Merge pull request #562 from Citadel-Station-13/upstream-merge-26507

[MIRROR] Removes a few spawns
2017-04-25 20:35:42 -05:00
parent 5a08e17c42 a96ba5aae3
commit 2102b20409
5 changed files with 10 additions and 19 deletions
@@ -175,8 +175,7 @@
 			else if(G.can_trigger_gun(user))
 				bonus_spread += 24 * G.weapon_weight
 				loop_counter++
-				spawn(loop_counter)
-					G.process_fire(target,user,1,params, null, bonus_spread)
+				addtimer(CALLBACK(G, /obj/item/weapon/gun.proc/process_fire, target, user, 1, params, null, bonus_spread), loop_counter)

 	process_fire(target,user,1,params, null, bonus_spread)