Merge remote-tracking branch 'citadel/master' into small_guncode_refactor

2020-02-04 03:47:01 -07:00
parent 1a439b8758 275b1f73e0
commit 8556a6188f
812 changed files with 46627 additions and 7896 deletions
@@ -85,6 +85,13 @@
 	if(zoomable)
 		azoom = new (src)

+/obj/item/gun/Destroy()
+	QDEL_NULL(pin)
+	QDEL_NULL(gun_light)
+	QDEL_NULL(bayonet)
+	QDEL_NULL(chambered)
+	return ..()
+
 /obj/item/gun/CheckParts(list/parts_list)
 	..()
 	var/obj/item/gun/G = locate(/obj/item/gun) in contents