From 24dc69d8b1f47d2cd7952a8f1e72cebd0cc8d5bd Mon Sep 17 00:00:00 2001 From: Migratingcocofruit <69551563+Migratingcocofruit@users.noreply.github.com> Date: Fri, 22 Nov 2024 15:11:38 +0200 Subject: [PATCH] Particle beam now consistently imparts the singularity with energy and only does so once (#27415) --- .../engines/singularity/particle_accelerator/particle.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle.dm b/code/modules/power/engines/singularity/particle_accelerator/particle.dm index 7810a0cc2b8..12641cefbd8 100644 --- a/code/modules/power/engines/singularity/particle_accelerator/particle.dm +++ b/code/modules/power/engines/singularity/particle_accelerator/particle.dm @@ -40,11 +40,16 @@ B.take_damage(energy * 0.6) movement_range = 0 +/// The particles bump the singularity /obj/effect/accelerated_particle/Bump(obj/singularity/S) if(!istype(S)) return ..() S.energy += energy + energy = 0 +/// The singularity bumps the particles +/obj/effect/accelerated_particle/singularity_act() + return /obj/effect/accelerated_particle/ex_act(severity) qdel(src)