Merge pull request #1758 from Citadel-Station-13/upstream-merge-28735

[MIRROR] Fixes bad del runtime
This commit is contained in:
LetterJay
2017-06-25 01:05:41 -05:00
committed by GitHub
+8 -12
View File
@@ -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.