diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/radiation.dm b/code/WorkInProgress/Cael_Aislinn/Rust/radiation.dm index 155ef23c5c6..b5855a96462 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/radiation.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/radiation.dm @@ -25,7 +25,7 @@ proc/RadiateParticle(var/energy, var/ionizing, var/dir = 0) if(!dir) RadiateParticleRand(energy, ionizing) - var/obj/effect/accelerated_particle/particle = new + var/obj/effect/accelerated_particle/particle = getFromPool(/obj/effect/accelerated_particle,get_turf(src)) particle.dir = dir particle.ionizing = ionizing if(energy) diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm index df3dfca3184..52022babb70 100644 --- a/code/modules/power/singularity/particle_accelerator/particle.dm +++ b/code/modules/power/singularity/particle_accelerator/particle.dm @@ -33,16 +33,16 @@ energy = 50 icon_state="particle3" -/obj/effect/accelerated_particle/New(loc, dir = 2) +/obj/effect/accelerated_particle/New(loc, dir = 2, move = 0) . = ..() src.loc = loc src.dir = dir if(movement_range > 20) movement_range = 20 - - spawn(0) - move(1) + if(move) + spawn(0) + move(1) /obj/effect/accelerated_particle/Bump(atom/A) if (A) diff --git a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm index 710a68d7d27..7a6286c919c 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm @@ -47,6 +47,6 @@ A = getFromPool(/obj/effect/accelerated_particle/powerful,T) if(A) A.dir = src.dir - A.New(T,dir) + A.New(T,dir,1) return 1 return 0