mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-16 17:43:35 +01:00
Merge pull request #6160 from Fox-McCloud/gcing
Fixes Operating Table and Operating Computer GCing
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user