shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6161 from Citadel-Station-13/upstream-merge-36714

Browse Source 
[MIRROR] Fixes strobe shields' icon getting stuck
This commit is contained in:
LetterJay
2018-03-31 06:19:55 -05:00
committed by GitHub
parent 7ce6bc2a62 3263520e39
commit 48bfd57b0f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/flash.dm
+4 -4
View File
@@ -266,22 +266,22 @@
return
crit_fail = FALSE
times_used = 0
playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
update_icon()
flash.crit_fail = TRUE
flash.update_icon()
return
..()
/obj/item/device/assembly/flash/shield/update_icon(flash = 0)
item_state = "flashshield"
/obj/item/device/assembly/flash/shield/update_icon(flash = FALSE)
icon_state = "flashshield"
item_state = "flashshield"
if(crit_fail)
icon_state = "riot"
item_state = "riot"
else if(flash)
item_state = "flashshield_flash"
icon_state = "flashshield_flash"
item_state = "flashshield_flash"
addtimer(CALLBACK(src, .proc/update_icon), 5)