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/objects/structures/transit_tubes/station.dm
+2 -2
View File
@@ -32,7 +32,7 @@
/obj/structure/transit_tube/station/should_stop_pod(pod, from_dir)
return 1
/obj/structure/transit_tube/station/Bumped(atom/movable/AM)
/obj/structure/transit_tube/station/CollidedWith(atom/movable/AM)
if(!pod_moving && open_status == STATION_TUBE_OPEN && ismob(AM) && AM.dir == boarding_dir)
for(var/obj/structure/transit_tube_pod/pod in loc)
if(!pod.moving)
@@ -71,7 +71,7 @@
if(do_after(user, 15, target = src))
if(open_status == STATION_TUBE_OPEN && GM && user.grab_state >= GRAB_AGGRESSIVE && user.pulling == GM && !GM.buckled && !GM.has_buckled_mobs())
GM.Knockdown(100)
src.Bumped(GM)
src.CollidedWith(GM)
break
else
for(var/obj/structure/transit_tube_pod/pod in loc)