Merge pull request #4639 from RemieRichards/AtomPool

/tg/station Atom/Movable Pool + Pooling of Emitter beams and Say() Virtualspeakers
This commit is contained in:
Swag McYolosteinen
2014-09-19 20:03:24 +02:00
7 changed files with 113 additions and 11 deletions
+6 -2
View File
@@ -119,13 +119,17 @@
else
src.fire_delay = rand(20,100)
src.shot_number = 0
var/obj/item/projectile/beam/emitter/A = new /obj/item/projectile/beam/emitter( src.loc )
var/obj/item/projectile/beam/emitter/A = PoolOrNew(/obj/item/projectile/beam/emitter,src.loc)
A.dir = src.dir
playsound(src.loc, 'sound/weapons/emitter.ogg', 25, 1)
if(prob(35))
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
A.dir = src.dir
switch(dir)
if(NORTH)
A.yo = 20