- Fixes issue 808. You won't get flashed by anything if you're blinded.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4479 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-08-17 16:30:42 +00:00
parent 3be7d6d8ef
commit bdae39686f
12 changed files with 30 additions and 18 deletions
@@ -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()
@@ -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()
@@ -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
@@ -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
+2 -1
View File
@@ -199,7 +199,8 @@
..()
/mob/living/silicon/ai/ex_act(severity)
flick("flash", flash)
if(!blinded)
flick("flash", flash)
switch(severity)
if(1.0)
+2 -1
View File
@@ -90,7 +90,8 @@
src << "<font color=green>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.</font>"
/mob/living/silicon/pai/ex_act(severity)
flick("flash", src.flash)
if(!blinded)
flick("flash", src.flash)
switch(severity)
if(1.0)
@@ -183,7 +183,8 @@
/mob/living/silicon/robot/ex_act(severity)
flick("flash", flash)
if(!blinded)
flick("flash", flash)
if (stat == 2 && client)
gib()
@@ -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