cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 13:36:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

POLARIS: Allow pulling objects through step teleports. (#4635)

Browse Source
This commit is contained in:
Aronai Sieyes
2018-01-28 01:10:20 -08:00
committed by Atermonera
parent 9aae412395
commit 6c1ab66d44
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/step_triggers.dm
+12 -1
View File
@@ -96,7 +96,18 @@
Trigger(var/atom/movable/A)
if(teleport_x && teleport_y && teleport_z)
var/turf/T = locate(teleport_x, teleport_y, teleport_z)
A.forceMove(T)
if(isliving(A))
var/mob/living/L = A
if(L.pulling)
var/atom/movable/P = L.pulling
L.stop_pulling()
P.forceMove(T)
L.forceMove(T)
L.start_pulling(P)
else
A.forceMove(T)
else
A.forceMove(T)
/* Random teleporter, teleports atoms to locations ranging from teleport_x - teleport_x_offset, etc */