Merge pull request #4489 from VOREStation/qdel-hints-gen5

Additional Destroy proc fixes
This commit is contained in:
Anewbe
2018-01-02 20:04:02 -05:00
committed by GitHub
10 changed files with 19 additions and 17 deletions
+1 -1
View File
@@ -12,7 +12,7 @@
sparks.attach(loc)
/obj/item/weapon/antag_spawner/Destroy()
qdel(sparks)
qdel_null(sparks)
return ..()
/obj/item/weapon/antag_spawner/proc/spawn_antag(client/C, turf/T)
@@ -52,6 +52,7 @@
/obj/item/weapon/implant/Destroy()
if(part)
part.implants.Remove(src)
part = null
return ..()
/obj/item/weapon/implant/attackby(obj/item/I, mob/user)
@@ -67,10 +67,10 @@ var/list/global/tank_gauge_cache = list()
return
/obj/item/weapon/tank/Destroy()
qdel(air_contents)
qdel_null(air_contents)
processing_objects.Remove(src)
qdel(src.proxyassembly)
qdel_null(src.proxyassembly)
if(istype(loc, /obj/item/device/transfer_valve))
var/obj/item/device/transfer_valve/TTV = loc
@@ -609,6 +609,10 @@ var/list/global/tank_gauge_cache = list()
/obj/item/device/tankassemblyproxy/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here.
tank.ignite() //boom (or not boom if you made shijwtty mix)
/obj/item/device/tankassemblyproxy/Destroy()
. = ..()
tank = null
assembly = null
/obj/item/weapon/tank/proc/assemble_bomb(W,user) //Bomb assembly proc. This turns assembly+tank into a bomb
var/obj/item/device/assembly_holder/S = W