diff --git a/code/game/machinery/bees_items.dm b/code/game/machinery/bees_items.dm
index 01e5d96ac02..e8c9014a3ba 100644
--- a/code/game/machinery/bees_items.dm
+++ b/code/game/machinery/bees_items.dm
@@ -74,22 +74,11 @@
icon_state = "honeycomb"
desc = "Dripping with sugary sweetness."
- New()
- ..()
-
/obj/item/weapon/reagent_containers/food/snacks/honeycomb/New()
..()
- reagents.add_reagent("honey",10)
- reagents.add_reagent("nutriment", 0.5)
- reagents.add_reagent("sugar", 2)
+ reagents.add_reagent("honey",15)
bitesize = 2
-/datum/reagent/honey
- name = "Honey"
- id = "honey"
- description = "A golden yellow syrup, loaded with sugary sweetness."
- color = "#FFFF00"
-
/obj/item/weapon/book/manual/hydroponics_beekeeping
name = "The Ins and Outs of Apiculture - A Precise Art"
icon_state ="bookHydroponicsBees"
diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm
index 26533075888..aaeef39d8d6 100644
--- a/code/game/machinery/kitchen/microwave.dm
+++ b/code/game/machinery/kitchen/microwave.dm
@@ -400,7 +400,7 @@
del(O)
src.reagents.clear_reagents()
ffuu.reagents.add_reagent("carbon", amount)
- ffuu.reagents.add_reagent("toxin", amount/10)
+ ffuu.reagents.add_reagent("????", amount/10)
return ffuu
/obj/machinery/microwave/Topic(href, href_list)
diff --git a/code/modules/food/candy_maker.dm b/code/modules/food/candy_maker.dm
index dc8b82235e9..c6fe36f48b1 100644
--- a/code/modules/food/candy_maker.dm
+++ b/code/modules/food/candy_maker.dm
@@ -406,7 +406,7 @@
del(O)
src.reagents.clear_reagents()
ffuu.reagents.add_reagent("carbon", amount)
- ffuu.reagents.add_reagent("toxin", amount/10)
+ ffuu.reagents.add_reagent("????", amount/10)
return ffuu
/obj/machinery/candy_maker/Topic(href, href_list)
diff --git a/code/modules/food/grill_new.dm b/code/modules/food/grill_new.dm
index 3655ecf7e05..757b5a4ca58 100644
--- a/code/modules/food/grill_new.dm
+++ b/code/modules/food/grill_new.dm
@@ -403,7 +403,7 @@
del(O)
src.reagents.clear_reagents()
ffuu.reagents.add_reagent("carbon", amount)
- ffuu.reagents.add_reagent("toxin", amount/10)
+ ffuu.reagents.add_reagent("????", amount/10)
return ffuu
/obj/machinery/grill/Topic(href, href_list)
diff --git a/code/modules/food/oven_new.dm b/code/modules/food/oven_new.dm
index b89a1a702d2..4fe0f79b396 100644
--- a/code/modules/food/oven_new.dm
+++ b/code/modules/food/oven_new.dm
@@ -403,7 +403,7 @@
del(O)
src.reagents.clear_reagents()
ffuu.reagents.add_reagent("carbon", amount)
- ffuu.reagents.add_reagent("toxin", amount/10)
+ ffuu.reagents.add_reagent("????", amount/10)
return ffuu
/obj/machinery/oven/Topic(href, href_list)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 4d1a6e37d54..561f26aeec0 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1907,8 +1907,9 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
return
else
losebreath += 5
- adjustOxyLoss(5)
+ adjustOxyLoss(10)
adjustBrainLoss(10)
+ Paralyse(2)
return
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 79204a72986..0228bb36903 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -716,7 +716,7 @@ datum
id = "sacid"
description = "A strong mineral acid with the molecular formula H2SO4."
reagent_state = LIQUID
- color = "#DB5008" // rgb: 219, 80, 8
+ color = "#00D72B"
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -1154,6 +1154,7 @@ datum
description = "Lexorin temporarily stops respiration. Causes tissue damage."
reagent_state = LIQUID
color = "#32127A" // rgb: 50, 18, 122
+ metabolization_rate = 0.2
on_mob_life(var/mob/living/M as mob)
if(M.stat == 2.0)
@@ -1461,9 +1462,9 @@ datum
diethylamine
name = "Diethylamine"
id = "diethylamine"
- description = "A secondary amine, mildly corrosive."
+ description = "A secondary amine, useful as a plant nutrient and as building block for other compounds."
reagent_state = LIQUID
- color = "#604030" // rgb: 96, 64, 48
+ color = "#322D00"
Spores
name = "Spores"
@@ -1741,7 +1742,6 @@ datum
M.Dizzy(20)
M.druggy = max(M.druggy, 40)
if(prob(30)) M.emote(pick("twitch","giggle"))
- holder.remove_reagent(src.id, 0.2)
data++
..()
return
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 2efe1bfc763..f01b9b5566c 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -359,6 +359,7 @@ datum
result = "ammonia"
required_reagents = list("hydrogen" = 3, "nitrogen" = 1)
result_amount = 3
+ mix_message = "The mixture bubbles, emitting an acrid reek."
diethylamine
name = "Diethylamine"
@@ -367,6 +368,7 @@ datum
required_reagents = list ("ammonia" = 1, "ethanol" = 1)
result_amount = 2
required_temp = 374
+ mix_message = "A horrible smell pours forth from the mixture."
space_cleaner
name = "Space cleaner"
@@ -374,6 +376,7 @@ datum
result = "cleaner"
required_reagents = list("ammonia" = 1, "water" = 1, "ethanol" = 1)
result_amount = 3
+ mix_message = "Ick, this stuff really stinks. Sure does make the container sparkle though!"
sulfuric_acid
name = "Sulfuric Acid"
@@ -381,6 +384,7 @@ datum
result = "sacid"
required_reagents = list("sulfur" = 1, "oxygen" = 1, "hydrogen" = 1)
result_amount = 3
+ mix_message = "The mixture gives off a sharp acidic tang."
///////Changeling Blood Test/////////////
changeling_test
diff --git a/code/modules/reagents/newchem/food.dm b/code/modules/reagents/newchem/food.dm
index 3e4c4dbbce4..60f985be272 100644
--- a/code/modules/reagents/newchem/food.dm
+++ b/code/modules/reagents/newchem/food.dm
@@ -1,3 +1,18 @@
+/datum/reagent/questionmark // food poisoning
+ name = "????"
+ id = "????"
+ description = "A gross and unidentifiable substance."
+ reagent_state = LIQUID
+ color = "#63DE63"
+ metabolization_rate = 0.4
+
+datum/reagent/questionmark/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+ if(!istype(M, /mob/living))
+ return
+ if(method == INGEST)
+ M.Weaken(2)
+ M << "Ugh! Eating that was a terrible idea!"
+
datum/reagent/egg
name = "Egg"
id = "egg"
@@ -15,16 +30,23 @@ datum/reagent/egg/on_mob_life(var/mob/living/M as mob)
datum/reagent/triple_citrus
name = "Triple Citrus"
id = "triple_citrus"
- description = "A solution."
+ description = "A refreshing mixed drink of orange, lemon and lime juice."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#23A046"
/datum/chemical_reaction/triple_citrus
name = "triple_citrus"
id = "triple_citrus"
result = "triple_citrus"
required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1)
- result_amount = 5
+ result_amount = 3
+ mix_message = "The citrus juices begin to blend together."
+
+datum/reagent/triple_citrus/reaction_mob(var/mob/living/carbon/M as mob, var/method=TOUCH, var/volume)
+ if(!istype(M, /mob/living/carbon))
+ return
+ if(method == INGEST)
+ M.adjustToxLoss(-rand(1,2))
datum/reagent/corn_starch
name = "Corn Starch"
@@ -40,6 +62,7 @@ datum/reagent/corn_starch
required_reagents = list("corn_starch" = 1, "sacid" = 1)
result_amount = 2
required_temp = 374
+ mix_message = "The mixture forms a viscous, clear fluid!"
datum/reagent/corn_syrup
name = "Corn Syrup"
@@ -61,6 +84,7 @@ datum/reagent/corn_syrup/on_mob_life(var/mob/living/M as mob)
required_reagents = list("corn_syrup" = 1)
required_catalysts = list("enzyme" = 1)
result_amount = 1
+ mix_message = "The mixture emits a sickly-sweet smell."
datum/reagent/vhfcs
name = "Very-high-fructose corn syrup"
@@ -73,4 +97,31 @@ datum/reagent/vhfcs/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.reagents.add_reagent("sugar", 2.4)
..()
- return
\ No newline at end of file
+ return
+
+/datum/chemical_reaction/cola
+ name = "cola"
+ id = "cola"
+ result = "cola"
+ required_reagents = list("carbon" = 1, "oxygen" = 1, "water" = 1, "sugar" = 1)
+ result_amount = 4
+ mix_message = "The mixture begins to fizz."
+
+/datum/reagent/honey
+ name = "Honey"
+ id = "honey"
+ description = "A sweet substance produced by bees through partial digestion. Bee barf."
+ reagent_state = LIQUID
+ color = "#CFCF1F"
+
+datum/reagent/honey/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ M.reagents.add_reagent("sugar", 0.8)
+ ..()
+ return
+/* //Commenting this out until smoke is rewritten, otherwise, this spam so much honeycomb it's not funny
+datum/reagent/honey/reaction_turf(var/turf/T, var/volume)
+ src = null
+ if(volume >= 5)
+ new /obj/item/weapon/reagent_containers/food/snacks/honeycomb(T)
+ return */
diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm
index 43becc47022..5d8a6770613 100644
--- a/code/modules/reagents/newchem/medicine.dm
+++ b/code/modules/reagents/newchem/medicine.dm
@@ -103,7 +103,7 @@ datum/reagent/charcoal
datum/reagent/charcoal/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
- M.adjustToxLoss(-3*REM)
+ M.adjustToxLoss(-1.5*REM)
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)
M.reagents.remove_reagent(R.id,1)
@@ -543,12 +543,11 @@ datum/reagent/atropine/on_mob_life(var/mob/living/M as mob)
M.adjustBruteLoss(-3*REM)
M.adjustFireLoss(-3*REM)
if(M.oxyloss > 65)
- M.setOxyLoss(65)
+ M.adjustOxyLoss(-10*REM)
if(M.losebreath > 5)
M.losebreath = 5
- if(prob(30))
- M.Dizzy(5)
- M.Jitter(5)
+ if(M.confused > 60)
+ M.confused += 5
M.reagents.remove_reagent("sarin",10)
..()
return
@@ -585,11 +584,9 @@ datum/reagent/epinephrine/on_mob_life(var/mob/living/M as mob)
M.adjustBruteLoss(-1*REM)
M.adjustFireLoss(-1*REM)
if(M.oxyloss > 35)
- M.setOxyLoss(35)
- if(M.losebreath >= 4)
- M.losebreath -= 4
- if(M.losebreath < 0)
- M.losebreath = 0
+ M.adjustOxyLoss(-10*REM)
+ if(M.losebreath >= 3)
+ M.losebreath = 3
..()
return
diff --git a/code/modules/reagents/newchem/other.dm b/code/modules/reagents/newchem/other.dm
index 3df9450e73b..7aa6d67dd30 100644
--- a/code/modules/reagents/newchem/other.dm
+++ b/code/modules/reagents/newchem/other.dm
@@ -89,6 +89,7 @@ datum/reagent/acetone
result = "oil"
required_reagents = list("fuel" = 1, "carbon" = 1, "hydrogen" = 1)
result_amount = 3
+ mix_message = "An iridescent black chemical forms in the container."
/datum/chemical_reaction/phenol
name = "phenol"
@@ -116,8 +117,8 @@ datum/reagent/colorful_reagent
name = "colorful_reagent"
id = "colorful_reagent"
result = "colorful_reagent"
- required_reagents = list("plasma" = 1, "radium" = 1, "space_drugs" = 1, "cryoxadone" = 1, "triple_citrus" = 1)
- result_amount = 5
+ required_reagents = list("plasma" = 1, "radium" = 1, "space_drugs" = 1, "cryoxadone" = 1, "triple_citrus" = 1, "stabilizing_agent" = 1)
+ result_amount = 6
datum/reagent/colorful_reagent/reaction_obj(var/obj/O, var/volume)
if(O)
diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm
index 20f9036870a..44ec0f05271 100644
--- a/code/modules/reagents/newchem/pyro.dm
+++ b/code/modules/reagents/newchem/pyro.dm
@@ -448,7 +448,17 @@ datum/reagent/cryostylane
result_amount = 3
datum/reagent/cryostylane/on_mob_life(var/mob/living/M as mob) //TODO: code freezing into an ice cube
- M.bodytemperature -= 30
+ if(M.reagents.has_reagent("oxygen"))
+ M.reagents.remove_reagent("oxygen", 1)
+ M.bodytemperature -= 30
+ ..()
+ return
+
+datum/reagent/cryostylane/on_tick()
+ if(holder.has_reagent("oxygen"))
+ holder.remove_reagent("oxygen", 1)
+ holder.chem_temp -= 10
+ holder.handle_reactions()
..()
return
@@ -470,10 +480,6 @@ datum/reagent/pyrosium
required_reagents = list("plasma" = 1, "radium" = 1, "phosphorus" = 1)
result_amount = 3
-/datum/chemical_reaction/pyrosium/on_reaction(var/datum/reagents/holder, var/created_volume)
- holder.chem_temp = 20 // also cools the fuck down
- return
-
datum/reagent/pyrosium/on_mob_life(var/mob/living/M as mob)
if(M.reagents.has_reagent("oxygen"))
M.reagents.remove_reagent("oxygen", 1)
diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm
index 4f22123c78b..7eb33842213 100644
--- a/code/modules/reagents/newchem/toxins.dm
+++ b/code/modules/reagents/newchem/toxins.dm
@@ -69,7 +69,7 @@ datum/reagent/formaldehyde/on_mob_life(var/mob/living/M as mob)
/datum/chemical_reaction/formaldehyde
name = "formaldehyde"
- id = "Formaldehyde"
+ id = "formaldehyde"
result = "formaldehyde"
required_reagents = list("ethanol" = 1, "oxygen" = 1, "silver" = 1)
result_amount = 3
@@ -110,11 +110,21 @@ datum/reagent/neurotoxin2
metabolization_rate = 1
datum/reagent/neurotoxin2/on_mob_life(var/mob/living/M as mob)
- if(M.brainloss < 60)
- M.adjustBrainLoss(1*REM)
- M.adjustToxLoss(1*REM)
- if(current_cycle >= 17)
- M.Paralyse(10)
+ if(current_cycle <= 4)
+ M.reagents.add_reagent("neurotoxin2", 1.0)
+ if(current_cycle >= 5)
+ if(prob(5))
+ M.emote("drool")
+ if(M.brainloss < 60)
+ M.adjustBrainLoss(1*REM)
+ M.adjustToxLoss(1*REM)
+ if(current_cycle >= 9)
+ M.drowsyness = max(M.drowsyness, 10)
+ if(current_cycle >= 13)
+ M.Paralyse(8)
+ switch(current_cycle)
+ if(5 to 45)
+ M.confused = max(M.confused, 15)
..()
return
@@ -136,11 +146,14 @@ datum/reagent/cyanide
datum/reagent/cyanide/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
+ if(prob(5))
+ M.emote("drool")
M.adjustToxLoss(1.5*REM)
if(prob(10))
+ M << "You cannot breathe!"
M.losebreath += 1
if(prob(8))
- M << "You feel horrendously weak!"
+ M << "You feel horrendously weak!"
M.Stun(2)
M.adjustToxLoss(2*REM)
..()
@@ -155,19 +168,6 @@ datum/reagent/cyanide/on_mob_life(var/mob/living/M as mob)
required_temp = 380
mix_message = "The mixture gives off a faint scent of almonds."
-/datum/reagent/questionmark // food poisoning
- name = "????"
- id = "????"
- description = "????"
- reagent_state = LIQUID
- color = "#CF3600"
- metabolization_rate = 0.2
-
-datum/reagent/questionmark/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.adjustToxLoss(1*REM)
- ..()
- return
datum/reagent/itching_powder
name = "Itching Powder"
@@ -216,9 +216,9 @@ datum/reagent/facid/on_mob_life(var/mob/living/M as mob)
datum/reagent/facid
name = "Fluorosulfuric Acid"
id = "facid"
- description = ""
+ description = "Fluorosulfuric acid is a an extremely corrosive super-acid."
reagent_state = LIQUID
- color = "#CF3600"
+ color = "#4141D2"
datum/reagent/facid/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
if(!istype(M, /mob/living))
@@ -296,6 +296,7 @@ datum/reagent/facid/reaction_obj(var/obj/O, var/volume)
required_reagents = list("sacid" = 1, "fluorine" = 1, "hydrogen" = 1, "potassium" = 1)
result_amount = 4
required_temp = 380
+ mix_message = "The mixture deepens to a dark blue, and slowly begins to corrode its container."
datum/reagent/initropidril
name = "Initropidril"
@@ -313,19 +314,18 @@ datum/reagent/initropidril/on_mob_life(var/mob/living/M as mob)
var/picked_option = rand(1,3)
switch(picked_option)
if(1)
- M.Stun(3)
- M.Weaken(3)
+ M << "You feel horrendously weak!"
+ M.Stun(2)
+ M.losebreath += 1
if(2)
- M.losebreath += 10
- M.adjustOxyLoss(rand(5,25))
+ M << "You cannot breathe!"
+ M.losebreath += 5
+ M.adjustOxyLoss(10)
if(3)
var/mob/living/carbon/human/H = M
if(!H.heart_attack)
- H.visible_message("[H] clutches at their chest as if their heart stopped!")
+ H.visible_message("[H] clutches at their chest !")
H.heart_attack = 1 // rip in pepperoni
- else
- H.losebreath += 10
- H.adjustOxyLoss(rand(5,25))
..()
return
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index dd0a00714b8..14cb6da5570 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -1380,7 +1380,7 @@
New()
..()
- reagents.add_reagent("toxin", 1)
+ reagents.add_reagent("????", 1)
reagents.add_reagent("carbon", 3)
bitesize = 2