Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Menstrual products #64372

Merged
merged 5 commits into from
Mar 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,34 @@
"container-item": "bag_plastic",
"items": [ { "item": "cotton_ball", "prob": 100, "count": [ 1, 10 ] } ]
},
{
"id": "tampon_box_full",
"type": "item_group",
"subtype": "collection",
"container-item": "box_small",
"items": [ { "item": "tampon", "prob": 100, "count": 24 } ]
},
{
"id": "tampon_box_used",
"type": "item_group",
"subtype": "collection",
"container-item": "box_small",
"items": [ { "item": "tampon", "prob": 100, "count": [ 1, 24 ] } ]
},
{
"id": "menstrual_pad_box_full",
"type": "item_group",
"subtype": "collection",
"container-item": "box_small",
"items": [ { "item": "menstrual_pad", "prob": 100, "count": 24 } ]
},
{
"id": "menstrual_pad_box_used",
"type": "item_group",
"subtype": "collection",
"container-item": "box_small",
"items": [ { "item": "menstrual_pad", "prob": 100, "count": [ 1, 24 ] } ]
},
{
"id": "drugs_analgesic",
"type": "item_group",
Expand All @@ -59,6 +87,8 @@
[ "liq_bandage_spray", 5 ],
{ "group": "adhesive_bandages_box_used", "prob": 50 },
{ "group": "cotton_ball_bag_used", "prob": 40 },
{ "group": "tampon_box_used", "prob": 40 },
{ "group": "menstrual_pad_box_used", "prob": 40 },
[ "disinfectant", 30 ],
[ "eyedrops", 10 ],
[ "medical_gauze", 20 ],
Expand Down
6 changes: 6 additions & 0 deletions data/json/itemgroups/SUS/domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,9 @@
{ "item": "ammonia_hydroxide", "prob": 20, "charges-min": 1 },
{ "item": "chem_washing_soda", "prob": 10, "charges-min": 1 },
{ "item": "string_floss", "count": [ 1, 2 ], "prob": 60 },
{ "group": "tampon_box_used", "prob": 10 },
{ "group": "menstrual_pad_box_used", "prob": 10 },
{ "item": "menstrual_cup", "prob": 1 },
{ "item": "toothbrush_plain", "count": [ 1, 3 ], "prob": 45 },
{ "item": "dentures", "count": [ 1, 2 ], "prob": 15 },
{ "item": "toothbrush_electric", "count": [ 1, 3 ], "prob": 25 }
Expand All @@ -711,6 +714,9 @@
{ "item": "eyedrops", "prob": 15 },
{ "item": "pepto", "prob": 70, "charges-min": 1, "container-item": "bottle_plastic_small" },
{ "item": "inhaler", "prob": 25, "charges-min": 10, "charges-max": 100 },
{ "group": "tampon_box_used", "prob": 20 },
{ "group": "menstrual_pad_box_used", "prob": 20 },
{ "item": "menstrual_cup", "prob": 2 },
{ "item": "disinfectant", "prob": 40, "charges-min": 1 },
{ "group": "alcohol_wipes_box_used", "prob": 60 },
{
Expand Down
8 changes: 7 additions & 1 deletion data/json/itemgroups/stashes.json
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,13 @@
"id": "bugout_bad_pack",
"subtype": "distribution",
"//": "an item that wouldn't be super useful in a survival situation, recreational items and such.",
"entries": [ { "group": "SUS_book", "prob": 50 }, { "group": "games", "prob": 20 }, { "group": "bugout_memento", "prob": 50 } ]
"entries": [
{ "group": "SUS_book", "prob": 50 },
{ "group": "games", "prob": 20 },
{ "group": "bugout_memento", "prob": 50 },
{ "group": "tampon_box_full", "prob": 20 },
{ "group": "menstrual_pad_box_full", "prob": 20 }
]
},
{
"type": "item_group",
Expand Down
90 changes: 90 additions & 0 deletions data/json/items/generic/bathroom_house.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,96 @@
}
]
},
{
"id": "tampon",
"name": { "str": "tampon" },
"type": "GENERIC",
"description": "A small cotton tampon with a plastic applicator.",
"symbol": "+",
"color": "white",
"looks_like": "cotton_ball",
"container": "bag_plastic",
"price": 25,
"price_postapoc": 200,
"//": "Makes a decent trade commodity but can be acquired in bulk.",
"weight": "10 g",
"volume": "50 ml",
"material": [ "plastic", "cotton" ],
"snippet_category": [
{
"id": "tampon1",
"text": "A small cotton tampon with a plastic applicator. Useless for some, an invaluable commodity for others."
},
{ "id": "tampon2", "text": "A 'light' cotton tampon with a plastic applicator rated for light flows." },
{ "id": "tampon3", "text": "A 'super' cotton tampon with a plastic applicator rated for heavy flows." },
{ "id": "tampon4", "text": "A small, lavender-scented cotton tampon with a plastic applicator." },
{
"id": "tampon5",
"text": "A small cotton tampon with a plastic applicator proudly claiming to be anti-microbial. Ultra-fine print indicates that this tampon has no noticeable health benefits compared to others."
},
{
"id": "tampon6",
"text": "An expensive-looking tampon with a fancy, smooth plastic applicator. The ultra-soft cotton has the appearance of a fluffy cloud."
},
{
"id": "tampon7",
"text": "A cheap-looking tampon. The cotton looks rough, the plastic applicator has a few sharp edges, and the string is somehow already knotted."
}
]
},
{
"id": "menstrual_pad",
"name": { "str": "menstrual pad" },
"type": "GENERIC",
"description": "An absorbent pad.",
"symbol": "=",
"color": "white",
"looks_like": "bandages",
"container": "bag_plastic",
"price": 25,
"price_postapoc": 200,
"//": "Makes a decent trade commodity but can be acquired in bulk.",
"weight": "10 g",
"volume": "50 ml",
"material": [ "plastic", "cotton" ],
"snippet_category": [
{
"id": "menstrual_pad1",
"text": "An absorbent menstrual pad. Unfortunately, not as useful as a bandage as you'd think. The adhesive is on the side opposite of the absorbent part."
},
{ "id": "menstrual_pad2", "text": "A small panty-liner only meant for the lightest flows." },
{ "id": "menstrual_pad3", "text": "A large menstrual pad meant for use overnight." },
{
"id": "menstrual_pad4",
"text": "An absorbent menstrual pad with racing stripes, for the fastest flows. Probably."
},
{ "id": "menstrual_pad5", "text": "An absorbent menstrual pad that smells strongly of essential oils." },
{
"id": "menstrual_pad6",
"text": "A pride-themed menstrual pad in trans flag coloring. 'Men can bleed too!' is proudly written on the packaging."
},
{
"id": "menstrual_pad7",
"text": "A cheap menstrual pad. The cotton somehow looks like sandpaper and is almost see-through thin."
}
]
},
{
"id": "menstrual_cup",
"name": { "str": "menstrual cup" },
"type": "GENERIC",
"description": "A tiny, washable, flexible plastic cup about the size of a medicine cup for catching menstrual flow.",
"symbol": "v",
"color": "pink",
"looks_like": "bottle_plastic_small",
"container": "bag_plastic",
"price": 1000,
"price_postapoc": 500,
"//": "Makes a decent trade commodity.",
"weight": "10 g",
"volume": "50 ml",
"material": [ "plastic" ]
},
{
"id": "hairbrush",
"name": { "str": "hairbrush", "str_pl": "hairbrushes" },
Expand Down
16 changes: 16 additions & 0 deletions data/json/recipes/recipe_deconstruction.json
Original file line number Diff line number Diff line change
Expand Up @@ -5922,6 +5922,22 @@
"//": "just unspool the floss, no need to make a big production out of it.",
"components": [ [ [ "plastic_chunk", 1 ] ], [ [ "thread", 25 ] ] ]
},
{
"result": "tampon",
"type": "uncraft",
"activity_level": "LIGHT_EXERCISE",
"skill_used": "fabrication",
"time": "12 s",
"components": [ [ [ "plastic_chunk", 1 ] ], [ [ "string_6", 1 ] ], [ [ "cotton_ball", 2 ] ] ]
},
{
"result": "menstrual_pad",
"type": "uncraft",
"activity_level": "LIGHT_EXERCISE",
"skill_used": "fabrication",
"time": "12 s",
"components": [ [ [ "cotton_ball", 3 ] ] ]
},
{
"result": "string_36",
"type": "uncraft",
Expand Down