Always call update_use_power() instead of directly setting the use_power var.

- This will let us react to the change appropriately.
- While we're here, lets define some constants so we can stop using bare numbers.
- Always use those constants when calling update_use_power()
This commit is contained in:
Leshana
2020-03-21 16:40:22 -04:00
parent efeaf058ff
commit c2d16acdca
52 changed files with 124 additions and 119 deletions
@@ -99,7 +99,7 @@
if(..())
return 1
if(href_list["toggleStatus"])
use_power = !use_power
update_use_power(!use_power)
update_icon()
if(href_list["temp"])
var/amount = text2num(href_list["temp"])
@@ -119,7 +119,7 @@
if(..())
return 1
if(href_list["toggleStatus"])
use_power = !use_power
update_use_power(!use_power)
update_icon()
if(href_list["temp"])
var/amount = text2num(href_list["temp"])
@@ -132,10 +132,10 @@
return 0
if(signal.data["power"])
use_power = text2num(signal.data["power"])
update_use_power(text2num(signal.data["power"]))
if(signal.data["power_toggle"])
use_power = !use_power
update_use_power(!use_power)
if(signal.data["inject"])
spawn inject()
@@ -160,7 +160,7 @@
/obj/machinery/atmospherics/unary/outlet_injector/attack_hand(mob/user as mob)
to_chat(user, "<span class='notice'>You toggle \the [src].</span>")
injecting = !injecting
use_power = injecting
update_use_power(injecting ? USE_POWER_IDLE : USE_POWER_OFF)
update_icon()
/obj/machinery/atmospherics/unary/outlet_injector/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
@@ -173,7 +173,7 @@
return 1
if (!node)
use_power = 0
update_use_power(USE_POWER_OFF)
if(!can_pump())
return 0
@@ -295,10 +295,10 @@
pump_direction = 1
if(signal.data["power"] != null)
use_power = text2num(signal.data["power"])
update_use_power(text2num(signal.data["power"]))
if(signal.data["power_toggle"] != null)
use_power = !use_power
update_use_power(!use_power)
if(signal.data["checks"] != null)
if (signal.data["checks"] == "default")
@@ -135,7 +135,7 @@
return 1
if (!node)
use_power = 0
update_use_power(USE_POWER_OFF)
//broadcast_status()
if(!use_power || (stat & (NOPOWER|BROKEN)))
return 0
@@ -180,21 +180,21 @@
return 0
if(signal.data["power"] != null)
use_power = text2num(signal.data["power"])
update_use_power(text2num(signal.data["power"]))
if(signal.data["power_toggle"] != null)
use_power = !use_power
update_use_power(!use_power)
if(signal.data["panic_siphon"]) //must be before if("scrubbing" thing
panic = text2num(signal.data["panic_siphon"])
if(panic)
use_power = 1
update_use_power(USE_POWER_IDLE)
scrubbing = 0
else
scrubbing = 1
if(signal.data["toggle_panic_siphon"] != null)
panic = !panic
if(panic)
use_power = 1
update_use_power(USE_POWER_IDLE)
scrubbing = 0
else
scrubbing = 1