Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again

code/modules/vehicles/cars/car.dm

@@ -29,8 +29,8 @@
 	last_enginesound_time = world.time
 	playsound(src, engine_sound, 100, TRUE)
 
-/obj/vehicle/sealed/car/MouseDrop_T(atom/dropping, mob/M)
-	if(!M.canmove || M.stat || M.restrained())
+/obj/vehicle/sealed/car/MouseDrop_T(atom/dropping, mob/living/M)
+	if(!istype(M) || !CHECK_MOBILITY(M, MOBILITY_USE))
 		return FALSE
 	if(isliving(dropping) && M != dropping)
 		var/mob/living/L = dropping

code/modules/vehicles/cars/clowncar.dm

@@ -52,7 +52,7 @@
 		var/mob/living/L = M
 		if(iscarbon(L))
 			var/mob/living/carbon/C = L
-			C.Knockdown(40) //I play to make sprites go horizontal
+			C.DefaultCombatKnockdown(40) //I play to make sprites go horizontal
 		L.visible_message("<span class='warning'>[src] rams into [L] and sucks him up!</span>") //fuck off shezza this isn't ERP.
 		mob_forced_enter(L)
 		playsound(src, pick('sound/vehicles/clowncar_ram1.ogg', 'sound/vehicles/clowncar_ram2.ogg', 'sound/vehicles/clowncar_ram3.ogg'), 75)

code/modules/vehicles/pimpin_ride.dm

@@ -55,12 +55,12 @@
 	else
 		return ..()
 
-/obj/vehicle/ridden/janicart/update_icon()
-	cut_overlays()
+/obj/vehicle/ridden/janicart/update_overlays()
+	. = ..()
 	if(mybag)
-		add_overlay("cart_garbage")
+		. += "cart_garbage"
 	if(floorbuffer)
-		add_overlay("cart_buffer")
+		. += "cart_buffer"
 
 /obj/vehicle/ridden/janicart/attack_hand(mob/user)
 	. = ..()

code/modules/vehicles/scooter.dm

@@ -282,7 +282,7 @@
 		var/atom/throw_target = get_edge_target_turf(H, pick(GLOB.cardinals))
 		unbuckle_mob(H)
 		H.throw_at(throw_target, 4, 3)
-		H.Knockdown(30)
+		H.DefaultCombatKnockdown(30)
 		H.adjustStaminaLoss(10)
 		var/head_slot = H.get_item_by_slot(SLOT_HEAD)
 		if(!head_slot || !(istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/hardhat)))

code/modules/vehicles/sealed.dm

@@ -93,7 +93,7 @@
 		mob_exit(i, null, randomstep)
 		if(iscarbon(i))
 			var/mob/living/carbon/Carbon = i
-			Carbon.Knockdown(40)
+			Carbon.DefaultCombatKnockdown(40)
 
 /obj/vehicle/sealed/proc/DumpSpecificMobs(flag, randomstep = TRUE)
 	for(var/i in occupants)
@@ -101,7 +101,7 @@
 			mob_exit(i, null, randomstep)
 			if(iscarbon(i))
 				var/mob/living/carbon/C = i
-				C.Knockdown(40)
+				C.DefaultCombatKnockdown(40)
 			
 			
 /obj/vehicle/sealed/AllowDrop()

code/modules/vehicles/secway.dm

@@ -27,9 +27,9 @@
 
 /obj/vehicle/ridden/secway/relaymove(mob/user, direction)
 	var/new_speed = normalspeed
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		if(H.sprinting && charge)
+	if(isliving(user))
+		var/mob/living/L = user
+		if((L.combat_flags & COMBAT_FLAG_SPRINT_TOGGLED) && charge)
 			charge--
 			new_speed = chargespeed
 	var/datum/component/riding/D = GetComponent(/datum/component/riding)

code/modules/vehicles/speedbike.dm

@@ -76,7 +76,7 @@
 			playsound(src, 'sound/effects/bang.ogg', 50, 1)
 		if(ishuman(A))
 			var/mob/living/carbon/human/H = A
-			H.Knockdown(100)
+			H.DefaultCombatKnockdown(100)
 			H.adjustStaminaLoss(30)
 			H.apply_damage(rand(20,35), BRUTE)
 			if(!crash_all)