Skip to content

Commit

Permalink
Obsolete acetone (#961)
Browse files Browse the repository at this point in the history
Remove spawns for acetone
  • Loading branch information
Lamandus authored Oct 8, 2021
1 parent c60eb47 commit c15e143
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 19 deletions.
1 change: 0 additions & 1 deletion data/json/itemgroups/Locations_MapExtras/locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -1110,7 +1110,6 @@
[ "chemistry_set", 50 ],
{ "group": "ammo_pocket_batteries_full", "prob": 70 },
[ "flashlight", 40 ],
[ "chem_acetone", 40 ],
[ "chem_hexamine", 15 ]
]
},
Expand Down
1 change: 0 additions & 1 deletion data/json/itemgroups/supplies.json
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,6 @@
[ "chem_muriatic_acid", 10 ],
[ "chem_acetic_acid", 10 ],
[ "chem_formaldehyde", 10 ],
[ "chem_acetone", 10 ],
{ "item": "chem_carbide", "prob": 10, "charges-min": 100 },
[ "chem_ammonium_nitrate", 10 ],
{ "item": "chem_chromium_oxide", "prob": 10, "charges-min": 100 },
Expand Down
17 changes: 0 additions & 17 deletions data/json/items/chemicals_and_resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -610,23 +610,6 @@
"//freezing_point": 25,
"drop_action": { "type": "emit_actor", "emits": [ "emit_acid_drop" ], "scale_qty": true }
},
{
"type": "AMMO",
"id": "chem_acetone",
"category": "chems",
"price": 50,
"price_postapoc": 100,
"name": { "str_sp": "acetone" },
"symbol": "=",
"color": "white",
"description": "Acetone, best known as the primary constituent of most nail polish removers. Flammable and can be easily used for potent home-made explosives, as demonstrated by the terrorist attacks of 2016.",
"volume": "250 ml",
"weight": "200 g",
"bashing": 1,
"ammo_type": "components",
"phase": "liquid",
"container": "bottle_glass"
},
{
"type": "AMMO",
"id": "chem_nitric_acid",
Expand Down
17 changes: 17 additions & 0 deletions data/json/obsoletion/items.json
Original file line number Diff line number Diff line change
Expand Up @@ -3335,6 +3335,23 @@
"calories": 400,
"flags": [ "EATEN_HOT" ]
},
{
"type": "AMMO",
"id": "chem_acetone",
"category": "chems",
"price": 50,
"price_postapoc": 100,
"name": { "str_sp": "acetone" },
"symbol": "=",
"color": "white",
"description": "Acetone, best known as the primary constituent of most nail polish removers. Flammable and can be easily used for potent home-made explosives.",
"volume": "10 ml",
"weight": "10 g",
"bashing": 1,
"ammo_type": "components",
"phase": "liquid",
"container": "bottle_glass"
},
{
"type": "COMESTIBLE",
"id": "chem_acrylamide",
Expand Down

0 comments on commit c15e143

Please sign in to comment.