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/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm
+3 -3
View File
@@ -109,10 +109,10 @@
return TRUE
return FALSE
/obj/effect/clockwork/spatial_gateway/Bumped(atom/A)
/obj/effect/clockwork/spatial_gateway/CollidedWith(atom/movable/AM)
..()
if(A && !QDELETED(A))
pass_through_gateway(A)
if(!QDELETED(AM))
pass_through_gateway(AM, FALSE)
/obj/effect/clockwork/spatial_gateway/proc/pass_through_gateway(atom/movable/A, no_cost)
if(!linked_gateway)
code/game/gamemodes/clock_cult/clock_structures/taunting_trail.dm
+1 -1
View File
@@ -43,7 +43,7 @@
affect_mob(AM)
return ..()
/obj/structure/destructible/clockwork/taunting_trail/Bumped(atom/movable/AM)
/obj/structure/destructible/clockwork/taunting_trail/CollidedWith(atom/movable/AM)
affect_mob(AM)
return ..()