From d499db2fe46204d8f4a35c2d1c90c76a77f1431b Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 19 Mar 2020 16:58:45 -0400 Subject: [PATCH] Update other_reagents.dm --- .../chemistry/reagents/other_reagents.dm | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 5038a4b68c..e4deb3f620 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -231,6 +231,7 @@ description = "An ubiquitous chemical substance that is composed of hydrogen and oxygen." color = "#AAAAAA77" // rgb: 170, 170, 170, 77 (alpha) taste_description = "water" + overdose_threshold = 150 //Imagine drinking a gallon of water var/cooling_temperature = 2 glass_icon_state = "glass_clear" glass_name = "glass of water" @@ -292,11 +293,22 @@ /datum/reagent/water/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with water can help put them out! if(!istype(M)) return + if(method == INGEST) + M.adjustStaminaLoss(-0.2*REM, 0) if(method == TOUCH) M.adjust_fire_stacks(-(reac_volume / 10)) M.ExtinguishMob() ..() +/datum/reagent/water/overdose_start(mob/living/M) + metabolization_rate = 45 * REAGENTS_METABOLISM + M.adjustBruteLoss(4*REM, 0) //Your cells start to explode + if(iscarbon(M)) + var/mob/living/carbon/C = M + C.applyLiverDamage(2) + ..() + . = 1 + /datum/reagent/water/holywater name = "Holy Water" description = "Water blessed by some deity." @@ -378,6 +390,7 @@ /datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke name = "Unholy Water" + overdose_threshold = 150 //Same as normal water description = "Something that shouldn't exist on this plane of existence." taste_description = "suffering" pH = 6.5 @@ -409,6 +422,15 @@ holder.remove_reagent(type, 1) return TRUE +/datum/reagent/fuel/unholywater/overdose_start(mob/living/M) + metabolization_rate = 60 * REAGENTS_METABOLISM + M.adjustBruteLoss(1*REM, 0) + if(iscarbon(M)) + var/mob/living/carbon/C = M + C.applyLiverDamage(3) + ..() + . = 1 + /datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god name = "Hell Water" description = "YOUR FLESH! IT BURNS!"