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

Mass-replacement of stat to machine_stat (#48758)

Browse Source 
Living and machine stat vars are pretty different, one uses flags and other number-defines.
This should make some other mass-replacements and searches a bit easier.
This commit is contained in:
Rohesie
2020-01-24 12:37:17 +13:00
committed by oranges
parent b961d49f5b
commit 7bef84f009
131 changed files with 422 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/server.dm
+6 -6
View File
@@ -39,7 +39,7 @@
heat_gen /= max(1, tot_rating)
/obj/machinery/rnd/server/update_icon_state()
if(stat & EMPED || stat & NOPOWER)
if(machine_stat & EMPED || machine_stat & NOPOWER)
icon_state = "RD-server-off"
else if(research_disabled)
icon_state = "RD-server-halt"
@@ -52,7 +52,7 @@
return
/obj/machinery/rnd/server/proc/refresh_working()
if(stat & EMPED || research_disabled || stat & NOPOWER)
if(machine_stat & EMPED || research_disabled || machine_stat & NOPOWER)
working = FALSE
else
working = TRUE
@@ -62,12 +62,12 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
stat |= EMPED
machine_stat |= EMPED
addtimer(CALLBACK(src, .proc/unemp), 600)
refresh_working()
/obj/machinery/rnd/server/proc/unemp()
stat &= ~EMPED
machine_stat &= ~EMPED
refresh_working()
/obj/machinery/rnd/server/proc/toggle_disable()
@@ -87,7 +87,7 @@
return 0
/obj/machinery/rnd/server/proc/produce_heat(heat_amt)
if(!(stat & (NOPOWER|BROKEN))) //Blatently stolen from space heater.
if(!(machine_stat & (NOPOWER|BROKEN))) //Blatently stolen from space heater.
var/turf/L = loc
if(istype(L))
var/datum/gas_mixture/env = L.return_air()
@@ -165,7 +165,7 @@
dat += "<b>Connected Servers:</b>"
dat += "<table><tr><td style='width:25%'><b>Server</b></td><td style='width:25%'><b>Operating Temp</b></td><td style='width:25%'><b>Status</b></td>"
for(var/obj/machinery/rnd/server/S in GLOB.machines)
dat += "<tr><td style='width:25%'>[S.name]</td><td style='width:25%'>[S.current_temp]</td><td style='width:25%'>[S.stat & EMPED || stat & NOPOWER?"Offline":"<A href='?src=[REF(src)];toggle=[REF(S)]'>([S.research_disabled? "<font color=red>Disabled" : "<font color=lightgreen>Online"]</font>)</A>"]</td><BR>"
dat += "<tr><td style='width:25%'>[S.name]</td><td style='width:25%'>[S.current_temp]</td><td style='width:25%'>[S.machine_stat & EMPED || machine_stat & NOPOWER?"Offline":"<A href='?src=[REF(src)];toggle=[REF(S)]'>([S.research_disabled? "<font color=red>Disabled" : "<font color=lightgreen>Online"]</font>)</A>"]</td><BR>"
dat += "</table></br>"
dat += "<b>Research Log</b></br>"