diff --git a/code/__DEFINES/job_ru.dm b/code/__DEFINES/job_ru.dm
index 3a57881efe..ccee44be20 100644
--- a/code/__DEFINES/job_ru.dm
+++ b/code/__DEFINES/job_ru.dm
@@ -233,12 +233,12 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 //-------- PVE Mercs and PMC's  --------//
 #define SQUAD_PMCPLT "AZURE-15"
 #define SQUAD_MERC "Freelancer"
-#define JOB_RTO_FL "Radio Jockey"
-#define JOB_SQUAD_TEAM_LEADER_FL "Cutthroat"
-#define JOB_SQUAD_LEADER_FL "Master at Arms"
-#define JOB_SQUAD_SMARTGUN_FL "Gunner"
-#define JOB_SQUAD_MEDIC_FL "Surgeon"
-#define JOB_SQUAD_RIFLEMAN_FL "Merc"
+#define JOB_RTO_FL "Radio Jockey (RTO)"
+#define JOB_SQUAD_TEAM_LEADER_FL "Bruiser (FTL)"
+#define JOB_SQUAD_LEADER_FL "Warlord (PltSgt)"
+#define JOB_SQUAD_SMARTGUN_FL "Gunner (Smartgunner)"
+#define JOB_SQUAD_MEDIC_FL "Surgeon (Corpsman)"
+#define JOB_SQUAD_RIFLEMAN_FL "Merc (Rifleman)"
 #define JOB_PMCPLAT_OW "OVERWATCH"
 #define JOB_PMCPLAT_LEADER "Operations Leader"
 #define JOB_PMCPLAT_FTL "Team Leader"
diff --git a/code/__DEFINES/minimap.dm b/code/__DEFINES/minimap.dm
index 0722ffc1f6..e362b1112c 100644
--- a/code/__DEFINES/minimap.dm
+++ b/code/__DEFINES/minimap.dm
@@ -65,6 +65,7 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 #define MINIMAP_SQUAD_INTEL "#053818"
 #define MINIMAP_SQUAD_UPP "#B22222"
 #define MINIMAP_SQUAD_PMC "#ccffe9"
+#define MINIMAP_SQUAD_LANCER "#a5a5a5"
 
 #define MINIMAP_ICON_BACKGROUND_CIVILIAN "#7D4820"
 #define MINIMAP_ICON_BACKGROUND_CIC "#3f3f3f"
diff --git a/code/__DEFINES/mode_ru.dm b/code/__DEFINES/mode_ru.dm
index 2c14c635ba..37c48f181c 100644
--- a/code/__DEFINES/mode_ru.dm
+++ b/code/__DEFINES/mode_ru.dm
@@ -143,7 +143,7 @@ var/global/list/ROLES_UNASSIGNED = list(JOB_SQUAD_MARINE)
 var/global/list/ROLES_AI = list(JOB_SO, JOB_PILOT, JOB_RESERVE, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE)
 var/global/list/ROLES_AI_UPP = list(JOB_SO_UPP, JOB_SQUAD_LEADER_UPP, JOB_RESERVE, JOB_SQUAD_MEDIC_UPP, JOB_SQUAD_TEAM_LEADER_UPP, JOB_SQUAD_SMARTGUN_UPP, JOB_SQUAD_MARINE_UPP)
 var/global/list/ROLES_AI_FORECON = list(JOB_SQUAD_LEADER_FORECON, JOB_RESERVE, JOB_SQUAD_MEDIC_FORECON, JOB_SQUAD_TEAM_LEADER_FORECON, JOB_SQUAD_SMARTGUN_FORECON, JOB_SQUAD_MARINE_FORECON, JOB_SQUAD_RTO)
-var/global/list/ROLES_AI_FREELANCER = list(JOB_SQUAD_RIFLEMAN_FL, JOB_SQUAD_LEADER_FL, JOB_SQUAD_MEDIC_FL, JOB_SQUAD_TEAM_LEADER_FL, JOB_SQUAD_SMARTGUN_FL, JOB_RTO_FL)
+var/global/list/ROLES_AI_FREELANCER = list(JOB_RTO_FL, JOB_SQUAD_LEADER_FL, JOB_SQUAD_TEAM_LEADER_FL, JOB_SQUAD_MEDIC_FL, JOB_SQUAD_SMARTGUN_FL, JOB_SQUAD_RIFLEMAN_FL)
 var/global/list/ROLES_PMCPLT = list(JOB_PMCPLAT_OW, JOB_PMCPLAT_LEADER, JOB_PMCPLAT_FTL, JOB_PMCPLAT_SG, JOB_PMCPLAT_STANDARD, JOB_PMCPLAT_MEDIC)
 var/global/list/ROLES_WO = list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_WO_SQUAD_MARINE, JOB_WO_SQUAD_MEDIC, JOB_WO_SQUAD_ENGINEER, JOB_WO_SQUAD_SMARTGUNNER, JOB_WO_SQUAD_SPECIALIST, JOB_WO_SQUAD_LEADER)
 //Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc.
diff --git a/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm b/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm
index efbe6402e4..8bdeb8205f 100644
--- a/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm
+++ b/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm
@@ -99,12 +99,12 @@ GLOBAL_LIST_INIT(platoon_to_jobs, list(/datum/squad/marine/alpha = list(/datum/j
 		/datum/job/marine/smartgunner/ai/pmc = JOB_SQUAD_SMARTGUN,\
 		/datum/job/marine/leader/ai/pmc = JOB_SQUAD_LEADER,\
 		/datum/job/command/bridge/ai/pmc = JOB_PMCPLAT_OW),\
-		/datum/squad/marine/fl = list(/datum/job/marine/standard/ai/fl = JOB_SQUAD_MARINE,\
-		/datum/job/command/bridge/ai/fl = JOB_SQUAD_RTO,\
-		/datum/job/marine/leader/ai/fl = JOB_SQUAD_LEADER,\
-		/datum/job/marine/medic/ai/fl = JOB_SQUAD_MEDIC,\
-		/datum/job/marine/tl/ai/fl = JOB_SQUAD_TEAM_LEADER,\
-		/datum/job/marine/smartgunner/ai/fl = JOB_SQUAD_SMARTGUN),\
+		/datum/squad/marine/lancer = list(/datum/job/marine/standard/ai/lancer = JOB_SQUAD_MARINE,\
+		/datum/job/command/bridge/ai/lancer = JOB_SQUAD_RTO,\
+		/datum/job/marine/leader/ai/lancer = JOB_SQUAD_LEADER,\
+		/datum/job/marine/medic/ai/lancer = JOB_SQUAD_MEDIC,\
+		/datum/job/marine/tl/ai/lancer = JOB_SQUAD_TEAM_LEADER,\
+		/datum/job/marine/smartgunner/ai/lancer = JOB_SQUAD_SMARTGUN),\
 //RU-PVE ADDITION ENDS
 		/datum/squad/marine/forecon = list(/datum/job/marine/standard/ai/forecon = JOB_SQUAD_MARINE,\
 		/datum/job/marine/standard/ai/rto = JOB_SQUAD_RTO,\
@@ -116,5 +116,5 @@ GLOBAL_LIST_INIT(platoon_to_jobs, list(/datum/squad/marine/alpha = list(/datum/j
 GLOBAL_LIST_INIT(platoon_to_role_list, list(/datum/squad/marine/alpha = ROLES_AI,\
 												/datum/squad/marine/upp = ROLES_AI_UPP,\
 												/datum/squad/marine/pmc = ROLES_PMCPLT,\
-												/datum/squad/marine/fl = ROLES_AI_FREELANCER,\
+												/datum/squad/marine/lancer = ROLES_AI_FREELANCER,\
 												/datum/squad/marine/forecon = ROLES_AI_FORECON))
diff --git a/colonialmarines.dme b/colonialmarines.dme
index 6bd7a29e04..fad47c94b5 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -2513,6 +2513,7 @@
 #include "void-marines\code\playable_factions\areas.dm"
 #include "void-marines\code\playable_factions\fl_mod_items.dm"
 #include "void-marines\code\playable_factions\fl_presets.dm"
+#include "void-marines\code\playable_factions\lancer.dm"
 #include "void-marines\code\playable_factions\fl_vendors.dm"
 #include "void-marines\code\playable_factions\pmc_presets.dm"
 #include "void-marines\code\playable_factions\shuttles.dm"
diff --git a/maps/corsair.json b/maps/corsair.json
index caecd93c19..54d8ed0b24 100644
--- a/maps/corsair.json
+++ b/maps/corsair.json
@@ -5,5 +5,5 @@
     "webmap_url": "GoldenArrow",
     "traits": [{"Marine Main Ship": true}],
     "nightmare_path": "maps/Nightmare/maps/corsair/",
-    "platoon": "/datum/squad/marine/fl"
+    "platoon": "/datum/squad/marine/lancer"
 }
diff --git a/maps/map_files/Corsair/Corsair.dmm b/maps/map_files/Corsair/Corsair.dmm
index 70fdc85380..8563ac6d9b 100644
--- a/maps/map_files/Corsair/Corsair.dmm
+++ b/maps/map_files/Corsair/Corsair.dmm
@@ -64,13 +64,13 @@
 /area/golden_arrow/hangar)
 "aB" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/marine_personal{
-	has_cryo_gear = 0
-	},
 /obj/item/clothing/under/marine/veteran/freelancer,
 /obj/item/clothing/suit/storage/marine/faction/freelancer,
 /obj/item/clothing/shoes/marine/brown/knife,
 /obj/item/device/radio/headset/distress/fl,
+/obj/structure/closet/secure_closet/marine_personal{
+	has_cryo_gear = 0
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -347,13 +347,13 @@
 	},
 /area/golden_arrow/medical)
 "dM" = (
-/obj/structure/closet/secure_closet/marine_personal{
-	has_cryo_gear = 0
-	},
 /obj/item/clothing/under/marine/veteran/freelancer,
 /obj/item/clothing/suit/storage/marine/faction/freelancer,
 /obj/item/clothing/shoes/royal_marine/knife,
 /obj/item/device/radio/headset/distress/fl,
+/obj/structure/closet/secure_closet/marine_personal{
+	has_cryo_gear = 0
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -456,7 +456,7 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/squad_one)
 "fl" = (
-/obj/effect/landmark/start/marine/tl/ai/fl,
+/obj/effect/landmark/start/marine/tl/ai/lancer,
 /turf/open/floor/kutjevo/fake_wood,
 /area/golden_arrow/dorms)
 "fm" = (
@@ -480,7 +480,7 @@
 	},
 /area/golden_arrow/canteen)
 "fz" = (
-/obj/effect/landmark/start/bridge/fl,
+/obj/effect/landmark/start/bridge/lancer,
 /turf/open/floor/kutjevo/fake_wood,
 /area/golden_arrow/dorms)
 "fB" = (
@@ -503,6 +503,7 @@
 /obj/structure/surface/rack,
 /obj/item/weapon/gun/rifle/m16/grenadier/repro,
 /obj/item/weapon/gun/rifle/m16/grenadier/repro,
+/obj/item/weapon/gun/rifle/m16/grenadier/repro,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/squad_one)
 "fI" = (
@@ -735,12 +736,14 @@
 /area/golden_arrow/canteen)
 "iU" = (
 /obj/structure/closet/secure_closet/marine_personal{
-	job = "Squad Sergeant";
-	has_cryo_gear = 0
+	job = "Fireteam Leader";
+	has_cryo_gear = 0;
+	name = "personal lockers"
 	},
 /obj/item/clothing/suit/storage/marine/veteran/mercenary/support,
 /obj/item/clothing/under/marine/veteran/mercenary/support,
 /obj/item/clothing/head/freelancer/beret,
+/obj/item/device/radio/headset/distress/fl,
 /turf/open/floor/kutjevo/fake_wood,
 /area/golden_arrow/dorms)
 "iY" = (
@@ -785,13 +788,10 @@
 /turf/open/floor/plating,
 /area/golden_arrow/canteen)
 "jx" = (
-/obj/effect/landmark/start/marine/leader/fl,
+/obj/effect/landmark/start/marine/leader/lancer,
 /turf/open/floor/kutjevo/fake_wood,
 /area/golden_arrow/dorms)
 "jC" = (
-/obj/structure/barricade/handrail/wire{
-	pixel_y = -4
-	},
 /obj/structure/barricade/handrail/wire{
 	dir = 4
 	},
@@ -845,15 +845,14 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/engineering)
 "kD" = (
-/obj/structure/closet/secure_closet/marine_personal{
-	has_cryo_gear = 0;
-	job = "Radio Telephone Operator"
-	},
 /obj/item/clothing/under/marine/veteran/freelancer,
 /obj/item/clothing/suit/storage/marine/faction/freelancer,
 /obj/item/clothing/shoes/marine/knife,
 /obj/item/device/radio/headset/distress/fl,
 /obj/item/storage/backpack/marine/satchel/rto,
+/obj/structure/closet/secure_closet/marine_personal{
+	job = "Radio Telephone Operator"
+	},
 /turf/open/floor/kutjevo/fake_wood,
 /area/golden_arrow/dorms)
 "kF" = (
@@ -868,7 +867,7 @@
 	},
 /area/golden_arrow/canteen)
 "kM" = (
-/obj/effect/landmark/start/marine/medic/fl,
+/obj/effect/landmark/start/marine/medic/lancer,
 /turf/open/floor/kutjevo/fake_wood,
 /area/golden_arrow/dorms)
 "kN" = (
@@ -883,6 +882,7 @@
 /obj/structure/surface/rack,
 /obj/item/weapon/gun/shotgun/merc,
 /obj/item/weapon/gun/shotgun/merc,
+/obj/item/weapon/gun/shotgun/merc,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/squad_one)
 "kS" = (
@@ -899,23 +899,18 @@
 	icon_state = "plating"
 	},
 /area/golden_arrow/engineering)
-"kZ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 2
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/dorms)
 "le" = (
 /obj/structure/surface/table/woodentable/fancy,
+/obj/item/toy/deck/uno,
 /turf/open/floor/kutjevo/fake_wood,
 /area/golden_arrow/dorms)
+"lk" = (
+/obj/structure/closet/secure_closet/marine_personal{
+	job = "Master at Arms (PltSgt)";
+	has_cryo_gear = 0
+	},
+/turf/closed/wall/almayer,
+/area/golden_arrow/dorms)
 "lz" = (
 /obj/structure/surface/rack,
 /obj/item/ammo_magazine/revolver/mateba,
@@ -942,6 +937,7 @@
 /obj/structure/surface/rack,
 /obj/item/weapon/gun/smg/mp5,
 /obj/item/weapon/gun/smg/mp5,
+/obj/item/weapon/gun/smg/mp5,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/squad_one)
 "lJ" = (
@@ -976,21 +972,6 @@
 	icon_state = "cargo"
 	},
 /area/golden_arrow/squad_one)
-"ma" = (
-/obj/structure/barricade/handrail/wire,
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 2
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/dorms)
 "mv" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -1053,12 +1034,15 @@
 /turf/open/floor/kutjevo/fake_wood,
 /area/golden_arrow/canteen)
 "nk" = (
-/obj/structure/barricade/handrail/wire,
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
 /obj/structure/barricade/handrail/wire{
-	dir = 4
+	dir = 1;
+	pixel_y = 12
 	},
-/obj/structure/blocker/invisible_wall,
-/turf/open/floor/almayer/empty,
+/turf/open/floor/almayer,
 /area/golden_arrow/dorms)
 "nx" = (
 /obj/effect/decal/strata_decals/grime/grime1{
@@ -1120,6 +1104,12 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/cryo_cells)
+"oS" = (
+/obj/structure/machinery/door/poddoor/almayer/planet_side_blastdoor{
+	dir = 4
+	},
+/turf/open/floor/almayer,
+/area/golden_arrow/hangar)
 "oU" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/item/storage/fancy/cigar/matchbook,
@@ -1340,7 +1330,7 @@
 /area/golden_arrow/dorms)
 "qJ" = (
 /obj/structure/closet/secure_closet/marine_personal{
-	job = "Platoon Corpsman";
+	job = "Section Corpsman";
 	has_cryo_gear = 0
 	},
 /obj/item/clothing/under/marine/veteran/mercenary/miner,
@@ -1432,6 +1422,7 @@
 "rB" = (
 /obj/structure/surface/rack,
 /obj/item/weapon/gun/smg/bizon/lancer,
+/obj/item/weapon/gun/smg/bizon/lancer,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/squad_one)
 "rH" = (
@@ -1528,7 +1519,16 @@
 	},
 /area/golden_arrow/dorms)
 "rZ" = (
-/obj/structure/machinery/cm_vending/sorted/marine_food,
+/obj/structure/closet/secure_closet/freezer/fridge,
+/obj/item/reagent_container/food/snacks/cheeseburger{
+	pixel_y = 9
+	},
+/obj/item/reagent_container/food/snacks/cheeseburger{
+	pixel_y = 1
+	},
+/obj/item/reagent_container/food/snacks/cheeseburger{
+	pixel_y = -8
+	},
 /turf/open/floor/kutjevo/fake_wood,
 /area/golden_arrow/dorms)
 "sa" = (
@@ -1647,7 +1647,6 @@
 /obj/structure/barricade/handrail{
 	dir = 8
 	},
-/obj/effect/glowshroom,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/cryo_cells)
 "th" = (
@@ -1798,7 +1797,7 @@
 	},
 /area/golden_arrow/hangar)
 "uA" = (
-/obj/effect/landmark/start/marine/fl,
+/obj/effect/landmark/start/marine/lancer,
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
@@ -1941,18 +1940,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/synthcloset)
-"wg" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SE-out";
-	pixel_x = 2
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NE-out";
-	pixel_x = 2;
-	pixel_y = 3
-	},
-/turf/open/floor/plating/bare_catwalk,
-/area/golden_arrow/dorms)
 "wm" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -2102,10 +2089,6 @@
 	icon_state = "S";
 	pixel_y = 1
 	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3
-	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -2136,19 +2119,6 @@
 /obj/effect/decal/cleanable/blood/oil/streak,
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"yp" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	layer = 2.5
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	layer = 2.5;
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/turf/open/floor/plating/bare_catwalk,
-/area/golden_arrow/dorms)
 "yr" = (
 /obj/structure/largecrate/supply/supplies/mre{
 	layer = 3.1
@@ -2178,7 +2148,7 @@
 /area/golden_arrow/cryo_cells)
 "yP" = (
 /obj/structure/closet/secure_closet/marine_personal{
-	job = "Platoon Sergeant";
+	job = "Section Sergeants";
 	has_cryo_gear = 0
 	},
 /obj/item/clothing/shoes/marine/jungle/knife,
@@ -2414,11 +2384,12 @@
 /turf/closed/wall/almayer,
 /area/golden_arrow/engineering)
 "Cf" = (
-/obj/structure/barricade/handrail/wire{
-	dir = 8
+/obj/structure/barricade/handrail/wire,
+/obj/effect/decal/warning_stripes{
+	icon_state = "S";
+	pixel_y = 1
 	},
-/obj/structure/blocker/invisible_wall,
-/turf/open/floor/almayer/empty,
+/turf/open/floor/almayer,
 /area/golden_arrow/dorms)
 "Ci" = (
 /obj/structure/window/framed/almayer/hull,
@@ -2505,6 +2476,7 @@
 /obj/structure/surface/rack,
 /obj/item/weapon/gun/smg/mac15,
 /obj/item/weapon/gun/smg/mac15,
+/obj/item/weapon/gun/smg/mac15,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/squad_one)
 "CK" = (
@@ -2529,9 +2501,9 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/synthcloset)
 "Di" = (
-/obj/effect/landmark/start/marine/fl,
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/marine/lancer,
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
@@ -2578,15 +2550,15 @@
 /turf/closed/wall/almayer,
 /area/golden_arrow/engineering)
 "DF" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 2
-	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
 	pixel_y = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/barricade/handrail/wire{
+	dir = 1;
+	pixel_y = 12
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -2596,6 +2568,7 @@
 	icon_state = "SE-out";
 	pixel_x = 2
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer,
 /area/golden_arrow/dorms)
 "DV" = (
@@ -2666,6 +2639,12 @@
 /obj/structure/bed/stool,
 /turf/open/floor/kutjevo/fake_wood,
 /area/golden_arrow/canteen)
+"Eq" = (
+/obj/effect/hybrisa/decal/gold/line2,
+/turf/open/floor/almayer{
+	icon_state = "cargo"
+	},
+/area/golden_arrow/hangar)
 "Er" = (
 /obj/effect/decal/cleanable/dirt/greenglow,
 /turf/open/floor/kutjevo/fake_wood,
@@ -2684,12 +2663,6 @@
 /obj/structure/largecrate{
 	fill_from_loc = 0
 	},
-/obj/structure/largecrate{
-	fill_from_loc = 0;
-	layer = 3.1;
-	pixel_x = -1;
-	pixel_y = 38
-	},
 /obj/item/toy/plush/therapy/red{
 	desc = "A USCM approved plush doll. It's not soft and hardly comforting!";
 	force = 15;
@@ -2698,10 +2671,18 @@
 	pixel_y = 8;
 	throwforce = 15
 	},
-/obj/item/clothing/head/cmcap{
-	layer = 3.0;
-	pixel_x = -1;
-	pixel_y = 15
+/obj/item/clothing/head/helmet/marine/veteran/mercenary/miner{
+	layer = 2.99;
+	pixel_y = 13;
+	armor_bio = 0;
+	armor_bomb = 0;
+	armor_bullet = 0;
+	armor_energy = 0;
+	armor_internaldamage = 0;
+	armor_laser = 0;
+	armor_melee = 0;
+	name = "\improper Useless Y8 miner helmet";
+	armor_rad = 0
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
@@ -2796,7 +2777,9 @@
 	},
 /area/golden_arrow/medical)
 "Ft" = (
-/obj/structure/machinery/door/airlock/almayer/medical,
+/obj/structure/machinery/door/airlock/almayer/medical{
+	req_one_access = null
+	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/almayer{
@@ -2816,6 +2799,11 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/engineering)
+"FK" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/toy/deck,
+/turf/open/floor/kutjevo/fake_wood,
+/area/golden_arrow/dorms)
 "FP" = (
 /obj/structure/surface/table/reinforced/prison,
 /obj/item/ammo_magazine/flamer_tank/gellied,
@@ -2863,6 +2851,7 @@
 /obj/item/ammo_magazine/smg/mp27,
 /obj/item/ammo_magazine/smg/mp27,
 /obj/item/ammo_magazine/smg/mp27,
+/obj/item/weapon/gun/smg/mp27,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/squad_one)
 "Ga" = (
@@ -2952,13 +2941,13 @@
 	pixel_x = -27
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/marine_personal{
-	has_cryo_gear = 0
-	},
 /obj/item/clothing/under/marine/veteran/freelancer,
 /obj/item/clothing/suit/storage/marine/faction/freelancer,
 /obj/item/clothing/shoes/marine/brown/knife,
 /obj/item/device/radio/headset/distress/fl,
+/obj/structure/closet/secure_closet/marine_personal{
+	has_cryo_gear = 0
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -3040,13 +3029,6 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
-"HX" = (
-/obj/structure/barricade/handrail/wire{
-	dir = 4
-	},
-/obj/structure/blocker/invisible_wall,
-/turf/open/floor/almayer/empty,
-/area/golden_arrow/dorms)
 "HY" = (
 /obj/structure/machinery/light{
 	dir = 4;
@@ -3093,21 +3075,9 @@
 "Iq" = (
 /obj/structure/surface/rack,
 /obj/item/weapon/gun/smg/fp9000,
+/obj/item/weapon/gun/smg/fp9000,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/squad_one)
-"Ir" = (
-/obj/structure/barricade/handrail/wire,
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	pixel_y = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "Iu" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/item/reagent_container/food/drinks/bottle/absinthe,
@@ -3150,26 +3120,19 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/squad_one)
 "IZ" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "SW-out";
-	layer = 2.5
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "NW-out";
-	layer = 2.5;
-	pixel_x = -1;
-	pixel_y = 1
-	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/bare_catwalk,
 /area/golden_arrow/dorms)
-"Jf" = (
-/obj/structure/barricade/handrail/wire,
-/obj/structure/barricade/handrail/wire{
-	dir = 8
+"Jb" = (
+/obj/structure/closet/secure_closet/marine_personal{
+	job = "Fireteam Leader";
+	has_cryo_gear = 0
 	},
-/obj/structure/blocker/invisible_wall,
-/turf/open/floor/almayer/empty,
+/obj/item/clothing/suit/storage/marine/veteran/mercenary/support,
+/obj/item/clothing/under/marine/veteran/mercenary/support,
+/obj/item/clothing/head/freelancer/beret,
+/obj/item/device/radio/headset/distress/fl,
+/turf/open/floor/kutjevo/fake_wood,
 /area/golden_arrow/dorms)
 "Jk" = (
 /turf/open/floor/almayer,
@@ -3184,7 +3147,6 @@
 	},
 /area/golden_arrow/hangar)
 "Jo" = (
-/obj/structure/barricade/handrail/wire,
 /obj/structure/machinery/light/small{
 	dir = 8
 	},
@@ -3196,9 +3158,6 @@
 	opacity = 0;
 	pixel_y = -17
 	},
-/obj/item/weapon/pizza_cutter{
-	pixel_y = 18
-	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
 "Jq" = (
@@ -3283,11 +3242,11 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/clothing/under/marine/veteran/freelancer,
 /obj/item/clothing/suit/storage/marine/faction/freelancer,
+/obj/item/clothing/shoes/marine,
+/obj/item/device/radio/headset/distress/fl,
 /obj/structure/closet/secure_closet/marine_personal{
 	has_cryo_gear = 0
 	},
-/obj/item/clothing/shoes/marine,
-/obj/item/device/radio/headset/distress/fl,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -3374,18 +3333,6 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/medical)
-"Li" = (
-/obj/structure/barricade/handrail/wire,
-/obj/effect/decal/warning_stripes{
-	icon_state = "N";
-	pixel_y = 1
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/dorms)
 "Lj" = (
 /obj/structure/surface/rack,
 /obj/item/explosive/grenade/phosphorus/clf,
@@ -3587,20 +3534,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
-"ME" = (
-/obj/structure/barricade/handrail/wire,
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 2
-	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	pixel_y = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/golden_arrow/dorms)
 "MP" = (
 /obj/item/storage/box/uscm_mre,
 /turf/open/floor/kutjevo/fake_wood,
@@ -3644,11 +3577,6 @@
 	icon_state = "sterile_green"
 	},
 /area/golden_arrow/medical)
-"Nt" = (
-/obj/structure/barricade/handrail/wire,
-/obj/structure/blocker/invisible_wall,
-/turf/open/floor/almayer/empty,
-/area/golden_arrow/dorms)
 "NH" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/kutjevo/fake_wood,
@@ -3662,6 +3590,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer,
 /area/golden_arrow/canteen)
+"NP" = (
+/obj/structure/machinery/door_control{
+	id = 66
+	},
+/turf/open/floor/almayer,
+/area/golden_arrow/hangar)
 "NU" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/machinery/cryopod,
@@ -3726,12 +3660,12 @@
 /turf/open/floor/kutjevo/fake_wood,
 /area/golden_arrow/dorms)
 "OF" = (
-/obj/effect/landmark/start/marine/smartgunner/fl,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/obj/structure/machinery/door/poddoor/almayer/planet_side_blastdoor{
+	dir = 4;
+	id = 66
 	},
-/area/golden_arrow/cryo_cells)
+/turf/open/floor/almayer,
+/area/golden_arrow/hangar)
 "OH" = (
 /obj/structure/machinery/door/airlock/multi_tile/almayer/marine,
 /turf/open/floor/almayer{
@@ -3891,6 +3825,8 @@
 /obj/structure/surface/rack,
 /obj/item/weapon/gun/rifle/l42a/L42B,
 /obj/item/weapon/gun/rifle/l42a/L42B,
+/obj/item/weapon/gun/rifle/l42a/L42B,
+/obj/item/weapon/gun/rifle/l42a/L42B,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/squad_one)
 "Qb" = (
@@ -3901,7 +3837,8 @@
 /area/golden_arrow/squad_one)
 "Qm" = (
 /obj/structure/machinery/door/airlock/almayer/command{
-	dir = 2
+	dir = 2;
+	req_access = null
 	},
 /turf/closed/wall/almayer/outer,
 /area/golden_arrow/hangar)
@@ -4004,6 +3941,7 @@
 /obj/item/ammo_magazine/pistol/heavy,
 /obj/item/ammo_magazine/pistol/heavy,
 /obj/item/ammo_magazine/pistol/heavy,
+/obj/item/storage/belt/gun/mateba,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/squad_one)
 "Rk" = (
@@ -4020,13 +3958,13 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/synthcloset)
 "Ro" = (
-/obj/structure/closet/secure_closet/marine_personal{
-	has_cryo_gear = 0
-	},
 /obj/item/clothing/under/marine/veteran/freelancer,
 /obj/item/clothing/suit/storage/marine/faction/freelancer,
 /obj/item/clothing/shoes/marine/jungle/knife,
 /obj/item/device/radio/headset/distress/fl,
+/obj/structure/closet/secure_closet/marine_personal{
+	has_cryo_gear = 0
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -4318,7 +4256,7 @@
 	dir = 1;
 	pixel_y = 20
 	},
-/obj/effect/landmark/start/marine/tl/ai/fl,
+/obj/effect/landmark/start/marine/tl/ai/lancer,
 /turf/open/floor/kutjevo/fake_wood,
 /area/golden_arrow/dorms)
 "UR" = (
@@ -4327,8 +4265,7 @@
 /turf/open/floor/carpet,
 /area/golden_arrow/canteen)
 "UX" = (
-/obj/effect/landmark/start/marine/fl,
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/marine/smartgunner/lancer,
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
@@ -4337,6 +4274,7 @@
 /obj/item/weapon/gun/shotgun/double/with_stock,
 /obj/structure/surface/rack,
 /obj/item/weapon/gun/shotgun/double/with_stock,
+/obj/item/weapon/gun/shotgun/double/with_stock,
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/squad_one)
 "Vh" = (
@@ -4512,7 +4450,12 @@
 /turf/open/space/basic,
 /area/space)
 "Xh" = (
-/obj/item/clothing/glasses/night,
+/obj/item/clothing/glasses/night{
+	actions_types = null;
+	active = 0;
+	clothing_traits_active = 0;
+	name = "\improper useless TV1 night vision goggles"
+	},
 /obj/structure/closet,
 /turf/open/floor/strata{
 	dir = 4;
@@ -4540,9 +4483,9 @@
 	icon_state = "N";
 	pixel_y = 1
 	},
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	layer = 3.3
+/obj/structure/barricade/handrail/wire{
+	dir = 1;
+	pixel_y = 12
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -4718,7 +4661,7 @@
 /area/golden_arrow/medical)
 "Zf" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/marine/fl,
+/obj/effect/landmark/start/marine/lancer,
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
@@ -10498,8 +10441,8 @@ RY
 Gz
 Jo
 DF
-wg
-ME
+Lx
+xW
 uj
 bv
 bv
@@ -10599,8 +10542,8 @@ YB
 iw
 Gz
 gC
-Jf
-Ir
+nk
+Lx
 Cf
 gC
 bv
@@ -10701,13 +10644,13 @@ Kh
 cf
 Gz
 gC
-Nt
-Li
-gC
+nk
+IZ
+Cf
 gC
 bv
 aq
-le
+FK
 Pv
 Os
 Yg
@@ -10720,10 +10663,10 @@ sa
 fz
 bv
 Fa
-uA
+UX
 Zf
 Di
-OF
+Zf
 fI
 Fa
 Xf
@@ -10804,8 +10747,8 @@ Uo
 Gz
 gC
 nk
-Ir
-HX
+Lx
+Cf
 gC
 bv
 kn
@@ -11211,9 +11154,9 @@ Kh
 vf
 Gz
 CG
-kZ
-wg
-ma
+DF
+Lx
+xW
 mI
 bv
 px
@@ -11223,7 +11166,7 @@ FP
 Yg
 Yg
 Pl
-Yg
+lk
 Yg
 Yg
 PB
@@ -11313,8 +11256,8 @@ Kh
 Uo
 Gz
 gC
-Jf
-Li
+nk
+Lx
 Cf
 gC
 bv
@@ -11329,7 +11272,7 @@ YS
 Yg
 iU
 YS
-iU
+Jb
 bv
 Fa
 yM
@@ -11415,9 +11358,9 @@ Kh
 cf
 Gz
 gC
-Nt
-Ir
-gC
+nk
+IZ
+Cf
 gC
 bv
 rZ
@@ -11434,10 +11377,10 @@ YS
 fl
 bv
 Fa
-uA
-uA
 UX
 uA
+Zf
+uA
 bT
 Fa
 Xf
@@ -11518,8 +11461,8 @@ iw
 Gz
 gC
 nk
-Li
-HX
+Lx
+Cf
 gC
 bv
 Oz
@@ -11620,7 +11563,7 @@ vv
 Gz
 hw
 XH
-yp
+IZ
 xW
 Cj
 bv
@@ -12742,7 +12685,7 @@ BN
 nH
 nH
 nH
-Xf
+NP
 Xf
 Xf
 Xf
@@ -12844,12 +12787,12 @@ LJ
 LJ
 LJ
 nH
-Xf
-Xf
-Xf
-Xf
-Xf
-Xf
+oS
+oS
+oS
+oS
+oS
+nH
 Xf
 Xf
 Xf
@@ -12946,12 +12889,12 @@ JU
 WI
 JU
 nH
-Xf
-Xf
-Xf
-Xf
-Xf
-Xf
+vF
+vF
+vF
+vF
+vF
+nH
 Xf
 Xf
 Xf
@@ -13048,12 +12991,12 @@ cn
 JU
 LJ
 nH
-Xf
-Xf
-Xf
-Xf
-Xf
-Xf
+aA
+aA
+aA
+aA
+aA
+nH
 Xf
 Xf
 Xf
@@ -13150,12 +13093,12 @@ cn
 LJ
 JU
 nH
-Xf
-Xf
-Xf
-Xf
-Xf
-Xf
+OF
+OF
+OF
+OF
+OF
+nH
 Xf
 Xf
 Xf
@@ -13252,13 +13195,13 @@ cn
 Ij
 Du
 nH
-Xf
-Xf
-Xf
-Xf
-Xf
-Xf
-Xf
+Eq
+Eq
+Eq
+Eq
+Eq
+nH
+nH
 Xf
 Xf
 Xf
@@ -13354,13 +13297,13 @@ cn
 JU
 Gb
 nH
-Xf
-Xf
-Xf
-Xf
-Xf
-Xf
-Xf
+jv
+jv
+jv
+jv
+jv
+jv
+nH
 Xf
 Xf
 Xf
@@ -13456,13 +13399,13 @@ cn
 LJ
 GG
 Qm
-Xf
-Xf
-Xf
-Xf
-Xf
-Xf
-Xf
+xZ
+xZ
+xZ
+xZ
+xZ
+jv
+nH
 Xf
 Xf
 Xf
@@ -13558,13 +13501,13 @@ cn
 LJ
 GG
 nH
-Xf
-Xf
-Xf
-Xf
-Xf
-Xf
-Xf
+jv
+jv
+jv
+jv
+jv
+jv
+nH
 Xf
 Xf
 Xf
diff --git a/maps/shuttles/dropship_lancer.dmm b/maps/shuttles/dropship_lancer.dmm
index fa33ac4cfb..14d02084e5 100644
--- a/maps/shuttles/dropship_lancer.dmm
+++ b/maps/shuttles/dropship_lancer.dmm
@@ -1,6 +1,10 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/obj/structure/bed/chair/dropship/passenger,
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4;
+	pixel_y = 8;
+	layer = 3.04
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -18,7 +22,13 @@
 /area/shuttle/lancers)
 "e" = (
 /obj/structure/bed/chair/dropship/passenger{
-	dir = 8
+	dir = 8;
+	pixel_y = -8;
+	layer = 3.01
+	},
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 8;
+	pixel_y = 8
 	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
@@ -35,8 +45,14 @@
 	},
 /area/shuttle/lancers)
 "h" = (
-/obj/structure/bed/chair/dropship/passenger,
-/obj/docking_port/mobile/marine_dropship/lancers,
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4;
+	pixel_x = 12
+	},
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 8;
+	pixel_x = -12
+	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -61,16 +77,38 @@
 	},
 /area/shuttle/lancers)
 "m" = (
+/obj/structure/surface/rack,
+/turf/open/shuttle/dropship{
+	icon_state = "rasputin15"
+	},
+/area/shuttle/lancers)
+"o" = (
 /obj/structure/bed/chair/dropship/passenger{
-	dir = 4
+	dir = 1
 	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
 /area/shuttle/lancers)
 "q" = (
-/turf/closed/shuttle/ert{
-	icon_state = "stan22"
+/obj/structure/machinery/computer/shuttle/ert/broken,
+/turf/open/shuttle/dropship{
+	icon_state = "rasputin15"
+	},
+/area/shuttle/lancers)
+"r" = (
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4;
+	pixel_y = 8;
+	layer = 3.02
+	},
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4;
+	pixel_y = -8;
+	layer = 3.03
+	},
+/turf/open/shuttle/dropship{
+	icon_state = "rasputin15"
 	},
 /area/shuttle/lancers)
 "t" = (
@@ -111,9 +149,7 @@
 	},
 /area/shuttle/lancers)
 "D" = (
-/obj/structure/machinery/door/airlock/almayer/generic{
-	dir = 8
-	},
+/obj/structure/machinery/door/airlock/hybrisa/generic_solid,
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin3"
 	},
@@ -135,25 +171,47 @@
 	},
 /area/shuttle/lancers)
 "H" = (
-/turf/closed/shuttle/ert{
-	icon_state = "stan23"
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 8;
+	pixel_y = 8;
+	layer = 3.02
+	},
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 8;
+	pixel_y = -8;
+	layer = 3.03
+	},
+/turf/open/shuttle/dropship{
+	icon_state = "rasputin15"
 	},
 /area/shuttle/lancers)
 "I" = (
 /obj/structure/blocker/invisible_wall,
 /obj/structure/machinery/computer/shuttle/dropship/flight,
+/obj/structure/machinery/computer/shuttle/dropship,
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
 /area/shuttle/lancers)
+"J" = (
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
+	pixel_x = -5;
+	pixel_y = -4
+	},
+/turf/closed/shuttle/ert{
+	icon_state = "stan22"
+	},
+/area/shuttle/lancers)
 "K" = (
 /turf/closed/shuttle/ert{
 	icon_state = "rightengine_1"
 	},
 /area/shuttle/lancers)
 "L" = (
-/obj/structure/machinery/door/airlock/almayer/generic,
-/turf/open/space/basic,
+/obj/structure/machinery/door/airlock/hybrisa/generic_solid/autoname,
+/turf/open/shuttle/dropship{
+	icon_state = "rasputin3"
+	},
 /area/shuttle/lancers)
 "N" = (
 /turf/closed/shuttle/ert{
@@ -166,9 +224,14 @@
 	},
 /area/shuttle/lancers)
 "R" = (
-/obj/item/weapon/shield/riot,
 /obj/structure/bed/chair/dropship/passenger{
-	dir = 8
+	dir = 4;
+	pixel_y = -8;
+	layer = 3.01
+	},
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4;
+	pixel_y = 8
 	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
@@ -179,14 +242,28 @@
 	icon_state = "stan_leftengine"
 	},
 /area/shuttle/lancers)
+"T" = (
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
+	pixel_x = 5;
+	pixel_y = -4
+	},
+/turf/closed/shuttle/ert{
+	icon_state = "stan23"
+	},
+/area/shuttle/lancers)
 "U" = (
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin8"
 	},
 /area/shuttle/lancers)
 "V" = (
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 8;
+	pixel_y = 8;
+	layer = 3.04
+	},
 /turf/open/shuttle/dropship{
-	icon_state = "rasputin7"
+	icon_state = "rasputin15"
 	},
 /area/shuttle/lancers)
 "W" = (
@@ -194,11 +271,6 @@
 	icon_state = "stan5"
 	},
 /area/shuttle/lancers)
-"X" = (
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin6"
-	},
-/area/shuttle/lancers)
 "Z" = (
 /turf/closed/shuttle/ert{
 	icon_state = "rightengine_2"
@@ -248,11 +320,11 @@ A
 (3,1,1) = {"
 A
 A
-A
-B
-m
-m
-m
+k
+J
+R
+r
+a
 u
 m
 m
@@ -268,9 +340,9 @@ A
 (4,1,1) = {"
 A
 A
-k
+B
 q
-X
+F
 F
 F
 F
@@ -290,11 +362,11 @@ A
 A
 w
 I
-P
-a
-a
+o
+u
+h
+h
 h
-a
 P
 F
 F
@@ -308,9 +380,9 @@ A
 (6,1,1) = {"
 A
 A
-f
-H
-V
+B
+q
+F
 F
 F
 F
@@ -328,15 +400,15 @@ A
 (7,1,1) = {"
 A
 A
-A
-B
-e
-e
+f
+T
 e
+H
+V
 u
-e
-e
-R
+m
+m
+m
 N
 W
 W
diff --git a/void-marines/code/playable_factions/alt_roles.dm b/void-marines/code/playable_factions/alt_roles.dm
index 076994e29f..3a3f414ac6 100644
--- a/void-marines/code/playable_factions/alt_roles.dm
+++ b/void-marines/code/playable_factions/alt_roles.dm
@@ -1,12 +1,19 @@
-/datum/squad/marine/fl
+/datum/squad/marine/lancer
 	name = SQUAD_MERC
-	equipment_color = "#687a9c"
-	chat_color = "#687a9c"
+	equipment_color = "#8d8d8d"
+	chat_color = "#8d8d8d"
 	access = list(ACCESS_ILLEGAL_PIRATE)
 	radio_freq = MERC_FREQ
-	minimap_color = "#687a9c"
+	minimap_color = MINIMAP_SQUAD_LANCER
 	use_stripe_overlay = FALSE
 	usable = TRUE
+	faction = FACTION_FREELANCER
+
+/datum/squad/marine/lancer/New()
+	. = ..()
+
+	RegisterSignal(SSdcs, COMSIG_GLOB_PLATOON_NAME_CHANGE, PROC_REF(rename_platoon)) //this signal allows pltco to change platoon’s name
+
 
 /datum/squad/marine/pmc
 	name = SQUAD_PMCPLT
@@ -69,57 +76,63 @@
 
 
 
-/datum/job/marine/leader/ai/fl
+/datum/job/marine/leader/ai/lancer
 	title = JOB_SQUAD_LEADER_FL
-	gear_preset = /datum/equipment_preset/uscm/leader/fl
+	gear_preset = /datum/equipment_preset/uscm/lancer/sl
+	job_options = null
 
-/obj/effect/landmark/start/marine/leader/fl
+/obj/effect/landmark/start/marine/leader/lancer
 	name = JOB_SQUAD_LEADER_FL
 	squad = SQUAD_MERC
-	job = /datum/job/marine/leader/ai/fl
+	job = /datum/job/marine/leader/ai/lancer
 
-/datum/job/marine/medic/ai/fl
+/datum/job/marine/medic/ai/lancer
 	title = JOB_SQUAD_MEDIC_FL
-	gear_preset = /datum/equipment_preset/uscm/medic/fl
+	gear_preset = /datum/equipment_preset/uscm/lancer/med
+	job_options = null
 
-/obj/effect/landmark/start/marine/medic/fl
+/obj/effect/landmark/start/marine/medic/lancer
 	name = JOB_SQUAD_MEDIC_FL
 	squad = SQUAD_MERC
-	job = /datum/job/marine/medic/ai/fl
+	job = /datum/job/marine/medic/ai/lancer
 
-/datum/job/marine/smartgunner/ai/fl
+/datum/job/marine/smartgunner/ai/lancer
 	title = JOB_SQUAD_SMARTGUN_FL
-	gear_preset = /datum/equipment_preset/uscm/smartgunner/fl
+	gear_preset = /datum/equipment_preset/uscm/lancer/smartgunner
+	job_options = null
 
-/obj/effect/landmark/start/marine/smartgunner/fl
+/obj/effect/landmark/start/marine/smartgunner/lancer
 	name = JOB_SQUAD_SMARTGUN_FL
 	squad = SQUAD_MERC
-	job = /datum/job/marine/smartgunner/ai/fl
+	job = /datum/job/marine/smartgunner/ai/lancer
 
-/datum/job/marine/standard/ai/fl
+/datum/job/marine/standard/ai/lancer
 	title = JOB_SQUAD_RIFLEMAN_FL
-	gear_preset = /datum/equipment_preset/uscm/pfc/fl
+	gear_preset = /datum/equipment_preset/uscm/lancer
+	job_options = null
 
-/obj/effect/landmark/start/marine/fl
+/obj/effect/landmark/start/marine/lancer
 	name = JOB_SQUAD_RIFLEMAN_FL
 	squad = SQUAD_MERC
-	job = /datum/job/marine/standard/ai/fl
+	job = /datum/job/marine/standard/ai/lancer
 
-/datum/job/command/bridge/ai/fl
+/datum/job/command/bridge/ai/lancer
 	title = JOB_RTO_FL
-	gear_preset = /datum/equipment_preset/uscm/rto/fl
+	gear_preset = /datum/equipment_preset/uscm/lancer/rto
+	job_options = null
 
-/obj/effect/landmark/start/bridge/fl
+/obj/effect/landmark/start/bridge/lancer
 	name = JOB_RTO_FL
 	squad = SQUAD_MERC
 	icon_state = "so_spawn"
-	job = /datum/job/command/bridge/ai/fl
+	job = /datum/job/command/bridge/ai/lancer
 
-/datum/job/marine/tl/ai/fl
+/datum/job/marine/tl/ai/lancer
 	title = JOB_SQUAD_TEAM_LEADER_FL
-	gear_preset = /datum/equipment_preset/uscm/tl/fl
+	gear_preset = /datum/equipment_preset/uscm/lancer/tl
+	job_options = null
 
-/obj/effect/landmark/start/marine/tl/ai/fl
+/obj/effect/landmark/start/marine/tl/ai/lancer
 	name = JOB_SQUAD_TEAM_LEADER_FL
 	squad = SQUAD_MERC
-	job = /datum/job/marine/tl/ai/fl
+	job = /datum/job/marine/tl/ai/lancer
diff --git a/void-marines/code/playable_factions/fl_presets.dm b/void-marines/code/playable_factions/fl_presets.dm
index 32dab0a8e6..cbc40423cf 100644
--- a/void-marines/code/playable_factions/fl_presets.dm
+++ b/void-marines/code/playable_factions/fl_presets.dm
@@ -1,77 +1,110 @@
-/datum/equipment_preset/uscm/pfc/fl
+/datum/equipment_preset/uscm/lancer
 	name = "Freelancer Marauder"
-	paygrade = "Freelancer Standard"
-	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP)
+	paygrade = "Freelancer Marauder"
 	role_comm_title = "FL"
-
-/datum/equipment_preset/uscm/pfc/fl/load_gear(mob/living/carbon/human/new_human)
+	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP)
+	faction_group = list(FACTION_FREELANCER)
+	faction = FACTION_FREELANCER
+	flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
+	assignment = "Marauder"
+	rank = JOB_SQUAD_MARINE
+	skills = /datum/skills/pfc
+
+/datum/equipment_preset/uscm/lancer/load_gear(mob/living/carbon/human/new_human)
 	var/back_item = /obj/item/storage/backpack/lightpack
 	if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
 		back_item = /obj/item/storage/backpack/marine
 
 	new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
 
-/datum/equipment_preset/uscm/smartgunner/fl
+/datum/equipment_preset/uscm/lancer/smartgunner
 	name = "Freelancer Machinegunner"
-	paygrade = "Freelancer Standard"
-	assignment = "Machinegunner"
-	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP, ACCESS_ILLEGAL_PIRATE_SMARTGUNNER)
+	paygrade = "Freelancer Gunner"
 	role_comm_title = "MG"
+	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP, ACCESS_ILLEGAL_PIRATE_SMARTGUNNER)
+	assignment = "Machinegunner"
+	rank = JOB_SQUAD_SMARTGUN
+	skills = /datum/skills/smartgunner
 
-/datum/equipment_preset/uscm/smartgunner/fl/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/uscm/lancer/smartgunner/load_gear(mob/living/carbon/human/new_human)
 	var/back_item = /obj/item/storage/backpack/lightpack
 	if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
 		back_item = /obj/item/storage/backpack/marine
 
 	new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
 
-/datum/equipment_preset/uscm/rto/fl
+/datum/equipment_preset/uscm/lancer/rto
 	name = "Radio Jockey"
-	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP, ACCESS_ILLEGAL_PIRATE_CO)
-	paygrade = "Freelancer Standard"
+	paygrade = "Freelancer Jokey"
 	role_comm_title = "RJ"
+	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP, ACCESS_ILLEGAL_PIRATE_CO)
+	assignment = "Radio Jokey"
+	rank = JOB_SQUAD_RTO
+	skills = /datum/skills/SL
 
-/datum/equipment_preset/uscm/rto/fl/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/uscm/lancer/rto/load_gear(mob/living/carbon/human/new_human)
 	var/back_item = /obj/item/storage/backpack/lightpack
 	if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
 		back_item = /obj/item/storage/backpack/marine
 
 	new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
 
-/datum/equipment_preset/uscm/medic/fl
+/datum/equipment_preset/uscm/lancer/med
 	name = "Freelancer Surgeon"
 	paygrade = "Freelancer Medic"
+	role_comm_title = "Srg"
 	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP, ACCESS_ILLEGAL_PIRATE_MEDICAL)
 	assignment = "Surgeon"
-	role_comm_title = "Srg"
+	rank = JOB_SQUAD_MEDIC
+	skills = /datum/skills/combat_medic
 
-/datum/equipment_preset/uscm/medic/fl/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/uscm/lancer/med/load_gear(mob/living/carbon/human/new_human)
 	var/back_item = /obj/item/storage/backpack/lightpack
 	if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
 		back_item = /obj/item/storage/backpack/marine/medic/upp
 
 	new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
 
-/datum/equipment_preset/uscm/tl/fl
-	name = "Freelancer Cutthroat"
+/datum/equipment_preset/uscm/lancer/tl
+	name = "Freelancer Bruiser"
 	paygrade = "Freelancer Standard"
+	role_comm_title = "Bruiser"
 	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP, ACCESS_ILLEGAL_PIRATE_TEAMLEAD)
+	assignment = "Bruiser"
+	rank = JOB_SQUAD_TEAM_LEADER
+	skills = /datum/skills/pmc/SL
 
-/datum/equipment_preset/uscm/tl/fl/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/uscm/lancer/tl/load_gear(mob/living/carbon/human/new_human)
 	var/back_item = /obj/item/storage/backpack/lightpack
 	if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
 		back_item = /obj/item/storage/backpack/marine
 
 	new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
 
-/datum/equipment_preset/uscm/leader/fl
-	name = "Freelancer Master At Arms"
-	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP, ACCESS_ILLEGAL_PIRATE_SENIOR_LEAD)
+/datum/equipment_preset/uscm/lancer/sl
+	name = "Freelancer Warlord"
 	paygrade = "Freelancer Leader"
-	role_comm_title = "MAA"
+	role_comm_title = "Warlord"
+	access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_ILLEGAL_PIRATE_PREP, ACCESS_ILLEGAL_PIRATE_SENIOR_LEAD)
+	assignment = "Warlord"
+	rank = JOB_SQUAD_LEADER
+	skills = /datum/skills/pmc/SL
 
-/datum/equipment_preset/uscm/leader/fl/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/uscm/lancer/sl/load_gear(mob/living/carbon/human/new_human)
 	var/back_item = /obj/item/storage/backpack/lightpack
 	if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
 		back_item = /obj/item/storage/backpack/marine
+
 	new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
diff --git a/void-marines/code/playable_factions/lancer.dm b/void-marines/code/playable_factions/lancer.dm
new file mode 100644
index 0000000000..499d4cd13f
--- /dev/null
+++ b/void-marines/code/playable_factions/lancer.dm
@@ -0,0 +1,52 @@
+/datum/faction/lancer
+	name = "Yo-ho-ho we are pirates!"
+	faction_tag = FACTION_FREELANCER
+
+/datum/faction/lancer/modify_hud_holder(image/holder, mob/living/carbon/human/H)
+	var/hud_icon_state
+	var/obj/item/card/id/ID = H.get_idcard()
+	var/_role
+	if(H.mind)
+		_role = H.job
+	else if(ID)
+		_role = ID.rank
+	switch(_role)
+		if(JOB_SQUAD_RTO)
+			hud_icon_state = "sd"
+		if(JOB_SQUAD_LEADER)
+			hud_icon_state = "leader_a"
+		if(JOB_SQUAD_TEAM_LEADER)
+			hud_icon_state = "tl"
+		if(JOB_SQUAD_SMARTGUN)
+			hud_icon_state = "gun"
+		if(JOB_SQUAD_MEDIC)
+			hud_icon_state = "med"
+	if(hud_icon_state)
+		holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "pmc_[hud_icon_state]")
+
+	var/datum/squad/squad = H.assigned_squad
+	if(istype(squad, /datum/squad/marine/lancer))
+		var/squad_clr = H.assigned_squad.equipment_color
+		switch(GET_DEFAULT_ROLE(_role))
+			if(JOB_SQUAD_MEDIC) hud_icon_state = "med"
+			if(JOB_SQUAD_SMARTGUN) hud_icon_state = "gun"
+			if(JOB_SQUAD_TEAM_LEADER) hud_icon_state = "tl"
+			if(JOB_SQUAD_LEADER) hud_icon_state = "leader_a"
+
+		if(!hud_icon_state) hud_icon_state = H.rank_fallback
+		if(hud_icon_state)
+			var/image/IMG = image('icons/mob/hud/marine_hud.dmi', H, "hudsquad")
+			if(squad_clr)
+				IMG.color = squad_clr
+			else
+				IMG.color = "#5A934A"
+			holder.overlays += IMG
+			holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "hudsquad_[hud_icon_state]")
+		if(H.assigned_squad && H.assigned_fireteam)
+			var/image/IMG2 = image('icons/mob/hud/marine_hud.dmi', H, "hudsquad_[H.assigned_fireteam]")
+			IMG2.color = squad_clr
+			holder.overlays += IMG2
+			if(H.assigned_squad.fireteam_leaders[H.assigned_fireteam] == H)
+				var/image/IMG3 = image('icons/mob/hud/marine_hud.dmi', H, "hudsquad_ftl")
+				IMG3.color = squad_clr
+				holder.overlays += IMG3
diff --git a/void-marines/code/playable_factions/stuff.dm b/void-marines/code/playable_factions/stuff.dm
index e493da0132..6588293fd8 100644
--- a/void-marines/code/playable_factions/stuff.dm
+++ b/void-marines/code/playable_factions/stuff.dm
@@ -257,6 +257,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pmc_medic, list(
 	name = "freelancer headset"
 	desc = "A standard headset used by colonists and truckers"
 	frequency = MERC_FREQ
+	has_hud = TRUE
 
 /obj/item/reagent_container/food/drinks/cans/soylent
 	name = "\improper Weyland-Yutani Meal Ready-to-Drink"