From bb1480a369f33a8dc2fbe75913211766315c92d5 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 10 Mar 2020 17:16:33 -0700 Subject: [PATCH 1/5] Update carbon.dm --- code/modules/mob/living/carbon/carbon.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index d7fce8a437..dfd409ef8f 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -813,7 +813,8 @@ return if(IsUnconscious() || IsSleeping() || getOxyLoss() > 50 || (HAS_TRAIT(src, TRAIT_DEATHCOMA)) || (health <= HEALTH_THRESHOLD_FULLCRIT && !HAS_TRAIT(src, TRAIT_NOHARDCRIT))) stat = UNCONSCIOUS - blind_eyes(1) + if(!eye_blind) + blind_eyes(1) if(combatmode) toggle_combat_mode(TRUE, TRUE) else From 09d39b8cbd72f47d6a98e3706066d0d4bf2c001d Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 10 Mar 2020 17:17:37 -0700 Subject: [PATCH 2/5] Update robot.dm --- code/modules/mob/living/silicon/robot/robot.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index d4f520a611..eca997beae 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -968,7 +968,8 @@ if(IsUnconscious() || IsStun() || IsParalyzed() || getOxyLoss() > maxHealth*0.5) if(stat == CONSCIOUS) stat = UNCONSCIOUS - blind_eyes(1) + if(!eye_blind) + blind_eyes(1) update_mobility() update_headlamp() else @@ -1236,4 +1237,4 @@ if(usr.stat == DEAD) return //won't work if dead - ai_roster() \ No newline at end of file + ai_roster() From c4f59b0b83244845c25504e01011b8befab9969a Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 10 Mar 2020 17:18:01 -0700 Subject: [PATCH 3/5] Update life.dm --- code/modules/mob/living/carbon/alien/larva/life.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index 81b76c1720..4d362ca554 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -21,7 +21,8 @@ if(IsUnconscious() || IsSleeping() || getOxyLoss() > 50 || (HAS_TRAIT(src, TRAIT_DEATHCOMA)) || health <= crit_threshold) if(stat == CONSCIOUS) stat = UNCONSCIOUS - blind_eyes(1) + if(!eye_blind) + blind_eyes(1) update_mobility() else if(stat == UNCONSCIOUS) From fef4c82464987ef24d7519006877cb914ee9b9fa Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 10 Mar 2020 17:18:53 -0700 Subject: [PATCH 4/5] Update living.dm --- code/modules/mob/living/living.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 0c69c5c744..a46d546baa 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -490,7 +490,8 @@ GLOB.alive_mob_list += src suiciding = 0 stat = UNCONSCIOUS //the mob starts unconscious, - blind_eyes(1) + if(!blind_eyes) + blind_eyes(1) updatehealth() //then we check if the mob should wake up. update_mobility() update_sight() From d5ab355fe5da32020a635cc433492a4a69160150 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 10 Mar 2020 19:39:11 -0700 Subject: [PATCH 5/5] Update living.dm --- code/modules/mob/living/living.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index a46d546baa..3544f1b82f 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -490,7 +490,7 @@ GLOB.alive_mob_list += src suiciding = 0 stat = UNCONSCIOUS //the mob starts unconscious, - if(!blind_eyes) + if(!eye_blind) blind_eyes(1) updatehealth() //then we check if the mob should wake up. update_mobility()