Merge pull request #9550 from SamHPurp/well-defined,-some-would-say-chiseled

Updates use_power to use the Defines
This commit is contained in:
variableundefined
2018-09-27 21:47:04 +08:00
committed by GitHub
105 changed files with 202 additions and 227 deletions
@@ -2,7 +2,7 @@
/obj/machinery/ntnet_relay
name = "NTNet Quantum Relay"
desc = "A very complex router and transmitter capable of connecting electronic devices together. Looks fragile."
use_power = 2
use_power = ACTIVE_POWER_USE
active_power_usage = 10000 //10kW, apropriate for machine that keeps massive cross-Zlevel wireless network operational. Used to be 20 but that actually drained the smes one round
idle_power_usage = 100
icon = 'icons/obj/stationobjs.dmi'
@@ -38,9 +38,9 @@
/obj/machinery/ntnet_relay/process()
if(operable())
use_power = 2
use_power = ACTIVE_POWER_USE
else
use_power = 1
use_power = IDLE_POWER_USE
update_icon()
@@ -7,7 +7,7 @@ var/list/global_modular_computers = list()
name = "modular computer"
desc = "An advanced computer."
use_power = 1
use_power = IDLE_POWER_USE
idle_power_usage = 5
var/hardware_flag = 0 // A flag that describes this device type
var/last_power_usage = 0 // Power usage during last tick