sfgdrfgh

2025-12-10 18:32:03 +00:00 · 2015-07-25 09:18:08 +02:00
parent be2a669cb6
commit e1ab433363
2 changed files with 3 additions and 3 deletions
--- a/code/modules/projectiles/guns/energy/experimental.dm
+++ b/code/modules/projectiles/guns/energy/experimental.dm
@@ -294,6 +294,7 @@
 /obj/item/weapon/gun/stickybomb/Destroy()
 	for(var/obj/item/stickybomb/S in loaded)
 		qdel(S)
+	loaded = null
 	for(var/obj/item/stickybomb/B in fired)
 		B.deactivate()
 		B.unstick()
--- a/code/modules/projectiles/projectile/experimental.dm
+++ b/code/modules/projectiles/projectile/experimental.dm
@@ -770,9 +770,8 @@
 		bulletdies()

 /obj/item/projectile/stickybomb/proc/bulletdies()
-	spawn()
-		returnToPool(src)
-		OnDeath()
+	returnToPool(src)
+	OnDeath()

 /obj/item/projectile/stickybomb/bump_original_check()//so players can aim at floors
 	if(!bumped)