From 265b56d9258a9749006e76774b358088d1ff95c8 Mon Sep 17 00:00:00 2001 From: NanakoAC Date: Fri, 18 Nov 2016 20:02:31 +0000 Subject: [PATCH] Fixes #1129 (#1169) Fixes going crazy speed when pushing a wheelchair This is a quick fix for now --- code/modules/mob/mob_movement.dm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 133451546ae..9ce5ab098e3 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -275,7 +275,7 @@ mob.last_move_intent = world.time + 10 - if (mob.buckled || mob.pulledby) + if (mob.buckled) if(istype(mob.buckled, /obj/vehicle)) //manually set move_delay for vehicles so we don't inherit any mob movement penalties //specific vehicle move delays are set in code\modules\vehicles\vehicle.dm @@ -287,8 +287,9 @@ if(istype(mob.loc, /turf/space)) // Wheelchair driving! return // No wheelchair driving in space - if(istype(mob.pulledby, /obj/structure/bed/chair/wheelchair)) - return mob.pulledby.relaymove(mob, direct) + + //TODO: Fuck wheelchairs. + //Toss away all this snowflake code here, and rewrite wheelchairs as a vehicle. else if(istype(mob.buckled, /obj/structure/bed/chair/wheelchair)) var/min_move_delay = 0 if(ishuman(mob.buckled)) @@ -330,6 +331,13 @@ if(mob.machine.relaymove(mob,direct)) return + //Wheelchair pushing goes here for now. + //TODO: Fuck wheelchairs. + if(istype(mob.pulledby, /obj/structure/bed/chair/wheelchair)) + move_delay += 1 + return mob.pulledby.relaymove(mob, direct) + + //We are now going to move moving = 1