diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm
index 9b1b0fbab52f..05fff2623c6c 100644
--- a/code/game/objects/effects/landmarks/landmarks.dm
+++ b/code/game/objects/effects/landmarks/landmarks.dm
@@ -500,91 +500,176 @@
 	var/job
 	var/job_list
 
-/obj/effect/landmark/late_join/alpha
+//Parents purly for organisation purposes and cleaner mapping menus
+/obj/effect/landmark/late_join/marine
+	icon_state = "late_join_alpha"
+
+/obj/effect/landmark/late_join/medical
+	icon_state = "late_join_medical"
+
+/obj/effect/landmark/late_join/supply
+	icon_state = "late_join_supply"
+
+/obj/effect/landmark/late_join/engineering
+	icon_state = "late_join_engineering"
+
+/obj/effect/landmark/late_join/transport
+	icon_state = "late_join_command"
+
+/obj/effect/landmark/late_join/police
+	icon_state = "late_join_police"
+
+/obj/effect/landmark/late_join/command
+	icon_state = "late_join_command"
+
+
+/obj/effect/landmark/late_join/marine/alpha
 	name = "alpha late join"
 	icon_state = "late_join_alpha"
 	squad = SQUAD_MARINE_1
 
-/obj/effect/landmark/late_join/bravo
+/obj/effect/landmark/late_join/marine/bravo
 	name = "bravo late join"
 	icon_state = "late_join_bravo"
 	squad = SQUAD_MARINE_2
 
-/obj/effect/landmark/late_join/charlie
+/obj/effect/landmark/late_join/marine/charlie
 	name = "charlie late join"
 	icon_state = "late_join_charlie"
 	squad = SQUAD_MARINE_3
 
-/obj/effect/landmark/late_join/delta
+/obj/effect/landmark/late_join/marine/delta
 	name = "delta late join"
 	icon_state = "late_join_delta"
 	squad = SQUAD_MARINE_4
 
-/obj/effect/landmark/late_join/synthetic
-	name = "synthetic late join"
-	icon_state = "late_join_misc"
-	job = JOB_SYNTH
-
-/obj/effect/landmark/late_join/working_joe
-	name = "working joe late join"
-	icon_state = "late_join_misc"
-	job = JOB_WORKING_JOE
-
-/obj/effect/landmark/late_join/working_joe/colony
-	name = "colony working joe late join"
-	icon_state = "late_join_misc"
-	job = JOB_COLONY_JOE
-
-/obj/effect/landmark/late_join/dzho_automaton
-	name = "dzho automaton late join"
-	icon_state = "late_join_upp"
-	job = JOB_UPP_JOE
-
-/obj/effect/landmark/late_join/cmo
+/obj/effect/landmark/late_join/medical/cmo
 	name = "Chief Medical Officer late join"
-	icon_state = "late_join_medical"
 	job = JOB_CMO
 
-/obj/effect/landmark/late_join/researcher
+/obj/effect/landmark/late_join/medical/researcher
 	name = "Researcher late join"
-	icon_state = "late_join_medical"
 	job = JOB_RESEARCHER
 
-/obj/effect/landmark/late_join/doctor
+/obj/effect/landmark/late_join/medical/doctor
 	name = "Doctor late join"
-	icon_state = "late_join_medical"
 	job = JOB_DOCTOR
 
-/obj/effect/landmark/late_join/field_doctor
+/obj/effect/landmark/late_join/medical/field_doctor
 	name = "Field Doctor late join"
-	icon_state = "late_join_medical"
 	job = JOB_FIELD_DOCTOR
 
-/obj/effect/landmark/late_join/nurse
+/obj/effect/landmark/late_join/medical/nurse
 	name = "Nurse late join"
-	icon_state = "late_join_medical"
 	job = JOB_NURSE
 
-/obj/effect/landmark/late_join/intel
-	name = "Intelligence Officer late join"
-	icon_state = "late_join_command"
-	job = JOB_INTEL
+/obj/effect/landmark/late_join/supply/cargo
+	name = "Cargo Technician late join"
+	job = JOB_CARGO_TECH
 
-/obj/effect/landmark/late_join/police
+/obj/effect/landmark/late_join/supply/chef
+	name = "Mess Technician late join"
+	job = JOB_MESS_SERGEANT
+
+/obj/effect/landmark/late_join/supply/requisition
+	name = "Quartermaster late join"
+	job = JOB_CHIEF_REQUISITION
+
+/obj/effect/landmark/late_join/engineering/otech
+	name = "Ordnance Technician late join"
+	job = JOB_ORDNANCE_TECH
+
+/obj/effect/landmark/late_join/engineering/maint
+	name = "Maintenance Technician late join"
+	job = JOB_MAINT_TECH
+
+/obj/effect/landmark/late_join/engineering/engineering
+	name = "Chief Engineer late join"
+	job = JOB_CHIEF_ENGINEER
+
+/obj/effect/landmark/late_join/transport/crew_chief
+	name = "Dropship Crew Chief late join"
+	job = JOB_DROPSHIP_CREW_CHIEF
+
+/obj/effect/landmark/late_join/transport/cas_pilot
+	name = "Gunship Pilot late join"
+	job = JOB_CAS_PILOT
+
+/obj/effect/landmark/late_join/transport/dropship_pilot
+	name = "Dropship Pilot late join"
+	job = JOB_DROPSHIP_PILOT
+
+/obj/effect/landmark/late_join/transport/tank_crew
+	name = "Tank Crew late join"
+	job = JOB_TANK_CREW
+
+/obj/effect/landmark/late_join/police/police
 	name = "Military Police late join"
-	icon_state = "late_join_police"
 	job = JOB_POLICE
 
-/obj/effect/landmark/late_join/warden
+/obj/effect/landmark/late_join/police/warden
 	name = "Military Warden late join"
-	icon_state = "late_join_police"
 	job = JOB_WARDEN
 
-/obj/effect/landmark/late_join/chief_police
+/obj/effect/landmark/late_join/police/chief_police
 	name = "Chief Military Police late join"
-	icon_state = "late_join_police"
 	job = JOB_CHIEF_POLICE
 
+/obj/effect/landmark/late_join/command/intel
+	name = "Intelligence Officer late join"
+	job = JOB_INTEL
+
+/obj/effect/landmark/late_join/command/auxiliary_officer
+	name = "Auxiliary Support Officer late join"
+	job = JOB_AUXILIARY_OFFICER
+
+/obj/effect/landmark/late_join/command/bridge
+	name = "Staff Officer late join"
+	job = JOB_SO
+
+/obj/effect/landmark/late_join/command/executive
+	name = "Executive Officer late join"
+	job = JOB_XO
+
+/obj/effect/landmark/late_join/command/commander
+	name = "Commanding Officer late join"
+	job = JOB_CO
+
+/obj/effect/landmark/late_join/synthetic
+	name = "synthetic late join"
+	icon_state = "late_join_misc"
+	job = JOB_SYNTH
+
+/obj/effect/landmark/late_join/working_joe
+	name = "working joe late join"
+	icon_state = "late_join_misc"
+	job = JOB_WORKING_JOE
+
+/obj/effect/landmark/late_join/working_joe/colony
+	name = "colony working joe late join"
+	icon_state = "late_join_misc"
+	job = JOB_COLONY_JOE
+
+/obj/effect/landmark/late_join/dzho_automaton
+	name = "dzho automaton late join"
+	icon_state = "late_join_upp"
+	job = JOB_UPP_JOE
+
+/obj/effect/landmark/late_join/reporter
+	name = "Combat Correspondent late join"
+	icon_state = "late_join_misc"
+	job = JOB_COMBAT_REPORTER
+
+/obj/effect/landmark/late_join/liaison
+	name = "Corporate Liaison late join"
+	icon_state = "late_join_corporate"
+	job = JOB_CORPORATE_LIAISON
+
+/obj/effect/landmark/late_join/corp_sec
+	name = "Corporate Bodyguard late join"
+	icon_state = "late_join_corporate"
+	job = JOB_CORPORATE_BODYGUARD
+
 
 /obj/effect/landmark/late_join/Initialize(mapload, ...)
 	. = ..()
diff --git a/icons/landmarks.dmi b/icons/landmarks.dmi
index ac7d01808e0c..14b9bb2412f5 100644
Binary files a/icons/landmarks.dmi and b/icons/landmarks.dmi differ
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index f6aec5bdc33f..0449977c0362 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -1844,7 +1844,7 @@
 /area/almayer/lifeboat_pumps/north2)
 "aeD" = (
 /obj/effect/landmark/start/field_doctor,
-/obj/effect/landmark/late_join/field_doctor,
+/obj/effect/landmark/late_join/medical/field_doctor,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/medical/lower_medical_medbay)
 "aeE" = (
@@ -2221,7 +2221,7 @@
 /area/almayer/command/airoom)
 "afz" = (
 /obj/effect/landmark/start/doctor,
-/obj/effect/landmark/late_join/doctor,
+/obj/effect/landmark/late_join/medical/doctor,
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
 	pixel_x = 1
@@ -6150,6 +6150,7 @@
 "apA" = (
 /obj/effect/landmark/start/pilot/dropship_pilot,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/late_join/transport/dropship_pilot,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/pilotbunks)
 "apB" = (
@@ -7543,6 +7544,7 @@
 	icon_state = "S"
 	},
 /obj/effect/landmark/start/chef,
+/obj/effect/landmark/late_join/supply/chef,
 /turf/open/floor/almayer,
 /area/almayer/living/offices/cryo)
 "asW" = (
@@ -8352,6 +8354,7 @@
 "avy" = (
 /obj/effect/landmark/start/auxiliary_officer,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/late_join/command/auxiliary_officer,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/bridgebunks)
 "avz" = (
@@ -8489,6 +8492,7 @@
 /area/almayer/living/intel)
 "avU" = (
 /obj/effect/landmark/start/crew_chief,
+/obj/effect/landmark/late_join/transport/crew_chief,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/pilotbunks)
 "avV" = (
@@ -8902,6 +8906,7 @@
 "axd" = (
 /obj/effect/landmark/start/bridge,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/late_join/command/bridge,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/bridgebunks)
 "axe" = (
@@ -9085,7 +9090,7 @@
 /area/almayer/engineering/upper_engineering)
 "axC" = (
 /obj/effect/landmark/start/intel,
-/obj/effect/landmark/late_join/intel,
+/obj/effect/landmark/late_join/command/intel,
 /obj/effect/decal/cleanable/generic,
 /obj/structure/platform_decoration/metal/almayer/north,
 /turf/open/floor/plating/plating_catwalk,
@@ -9121,6 +9126,7 @@
 /area/almayer/command/combat_correspondent)
 "axH" = (
 /obj/effect/landmark/start/otech,
+/obj/effect/landmark/late_join/engineering/otech,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/upper_engineering/port)
 "axI" = (
@@ -9146,6 +9152,7 @@
 	layer = 2.9;
 	dir = 8
 	},
+/obj/effect/landmark/late_join/command/bridge,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/bridgebunks)
 "axL" = (
@@ -9305,6 +9312,7 @@
 /area/almayer/command/lifeboat)
 "ayj" = (
 /obj/effect/landmark/start/cargo,
+/obj/effect/landmark/late_join/supply/cargo,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/req)
 "ayk" = (
@@ -14486,13 +14494,13 @@
 	icon_state = "pipe-c"
 	},
 /obj/effect/landmark/start/marine/smartgunner/alpha,
-/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/late_join/marine/alpha,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha)
 "aMI" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/landmark/start/marine/spec/delta,
-/obj/effect/landmark/late_join/delta,
+/obj/effect/landmark/late_join/marine/delta,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
 "aMJ" = (
@@ -15474,8 +15482,7 @@
 	pixel_y = 12
 	},
 /obj/structure/filingcabinet/documentation/uscm_mp{
-	pixel_x = 8;
-	icon_state = "chestdrawer"
+	pixel_x = 8
 	},
 /turf/open/floor/almayer/plate,
 /area/almayer/command/cic)
@@ -21920,7 +21927,7 @@
 "beV" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/landmark/start/marine/leader/alpha,
-/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/late_join/marine/alpha,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha)
 "beW" = (
@@ -30232,7 +30239,7 @@
 	dir = 10
 	},
 /obj/effect/landmark/start/marine/alpha,
-/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/late_join/marine/alpha,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha)
 "bxC" = (
@@ -30582,7 +30589,7 @@
 /area/almayer/hallways/hangar)
 "byn" = (
 /obj/effect/landmark/start/marine/leader/bravo,
-/obj/effect/landmark/late_join/bravo,
+/obj/effect/landmark/late_join/marine/bravo,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/bravo)
 "byo" = (
@@ -35581,7 +35588,7 @@
 /area/almayer/shipboard/starboard_point_defense)
 "bKM" = (
 /obj/effect/landmark/start/marine/medic/charlie,
-/obj/effect/landmark/late_join/charlie,
+/obj/effect/landmark/late_join/marine/charlie,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/charlie)
 "bKN" = (
@@ -39009,6 +39016,7 @@
 /area/almayer/command/corporateliaison)
 "bTn" = (
 /obj/effect/landmark/start/tank_crew,
+/obj/effect/landmark/late_join/transport/tank_crew,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/tankerbunks)
 "bTo" = (
@@ -39443,7 +39451,7 @@
 /area/almayer/squads/req)
 "bUp" = (
 /obj/effect/landmark/start/marine/alpha,
-/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/late_join/marine/alpha,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer/plate,
 /area/almayer/squads/alpha)
@@ -39480,6 +39488,7 @@
 /area/almayer/maint/hull/upper/u_m_p)
 "bUt" = (
 /obj/effect/landmark/start/corp_sec,
+/obj/effect/landmark/late_join/corp_sec,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/maint/upper/u_m_p)
 "bUu" = (
@@ -44010,7 +44019,7 @@
 /area/almayer/medical/medical_science)
 "cdN" = (
 /obj/effect/landmark/start/researcher,
-/obj/effect/landmark/late_join/researcher,
+/obj/effect/landmark/late_join/medical/researcher,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/medical/medical_science)
 "cdO" = (
@@ -46247,7 +46256,7 @@
 /area/almayer/powered)
 "cjc" = (
 /obj/effect/landmark/start/marine/alpha,
-/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/late_join/marine/alpha,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha)
 "cjd" = (
@@ -46881,6 +46890,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start/tank_crew,
+/obj/effect/landmark/late_join/transport/tank_crew,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/tankerbunks)
 "cov" = (
@@ -49097,7 +49107,7 @@
 /area/almayer/hallways/upper/starboard)
 "dlu" = (
 /obj/effect/landmark/start/marine/bravo,
-/obj/effect/landmark/late_join/bravo,
+/obj/effect/landmark/late_join/marine/bravo,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/bravo)
@@ -49323,7 +49333,7 @@
 /area/almayer/squads/charlie_delta_shared)
 "drk" = (
 /obj/effect/landmark/start/intel,
-/obj/effect/landmark/late_join/intel,
+/obj/effect/landmark/late_join/command/intel,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/intel)
 "dro" = (
@@ -49440,7 +49450,7 @@
 /area/almayer/living/grunt_rnr)
 "dut" = (
 /obj/effect/landmark/start/nurse,
-/obj/effect/landmark/late_join/nurse,
+/obj/effect/landmark/late_join/medical/nurse,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/medical/lower_medical_medbay)
 "duv" = (
@@ -50699,6 +50709,7 @@
 "dWg" = (
 /obj/effect/landmark/start/cargo,
 /obj/structure/machinery/light,
+/obj/effect/landmark/late_join/supply/cargo,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/req)
 "dWA" = (
@@ -51188,7 +51199,7 @@
 /area/almayer/lifeboat_pumps/south2)
 "ehx" = (
 /obj/effect/landmark/start/marine/tl/alpha,
-/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/late_join/marine/alpha,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha)
 "ehL" = (
@@ -51697,7 +51708,7 @@
 	icon_state = "pipe-j2"
 	},
 /obj/effect/landmark/start/marine/smartgunner/delta,
-/obj/effect/landmark/late_join/delta,
+/obj/effect/landmark/late_join/marine/delta,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
 "erL" = (
@@ -54599,7 +54610,7 @@
 /area/almayer/command/telecomms)
 "fDJ" = (
 /obj/effect/landmark/start/marine/engineer/charlie,
-/obj/effect/landmark/late_join/charlie,
+/obj/effect/landmark/late_join/marine/charlie,
 /turf/open/floor/almayer/plate,
 /area/almayer/squads/charlie)
 "fDU" = (
@@ -54753,7 +54764,7 @@
 /area/almayer/engineering/starboard_atmos)
 "fIM" = (
 /obj/effect/landmark/start/marine/tl/bravo,
-/obj/effect/landmark/late_join/bravo,
+/obj/effect/landmark/late_join/marine/bravo,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/bravo)
 "fIX" = (
@@ -55237,7 +55248,7 @@
 	icon_state = "E";
 	pixel_x = 1
 	},
-/obj/effect/landmark/late_join/warden,
+/obj/effect/landmark/late_join/police/warden,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cryo)
 "fSl" = (
@@ -55402,7 +55413,7 @@
 /area/almayer/command/combat_correspondent)
 "fXN" = (
 /obj/effect/landmark/start/marine/delta,
-/obj/effect/landmark/late_join/delta,
+/obj/effect/landmark/late_join/marine/delta,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
 "fXO" = (
@@ -55509,7 +55520,7 @@
 /area/almayer/shipboard/brig/execution)
 "fZZ" = (
 /obj/effect/landmark/start/marine/medic/bravo,
-/obj/effect/landmark/late_join/bravo,
+/obj/effect/landmark/late_join/marine/bravo,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/bravo)
 "gac" = (
@@ -55892,7 +55903,7 @@
 /area/almayer/medical/operating_room_three)
 "gkd" = (
 /obj/effect/landmark/start/marine/charlie,
-/obj/effect/landmark/late_join/charlie,
+/obj/effect/landmark/late_join/marine/charlie,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/charlie)
@@ -57665,7 +57676,7 @@
 "gWE" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/landmark/start/marine/spec/alpha,
-/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/late_join/marine/alpha,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha)
 "gWG" = (
@@ -59118,7 +59129,7 @@
 /area/almayer/living/briefing)
 "hDx" = (
 /obj/effect/landmark/start/marine/tl/delta,
-/obj/effect/landmark/late_join/delta,
+/obj/effect/landmark/late_join/marine/delta,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
@@ -59150,7 +59161,7 @@
 /area/almayer/medical/lower_medical_lobby)
 "hEb" = (
 /obj/effect/landmark/start/marine/medic/bravo,
-/obj/effect/landmark/late_join/bravo,
+/obj/effect/landmark/late_join/marine/bravo,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer/plate,
 /area/almayer/squads/bravo)
@@ -59840,7 +59851,7 @@
 /area/almayer/medical/morgue)
 "hWr" = (
 /obj/effect/landmark/start/marine/smartgunner/bravo,
-/obj/effect/landmark/late_join/bravo,
+/obj/effect/landmark/late_join/marine/bravo,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/bravo)
 "hWs" = (
@@ -60757,7 +60768,7 @@
 /area/almayer/living/starboard_garden)
 "ipM" = (
 /obj/effect/landmark/start/marine/tl/alpha,
-/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/late_join/marine/alpha,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha)
@@ -61218,7 +61229,7 @@
 /area/almayer/maint/upper/u_a_p)
 "iDf" = (
 /obj/effect/landmark/start/marine/alpha,
-/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/late_join/marine/alpha,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha)
@@ -61991,7 +62002,7 @@
 /area/almayer/maint/hull/upper/u_a_p)
 "iSZ" = (
 /obj/effect/landmark/start/marine/engineer/alpha,
-/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/late_join/marine/alpha,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha)
@@ -63055,6 +63066,7 @@
 /obj/structure/machinery/light{
 	dir = 1
 	},
+/obj/effect/landmark/late_join/engineering/maint,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/upper_engineering/port)
 "jmY" = (
@@ -67498,7 +67510,7 @@
 /area/almayer/maint/hull/lower/l_f_p)
 "ljs" = (
 /obj/effect/landmark/start/marine/spec/bravo,
-/obj/effect/landmark/late_join/bravo,
+/obj/effect/landmark/late_join/marine/bravo,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/bravo)
@@ -68338,7 +68350,7 @@
 /area/almayer/maint/hull/upper/s_bow)
 "lDV" = (
 /obj/effect/landmark/start/marine/medic/bravo,
-/obj/effect/landmark/late_join/bravo,
+/obj/effect/landmark/late_join/marine/bravo,
 /obj/structure/sign/safety/cryo{
 	pixel_y = 25
 	},
@@ -69640,7 +69652,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start/intel,
-/obj/effect/landmark/late_join/intel,
+/obj/effect/landmark/late_join/command/intel,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/intel)
@@ -69819,7 +69831,7 @@
 /area/almayer/living/briefing)
 "mpJ" = (
 /obj/effect/landmark/start/marine/medic/charlie,
-/obj/effect/landmark/late_join/charlie,
+/obj/effect/landmark/late_join/marine/charlie,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/charlie)
@@ -70006,7 +70018,7 @@
 /area/almayer/engineering/upper_engineering)
 "muy" = (
 /obj/effect/landmark/start/marine/engineer/alpha,
-/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/late_join/marine/alpha,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer/plate,
 /area/almayer/squads/alpha)
@@ -70054,7 +70066,7 @@
 /area/almayer/squads/delta)
 "mvy" = (
 /obj/effect/landmark/start/marine/delta,
-/obj/effect/landmark/late_join/delta,
+/obj/effect/landmark/late_join/marine/delta,
 /obj/structure/machinery/light,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
@@ -70825,6 +70837,7 @@
 /area/almayer/living/port_emb)
 "mKN" = (
 /obj/effect/landmark/start/pilot/cas_pilot,
+/obj/effect/landmark/late_join/transport/cas_pilot,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/pilotbunks)
 "mLg" = (
@@ -70844,7 +70857,7 @@
 /area/almayer/underdeck/req)
 "mLF" = (
 /obj/effect/landmark/start/marine/medic/bravo,
-/obj/effect/landmark/late_join/bravo,
+/obj/effect/landmark/late_join/marine/bravo,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/bravo)
@@ -72382,7 +72395,7 @@
 /area/almayer/squads/charlie)
 "nrN" = (
 /obj/effect/landmark/start/doctor,
-/obj/effect/landmark/late_join/doctor,
+/obj/effect/landmark/late_join/medical/doctor,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/medical/lower_medical_medbay)
 "nrO" = (
@@ -72510,7 +72523,7 @@
 /area/almayer/lifeboat_pumps/south2)
 "nuN" = (
 /obj/effect/landmark/start/marine/medic/alpha,
-/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/late_join/marine/alpha,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha)
 "nuZ" = (
@@ -72799,7 +72812,7 @@
 /area/almayer/hallways/lower/repair_bay)
 "nCf" = (
 /obj/effect/landmark/start/marine/tl/charlie,
-/obj/effect/landmark/late_join/charlie,
+/obj/effect/landmark/late_join/marine/charlie,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/charlie)
 "nCj" = (
@@ -74453,7 +74466,7 @@
 /area/almayer/medical/lower_medical_medbay)
 "oka" = (
 /obj/effect/landmark/start/marine/medic/charlie,
-/obj/effect/landmark/late_join/charlie,
+/obj/effect/landmark/late_join/marine/charlie,
 /turf/open/floor/almayer/plate,
 /area/almayer/squads/charlie)
 "okd" = (
@@ -75499,7 +75512,7 @@
 /area/almayer/hallways/upper/midship_hallway)
 "oEo" = (
 /obj/effect/landmark/start/marine/medic/delta,
-/obj/effect/landmark/late_join/delta,
+/obj/effect/landmark/late_join/marine/delta,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
 "oEy" = (
@@ -75726,6 +75739,7 @@
 /area/almayer/shipboard/brig/processing)
 "oIn" = (
 /obj/effect/landmark/start/liaison,
+/obj/effect/landmark/late_join/liaison,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/maint/upper/u_m_p)
 "oIp" = (
@@ -76418,7 +76432,7 @@
 /area/almayer/maint/hull/upper/u_a_p)
 "oXb" = (
 /obj/effect/landmark/start/marine/charlie,
-/obj/effect/landmark/late_join/charlie,
+/obj/effect/landmark/late_join/marine/charlie,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/charlie)
 "oXp" = (
@@ -78495,7 +78509,7 @@
 /area/almayer/command/corporateliaison)
 "pWb" = (
 /obj/effect/landmark/start/marine/tl/delta,
-/obj/effect/landmark/late_join/delta,
+/obj/effect/landmark/late_join/marine/delta,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
 "pWd" = (
@@ -78591,7 +78605,7 @@
 /area/almayer/squads/req)
 "pXZ" = (
 /obj/effect/landmark/start/marine/spec/charlie,
-/obj/effect/landmark/late_join/charlie,
+/obj/effect/landmark/late_join/marine/charlie,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/charlie)
 "pYh" = (
@@ -79148,7 +79162,7 @@
 /area/almayer/shipboard/stern_point_defense)
 "qki" = (
 /obj/effect/landmark/start/marine/smartgunner/charlie,
-/obj/effect/landmark/late_join/charlie,
+/obj/effect/landmark/late_join/marine/charlie,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/charlie)
 "qkP" = (
@@ -80080,6 +80094,7 @@
 /area/almayer/shipboard/brig/cells)
 "qCy" = (
 /obj/effect/landmark/start/captain,
+/obj/effect/landmark/late_join/command/commander,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/bridgebunks)
 "qCA" = (
@@ -80124,7 +80139,7 @@
 /area/almayer/shipboard/brig/perma)
 "qDq" = (
 /obj/effect/landmark/start/marine/bravo,
-/obj/effect/landmark/late_join/bravo,
+/obj/effect/landmark/late_join/marine/bravo,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/bravo)
 "qDt" = (
@@ -80547,6 +80562,7 @@
 /area/almayer/maint/upper/u_a_p)
 "qLs" = (
 /obj/effect/landmark/start/maint,
+/obj/effect/landmark/late_join/engineering/maint,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/upper_engineering/port)
 "qLt" = (
@@ -81517,7 +81533,7 @@
 /area/almayer/maint/lower/cryo_cells)
 "rfa" = (
 /obj/effect/landmark/start/marine/medic/alpha,
-/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/late_join/marine/alpha,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer/plate,
 /area/almayer/squads/alpha)
@@ -81945,6 +81961,7 @@
 /area/almayer/living/grunt_rnr)
 "rpp" = (
 /obj/effect/landmark/start/executive,
+/obj/effect/landmark/late_join/command/executive,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/bridgebunks)
 "rpG" = (
@@ -83061,7 +83078,7 @@
 /area/almayer/living/starboard_emb)
 "rNd" = (
 /obj/effect/landmark/start/marine/engineer/delta,
-/obj/effect/landmark/late_join/delta,
+/obj/effect/landmark/late_join/marine/delta,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
@@ -83627,7 +83644,7 @@
 /area/almayer/living/gym)
 "rYp" = (
 /obj/effect/landmark/start/marine/medic/delta,
-/obj/effect/landmark/late_join/delta,
+/obj/effect/landmark/late_join/marine/delta,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer/plate,
 /area/almayer/squads/delta)
@@ -83742,7 +83759,7 @@
 	icon_state = "W";
 	layer = 2.5
 	},
-/obj/effect/landmark/late_join/police,
+/obj/effect/landmark/late_join/police/police,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cryo)
 "sbZ" = (
@@ -84153,6 +84170,7 @@
 /area/almayer/hallways/upper/aft_hallway)
 "sjM" = (
 /obj/effect/landmark/start/reporter,
+/obj/effect/landmark/late_join/reporter,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/maint/upper/u_m_p)
 "skg" = (
@@ -85806,7 +85824,7 @@
 /area/almayer/squads/alpha)
 "sXw" = (
 /obj/effect/landmark/start/marine/engineer/bravo,
-/obj/effect/landmark/late_join/bravo,
+/obj/effect/landmark/late_join/marine/bravo,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/bravo)
 "sXB" = (
@@ -86276,7 +86294,7 @@
 /area/almayer/engineering/upper_engineering/starboard)
 "tgV" = (
 /obj/effect/landmark/start/doctor,
-/obj/effect/landmark/late_join/doctor,
+/obj/effect/landmark/late_join/medical/doctor,
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
 	},
@@ -87416,7 +87434,7 @@
 /area/almayer/living/briefing)
 "tEO" = (
 /obj/effect/landmark/start/marine/medic/charlie,
-/obj/effect/landmark/late_join/charlie,
+/obj/effect/landmark/late_join/marine/charlie,
 /obj/structure/sign/safety/cryo{
 	pixel_x = 8;
 	pixel_y = -25
@@ -87899,7 +87917,7 @@
 	icon_state = "E";
 	pixel_x = 1
 	},
-/obj/effect/landmark/late_join/chief_police,
+/obj/effect/landmark/late_join/police/chief_police,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cryo)
 "tQV" = (
@@ -88325,7 +88343,7 @@
 	icon_state = "S"
 	},
 /obj/effect/landmark/start/professor,
-/obj/effect/landmark/late_join/cmo,
+/obj/effect/landmark/late_join/medical/cmo,
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
 	pixel_x = 1
@@ -88697,6 +88715,7 @@
 	icon_state = "S"
 	},
 /obj/effect/landmark/start/chef,
+/obj/effect/landmark/late_join/supply/chef,
 /turf/open/floor/almayer/cargo_arrow/east,
 /area/almayer/living/offices/cryo)
 "uhq" = (
@@ -89116,7 +89135,7 @@
 /area/almayer/underdeck/hangar)
 "urN" = (
 /obj/effect/landmark/start/marine/leader/charlie,
-/obj/effect/landmark/late_join/charlie,
+/obj/effect/landmark/late_join/marine/charlie,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/charlie)
 "usm" = (
@@ -90697,7 +90716,7 @@
 /area/almayer/engineering/lower)
 "uYH" = (
 /obj/effect/landmark/start/marine/medic/delta,
-/obj/effect/landmark/late_join/delta,
+/obj/effect/landmark/late_join/marine/delta,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
@@ -90879,6 +90898,7 @@
 /area/almayer/shipboard/brig/perma)
 "vcu" = (
 /obj/effect/landmark/start/engineering,
+/obj/effect/landmark/late_join/engineering/engineering,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/upper_engineering/port)
 "vcE" = (
@@ -91160,7 +91180,7 @@
 /area/almayer/squads/bravo)
 "vio" = (
 /obj/effect/landmark/start/marine/delta,
-/obj/effect/landmark/late_join/delta,
+/obj/effect/landmark/late_join/marine/delta,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
@@ -91220,7 +91240,7 @@
 /area/almayer/living/briefing)
 "viS" = (
 /obj/effect/landmark/start/marine/engineer/bravo,
-/obj/effect/landmark/late_join/bravo,
+/obj/effect/landmark/late_join/marine/bravo,
 /turf/open/floor/almayer/plate,
 /area/almayer/squads/bravo)
 "vjb" = (
@@ -91783,7 +91803,7 @@
 /area/almayer/shipboard/sea_office)
 "vug" = (
 /obj/effect/landmark/start/marine/engineer/alpha,
-/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/late_join/marine/alpha,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha)
 "vuA" = (
@@ -92297,6 +92317,7 @@
 /area/almayer/command/airoom)
 "vCO" = (
 /obj/effect/landmark/start/bridge,
+/obj/effect/landmark/late_join/command/bridge,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/bridgebunks)
 "vDa" = (
@@ -93119,7 +93140,7 @@
 /area/almayer/hallways/lower/starboard_fore_hallway)
 "vUb" = (
 /obj/effect/landmark/start/marine/alpha,
-/obj/effect/landmark/late_join/alpha,
+/obj/effect/landmark/late_join/marine/alpha,
 /turf/open/floor/almayer/plate,
 /area/almayer/squads/alpha)
 "vUe" = (
@@ -93623,7 +93644,7 @@
 /area/almayer/engineering/lower/engine_core)
 "wdz" = (
 /obj/effect/landmark/start/marine/engineer/charlie,
-/obj/effect/landmark/late_join/charlie,
+/obj/effect/landmark/late_join/marine/charlie,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/charlie)
 "wdG" = (
@@ -93683,7 +93704,7 @@
 	icon_state = "E";
 	pixel_x = 1
 	},
-/obj/effect/landmark/late_join/police,
+/obj/effect/landmark/late_join/police/police,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cryo)
 "wer" = (
@@ -95141,7 +95162,7 @@
 "wGE" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/landmark/start/marine/leader/delta,
-/obj/effect/landmark/late_join/delta,
+/obj/effect/landmark/late_join/marine/delta,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
 "wGX" = (
@@ -95963,7 +95984,7 @@
 /area/almayer/medical/medical_science)
 "wWX" = (
 /obj/effect/landmark/start/marine/engineer/delta,
-/obj/effect/landmark/late_join/delta,
+/obj/effect/landmark/late_join/marine/delta,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
 "wXh" = (
@@ -96666,6 +96687,7 @@
 /area/almayer/command/lifeboat)
 "xnI" = (
 /obj/effect/landmark/start/requisition,
+/obj/effect/landmark/late_join/supply/requisition,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/req)
 "xnX" = (
@@ -98798,7 +98820,7 @@
 /area/almayer/hallways/lower/starboard_midship_hallway)
 "yfm" = (
 /obj/effect/landmark/start/marine/delta,
-/obj/effect/landmark/late_join/delta,
+/obj/effect/landmark/late_join/marine/delta,
 /turf/open/floor/almayer/plate,
 /area/almayer/squads/delta)
 "yfn" = (
@@ -99042,7 +99064,7 @@
 /area/almayer/engineering/lower)
 "yle" = (
 /obj/effect/landmark/start/marine/engineer/delta,
-/obj/effect/landmark/late_join/delta,
+/obj/effect/landmark/late_join/marine/delta,
 /turf/open/floor/almayer/plate,
 /area/almayer/squads/delta)
 "ylh" = (