From db297e027f5da14b8c18e9b44e430fbef8414908 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 17 Jul 2016 02:24:14 -0400 Subject: [PATCH] more cleanup --- .../reagents/oldchem/reagents/reagents_flammable.dm | 3 ++- .../reagents/oldchem/reagents/reagents_toxin.dm | 3 ++- .../reagents/oldchem/reagents/reagents_water.dm | 10 +++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/oldchem/reagents/reagents_flammable.dm b/code/modules/reagents/oldchem/reagents/reagents_flammable.dm index 9744b993a3c..f0d48f4afab 100644 --- a/code/modules/reagents/oldchem/reagents/reagents_flammable.dm +++ b/code/modules/reagents/oldchem/reagents/reagents_flammable.dm @@ -18,6 +18,7 @@ id = "unholywater" description = "Something that shouldn't exist on this plane of existance." process_flags = ORGANIC | SYNTHETIC //ethereal means everything processes it. + metabolization_rate = 1 /datum/reagent/fuel/unholywater/on_mob_life(mob/living/M) M.adjustBrainLoss(3) @@ -32,7 +33,7 @@ M.adjustFireLoss(2) M.adjustOxyLoss(2) M.adjustBruteLoss(2) - holder.remove_reagent(src.id, 1) + ..() /datum/reagent/plasma name = "Plasma" diff --git a/code/modules/reagents/oldchem/reagents/reagents_toxin.dm b/code/modules/reagents/oldchem/reagents/reagents_toxin.dm index 792db196912..a11232427ea 100644 --- a/code/modules/reagents/oldchem/reagents/reagents_toxin.dm +++ b/code/modules/reagents/oldchem/reagents/reagents_toxin.dm @@ -288,6 +288,7 @@ id = "hell_water" description = "YOUR FLESH! IT BURNS!" process_flags = ORGANIC | SYNTHETIC //Admin-bus has no brakes! KILL THEM ALL. + metabolization_rate = 1 /datum/reagent/hellwater/on_mob_life(mob/living/M) M.fire_stacks = min(5, M.fire_stacks + 3) @@ -295,7 +296,7 @@ M.adjustToxLoss(1) M.adjustFireLoss(1) //Hence the other damages... ain't I a bastard? M.adjustBrainLoss(5) - holder.remove_reagent(id, 1) + ..() /datum/reagent/carpotoxin diff --git a/code/modules/reagents/oldchem/reagents/reagents_water.dm b/code/modules/reagents/oldchem/reagents/reagents_water.dm index f000c1bd18d..7df0fd3fdba 100644 --- a/code/modules/reagents/oldchem/reagents/reagents_water.dm +++ b/code/modules/reagents/oldchem/reagents/reagents_water.dm @@ -283,17 +283,13 @@ process_flags = ORGANIC | SYNTHETIC /datum/reagent/holywater/on_mob_life(mob/living/M) - if(!data) data = 1 - data++ M.jitteriness = max(M.jitteriness-5,0) - if(data >= 30) // 12 units, 60 seconds @ metabolism 0.4 units & tick rate 2.0 sec - if(!M.stuttering) M.stuttering = 1 + if(current_cycle >= 30) // 12 units, 60 seconds @ metabolism 0.4 units & tick rate 2.0 sec M.stuttering += 4 M.Dizzy(5) if(iscultist(M) && prob(5)) M.say(pick("Av'te Nar'sie","Pa'lid Mors","INO INO ORA ANA","SAT ANA!","Daim'niodeis Arc'iai Le'eones","Egkau'haom'nai en Chaous","Ho Diak'nos tou Ap'iron","R'ge Na'sie","Diabo us Vo'iscum","Si gn'um Co'nu")) - if(data >= 75 && prob(33)) // 30 units, 150 seconds - if(!M.confused) M.confused = 1 + if(current_cycle >= 75 && prob(33)) // 30 units, 150 seconds M.confused += 3 if(isvampirethrall(M)) ticker.mode.remove_vampire_mind(M.mind) @@ -310,7 +306,7 @@ M.confused = 0 return if(ishuman(M) && M.mind && M.mind.vampire && !M.mind.vampire.get_ability(/datum/vampire_passive/full) && prob(80)) - switch(data) + switch(current_cycle) if(1 to 4) to_chat(M, "Something sizzles in your veins!") M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)