cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 08:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1129 (#1169)

Browse Source 
Fixes going crazy speed when pushing a wheelchair
This is a quick fix for now
This commit is contained in:
NanakoAC
2016-11-18 22:02:31 +02:00
committed by skull132
parent 5cddb85f6e
commit 265b56d925
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob_movement.dm
+11 -3
View File
@@ -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