Added qdel(wires) to a bunch of objects Destroy proc.

Return ..()
This commit is contained in:
xxalpha
2015-08-27 11:10:58 +01:00
parent d7eca4f327
commit 19947d4fa0
17 changed files with 72 additions and 7 deletions
+7
View File
@@ -25,6 +25,13 @@
var/const/WIRE_RADIO_RECEIVE = 8 //Allows Pulsed(1) to call Activate()
var/const/WIRE_RADIO_PULSE = 16 //Allows Pulse(1) to send a radio message
/obj/item/device/assembly/Destroy()
qdel(connected)
connected = null
qdel(holder)
holder = null
return ..()
/obj/item/device/assembly/proc/holder_movement() //Called when the holder is moved
return
+5
View File
@@ -121,6 +121,11 @@
var/attacher = "UNKNOWN"
var/datum/wires/explosive/gibtonite/wires
/obj/item/weapon/twohanded/required/gibtonite/Destroy()
qdel(wires)
wires = null
return ..()
/obj/item/weapon/twohanded/required/gibtonite/attackby(obj/item/I, mob/user, params)
if(!wires && istype(I, /obj/item/device/assembly/igniter))
user.visible_message("[user] attaches [I] to [src].", "<span class='notice'>You attach [I] to [src].</span>")
@@ -138,7 +138,9 @@
mmi = null
if(connected_ai)
connected_ai.connected_robots -= src
..()
qdel(wires)
wires = null
return ..()
/mob/living/silicon/robot/proc/pick_module()
+2 -1
View File
@@ -153,11 +153,12 @@
if(occupier)
malfvacate(1)
qdel(wires)
wires = null
if(cell)
qdel(cell)
if(terminal)
disconnect_terminal()
..()
return ..()
/obj/machinery/power/apc/proc/make_terminal()
// create a terminal object at the same position as original turf loc
@@ -29,7 +29,9 @@
/obj/machinery/particle_accelerator/control_box/Destroy()
if(active)
toggle_power()
..()
qdel(wires)
wires = null
return ..()
/obj/machinery/particle_accelerator/control_box/attack_hand(mob/user)
if(construction_state >= 3)
+5
View File
@@ -20,6 +20,11 @@
..()
wires = new(src)
/obj/machinery/r_n_d/Destroy()
qdel(wires)
wires = null
return ..()
/obj/machinery/r_n_d/proc/shock(mob/user, prb)
if(stat & (BROKEN|NOPOWER)) // unpowered, no shock
return 0