Refactored CollidedWith (#19541)

Refactored CollidedWith()
This commit is contained in:
Fluffy
2024-06-29 10:01:18 +00:00
committed by GitHub
parent d63d63d78c
commit d8d67ebd3a
31 changed files with 317 additions and 183 deletions
@@ -63,12 +63,12 @@
PC.parent.energy += energy
qdel(src)
/obj/effect/accelerated_particle/CollidedWith(atom/A)
/obj/effect/accelerated_particle/CollidedWith(atom/bumped_atom)
. = ..()
if (!active)
return
if(ismob(A))
toxmob(A)
if(ismob(bumped_atom))
toxmob(bumped_atom)
/obj/effect/accelerated_particle/ex_act(severity)
if (!active)
@@ -79,10 +79,10 @@
if (A)
consume(A)
/obj/singularity/CollidedWith(atom/movable/AM)
/obj/singularity/CollidedWith(atom/bumped_atom)
. = ..()
if (AM)
consume(AM)
if (bumped_atom)
consume(bumped_atom)
/obj/singularity/process()
eat()