mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-31 07:58:22 +01:00
Merge pull request #15633 from Kashargul/furtherPullingFixes
further teleport pulling fixes
This commit is contained in:
@@ -117,7 +117,7 @@
|
||||
L.stop_pulling()
|
||||
P.forceMove(T)
|
||||
L.forceMove(T)
|
||||
L.start_pulling(P)
|
||||
L.continue_pulling(P)
|
||||
else
|
||||
L.forceMove(T)
|
||||
else
|
||||
@@ -285,4 +285,3 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is loop
|
||||
|
||||
/obj/effect/step_trigger/warning/train_edge
|
||||
warningmessage = "The wind billowing alongside the train is extremely strong here! Any movement could easily pull you down beneath the carriages, return to the train immediately!"
|
||||
|
||||
|
||||
@@ -220,7 +220,7 @@
|
||||
if(L.pulling && !L.pulling.anchored)
|
||||
var/atom/movable/P = L.pulling
|
||||
P.forceMove(get_turf(top))
|
||||
L.start_pulling(P)
|
||||
L.continue_pulling(P)
|
||||
|
||||
for(var/obj/item/weapon/grab/G in list(L.l_hand, L.r_hand))
|
||||
G.affecting.forceMove(get_turf(top))
|
||||
@@ -479,7 +479,7 @@
|
||||
// If the object is pulling or grabbing anything, we'll want to move those too. A grab chain may be disrupted in doing so.
|
||||
if(P)
|
||||
P.forceMove(get_turf(bottom))
|
||||
L.start_pulling(P)
|
||||
L.continue_pulling(P)
|
||||
|
||||
for(var/obj/item/weapon/grab/G in list(L.l_hand, L.r_hand))
|
||||
G.affecting.forceMove(get_turf(bottom))
|
||||
|
||||
Reference in New Issue
Block a user