cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Flash burns out AFTER flashing

Browse Source
This commit is contained in:
Robustin
2017-11-30 18:15:46 -05:00
committed by GitHub
parent 4521c4b5ee
commit 7521dc67ee
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/flash.dm
+2 -7
View File
@@ -70,15 +70,12 @@
return 1
/obj/item/device/assembly/flash/proc/try_use_flash(mob/user = null)
flash_recharge(10)
if(crit_fail)
return 0
playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
update_icon(1)
times_used++
flash_recharge(10)
update_icon(1)
if(user && !clown_check(user))
return 0
@@ -106,11 +103,9 @@
/obj/item/device/assembly/flash/attack(mob/living/M, mob/user)
if(!try_use_flash(user))
return 0
if(iscarbon(M))
flash_carbon(M, user, 5, 1)
return 1
else if(issilicon(M))
var/mob/living/silicon/robot/R = M
add_logs(user, R, "flashed", src)