Merge pull request #10925 from Ghommie/Ghommie-cit558

runtime is forever, errors are eternal.
2020-02-07 17:29:49 +00:00
parent 0e778fc2be 639ec8066d
commit 5717700146
11 changed files with 44 additions and 39 deletions
@@ -57,9 +57,10 @@
 	fire_delay = shot.delay

 /obj/item/gun/energy/Destroy()
-	QDEL_NULL(cell)
-	QDEL_LIST(ammo_type)
-	STOP_PROCESSING(SSobj, src)
+	if(flags_1 & INITIALIZED_1)
+		QDEL_NULL(cell)
+		QDEL_LIST(ammo_type)
+		STOP_PROCESSING(SSobj, src)
 	return ..()

 /obj/item/gun/energy/process()