From 8ab7b6a306a9953bb4bcdbf52f46ac806900d956 Mon Sep 17 00:00:00 2001 From: Exavere Date: Tue, 21 Sep 2021 13:18:00 -0500 Subject: [PATCH 1/4] Fixes #16757 --- code/modules/power/treadmill.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/treadmill.dm b/code/modules/power/treadmill.dm index 2ffc4f301f4..5d30500a4ec 100644 --- a/code/modules/power/treadmill.dm +++ b/code/modules/power/treadmill.dm @@ -40,7 +40,7 @@ /obj/machinery/power/treadmill/proc/throw_off(atom/movable/A) // if 2fast, throw the person, otherwise they just slide off, if there's reasonable speed at all - if(speed) + if(speed && !A.move_resist == INFINITY) var/dist = max(throw_dist * speed / MAX_SPEED, 1) A.throw_at(get_distant_turf(get_turf(src), reverse_direction(dir), dist), A.throw_range, A.throw_speed, src, 1) From 6c0b93091ab50916938cd0d8baf4d88dc92b5f00 Mon Sep 17 00:00:00 2001 From: Exavere Date: Tue, 21 Sep 2021 14:57:11 -0500 Subject: [PATCH 2/4] Hopefully my smoothbrain gets this right. --- code/modules/power/treadmill.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/power/treadmill.dm b/code/modules/power/treadmill.dm index 5d30500a4ec..1fa04dee597 100644 --- a/code/modules/power/treadmill.dm +++ b/code/modules/power/treadmill.dm @@ -26,7 +26,9 @@ icon_state = speed ? "conveyor-1" : "conveyor0" /obj/machinery/power/treadmill/Crossed(mob/living/M, oldloc) - if(anchored && !M.anchored) + if(anchored + + !M.anchored) if(!istype(M) || M.dir != dir) throw_off(M) else @@ -40,7 +42,7 @@ /obj/machinery/power/treadmill/proc/throw_off(atom/movable/A) // if 2fast, throw the person, otherwise they just slide off, if there's reasonable speed at all - if(speed && !A.move_resist == INFINITY) + if(speed && A.move_resist < INFINITY) var/dist = max(throw_dist * speed / MAX_SPEED, 1) A.throw_at(get_distant_turf(get_turf(src), reverse_direction(dir), dist), A.throw_range, A.throw_speed, src, 1) From c01f71a9f65ccf332c607b659f46cc88147ee96f Mon Sep 17 00:00:00 2001 From: Exavere Date: Tue, 21 Sep 2021 14:59:55 -0500 Subject: [PATCH 3/4] agony --- code/modules/power/treadmill.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/power/treadmill.dm b/code/modules/power/treadmill.dm index 1fa04dee597..61a9b61fba6 100644 --- a/code/modules/power/treadmill.dm +++ b/code/modules/power/treadmill.dm @@ -27,7 +27,6 @@ /obj/machinery/power/treadmill/Crossed(mob/living/M, oldloc) if(anchored - !M.anchored) if(!istype(M) || M.dir != dir) throw_off(M) From 332c17155c45c65b84f887eb965b97e566a6b425 Mon Sep 17 00:00:00 2001 From: Exavere Date: Tue, 21 Sep 2021 15:06:21 -0500 Subject: [PATCH 4/4] More mistake fixing, yay --- code/modules/power/treadmill.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/power/treadmill.dm b/code/modules/power/treadmill.dm index 61a9b61fba6..2d35e35d532 100644 --- a/code/modules/power/treadmill.dm +++ b/code/modules/power/treadmill.dm @@ -26,8 +26,7 @@ icon_state = speed ? "conveyor-1" : "conveyor0" /obj/machinery/power/treadmill/Crossed(mob/living/M, oldloc) - if(anchored - !M.anchored) + if(anchored && !M.anchored) if(!istype(M) || M.dir != dir) throw_off(M) else