Merge pull request #15236 from silicons/decon

fixes computer boards disappearing on decon
This commit is contained in:
Lin
2021-10-05 12:14:00 -07:00
committed by GitHub
2 changed files with 4 additions and 4 deletions
+3 -4
View File
@@ -17,12 +17,8 @@
/obj/machinery/computer/Initialize(mapload, obj/item/circuitboard/C)
. = ..()
power_change()
/obj/machinery/computer/Destroy()
. = ..()
/obj/machinery/computer/process()
if(stat & (NOPOWER|BROKEN))
return FALSE
@@ -119,6 +115,9 @@
A.circuit = circuit
// Circuit removal code is handled in /obj/machinery/Exited()
circuit.forceMove(A)
// no it's not 4head the circuit's in nullspace which means this won't be called!!
circuit = null
component_parts -= circuit
A.set_anchored(TRUE)
if(stat & BROKEN)
if(user)
@@ -151,6 +151,7 @@
new_computer.RefreshParts()
new_computer.on_construction()
new_computer.circuit.moveToNullspace()
qdel(src)
return