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
@@ -53,11 +53,9 @@
processing_objects |= src
/obj/item/device/electronic_assembly/Destroy()
battery = null
battery = null // It will be qdel'd by ..() if still in our contents
processing_objects -= src
for(var/atom/movable/AM in contents)
qdel(AM)
..()
return ..()
/obj/item/device/electronic_assembly/process()
handle_idle_power()
@@ -25,8 +25,8 @@
power_draw_per_use = 50 // The targeting mechanism uses this. The actual gun uses its own cell for firing if it's an energy weapon.
/obj/item/integrated_circuit/manipulation/weapon_firing/Destroy()
qdel(installed_gun)
..()
installed_gun = null // It will be qdel'd by ..() if still in our contents
return ..()
/obj/item/integrated_circuit/manipulation/weapon_firing/attackby(var/obj/O, var/mob/user)
if(istype(O, /obj/item/weapon/gun))
@@ -247,5 +247,5 @@
/obj/effect/suspension_field/Destroy()
for(var/atom/movable/I in src)
I.loc = src.loc
..()
I.dropInto(loc)
return ..()