From 0a7225e8eb94aaadafbf5638a1e8655df5b8ffd4 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sat, 14 Nov 2015 21:09:23 -0800 Subject: [PATCH] wheelchair speeds --- .../stool_bed_chair_nest/wheelchair.dm | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 167e3cd0fa8..7cd4847dbcf 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -24,17 +24,17 @@ if(world.time < move_delay) return - move_delay = world.time - move_delay += 2 //wheelchairs are not infact sport bikes + var/calculated_move_delay + calculated_move_delay += 5 //wheelchairs are not infact sport bikes if(buckled_mob) if(buckled_mob.incapacitated()) return 0 - + var/mob/living/thedriver = user var/mob_delay = thedriver.movement_delay() if(mob_delay > 0) - move_delay += mob_delay + calculated_move_delay += mob_delay if(ishuman(buckled_mob)) var/mob/living/carbon/human/driver = user @@ -46,11 +46,17 @@ for(var/organ_name in list("l_hand","r_hand","l_arm","r_arm")) var/obj/item/organ/external/E = driver.get_organ(organ_name) if(!E || (E.status & ORGAN_DESTROYED)) - move_delay += 4 + calculated_move_delay += 4 else if(E.status & ORGAN_SPLINTED) - move_delay += 0.5 + calculated_move_delay += 0.5 else if(E.status & ORGAN_BROKEN) - move_delay += 1.5 + calculated_move_delay += 1.5 + + if(calculated_move_delay < 4) + calculated_move_delay = 4 //no racecarts + + move_delay = world.time + move_delay += calculated_move_delay if(!buckled_mob.Move(get_step(buckled_mob, direction), direction)) loc = buckled_mob.loc //we gotta go back