Resprites Trekkie Uniforms, adds Voyager Uniforms, adds Trekkie Costu…

…me Crate (tgstation#68871)

Added a Star Trek Costume Crate and updated the Star Trek uniforms to modern sprite standards, as well as adding Voyager uniforms!

code/datums/greyscale/config_types/greyscale_configs.dm

@@ -820,6 +820,17 @@
 	icon_file = 'icons/mob/clothing/suits/jacket.dmi'
 	json_config = 'code/datums/greyscale/json_configs/fancy_coat_worn.json'
 
+/datum/greyscale_config/trek
+	name = "Trek Uniform"
+	icon_file = 'icons/obj/clothing/under/trek.dmi'
+	json_config = 'code/datums/greyscale/json_configs/trek.json'
+	//All Trek uniforms are different icon_states in the same json so we dont have seperate jsons for all the different types
+
+/datum/greyscale_config/trek/worn
+	name = "Worn Trek Uniform"
+	icon_file = 'icons/mob/clothing/under/trek.dmi'
+	//The worn json is exactly the same, so it's easier to just inherit it (EXPERIMENTAL - SUCCESS. TODO: REMOVE ALL (duplicate-of-obj)_WORN CONFIGS)
+
 /datum/greyscale_config/encryptionkey_basic
 	name = "Basic Encryptionkey"
 	icon_file = 'icons/obj/radio.dmi'
@@ -830,7 +841,6 @@
 	icon_file = 'icons/obj/radio.dmi'
 	json_config = 'code/datums/greyscale/json_configs/encryptionkey_cube.json'
 
-
 /datum/greyscale_config/encryptionkey_research
 	name = "Research Encryptionkey"
 	icon_file = 'icons/obj/radio.dmi'

code/datums/greyscale/json_configs/trek.json

@@ -0,0 +1,113 @@
+{
+	"trek_tos": [
+		{
+			"type": "icon_state",
+			"icon_state": "tos_base",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "tos_color",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "trek_badge",
+			"blend_mode": "overlay"
+		}
+	],
+	"trek_tos_sec": [
+		{
+			"type": "icon_state",
+			"icon_state": "tos_color",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "tos_base",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "trek_badge",
+			"blend_mode": "overlay"
+		}
+	],
+	"trek_tos_com": [
+		{
+			"type": "icon_state",
+			"icon_state": "tos_base",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "tos_color",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "trek_badge",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "command_band",
+			"blend_mode": "overlay"
+		}
+	],
+
+	"trek_next": [
+		{
+			"type": "icon_state",
+			"icon_state": "next_base",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "next_color",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "trek_badge",
+			"blend_mode": "overlay"
+		}
+	],
+
+	"trek_voy": [
+		{
+			"type": "icon_state",
+			"icon_state": "voy_base",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "voy_color",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "trek_badge",
+			"blend_mode": "overlay"
+		}
+	],
+
+	"trek_ent": [
+		{
+			"type": "icon_state",
+			"icon_state": "ent_base",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "ent_color",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

code/modules/cargo/packs.dm

@@ -2522,6 +2522,26 @@
 		var/item = pick_n_take(L)
 		new item(C)
 
+/datum/supply_pack/costumes_toys/trekkie
+	name = "Trekkie Costume Crate"
+	desc = "Wear the scrapped concepts for Nanotrasen's jumpsuits, based off popular late-20th century Earth media! While they couldn't be used for the official jumpsuits due to copyright infringement, it's been assured that they can still legally be sold under the label of being 'failed designs'."
+	cost = CARGO_CRATE_VALUE * 2
+	contains = list(
+		/obj/item/clothing/under/trek/command,
+		/obj/item/clothing/under/trek/command/next,
+		/obj/item/clothing/under/trek/command/voy,
+		/obj/item/clothing/under/trek/command/ent,
+		/obj/item/clothing/under/trek/engsec,
+		/obj/item/clothing/under/trek/engsec/next,
+		/obj/item/clothing/under/trek/engsec/voy,
+		/obj/item/clothing/under/trek/engsec/ent,
+		/obj/item/clothing/under/trek/medsci,
+		/obj/item/clothing/under/trek/medsci/next,
+		/obj/item/clothing/under/trek/medsci/voy,
+		/obj/item/clothing/under/trek/medsci/ent,
+	)
+	crate_type = /obj/structure/closet/crate/wooden
+
 /datum/supply_pack/costumes_toys/mafia
 	name = "Cosa Nostra Starter Pack"
 	desc = "This crate contains everything you need to set up your own ethnicity-based racketeering operation."

code/modules/clothing/under/trek.dm

@@ -1,64 +1,84 @@
 //Just some alt-uniforms themed around Star Trek - Pls don't sue, Mr Roddenberry ;_;
 
-
 /obj/item/clothing/under/trek
 	can_adjust = FALSE
 	icon = 'icons/obj/clothing/under/trek.dmi'
 	worn_icon = 'icons/mob/clothing/under/trek.dmi'
 
-
-//TOS
+/*
+*	The Original Series (Technically not THE original because these have a black undershirt while the very-original didn't but IDC)
+*/
 /obj/item/clothing/under/trek/command
 	name = "command uniform"
-	desc = "The uniform worn by command officers."
-	icon_state = "trek_command"
+	desc = "An outdated uniform worn by command officers."
+	icon_state = "trek_tos_com" //Shirt has gold wrist-bands
 	inhand_icon_state = "y_suit"
+	greyscale_config = /datum/greyscale_config/trek
+	greyscale_config_worn = /datum/greyscale_config/trek/worn
+	greyscale_colors = "#fab342"
 
 /obj/item/clothing/under/trek/engsec
 	name = "engsec uniform"
-	desc = "The uniform worn by engineering/security officers."
-	icon_state = "trek_engsec"
+	desc = "An outdated uniform worn by engineering/security officers."
+	icon_state = "trek_tos_sec" //Tucked-in shirt
 	inhand_icon_state = "r_suit"
-	armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 0) //more sec than eng, but w/e.
-	strip_delay = 50
+	greyscale_config = /datum/greyscale_config/trek
+	greyscale_config_worn = /datum/greyscale_config/trek/worn
+	greyscale_colors = "#B72B2F"
 
 /obj/item/clothing/under/trek/medsci
 	name = "medsci uniform"
-	desc = "The uniform worn by medical/science officers."
-	icon_state = "trek_medsci"
+	desc = "An outdated worn by medical/science officers."
+	icon_state = "trek_tos"
 	inhand_icon_state = "b_suit"
+	greyscale_config = /datum/greyscale_config/trek
+	greyscale_config_worn = /datum/greyscale_config/trek/worn
+	greyscale_colors = "#5FA4CC"
 
-
-//TNG
+/*
+*	The Next Generation
+*/
 /obj/item/clothing/under/trek/command/next
-	icon_state = "trek_next_command"
-	inhand_icon_state = "r_suit"
+	icon_state = "trek_next" //Technically TNG had Command wearing red, but bc gold is closer to command roles for SS13 we're taking some liberties
 
 /obj/item/clothing/under/trek/engsec/next
-	icon_state = "trek_next_engsec"
-	inhand_icon_state = "y_suit"
+	icon_state = "trek_next"
 
 /obj/item/clothing/under/trek/medsci/next
-	icon_state = "trek_next_medsci"
+	icon_state = "trek_next"
+
+/*
+*	Voyager
+*/
+/obj/item/clothing/under/trek/command/voy
+	icon_state = "trek_voy" //Same point applies as TNG
 
+/obj/item/clothing/under/trek/engsec/voy
+	icon_state = "trek_voy"
 
-//ENT
+/obj/item/clothing/under/trek/medsci/voy
+	icon_state = "trek_voy"
+
+/*
+*	Enterprise
+*/
 /obj/item/clothing/under/trek/command/ent
-	icon_state = "trek_ent_command"
+	icon_state = "trek_ent"
+	//Greyscale sprite note, the base of it can't be greyscaled lest I make a whole new .json, but the color bands are greyscale at least.
+	//I've left a greyscale version of it in color.dmi in case someone wants a pocketed-jumpsuit/'coveralls' without the color bands - Orion_the_Fox
 	inhand_icon_state = "bl_suit"
 
 /obj/item/clothing/under/trek/engsec/ent
-	icon_state = "trek_ent_engsec"
+	icon_state = "trek_ent"
 	inhand_icon_state = "bl_suit"
 
 /obj/item/clothing/under/trek/medsci/ent
-	icon_state = "trek_ent_medsci"
+	icon_state = "trek_ent"
 	inhand_icon_state = "bl_suit"
 
-
 //Q
 /obj/item/clothing/under/trek/q
 	name = "french marshall's uniform"
-	desc = "Something about it feels off..."
+	desc = "Something about this uniform feels off..."
 	icon_state = "trek_Q"
 	inhand_icon_state = "r_suit"