cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 07:33:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/devices/flash.dm
+2 -1
View File
@@ -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
code/game/objects/devices/flashlight.dm
+6 -5
View File
@@ -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 ..()