From acc03ae85e13e26652ff9396880b516072a2d743 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 24 Jun 2017 11:48:05 -0500 Subject: [PATCH] Fixes bad del runtime --- code/game/objects/items/devices/PDA/PDA.dm | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 9764a15757..d4b38c97d6 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -844,18 +844,14 @@ GLOBAL_LIST_EMPTY(PDAs) /obj/item/device/pda/Destroy() GLOB.PDAs -= src - if(id) - qdel(id) - id = null - if(cartridge) - qdel(cartridge) - cartridge = null - if(pai) - qdel(pai) - pai = null - if(inserted_item) - qdel(inserted_item) - inserted_item = null + if(istype(id)) + QDEL_NULL(id) + if(istype(cartridge)) + QDEL_NULL(cartridge) + if(istype(pai)) + QDEL_NULL(pai) + if(istype(inserted_item)) + QDEL_NULL(inserted_item) return ..() //AI verb and proc for sending PDA messages.