diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 8134c58e275..eb4eb6d3bfe 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -82,8 +82,9 @@ flick("e_flash", O:flash) O.eye_stat += rand(1, 2) else - flick("flash", O:flash) - O.eye_stat += rand(0, 2) + if(!O.blinded) + flick("flash", O:flash) + O.eye_stat += rand(0, 2) /obj/machinery/flasher/portable/HasProximity(atom/movable/AM as mob|obj) diff --git a/code/game/objects/devices/flash.dm b/code/game/objects/devices/flash.dm index ba094fbecd2..60eb8ff74da 100644 --- a/code/game/objects/devices/flash.dm +++ b/code/game/objects/devices/flash.dm @@ -166,7 +166,8 @@ S.icon_state = "shield0" var/safety = M:eyecheck() if(!safety) - flick("flash", M.flash) + if(!M.blinded) + flick("flash", M.flash) return diff --git a/code/game/objects/devices/flashlight.dm b/code/game/objects/devices/flashlight.dm index a3d80c5e0f7..c42462c4558 100644 --- a/code/game/objects/devices/flashlight.dm +++ b/code/game/objects/devices/flashlight.dm @@ -70,14 +70,15 @@ if(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey))//robots and aliens are unaffected if(M.stat == DEAD || M.sdisabilities & BLIND)//mob is dead or fully blind if(M!=user) - user.show_message(text("\red [] pupils does not react to the light!", M),1) + user.show_message("\red [M] pupils does not react to the light!",1) else if(XRAY in M.mutations)//mob has X-RAY vision if(M!=user) - user.show_message(text("\red [] pupils give an eerie glow!", M),1) + user.show_message("\red [M] pupils give an eerie glow!",1) else //nothing wrong - flick("flash", M.flash)//flash the affected mob - if(M!=user) - user.show_message(text("\blue [] pupils narrow", M),1) + if(!M.blinded) + flick("flash", M.flash)//flash the affected mob + if(M!=user) + user.show_message("\blue [M] pupils narrow",1) else return ..() diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index f3a7a1ccedb..da379ee047d 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -72,7 +72,8 @@ ..() /mob/living/carbon/alien/humanoid/ex_act(severity) - flick("flash", flash) + if(!blinded) + flick("flash", flash) if (stat == 2 && client) gib() diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index d58d76e5062..09652719618 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -65,7 +65,8 @@ /mob/living/carbon/alien/larva/ex_act(severity) - flick("flash", flash) + if(!blinded) + flick("flash", flash) if (stat == 2 && client) gib() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 51a8749293c..832a8c19d4c 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -164,7 +164,8 @@ stat("Energy Charge", round(wear_suit:cell:charge/100)) /mob/living/carbon/human/ex_act(severity) - flick("flash", flash) + if(!blinded) + flick("flash", flash) // /obj/item/clothing/suit/bomb_suit(src) // /obj/item/clothing/head/bomb_hood(src) @@ -247,7 +248,7 @@ /mob/living/carbon/human/meteorhit(O as obj) for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) - M.show_message(text("\red [] has been hit by []", src, O), 1) + M.show_message("\red [src] has been hit by [O]", 1) if (health > 0) var/datum/organ/external/affecting = get_organ(pick("chest", "chest", "chest", "head")) if(!affecting) return diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index fe4ac78eea7..53e681497ba 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -466,7 +466,8 @@ ..() /mob/living/carbon/monkey/ex_act(severity) - flick("flash", flash) + if(!blinded) + flick("flash", flash) if (stat == 2 && client) gib() return diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index a63079e7568..d77c8d4fac3 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -199,7 +199,8 @@ ..() /mob/living/silicon/ai/ex_act(severity) - flick("flash", flash) + if(!blinded) + flick("flash", flash) switch(severity) if(1.0) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 324464e7e9d..c864d24a29a 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -90,7 +90,8 @@ src << "You feel an electric surge run through your circuitry and become acutely aware at how lucky you are that you can still feel at all." /mob/living/silicon/pai/ex_act(severity) - flick("flash", src.flash) + if(!blinded) + flick("flash", src.flash) switch(severity) if(1.0) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index a8117c86869..17e878d36c5 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -183,7 +183,8 @@ /mob/living/silicon/robot/ex_act(severity) - flick("flash", flash) + if(!blinded) + flick("flash", flash) if (stat == 2 && client) gib() diff --git a/code/modules/mob/living/simple_animal/life.dm b/code/modules/mob/living/simple_animal/life.dm index bd0b8e9aeda..5086a760ffd 100644 --- a/code/modules/mob/living/simple_animal/life.dm +++ b/code/modules/mob/living/simple_animal/life.dm @@ -373,7 +373,8 @@ return /mob/living/simple_animal/ex_act(severity) - flick("flash", flash) + if(!blinded) + flick("flash", flash) switch (severity) if (1.0) health -= 500 diff --git a/code/unused/hivebot/hivebot.dm b/code/unused/hivebot/hivebot.dm index d0b9c9f0ba9..9ef3ca53b55 100644 --- a/code/unused/hivebot/hivebot.dm +++ b/code/unused/hivebot/hivebot.dm @@ -58,7 +58,8 @@ return 0 /mob/living/silicon/hivebot/ex_act(severity) - flick("flash", src.flash) + if(!blinded) + flick("flash", src.flash) if (src.stat == 2 && src.client) src.gib(1)