cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2578 from CHOMPStationBot/upstream-merge-11132

Browse Source 
[MIRROR] Fixes #11129
This commit is contained in:
Nadyr
2021-07-18 18:27:40 -04:00
committed by GitHub
parent 15295b1caa 0f48323b68
commit 166ec7db90
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/power/batteryrack.dm
View File

@@ -36,10 +36,10 @@
/obj/machinery/power/smes/batteryrack/proc/add_parts() /obj/machinery/power/smes/batteryrack/proc/add_parts()
component_parts = list() component_parts = list()
component_parts += new /obj/item/weapon/circuitboard/batteryrack component_parts += new /obj/item/weapon/circuitboard/batteryrack
component_parts += new /obj/item/weapon/stock_parts/capacitor/ // Capacitors: Maximal I/O component_parts += new /obj/item/weapon/stock_parts/capacitor // Capacitors: Maximal I/O
component_parts += new /obj/item/weapon/stock_parts/capacitor/ component_parts += new /obj/item/weapon/stock_parts/capacitor
component_parts += new /obj/item/weapon/stock_parts/capacitor/ component_parts += new /obj/item/weapon/stock_parts/capacitor
component_parts += new /obj/item/weapon/stock_parts/matter_bin/ // Matter Bin: Max. amount of cells. component_parts += new /obj/item/weapon/stock_parts/matter_bin // Matter Bin: Max. amount of cells.
/obj/machinery/power/smes/batteryrack/RefreshParts() /obj/machinery/power/smes/batteryrack/RefreshParts()
var/capacitor_efficiency = 0 var/capacitor_efficiency = 0
@@ -61,6 +61,9 @@
internal_cells = null internal_cells = null
return ..() return ..()
/obj/machinery/power/smes/batteryrack/check_terminals()
return TRUE // we don't necessarily need terminals
/obj/machinery/power/smes/batteryrack/update_icon() /obj/machinery/power/smes/batteryrack/update_icon()
cut_overlays() cut_overlays()
icon_update = 0 icon_update = 0

24
code/modules/power/smes.dm
View File

@@ -68,14 +68,8 @@ GLOBAL_LIST_EMPTY(smeses)
/obj/machinery/power/smes/Initialize() /obj/machinery/power/smes/Initialize()
. = ..() . = ..()
GLOB.smeses += src GLOB.smeses += src
for(var/d in GLOB.cardinal) add_nearby_terminals()
var/turf/T = get_step(src, d) if(!check_terminals())
for(var/obj/machinery/power/terminal/term in T)
if(term && term.dir == turn(d, 180) && !term.master)
terminals |= term
term.master = src
term.connect_to_network()
if(!terminals.len)
stat |= BROKEN stat |= BROKEN
return return
update_icon() update_icon()
@@ -91,6 +85,20 @@ GLOBAL_LIST_EMPTY(smeses)
GLOB.smeses -= src GLOB.smeses -= src
return ..() return ..()
/obj/machinery/power/smes/proc/add_nearby_terminals()
for(var/d in GLOB.cardinal)
var/turf/T = get_step(src, d)
for(var/obj/machinery/power/terminal/term in T)
if(term && term.dir == turn(d, 180) && !term.master)
terminals |= term
term.master = src
term.connect_to_network()
/obj/machinery/power/smes/proc/check_terminals()
if(!terminals.len)
return FALSE
return TRUE
/obj/machinery/power/smes/add_avail(var/amount) /obj/machinery/power/smes/add_avail(var/amount)
if(..(amount)) if(..(amount))
powernet.smes_newavail += amount powernet.smes_newavail += amount