From 7de7f6bbdb68dfcb7034d754345c325c81ac829b Mon Sep 17 00:00:00 2001
From: PKPenguin321 <pkpenguin321.git@gmail.com>
Date: Tue, 7 Jun 2016 21:30:28 -0700
Subject: [PATCH] tweaks

---
 code/modules/vehicles/scooter.dm | 40 +++++++++++++++-----------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index 79e80282808..9fce1acd3dd 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -24,22 +24,20 @@
 	if(buckled_mobs.len)
 		for(var/m in buckled_mobs)
 			var/mob/living/buckled_mob = m
-			if(iscarbon(buckled_mob))
-				var/mob/living/carbon/buckled_carbon = buckled_mob
-				if(buckled_carbon.get_num_legs() < 2)
-					switch(buckled_carbon.dir)
-						if(NORTH)
-							buckled_carbon.pixel_x = 0
-							buckled_carbon.pixel_y = -4
-						if(EAST)
-							buckled_carbon.pixel_x = -2
-							buckled_carbon.pixel_y = -4
-						if(SOUTH)
-							buckled_carbon.pixel_x = 0
-							buckled_carbon.pixel_y = -4
-						if(WEST)
-							buckled_carbon.pixel_x = 2
-							buckled_carbon.pixel_y = -4
+			if(buckled_mobs.get_num_legs() <= 0)
+				switch(buckled_mobs.dir)
+					if(NORTH)
+						buckled_mobs.pixel_x = 0
+						buckled_mobs.pixel_y = -4
+					if(EAST)
+						buckled_mobs.pixel_x = -2
+						buckled_mobs.pixel_y = -4
+					if(SOUTH)
+						buckled_mobs.pixel_x = 0
+						buckled_mobs.pixel_y = -4
+					if(WEST)
+						buckled_mobs.pixel_x = 2
+						buckled_mobs.pixel_y = -4
 			else
 				switch(buckled_mob.dir)
 					if(NORTH)
@@ -58,11 +56,11 @@
 /obj/vehicle/scooter/post_buckle_mob(mob/living/M)
 	vehicle_move_delay = initial(vehicle_move_delay)
 	..()
-	if(!iscarbon(M))
-		return
-	var/mob/living/carbon/C = M
-	if(C.get_num_legs() < 2)
-		vehicle_move_delay = initial(vehicle_move_delay) + 1
+	if(M.get_num_legs() < 2)
+		vehicle_move_delay ++
+		if(M.get_num_arms() <= 0)
+			unbuckle_mob(M)
+			M << "<span class='warning'>Your limbless body flops off \the [src].</span>"
 
 /obj/vehicle/scooter/skateboard
 	name = "skateboard"