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

This commit is contained in:
Leshana
2017-06-10 22:41:51 -04:00
parent eb1712ee58
commit 5a02b7e5c7
50 changed files with 131 additions and 115 deletions
+10 -5
View File
@@ -1469,11 +1469,16 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/Destroy()
PDAs -= src
/* VOREStation Removal
if (src.id && prob(90)) //IDs are kept in 90% of the cases
src.id.loc = get_turf(src.loc)
*/
..()
// VOREStation Edit - Always destroy IDs
// if (src.id && prob(90)) //IDs are kept in 90% of the cases
// src.id.forceMove(get_turf(src.loc))
// else
// qdel_null(src.id)
qdel_null(src.id)
// VOREStation Edit End
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!"