Merge pull request #6160 from Fox-McCloud/gcing

Fixes Operating Table and Operating Computer GCing
This commit is contained in:
Crazy Lemon
2017-01-13 14:16:16 -08:00
committed by GitHub
2 changed files with 20 additions and 1 deletions
+9
View File
@@ -23,6 +23,15 @@
computer.table = src
break
/obj/machinery/optable/Destroy()
if(computer)
computer.table = null
computer.victim = null
computer = null
if(victim)
victim = null
return ..()
/obj/machinery/optable/ex_act(severity)
switch(severity)
if(1.0)
+11 -1
View File
@@ -29,6 +29,14 @@
table.computer = src
break
/obj/machinery/computer/operating/Destroy()
if(table)
table.computer = null
table = null
if(victim)
victim = null
return ..()
/obj/machinery/computer/operating/attack_ai(mob/user)
add_fingerprint(user)
if(stat & (BROKEN|NOPOWER))
@@ -94,7 +102,9 @@
/obj/machinery/computer/operating/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
var/data[0]
var/mob/living/carbon/human/occupant = src.table.victim
var/mob/living/carbon/human/occupant
if(table)
occupant = table.victim
data["hasOccupant"] = occupant ? 1 : 0
var/occupantData[0]