Rename Bumped to CollidedWith (#2017)

This commit is contained in:
CitadelStationBot
2017-07-15 13:44:12 -05:00
committed by kevinz000
parent 738eaa1d54
commit 54da14ea6b
36 changed files with 102 additions and 104 deletions
@@ -107,9 +107,8 @@
return
/obj/singularity/Bumped(atom/A)
consume(A)
return
/obj/singularity/CollidedWith(atom/movable/AM)
consume(AM)
/obj/singularity/process()
@@ -546,7 +546,7 @@
radiation_pulse(get_turf(src), 1, 1, 150, 1)
/obj/machinery/power/supermatter_shard/Bumped(atom/AM)
/obj/machinery/power/supermatter_shard/CollidedWith(atom/movable/AM)
if(isliving(AM))
AM.visible_message("<span class='danger'>\The [AM] slams into \the [src] inducing a resonance... [AM.p_their()] body starts to glow and catch flame before flashing into ash.</span>",\
"<span class='userdanger'>You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"</span>",\
+2 -2
View File
@@ -141,8 +141,8 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
/obj/singularity/energy_ball/Collide(atom/A)
dust_mobs(A)
/obj/singularity/energy_ball/Bumped(atom/A)
dust_mobs(A)
/obj/singularity/energy_ball/CollidedWith(atom/movable/AM)
dust_mobs(AM)
/obj/singularity/energy_ball/orbit(obj/singularity/energy_ball/target)
if (istype(target))