cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Species flash cleanup.

Browse Source
This commit is contained in:
Zuhayr
2015-09-06 10:09:03 +09:30
parent 6dc3b22432
commit 2b2e27d380
2 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/machinery/flasher.dm
View File

@@ -67,17 +67,11 @@
if (get_dist(src, O) > src.range)
continue
var/flash_time = strength
if (istype(O, /mob/living/carbon/human))
var/mob/living/carbon/human/H = O
if(!H.eyecheck() <= 0)
continue
if (istype(O, /mob/living/carbon/alien))//So aliens don't get flashed (they have no external eyes)/N
continue
var/flash_time = strength
if (istype(O, /mob/living/carbon/human))
var/mob/living/carbon/human/H = O
flash_time *= H.species.flash_mod
var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
if(!E)

6
code/game/objects/items/devices/flash.dm
View File

@@ -64,18 +64,16 @@
var/flashfail = 0
if(iscarbon(M))
if(M.stat!=DEAD)
var/safety = M:eyecheck()
if(safety <= 0)
var/flash_strength = 10
if(ishuman(M) && ishuman(user) && M.stat!=DEAD)
if(ishuman(M))
var/mob/living/carbon/human/H = M
flash_strength *= H.species.flash_mod
if(flash_strength > 0)
M.Weaken(flash_strength)
flick("e_flash", M.flash)
else
flashfail = 1