APC & Machinery Refactor + Local Powernets (#19991)

* local powernet and machine power refactor

* some fixes

* more tweaks + powerchange() refactor

* fixes var edited apcs on meatpackers.dmm

* fixes issue with power channels

* Reviews

* delta fix

* Update code/game/machinery/portable_turret.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* removed area power change proc

* damn morgues

* requested changes

* request changes

* deconfliction

* mapping fixes

* some fixes from TM

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
Ryan
2023-01-30 22:28:10 +00:00
committed by GitHub
co-authored by Henri215
parent caee0ec975
commit 7c3cd86f14
190 changed files with 2613 additions and 2556 deletions
@@ -4,8 +4,7 @@
anchored = TRUE
icon = 'icons/obj/chemical.dmi'
icon_state = "dispenser"
use_power = IDLE_POWER_USE
idle_power_usage = 40
idle_power_consumption = 40
resistance_flags = FIRE_PROOF | ACID_PROOF
var/ui_title = "Chem Dispenser 5000"
var/cell_type = /obj/item/stock_parts/cell/high
@@ -123,17 +122,11 @@
return
recharge_counter++
/obj/machinery/chem_dispenser/power_change()
if(powered())
stat &= ~NOPOWER
else
stat |= NOPOWER
/obj/machinery/chem_dispenser/update_icon_state()
if(panel_open)
icon_state = "[initial(icon_state)]-o"
return
if(!powered() && !is_drink)
if(!has_power() && !is_drink)
icon_state = "dispenser_nopower"
return
icon_state = "[initial(icon_state)][beaker ? "_working" : ""]"
@@ -4,9 +4,9 @@
anchored = TRUE
icon = 'icons/obj/chemical.dmi'
icon_state = "mixer0b"
use_power = IDLE_POWER_USE
idle_power_usage = 40
idle_power_consumption = 40
resistance_flags = FIRE_PROOF|ACID_PROOF
var/obj/item/reagent_containers/beaker = null
var/desired_temp = T0C
var/on = FALSE
@@ -55,7 +55,7 @@
SStgui.update_uis(src)
/obj/machinery/chem_heater/power_change()
if(powered())
if(has_power())
stat &= ~NOPOWER
else
stat |= NOPOWER
@@ -10,9 +10,9 @@
anchored = TRUE
icon = 'icons/obj/chemical.dmi'
icon_state = "mixer0"
use_power = IDLE_POWER_USE
idle_power_usage = 20
idle_power_consumption = 20
resistance_flags = FIRE_PROOF | ACID_PROOF
var/obj/item/reagent_containers/beaker = null
var/obj/item/storage/pill_bottle/loaded_pill_bottle = null
var/mode = 0
@@ -22,7 +22,6 @@
var/patchamount = 10
var/bottlesprite = 1
var/pillsprite = 1
var/client/has_sprites = list()
var/printing = FALSE
var/static/list/pill_bottle_wrappers
var/static/list/bottle_styles
@@ -67,11 +66,11 @@
loaded_pill_bottle = null
/obj/machinery/chem_master/update_icon_state()
icon_state = "mixer[beaker ? "1" : "0"][powered() ? "" : "_nopower"]"
icon_state = "mixer[beaker ? "1" : "0"][has_power() ? "" : "_nopower"]"
/obj/machinery/chem_master/update_overlays()
. = ..()
if(powered())
if(has_power())
. += "waitlight"
/obj/machinery/chem_master/blob_act(obj/structure/blob/B)
@@ -79,10 +78,8 @@
qdel(src)
/obj/machinery/chem_master/power_change()
if(powered())
stat &= ~NOPOWER
else
stat |= NOPOWER
if(!..())
return
update_icon()
/obj/machinery/chem_master/attackby(obj/item/I, mob/user, params)
@@ -6,8 +6,7 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "pandemic0"
circuit = /obj/item/circuitboard/pandemic
use_power = IDLE_POWER_USE
idle_power_usage = 20
idle_power_consumption = 20
resistance_flags = ACID_PROOF
var/temp_html = ""
var/printing = null
@@ -57,7 +56,7 @@
if(stat & BROKEN)
icon_state = (beaker ? "pandemic1_b" : "pandemic0_b")
return
icon_state = "pandemic[(beaker)?"1":"0"][(powered()) ? "" : "_nopower"]"
icon_state = "pandemic[(beaker)?"1":"0"][(has_power()) ? "" : "_nopower"]"
/obj/machinery/computer/pandemic/update_overlays()
. = list()
@@ -4,9 +4,8 @@
icon_state = "juicer1"
layer = 2.9
anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 5
active_power_usage = 100
idle_power_consumption = 5
active_power_consumption = 100
pass_flags = PASSTABLE
resistance_flags = ACID_PROOF
var/operating = FALSE