cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactored CollidedWith (#19541)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/tesla/energy_ball.dm
+12 -8
View File
@@ -211,16 +211,20 @@
var/obj/O = A
O.tesla_act(0, TRUE)
/obj/singularity/energy_ball/CollidedWith(atom/A)
if(check_for_immune(A))
/obj/singularity/energy_ball/CollidedWith(atom/bumped_atom)
//Fucking snowflake code
SHOULD_CALL_PARENT(FALSE)
SEND_SIGNAL(src, COMSIG_ATOM_BUMPED, bumped_atom)
if(check_for_immune(bumped_atom))
return
if(isliving(A))
dust_mobs(A)
else if(isobj(A))
if(istype(A, /obj/effect/accelerated_particle))
consume(A)
if(isliving(bumped_atom))
dust_mobs(bumped_atom)
else if(isobj(bumped_atom))
if(istype(bumped_atom, /obj/effect/accelerated_particle))
consume(bumped_atom)
return
var/obj/O = A
var/obj/O = bumped_atom
O.tesla_act(0, TRUE)
/obj/singularity/energy_ball/proc/check_for_immune(var/O)