Clipboard Initialize + GC fixes

2017-05-13 18:01:26 -05:00
parent 55dd3876e5
commit eacd4305e6
1 changed files with 7 additions and 3 deletions
@@ -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()