diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm index f49643c865b..c265dc20324 100644 --- a/code/game/objects/items/random_items.dm +++ b/code/game/objects/items/random_items.dm @@ -325,7 +325,7 @@ icon_state = "flashbang" var/list/grenadelist = list(/obj/item/weapon/grenade/chem_grenade/metalfoam, /obj/item/weapon/grenade/chem_grenade/incendiary, /obj/item/weapon/grenade/chem_grenade/antiweed, /obj/item/weapon/grenade/chem_grenade/cleaner, /obj/item/weapon/grenade/chem_grenade/teargas, - /obj/item/weapon/grenade/chem_grenade/holywater, /obj/item/weapon/grenade/chem_grenade/soap, /obj/item/weapon/grenade/chem_grenade/meat, + /obj/item/weapon/grenade/chem_grenade/holywater, /obj/item/weapon/grenade/chem_grenade/meat, /obj/item/weapon/grenade/chem_grenade/dirt, /obj/item/weapon/grenade/chem_grenade/lube, /obj/item/weapon/grenade/smokebomb, /obj/item/weapon/grenade/chem_grenade/drugs, /obj/item/weapon/grenade/chem_grenade/ethanol) // holy list batman diff --git a/code/game/objects/items/weapons/grenades.dm b/code/game/objects/items/weapons/grenades.dm index 27dfceca0e4..8457afa0e36 100644 --- a/code/game/objects/items/weapons/grenades.dm +++ b/code/game/objects/items/weapons/grenades.dm @@ -47,23 +47,6 @@ B.reagents.add_reagent("holywater",100) beakers += B -/obj/item/weapon/grenade/chem_grenade/soap - payload_name = "soap" - desc = "Not necessarily as clean as the name implies." - stage = 2 - - New() - ..() - var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) - var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) - - B1.reagents.add_reagent("cornoil",60) - B2.reagents.add_reagent("enzyme",5) - B2.reagents.add_reagent("ammonia",30) - - beakers += B1 - beakers += B2 - update_icon() /obj/item/weapon/grenade/chem_grenade/drugs payload_name = "miracle" @@ -348,9 +331,6 @@ /obj/item/weapon/grenade/clusterbuster/xmas name = "Christmas Miracle" payload = /obj/item/weapon/a_gift -/obj/item/weapon/grenade/clusterbuster/soap - name = "Megamaid's Passive-Aggressive Soap-creation Grenade" - payload = /obj/item/weapon/grenade/chem_grenade/soap /obj/item/weapon/grenade/clusterbuster/dirt name = "Megamaid's Job Security Grenade" payload = /obj/effect/decal/cleanable/random diff --git a/code/modules/reagents/newchem/drugs.dm b/code/modules/reagents/newchem/drugs.dm index 882adf98fac..83b68f7a69f 100644 --- a/code/modules/reagents/newchem/drugs.dm +++ b/code/modules/reagents/newchem/drugs.dm @@ -277,7 +277,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob) name = "bath_salts" id = "bath_salts" result = "bath_salts" - required_reagents = list("????" = 1, "saltpetre" = 1, "nutriment" = 1, "cleaner" = 1, "enzyme" = 1, "mugwort" = 1, "mercury" = 1) + required_reagents = list("????" = 1, "saltpetre" = 1, "msg" = 1, "cleaner" = 1, "enzyme" = 1, "mugwort" = 1, "mercury" = 1) result_amount = 6 required_temp = 374 mix_message = "Tiny cubic crystals precipitate out of the mixture. Huh." diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index e76d64740e8..1f3539c18ba 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -270,6 +270,8 @@ New() ..() reagents.add_reagent("dry_ramen", 30) + if(prob(10)) + reagents.add_reagent("enzyme", 3) src.pixel_x = rand(-10.0, 10) src.pixel_y = rand(-10.0, 10) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 458f025d372..b54594dd5e7 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -589,6 +589,7 @@ New() ..() reagents.add_reagent("nutriment", 2) + reagents.add_reagent("egg", 5) reagents.add_reagent("sodiumchloride", 1) reagents.add_reagent("blackpepper", 1) bitesize = 1 @@ -602,6 +603,7 @@ New() ..() reagents.add_reagent("nutriment", 2) + reagents.add_reagent("egg", 5) /obj/item/weapon/reagent_containers/food/snacks/flour name = "flour"