shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename Bumped to CollidedWith (#2017)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+1 -1
View File
@@ -99,7 +99,7 @@
if(PushAM(AM))
return
/mob/living/Bumped(atom/movable/AM)
/mob/living/CollidedWith(atom/movable/AM)
..()
last_bumped = world.time
code/modules/mob/living/simple_animal/guardian/types/fire.dm
+1 -1
View File
@@ -27,7 +27,7 @@
..()
collision_ignite(AM)
/mob/living/simple_animal/hostile/guardian/fire/Bumped(AM as mob|obj)
/mob/living/simple_animal/hostile/guardian/fire/CollidedWith(atom/movable/AM)
..()
collision_ignite(AM)
code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+1 -1
View File
@@ -437,7 +437,7 @@ Difficulty: Very Hard
playsound(user, activation_sound, 100, 1)
return TRUE
/obj/machinery/anomalous_crystal/Bumped(atom/AM as mob|obj)
/obj/machinery/anomalous_crystal/CollidedWith(atom/movable/AM)
..()
if(ismob(AM))
ActivationReaction(AM, ACTIVATE_MOB_BUMP)