More and more Destroy() cleanups all across the board - Return qdel hints.

This commit is contained in:
Leshana
2017-06-05 23:01:41 -04:00
parent 010cca1d44
commit e48b548f2b
51 changed files with 128 additions and 113 deletions
+6 -2
View File
@@ -1470,8 +1470,12 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/Destroy()
PDAs -= src
if (src.id && prob(90)) //IDs are kept in 90% of the cases
src.id.loc = get_turf(src.loc)
..()
src.id.forceMove(get_turf(src.loc))
else
qdel_null(src.id)
qdel_null(src.cartridge)
qdel_null(src.pai)
return ..()
/obj/item/device/pda/clown/Crossed(AM as mob|obj) //Clown PDA is slippery.
if (istype(AM, /mob/living))
+4 -4
View File
@@ -78,6 +78,10 @@ var/list/civilian_cartridges = list(
var/message2
var/list/stored_data = list()
/obj/item/weapon/cartridge/Destroy()
qdel_null(radio)
return ..()
/obj/item/weapon/cartridge/engineering
name = "\improper Power-ON cartridge"
icon_state = "cart-e"
@@ -164,10 +168,6 @@ var/list/civilian_cartridges = list(
radio = new /obj/item/radio/integrated/signal(src)
..()
/obj/item/weapon/cartridge/signal/Destroy()
qdel(radio)
..()
/obj/item/weapon/cartridge/quartermaster
name = "\improper Space Parts & Space Vendors cartridge"
desc = "Perfect for the Quartermaster on the go!"
@@ -803,7 +803,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
if(exonet)
exonet.remove_address()
exonet = null
..()
return ..()
// Proc: update_icon()
// Parameters: None
@@ -96,7 +96,7 @@
/obj/item/device/radio/intercom/Destroy()
processing_objects -= src
..()
return ..()
/obj/item/device/radio/intercom/attack_ai(mob/user as mob)
src.add_fingerprint(user)