From 099c86fc7767100b1e8ae0b6d7e36f62c380e571 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Wed, 18 May 2016 22:56:17 -0400 Subject: [PATCH] Fixes lack of blindness when KO/asleep I missed it! So I fixed it. It could have been done with a bunch of "If you're SUPPOSED to be blind" or "If you're ASLEEP" but honestly this check should be in there anyway. P.sure people with tourettes don't randomly scream things while asleep. --- code/modules/mob/living/carbon/human/life.dm | 46 ++++++++++---------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 36e418418e3..d0739f22329 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -150,6 +150,10 @@ /mob/living/carbon/human/handle_disabilities() ..() + + if(stat != CONSCIOUS) //Let's not worry about tourettes if you're not conscious. + return + //Vision if(species.vision_organ) if(internal_organs_by_name[species.vision_organ]) // Vision organs cut out? Permablind. @@ -165,7 +169,6 @@ blinded = 0 eye_blurry = 0 - if (disabilities & EPILEPSY) if ((prob(1) && paralysis < 1)) src << "\red You have a seizure!" @@ -198,27 +201,26 @@ if (prob(10)) stuttering = max(10, stuttering) - if(stat != 2) - var/rn = rand(0, 200) - if(getBrainLoss() >= 5) - if(0 <= rn && rn <= 3) - custom_pain("Your head feels numb and painful.") - if(getBrainLoss() >= 15) - if(4 <= rn && rn <= 6) if(eye_blurry <= 0) - src << "It becomes hard to see for some reason." - eye_blurry = 10 - if(getBrainLoss() >= 35) - if(7 <= rn && rn <= 9) if(get_active_hand()) - src << "Your hand won't respond properly, you drop what you're holding!" - drop_item() - if(getBrainLoss() >= 45) - if(10 <= rn && rn <= 12) - if(prob(50)) - src << "You suddenly black out!" - Paralyse(10) - else if(!lying) - src << "Your legs won't respond properly, you fall down!" - Weaken(10) + var/rn = rand(0, 200) + if(getBrainLoss() >= 5) + if(0 <= rn && rn <= 3) + custom_pain("Your head feels numb and painful.") + if(getBrainLoss() >= 15) + if(4 <= rn && rn <= 6) if(eye_blurry <= 0) + src << "It becomes hard to see for some reason." + eye_blurry = 10 + if(getBrainLoss() >= 35) + if(7 <= rn && rn <= 9) if(get_active_hand()) + src << "Your hand won't respond properly, you drop what you're holding!" + drop_item() + if(getBrainLoss() >= 45) + if(10 <= rn && rn <= 12) + if(prob(50)) + src << "You suddenly black out!" + Paralyse(10) + else if(!lying) + src << "Your legs won't respond properly, you fall down!" + Weaken(10)