diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm
index 9be719b8f98..4ee07c0e8de 100644
--- a/code/game/jobs/faction/pmc.dm
+++ b/code/game/jobs/faction/pmc.dm
@@ -13,7 +13,7 @@
 	<li><b>Medical</b>
 	</ul></p>
 	"}
-	title_suffix = "PMC"
+	title_suffix = "Pmcg"
 
 	allowed_role_types = PMC_ROLES
 
diff --git a/code/game/jobs/faction/scc.dm b/code/game/jobs/faction/scc.dm
index c308bed9544..1f8e62f03e8 100644
--- a/code/game/jobs/faction/scc.dm
+++ b/code/game/jobs/faction/scc.dm
@@ -15,7 +15,7 @@
 	</ul></p>
 	"}
 
-	title_suffix = "SCC"
+	title_suffix = "Scc"
 
 	allowed_role_types = SCC_ROLES
 
diff --git a/code/game/jobs/faction/zavodskoi.dm b/code/game/jobs/faction/zavodskoi.dm
index 2c7a3eaba94..354401de950 100644
--- a/code/game/jobs/faction/zavodskoi.dm
+++ b/code/game/jobs/faction/zavodskoi.dm
@@ -31,15 +31,7 @@
 	</ul></p>"}
 	title_suffix = "Zavod"
 
-	allowed_role_types = list(
-		/datum/job/visitor,
-		/datum/job/officer,
-		/datum/job/warden,
-		/datum/job/scientist,
-		/datum/job/machinist,
-		/datum/job/surgeon,
-		/datum/job/representative
-	)
+	allowed_role_types = ZAVOD_ROLES
 
 	allowed_species_types = list(
 		/datum/species/human,
diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm
index 6c6e82475d3..6a9a7c6d6ca 100644
--- a/code/modules/client/asset_cache.dm
+++ b/code/modules/client/asset_cache.dm
@@ -364,7 +364,10 @@ var/list/asset_datums = list()
 		"faction_NT.png" = 'icons/misc/factions/NanoTrasenlogo.png',
 		"faction_Idris.png" = 'icons/misc/factions/Idrislogo.png',
 		"faction_Hepht.png" = 'icons/misc/factions/Hephaestuslogo.png',
-		"faction_unaffiliated.png" = 'icons/misc/factions/Unaffiliatedlogo.png'
+		"faction_unaffiliated.png" = 'icons/misc/factions/Unaffiliatedlogo.png',
+		"faction_PMCG.png" = 'icons/misc/factions/pmcglogo.png',
+		"faction_Orion.png" = 'icons/misc/factions/Orionlogo.png',
+		"faction_SCC.png" = 'icons/misc/factions/SCClogo.png'
 	)
 
 /datum/asset/simple/jquery
@@ -416,7 +419,9 @@ var/list/asset_datums = list()
 		"zhlogo.png" = 'html/images/zhlogo.png',
 		"idrislogo.png" = 'html/images/idrislogo.png',
 		"eridanilogo.png" = 'html/images/eridanilogo.png',
+		"pmcglogo.png" = 'html/images/pmcglogo.png',
 		"zavodlogo.png" = 'html/images/zavodlogo.png',
+		"orionlogo.png" = 'html/images/orionlogo.png',
 		"hplogo.png" = 'html/images/hplogo.png',
 		"beflag.png" = 'html/images/beflag.png',
 		"elyraflag.png" = 'html/images/elyraflag.png',
diff --git a/html/images/orionlogo.png b/html/images/orionlogo.png
new file mode 100644
index 00000000000..dd69e3cbd15
Binary files /dev/null and b/html/images/orionlogo.png differ
diff --git a/html/images/pmcglogo.png b/html/images/pmcglogo.png
new file mode 100644
index 00000000000..bc04ab4b787
Binary files /dev/null and b/html/images/pmcglogo.png differ
diff --git a/icons/misc/factions/Orionlogo.png b/icons/misc/factions/Orionlogo.png
new file mode 100644
index 00000000000..38956466575
Binary files /dev/null and b/icons/misc/factions/Orionlogo.png differ
diff --git a/icons/misc/factions/SCClogo.png b/icons/misc/factions/SCClogo.png
new file mode 100644
index 00000000000..dfe7ab3f6f6
Binary files /dev/null and b/icons/misc/factions/SCClogo.png differ
diff --git a/icons/misc/factions/pmcglogo.png b/icons/misc/factions/pmcglogo.png
new file mode 100644
index 00000000000..bc04ab4b787
Binary files /dev/null and b/icons/misc/factions/pmcglogo.png differ
diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm
index cf02fca7c87..937f6ba9e55 100644
--- a/maps/sccv_horizon/placeholder-2_deck_2.dmm
+++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm
@@ -14121,8 +14121,6 @@
 /area/engineering/locker_room)
 "iXv" = (
 /obj/structure/table/reinforced,
-/obj/item/crowbar,
-/obj/item/device/flash,
 /obj/effect/floor_decal/corner/blue/full{
 	dir = 8
 	},
@@ -14130,6 +14128,8 @@
 	c_tag = "Security - Second Deck Checkpoint";
 	dir = 4
 	},
+/obj/item/gun/energy/mousegun/xenofauna,
+/obj/item/gun/energy/mousegun/xenofauna,
 /turf/simulated/floor/tiled,
 /area/security/checkpoint2)
 "iXI" = (
@@ -20908,6 +20908,7 @@
 	dir = 10
 	},
 /obj/item/paper_scanner,
+/obj/item/device/flash,
 /turf/simulated/floor/tiled,
 /area/security/checkpoint2)
 "nkT" = (
@@ -28982,6 +28983,7 @@
 	pixel_y = 6
 	},
 /obj/machinery/firealarm/north,
+/obj/item/crowbar,
 /turf/simulated/floor/tiled,
 /area/security/checkpoint2)
 "snU" = (