Shuttle garbage collection (#36871)

* Shuttle garbage collection

* istype
This commit is contained in:
kevinz000
2018-04-07 17:51:30 -07:00
committed by CitadelStationBot
parent 4817cb10de
commit e8561ec98c

View File

@@ -32,7 +32,7 @@
// may result.
if(force)
..()
. = QDEL_HINT_HARDDEL_NOW
. = QDEL_HINT_QUEUE
else
return QDEL_HINT_LETMELIVE
@@ -187,6 +187,11 @@
highlight("#f00")
#endif
/obj/docking_port/stationary/Destroy(force)
if(force)
SSshuttle.stationary -= src
. = ..()
/obj/docking_port/stationary/proc/load_roundstart()
if(json_key)
var/sid = SSmapping.config.shuttles[json_key]
@@ -231,6 +236,8 @@
log_world("A transit dock was destroyed while something was docked to it.")
SSshuttle.transit -= src
if(owner)
if(owner.assigned_transit == src)
owner.assigned_transit = null
owner = null
if(assigned_turfs)
dezone()
@@ -238,7 +245,6 @@
assigned_turfs = null
. = ..()
/obj/docking_port/mobile
name = "shuttle"
icon_state = "pinonclose"