cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +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

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

@@ -64,20 +64,18 @@
var/flashfail = 0
if(iscarbon(M))
var/safety = M:eyecheck()
if(safety <= 0)
var/flash_strength = 10
if(ishuman(M) && ishuman(user) && M.stat!=DEAD)
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
if(M.stat!=DEAD)
var/safety = M:eyecheck()
if(safety <= 0)
var/flash_strength = 10
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
else if(issilicon(M))
M.Weaken(rand(5,10))