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

Merge pull request #11391 from Ghommie/Ghommie-cit612

Browse Source 
Porting "Further update_icon splitup"
This commit is contained in:
kevinz000
2020-03-10 05:58:17 -07:00
committed by GitHub
parent 40e470cba2 59b1a223a3
commit e210f7d535
157 changed files with 698 additions and 827 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+4 -4
View File
@@ -144,14 +144,14 @@
..()
icon_state = "[(nopower_state && !powered()) ? nopower_state : initial(icon_state)]"
/obj/machinery/chem_dispenser/update_icon()
cut_overlays()
/obj/machinery/chem_dispenser/update_overlays()
. = ..()
if(has_panel_overlay && panel_open)
add_overlay(mutable_appearance(icon, "[initial(icon_state)]_panel-o"))
. += mutable_appearance(icon, "[initial(icon_state)]_panel-o")
if(beaker)
beaker_overlay = display_beaker()
add_overlay(beaker_overlay)
. += beaker_overlay
/obj/machinery/chem_dispenser/emag_act(mob/user)
. = ..()
code/modules/reagents/chemistry/machinery/chem_heater.dm
+1 -1
View File
@@ -22,7 +22,7 @@
beaker = null
update_icon()
/obj/machinery/chem_heater/update_icon()
/obj/machinery/chem_heater/update_icon_state()
if(beaker)
icon_state = "mixer1b"
else
code/modules/reagents/chemistry/machinery/chem_master.dm
+6 -4
View File
@@ -67,15 +67,17 @@
bottle = null
update_icon()
/obj/machinery/chem_master/update_icon()
cut_overlays()
if (stat & BROKEN)
add_overlay("waitlight")
/obj/machinery/chem_master/update_icon_state()
if(beaker)
icon_state = "mixer1"
else
icon_state = "mixer0"
/obj/machinery/chem_master/update_overlays()
. = ..()
if (stat & BROKEN)
. += "waitlight"
/obj/machinery/chem_master/blob_act(obj/structure/blob/B)
if (prob(50))
qdel(src)
code/modules/reagents/chemistry/machinery/pandemic.dm
+7 -7
View File
@@ -109,16 +109,16 @@
update_icon()
playsound(loc, 'sound/machines/ping.ogg', 30, 1)
/obj/machinery/computer/pandemic/update_icon()
/obj/machinery/computer/pandemic/update_icon_state()
if(stat & BROKEN)
icon_state = (beaker ? "mixer1_b" : "mixer0_b")
return
icon_state = "mixer[(beaker) ? "1" : "0"][powered() ? "" : "_nopower"]"
if(wait)
add_overlay("waitlight")
else
cut_overlays()
icon_state = "mixer[(beaker) ? "1" : "0"][powered() ? "" : "_nopower"]"
/obj/machinery/computer/pandemic/update_overlays()
. = ..()
if(!(stat & BROKEN) && wait)
. += "waitlight"
/obj/machinery/computer/pandemic/ui_interact(mob/user, ui_key = "main", datum/tgui/ui, force_open = FALSE, datum/tgui/master_ui, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+1 -1
View File
@@ -66,7 +66,7 @@
AM.forceMove(drop_location())
holdingitems = list()
/obj/machinery/reagentgrinder/update_icon()
/obj/machinery/reagentgrinder/update_icon_state()
if(beaker)
icon_state = "juicer1"
else
code/modules/reagents/chemistry/machinery/smoke_machine.dm
+1 -2
View File
@@ -34,7 +34,7 @@
for(var/obj/item/stock_parts/matter_bin/B in component_parts)
reagents.maximum_volume += REAGENTS_BASE_VOLUME * B.rating
/obj/machinery/smoke_machine/update_icon()
/obj/machinery/smoke_machine/update_icon_state()
if((!is_operational()) || (!on) || (reagents.total_volume == 0))
if (panel_open)
icon_state = "smoke0-o"
@@ -42,7 +42,6 @@
icon_state = "smoke0"
else
icon_state = "smoke1"
return ..()
/obj/machinery/smoke_machine/RefreshParts()
var/new_volume = REAGENTS_BASE_VOLUME