Merge pull request #9 from Duck-/master

Here's my stuffsfjfsflkj

code/modules/mob/living/carbon/human/human.dm

@@ -478,10 +478,9 @@
 		var/obj/machinery/bot/mulebot/MB = AM
 		MB.RunOver(src)
 
-/*	if(istype(AM, /obj/vehicle))
+	if(istype(AM, /obj/vehicle))
 		var/obj/vehicle/V = AM
 		V.RunOver(src)
-*/
 
 //gets assignment from ID or ID inside PDA or PDA itself
 //Useful when player do something with computers

code/modules/mob/mob_movement.dm

@@ -203,7 +203,8 @@
 
 
 	if(!mob.canmove)
-		return
+		if (mob.buckled && (istype(mob.buckled, /obj/structure/stool/bed/chair/wheelchair) || istype(mob.buckled, /obj/vehicle))) // Exception for wheelchairs
+		else return
 
 	//if(istype(mob.loc, /turf/space) || (mob.flags & NOGRAV))
 	//	if(!mob.Process_Spacemove(0))	return 0
@@ -257,6 +258,9 @@
 			if(mob.machine.relaymove(mob,direct))
 				return
 
+		if(istype(mob.buckled, /obj/vehicle))
+			return mob.buckled.relaymove(mob,direct)
+
 		if(mob.pulledby || mob.buckled) // Wheelchair driving!
 			if(istype(mob.loc, /turf/space))
 				return // No wheelchair driving in space