Skip to content

Commit

Permalink
Merge pull request CleverRaven#74894 from RenechCDDA/audit_science
Browse files Browse the repository at this point in the history
Extract personal effects from "science" item group, remove cannabis paraphernalia
  • Loading branch information
Maleclypse authored Jul 8, 2024
2 parents ba27956 + 496835e commit e7d0f7d
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 22 deletions.
26 changes: 26 additions & 0 deletions data/json/itemgroups/SUS/combos.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,31 @@
"subtype": "collection",
"id": "catalyic_cracking_items",
"entries": [ { "item": "catalytic_cracking_handbook", "prob": 100 } ]
},
{
"type": "item_group",
"subtype": "collection",
"id": "SUS_science_personal_effects",
"//": "These are personal effects, such as might be found at their workplace or on their person. The rates for medication (including vision aids) are intended to mirror the distribution of these items in the general US population.",
"//2": "diazepem ~5.6% in 2013 https://www.benzoinfo.com/prescribing-statistics/",
"//3": "antiparasitics: only data for US military could be found via google searching, but if rate is comparable to general population it's not even 1% https://academic.oup.com/ofid/article/9/3/ofac040/6528390 https://health.mil/News/Articles/2024/01/01/MSMR-Ivermectin",
"//4": "~4.1% of the population with at least one stimulant prescription per year https://www.cdc.gov/mmwr/volumes/72/wr/mm7213a1.htm",
"//5": "~8.7% of the population have asthma, presumably only some require an inhaler https://www.cdc.gov/nchs/fastats/asthma.htm",
"items": [
{ "item": "inhaler", "prob": 8, "charges": [ 10, 100 ] },
[ "eyedrops", 20 ],
{ "prob": 4, "group": "adderall_bottle_plastic_pill_prescription_1_10" },
{ "group": "wallets_science", "prob": 15 },
[ "badge_doctor", 2 ],
[ "lanyard", 15 ],
{ "item": "smart_phone", "prob": 80, "charges": [ 0, 120 ] },
[ "memory_card_unread", 30 ],
[ "mask_dust", 30 ],
{ "group": "box_of_contact_lens_any", "prob": 16 },
{ "group": "clothing_glasses", "prob": 65 },
[ "wrapped_rad_badge", 5 ],
{ "prob": 1, "group": "antiparasitic_bottle_plastic_pill_prescription_1_10" },
{ "prob": 6, "group": "diazepam_bottle_plastic_pill_prescription_1_10" }
]
}
]
17 changes: 0 additions & 17 deletions data/json/itemgroups/science_and_tech.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,7 @@
[ "purifier", 5 ],
{ "prob": 5, "group": "iodine_bottle_plastic_pill_supplement_1_10" },
{ "prob": 5, "group": "prussian_blue_bottle_plastic_pill_supplement_1_10" },
{ "item": "inhaler", "prob": 14, "charges": [ 10, 100 ] },
[ "eyedrops", 20 ],
{ "prob": 10, "group": "adderall_bottle_plastic_pill_prescription_1_10" },
{ "group": "wallets_science", "prob": 2 },
{ "item": "chem_ethanol", "prob": 10, "charges": [ 250, -1 ] },
[ "badge_doctor", 2 ],
[ "lanyard", 1 ],
[ "cleansuit", 5 ],
{ "item": "laptop", "prob": 10, "charges": [ 0, 500 ] },
{ "item": "eink_tablet_pc", "prob": 20, "charges": [ 0, 100 ] },
Expand All @@ -48,9 +42,6 @@
[ "pouch_autoclave", 10 ],
[ "mask_dust", 65 ],
{ "item": "mask_filter", "prob": 30, "charges": [ 0, 100 ] },
{ "group": "box_of_contact_lens_any", "prob": 30 },
{ "item": "transition_contacts", "prob": 6, "count": 6 },
{ "group": "clothing_glasses", "prob": 30 },
[ "file", 10 ],
[ "textbook_computer", 8 ],
[ "computer_science", 6 ],
Expand Down Expand Up @@ -105,10 +96,8 @@
{ "prob": 10, "group": "pur_tablets_bottle_plastic_small_1_15" },
[ "optical_cloak", 1 ],
[ "holo_cloak", 1 ],
{ "prob": 2, "group": "antiparasitic_bottle_plastic_pill_prescription_1_10" },
[ "survnote", 1 ],
{ "group": "tools_toolbox", "prob": 1 },
{ "prob": 1, "group": "diazepam_bottle_plastic_pill_prescription_1_10" },
[ "magnifying_glass", 1 ],
{ "group": "quicklime_bag", "prob": 10 },
[ "tin", 5 ],
Expand All @@ -119,15 +108,9 @@
{ "item": "denat_alcohol", "prob": 1, "charges": [ 250, -1 ] },
{ "item": "methed_alcohol", "prob": 1, "charges": [ 250, -1 ] },
[ "remotevehcontrol", 5 ],
{ "item": "textbook_extraction", "prob": 10 },
{ "item": "recovery_pump", "prob": 5 },
{ "item": "vac_pump", "prob": 5 },
{ "item": "polycarbonate_sheet", "prob": 30 },
{ "item": "closed_loop_extractor_large", "prob": 2 },
{ "item": "closed_loop_extractor_small", "prob": 2 },
{ "item": "gasket_plastic", "prob": 10 },
{ "item": "butane_tank", "prob": 15, "charges": [ 15000, -1 ] },
{ "item": "vac_oven_small", "prob": 5 },
{ "item": "butane_can", "prob": 2, "charges": [ 300, -1 ] },
{ "prob": 16, "group": "chem_citric_acid_bottle_glass_50" }
]
Expand Down
26 changes: 23 additions & 3 deletions data/json/mapgen/lab/lab_common.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,19 @@
{ "item": "mut_lab", "chance": 2 },
{ "item": "robots", "chance": 5 },
{ "item": "science", "chance": 5 },
{ "item": "SUS_science_personal_effects", "chance": 1 },
{ "item": "sewage_plant", "chance": 5 },
{ "item": "harddrugs", "chance": 5 },
{ "item": "softdrugs", "chance": 5 }
]
},
"d": { "items": [ { "item": "office", "chance": 20 }, { "item": "science", "chance": 5 } ] },
"d": {
"items": [
{ "item": "office", "chance": 20 },
{ "item": "science", "chance": 5 },
{ "item": "SUS_science_personal_effects", "chance": 2 }
]
},
"h": { "item": [ { "item": "coat_lab", "chance": 5 } ] },
"]": { "items": [ { "item": "manuals", "chance": 10 }, { "item": "textbooks", "chance": 10 } ] },
"l": {
Expand All @@ -82,9 +89,20 @@
"type": "palette",
"id": "lab_loot_home_office",
"mapping": {
"c": { "items": [ { "item": "office", "chance": 30 }, { "item": "science", "chance": 2 } ] },
"c": {
"items": [
{ "item": "office", "chance": 30 },
{ "item": "SUS_science_personal_effects", "chance": 15 },
{ "item": "science", "chance": 2 }
]
},
"d": {
"items": [ { "item": "office", "chance": 25 }, { "item": "stash_drugs", "chance": 5 }, { "item": "science", "chance": 3 } ]
"items": [
{ "item": "office", "chance": 25 },
{ "item": "SUS_science_personal_effects", "chance": 10 },
{ "item": "stash_drugs", "chance": 5 },
{ "item": "science", "chance": 3 }
]
},
"f": { "items": [ { "item": "SUS_fridge_breakroom", "chance": 60 } ] },
"S": { "items": [ { "item": "drugs_heal_simple", "chance": 10 }, { "item": "harddrugs", "chance": 5 } ] },
Expand All @@ -93,6 +111,7 @@
{ "item": "chem_lab", "chance": 10 },
{ "item": "robots", "chance": 5 },
{ "item": "science", "chance": 5 },
{ "item": "SUS_science_personal_effects", "chance": 1 },
{ "item": "sewage_plant", "chance": 5 },
{ "item": "harddrugs", "chance": 5 },
{ "item": "softdrugs", "chance": 5 }
Expand All @@ -114,6 +133,7 @@
{ "item": "office", "chance": 10 },
{ "item": "stash_drugs", "chance": 5 },
{ "item": "science", "chance": 3 },
{ "item": "SUS_science_personal_effects", "chance": 2 },
{ "item": "dresser", "chance": 3 },
{ "item": "lab_torso", "chance": 3 },
{ "item": "lab_pants", "chance": 3 }
Expand Down
14 changes: 12 additions & 2 deletions data/json/mapgen/lab/lab_rooms.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,12 @@
"palettes": [ "lab_palette" ],
"mapping": {
"c": {
"items": [ { "item": "office", "chance": 30 }, { "item": "textbooks", "chance": 3 }, { "item": "science", "chance": 3 } ]
"items": [
{ "item": "office", "chance": 30 },
{ "item": "SUS_science_personal_effects", "chance": 10 },
{ "item": "textbooks", "chance": 3 },
{ "item": "science", "chance": 3 }
]
},
"h": { "item": [ { "item": "coat_lab", "chance": 10 } ] }
}
Expand Down Expand Up @@ -242,7 +247,12 @@
"palettes": [ "lab_palette" ],
"mapping": {
"c": {
"items": [ { "item": "office", "chance": 30 }, { "item": "textbooks", "chance": 3 }, { "item": "science", "chance": 3 } ]
"items": [
{ "item": "office", "chance": 30 },
{ "item": "SUS_science_personal_effects", "chance": 10 },
{ "item": "textbooks", "chance": 3 },
{ "item": "science", "chance": 3 }
]
},
"h": { "item": [ { "item": "coat_lab", "chance": 10 } ] }
}
Expand Down
2 changes: 2 additions & 0 deletions data/json/mapgen/nursing_home.json
Original file line number Diff line number Diff line change
Expand Up @@ -799,13 +799,15 @@
],
"u": [
{ "item": "science", "chance": 40, "repeat": [ 0, 1 ] },
{ "item": "SUS_science_personal_effects", "chance": 10, "repeat": [ 0, 1 ] },
{ "item": "tools_science", "chance": 40, "repeat": [ 0, 1 ] },
{ "item": "tools_common", "chance": 40, "repeat": [ 0, 1 ] },
{ "item": "drugs_emergency", "chance": 40, "repeat": [ 0, 1 ] },
{ "item": "drugs_pharmacy", "chance": 40, "repeat": [ 0, 1 ] }
],
"U": [
{ "item": "science", "chance": 80, "repeat": [ 0, 1 ] },
{ "item": "SUS_science_personal_effects", "chance": 25, "repeat": [ 0, 1 ] },
{ "item": "tools_science", "chance": 80, "repeat": [ 0, 1 ] },
{ "item": "harddrugs", "chance": 50, "repeat": [ 0, 1 ] }
]
Expand Down

0 comments on commit e7d0f7d

Please sign in to comment.