itworksedition

new525 · Jun 10, 2016 · cb907d1 · cb907d1
1 parent c4b8dd4
commit cb907d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
@@ -508,7 +508,4 @@ obj/item/weapon/gun/proc/newshot()
 /obj/item/weapon/gun/burn()
 	if(pin)
 		qdel(pin)
-	if(power_supply)
-		qdel(power_supply)
-	SSobj.burning -= src
-	qdel(src)
+	.=..()
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
@@ -164,4 +164,9 @@
 			SSobj.processing |= src
 		else
 			SSobj.processing -= src
-	..()
+	..()
+
+/obj/item/weapon/gun/energy/burn()
+	if(power_supply)
+		qdel(power_supply)
+	.=..()