diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index f2469cd91f2..1e5bb2a2a8e 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -789,13 +789,13 @@
product_slogans = "Try our new nougat bar!;Twice the calories for half the price!"
product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!"
icon_state = "snack"
- products = list(/obj/item/weapon/reagent_containers/food/snacks/candy/candybar = 6,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 6,/obj/item/weapon/reagent_containers/food/snacks/chips =6,
- /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 6,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 6,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 6,
- /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 6)
+ products = list(/obj/item/weapon/reagent_containers/food/snacks/candy/candybar = 6,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 6,/obj/item/weapon/reagent_containers/food/drinks/chicken_soup = 6,
+ /obj/item/weapon/reagent_containers/food/snacks/chips =6,/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 6,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 6,
+ /obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 6,/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 6)
contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6)
- prices = list(/obj/item/weapon/reagent_containers/food/snacks/candy/candybar = 20,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 30,/obj/item/weapon/reagent_containers/food/snacks/chips =25,
- /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 30,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 20,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 30,
- /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 25)
+ prices = list(/obj/item/weapon/reagent_containers/food/snacks/candy/candybar = 20,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 30,/obj/item/weapon/reagent_containers/food/drinks/chicken_soup = 30,
+ /obj/item/weapon/reagent_containers/food/snacks/chips =25,/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 30,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 20,
+ /obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 30,/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 25)
refill_canister = /obj/item/weapon/vending_refill/snack
/obj/machinery/vending/snack/New()
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/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 5cbc5514f24..49fa74401bf 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -2131,11 +2131,15 @@ datum
adj_temp = 25
on_mob_life(var/mob/living/M as mob)
- ..()
M.Jitter(5)
if(adj_temp > 0 && holder.has_reagent("frostoil"))
holder.remove_reagent("frostoil", 10*REAGENTS_METABOLISM)
- holder.remove_reagent(src.id, 0.1)
+ if(prob(50))
+ M.AdjustParalysis(-1)
+ M.AdjustStunned(-1)
+ M.AdjustWeakened(-1)
+ ..()
+ return
icecoffee
name = "Iced Coffee"
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/newchem/food.dm b/code/modules/reagents/newchem/food.dm
index cd6e852f580..5a8c8c520f6 100644
--- a/code/modules/reagents/newchem/food.dm
+++ b/code/modules/reagents/newchem/food.dm
@@ -126,6 +126,19 @@ datum/reagent/honey/reaction_turf(var/turf/T, var/volume)
new /obj/item/weapon/reagent_containers/food/snacks/honeycomb(T)
return */
+/datum/reagent/chocolate
+ name = "Chocolate"
+ id = "chocolate"
+ description = "Chocolate is a delightful product derived from the seeds of the theobroma cacao tree."
+ reagent_state = LIQUID
+ color = "#2E2418"
+
+datum/reagent/chocolate/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ M.reagents.add_reagent("sugar", 0.8)
+ ..()
+ return
+
/datum/reagent/mugwort
name = "Mugwort"
id = "mugwort"
@@ -159,4 +172,50 @@ datum/reagent/porktonium/overdose_process(var/mob/living/M as mob)
M.reagents.add_reagent("cyanide", 10)
M.reagents.add_reagent("radium", 15)
..()
+ return
+
+/datum/reagent/fungus
+ name = "Space fungus"
+ id = "fungus"
+ description = "Scrapings of some unknown fungus found growing on the station walls."
+ reagent_state = LIQUID
+ color = "#C87D28"
+
+datum/reagent/fungus/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+ if(!istype(M, /mob/living))
+ return
+ if(method == INGEST)
+ M << "Yuck!"
+
+/datum/reagent/chicken_soup
+ name = "Chicken soup"
+ id = "chicken_soup"
+ description = "An old household remedy for mild illnesses."
+ reagent_state = LIQUID
+ color = "#B4B400"
+
+/datum/reagent/chicken_soup/on_mob_life(var/mob/living/M as mob)
+ M.nutrition += 2
+ ..()
+ return
+
+/datum/reagent/msg
+ name = "Monosodium glutamate"
+ id = "msg"
+ description = "Monosodium Glutamate is a sodium salt known chiefly for its use as a controversial flavor enhancer."
+ reagent_state = LIQUID
+ color = "#F5F5F5"
+
+datum/reagent/msg/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+ if(!istype(M, /mob/living))
+ return
+ if(method == INGEST)
+ M << "That tasted amazing!"
+
+
+/datum/reagent/msg/on_mob_life(var/mob/living/M as mob)
+ if(prob(1))
+ M.Stun(rand(4,10))
+ M << "A horrible migraine overpowers you."
+ ..()
return
\ No newline at end of file
diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm
index 8c56c30bdd2..cd0ff90e0c7 100644
--- a/code/modules/reagents/newchem/medicine.dm
+++ b/code/modules/reagents/newchem/medicine.dm
@@ -422,6 +422,7 @@ datum/reagent/diphenhydramine/on_mob_life(var/mob/living/M as mob)
M.drowsyness += 1
M.jitteriness -= 1
M.reagents.remove_reagent("histamine",3)
+ M.reagents.remove_reagent("itching_powder",3)
..()
return
diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm
index 20703d55e78..bd9baf41c34 100644
--- a/code/modules/reagents/newchem/toxins.dm
+++ b/code/modules/reagents/newchem/toxins.dm
@@ -23,12 +23,17 @@ datum/reagent/polonium/on_mob_life(var/mob/living/M as mob)
datum/reagent/histamine
name = "Histamine"
id = "histamine"
- description = "A dose-dependent toxin, ranges from annoying to incredibly lethal."
+ description = "Immune-system neurotransmitter. If detected in blood, the subject is likely undergoing an allergic reaction."
reagent_state = LIQUID
- color = "#CF3600"
+ color = "#E7C4C4"
metabolization_rate = 0.2
overdose_threshold = 30
+datum/reagent/histamine/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) //dumping histamine on someone is VERY mean.
+ if(iscarbon(M))
+ if(method == TOUCH)
+ M.reagents.add_reagent("histamine",10)
+
datum/reagent/histamine/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
switch(pick(1, 2, 3, 4))
@@ -58,7 +63,7 @@ datum/reagent/formaldehyde
id = "formaldehyde"
description = "Formaldehyde is a common industrial chemical and is used to preserve corpses and medical samples. It is highly toxic and irritating."
reagent_state = LIQUID
- color = "#CF3600"
+ color = "#DED6D0"
penetrates_skin = 1
datum/reagent/formaldehyde/on_mob_life(var/mob/living/M as mob)
@@ -175,17 +180,12 @@ datum/reagent/cyanide/on_mob_life(var/mob/living/M as mob)
datum/reagent/itching_powder
name = "Itching Powder"
id = "itching_powder"
- description = "Lots of annoying random effects, chances to do some brute damage from scratching. 6% chance to decay into 1-3 units of histamine."
+ description = "An abrasive powder beloved by cruel pranksters."
reagent_state = LIQUID
- color = "#CF3600"
+ color = "#B0B0B0"
metabolization_rate = 0.3
penetrates_skin = 1
-/datum/reagent/itching_powder/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
- if(method == TOUCH)
- M.reagents.add_reagent("itching_powder", volume)
- return
-
datum/reagent/itching_powder/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(prob(rand(5,50)))
@@ -199,7 +199,6 @@ datum/reagent/itching_powder/on_mob_life(var/mob/living/M as mob)
M.adjustBruteLoss(0.2*REM)
if(prob(6))
M.reagents.add_reagent("histamine",rand(1,3))
- M.reagents.remove_reagent("itching_powder",1)
..()
return
@@ -209,6 +208,7 @@ datum/reagent/itching_powder/on_mob_life(var/mob/living/M as mob)
result = "itching_powder"
required_reagents = list("fuel" = 1, "ammonia" = 1, "charcoal" = 1)
result_amount = 3
+ mix_message = "The mixture congeals and dries up, leaving behind an abrasive powder."
datum/reagent/facid/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -333,6 +333,22 @@ datum/reagent/initropidril/on_mob_life(var/mob/living/M as mob)
..()
return
+datum/reagent/concentrated_initro
+ name = "Concentrated Initropidril"
+ id = "concentrated_initro"
+ description = "A guaranteed heart-stopper!"
+ reagent_state = LIQUID
+ color = "#AB1CCF"
+ metabolization_rate = 0.4
+
+datum/reagent/concentrated_initro/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ if(volume >=5)
+ var/mob/living/carbon/human/H = M
+ if(!H.heart_attack)
+ H.visible_message("[H] clutches at their chest!")
+ H.heart_attack = 1 // rip in pepperoni
+
datum/reagent/pancuronium
name = "Pancuronium"
id = "pancuronium"
@@ -353,16 +369,19 @@ datum/reagent/pancuronium/on_mob_life(var/mob/living/M as mob)
datum/reagent/sodium_thiopental
name = "Sodium Thiopental"
id = "sodium_thiopental"
- description = "Puts you to sleep after 30 seconds, along with some major stamina loss."
+ description = "An rapidly-acting barbituate tranquilizer."
reagent_state = LIQUID
- color = "#658EDF"
+ color = "#5F8BE1"
metabolization_rate = 0.7
datum/reagent/sodium_thiopental/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
- if(current_cycle >= 10)
- M.sleeping += 3
- M.adjustStaminaLoss(10)
+ if(current_cycle == 1)
+ M.emote("drool")
+ if(current_cycle >= 2)
+ M.drowsyness = max(M.drowsyness, 20)
+ if(current_cycle >= 5)
+ M.Paralyse(4)
..()
return
@@ -423,9 +442,9 @@ datum/reagent/sulfonal/on_mob_life(var/mob/living/M as mob)
datum/reagent/amanitin
name = "Amanitin"
id = "amanitin"
- description = "On the last second that it's in you, it hits you with a stack of toxin damage based on how long it's been in you. The more you use, the longer it takes before anything happens, but the harder it hits when it does."
+ description = "A toxin produced by certain mushrooms. Very deadly."
reagent_state = LIQUID
- color = "#CF3600"
+ color = "#D9D9D9"
datum/reagent/amanitin/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -441,9 +460,9 @@ datum/reagent/amanitin/reagent_deleted(var/mob/living/M as mob)
datum/reagent/lipolicide
name = "Lipolicide"
id = "lipolicide"
- description = "Deals some toxin damage unless they keep eating food. Will reduce nutrition values."
- reagent_state = LIQUID
- color = "#CF3600"
+ description = "A compound found in many seedy dollar stores in the form of a weight-loss tonic."
+ reagent_state = SOLID
+ color = "#D1DED1"
/datum/chemical_reaction/lipolicide
name = "lipolicide"
@@ -466,9 +485,9 @@ datum/reagent/lipolicide/on_mob_life(var/mob/living/M as mob)
datum/reagent/coniine
name = "Coniine"
id = "coniine"
- description = "Does moderate toxin damage and oxygen loss."
+ description = "A neurotoxin that rapidly causes respiratory failure."
reagent_state = LIQUID
- color = "#CF3600"
+ color = "#C2D8CD"
metabolization_rate = 0.05
datum/reagent/coniine/on_mob_life(var/mob/living/M as mob)
@@ -710,4 +729,25 @@ datum/reagent/glowing_slurry/on_mob_life(var/mob/living/M as mob)
domutcheck(M, null)
M.UpdateAppearance()
..()
+ return
+
+datum/reagent/ants
+ name = "Ants"
+ id = "ants"
+ description = "A sample of a lost breed of Space Ants (formicidae bastardium tyrannus), they are well-known for ravaging the living shit out of pretty much anything."
+ reagent_state = SOLID
+ color = "#993333"
+
+datum/reagent/ants/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) //NOT THE ANTS
+ if(iscarbon(M))
+ if(method == TOUCH || method==INGEST)
+ M.adjustBruteLoss(4)
+ M.emote("scream")
+ M << "OH SHIT ANTS!!!!"
+
+
+datum/reagent/ants/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ M.adjustBruteLoss(2)
+ ..()
return
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 48361063466..1f3539c18ba 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -270,6 +270,18 @@
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)
+
+/obj/item/weapon/reagent_containers/food/drinks/chicken_soup
+ name = "Cup Chicken Soup"
+ desc = "A delicious and soothing cup of chicken noodle soup; just like spessmom used to make it."
+ icon_state = "ramen"
+ New()
+ ..()
+ reagents.add_reagent("chicken_soup", 30)
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 508a1bbbc36..b54594dd5e7 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -388,7 +388,7 @@
New()
..()
reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("sugar", 2)
+ reagents.add_reagent("chocolate",2)
reagents.add_reagent("coco", 2)
bitesize = 2
@@ -401,7 +401,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sugar", 2)
+ reagents.add_reagent("chocolate",2)
reagents.add_reagent("coco", 2)
bitesize = 2
@@ -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"
@@ -1260,6 +1262,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("msg",4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chinese/tao
@@ -1269,6 +1272,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("msg",4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chinese/newdles
@@ -1278,6 +1282,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("msg",4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chinese/rice
@@ -1288,6 +1293,7 @@
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("rice", 3)
+ reagents.add_reagent("msg",4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/syndicake
@@ -2540,6 +2546,7 @@
New()
..()
reagents.add_reagent("nutriment", 20)
+ reagents.add_reagent("chocolate",20)
/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice
name = "Chocolate Cake slice"
@@ -3153,7 +3160,7 @@
New()
..()
reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("sugar",8)
+ reagents.add_reagent("chocolate",8)
reagents.add_reagent("ice",2)
bitesize = 6
diff --git a/code/modules/reagents/reagent_containers/food/snacks/candy.dm b/code/modules/reagents/reagent_containers/food/snacks/candy.dm
index 22b5f10e73d..6a0759c2bcc 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/candy.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/candy.dm
@@ -27,7 +27,7 @@
New()
..()
reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("sugar", 2)
+ reagents.add_reagent("chocolate",2)
reagents.add_reagent("coco", 2)
bitesize = 2
@@ -89,7 +89,7 @@
New()
..()
reagents.add_reagent("cream", 3)
- reagents.add_reagent("sugar", 3)
+ reagents.add_reagent("chocolate",3)
reagents.add_reagent("coco", 3)
bitesize = 3
@@ -145,7 +145,7 @@
New()
..()
reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("sugar", 5)
+ reagents.add_reagent("chocolate",5)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/candycane
@@ -226,7 +226,7 @@
New()
..()
reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("sugar", 2)
+ reagents.add_reagent("chocolate",2)
reagents.add_reagent("coco", 2)
bitesize = 3
@@ -535,7 +535,7 @@
New()
..()
- reagents.add_reagent("coco" = 2)
+ reagents.add_reagent("chocolate",2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/popcorn