diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm
index 4edc0169a42..816132df8e6 100644
--- a/code/modules/client/preference/loadout/loadout_suit.dm
+++ b/code/modules/client/preference/loadout/loadout_suit.dm
@@ -79,6 +79,43 @@
 	path = /obj/item/clothing/suit/storage/labcoat/emt
 	allowed_roles = list("Chief Medical Officer", "Paramedic")
 
+//BOMBER JACKETS
+/datum/gear/suit/bomber
+	main_typepath = /datum/gear/suit/bomber
+
+/datum/gear/suit/bomber/basic
+	display_name = "Bomber jacket"
+	path = /obj/item/clothing/suit/jacket
+
+/datum/gear/suit/bomber/job
+	main_typepath = /datum/gear/suit/bomber/job
+	subtype_selection_cost = FALSE
+
+/datum/gear/suit/bomber/job/sec
+	display_name = "Bomber jacket, security"
+	path = /obj/item/clothing/suit/jacket/secbomber
+	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
+
+/datum/gear/suit/bomber/job/cargo
+	display_name = "Bomber jacket, cargo"
+	path = /obj/item/clothing/suit/jacket/cargobomber
+	allowed_roles = list("Quartermaster", "Cargo Technician")
+
+/datum/gear/suit/bomber/job/miner
+	display_name = "Bomber jacket, mining"
+	path = /obj/item/clothing/suit/jacket/miningbomber
+	allowed_roles = list("Quartermaster", "Shaft Miner")
+
+/datum/gear/suit/bomber/job/engi
+	display_name = "Bomber jacket, engineering"
+	path = /obj/item/clothing/suit/jacket/engibomber
+	allowed_roles = list("Chief Engineer", "Station Engineer")
+
+/datum/gear/suit/bomber/job/atmos
+	display_name = "Bomber jacket, atmospherics"
+	path = /obj/item/clothing/suit/jacket/atmosbomber
+	allowed_roles = list("Chief Engineer", "Life Support Specialist")
+
 //JACKETS
 /datum/gear/suit/leather_jacket
 	display_name = "Leather jacket"
@@ -96,20 +133,6 @@
 	display_name = "Trenchcoat, black"
 	path = /obj/item/clothing/suit/blacktrenchcoat
 
-/datum/gear/suit/bomber_jacket
-	display_name = "Bomber jacket"
-	path = /obj/item/clothing/suit/jacket
-
-/datum/gear/suit/cargo_bomber_jacket
-	display_name = "Cargo bomber jacket"
-	path = /obj/item/clothing/suit/jacket/cargobomber
-	allowed_roles = list("Quartermaster", "Cargo Technician")
-
-/datum/gear/suit/mining_bomber_jacket
-	display_name = "Mining bomber jacket"
-	path = /obj/item/clothing/suit/jacket/miningbomber
-	allowed_roles = list("Quartermaster", "Shaft Miner")
-
 /datum/gear/suit/ol_miljacket
 	display_name = "Military jacket, olive"
 	path = /obj/item/clothing/suit/jacket/miljacket
@@ -131,11 +154,6 @@
 	path = /obj/item/clothing/suit/armor/secjacket
 	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
 
-/datum/gear/suit/secbomberjacket
-	display_name = "Security bomber jacket"
-	path = /obj/item/clothing/suit/jacket/secbomber
-	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
-
 /datum/gear/suit/ianshirt
 	display_name = "Ian Shirt"
 	path = /obj/item/clothing/suit/ianshirt