Object pool for beam projectile, minor changes to object pool.

Conflicts:
	code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm
	code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm
	code/game/objects/structures/grille.dm
	code/modules/power/singularity/emitter.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
This commit is contained in:
ESwordTheCat
2014-04-29 13:33:06 -04:00
committed by ZomgPonies
parent 49c11d1c9e
commit ebfcc9be79
13 changed files with 117 additions and 48 deletions
@@ -158,6 +158,10 @@ steam.start() -- spawns the effect
var/amount = 6.0
resetVariables()
amount = initial(amount)
return ..()
/obj/effect/effect/sparks/New()
..()
playsound(src.loc, "sparks", 100, 1)