Merge remote-tracking branch 'citadel/master' into combat_rework

code/modules/vehicles/atv.dm

@@ -60,3 +60,23 @@
 				turret.pixel_x = 12
 				turret.pixel_y = 4
 				turret.layer = OBJ_LAYER
+
+/obj/vehicle/ridden/atv/snowmobile
+	name = "snowmobile"
+	desc = "a tracked vehicle designed for use in the snow, it looks like it would have difficulty moving elsewhere, however."
+	icon_state = "snowmobile"
+
+/obj/vehicle/ridden/atv/snowmobile/Moved()
+	. = ..()
+	var/static/list/snow_typecache = typecacheof(list(/turf/open/floor/plating/asteroid/snow/icemoon, /turf/open/floor/plating/snowed/smoothed/icemoon))
+	var/datum/component/riding/E = LoadComponent(/datum/component/riding)
+	if(snow_typecache[loc.type])
+		E.vehicle_move_delay = 1
+	else
+		E.vehicle_move_delay = 2
+
+/obj/vehicle/ridden/atv/snowmobile/snowcurity
+	name = "security snowmobile"
+	desc = "for when you want to look like even more of a tool than riding a secway."
+	icon_state = "snowcurity"
+	key_type = /obj/item/key/security

code/modules/vehicles/cars/car.dm

@@ -51,10 +51,10 @@
 
 /obj/vehicle/sealed/car/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
 	if(!I.force)
-		return
+		return FALSE
 	if(occupants[user])
 		to_chat(user, "<span class='notice'>Your attack bounces off of the car's padded interior.</span>")
-		return
+		return FALSE
 	return ..()
 
 /obj/vehicle/sealed/car/attack_hand(mob/living/user)