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

Merge pull request #11259 from Ghommie/Ghommie-cit590

Browse Source 
Porting update_icon improvements.
This commit is contained in:
kevinz000
2020-02-28 04:30:12 -07:00
committed by GitHub
parent 70bf885968 a99e9ec2ff
commit e39d7fa49d
122 changed files with 738 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
View File

@@ -178,23 +178,22 @@
else
return NUKE_OFF_UNLOCKED
/obj/machinery/nuclearbomb/update_icon()
if(deconstruction_state == NUKESTATE_INTACT)
switch(get_nuke_state())
if(NUKE_OFF_LOCKED, NUKE_OFF_UNLOCKED)
icon_state = "nuclearbomb_base"
update_icon_interior()
update_icon_lights()
if(NUKE_ON_TIMING)
cut_overlays()
icon_state = "nuclearbomb_timing"
if(NUKE_ON_EXPLODING)
cut_overlays()
icon_state = "nuclearbomb_exploding"
else
/obj/machinery/nuclearbomb/update_icon_state()
if(deconstruction_state != NUKESTATE_INTACT)
icon_state = "nuclearbomb_base"
update_icon_interior()
update_icon_lights()
return
switch(get_nuke_state())
if(NUKE_OFF_LOCKED, NUKE_OFF_UNLOCKED)
icon_state = "nuclearbomb_base"
if(NUKE_ON_TIMING)
icon_state = "nuclearbomb_timing"
if(NUKE_ON_EXPLODING)
icon_state = "nuclearbomb_exploding"
/obj/machinery/nuclearbomb/update_overlays()
. = ..()
update_icon_interior()
update_icon_lights()
/obj/machinery/nuclearbomb/proc/update_icon_interior()
cut_overlay(interior)