From e3ba907c58fca28e2c8076b1d8a265d2ad9bf2a3 Mon Sep 17 00:00:00 2001 From: phil235 Date: Wed, 17 Feb 2016 21:20:39 +0100 Subject: [PATCH] Fixes certain reagent making you sleep/be stunned/blind for just a split second every time life() is called. --- .../chemistry/reagents/alcohol_reagents.dm | 2 +- .../reagents/chemistry/reagents/drink_reagents.dm | 4 ++-- .../reagents/chemistry/reagents/food_reagents.dm | 8 ++++---- .../chemistry/reagents/medicine_reagents.dm | 2 +- .../reagents/chemistry/reagents/toxin_reagents.dm | 14 +++++++------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index b87b51929c7..58addafb723 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -323,7 +323,7 @@ metabolization_rate = 0.8 /datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/M) - M.Stun(1) + M.Stun(2) ..() return diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index d99f783f316..7a724cb74ef 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -493,9 +493,9 @@ M.slurring += 3 switch(current_cycle) if(51 to 200) - M.AdjustSleeping(1) + M.Sleeping(5) if(201 to INFINITY) - M.AdjustSleeping(1) + M.AdjustSleeping(2) M.adjustToxLoss(2) ..() return diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index f14bf7e2de7..0e6e7378091 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -202,8 +202,8 @@ else if ( mouth_covered ) // Reduced effects if partially protected if(prob(5)) victim.emote("scream") - victim.adjust_blurriness(3) - victim.adjust_blindness(1) + victim.blur_eyes(3) + victim.blind_eyes(2) victim.confused = max(M.confused, 3) victim.damageoverlaytemp = 60 victim.Weaken(3) @@ -216,8 +216,8 @@ else // Oh dear :D if(prob(5)) victim.emote("scream") - victim.adjust_blurriness(5) - victim.adjust_blindness(2) + victim.blur_eyes(5) + victim.blind_eyes(3) victim.confused = max(M.confused, 6) victim.damageoverlaytemp = 75 victim.Weaken(5) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 62a15602716..34152e8405b 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -539,7 +539,7 @@ if(current_cycle >= 12 && current_cycle < 24) M.drowsyness += 1 else if(current_cycle >= 24) - M.AdjustSleeping(1) + M.Sleeping(2) ..() /datum/reagent/medicine/morphine/overdose_process(mob/living/M) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index fa126f4e483..ceea304b44d 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -256,9 +256,9 @@ M.confused += 2 M.drowsyness += 2 if(10 to 50) - M.AdjustSleeping(1) + M.Sleeping(2) if(51 to INFINITY) - M.AdjustSleeping(1) + M.Sleeping(2) M.adjustToxLoss((current_cycle - 50)*REM) ..() return @@ -273,9 +273,9 @@ /datum/reagent/toxin/beer2/on_mob_life(mob/living/M) switch(current_cycle) if(1 to 50) - M.AdjustSleeping(1) + M.Sleeping(2) if(51 to INFINITY) - M.AdjustSleeping(1) + M.Sleeping(2) M.adjustToxLoss((current_cycle - 50)*REM) ..() @@ -412,7 +412,7 @@ M.adjustBrainLoss(1*REM) M.adjustToxLoss(1*REM) if(current_cycle >= 18) - M.AdjustSleeping(1) + M.Sleeping(2) ..() /datum/reagent/toxin/cyanide @@ -529,7 +529,7 @@ /datum/reagent/toxin/sodium_thiopental/on_mob_life(mob/living/M) if(current_cycle >= 10) - M.AdjustSleeping(1) + M.Sleeping(2) M.adjustStaminaLoss(10*REM) ..() @@ -544,7 +544,7 @@ /datum/reagent/toxin/sulfonal/on_mob_life(mob/living/M) if(current_cycle >= 22) - M.AdjustSleeping(1) + M.Sleeping(2) ..() /datum/reagent/toxin/amanitin