From 740c54328bdf4fdc8275563a09bc56c5bc626cab Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Wed, 2 Jul 2014 22:42:53 +0200 Subject: [PATCH] Minor code cleanup Conflicts: code/modules/mob/mob_movement.dm --- code/modules/mob/mob_movement.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 4dfaabf5763..6d8b81aaa30 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -206,8 +206,7 @@ if(!mob.canmove) - if (mob.buckled && (istype(mob.buckled, /obj/structure/stool/bed/chair/wheelchair) || istype(mob.buckled, /obj/structure/stool/bed/chair/cart) || istype(mob.buckled, /obj/vehicle))) // Exception for wheelchairs - else return + return //if(istype(mob.loc, /turf/space) || (mob.flags & NOGRAV)) // if(!mob.Process_Spacemove(0)) return 0 @@ -267,7 +266,7 @@ var/mob/living/carbon/human/driver = mob.buckled var/datum/organ/external/l_hand = driver.get_organ("l_hand") var/datum/organ/external/r_hand = driver.get_organ("r_hand") - if((!l_hand || l_hand.status & ORGAN_DESTROYED) && (!r_hand || r_hand.status & ORGAN_DESTROYED)) + if((!l_hand || (l_hand.status & ORGAN_DESTROYED)) && (!r_hand || (r_hand.status & ORGAN_DESTROYED))) return // No hands to drive your chair? Tough luck! move_delay += 2 return mob.buckled.relaymove(mob,direct)