Merge pull request #5216 from MistakeNot4892/port/quads

Porting quadbikes from Polaris.

Author: out-of-phaze

code/datums/composite_sounds/vehicle_engine.dm

@@ -0,0 +1,7 @@
+/datum/composite_sound/vehicle_engine
+	start_sound = 'sound/machines/vehicle/engine_start.ogg'
+	start_length = 2
+	mid_sounds = list('sound/machines/vehicle/engine_mid.ogg'=1)
+	mid_length = 6
+	end_sound = 'sound/machines/vehicle/engine_end.ogg'
+	play_volume = 20

code/datums/supplypacks/operations.dm

@@ -3,13 +3,13 @@
 
 /decl/hierarchy/supply_pack/operations/cargotrain
 	name = "Equipment - Cargo Train Tug"
-	contains = list(/obj/vehicle/train/cargo/engine)
+	contains = list(/obj/vehicle/train/engine)
 	containertype = /obj/structure/largecrate
 	containername = "cargo train tug crate"
 
 /decl/hierarchy/supply_pack/operations/cargotrailer
 	name = "Equipment - Cargo Train Trolley"
-	contains = list(/obj/vehicle/train/cargo/trolley)
+	contains = list(/obj/vehicle/train/trolley)
 	containertype = /obj/structure/largecrate
 	containername = "cargo train trolley crate"
 

code/game/turfs/flooring/_flooring.dm

@@ -394,3 +394,6 @@ var/global/list/flooring_cache = list()
 /// contaminant is, optionally, the material of the coating that wants to be added.
 /decl/flooring/proc/can_show_coating_footprints(turf/target, decl/material/contaminant)
 	return TRUE
+
+/decl/flooring/proc/get_vehicle_transit_delay(obj/vehicle/vehicle)
+	return vehicle::base_speed

code/game/turfs/flooring/flooring_grass.dm

@@ -50,6 +50,9 @@
 		return TRUE
 	return ..()
 
+/decl/flooring/grass/get_vehicle_transit_delay(obj/vehicle/vehicle)
+	return 1
+
 /decl/flooring/grass/fake
 	desc            = "Do they smoke grass out in space, Bowie? Or do they smoke AstroTurf?"
 	icon            = 'icons/turf/flooring/fakegrass.dmi'
@@ -58,3 +61,6 @@
 	build_type      = /obj/item/stack/tile/grass
 	force_material  = /decl/material/solid/organic/plastic
 	uid                = "floor_grass_fake"
+
+/decl/flooring/grass/fake/get_vehicle_transit_delay(obj/vehicle/vehicle)
+	return vehicle::base_speed

code/game/turfs/flooring/flooring_mud.dm

@@ -34,6 +34,9 @@
 		return FALSE
 	return ..()
 
+/decl/flooring/mud/get_vehicle_transit_delay(obj/vehicle/vehicle)
+	return vehicle.vehicle_transit_type == vehicle::VEHICLE_SNOWMOBILE ? 1.4 : 1.5
+
 /decl/flooring/dry_mud
 	name            = "dry mud"
 	desc            = "This was once mud, but forgot to keep hydrated."
@@ -48,6 +51,9 @@
 	force_material  = /decl/material/solid/soil
 	uid             = "floor_dry_mud"
 
+/decl/flooring/dry_mud/get_vehicle_transit_delay(obj/vehicle/vehicle)
+	return 1
+
 /decl/flooring/dry_mud/fluid_act(turf/floor/target, datum/reagents/fluids)
 	if(target.get_topmost_flooring() == src)
 		target.set_flooring(/decl/flooring/mud)
@@ -80,3 +86,6 @@
 		target.set_base_flooring(/decl/flooring/mud)
 		. = TRUE
 	return . || ..()
+
+/decl/flooring/dirt/get_vehicle_transit_delay(obj/vehicle/vehicle)
+	return 1

code/game/turfs/flooring/flooring_natural.dm

@@ -73,6 +73,9 @@
 	force_material  = /decl/material/solid/ice
 	uid             = "floor_ice"
 
+/decl/flooring/ice/get_vehicle_transit_delay(obj/vehicle/vehicle)
+	return vehicle.vehicle_transit_type == vehicle::VEHICLE_SNOWMOBILE ? 0.8 : ..()
+
 /decl/flooring/ice/update_turf_icon(turf/floor/target)
 	. = ..()
 	if(istype(target))

code/game/turfs/flooring/flooring_rock.dm

@@ -15,3 +15,6 @@
 	ASSERT(turf_material?.adjective_name)
 	target.SetName("[turf_material.adjective_name] [name]")
 	target.desc = "An expanse of bare [turf_material.solid_name]."
+
+/decl/flooring/rock/get_vehicle_transit_delay(obj/vehicle/vehicle)
+	return vehicle.vehicle_transit_type == vehicle::VEHICLE_SNOWMOBILE ? 1.5 : ..()

code/game/turfs/flooring/flooring_snow.dm

@@ -48,6 +48,9 @@
 		return FALSE
 	return ..()
 
+/decl/flooring/snow/get_vehicle_transit_delay(obj/vehicle/vehicle)
+	return vehicle.vehicle_transit_type == vehicle::VEHICLE_SNOWMOBILE ? 0.8 : 1.7
+
 /decl/flooring/permafrost
 	name            = "permafrost"
 	desc            = "A stretch of frozen soil that hasn't seen a thaw for many seasons."
@@ -56,8 +59,16 @@
 	force_material  = /decl/material/solid/ice
 	uid             = "floor_permafrost"
 
+/decl/flooring/permafrost/get_vehicle_transit_delay(obj/vehicle/vehicle)
+	if(holographic)
+		return vehicle::base_speed
+	if(vehicle.vehicle_transit_type == vehicle::VEHICLE_SNOWMOBILE)
+		return 0.8
+	return ..()
+
 /decl/flooring/snow/fake
 	name            = "holosnow"
 	desc            = "Not quite the same as snow on an entertainment terminal, but close."
 	holographic     = TRUE
 	uid             = "floor_snow_fake"
+

code/game/turfs/floors/_floor.dm

@@ -199,3 +199,9 @@
 
 /turf/floor/can_show_coating_footprints(decl/material/contaminant = null)
 	return ..() && get_topmost_flooring()?.can_show_coating_footprints(src, contaminant)
+
+/turf/floor/proc/get_vehicle_transit_delay(obj/vehicle/vehicle)
+	var/decl/flooring/terrain = get_topmost_flooring()
+	if(!istype(vehicle) || QDELETED(vehicle) || !istype(terrain) || vehicle.vehicle_transit_type == vehicle::VEHICLE_GENERIC)
+		return vehicle::base_speed
+	return terrain.get_vehicle_transit_delay(vehicle)

code/modules/mob/mob.dm

@@ -713,7 +713,7 @@ var/global/const/ACTION_DANGER_ALL = 2
 		return TRUE
 	if(!anchored && istype(over, /obj/vehicle/train))
 		var/obj/vehicle/train/beep = over
-		if(!beep.load(src))
+		if(!beep.load_onto_vehicle(src))
 			to_chat(user, SPAN_WARNING("You were unable to load \the [src] onto \the [over]."))
 		return TRUE
 	. = ..()