Merge pull request #449 from Citadel-Station-13/upstream-merge-26296

[MIRROR] Slight shotgun tweak to lose a spawn
2017-04-18 01:16:08 -05:00
parent 228cf30ca0 44cc95c24a
commit cfd79eb7b7
1 changed files with 2 additions and 4 deletions
@@ -35,12 +35,10 @@
 	return (chambered.BB ? 1 : 0)

 /obj/item/weapon/gun/ballistic/shotgun/attack_self(mob/living/user)
-	if(recentpump)
+	if(recentpump > world.time)
 		return
 	pump(user)
-	recentpump = 1
-	spawn(10)
-		recentpump = 0
+	recentpump = world.time + 10
 	return

 /obj/item/weapon/gun/ballistic/shotgun/blow_up(mob/user)