Merge pull request #946 from Citadel-Station-13/upstream-merge-27181

[MIRROR] Clipboard Initialize + GC fixes
This commit is contained in:
LetterJay
2017-05-14 16:28:41 -04:00
committed by GitHub

View File

@@ -12,10 +12,14 @@
slot_flags = SLOT_BELT
resistance_flags = FLAMMABLE
/obj/item/weapon/clipboard/New()
/obj/item/weapon/clipboard/Initialize()
update_icon()
..()
. = ..()
/obj/item/weapon/clipboard/Destroy()
QDEL_NULL(haspen)
QDEL_NULL(toppaper) //let movable/Destroy handle the rest
return ..()
/obj/item/weapon/clipboard/update_icon()
cut_overlays()
@@ -115,4 +119,4 @@
//Update everything
attack_self(usr)
update_icon()
update_icon()