Merge remote-tracking branch 'upstream/master' into rename-organs

code/modules/events/anomaly_bluespace.dm

@@ -43,9 +43,10 @@
 				var/y_distance = TO.y - FROM.y
 				var/x_distance = TO.x - FROM.x
 				for(var/atom/movable/A in range(12, FROM )) // iterate thru list of mobs in the area
-					if(istype(A, /obj/item/radio/beacon)) continue // don't teleport beacons because that's just insanely stupid
-					if(A.anchored) continue
-
+					if(istype(A, /obj/item/radio/beacon)) // don't teleport beacons because that's just insanely stupid
+						continue 
+					if(A.anchored || A.move_resist == INFINITY)
+						continue
 					var/turf/newloc = locate(A.x + x_distance, A.y + y_distance, TO.z) // calculate the new place
 					if(!A.Move(newloc)) // if the atom, for some reason, can't move, FORCE them to move! :) We try Move() first to invoke any movement-related checks the atom needs to perform after moving
 						A.loc = locate(A.x + x_distance, A.y + y_distance, TO.z)

code/modules/mining/lavaland/loot/tendril_loot.dm

@@ -163,7 +163,7 @@
 	desc = "A boat used for traversing lava."
 	icon_state = "goliath_boat"
 	icon = 'icons/obj/lavaland/dragonboat.dmi'
-	keytype = /obj/item/oar
+	held_key_type = /obj/item/oar
 	burn_state = LAVA_PROOF
 
 /obj/vehicle/lavaboat/relaymove(mob/user, direction)
@@ -174,7 +174,7 @@
 		..()
 	else
 		to_chat(user, "<span class='warning'>Boats don't go on land!</span>")
-		return 0
+		return FALSE
 
 /obj/item/oar
 	name = "oar"
@@ -218,7 +218,7 @@
 /obj/vehicle/lavaboat/dragon
 	name = "mysterious boat"
 	desc = "This boat moves where you will it, without the need for an oar."
-	keytype = null
+	held_key_type = null
 	icon_state = "dragon_boat"
 	generic_pixel_y = 2
 	generic_pixel_x = 1

code/modules/mining/machine_vending.dm

@@ -36,7 +36,7 @@
 		new /datum/data/mining_equipment("Fulton Pack",					/obj/item/extraction_pack,											1000),
 		new /datum/data/mining_equipment("Lazarus Injector",			/obj/item/lazarus_injector,											1000),
 		new /datum/data/mining_equipment("Silver Pickaxe",				/obj/item/pickaxe/silver,											1000),
-		new /datum/data/mining_equipment("Mining Conscription Kit",		/obj/item/storage/backpack/duffel/mining_conscript,					1500),
+		new /datum/data/mining_equipment("Mining Conscription Kit",		/obj/item/storage/backpack/duffel/mining_conscript/full,					1500),
 		new /datum/data/mining_equipment("Jetpack Upgrade",				/obj/item/tank/jetpack/suit,										2000),
 		new /datum/data/mining_equipment("Mining Hardsuit",				/obj/item/clothing/suit/space/hardsuit/mining,						2000),
 		new /datum/data/mining_equipment("Diamond Pickaxe",				/obj/item/pickaxe/diamond,											2000),
@@ -235,7 +235,7 @@
 			new /obj/item/extinguisher/mini(drop_location)
 			new /obj/item/twohanded/kinetic_crusher(drop_location)
 		if("Mining Conscription Kit")
-			new /obj/item/storage/backpack/duffel/mining_conscript(drop_location)
+			new /obj/item/storage/backpack/duffel/mining_conscript/full(drop_location)
 
 	qdel(voucher)
 
@@ -293,19 +293,14 @@
 		to_chat(user, "You upgrade [I] with mining access.")
 		qdel(src)
 
-/obj/item/storage/backpack/duffel/mining_conscript
+/obj/item/storage/backpack/duffel/mining_conscript/full
 	name = "mining conscription kit"
 	desc = "A kit containing everything a crewmember needs to support a shaft miner in the field."
 
-/obj/item/storage/backpack/duffel/mining_conscript/New()
+/obj/item/storage/backpack/duffel/mining_conscript/full/New()
 	..()
-	new /obj/item/clothing/glasses/meson(src)
-	new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
-	new /obj/item/storage/bag/ore(src)
 	new /obj/item/clothing/suit/hooded/explorer(src)
-	new /obj/item/encryptionkey/headset_cargo(src)
-	new /obj/item/clothing/mask/gas/explorer(src)
 	new /obj/item/card/id/mining_access_card(src)
 	new /obj/item/gun/energy/kinetic_accelerator(src)
 	new /obj/item/kitchen/knife/combat/survival(src)
-	new /obj/item/flashlight/seclite(src)
+	new /obj/item/flashlight/seclite(src)

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

@@ -20,7 +20,7 @@
 	cold_level_3 = 200
 	coldmod = 3
 
-	brain_mod = 2.5
+	brain_mod = 1.5
 
 	male_cough_sounds = list('sound/effects/slime_squish.ogg')
 	female_cough_sounds = list('sound/effects/slime_squish.ogg')

code/modules/mob/living/silicon/robot/drone/drone.dm

@@ -13,7 +13,7 @@
 	braintype = "Robot"
 	lawupdate = 0
 	density = 0
-	req_access = list(access_engine, access_robotics)
+	req_one_access = list(access_engine, access_robotics)
 	ventcrawler = 2
 	magpulse = 1
 	mob_size = MOB_SIZE_SMALL

code/modules/mob/living/silicon/robot/robot.dm

@@ -65,7 +65,8 @@ var/list/robot_verbs_default = list(
 
 	var/wiresexposed = 0
 	var/locked = 1
-	var/list/req_access = list(access_robotics)
+	var/list/req_one_access = list(access_robotics)
+	var/list/req_access
 	var/ident = 0
 	//var/list/laws = list()
 	var/alarms = list("Motion"=list(), "Fire"=list(), "Atmosphere"=list(), "Power"=list(), "Camera"=list())
@@ -891,6 +892,7 @@ var/list/robot_verbs_default = list(
 /mob/living/silicon/robot/proc/allowed(obj/item/I)
 	var/obj/dummy = new /obj(null) // Create a dummy object to check access on as to avoid having to snowflake check_access on every mob
 	dummy.req_access = req_access
+	dummy.req_one_access = req_one_access
 
 	if(dummy.check_access(I))
 		qdel(dummy)
@@ -1302,7 +1304,7 @@ var/list/robot_verbs_default = list(
 	designation = "SpecOps"
 	lawupdate = 0
 	scrambledcodes = 1
-	req_access = list(access_cent_specops)
+	req_one_access = list(access_cent_specops)
 	ionpulse = 1
 	magpulse = 1
 	pdahide = 1
@@ -1352,7 +1354,7 @@ var/list/robot_verbs_default = list(
 	designation = "ERT"
 	lawupdate = 0
 	scrambledcodes = 1
-	req_access = list(access_cent_specops)
+	req_one_access = list(access_cent_specops)
 	ionpulse = 1
 
 	force_modules = list("Engineering", "Medical", "Security")

code/modules/research/xenobiology/xenobiology.dm

@@ -354,19 +354,31 @@
 	icon_state = "bottle3"
 	origin_tech = "biotech=5"
 
-/obj/item/slimepotion/speed/afterattack(obj/item/C, mob/user, proximity_flag)
+/obj/item/slimepotion/speed/afterattack(obj/O, mob/user, proximity_flag)
 	if(!proximity_flag)
 		return
 	..()
-	if(!istype(C))
-		to_chat(user, "<span class='warning'>The potion can only be used on items!</span>")
+	if(!istype(O))
+		to_chat(user, "<span class='warning'>The potion can only be used on items or vehicles!</span>")
 		return
-	if(C.slowdown <= 0)
-		to_chat(user, "<span class='warning'>[C] can't be made any faster!</span>")
-		return..()
-	to_chat(user, "<span class='notice'>You slather the red gunk over [C], making it faster.</span>")
-	C.color = "#FF0000"
-	C.slowdown = 0
+	if(isitem(O))
+		var/obj/item/I = O
+		if(I.slowdown <= 0)
+			to_chat(user, "<span class='warning'>[I] can't be made any faster!</span>")
+			return ..()
+		I.slowdown = 0
+
+	if(istype(O, /obj/vehicle))
+		var/obj/vehicle/V = O
+		var/vehicle_speed_mod = config.run_speed
+		if(V.vehicle_move_delay <= vehicle_speed_mod)
+			to_chat(user, "<span class='warning'>[V] can't be made any faster!</span>")
+			return ..()
+		V.vehicle_move_delay = vehicle_speed_mod
+
+	to_chat(user, "<span class='notice'>You slather the red gunk over [O], making it faster.</span>")
+	O.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
+	O.add_atom_colour("#FF0000", FIXED_COLOUR_PRIORITY)
 	qdel(src)
 
 /obj/item/slimepotion/speed/MouseDrop(obj/over_object)

code/modules/surgery/organs/subtypes/slime.dm

@@ -3,6 +3,10 @@
 	name = "slime heart"
 	icon_state = "heart"
 	desc = "This is a slime's osmotic pressure regulator, it appears to be some kind of biological pump that uses osmotic pressure to regulate water flow. It seems to work similar to a heart."
+	dead_icon = null
+
+/obj/item/organ/internal/heart/slime/update_icon()
+	return
 
 /obj/item/organ/internal/lungs/slime
 	icon = 'icons/obj/species_organs/slime.dmi'    

code/modules/surgery/organs/subtypes/unbreakable.dm

@@ -1,5 +1,6 @@
 /obj/item/organ/external/chest/unbreakable
 	cannot_break = TRUE
+	encased = null
 
 /obj/item/organ/external/groin/unbreakable
 	cannot_break = TRUE
@@ -30,6 +31,7 @@
 
 /obj/item/organ/external/head/unbreakable
 	cannot_break = TRUE
+	encased = null
 
 // Cannot dismember or break
 /obj/item/organ/external/chest/unbreakable/sturdy

code/modules/surgery/robotics.dm

@@ -545,7 +545,7 @@
 /datum/surgery/cybernetic_customization
 	name = "Cybernetic Appearance Customization"
 	steps = list(/datum/surgery_step/robotics/external/unscrew_hatch, /datum/surgery_step/robotics/external/customize_appearance)
-	possible_locs = list("head", "chest", "l_arm", "r_arm", "r_leg", "l_leg")
+	possible_locs = list("head", "chest", "l_arm", "l_hand", "r_arm", "r_hand", "r_leg", "r_foot", "l_leg", "l_foot", "groin")
 	requires_organic_bodypart = FALSE
 
 /datum/surgery/cybernetic_customization/can_start(mob/user, mob/living/carbon/human/target)

code/modules/vehicle/ambulance.dm

@@ -2,12 +2,12 @@
 	name = "ambulance"
 	desc = "This is what the paramedic uses to run over people they need to take to medbay."
 	icon_state = "docwagon2"
-	keytype = /obj/item/key/ambulance
+	key_type = /obj/item/key/ambulance
 	var/obj/structure/bed/amb_trolley/bed = null
 	var/datum/action/ambulance_alarm/AA
 	var/datum/looping_sound/ambulance_alarm/soundloop
 
-/obj/vehicle/ambulance/New()
+/obj/vehicle/ambulance/Initialize(mapload)
 	. = ..()
 	AA = new(src)
 	soundloop = new(list(src), FALSE)

code/modules/vehicle/atv.dm

@@ -2,18 +2,16 @@
 	name = "all-terrain vehicle"
 	desc = "An all-terrain vehicle built for traversing rough terrain with ease. One of the few old-earth technologies that are still relevant on most planet-bound outposts."
 	icon = 'icons/vehicles/4wheeler.dmi'
-	icon_state = "fourwheel"
-	keytype = /obj/item/key
+	icon_state = "atv"
+	key_type = /obj/item/key
 	generic_pixel_x = 0
 	generic_pixel_y = 4
 	vehicle_move_delay = 1
-	var/static/image/atvcover = null
+	var/static/mutable_appearance/atvcover
 
-/obj/vehicle/atv/New()
-	..()
-	if(!atvcover)
-		atvcover = image("icons/vehicles/4wheeler.dmi", "4wheeler_north")
-		atvcover.layer = MOB_LAYER + 0.1
+/obj/vehicle/atv/Initialize(mapload)
+	. = ..()
+	atvcover = mutable_appearance(icon, atvcover, ABOVE_MOB_LAYER)
 
 /obj/vehicle/atv/post_buckle_mob(mob/living/M)
 	add_overlay(atvcover)
@@ -26,7 +24,7 @@
 
 /obj/vehicle/atv/handle_vehicle_layer()
 	if(dir == SOUTH)
-		layer = MOB_LAYER+0.1
+		layer = ABOVE_MOB_LAYER
 	else
 		layer = OBJ_LAYER
 
@@ -40,20 +38,20 @@
 	emp_vulnerable = 1
 	density = 0
 
-/obj/vehicle/atv/turret/New()
-	..()
+/obj/vehicle/atv/turret/Initialize(mapload)
+	. = ..()
 	turret = new(loc)
 	//turret.base = src
 
 /obj/vehicle/atv/turret/handle_vehicle_layer()
 	if(dir == SOUTH)
-		layer = MOB_LAYER+0.1
+		layer = ABOVE_MOB_LAYER
 	else
 		layer = OBJ_LAYER
 
 	if(turret)
 		if(dir == NORTH)
-			turret.layer = MOB_LAYER+0.1
+			turret.layer = ABOVE_MOB_LAYER
 		else
 			turret.layer = OBJ_LAYER
 

code/modules/vehicle/janicart.dm

@@ -3,10 +3,13 @@
 	name = "janicart (pimpin' ride)"
 	desc = "A brave janitor cyborg gave its life to produce such an amazing combination of speed and utility."
 	icon_state = "pussywagon"
-	keytype = /obj/item/key/janitor
-	var/obj/item/storage/bag/trash/mybag = null
-	var/floorbuffer = 0
+	key_type = /obj/item/key/janitor
+	var/obj/item/storage/bag/trash/mybag
+	var/floorbuffer = FALSE
 
+/obj/vehicle/janicart/Destroy()
+	QDEL_NULL(mybag)
+	return ..()
 
 /obj/vehicle/janicart/handle_vehicle_offsets()
 	..()
@@ -63,35 +66,34 @@
 
 /obj/vehicle/janicart/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/storage/bag/trash))
-		if(keytype == /obj/item/key/janitor)
-			if(!user.drop_item())
-				return
-			to_chat(user, "<span class='notice'>You hook the trashbag onto \the [name].</span>")
-			I.loc = src
-			mybag = I
-	else if(istype(I, /obj/item/janiupgrade))
-		if(keytype == /obj/item/key/janitor)
-			floorbuffer = 1
-			qdel(I)
-			to_chat(user,"<span class='notice'>You upgrade \the [name] with the floor buffer.</span>")
-	update_icon()
-
-	..()
-
+		if(!user.drop_item())
+			return
+		to_chat(user, "<span class='notice'>You hook [I] onto [src].</span>")
+		I.forceMove(src)
+		mybag = I
+		update_icon()
+		return
+	if(istype(I, /obj/item/janiupgrade))
+		floorbuffer = TRUE
+		qdel(I)
+		to_chat(user,"<span class='notice'>You upgrade [src] with [I].</span>")
+		update_icon()
+		return
+	return ..()
 
 /obj/vehicle/janicart/update_icon()
-	overlays.Cut()
+	cut_overlays()
 	if(mybag)
-		overlays += "cart_garbage"
+		add_overlay("cart_garbage")
 	if(floorbuffer)
-		overlays += "cart_buffer"
+		add_overlay("cart_buffer")
 
 
 /obj/vehicle/janicart/attack_hand(mob/user)
 	if(..())
-		return 1
+		return TRUE
 	else if(mybag)
-		mybag.loc = get_turf(user)
+		mybag.forceMove(get_turf(user))
 		user.put_in_hands(mybag)
 		mybag = null
 		update_icon()

code/modules/vehicle/motorcycle.dm

@@ -6,15 +6,11 @@
 	generic_pixel_x = 0
 	generic_pixel_y = 4
 	vehicle_move_delay = 1
-	var/static/image/bikecover = null
-
-
-/obj/vehicle/motorcycle/New()
-	..()
-	if(!bikecover)
-		bikecover = image("icons/vehicles/motorcycle.dmi", "motorcycle_overlay_4d")
-		bikecover.layer = MOB_LAYER + 0.1
+	var/mutable_appearance/bikecover
 
+/obj/vehicle/motorcycle/Initialize(mapload)
+	. = ..()
+	bikecover = mutable_appearance(icon, "motorcycle_overlay_4d", ABOVE_MOB_LAYER)
 
 /obj/vehicle/motorcycle/post_buckle_mob(mob/living/M)
 	add_overlay(bikecover)
@@ -28,6 +24,6 @@
 
 /obj/vehicle/motorcycle/handle_vehicle_layer()
 	if(dir == SOUTH)
-		layer = MOB_LAYER+0.1
+		layer = ABOVE_MOB_LAYER
 	else
 		layer = OBJ_LAYER

code/modules/vehicle/secway.dm

@@ -2,9 +2,10 @@
 	name = "secway"
 	desc = "A brave security cyborg gave its life to help you look like a complete tool."
 	icon_state = "secway"
-	keytype = /obj/item/key/security
+	key_type = /obj/item/key/security
 	generic_pixel_x = 0
 	generic_pixel_y = 4
+	vehicle_move_delay = 1
 
 
 /obj/item/key/security

code/modules/vehicle/snowmobile.dm

@@ -3,7 +3,7 @@
 	desc = "Wheeeeeeeeeeee."
 	icon = 'icons/obj/vehicles.dmi'
 	icon_state = "snowmobile"
-	keytype = /obj/item/key/snowmobile
+	key_type = /obj/item/key/snowmobile
 	generic_pixel_x = 0
 	generic_pixel_y = 4
 

code/modules/vehicle/speedbike.dm

@@ -3,16 +3,14 @@
 	icon = 'icons/obj/bike.dmi'
 	icon_state = "speedbike_blue"
 	layer = MOB_LAYER - 0.1
-	keytype = null
 	vehicle_move_delay = 0
 	var/overlay_state = "cover_blue"
-	var/image/overlay = null
+	var/mutable_appearance/overlay
 
-/obj/vehicle/space/speedbike/New()
-	..()
-	overlay = image("icons/obj/bike.dmi", overlay_state)
-	overlay.layer = MOB_LAYER + 0.1
-	overlays += overlay
+/obj/vehicle/space/speedbike/Initialize(mapload)
+	. = ..()
+	overlay = mutable_appearance(icon, overlay_state, ABOVE_MOB_LAYER)
+	add_overlay(overlay)
 
 /obj/vehicle/space/speedbike/Move(newloc,move_dir)
 	if(has_buckled_mobs())

code/modules/vehicle/sportscar.dm

@@ -6,14 +6,11 @@
 	generic_pixel_x = 0
 	generic_pixel_y = 4
 	vehicle_move_delay = 1
-	var/static/image/carcover = null
+	var/mutable_appearance/carcover
 
-
-/obj/vehicle/car/New()
-	..()
-	if(!carcover)
-		carcover = image("icons/vehicles/sportscar.dmi", "sportscar_cover")
-		carcover.layer = MOB_LAYER + 0.1
+/obj/vehicle/car/Initialize(mapload)
+	. = ..()
+	carcover = mutable_appearance(icon, "sportscar_cover", ABOVE_MOB_LAYER)
 
 /obj/vehicle/car/post_buckle_mob(mob/living/M)
 	add_overlay(carcover)
@@ -46,6 +43,6 @@
 
 /obj/vehicle/car/handle_vehicle_layer()
 	if(dir == SOUTH)
-		layer = MOB_LAYER+0.1
+		layer = ABOVE_MOB_LAYER
 	else
 		layer = OBJ_LAYER

code/modules/vehicle/vehicle.dm

@@ -9,8 +9,12 @@
 	can_buckle = TRUE
 	buckle_lying = FALSE
 	armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0)
-	var/keytype = null //item typepath, if non-null an item of this type is needed in your hands to drive this vehicle
-	var/next_vehicle_move = 0 //used for move delays
+	var/key_type
+	var/held_key_type //Similar to above, but the vehicle needs the key in hands as opposed to inserted into the ignition
+	var/obj/item/key/inserted_key
+	var/key_type_exact = TRUE		//can subtypes work
+	var/last_vehicle_move = 0 //used for move delays
+	var/last_move_diagonal = FALSE
 	var/vehicle_move_delay = 2 //tick delay between movements, lower = faster, higher = slower
 	var/auto_door_open = TRUE
 	var/needs_gravity = 0 //To allow non-space vehicles to move in no gravity or not, mostly for adminbus
@@ -20,10 +24,56 @@
 	var/spaceworthy = FALSE
 
 
-/obj/vehicle/New()
-	..()
+/obj/vehicle/Initialize(mapload)
+	. = ..()
 	handle_vehicle_layer()
 
+/obj/vehicle/Destroy()
+	QDEL_NULL(inserted_key)
+	return ..()
+
+/obj/vehicle/examine(mob/user)
+	. = ..()
+	if(key_type)
+		if(!inserted_key)
+			. += "<span class='notice'>Put a key inside it by clicking it with the key.</span>"
+		else
+			. += "<span class='notice'>Alt-click [src] to remove the key.</span>"
+
+/obj/vehicle/attackby(obj/item/I, mob/user, params)
+	if(key_type && !is_key(inserted_key) && is_key(I))
+		if(user.drop_item())
+			I.forceMove(src)
+			to_chat(user, "<span class='notice'>You insert [I] into [src].</span>")
+			if(inserted_key)	//just in case there's an invalid key
+				inserted_key.forceMove(drop_location())
+			inserted_key = I
+		else
+			to_chat(user, "<span class='warning'>[I] seems to be stuck to your hand!</span>")
+		return
+	return ..()
+
+/obj/vehicle/AltClick(mob/user)
+	if(inserted_key && user.Adjacent(user))
+		if(!(user in buckled_mobs))
+			to_chat(user, "<span class='warning'>You must be riding [src] to remove [src]'s key!</span>")
+			return
+		to_chat(user, "<span class='notice'>You remove [inserted_key] from [src].</span>")
+		inserted_key.forceMove(drop_location())
+		user.put_in_hands(inserted_key)
+		inserted_key = null
+	return ..()
+
+/obj/vehicle/proc/is_key(obj/item/I)
+	return I ? (key_type_exact ? (I.type == key_type) : istype(I, key_type)) : FALSE
+
+/obj/vehicle/proc/held_keycheck(mob/user)
+	if(held_key_type)
+		if(istype(user.l_hand, held_key_type) || istype(user.r_hand, held_key_type))
+			return TRUE
+	else
+		return TRUE
+	return FALSE
 
 //APPEARANCE
 /obj/vehicle/proc/handle_vehicle_layer()
@@ -49,15 +99,6 @@
 	return
 
 
-//KEYS
-/obj/vehicle/proc/keycheck(mob/user)
-	if(keytype)
-		if(istype(user.l_hand, keytype) || istype(user.r_hand, keytype))
-			return TRUE
-	else
-		return TRUE
-	return FALSE
-
 /obj/item/key
 	name = "key"
 	desc = "A small grey key."
@@ -93,25 +134,30 @@
 
 //MOVEMENT
 /obj/vehicle/relaymove(mob/user, direction)
+	if(key_type && !is_key(inserted_key))
+		to_chat(user, "<span class='warning'>[src] has no key inserted!</span>")
+		return
+
 	if(user.incapacitated())
 		unbuckle_mob(user)
 		return
 
-	if(world.time < next_vehicle_move)
+	if(world.time < last_vehicle_move + ((last_move_diagonal? 2 : 1) * (vehicle_move_delay + config.human_delay)))
 		return
-	next_vehicle_move = world.time + vehicle_move_delay
-	if(keycheck(user))
+	last_vehicle_move = world.time
+
+	if(held_keycheck(user))
+		var/turf/next = get_step(src, direction)
 		if(!Process_Spacemove(direction) || !isturf(loc))
 			return
 		step(src, direction)
 
-		if(has_buckled_mobs())
-			for(var/m in buckled_mobs)
-				var/mob/living/buckled_mob = m
-				if(buckled_mob.loc != loc)
-					buckled_mob.buckled = null //Temporary, so Move() succeeds.
-					buckled_mob.buckled = src //Restoring
+		if((direction & (direction - 1)) && (loc == next))		//moved diagonally
+			last_move_diagonal = TRUE
+		else
+			last_move_diagonal = FALSE
 
+		if(has_buckled_mobs())
 			if(issimulatedturf(loc))
 				var/turf/simulated/T = loc
 				if(T.wet == TURF_WET_LUBE)	//Lube! Fall off!
@@ -125,20 +171,15 @@
 		handle_vehicle_layer()
 		handle_vehicle_offsets()
 	else
-		to_chat(user, "<span class='notice'>You'll need the keys in one of your hands to drive \the [name].</span>")
+		to_chat(user, "<span class='warning'>You'll need the keys in one of your hands to drive [src].</span>")
 
 
-/obj/vehicle/Move(NewLoc,Dir=0,step_x=0,step_y=0)
+/obj/vehicle/Move(NewLoc, Dir = 0, step_x = 0, step_y = 0)
 	. = ..()
 	handle_vehicle_layer()
 	handle_vehicle_offsets()
 
 
-/obj/vehicle/attackby(obj/item/I, mob/user, params)
-	if(keytype && istype(I, keytype))
-		to_chat(user, "Hold [I] in one of your hands while you drive \the [name].")
-
-
 /obj/vehicle/Bump(atom/movable/M)
 	if(!spaceworthy && isspaceturf(get_turf(src)))
 		return FALSE