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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos

Browse Source
This commit is contained in:
Putnam
2021-01-19 17:52:40 -08:00
parent f05df1c7de 131b11f4ae
commit 158dd11d8d
519 changed files with 7449 additions and 3295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+2 -1
View File
@@ -126,12 +126,13 @@
if(current_tube == null)
setDir(next_dir)
Move(get_step(loc, dir), dir) // Allow collisions when leaving the tubes.
Move(get_step(loc, dir), dir, DELAY_TO_GLIDE_SIZE(exit_delay)) // Allow collisions when leaving the tubes.
break
last_delay = current_tube.enter_delay(src, next_dir)
sleep(last_delay)
setDir(next_dir)
set_glide_size(DELAY_TO_GLIDE_SIZE(last_delay + exit_delay))
forceMove(next_loc) // When moving from one tube to another, skip collision and such.
density = current_tube.density