diff --git a/code/__DEFINES/armor.dm b/code/__DEFINES/armor.dm
index 790d19d3988..35ffad15606 100644
--- a/code/__DEFINES/armor.dm
+++ b/code/__DEFINES/armor.dm
@@ -1055,3 +1055,107 @@ GLOBAL_LIST_INIT(all_armor_types, list(
 		"acid" = 0, \
 		"wound" = 0, \
 		"damage_threshold" = 10)
+
+/* VEHICLE ARMOR VALUES
+*
+*
+********/
+
+/*
+ * Uncovered vehicle 'armor', for buggies or bicycles
+ * * * * * * * * * * * */
+#define ARMOR_VALUE_VEHICLE_BUGGY list(\
+		"melee" = 20, \
+		"bullet" = 10, \
+		"laser" = 10, \
+		"energy" = 5, \
+		"bomb" = 0, \
+		"bio" = 50, \
+		"rad" = 25, \
+		"fire" = 50, \
+		"acid" = 50, \
+		"wound" = 50, \
+		"damage_threshold" = 0)
+
+/*
+ * Light duty vehicles like regular cars
+ * * * * * * * * * * * */
+#define ARMOR_VALUE_VEHICLE_CAR list(\
+		"melee" = 30, \
+		"bullet" = 15, \
+		"laser" = 15, \
+		"energy" = 5, \
+		"bomb" = 10, \
+		"bio" = 50, \
+		"rad" = 25, \
+		"fire" = 50, \
+		"acid" = 50, \
+		"wound" = 50, \
+		"damage_threshold" = 3)
+
+/*
+ * Heavy-duty vehicles like trucks
+ * Built tough to withstand more abuse
+ * * * * * * * * * * * */
+#define ARMOR_VALUE_VEHICLE_TRUCK list(\
+		"melee" = 45, \
+		"bullet" = 20, \
+		"laser" = 20, \
+		"energy" = 10, \
+		"bomb" = 25, \
+		"bio" = 50, \
+		"rad" = 25, \
+		"fire" = 50, \
+		"acid" = 50, \
+		"wound" = 50, \
+		"damage_threshold" = 5)
+
+/*
+ * Light vehicles with DIY armor added to vulnerable areas
+ * * * * * * * * * * * */
+#define ARMOR_VALUE_VEHICLE_ARMORED_LIGHT list(\
+		"melee" = 50, \
+		"bullet" = 25, \
+		"laser" = 20, \
+		"energy" = 20, \
+		"bomb" = 35, \
+		"bio" = 50, \
+		"rad" = 50, \
+		"fire" = 50, \
+		"acid" = 50, \
+		"wound" = 50, \
+		"damage_threshold" = 8)
+
+/*
+ * Heavy vehicles with a significant amount of armor added
+ * Generally, purpose-built to withstand a decent amount of attacks
+ * * * * * * * * * * * */
+#define ARMOR_VALUE_VEHICLE_ARMORED list(\
+		"melee" = 65, \
+		"bullet" = 40, \
+		"laser" = 40, \
+		"energy" = 35, \
+		"bomb" = 35, \
+		"bio" = 50, \
+		"rad" = 50, \
+		"fire" = 50, \
+		"acid" = 50, \
+		"wound" = 50, \
+		"damage_threshold" = 10)
+
+/*
+ * Very sturdy vehicles designed for frontline combat
+ * Expected to survive a lot of attacks and dish out punishment
+ * * * * * * * * * * * */
+#define ARMOR_VALUE_VEHICLE_TANK list(\
+		"melee" = 75, \
+		"bullet" = 55, \
+		"laser" = 55, \
+		"energy" = 50, \
+		"bomb" = 50, \
+		"bio" = 50, \
+		"rad" = 50, \
+		"fire" = 50, \
+		"acid" = 50, \
+		"wound" = 50, \
+		"damage_threshold" = 12)
\ No newline at end of file
diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm
index 7951b190e02..daf0a9e6b6b 100644
--- a/code/__DEFINES/construction.dm
+++ b/code/__DEFINES/construction.dm
@@ -120,6 +120,8 @@
 //#define CAT_EXPLOSIVE "Explosives"
 #define CAT_VEHICLES "Vehicles"
 #define CAT_VEHICLEPARTS "Vehicle Parts"
+#define CAT_VEHICLEWEAPONS "Vehicle Weapons"
+#define CAT_VEHICLEAMMO "Vehicle Ammo"
 
 #define RCD_FLOORWALL 1
 #define RCD_AIRLOCK 2
diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
index a2358423242..eace9775c9b 100644
--- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
+++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
@@ -567,19 +567,6 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
 
-/datum/crafting_recipe/lmgammo
-	name = "LMG Ammo for vehicules"
-	result = /obj/item/mecha_ammo/lmg/craftable
-	reqs = list(/obj/item/stack/crafting/metalparts = 5,
-	/obj/item/stack/sheet/prewar = 5,
-	/obj/item/ammo_box/a556 = 2,
-	/obj/item/stack/sheet/mineral/titanium = 1,
-	)
-	tools = list(TOOL_AWORKBENCH)
-	time = 5
-	category = CAT_WEAPONRY
-	subcategory = CAT_AMMO
-
 /////////////////
 ///GUN CRAFTING//
 /////////////////
@@ -681,19 +668,6 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
 
-/datum/crafting_recipe/gun/HMGvehicule
-	name = "Improvised HMG (for vehicules)"
-	result = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/hobo
-	reqs = list(/obj/item/gun/ballistic/automatic/autopipe = 2,
-	/obj/item/stack/crafting/metalparts = 10,
-	/obj/item/stack/sheet/prewar = 8,
-	/obj/item/stack/sheet/mineral/titanium = 8,
-	/obj/item/stack/rods = 2)
-	tools = list(TOOL_WORKBENCH)
-	time = 180
-	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
-
 /datum/crafting_recipe/gun/shotgunbat
 	name = "Shotgun bat"
 	result = /obj/item/gun/ballistic/revolver/hobo/single_shotgun
diff --git a/code/datums/components/crafting/recipes/vehicle_parts.dm b/code/datums/components/crafting/recipes/vehicles/vehicle_parts.dm
similarity index 100%
rename from code/datums/components/crafting/recipes/vehicle_parts.dm
rename to code/datums/components/crafting/recipes/vehicles/vehicle_parts.dm
diff --git a/code/datums/components/crafting/recipes/vehicles/vehicle_weapons.dm b/code/datums/components/crafting/recipes/vehicles/vehicle_weapons.dm
new file mode 100644
index 00000000000..2d3230ef008
--- /dev/null
+++ b/code/datums/components/crafting/recipes/vehicles/vehicle_weapons.dm
@@ -0,0 +1,64 @@
+/datum/crafting_recipe/lmgammo
+	name = "LMG Ammo for vehicules"
+	result = /obj/item/mecha_ammo/lmg/craftable
+	reqs = list(/obj/item/ammo_box/a556 = 1)
+	tools = list(TOOL_WORKBENCH)
+	time = 5
+	category = CAT_VEHICLES
+	subcategory = CAT_VEHICLEAMMO
+
+/datum/crafting_recipe/gun/LMGvehicule
+	name = "Improvised LMG (for vehicules)"
+	result = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/hobo
+	reqs = list(/obj/item/gun/ballistic/automatic/autopipe = 2,
+	/obj/item/stack/crafting/metalparts = 10,
+	/obj/item/stack/sheet/prewar = 8,
+	/obj/item/stack/sheet/mineral/titanium = 8,
+	/obj/item/stack/rods = 2)
+	tools = list(TOOL_WORKBENCH)
+	time = 180
+	category = CAT_VEHICLES
+	subcategory = CAT_VEHICLEWEAPONS
+
+/datum/crafting_recipe/gun/lasermount_vehicle
+	name = "vehicle-mounted laser rifle"
+	result = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
+	reqs = list(/obj/item/stock_parts/scanning_module/phasic = 3,
+	/obj/item/stack/crafting/goodparts = 5,
+	/obj/item/stack/sheet/prewar = 10,
+	/obj/item/stack/sheet/mineral/titanium = 5,
+	/obj/item/stack/sheet/mineral/gold = 3,
+	/obj/item/stack/rods = 2)
+	tools = list(TOOL_AWORKBENCH)
+	time = 180
+	category = CAT_VEHICLES
+	subcategory = CAT_VEHICLEWEAPONS
+
+/datum/crafting_recipe/gun/heavylasermount_vehicle
+	name = "vehicle-mounted heavy laser rifle"
+	result = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
+	reqs = list(/obj/item/stock_parts/scanning_module/phasic = 6,
+	/obj/item/stack/crafting/goodparts = 10,
+	/obj/item/stack/sheet/prewar = 10,
+	/obj/item/stack/sheet/mineral/titanium = 10,
+	/obj/item/stack/sheet/mineral/gold = 5,
+	/obj/item/stack/rods = 2)
+	tools = list(TOOL_AWORKBENCH)
+	time = 180
+	category = CAT_VEHICLES
+	subcategory = CAT_VEHICLEWEAPONS
+
+/datum/crafting_recipe/gun/plasmamount_vehicle
+	name = "vehicle-mounted Plasma caster"
+	result = /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma
+	reqs = list(/obj/item/stock_parts/micro_laser/ultra = 6,
+	/obj/item/stack/crafting/goodparts = 10,
+	/obj/item/stack/sheet/prewar = 10,
+	/obj/item/stack/sheet/mineral/titanium = 10,
+	/obj/item/stack/sheet/mineral/diamond = 5,
+	/obj/item/stack/sheet/mineral/gold = 10,
+	/obj/item/stack/rods = 2)
+	tools = list(TOOL_AWORKBENCH)
+	time = 180
+	category = CAT_VEHICLES
+	subcategory = CAT_VEHICLEWEAPONS
diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm
index 92e90c6d27a..86e68ce9fb8 100644
--- a/code/game/mecha/combat/combat.dm
+++ b/code/game/mecha/combat/combat.dm
@@ -3,8 +3,6 @@
 	internal_damage_threshold = 50
 	armor = ARMOR_VALUE_HEAVY
 	mouse_pointer = 'icons/mecha/mecha_mouse.dmi'
-	deflect_chance = 0
-	max_equip = 4
 	stepsound = 'sound/mecha/neostep2.ogg'
 
 /obj/mecha/combat/proc/max_ammo() //Max the ammo stored for Nuke Ops mechs, or anyone else that calls this
diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm
index 4e81f0510bc..4200a63e885 100644
--- a/code/game/mecha/combat/gygax.dm
+++ b/code/game/mecha/combat/gygax.dm
@@ -29,7 +29,6 @@
 	max_temperature = 35000
 	leg_overload_coeff = 100
 	wreckage = /obj/structure/mecha_wreckage/gygax/dark
-	max_equip = 4
 
 /obj/mecha/combat/gygax/dark/loaded/Initialize()
 	. = ..()
diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm
index 825a3da6f41..9f5071dee91 100644
--- a/code/game/mecha/combat/marauder.dm
+++ b/code/game/mecha/combat/marauder.dm
@@ -52,7 +52,6 @@
 	wreckage = /obj/structure/mecha_wreckage/seraph
 	internal_damage_threshold = 20
 	force = 65
-	max_equip = 5
 
 /obj/mecha/combat/marauder/seraph/Initialize()
 	. = ..()
@@ -74,8 +73,6 @@
 	name = "\improper Mauler"
 	icon_state = "mauler"
 	wreckage = /obj/structure/mecha_wreckage/mauler
-	max_equip = 5
-
 /obj/mecha/combat/marauder/mauler/loaded/Initialize()
 	. = ..()
 	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg(src)
diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm
index 36fafd45769..c9f0b0199c7 100644
--- a/code/game/mecha/combat/phazon.dm
+++ b/code/game/mecha/combat/phazon.dm
@@ -6,7 +6,6 @@
 	dir_in = 2 //Facing South.
 	step_energy_drain = 3
 	max_integrity = 200
-	deflect_chance = 30
 	armor = ARMOR_VALUE_HEAVY
 	max_temperature = 25000
 	infra_luminosity = 3
@@ -14,7 +13,6 @@
 	add_req_access = 1
 	internal_damage_threshold = 25
 	force = 15
-	max_equip = 3
 	phase_state = "phazon-phase"
 
 /obj/mecha/combat/phazon/GrantActions(mob/living/user, human_occupant = 0)
@@ -27,1299 +25,3 @@
 	..()
 	switch_damtype_action.Remove(user)
 	phasing_action.Remove(user)
-
-//////////// VERTIBIRD //////////////
-
-/obj/mecha/combat/phazon/vertibird
-	name = "\improper Vertibird"
-	desc = "A real useable, and working vertibird, maintained with luck, sweat, and ducktape. This one seems to be more focused toward combat."
-	icon = 'icons/mecha/vb-vertibird.dmi'
-	icon_state = "vb"
-	pixel_x = -138
-	pixel_y = -138
-	layer = ABOVE_MOB_LAYER
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 0.6
-	dir_in = 2
-	step_energy_drain = 0.75
-	max_integrity = 150
-	deflect_chance = 30
-	armor = ARMOR_VALUE_LIGHT
-	max_temperature = 25000
-	infra_luminosity = 1
-	wreckage = /obj/structure/mecha_wreckage/vertibird
-	add_req_access = 1
-	internal_damage_threshold = 25
-	force = 15
-	max_equip = 6
-	opacity = 0
-	canstrafe = TRUE
-	movement_type = FLYING
-	stepsound = 'sound/f13machines/vertibird_loop.ogg'
-	turnsound = 'sound/f13machines/vertibird_loop.ogg'
-
-/obj/structure/mecha_wreckage/vertibird
-	name = "\improper Vertibird Wreck"
-	desc = "Mayday, Mayday, Vertibird going down... IN STYLE."
-	icon = 'icons/mecha/vb-vertibird.dmi'
-	icon_state = "vb-broken"
-	pixel_x = -138
-	pixel_y = -138
- 
-/obj/mecha/combat/phazon/vertibird/GrantActions(mob/living/user, human_occupant = 0) 
-	internals_action.Grant(user, src)
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	strafing_action.Grant(user, src)
-	zoom_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	landing_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/vertibird/RemoveActions(mob/living/user, human_occupant = 0)
-	internals_action.Remove(user)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	strafing_action.Remove(user)
-	zoom_action.Remove(user)
-	eject_action.Remove(user)
-	landing_action.Remove(user)
-
-/obj/mecha/combat/phazon/vertibird/obj_destruction()
-	for(var/mob/M in src)
-		to_chat(M, span_brass("The vertibird is going to Crash"))
-		M.dust()
-	playsound(src, 'sound//f13machines//vertibird_crash.ogg', 100, 0)
-	src.visible_message(span_userdanger("The reactor has gone critical, its going to blow!"))
-	addtimer(CALLBACK(src,.proc/go_critical),breach_time)
-
-/obj/mecha/combat/phazon/vertibird/proc/go_critical()
-	explosion(get_turf(loc))
-	Destroy(src)
-
-/obj/mecha/combat/phazon/vertibird/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/medical/sleeper
-	ME.attach(src)
-	max_ammo()
-
-///NCR VERTIBIRD
-
-/obj/mecha/combat/phazon/vertibird/ncr
-	name = "\improper NCR Vertibird"
-	desc = "A real useable, and working vertibird, maintained with luck, sweat, and ducktape. This one seems to be more focused toward Troop transport, and his painted in the colors of the NCR."
-	icon = 'icons/mecha/vb-vertibird-ncr.dmi'
-	icon_state = "vb"
-	pixel_x = -138
-	pixel_y = -138
-	layer = ABOVE_MOB_LAYER
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 0.8
-	dir_in = 2
-	step_energy_drain = 0.7
-	max_integrity = 200
-	deflect_chance = 30
-	armor = ARMOR_VALUE_LIGHT
-	max_temperature = 25000
-	infra_luminosity = 1
-	wreckage = /obj/structure/mecha_wreckage/vertibird
-	add_req_access = 1
-	internal_damage_threshold = 25
-	force = 15
-	max_equip = 8
-	opacity = 0
-	canstrafe = TRUE
-	movement_type = FLYING
-	stepsound = 'sound/f13machines/vertibird_loop.ogg'
-	turnsound = 'sound/f13machines/vertibird_loop.ogg'
-
-/obj/mecha/combat/phazon/vertibird/ncr/GrantActions(mob/living/user, human_occupant = 0) 
-	internals_action.Grant(user, src)
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	strafing_action.Grant(user, src)
-	zoom_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	smoke_action.Grant(user, src)
-	landing_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/vertibird/ncr/RemoveActions(mob/living/user, human_occupant = 0)
-	internals_action.Remove(user)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	strafing_action.Remove(user)
-	zoom_action.Remove(user)
-	eject_action.Remove(user)
-	smoke_action.Remove(user)
-	landing_action.Remove(user)
-
-/obj/mecha/combat/phazon/vertibird/ncr/obj_destruction()
-	for(var/mob/M in src)
-		to_chat(M, span_brass(" The vertibird is going to Crash !"))
-		M.dust()
-	playsound(src, 'sound//f13machines//vertibird_crash.ogg', 100, 0)
-	src.visible_message(span_userdanger("The reactor has gone critical, its going to blow!"))
-	addtimer(CALLBACK(src,.proc/go_critical),breach_time)
-
-/obj/mecha/combat/phazon/vertibird/ncr/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/medical/sleeper
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/medical/sleeper
-	ME.attach(src)
-	max_ammo()
-
-///VERTIBIRD ENCLAVE
-
-/obj/mecha/combat/phazon/vertibird/enclave
-	name = "\improper Enclave Naval Vertibird"
-	desc = "A real useable, and working vertibird, maintained with luck, sweat, and ducktape. This one seems to be more focused toward combat, and be stored in a ship. Thats peak Enclave tech."
-	icon = 'icons/mecha/vb-vertibird-enclave.dmi'
-	icon_state = "vb"
-	pixel_x = -138
-	pixel_y = -138
-	layer = ABOVE_MOB_LAYER
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 0.6
-	dir_in = 2
-	step_energy_drain = 0.75
-	max_integrity = 150
-	deflect_chance = 30
-	armor = ARMOR_VALUE_LIGHT
-	max_temperature = 25000
-	infra_luminosity = 1
-	wreckage = /obj/structure/mecha_wreckage/vertibird
-	add_req_access = 1
-	internal_damage_threshold = 25
-	force = 15
-	max_equip = 6
-	opacity = 0
-	canstrafe = TRUE
-	movement_type = FLYING
-	stepsound = 'sound/f13machines/vertibird_loop.ogg'
-	turnsound = 'sound/f13machines/vertibird_loop.ogg'
-
-/obj/mecha/combat/phazon/vertibird/enclave/GrantActions(mob/living/user, human_occupant = 0) 
-	internals_action.Grant(user, src)
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	strafing_action.Grant(user, src)
-	zoom_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	landing_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/vertibird/enclave/RemoveActions(mob/living/user, human_occupant = 0)
-	internals_action.Remove(user)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	strafing_action.Remove(user)
-	zoom_action.Remove(user)
-	eject_action.Remove(user)
-	landing_action.Remove(user)
-
-/obj/mecha/combat/phazon/vertibird/enclave/obj_destruction()
-	for(var/mob/M in src)
-		to_chat(M, span_brass(" The vertibird is going to Crash !"))
-		M.dust()
-	playsound(src, 'sound//f13machines//vertibird_crash.ogg', 100, 0)
-	src.visible_message(span_userdanger("The reactor has gone critical, its going to blow!"))
-	addtimer(CALLBACK(src,.proc/go_critical),breach_time)
-
-/obj/mecha/combat/phazon/vertibird/enclave/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	max_ammo()
-
-/// BOS Vertibird
-
-/obj/mecha/combat/phazon/vertibird/brotherhood
-	name = "\improper Brotherhood Vertibird"
-	desc = "A real useable, and working vertibird, maintained with luck, sweat, and ducktape. This one seems to be more focused toward combat, and marked with brotherhood markings."
-	icon = 'icons/mecha/vb-vertibird-bos.dmi'
-	icon_state = "vb"
-	pixel_x = -138
-	pixel_y = -138
-	layer = ABOVE_MOB_LAYER
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 0.6
-	dir_in = 2
-	step_energy_drain = 0.75
-	max_integrity = 150
-	deflect_chance = 30
-	armor = ARMOR_VALUE_LIGHT
-	max_temperature = 25000
-	infra_luminosity = 1
-	wreckage = /obj/structure/mecha_wreckage/vertibird
-	add_req_access = 1
-	internal_damage_threshold = 25
-	force = 15
-	max_equip = 6
-	opacity = 0
-	canstrafe = TRUE
-	movement_type = FLYING
-	stepsound = 'sound/f13machines/vertibird_loop.ogg'
-	turnsound = 'sound/f13machines/vertibird_loop.ogg'
-
-/obj/mecha/combat/phazon/vertibird/brotherhood/GrantActions(mob/living/user, human_occupant = 0) 
-	internals_action.Grant(user, src)
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	strafing_action.Grant(user, src)
-	zoom_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	landing_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/vertibird/brotherhood/RemoveActions(mob/living/user, human_occupant = 0)
-	internals_action.Remove(user)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	strafing_action.Remove(user)
-	zoom_action.Remove(user)
-	eject_action.Remove(user)
-	landing_action.Remove(user)
-
-/obj/mecha/combat/phazon/vertibird/brotherhood/obj_destruction()
-	for(var/mob/M in src)
-		to_chat(M, span_brass(" The vertibird is going to Crash !"))
-		M.dust()
-	playsound(src, 'sound//f13machines//vertibird_crash.ogg', 100, 0)
-	src.visible_message(span_userdanger("The reactor has gone critical, its going to blow!"))
-	addtimer(CALLBACK(src,.proc/go_critical),breach_time)
-
-/obj/mecha/combat/phazon/vertibird/brotherhood/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	max_ammo()
-
-//////////// NCR TRUCK //////////////
-
-/obj/mecha/combat/phazon/ncrtruck
-	name = "\improper NCR Truck"
-	desc = "A truck running on powercells. Nice eh ? still a wreck."
-	icon = 'icons/mecha/ncrtruck.dmi'
-	icon_state = "ncrtruck"
-	pixel_x = -15
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 1
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 1
-	max_temperature = 20000
-	max_integrity = 600
-	armor = ARMOR_VALUE_HEAVY
-	max_equip = 8
-	stepsound = 'sound/f13machines/buggy_loop.ogg'
-	turnsound = 'sound/f13machines/buggy_loop.ogg'
-	wreckage = /obj/structure/mecha_wreckage/ncrtruck
-	var/list/cargo = new
-	var/cargo_capacity = 30
-	var/hides = 0
-
-/obj/structure/mecha_wreckage/ncrtruck
-	name = "\improper NCR Truck wreckage"
-	desc = "Its a truck ! BROKEN TRUCK."
-	icon = 'icons/fallout/vehicles/medium_vehicles.dmi'
-	icon_state = "derelict"
-
-/obj/mecha/combat/phazon/ncrtruck/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/ncrtruck/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/ncrtruck/Destroy()
-	for(var/atom/movable/A in cargo)
-		A.forceMove(drop_location())
-		step_rand(A)
-	cargo.Cut()
-	return ..()
-
-/obj/mecha/combat/phazon/ncrtruck/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/ncrtruck/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-
-/obj/mecha/combat/phazon/ncrtruck/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-
-//////////// NCR TRUCK MP //////////////
-
-/obj/mecha/combat/phazon/ncrtruck/mp
-	name = "\improper NCR MP Truck"
-	desc = "A truck running on powercells. Nice eh ? still a wreck. This Truck has been given to the NCR MPs, and has been modified to go a bit faster. But, got less seats and is a bit less solid."
-	icon = 'icons/mecha/ncrtruck-mp.dmi'
-	icon_state = "ncrtruck"
-	pixel_x = -15
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 1
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 1
-	max_temperature = 20000
-	max_integrity = 600
-	armor = ARMOR_VALUE_HEAVY
-	max_equip = 4
-	stepsound = 'sound/f13machines/buggy_loop.ogg'
-	turnsound = 'sound/f13machines/buggy_loop.ogg'
-	wreckage = /obj/structure/mecha_wreckage/ncrtruck
-
-/obj/mecha/combat/phazon/ncrtruck/mp/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/ncrtruck/mp/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/ncrtruck/mp/Destroy()
-	for(var/atom/movable/A in cargo)
-		A.forceMove(drop_location())
-		step_rand(A)
-	cargo.Cut()
-	return ..()
-
-/obj/mecha/combat/phazon/ncrtruck/mp/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-	sirens_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/ncrtruck/mp/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-	sirens_action.Remove(user)
-
-/obj/mecha/combat/phazon/ncrtruck/mp/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-
-//Buggy 
-
-/obj/mecha/combat/phazon/buggy
-	name = "\improper Buggy"
-	desc = "A light vehicle, not very powerfull or solid, running on a powercell."
-	icon = 'icons/mecha/buggy.dmi'
-	icon_state = "buggygreen"
-	pixel_x = -15
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 0.8
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 1
-	max_temperature = 20000
-	max_integrity = 200
-	armor = ARMOR_VALUE_LIGHT
-	max_equip = 2
-	stepsound = 'sound/f13machines/buggy_loop.ogg'
-	turnsound = 'sound/f13machines/buggy_loop.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/structure/mecha_wreckage/buggy
-	name = "\improper Buggy wreckage"
-	desc = "Its a buggy ! Won't bug you anymore."
-	icon_state = "buggy-broken"
-
-/obj/mecha/combat/phazon/buggy/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/buggy/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-
-/obj/mecha/combat/phazon/buggy/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-
-//Buggydune
-
-/obj/mecha/combat/phazon/buggy/dune
-	name = "\improper Buggy"
-	desc = "A light vehicle, not very powerfull or solid, running on a powercell."
-	icon = 'icons/mecha/buggy.dmi'
-	icon_state = "buggydune"
-	pixel_x = -15
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 0.8
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 1
-	max_temperature = 20000
-	max_integrity = 200
-	armor = ARMOR_VALUE_LIGHT
-	max_equip = 2
-	stepsound = 'sound/f13machines/buggy_loop.ogg'
-	turnsound = 'sound/f13machines/buggy_loop.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/mecha/combat/phazon/buggy/dune/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/dune/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/dune/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/buggy/dune/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-
-/obj/mecha/combat/phazon/buggy/dune/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-
-//Buggyred
-
-/obj/mecha/combat/phazon/buggy/red
-	name = "\improper Buggy"
-	desc = "A light vehicle, not very powerfull or solid, running on a powercell."
-	icon = 'icons/mecha/buggy.dmi'
-	icon_state = "buggyred"
-	pixel_x = -15
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 0.8
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 1
-	max_temperature = 20000
-	max_integrity = 200
-	armor = ARMOR_VALUE_LIGHT
-	max_equip = 2
-	stepsound = 'sound/f13machines/buggy_loop.ogg'
-	turnsound = 'sound/f13machines/buggy_loop.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/mecha/combat/phazon/buggy/red/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/red/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/red/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/buggy/red/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-
-/obj/mecha/combat/phazon/buggy/red/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-
-//Buggyflame
-
-/obj/mecha/combat/phazon/buggy/flamme
-	name = "\improper Buggy"
-	desc = "A light vehicle, not very powerfull or solid, running on a powercell."
-	icon = 'icons/mecha/buggy.dmi'
-	icon_state = "buggyflame"
-	pixel_x = -15
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 0.8
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 1
-	max_temperature = 20000
-	max_integrity = 200
-	armor = ARMOR_VALUE_LIGHT
-	max_equip = 2
-	stepsound = 'sound/f13machines/buggy_loop.ogg'
-	turnsound = 'sound/f13machines/buggy_loop.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/mecha/combat/phazon/buggy/flamme/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/flamme/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/flamme/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/buggy/flamme/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-
-/obj/mecha/combat/phazon/buggy/flamme/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-
-//Buggy Ranger
-
-/obj/mecha/combat/phazon/buggy/ranger
-	name = "\improper Ranger Buggy"
-	desc = "A light vehicle, not very powerfull or solid, running on a powercell. This one as been recolored by the Rangers."
-	icon = 'icons/mecha/hanlonbuggy.dmi'
-	icon_state = "hanlonbuggy"
-	pixel_x = -15
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 0.8
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 1
-	max_temperature = 20000
-	max_integrity = 200
-	armor = ARMOR_VALUE_LIGHT
-	max_equip = 2
-	stepsound = 'sound/f13machines/buggy_loop.ogg'
-	turnsound = 'sound/f13machines/buggy_loop.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/mecha/combat/phazon/buggy/ranger/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/ranger/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/ranger/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/buggy/ranger/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-
-/obj/mecha/combat/phazon/buggy/ranger/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-
-//Buggy Ranger AND RICO
-
-/obj/mecha/combat/phazon/buggy/rangerarmed
-	name = "\improper Vet Ranger Buggy with gunner"
-	desc = "A light vehicle, not very powerfull or solid, running on a powercell. This one as been recolored by the Rangers... And Ranger Rico ''Gunner'' Davberger is gonna shoot with his shotgun."
-	icon = 'icons/mecha/buggyrangergun.dmi'
-	icon_state = "rangergun"
-	pixel_x = -15
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 1
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 1
-	max_temperature = 20000
-	max_integrity = 200
-	armor = ARMOR_VALUE_LIGHT
-	max_equip = 3
-	stepsound = 'sound/f13machines/buggy_loop.ogg'
-	turnsound = 'sound/f13machines/buggy_loop.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/mecha/combat/phazon/buggy/rangerarmed/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/rangerarmed/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/rangerarmed/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-	smoke_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/buggy/rangerarmed/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-	smoke_action.Remove(user)
-
-/obj/mecha/combat/phazon/buggy/rangerarmed/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
-	ME.attach(src)
-	max_ammo()
-
-//Legion Chariot
-
-/obj/mecha/combat/phazon/buggy/legion
-	name = "\improper Legion Chariot"
-	desc = "A light vehicle, not very powerfull or solid, running on a power cell... Okay, its a lie. Its actually run on power generated by the horse...The cell is here to make sure that some componant of the half buggy pulled by horses works."
-	icon = 'icons/mecha/buggy-legion.dmi'
-	icon_state = "legionbuggy"
-	pixel_x = -18
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 1.2
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 0.8
-	max_temperature = 20000
-	max_integrity = 250
-	armor = ARMOR_VALUE_MEDIUM
-	max_equip = 2
-	stepsound = 'sound/effects/footstep/gallop2.ogg'
-	turnsound = 'sound/effects/footstep/gallop1.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/mecha/combat/phazon/buggy/legion/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/legion/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/legion/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/buggy/legion/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-
-/obj/mecha/combat/phazon/buggy/legion/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-
-//Buggy Legion AND MESALLA
-
-/obj/mecha/combat/phazon/buggy/legionarmed
-	name = "\improper Legion Chariot with gunner"
-	desc = "A light vehicle, not very powerfull or solid, running on a power cell... Okay, its a lie. Its actually run on power generated by the horse...The cell is here to make sure that some componant of the half buggy pulled by horses works. This one as been recolored by the legions... And Prime Decanus Messala ''Gunner'' Davius is gonna shoot with his shotgun."
-	icon = 'icons/mecha/buggy-legiongun.dmi'
-	icon_state = "legiongun"
-	pixel_x = -18
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 1.2
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 0.8
-	max_temperature = 20000
-	max_integrity = 250
-	armor = ARMOR_VALUE_MEDIUM
-	max_equip = 3
-	stepsound = 'sound/effects/footstep/gallop2.ogg'
-	turnsound = 'sound/effects/footstep/gallop1.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/mecha/combat/phazon/buggy/legionarmed/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/legionarmed/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/buggy/legionarmed/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-	smoke_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/buggy/legionarmed/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-	smoke_action.Remove(user)
-
-/obj/mecha/combat/phazon/buggy/legionarmed/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
-	ME.attach(src)
-	max_ammo()
-
-//Highwayman
-
-/obj/mecha/combat/phazon/highwayman
-	name = "\improper highwayman eco"
-	desc = "A fast vehicule, runing on powercell. YUP ! ITS THE HIGHWAYMAN ! Kinda. Its not the original, but a budget version."
-	icon = 'icons/mecha/highwayman.dmi'
-	icon_state = "highwayman"
-	pixel_x = -15
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 0.7
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 1
-	max_temperature = 20000
-	max_integrity = 250
-	armor = list("melee" = 30, "bullet" = 25, "laser" = 20, "energy" = 20, "bomb" = 40, "bio" = 0, "rad" = 100, "fire" = 100, "acid" = 100)
-	max_equip = 2
-	stepsound = 'sound/f13machines/buggy_loop.ogg'
-	turnsound = 'sound/f13machines/buggy_loop.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/mecha/combat/phazon/highwayman/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/highwayman/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/highwayman/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/highwayman/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-
-/obj/mecha/combat/phazon/highwayman/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-
-//corvega
-
-/obj/mecha/combat/phazon/corvega
-	name = "\improper Corvega"
-	desc = "A old vehicule, runing on powercell."
-	icon = 'icons/mecha/corvega.dmi'
-	icon_state = "corvega"
-	pixel_x = -15
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 0.75
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 1
-	max_temperature = 20000
-	max_integrity = 280
-	armor = ARMOR_VALUE_MEDIUM
-	max_equip = 3
-	stepsound = 'sound/f13machines/buggy_loop.ogg'
-	turnsound = 'sound/f13machines/buggy_loop.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/mecha/combat/phazon/corvega/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/corvega/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/corvega/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/corvega/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-
-/obj/mecha/combat/phazon/corvega/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-
-//corvega police
-
-/obj/mecha/combat/phazon/corvega/police
-	name = "\improper Police Corvega"
-	desc = "A old vehicule, runing on powercell. Seems to have been the proprety of the PreWar Yuma PD."
-	icon = 'icons/mecha/corvega-police.dmi'
-	icon_state = "corvega"
-	pixel_x = -15
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 0.75
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 1.3
-	max_temperature = 20000
-	max_integrity = 280
-	armor = ARMOR_VALUE_MEDIUM
-	max_equip = 3
-	stepsound = 'sound/f13machines/buggy_loop.ogg'
-	turnsound = 'sound/f13machines/buggy_loop.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/mecha/combat/phazon/corvega/police/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/corvega/police/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/corvega/police/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-	sirens_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/corvega/police/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-	sirens_action.Remove(user)
-
-/obj/mecha/combat/phazon/corvega/police/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-
-//pickuptruck
-
-/obj/mecha/combat/phazon/pickuptruck
-	name = "\improper pickup truck"
-	desc = "A old vehicule, runing on powercell."
-	icon = 'icons/mecha/pickuptruck.dmi'
-	icon_state = "pickuptruck"
-	pixel_x = -15
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 1.4
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 1
-	max_temperature = 20000
-	max_integrity = 300
-	armor = ARMOR_VALUE_MEDIUM
-	max_equip = 4
-	stepsound = 'sound/f13machines/buggy_loop.ogg'
-	turnsound = 'sound/f13machines/buggy_loop.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/mecha/combat/phazon/pickuptruck/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/pickuptruck/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/pickuptruck/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/pickuptruck/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-
-/obj/mecha/combat/phazon/pickuptruck/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-
-//pickuptruck blue
-
-/obj/mecha/combat/phazon/pickuptruck/blue
-	name = "\improper pickup truck"
-	desc = "A old vehicule, runing on powercell."
-	icon = 'icons/mecha/pickuptruck-blue.dmi'
-	icon_state = "pickuptruck"
-	pixel_x = -15
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 1.4
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 1
-	max_temperature = 20000
-	max_integrity = 300
-	armor = ARMOR_VALUE_MEDIUM
-	max_equip = 4
-	stepsound = 'sound/f13machines/buggy_loop.ogg'
-	turnsound = 'sound/f13machines/buggy_loop.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/mecha/combat/phazon/pickuptruck/blue/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/pickuptruck/blue/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/pickuptruck/blue/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/pickuptruck/blue/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-
-/obj/mecha/combat/phazon/pickuptruck/blue/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-
-//pickuptruck bos
-
-/obj/mecha/combat/phazon/pickuptruck/bos
-	name = "\improper BoS pickup truck"
-	desc = "A old vehicule, runing on powercell."
-	icon = 'icons/mecha/pickuptruck-bos.dmi'
-	icon_state = "pickuptruck"
-	pixel_x = -15
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 1.4
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 1
-	max_temperature = 20000
-	max_integrity = 300
-	armor = ARMOR_VALUE_MEDIUM
-	max_equip = 4
-	stepsound = 'sound/f13machines/buggy_loop.ogg'
-	turnsound = 'sound/f13machines/buggy_loop.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/mecha/combat/phazon/pickuptruck/bos/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/pickuptruck/bos/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/pickuptruck/bos/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/pickuptruck/bos/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-
-/obj/mecha/combat/phazon/pickuptruck/bos/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-
-//pickuptruck bos AND Kiana
-
-/obj/mecha/combat/phazon/pickuptruck/bos/armed
-	name = "\improper BoS pickup truck with gunner"
-	desc = "A old vehicule, runing on powercell. Its a A modified brotherhood truck, with the addition of a laser rifle at the back, maned by Paladin Kiana Davberg. Consumes more and is a more fragile."
-	icon = 'icons/mecha/pickuptruck-gunbos.dmi'
-	icon_state = "pickuptruck"
-	pixel_x = -15
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 1.4
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 1.5
-	max_temperature = 20000
-	max_integrity = 300
-	armor = ARMOR_VALUE_MEDIUM
-	max_equip = 4
-	stepsound = 'sound/f13machines/buggy_loop.ogg'
-	turnsound = 'sound/f13machines/buggy_loop.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/mecha/combat/phazon/pickuptruck/bos/armed/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/pickuptruck/bos/armed/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/pickuptruck/bos/armed/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/pickuptruck/bos/armed/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-
-/obj/mecha/combat/phazon/pickuptruck/bos/armed/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
-	
-//truckcaravan
-
-/obj/mecha/combat/phazon/truckcaravan
-	name = "\improper Truck caravan"
-	desc = "A vehicle, not very powerfull or solid, running on a power cell... Okay, its a lie. Its pulled by two brahmins...The cell is here to make sure that some componant of the half buggy pulled by brahmins works."
-	icon = 'icons/mecha/truckcaravan.dmi'
-	icon_state = "truckcaravan"
-	pixel_x = -20
-	pixel_y = 0
-	can_be_locked = TRUE
-	dna_lock
-	step_in = 1.6
-	opacity = 0
-	dir_in = 8
-	step_energy_drain = 0.6
-	max_temperature = 20000
-	max_integrity = 250
-	armor = ARMOR_VALUE_HEAVY
-	max_equip = 2
-	stepsound = 'sound/effects/footstep/gallop2.ogg'
-	turnsound = 'sound/effects/footstep/gallop1.ogg'
-	wreckage = /obj/structure/mecha_wreckage/buggy
-
-/obj/mecha/combat/phazon/truckcaravan/go_out()
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/truckcaravan/moved_inside(mob/living/carbon/human/H)
-	..()
-	update_icon()
-
-/obj/mecha/combat/phazon/truckcaravan/GrantActions(mob/living/user, human_occupant = 0) 
-	cycle_action.Grant(user, src)
-	lights_action.Grant(user, src)
-	stats_action.Grant(user, src)
-	eject_action.Grant(user, src)
-	klaxon_action.Grant(user, src)
-
-/obj/mecha/combat/phazon/truckcaravan/RemoveActions(mob/living/user, human_occupant = 0)
-	cycle_action.Remove(user)
-	lights_action.Remove(user)
-	stats_action.Remove(user)
-	eject_action.Remove(user)
-	klaxon_action.Remove(user)
-
-/obj/mecha/combat/phazon/truckcaravan/loaded/Initialize()
-	. = ..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new
-	ME = new /obj/item/mecha_parts/mecha_equipment/seat
-	ME.attach(src)
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index de211d0daa9..637445483f7 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -1,6 +1,10 @@
 //DO NOT ADD MECHA PARTS TO THE GAME WITH THE DEFAULT "SPRITE ME" SPRITE!
 //I'm annoyed I even have to tell you this! SPRITE FIRST, then commit.
 
+#define EQUIP_WEAPON	"weapon"
+#define EQUIP_UTILITY	"utility"
+#define EQUIP_MISC	    "misc"
+
 /obj/item/mecha_parts/mecha_equipment
 	name = "mecha equipment"
 	icon = 'icons/mecha/mecha_equipment.dmi'
@@ -20,6 +24,7 @@
 	var/selectable = 1	// Set to 0 for passive equipment such as mining scanner or armor plates
 	var/harmful = FALSE //Controls if equipment can be used to attack by a pacifist.
 	//var/destroy_sound = 'sound/mecha/critdestr.ogg'
+	var/equip_type = EQUIP_UTILITY
 
 /obj/item/mecha_parts/mecha_equipment/proc/update_chassis_page()
 	if(chassis)
@@ -118,11 +123,26 @@
 	if(!chassis || 	chassis.loc != C || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir))
 		return 0
 
-/obj/item/mecha_parts/mecha_equipment/proc/can_attach(obj/mecha/M)
-	if(M.equipment.len<M.max_equip)
+/obj/item/mecha_parts/mecha_equipment/proc/can_attach(obj/mecha/M as obj)
+	if(equip_type == EQUIP_MISC && M.misc_equipment.len < M.max_misc_equip)
+		return 1
+	if(equip_type == EQUIP_WEAPON && M.weapon_equipment.len < M.max_weapons_equip)
+		return 1
+	if(equip_type == EQUIP_UTILITY && M.utility_equipment.len < M.max_utility_equip)
 		return 1
+	return 0
 
 /obj/item/mecha_parts/mecha_equipment/proc/attach(obj/mecha/M)
+	var/has_equipped = 0
+	if(equip_type == EQUIP_MISC && M.misc_equipment.len < M.max_misc_equip && !has_equipped)
+		M.misc_equipment += src
+		has_equipped = 1
+	if(equip_type == EQUIP_WEAPON && M.weapon_equipment.len < M.max_weapons_equip && !has_equipped)
+		M.weapon_equipment += src
+		has_equipped = 1
+	if(equip_type == EQUIP_UTILITY && M.utility_equipment.len < M.max_utility_equip && !has_equipped)
+		M.utility_equipment += src
+		has_equipped = 1
 	M.equipment += src
 	chassis = M
 	forceMove(M)
@@ -131,15 +151,25 @@
 	return
 
 /obj/item/mecha_parts/mecha_equipment/proc/detach(atom/moveto=null)
+	if(!chassis)
+		return
 	moveto = moveto || get_turf(chassis)
-	if(src.Move(moveto))
-		chassis.equipment -= src
-		if(chassis.selected == src)
-			chassis.selected = null
-		update_chassis_page()
-		chassis.mecha_log_message("[src] removed from equipment.")
-		chassis = null
-		set_ready_state(1)
+	forceMove(moveto)
+	chassis.equipment -= src
+	if(equip_type)
+		switch(equip_type)
+			if(EQUIP_MISC)
+				chassis.misc_equipment -= src
+			if(EQUIP_WEAPON)
+				chassis.weapon_equipment -= src
+			if(EQUIP_UTILITY)
+				chassis.utility_equipment -= src
+	if(chassis.selected == src)
+		chassis.selected = null
+	update_chassis_page()
+	chassis.mecha_log_message("[src] removed from equipment.")
+	chassis = null
+	set_ready_state(TRUE)
 	return
 
 
diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index 9ec7548b3f0..5c277b42eee 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -218,7 +218,7 @@
 	if(href_list["eject"])
 		go_out()
 		return
-	
+
 /obj/item/mecha_parts/mecha_equipment/seat/container_resist(mob/living/user)
 	go_out()
 
@@ -256,6 +256,7 @@
 //	var/deflect_coeff = 1.15
 	var/damage_coeff = 0.7
 	selectable = 0
+	equip_type = EQUIP_MISC
 
 /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/proc/attack_react()
 	if(action_checks(src))
@@ -274,6 +275,7 @@
 //	var/deflect_coeff = 1.15
 	var/damage_coeff = 0.75
 	selectable = 0
+	equip_type = EQUIP_MISC
 
 /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/proc/projectile_react()
 	if(action_checks(src))
@@ -294,6 +296,7 @@
 	var/icon/droid_overlay
 	var/list/repairable_damage = list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH)
 	selectable = 0
+	equip_type = EQUIP_MISC
 
 /obj/item/mecha_parts/mecha_equipment/repair_droid/Destroy()
 	STOP_PROCESSING(SSobj, src)
@@ -378,6 +381,7 @@
 	var/coeff = 100
 	var/list/use_channels = list(EQUIP,ENVIRON,LIGHT)
 	selectable = 0
+	equip_type = EQUIP_MISC
 
 /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/Destroy()
 	STOP_PROCESSING(SSobj, src)
@@ -465,6 +469,7 @@
 	var/fuel_per_cycle_idle = 25
 	var/fuel_per_cycle_active = 200
 	var/power_per_cycle = 50
+	equip_type = EQUIP_MISC
 
 /obj/item/mecha_parts/mecha_equipment/generator/Initialize()
 	. = ..()
@@ -576,6 +581,7 @@
 	fuel_per_cycle_active = 30
 	power_per_cycle = 100
 	var/rad_per_cycle = 30
+	equip_type = EQUIP_MISC
 
 /obj/item/mecha_parts/mecha_equipment/generator/nuclear/generator_init()
 	fuel = new /obj/item/stack/sheet/mineral/uranium(src, 0)
diff --git a/code/game/mecha/equipment/weapons/fallout/ballistic.dm b/code/game/mecha/equipment/weapons/fallout/ballistic.dm
new file mode 100644
index 00000000000..7ab4d802e2d
--- /dev/null
+++ b/code/game/mecha/equipment/weapons/fallout/ballistic.dm
@@ -0,0 +1,33 @@
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/auto
+	name = "\improper AC AUTO"
+	desc = "A weapon for combat exosuits. Automatic."
+	icon_state = "mecha_uac2"
+	fire_sound = 'sound/f13weapons/bozar_fire.ogg'
+	equip_cooldown = 5
+	projectile = /obj/item/projectile/bullet/lmg/auto
+	projectiles = 200
+	projectiles_cache = 200
+	projectiles_cache_max = 600
+	projectiles_per_shot = 4
+	variance = 6
+	is_automatic = TRUE
+	randomspread = 1.08
+	harmful = TRUE
+	ammo_type = "lmg"
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/hobo
+	name = "\improper Improvised HMG"
+	desc = "A automatic machine gun make with scraps."
+	icon_state = "mecha_lmg_fo"
+	fire_sound = 'sound/f13weapons/boltfire.ogg'
+	equip_cooldown = 5
+	projectile = /obj/item/projectile/bullet/lmg/hobo
+	projectiles = 100
+	projectiles_cache = 100
+	projectiles_cache_max = 300
+	projectiles_per_shot = 2
+	variance = 6
+	is_automatic = TRUE
+	randomspread = 1.2
+	harmful = TRUE
+	ammo_type = "lmg"
diff --git a/code/game/mecha/equipment/weapons/fallout/energy.dm b/code/game/mecha/equipment/weapons/fallout/energy.dm
new file mode 100644
index 00000000000..51478681c80
--- /dev/null
+++ b/code/game/mecha/equipment/weapons/fallout/energy.dm
@@ -0,0 +1,27 @@
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser // AER9
+	equip_cooldown = 7
+	name = "\improper mounted laser rifle"
+	desc = "A mounted laser rifle, drawing off the vehicle's alternator. Fires basic lasers."
+	icon_state = "mecha_laser"
+	energy_drain = 50
+	projectile = /obj/item/projectile/beam/laser/lasgun/hitscan
+	fire_sound = 'sound/weapons/laser.ogg'
+	harmful = TRUE
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy // AER12
+	equip_cooldown = 12
+	name = "\improper mounted laser cannon"
+	desc = "A mounted laser rifle, drawing off the vehicle's alternator. Fires heavy lasers. "
+	icon_state = "mecha_laser_heavy"
+	energy_drain = 100
+	projectile = /obj/item/projectile/beam/laser/aer12/hitscan
+	fire_sound = 'sound/weapons/lasercannonfire.ogg'
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma // Plasma Pistol/Cannon
+	equip_cooldown = 20
+	name = "\improper mounted plasma gun"
+	desc = "A mounted plasma weapon, seemingly non-OEM based running off the vehicle's alternator. Fires large globules of burning plasma. "
+	icon_state = "mecha_plasma_gun"
+	energy_drain = 200
+	projectile = /obj/item/projectile/energy/plasmabolt/rifle
+	fire_sound = 'sound/weapons/lasercannonfire.ogg'
\ No newline at end of file
diff --git a/code/game/mecha/equipment/weapons/mecha_ammo.dm b/code/game/mecha/equipment/weapons/mecha_ammo.dm
index f5844ec5e61..b0d5a6d0673 100644
--- a/code/game/mecha/equipment/weapons/mecha_ammo.dm
+++ b/code/game/mecha/equipment/weapons/mecha_ammo.dm
@@ -59,7 +59,7 @@
 	name = "handmade machine gun ammo"
 	desc = "A box of linked ammunition, designed for multiple LMGs."
 	icon_state = "lmg"
-	rounds = 150
+	rounds = 25
 	ammo_type = "lmg"
 
 /obj/item/mecha_ammo/missiles_br
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 5865e2f3b7f..c8d6bcc9b53 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -11,6 +11,7 @@
 	var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect	//the visual effect appearing when the weapon is fired.
 	var/kickback = TRUE //Will using this weapon in no grav push mecha back.
 	mech_flags = EXOSUIT_MODULE_COMBAT
+	equip_type = EQUIP_WEAPON
 
 /obj/item/mecha_parts/mecha_equipment/weapon/can_attach(obj/mecha/combat/M)
 	if(..())
@@ -72,25 +73,6 @@
 	chassis.use_power(energy_drain*get_shot_amount())
 	addtimer(CALLBACK(src, PROC_REF(set_ready_state), 1), equip_cooldown)
 
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
-	equip_cooldown = 7
-	name = "\improper CH-PS \"Immolator\" laser"
-	desc = "A weapon for combat exosuits. Shoots basic lasers."
-	icon_state = "mecha_laser"
-	energy_drain = 50
-	projectile = /obj/item/projectile/beam/laser/mech/light
-	fire_sound = 'sound/weapons/laser.ogg'
-	harmful = TRUE
-
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
-	equip_cooldown = 14
-	name = "\improper CH-LC \"Solaris\" laser cannon"
-	desc = "A weapon for combat exosuits. Shoots heavy lasers."
-	icon_state = "mecha_laser"
-	energy_drain = 100
-	projectile = /obj/item/projectile/beam/laser/mech/heavy
-	fire_sound = 'sound/weapons/lasercannonfire.ogg'
-
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion
 	equip_cooldown = 16
 	name = "\improper MKIV ion heavy cannon"
@@ -133,13 +115,6 @@
 	fire_sound = 'sound/weapons/plasma_cutter.ogg'
 	harmful = TRUE
 
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/can_attach(obj/mecha/working/M)
-	if(..()) //combat mech
-		return 1
-	else if(M.equipment.len < M.max_equip && istype(M))
-		return 1
-	return 0
-
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser
 	name = "\improper PBT \"Pacifier\" mounted taser"
 	desc = "A weapon for combat exosuits. Shoots non-lethal stunning electrodes."
@@ -274,40 +249,6 @@
 	harmful = TRUE
 	ammo_type = "lmg"
 
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/auto
-	name = "\improper AC AUTO"
-	desc = "A weapon for combat exosuits. Automatic."
-	icon_state = "mecha_uac2"
-	fire_sound = 'sound/f13weapons/bozar_fire.ogg'
-	equip_cooldown = 10
-	projectile = /obj/item/projectile/bullet/lmg/auto
-	projectiles = 150
-	projectiles_cache = 150
-	projectiles_cache_max = 1200
-	projectiles_per_shot = 4
-	variance = 6
-	is_automatic = TRUE
-	randomspread = 1.08
-	harmful = TRUE
-	ammo_type = "lmg"
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/hobo
-	name = "\improper Improvised HMG"
-	desc = "A automatic machine gun make with scraps."
-	icon_state = "mecha_uac2"
-	fire_sound = 'sound/f13weapons/boltfire.ogg'
-	equip_cooldown = 10
-	projectile = /obj/item/projectile/bullet/lmg/hobo
-	projectiles = 25
-	projectiles_cache = 25
-	projectiles_cache_max = 1200
-	projectiles_per_shot = 2
-	variance = 6
-	is_automatic = TRUE
-	randomspread = 1.2
-	harmful = TRUE
-	ammo_type = "lmg"
-
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
 	name = "\improper SRM-8 missile rack"
 	desc = "A weapon for combat exosuits. Launches light explosive missiles."
diff --git a/code/game/mecha/fallout/armored.dm b/code/game/mecha/fallout/armored.dm
new file mode 100644
index 00000000000..0c2efc3e1be
--- /dev/null
+++ b/code/game/mecha/fallout/armored.dm
@@ -0,0 +1,46 @@
+/obj/mecha/combat/phazon/armored
+	name = "\improper uparmored M38"
+	desc = "A apparently original M38 jeep, modified with a almost fully armored chassis."
+	icon = 'icons/mecha/armoredjeep.dmi'
+	icon_state = "armoredjeep"
+	max_integrity = 400
+	step_energy_drain = 1.5
+	step_in = 1.5
+	armor = ARMOR_VALUE_VEHICLE_ARMORED
+	wreckage = /obj/structure/mecha_wreckage/buggy
+	max_utility_equip = 2
+	max_weapons_equip = 1
+	max_misc_equip = 1
+
+/obj/mecha/combat/phazon/armoredjeep/rangerarmed/go_out()
+	..()
+	update_icon()
+
+/obj/mecha/combat/phazon/armoredjeep/rangerarmed/moved_inside(mob/living/carbon/human/H)
+	..()
+	update_icon()
+
+/obj/mecha/combat/phazon/armoredjeep/rangerarmed/GrantActions(mob/living/user, human_occupant = 0)
+	cycle_action.Grant(user, src)
+	lights_action.Grant(user, src)
+	stats_action.Grant(user, src)
+	eject_action.Grant(user, src)
+	klaxon_action.Grant(user, src)
+	smoke_action.Grant(user, src)
+
+/obj/mecha/combat/phazon/armoredjeep/rangerarmed/RemoveActions(mob/living/user, human_occupant = 0)
+	cycle_action.Remove(user)
+	lights_action.Remove(user)
+	stats_action.Remove(user)
+	eject_action.Remove(user)
+	klaxon_action.Remove(user)
+	smoke_action.Remove(user)
+
+/obj/mecha/combat/phazon/armoredjeep/rangerarmed/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/hobo
+	ME.attach(src)
+	max_ammo()
diff --git a/code/game/mecha/fallout/birds.dm b/code/game/mecha/fallout/birds.dm
new file mode 100644
index 00000000000..ab9916f56a2
--- /dev/null
+++ b/code/game/mecha/fallout/birds.dm
@@ -0,0 +1,246 @@
+//////////// VERTIBIRD //////////////
+
+/obj/mecha/combat/phazon/vertibird
+	name = "\improper Vertibird"
+	desc = "A real useable, and working vertibird, maintained with luck, sweat, and ducktape. This one seems to be more focused toward combat."
+	icon = 'icons/mecha/vb-vertibird.dmi'
+	icon_state = "vb"
+	pixel_x = -138
+	pixel_y = -138
+	layer = ABOVE_MOB_LAYER
+	step_in = 0.6
+	dir_in = 2
+	step_energy_drain = 0.75
+	max_integrity = 150
+	armor = ARMOR_VALUE_VEHICLE_CAR
+	wreckage = /obj/structure/mecha_wreckage/vertibird
+	add_req_access = 1
+	internal_damage_threshold = 25
+	max_utility_equip = 4
+	max_weapons_equip = 4
+	max_misc_equip = 2
+	canstrafe = TRUE
+	movement_type = FLYING
+	stepsound = 'sound/f13machines/vertibird_loop.ogg'
+	turnsound = 'sound/f13machines/vertibird_loop.ogg'
+
+/obj/structure/mecha_wreckage/vertibird
+	name = "\improper Vertibird Wreck"
+	desc = "Mayday, Mayday, Vertibird going down... IN STYLE."
+	icon = 'icons/mecha/vb-vertibird.dmi'
+	icon_state = "vb-broken"
+	pixel_x = -138
+	pixel_y = -138
+
+/obj/mecha/combat/phazon/vertibird/GrantActions(mob/living/user, human_occupant = 0)
+	internals_action.Grant(user, src)
+	cycle_action.Grant(user, src)
+	lights_action.Grant(user, src)
+	stats_action.Grant(user, src)
+	strafing_action.Grant(user, src)
+	zoom_action.Grant(user, src)
+	eject_action.Grant(user, src)
+	landing_action.Grant(user, src)
+
+/obj/mecha/combat/phazon/vertibird/RemoveActions(mob/living/user, human_occupant = 0)
+	internals_action.Remove(user)
+	cycle_action.Remove(user)
+	lights_action.Remove(user)
+	stats_action.Remove(user)
+	strafing_action.Remove(user)
+	zoom_action.Remove(user)
+	eject_action.Remove(user)
+	landing_action.Remove(user)
+
+/obj/mecha/combat/phazon/vertibird/obj_destruction()
+	for(var/mob/M in src)
+		to_chat(M, span_brass("The vertibird is going to Crash"))
+		M.dust()
+	playsound(src, 'sound//f13machines//vertibird_crash.ogg', 100, 0)
+	src.visible_message(span_userdanger("The reactor has gone critical, its going to blow!"))
+	addtimer(CALLBACK(src,.proc/go_critical),breach_time)
+
+/obj/mecha/combat/phazon/vertibird/proc/go_critical()
+	explosion(get_turf(loc))
+	Destroy(src)
+
+/obj/mecha/combat/phazon/vertibird/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/auto
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/medical/sleeper
+	ME.attach(src)
+	max_ammo()
+
+///NCR VERTIBIRD
+
+/obj/mecha/combat/phazon/vertibird/ncr
+	name = "\improper NCR Vertibird"
+	desc = "A real useable, and working vertibird, maintained with luck, sweat, and ducktape. This one seems to be more focused toward Troop transport, and his painted in the colors of the NCR."
+	icon = 'icons/mecha/vb-vertibird-ncr.dmi'
+	icon_state = "vb"
+	step_in = 0.8
+	step_energy_drain = 0.7
+	max_integrity = 200
+	wreckage = /obj/structure/mecha_wreckage/vertibird
+	add_req_access = 1
+	max_utility_equip = 8
+	max_weapons_equip = 1
+
+/obj/mecha/combat/phazon/vertibird/ncr/GrantActions(mob/living/user, human_occupant = 0)
+	internals_action.Grant(user, src)
+	cycle_action.Grant(user, src)
+	lights_action.Grant(user, src)
+	stats_action.Grant(user, src)
+	strafing_action.Grant(user, src)
+	zoom_action.Grant(user, src)
+	eject_action.Grant(user, src)
+	smoke_action.Grant(user, src)
+	landing_action.Grant(user, src)
+
+/obj/mecha/combat/phazon/vertibird/ncr/RemoveActions(mob/living/user, human_occupant = 0)
+	internals_action.Remove(user)
+	cycle_action.Remove(user)
+	lights_action.Remove(user)
+	stats_action.Remove(user)
+	strafing_action.Remove(user)
+	zoom_action.Remove(user)
+	eject_action.Remove(user)
+	smoke_action.Remove(user)
+	landing_action.Remove(user)
+
+/obj/mecha/combat/phazon/vertibird/ncr/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/auto
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/medical/sleeper
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/medical/sleeper
+	ME.attach(src)
+	max_ammo()
+
+///VERTIBIRD ENCLAVE
+
+/obj/mecha/combat/phazon/vertibird/enclave
+	name = "\improper Enclave Naval Vertibird"
+	desc = "A real useable, and working vertibird, maintained with luck, sweat, and ducktape. This one seems to be more focused toward combat, and be stored in a ship. Thats peak Enclave tech."
+	icon = 'icons/mecha/vb-vertibird-enclave.dmi'
+	icon_state = "vb"
+	step_in = 0.6
+	step_energy_drain = 0.75
+	max_integrity = 150
+	wreckage = /obj/structure/mecha_wreckage/vertibird
+	add_req_access = 1
+	max_utility_equip = 4
+	max_weapons_equip = 4
+	max_misc_equip = 2
+
+/obj/mecha/combat/phazon/vertibird/enclave/GrantActions(mob/living/user, human_occupant = 0)
+	internals_action.Grant(user, src)
+	cycle_action.Grant(user, src)
+	lights_action.Grant(user, src)
+	stats_action.Grant(user, src)
+	strafing_action.Grant(user, src)
+	zoom_action.Grant(user, src)
+	eject_action.Grant(user, src)
+	landing_action.Grant(user, src)
+
+/obj/mecha/combat/phazon/vertibird/enclave/RemoveActions(mob/living/user, human_occupant = 0)
+	internals_action.Remove(user)
+	cycle_action.Remove(user)
+	lights_action.Remove(user)
+	stats_action.Remove(user)
+	strafing_action.Remove(user)
+	zoom_action.Remove(user)
+	eject_action.Remove(user)
+	landing_action.Remove(user)
+
+/obj/mecha/combat/phazon/vertibird/enclave/obj_destruction()
+	for(var/mob/M in src)
+		to_chat(M, span_brass(" The vertibird is going to Crash !"))
+		M.dust()
+	playsound(src, 'sound//f13machines//vertibird_crash.ogg', 100, 0)
+	src.visible_message(span_userdanger("The reactor has gone critical, its going to blow!"))
+	addtimer(CALLBACK(src,.proc/go_critical),breach_time)
+
+/obj/mecha/combat/phazon/vertibird/enclave/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/auto
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	max_ammo()
+
+/// BOS Vertibird
+
+/obj/mecha/combat/phazon/vertibird/brotherhood
+	name = "\improper Brotherhood Vertibird"
+	desc = "A real useable, and working vertibird, maintained with luck, sweat, and ducktape. This one seems to be more focused toward combat, and marked with brotherhood markings."
+	icon = 'icons/mecha/vb-vertibird-bos.dmi'
+	icon_state = "vb"
+	step_in = 0.6
+	step_energy_drain = 0.75
+	max_integrity = 150
+	wreckage = /obj/structure/mecha_wreckage/vertibird
+	add_req_access = 1
+	max_utility_equip = 4
+	max_weapons_equip = 4
+	max_misc_equip = 2
+
+/obj/mecha/combat/phazon/vertibird/brotherhood/GrantActions(mob/living/user, human_occupant = 0)
+	internals_action.Grant(user, src)
+	cycle_action.Grant(user, src)
+	lights_action.Grant(user, src)
+	stats_action.Grant(user, src)
+	strafing_action.Grant(user, src)
+	zoom_action.Grant(user, src)
+	eject_action.Grant(user, src)
+	landing_action.Grant(user, src)
+
+/obj/mecha/combat/phazon/vertibird/brotherhood/RemoveActions(mob/living/user, human_occupant = 0)
+	internals_action.Remove(user)
+	cycle_action.Remove(user)
+	lights_action.Remove(user)
+	stats_action.Remove(user)
+	strafing_action.Remove(user)
+	zoom_action.Remove(user)
+	eject_action.Remove(user)
+	landing_action.Remove(user)
+
+/obj/mecha/combat/phazon/vertibird/brotherhood/obj_destruction()
+	for(var/mob/M in src)
+		to_chat(M, span_brass(" The vertibird is going to Crash !"))
+		M.dust()
+	playsound(src, 'sound//f13machines//vertibird_crash.ogg', 100, 0)
+	src.visible_message(span_userdanger("The reactor has gone critical, its going to blow!"))
+	addtimer(CALLBACK(src,.proc/go_critical),breach_time)
+
+/obj/mecha/combat/phazon/vertibird/brotherhood/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/auto
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	max_ammo()
\ No newline at end of file
diff --git a/code/game/mecha/fallout/buggies.dm b/code/game/mecha/fallout/buggies.dm
new file mode 100644
index 00000000000..0a17a8ec83f
--- /dev/null
+++ b/code/game/mecha/fallout/buggies.dm
@@ -0,0 +1,160 @@
+//Buggy
+
+/obj/mecha/combat/phazon/buggy
+	name = "\improper Buggy"
+	desc = "A light vehicle, not very powerfull or solid, running on a powercell."
+	icon = 'icons/mecha/buggy.dmi'
+	icon_state = "buggygreen"
+	pixel_x = -15
+	pixel_y = -5
+	max_integrity = 200
+	step_in = 0.8
+	armor = ARMOR_VALUE_VEHICLE_BUGGY
+	stepsound = 'sound/f13machines/buggy_loop.ogg'
+	turnsound = 'sound/f13machines/buggy_loop.ogg'
+	wreckage = /obj/structure/mecha_wreckage/buggy
+
+/obj/structure/mecha_wreckage/buggy
+	name = "\improper Buggy wreckage"
+	desc = "Its a buggy ! Won't bug you anymore."
+	icon_state = "buggy-broken"
+
+/obj/mecha/combat/phazon/buggy/go_out()
+	..()
+	update_icon()
+
+/obj/mecha/combat/phazon/buggy/moved_inside(mob/living/carbon/human/H)
+	..()
+	update_icon()
+
+/obj/mecha/combat/phazon/buggy/GrantActions(mob/living/user, human_occupant = 0)
+	cycle_action.Grant(user, src)
+	lights_action.Grant(user, src)
+	stats_action.Grant(user, src)
+	eject_action.Grant(user, src)
+	klaxon_action.Grant(user, src)
+
+/obj/mecha/combat/phazon/buggy/RemoveActions(mob/living/user, human_occupant = 0)
+	cycle_action.Remove(user)
+	lights_action.Remove(user)
+	stats_action.Remove(user)
+	eject_action.Remove(user)
+	klaxon_action.Remove(user)
+
+/obj/mecha/combat/phazon/buggy/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+
+//Buggydune
+
+/obj/mecha/combat/phazon/buggy/dune
+	name = "\improper Buggy"
+	desc = "A light vehicle, not very powerfull or solid, running on a powercell."
+	icon = 'icons/mecha/buggy.dmi'
+	icon_state = "buggydune"
+	max_integrity = 200
+	armor = ARMOR_VALUE_VEHICLE_BUGGY
+	wreckage = /obj/structure/mecha_wreckage/buggy
+
+/obj/mecha/combat/phazon/buggy/dune/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+
+//Buggyred
+
+/obj/mecha/combat/phazon/buggy/red
+	name = "\improper Buggy"
+	desc = "A light vehicle, not very powerfull or solid, running on a powercell."
+	icon = 'icons/mecha/buggy.dmi'
+	icon_state = "buggyred"
+	max_integrity = 200
+	armor = ARMOR_VALUE_VEHICLE_BUGGY
+	wreckage = /obj/structure/mecha_wreckage/buggy
+
+/obj/mecha/combat/phazon/buggy/red/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+
+//Buggyflame
+
+/obj/mecha/combat/phazon/buggy/flamme
+	name = "\improper Buggy"
+	desc = "A light vehicle, not very powerfull or solid, running on a powercell."
+	icon = 'icons/mecha/buggy.dmi'
+	icon_state = "buggyflame"
+	max_integrity = 200
+	armor = ARMOR_VALUE_VEHICLE_BUGGY
+	wreckage = /obj/structure/mecha_wreckage/buggy
+
+/obj/mecha/combat/phazon/buggy/flamme/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+
+//Buggy Ranger
+
+/obj/mecha/combat/phazon/buggy/ranger
+	name = "\improper Ranger Buggy"
+	desc = "A light vehicle, not very powerfull or solid, running on a powercell. This one as been recolored by the Rangers."
+	icon = 'icons/mecha/hanlonbuggy.dmi'
+	icon_state = "hanlonbuggy"
+	max_integrity = 200
+	armor = ARMOR_VALUE_VEHICLE_BUGGY
+	wreckage = /obj/structure/mecha_wreckage/buggy
+
+/obj/mecha/combat/phazon/buggy/ranger/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+
+//Buggy Ranger AND RICO
+
+/obj/mecha/combat/phazon/buggy/rangerarmed
+	name = "\improper Vet Ranger Buggy with gunner"
+	desc = "A light vehicle, not very powerfull or solid, running on a powercell. This one as been recolored by the Rangers... And Ranger Rico ''Gunner'' Davberger is gonna shoot with his shotgun."
+	icon = 'icons/mecha/buggyrangergun.dmi'
+	icon_state = "rangergun"
+	max_integrity = 200
+	armor = ARMOR_VALUE_VEHICLE_BUGGY
+	wreckage = /obj/structure/mecha_wreckage/buggy
+
+/obj/mecha/combat/phazon/buggy/rangerarmed/go_out()
+	..()
+	update_icon()
+
+/obj/mecha/combat/phazon/buggy/rangerarmed/moved_inside(mob/living/carbon/human/H)
+	..()
+	update_icon()
+
+/obj/mecha/combat/phazon/buggy/rangerarmed/GrantActions(mob/living/user, human_occupant = 0)
+	cycle_action.Grant(user, src)
+	lights_action.Grant(user, src)
+	stats_action.Grant(user, src)
+	eject_action.Grant(user, src)
+	klaxon_action.Grant(user, src)
+	smoke_action.Grant(user, src)
+
+/obj/mecha/combat/phazon/buggy/rangerarmed/RemoveActions(mob/living/user, human_occupant = 0)
+	cycle_action.Remove(user)
+	lights_action.Remove(user)
+	stats_action.Remove(user)
+	eject_action.Remove(user)
+	klaxon_action.Remove(user)
+	smoke_action.Remove(user)
+
+/obj/mecha/combat/phazon/buggy/rangerarmed/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
+	ME.attach(src)
+	max_ammo()
diff --git a/code/game/mecha/fallout/carriages.dm b/code/game/mecha/fallout/carriages.dm
new file mode 100644
index 00000000000..7a98de69c9d
--- /dev/null
+++ b/code/game/mecha/fallout/carriages.dm
@@ -0,0 +1,101 @@
+//Legion Chariot
+
+/obj/mecha/combat/phazon/buggy/legion
+	name = "\improper Legion Chariot"
+	desc = "A light vehicle, not very powerfull or solid, running on a power cell... Okay, its a lie. Its actually run on power generated by the horse...The cell is here to make sure that some componant of the half buggy pulled by horses works."
+	icon = 'icons/mecha/buggy-legion.dmi'
+	icon_state = "legionbuggy"
+	pixel_x = -18
+	pixel_y = 0
+	max_integrity = 250
+	step_energy_drain = 0.8
+	step_in = 1.2
+	armor = ARMOR_VALUE_VEHICLE_TRUCK
+	stepsound = 'sound/effects/footstep/gallop2.ogg'
+	turnsound = 'sound/effects/footstep/gallop1.ogg'
+	wreckage = /obj/structure/mecha_wreckage/buggy
+
+/obj/mecha/combat/phazon/buggy/legion/go_out()
+	..()
+	update_icon()
+
+/obj/mecha/combat/phazon/buggy/legion/moved_inside(mob/living/carbon/human/H)
+	..()
+	update_icon()
+
+/obj/mecha/combat/phazon/buggy/legion/GrantActions(mob/living/user, human_occupant = 0)
+	cycle_action.Grant(user, src)
+	lights_action.Grant(user, src)
+	stats_action.Grant(user, src)
+	eject_action.Grant(user, src)
+	klaxon_action.Grant(user, src)
+
+/obj/mecha/combat/phazon/buggy/legion/RemoveActions(mob/living/user, human_occupant = 0)
+	cycle_action.Remove(user)
+	lights_action.Remove(user)
+	stats_action.Remove(user)
+	eject_action.Remove(user)
+	klaxon_action.Remove(user)
+
+/obj/mecha/combat/phazon/buggy/legion/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+
+//Buggy Legion AND MESALLA
+
+/obj/mecha/combat/phazon/buggy/legionarmed
+	name = "\improper Legion Chariot with gunner"
+	desc = "A light vehicle, not very powerfull or solid, running on a power cell... Okay, its a lie. Its actually run on power generated by the horse...The cell is here to make sure that some componant of the half buggy pulled by horses works. This one as been recolored by the legions... And Prime Decanus Messala ''Gunner'' Davius is gonna shoot with his shotgun."
+	icon = 'icons/mecha/buggy-legiongun.dmi'
+	icon_state = "legiongun"
+	max_integrity = 250
+	step_energy_drain = 0.8
+	step_in = 1.2
+	armor = ARMOR_VALUE_VEHICLE_TRUCK
+
+/obj/mecha/combat/phazon/buggy/legionarmed/GrantActions(mob/living/user, human_occupant = 0)
+	cycle_action.Grant(user, src)
+	lights_action.Grant(user, src)
+	stats_action.Grant(user, src)
+	eject_action.Grant(user, src)
+	klaxon_action.Grant(user, src)
+	smoke_action.Grant(user, src)
+
+/obj/mecha/combat/phazon/buggy/legionarmed/RemoveActions(mob/living/user, human_occupant = 0)
+	cycle_action.Remove(user)
+	lights_action.Remove(user)
+	stats_action.Remove(user)
+	eject_action.Remove(user)
+	klaxon_action.Remove(user)
+	smoke_action.Remove(user)
+
+/obj/mecha/combat/phazon/buggy/legionarmed/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
+	ME.attach(src)
+	max_ammo()
+
+//truckcaravan
+
+/obj/mecha/combat/phazon/truckcaravan
+	name = "\improper Truck caravan"
+	desc = "A vehicle, not very powerfull or solid, running on a power cell... Okay, its a lie. Its pulled by two brahmins...The cell is here to make sure that some componant of the half buggy pulled by brahmins works."
+	icon = 'icons/mecha/truckcaravan.dmi'
+	icon_state = "truckcaravan"
+	pixel_x = -20
+	pixel_y = 0
+	max_integrity = 250
+	step_in = 1.6
+	step_energy_drain = 0.8
+	armor = ARMOR_VALUE_VEHICLE_TRUCK
+
+/obj/mecha/combat/phazon/truckcaravan/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
diff --git a/code/game/mecha/fallout/cars.dm b/code/game/mecha/fallout/cars.dm
new file mode 100644
index 00000000000..6441b6780fd
--- /dev/null
+++ b/code/game/mecha/fallout/cars.dm
@@ -0,0 +1,99 @@
+//Highwayman
+
+/obj/mecha/combat/phazon/highwayman
+	name = "\improper highwayman eco"
+	desc = "A fast vehicule, runing on powercell. YUP ! ITS THE HIGHWAYMAN ! Kinda. Its not the original, but a budget version."
+	icon = 'icons/mecha/highwayman.dmi'
+	icon_state = "highwayman"
+	pixel_x = -16
+	pixel_y = -5
+	max_integrity = 250
+	step_energy_drain = 1
+	step_in = 0.7
+	armor = ARMOR_VALUE_VEHICLE_CAR
+	stepsound = 'sound/f13machines/buggy_loop.ogg'
+	turnsound = 'sound/f13machines/buggy_loop.ogg'
+	wreckage = /obj/structure/mecha_wreckage/buggy
+
+/obj/mecha/combat/phazon/highwayman/go_out()
+	..()
+	update_icon()
+
+/obj/mecha/combat/phazon/highwayman/moved_inside(mob/living/carbon/human/H)
+	..()
+	update_icon()
+
+/obj/mecha/combat/phazon/highwayman/GrantActions(mob/living/user, human_occupant = 0)
+	cycle_action.Grant(user, src)
+	lights_action.Grant(user, src)
+	stats_action.Grant(user, src)
+	eject_action.Grant(user, src)
+	klaxon_action.Grant(user, src)
+
+/obj/mecha/combat/phazon/highwayman/RemoveActions(mob/living/user, human_occupant = 0)
+	cycle_action.Remove(user)
+	lights_action.Remove(user)
+	stats_action.Remove(user)
+	eject_action.Remove(user)
+	klaxon_action.Remove(user)
+
+/obj/mecha/combat/phazon/highwayman/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+
+//corvega
+
+/obj/mecha/combat/phazon/corvega
+	name = "\improper Corvega"
+	desc = "A old vehicule, runing on powercell."
+	icon = 'icons/mecha/corvega.dmi'
+	icon_state = "corvega"
+	max_integrity = 280
+	armor = ARMOR_VALUE_VEHICLE_CAR
+	wreckage = /obj/structure/mecha_wreckage/buggy
+
+/obj/mecha/combat/phazon/corvega/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+
+//corvega police
+
+/obj/mecha/combat/phazon/corvega/police
+	name = "\improper Police Corvega"
+	desc = "A old vehicule, runing on powercell. Seems to have been the proprety of the PreWar Yuma PD."
+	icon = 'icons/mecha/corvega-police.dmi'
+	icon_state = "corvega"
+	max_integrity = 280
+	step_energy_drain = 1.3
+	armor = ARMOR_VALUE_VEHICLE_ARMORED_LIGHT
+	wreckage = /obj/structure/mecha_wreckage/buggy
+
+/obj/mecha/combat/phazon/corvega/police/GrantActions(mob/living/user, human_occupant = 0)
+	cycle_action.Grant(user, src)
+	lights_action.Grant(user, src)
+	stats_action.Grant(user, src)
+	eject_action.Grant(user, src)
+	klaxon_action.Grant(user, src)
+	sirens_action.Grant(user, src)
+
+/obj/mecha/combat/phazon/corvega/police/RemoveActions(mob/living/user, human_occupant = 0)
+	cycle_action.Remove(user)
+	lights_action.Remove(user)
+	stats_action.Remove(user)
+	eject_action.Remove(user)
+	klaxon_action.Remove(user)
+	sirens_action.Remove(user)
+
+/obj/mecha/combat/phazon/corvega/police/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
\ No newline at end of file
diff --git a/code/game/mecha/fallout/pickuptrucks.dm b/code/game/mecha/fallout/pickuptrucks.dm
new file mode 100644
index 00000000000..c6cc0a3dff8
--- /dev/null
+++ b/code/game/mecha/fallout/pickuptrucks.dm
@@ -0,0 +1,107 @@
+//pickuptruck
+
+/obj/mecha/combat/phazon/pickuptruck
+	name = "\improper pickup truck"
+	desc = "A old vehicule, runing on powercell."
+	icon = 'icons/mecha/pickuptruck.dmi'
+	icon_state = "pickuptruck"
+	pixel_x = -17
+	pixel_y = -3
+	max_integrity = 300
+	step_in = 1.4
+	step_energy_drain = 1.5
+	armor = ARMOR_VALUE_VEHICLE_CAR
+	stepsound = 'sound/f13machines/buggy_loop.ogg'
+	turnsound = 'sound/f13machines/buggy_loop.ogg'
+	wreckage = /obj/structure/mecha_wreckage/buggy
+
+/obj/mecha/combat/phazon/pickuptruck/go_out()
+	..()
+	update_icon()
+
+/obj/mecha/combat/phazon/pickuptruck/moved_inside(mob/living/carbon/human/H)
+	..()
+	update_icon()
+
+/obj/mecha/combat/phazon/pickuptruck/GrantActions(mob/living/user, human_occupant = 0)
+	cycle_action.Grant(user, src)
+	lights_action.Grant(user, src)
+	stats_action.Grant(user, src)
+	eject_action.Grant(user, src)
+	klaxon_action.Grant(user, src)
+
+/obj/mecha/combat/phazon/pickuptruck/RemoveActions(mob/living/user, human_occupant = 0)
+	cycle_action.Remove(user)
+	lights_action.Remove(user)
+	stats_action.Remove(user)
+	eject_action.Remove(user)
+	klaxon_action.Remove(user)
+
+/obj/mecha/combat/phazon/pickuptruck/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+
+//pickuptruck blue
+
+/obj/mecha/combat/phazon/pickuptruck/blue
+	name = "\improper pickup truck"
+	desc = "A old vehicule, runing on powercell."
+	icon = 'icons/mecha/pickuptruck-blue.dmi'
+	icon_state = "pickuptruck"
+	max_integrity = 300
+	armor = ARMOR_VALUE_VEHICLE_CAR
+	wreckage = /obj/structure/mecha_wreckage/buggy
+
+/obj/mecha/combat/phazon/pickuptruck/blue/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+
+//pickuptruck bos
+
+/obj/mecha/combat/phazon/pickuptruck/bos
+	name = "\improper BoS pickup truck"
+	desc = "A old vehicule, runing on powercell."
+	icon = 'icons/mecha/pickuptruck-bos.dmi'
+	icon_state = "pickuptruck"
+	max_integrity = 300
+	armor = ARMOR_VALUE_VEHICLE_CAR
+	wreckage = /obj/structure/mecha_wreckage/buggy
+
+/obj/mecha/combat/phazon/pickuptruck/bos/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+
+//pickuptruck bos AND Kiana
+
+/obj/mecha/combat/phazon/pickuptruck/bos/armed
+	name = "\improper BoS pickup truck with gunner"
+	desc = "A old vehicule, runing on powercell. Its a A modified brotherhood truck, with the addition of a laser rifle at the back, maned by Paladin Kiana Davberg."
+	icon = 'icons/mecha/pickuptruck-gunbos.dmi'
+	icon_state = "pickuptruck"
+	max_integrity = 300
+	armor = ARMOR_VALUE_VEHICLE_CAR
+	wreckage = /obj/structure/mecha_wreckage/buggy
+
+/obj/mecha/combat/phazon/pickuptruck/bos/armed/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
\ No newline at end of file
diff --git a/code/game/mecha/fallout/trucks.dm b/code/game/mecha/fallout/trucks.dm
new file mode 100644
index 00000000000..e3d4d518493
--- /dev/null
+++ b/code/game/mecha/fallout/trucks.dm
@@ -0,0 +1,110 @@
+//////////// NCR TRUCK //////////////
+
+/obj/mecha/combat/phazon/ncrtruck
+	name = "\improper NCR Truck"
+	desc = "A truck running on powercells. Nice eh ? still a wreck."
+	icon = 'icons/mecha/ncrtruck.dmi'
+	icon_state = "ncrtruck"
+	pixel_x = -22
+	pixel_y = -5
+	max_integrity = 600
+	step_in = 1
+	armor = ARMOR_VALUE_VEHICLE_TRUCK
+	max_weapons_equip = 1
+	max_utility_equip = 8
+	stepsound = 'sound/f13machines/buggy_loop.ogg'
+	turnsound = 'sound/f13machines/buggy_loop.ogg'
+	wreckage = /obj/structure/mecha_wreckage/ncrtruck
+	var/list/cargo = new
+	var/cargo_capacity = 30
+	var/hides = 0
+
+/obj/structure/mecha_wreckage/ncrtruck
+	name = "\improper NCR Truck wreckage"
+	desc = "Its a truck ! BROKEN TRUCK."
+	icon = 'icons/fallout/vehicles/medium_vehicles.dmi'
+	icon_state = "derelict"
+
+/obj/mecha/combat/phazon/ncrtruck/go_out()
+	..()
+	update_icon()
+
+/obj/mecha/combat/phazon/ncrtruck/moved_inside(mob/living/carbon/human/H)
+	..()
+	update_icon()
+
+/obj/mecha/combat/phazon/ncrtruck/Destroy()
+	for(var/atom/movable/A in cargo)
+		A.forceMove(drop_location())
+		step_rand(A)
+	cargo.Cut()
+	return ..()
+
+/obj/mecha/combat/phazon/ncrtruck/GrantActions(mob/living/user, human_occupant = 0)
+	cycle_action.Grant(user, src)
+	lights_action.Grant(user, src)
+	stats_action.Grant(user, src)
+	eject_action.Grant(user, src)
+	klaxon_action.Grant(user, src)
+
+/obj/mecha/combat/phazon/ncrtruck/RemoveActions(mob/living/user, human_occupant = 0)
+	cycle_action.Remove(user)
+	lights_action.Remove(user)
+	stats_action.Remove(user)
+	eject_action.Remove(user)
+	klaxon_action.Remove(user)
+
+/obj/mecha/combat/phazon/ncrtruck/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+
+//////////// NCR TRUCK MP //////////////
+
+/obj/mecha/combat/phazon/ncrtruck/mp
+	name = "\improper NCR MP Truck"
+	desc = "A truck running on powercells. Nice eh ? still a wreck. This Truck has been given to the NCR MPs, the running gear has been improved."
+	icon = 'icons/mecha/ncrtruck-mp.dmi'
+	icon_state = "ncrtruck"
+	max_integrity = 600
+	step_in = 0.8
+	armor = ARMOR_VALUE_VEHICLE_TRUCK
+	wreckage = /obj/structure/mecha_wreckage/ncrtruck
+
+/obj/mecha/combat/phazon/ncrtruck/mp/GrantActions(mob/living/user, human_occupant = 0)
+	cycle_action.Grant(user, src)
+	lights_action.Grant(user, src)
+	stats_action.Grant(user, src)
+	eject_action.Grant(user, src)
+	klaxon_action.Grant(user, src)
+	sirens_action.Grant(user, src)
+
+/obj/mecha/combat/phazon/ncrtruck/mp/RemoveActions(mob/living/user, human_occupant = 0)
+	cycle_action.Remove(user)
+	lights_action.Remove(user)
+	stats_action.Remove(user)
+	eject_action.Remove(user)
+	klaxon_action.Remove(user)
+	sirens_action.Remove(user)
+
+/obj/mecha/combat/phazon/ncrtruck/mp/loaded/Initialize()
+	. = ..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/seat
+	ME.attach(src)
+
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index afcaf470d86..daaa27d9a1b 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -44,7 +44,7 @@
 	move_force = MOVE_FORCE_VERY_STRONG
 	move_resist = MOVE_FORCE_EXTREMELY_STRONG
 	light_range = 9
-	var/deflect_chance = 10 //chance to deflect the incoming projectiles, hits, or lesser the effect of ex_act.
+	var/deflect_chance = 0 //chance to deflect the incoming projectiles, hits, or lesser the effect of ex_act.
 	armor = ARMOR_VALUE_HEAVY
 	var/list/facing_modifiers = list(FRONT_ARMOUR = 1.5, SIDE_ARMOUR = 1, BACK_ARMOUR = 0.5)
 	//var/obj/item/stock_parts/cell/cell
@@ -92,7 +92,15 @@
 
 	var/list/equipment = new
 	var/obj/item/mecha_parts/mecha_equipment/selected
-	var/max_equip = 3
+
+	var/max_utility_equip = 3 // Seats, clamps, etc.
+	var/max_weapons_equip = 1 // Weapons, duh.
+	var/max_misc_equip = 1 // Anything that isn't a utility or a weapon.
+
+	var/list/weapon_equipment = new
+	var/list/utility_equipment = new
+	var/list/misc_equipment = new
+
 	var/datum/events/events
 
 	var/stepsound = 'sound/mecha/mechstep.ogg'
@@ -189,7 +197,7 @@
 			c.reagents.trans_id_to(fuel_holder, /datum/reagent/fuel, min((fuel_holder.volume - fuel_holder.reagents.total_volume), c.amount_per_transfer_from_this))
 			return TRUE
 	. = ..()
-	
+
 
 /obj/mecha/proc/get_fuel_tank()
 	return fuel_holder
diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm
index 64f03afb52a..aec00eb16e4 100644
--- a/code/game/mecha/mecha_topic.dm
+++ b/code/game/mecha/mecha_topic.dm
@@ -122,25 +122,32 @@
 
 
 /obj/mecha/proc/get_equipment_menu() //outputs mecha html equipment menu
-	. = ""
+	var/output
 	if(equipment.len)
-		. += {"<div class='wr'>
+		output += {"<div class='wr'>
 						<div class='header'>Equipment</div>
 						<div class='links'>"}
-		for(var/X in equipment)
-			var/obj/item/mecha_parts/mecha_equipment/W = X
-			. += "[W.name] <a href='?src=[REF(W)];detach=1'>Detach</a><br>"
-		. += "<b>Available equipment slots:</b> [max_equip-equipment.len]"
-		. += "</div></div>"
-
+		for(var/obj/item/mecha_parts/mecha_equipment/W in weapon_equipment)
+			output += "Weapon Module: [W.name] <a href='?src=\ref[W];detach=1'>Detach</a><br>"
+		for(var/obj/item/mecha_parts/mecha_equipment/W in utility_equipment)
+			output += "Utility Module: [W.name] <a href='?src=\ref[W];detach=1'>Detach</a><br>"
+		for(var/obj/item/mecha_parts/mecha_equipment/W in misc_equipment)
+			output += "Miscellaneous Module: [W.name] <a href='?src=\ref[W];detach=1'>Detach</a><br>"
+	output += {"<b>Available weapon slots:</b> [max_weapons_equip-weapon_equipment.len]<br>
+	 <b>Available utility slots:</b> [max_utility_equip-utility_equipment.len]<br>
+	 <b>Available miscellaneous slots:</b> [max_misc_equip-misc_equipment.len]<br>
+	 </div></div>
+	 "}
+	return output
 
 /obj/mecha/proc/get_equipment_list() //outputs mecha equipment list in html
 	if(!equipment.len)
 		return
-	. = "<b>Equipment:</b><div style=\"margin-left: 15px;\">"
+	var/output = "<b>Equipment:</b><div style=\"margin-left: 15px;\">"
 	for(var/obj/item/mecha_parts/mecha_equipment/MT in equipment)
-		. += "<div id='[REF(MT)]'>[MT.get_equip_info()]</div>"
-	. += "</div>"
+		output += "<div id='\ref[MT]'>[MT.get_equip_info()]</div>"
+	output += "</div>"
+	return output
 
 
 
diff --git a/code/game/mecha/medical/medical.dm b/code/game/mecha/medical/medical.dm
index 00183443adf..f35ac866784 100644
--- a/code/game/mecha/medical/medical.dm
+++ b/code/game/mecha/medical/medical.dm
@@ -4,7 +4,9 @@
 	deflect_chance = 0
 	light_power = 9
 	light_range = 10
-	max_equip = 4
+	max_utility_equip = 3
+	max_weapons_equip = 1
+	max_misc_equip = 3
 
 /obj/mecha/medical/mechturn(direction)
 	setDir(direction)
diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm
index 9456580ad06..ae7d1a91ecb 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/game/mecha/working/ripley.dm
@@ -6,7 +6,9 @@
 	max_temperature = 20000
 	max_integrity = 300
 	armor = ARMOR_VALUE_MEDIUM
-	max_equip = 6
+	max_utility_equip = 4
+	max_weapons_equip = 2
+	max_misc_equip = 2
 	wreckage = /obj/structure/mecha_wreckage/ripley
 	var/list/cargo = new
 	var/cargo_capacity = 15
@@ -41,7 +43,9 @@
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	lights_power = 7
 	armor = ARMOR_VALUE_MEDIUM
-	max_equip = 5 // More armor, less tools
+	max_utility_equip = 3
+	max_weapons_equip = 1
+	max_misc_equip = 2
 	wreckage = /obj/structure/mecha_wreckage/ripley/firefighter
 
 
@@ -85,7 +89,9 @@
 	lights_power = 7
 	step_energy_drain = 30 //slightly higher energy drain since you movin those wheels FAST
 	armor = ARMOR_VALUE_MEDIUM
-	max_equip = 5
+	max_utility_equip = 3
+	max_weapons_equip = 1
+	max_misc_equip = 2
 	wreckage = /obj/structure/mecha_wreckage/clarke
 	cargo_capacity = 10
 	canstrafe = FALSE
diff --git a/hailmary.dme b/hailmary.dme
index 7d4d50bb4a4..3f40b9415df 100644
--- a/hailmary.dme
+++ b/hailmary.dme
@@ -556,7 +556,8 @@
 #include "code\datums\components\crafting\recipes\recipes_tools.dm"
 #include "code\datums\components\crafting\recipes\recipes_tribal.dm"
 #include "code\datums\components\crafting\recipes\recipes_weapon_and_ammo.dm"
-#include "code\datums\components\crafting\recipes\vehicle_parts.dm"
+#include "code\datums\components\crafting\recipes\vehicles\vehicle_parts.dm"
+#include "code\datums\components\crafting\recipes\vehicles\vehicle_weapons.dm"
 #include "code\datums\components\fantasy\_fantasy.dm"
 #include "code\datums\components\fantasy\affix.dm"
 #include "code\datums\components\fantasy\prefixes.dm"
@@ -1003,6 +1004,15 @@
 #include "code\game\mecha\equipment\tools\work_tools.dm"
 #include "code\game\mecha\equipment\weapons\mecha_ammo.dm"
 #include "code\game\mecha\equipment\weapons\weapons.dm"
+#include "code\game\mecha\equipment\weapons\fallout\ballistic.dm"
+#include "code\game\mecha\equipment\weapons\fallout\energy.dm"
+#include "code\game\mecha\fallout\armored.dm"
+#include "code\game\mecha\fallout\birds.dm"
+#include "code\game\mecha\fallout\buggies.dm"
+#include "code\game\mecha\fallout\carriages.dm"
+#include "code\game\mecha\fallout\cars.dm"
+#include "code\game\mecha\fallout\pickuptrucks.dm"
+#include "code\game\mecha\fallout\trucks.dm"
 #include "code\game\mecha\medical\medical.dm"
 #include "code\game\mecha\medical\medigax.dm"
 #include "code\game\mecha\medical\odysseus.dm"
diff --git a/icons/mecha/armoredjeep.dmi b/icons/mecha/armoredjeep.dmi
new file mode 100644
index 00000000000..33044cb5781
Binary files /dev/null and b/icons/mecha/armoredjeep.dmi differ
diff --git a/icons/mecha/mecha_equipment.dmi b/icons/mecha/mecha_equipment.dmi
index 5e277af7cca..71ba107315e 100644
Binary files a/icons/mecha/mecha_equipment.dmi and b/icons/mecha/mecha_equipment.dmi differ