diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm
index a6ae08ea13e..f9fe14a9570 100644
--- a/code/modules/client/preference/loadout/loadout_general.dm
+++ b/code/modules/client/preference/loadout/loadout_general.dm
@@ -93,40 +93,6 @@
 	display_name = "Shark plushie"
 	path = /obj/item/toy/plushie/shark
 
-/datum/gear/goggles
-	display_name = "Goggles"
-	path = /obj/item/clothing/glasses/goggles
-
-/datum/gear/sechud
-	display_name = "Classic security HUD"
-	path = /obj/item/clothing/glasses/hud/security
-	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Internal Affairs Agent","Magistrate")
-
-/datum/gear/sechudgoggles
-	display_name = "Security HUD goggles"
-	path = /obj/item/clothing/glasses/hud/security/goggles
-	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Internal Affairs Agent", "Magistrate")
-
-/datum/gear/medhudgoggles
-	display_name = "Health HUD goggles"
-	path = /obj/item/clothing/glasses/hud/health/goggles
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Chemist", "Geneticist", "Virologist", "Psychiatrist", "Paramedic")
-
-/datum/gear/diaghudgoggles
-	display_name = "Diagnostic HUD goggles"
-	path = /obj/item/clothing/glasses/hud/diagnostic/goggles
-	allowed_roles = list("Research Director", "Scientist", "Roboticist")
-
-/datum/gear/hydrohudgoggles
-	display_name = "Hydroponic HUD goggles"
-	path = /obj/item/clothing/glasses/hud/hydroponic/goggles
-	allowed_roles = list("Botanist")
-
-/datum/gear/skillhudgoggles
-	display_name = "Skill HUD goggles"
-	path = /obj/item/clothing/glasses/hud/skills/goggles
-	allowed_roles = list("Psychiatrist", "Nanotrasen Representative", "Head of Personnel", "Captain")
-
 /datum/gear/cryaonbox
 	display_name = "Box of crayons"
 	path = /obj/item/storage/fancy/crayons
diff --git a/code/modules/client/preference/loadout/loadout_glasses.dm b/code/modules/client/preference/loadout/loadout_glasses.dm
index 1eec9f19af3..c6188f31464 100644
--- a/code/modules/client/preference/loadout/loadout_glasses.dm
+++ b/code/modules/client/preference/loadout/loadout_glasses.dm
@@ -35,3 +35,41 @@
 /datum/gear/glasses/prescription
 	display_name = "Prescription glasses"
 	path = /obj/item/clothing/glasses/regular
+
+/datum/gear/glasses/sechud
+	display_name = "Classic security HUD"
+	path = /obj/item/clothing/glasses/hud/security
+	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Internal Affairs Agent","Magistrate")
+
+/datum/gear/glasses/goggles
+	display_name = "Goggles"
+	path = /obj/item/clothing/glasses/goggles
+
+/datum/gear/glasses/goggles_job
+	main_typepath = /datum/gear/glasses/goggles_job
+	subtype_selection_cost = FALSE
+
+/datum/gear/glasses/goggles_job/sechudgoggles
+	display_name = "Security HUD goggles"
+	path = /obj/item/clothing/glasses/hud/security/goggles
+	allowed_roles = list("Head of Security", "Warden", "Security Officer", "Internal Affairs Agent", "Magistrate")
+
+/datum/gear/glasses/goggles_job/medhudgoggles
+	display_name = "Health HUD goggles"
+	path = /obj/item/clothing/glasses/hud/health/goggles
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Chemist", "Geneticist", "Virologist", "Psychiatrist", "Paramedic")
+
+/datum/gear/glasses/goggles_job/diaghudgoggles
+	display_name = "Diagnostic HUD goggles"
+	path = /obj/item/clothing/glasses/hud/diagnostic/goggles
+	allowed_roles = list("Research Director", "Scientist", "Roboticist")
+
+/datum/gear/glasses/goggles_job/hydrohudgoggles
+	display_name = "Hydroponic HUD goggles"
+	path = /obj/item/clothing/glasses/hud/hydroponic/goggles
+	allowed_roles = list("Botanist")
+
+/datum/gear/glasses/goggles_job/skillhudgoggles
+	display_name = "Skill HUD goggles"
+	path = /obj/item/clothing/glasses/hud/skills/goggles
+	allowed_roles = list("Psychiatrist", "Nanotrasen Representative", "Head of Personnel", "Captain")