Merge pull request #1711 from VOREStation/more-qdel-fixes

More qdel fixes
This commit is contained in:
Arokha Sieyes
2017-06-12 10:28:48 -04:00
committed by GitHub
19 changed files with 41 additions and 56 deletions
+1 -1
View File
@@ -103,7 +103,7 @@
/obj/item/radio/integrated/beepsky/Destroy()
if(radio_controller)
radio_controller.remove_object(src, control_freq)
..()
return ..()
/*
* Radio Cartridge, essentially a signaler.
@@ -256,7 +256,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
if(exonet)
exonet.remove_address()
exonet = null
..()
return ..()
// Proc: ui_interact()
// Parameters: 4 (standard NanoUI arguments)
@@ -37,7 +37,7 @@
/obj/item/device/flashlight/Destroy()
if(power_use)
processing_objects -= src
..()
return ..()
/obj/item/device/flashlight/verb/toggle()
set name = "Toggle Flashlight Brightness"
+2 -1
View File
@@ -27,7 +27,8 @@
//Will stop people throwing friend pAIs into the singularity so they can respawn
if(!isnull(pai))
pai.death(0)
..()
qdel_null(radio)
return ..()
/obj/item/device/paicard/attack_self(mob/user)
if (!in_range(src, user))
@@ -33,10 +33,8 @@ var/global/list/active_radio_jammers = list()
/obj/item/device/radio_jammer/Destroy()
if(on)
turn_off()
if(power_source)
qdel(power_source)
power_source = null
..()
qdel_null(power_source)
return ..()
/obj/item/device/radio_jammer/proc/turn_off(mob/user)
if(user)