diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
index 6add63822d..0f5112c748 100644
--- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
@@ -44,6 +44,70 @@
 	path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedeng
 	allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer")
 
+// Trekie things
+//TOS
+/datum/gear/uniform/job_trek/cmd/tos
+	display_name = "TOS uniform, cmd"
+	path = /obj/item/clothing/under/fluff/trek/command
+	allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer")
+
+/datum/gear/uniform/job_trek/medsci/tos
+	display_name = "TOS uniform, med/sci"
+	path = /obj/item/clothing/under/fluff/trek/medsci
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist")
+
+/datum/gear/uniform/job_trek/eng/tos
+	display_name = "TOS uniform, eng/sec"
+	path = /obj/item/clothing/under/fluff/trek/engsec
+	allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security")
+
+//TNG
+/datum/gear/uniform/job_trek/cmd/tng
+	display_name = "TNG uniform, cmd"
+	path = /obj/item/clothing/under/fluff/trek/command/next
+	allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer")
+
+/datum/gear/uniform/job_trek/medsci/tng
+	display_name = "TNG uniform, med/sci"
+	path = /obj/item/clothing/under/fluff/trek/medsci/next
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist")
+
+/datum/gear/uniform/job_trek/eng/tng
+	display_name = "TNG uniform, eng/sec"
+	path = /obj/item/clothing/under/fluff/trek/engsec/next
+	allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security")
+
+//VOY
+/datum/gear/uniform/job_trek/cmd/voy
+	display_name = "VOY uniform, cmd"
+	path = /obj/item/clothing/under/fluff/trek/command/voy
+	allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer")
+
+/datum/gear/uniform/job_trek/medsci/voy
+	display_name = "VOY uniform, med/sci"
+	path = /obj/item/clothing/under/fluff/trek/medsci/voy
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist")
+
+/datum/gear/uniform/job_trek/eng/voy
+	display_name = "VOY uniform, eng/sec"
+	path = /obj/item/clothing/under/fluff/trek/engsec/voy
+	allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security")
+
+//ENT
+/datum/gear/uniform/job_trek/cmd/ent
+	display_name = "ENT uniform, cmd"
+	path = /obj/item/clothing/under/fluff/trek/command/ent
+	allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer")
+
+/datum/gear/uniform/job_trek/medsci/ent
+	display_name = "ENT uniform, med/sci"
+	path = /obj/item/clothing/under/fluff/trek/medsci/ent
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist")
+
+/datum/gear/uniform/job_trek/eng/ent
+	display_name = "ENT uniform, eng/sec"
+	path = /obj/item/clothing/under/fluff/trek/engsec/ent
+	allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security")
 /*
 Swimsuits
 */
diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
index 633c8277ad..fe79a155f5 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
@@ -988,4 +988,72 @@ Departamental Swimsuits, for general use
 	name = "Penelope's Swimsuit"
 	desc = "It's made of a special fiber that provides no protection whatsoever, but its elastic. This one was custom made for Penelope."
 	icon_state = "swimsuit_penelope"
-	item_state = "swimsuit_penelope_mob"
\ No newline at end of file
+	item_state = "swimsuit_penelope_mob"
+
+//Just some alt-uniforms themed around Star Trek - Pls don't sue, Mr Roddenberry ;_;
+
+
+/obj/item/clothing/under/fluff/trek
+	icon = 'icons/vore/custom_clothes_vr.dmi'
+	icon_override = 'icons/vore/custom_clothes_vr.dmi'
+
+//TOS
+/obj/item/clothing/under/fluff/trek/command
+	name = "command uniform"
+	desc = "The uniform worn by command officers"
+	icon_state = "trek_command"
+	item_state = "trek_command_mob"
+	armor = list(melee = 10, bullet = 10, laser = 10,energy = 0, bomb = 0, bio = 10, rad = 10, fire = 0, acid = 0) // Considering only staff heads get to pick it
+
+/obj/item/clothing/under/fluff/trek/engsec
+	name = "engsec uniform"
+	desc = "The uniform worn by engineering/security officers"
+	icon_state = "trek_engsec"
+	item_state = "trek_engsec_mob"
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10, fire = 0, acid = 0) // since they're shared between jobs and kinda moot.
+
+/obj/item/clothing/under/fluff/trek/medsci
+	name = "medsci uniform"
+	desc = "The uniform worn by medical/science officers"
+	icon_state = "trek_medsci"
+	item_state = "trek_medsci_mob"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0) // basically a copy of vanilla sci/med
+
+//TNG
+/obj/item/clothing/under/fluff/trek/command/next
+	icon_state = "trek_next_command"
+	item_state = "trek_next_command_mob"
+
+/obj/item/clothing/under/fluff/trek/engsec/next
+	icon_state = "trek_next_engsec"
+	item_state = "trek_next_engsec_mob"
+
+/obj/item/clothing/under/fluff/trek/medsci/next
+	icon_state = "trek_next_medsci"
+	item_state = "trek_next_medsci_mob"
+
+//ENT
+/obj/item/clothing/under/fluff/trek/command/ent
+	icon_state = "trek_ent_command"
+	item_state = "trek_ent_command_mob"
+
+/obj/item/clothing/under/fluff/trek/engsec/ent
+	icon_state = "trek_ent_engsec"
+	item_state = "trek_ent_engsec_mob"
+
+/obj/item/clothing/under/fluff/trek/medsci/ent
+	icon_state = "trek_ent_medsci"
+	item_state = "trek_ent_medsci_mob"
+
+//VOY
+/obj/item/clothing/under/fluff/trek/command/voy
+	icon_state = "trek_voy_command"
+	item_state = "trek_voy_command_mob"
+
+/obj/item/clothing/under/fluff/trek/engsec/voy
+	icon_state = "trek_voy_engsec"
+	item_state = "trek_voy_engsec_mob"
+
+/obj/item/clothing/under/fluff/trek/medsci/voy
+	icon_state = "trek_voy_medsci"
+	item_state = "trk_vor_medsci_mob"
\ No newline at end of file
diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi
index 978b250ae2..fabb47ef0c 100644
Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ