[MIRROR] [MODULAR] Outfit GAGSification Batch 1 (#1901)

* [MODULAR] Outfit GAGSification Batch 1 (#742)

* GAGS Costumes Polish Pass 1

Improves the Qipao, Yukata, and Cheongsam with better GAGS support.
GAGS-ifies the Monk Habit, standard Habit, Nun Hood, and Nun Veil.

* GAGS Costumes Polish Pass 2

Pencilskirt has been GAGSified and split up a bit to allow for using your undershirt & customizing colors.

* GAGS Costumes Polish Pass 3

Makes proper suit versions of the standard pencilskirt & executive pencilskirt bc they look like really cozy fancy office clothes, adds the VOY trekkie uniforms to selection, refactors trekkie uniforms' digilegs settings into the modular costumes file, and makes trekkie uniforms USER_RECOLORABLE so you can customize them if you wish.

* Addressing some jank Orion pointed out

* Restoring pencilskirt components in suits.dmi

* Update suits.dmi

---------

Co-authored-by: CliffracerX <[email protected]>
Co-authored-by: Iajret <[email protected]>

code/modules/clothing/under/trek.dm

@@ -15,7 +15,6 @@
 	inhand_icon_state = "y_suit"
 	greyscale_config = /datum/greyscale_config/trek
 	greyscale_config_worn = /datum/greyscale_config/trek/worn
-	greyscale_config_worn_digi = /datum/greyscale_config/trek/worn/digi //NOVA EDIT ADDITION - DigiGreyscale
 	greyscale_colors = "#fab342"
 
 /obj/item/clothing/under/trek/engsec
@@ -25,7 +24,6 @@
 	inhand_icon_state = "r_suit"
 	greyscale_config = /datum/greyscale_config/trek
 	greyscale_config_worn = /datum/greyscale_config/trek/worn
-	greyscale_config_worn_digi = /datum/greyscale_config/trek/worn/digi //NOVA EDIT ADDITION - DigiGreyscale
 	greyscale_colors = "#B72B2F"
 
 /obj/item/clothing/under/trek/medsci
@@ -35,7 +33,6 @@
 	inhand_icon_state = "b_suit"
 	greyscale_config = /datum/greyscale_config/trek
 	greyscale_config_worn = /datum/greyscale_config/trek/worn
-	greyscale_config_worn_digi = /datum/greyscale_config/trek/worn/digi //NOVA EDIT ADDITION - DigiGreyscale
 	greyscale_colors = "#5FA4CC"
 
 /*

modular_nova/master_files/code/modules/clothing/head/_head.dm

@@ -46,6 +46,24 @@
 /obj/item/clothing/head/helmet/chaplain
 	worn_icon_muzzled = 'modular_nova/master_files/icons/mob/clothing/head/chaplain_muzzled.dmi'
 
+/obj/item/clothing/head/hooded/monkhabit
+	greyscale_config = /datum/greyscale_config/monk_habit_hood
+	greyscale_config_worn = /datum/greyscale_config/monk_habit_hood/worn
+	greyscale_colors = "#8C531A#9C7132"
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+/obj/item/clothing/head/chaplain/nun_hood
+	greyscale_config = /datum/greyscale_config/nun_hood
+	greyscale_config_worn = /datum/greyscale_config/nun_hood/worn
+	greyscale_colors = "#373548#FFFFFF"
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+/obj/item/clothing/head/chaplain/habit_veil
+	greyscale_config = /datum/greyscale_config/nun_veil
+	greyscale_config_worn = /datum/greyscale_config/nun_veil/worn
+	greyscale_colors = "#373548#FFFFFF"
+	flags_1 = IS_PLAYER_COLORABLE_1
+
 /obj/item/clothing/head/collectable/welding
 	worn_icon_muzzled = 'modular_nova/master_files/icons/mob/clothing/head_muzzled.dmi'
 	supports_variations_flags = CLOTHING_SNOUTED_VARIATION

modular_nova/master_files/code/modules/clothing/suits/_suits.dm

@@ -24,3 +24,32 @@
 
 /obj/item/clothing/suit/hooded/chaplainsuit
 	worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/suits/chaplain_digi.dmi'
+
+/obj/item/clothing/suit/chaplainsuit/habit
+	greyscale_config = /datum/greyscale_config/chappy_habit
+	greyscale_config_worn = /datum/greyscale_config/chappy_habit/worn
+	greyscale_colors = "#373548#FFFFFF#D29722"
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+/obj/item/clothing/suit/hooded/chaplainsuit/monkhabit
+	greyscale_config = /datum/greyscale_config/monk_habit
+	greyscale_config_worn = /datum/greyscale_config/monk_habit/worn
+	greyscale_colors = "#8C531A#9C7132"
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+// Monk habit hood needs to match; code pulled from wintercoats.
+/obj/item/clothing/suit/hooded/chaplainsuit/monkhabit/set_greyscale(list/colors, new_config, new_worn_config, new_inhand_left, new_inhand_right)
+	. = ..()
+	if(!hood)
+		return
+	var/list/coat_colors = SSgreyscale.ParseColorString(greyscale_colors)
+	var/list/new_coat_colors = coat_colors.Copy(1,3)
+	hood.set_greyscale(new_coat_colors) //Adopt the suit's grayscale coloring for visual clarity.
+	hood.update_slot_icon()
+
+//But also keep old method in case the hood is (re-)created later
+/obj/item/clothing/suit/hooded/chaplainsuit/monkhabit/on_hood_created(obj/item/clothing/head/hooded/hood)
+	. = ..()
+	var/list/coat_colors = (SSgreyscale.ParseColorString(greyscale_colors))
+	var/list/new_coat_colors = coat_colors.Copy(1,3)
+	hood.set_greyscale(new_coat_colors) //Adopt the suit's grayscale coloring for visual clarity.

modular_nova/master_files/code/modules/clothing/under/costume.dm

@@ -63,25 +63,37 @@
 	flags_1 = IS_PLAYER_COLORABLE_1
 	gets_cropped_on_taurs = FALSE
 
+/obj/item/clothing/under/costume/nova/qipao/customtrim
+	greyscale_colors = "#2b2b2b#ffce5b"
+	greyscale_config = /datum/greyscale_config/qipao_customtrim
+	greyscale_config_worn = /datum/greyscale_config/qipao_customtrim/worn
+	greyscale_config_worn_digi = /datum/greyscale_config/qipao_customtrim/worn/digi
+
 /obj/item/clothing/under/costume/nova/cheongsam
 	name = "cheongsam"
 	desc = "A cheongsam, traditionally worn in ancient Earth China by men during social events and lunar new years."
 	icon_state = "cheongsam"
 	body_parts_covered = CHEST|GROIN|LEGS
 	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
-	greyscale_colors = "#2b2b2b"
+	greyscale_colors = "#2b2b2b#353535"
 	greyscale_config = /datum/greyscale_config/cheongsam
 	greyscale_config_worn = /datum/greyscale_config/cheongsam/worn
 	greyscale_config_worn_digi = /datum/greyscale_config/cheongsam/worn/digi
 	flags_1 = IS_PLAYER_COLORABLE_1
 	gets_cropped_on_taurs = FALSE
 
+/obj/item/clothing/under/costume/nova/cheongsam/customtrim
+	greyscale_colors = "#2b2b2b#ffce5b#353535"
+	greyscale_config = /datum/greyscale_config/cheongsam_customtrim
+	greyscale_config_worn = /datum/greyscale_config/cheongsam_customtrim/worn
+	greyscale_config_worn_digi = /datum/greyscale_config/cheongsam_customtrim/worn/digi
+
 /obj/item/clothing/under/costume/nova/yukata
 	name = "yukata"
 	desc = "A traditional ancient Earth Japanese yukata, typically worn in casual settings."
 	icon_state = "yukata"
 	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
-	greyscale_colors = "#2b2b2b"
+	greyscale_colors = "#2b2b2b#666666"
 	greyscale_config = /datum/greyscale_config/yukata
 	greyscale_config_worn = /datum/greyscale_config/yukata/worn
 	greyscale_config_worn_digi = /datum/greyscale_config/yukata/worn/digi
@@ -136,3 +148,18 @@
 	name = "sexy green christmas costume"
 	desc = "Stupid. Ugly. Out of date. If I can't find something nice to wear I'm not going."
 	greyscale_colors = "#1a991a#c4c2c2"
+
+/*
+*	TREK CLOTHES
+*/
+/obj/item/clothing/under/trek/command
+	greyscale_config_worn_digi = /datum/greyscale_config/trek/worn/digi
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+/obj/item/clothing/under/trek/engsec
+	greyscale_config_worn_digi = /datum/greyscale_config/trek/worn/digi
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+/obj/item/clothing/under/trek/medsci
+	greyscale_config_worn_digi = /datum/greyscale_config/trek/worn/digi
+	flags_1 = IS_PLAYER_COLORABLE_1

modular_nova/master_files/code/modules/clothing/under/jobs/civilian/suits.dm

@@ -34,51 +34,102 @@
 	greyscale_config_worn = /datum/greyscale_config/recolorable_suitskirt/worn
 	greyscale_config_worn_digi = /datum/greyscale_config/recolorable_suitskirt/worn/digi
 
-/*
-*	SUITS
-*/
+/obj/item/clothing/under/suit/nova/recolorable/casual
+	name = "office casual suit"
+	desc = "A semi-formal suit, clean-cut with a matching vest and slacks."
+	icon_state = "fancysuit_casual"
+	greyscale_config = /datum/greyscale_config/fancysuit_casual
+	greyscale_config_worn = /datum/greyscale_config/fancysuit_casual/worn
+	greyscale_config_worn_digi = /datum/greyscale_config/fancysuit_casual/worn/digi
+	greyscale_colors = "#37373e#ffffff"
+
+/obj/item/clothing/under/suit/nova/recolorable/executive
+	name = "executive casual suit"
+	desc = "A formal suit, clean-cut with a matching vest, undershirt, tie and slacks."
+	icon_state = "fancysuit_executive"
+	greyscale_config = /datum/greyscale_config/fancysuit_executive
+	greyscale_config_worn = /datum/greyscale_config/fancysuit_executive/worn
+	greyscale_config_worn_digi = /datum/greyscale_config/fancysuit_executive/worn/digi
+	greyscale_colors = "#37373e#37373e#ffffff#ac3232"
+
 /obj/item/clothing/under/suit/nova/pencil
-	name = "black pencilskirt"
-	desc = "A clean white shirt with a tight-fitting black pencilskirt."
-	icon_state = "black_pencil"
+	name = "pencilskirt and shirt"
+	desc = "A clean shirt with a tight-fitting pencilskirt."
+	icon_state = "pencilskirt_shirt"
 	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
 	gets_cropped_on_taurs = FALSE
+	greyscale_colors = "#37373e#ffffff"
+	greyscale_config = /datum/greyscale_config/pencilskirt_withshirt
+	greyscale_config_worn = /datum/greyscale_config/pencilskirt_withshirt/worn
+	greyscale_config_worn_digi = /datum/greyscale_config/pencilskirt_withshirt/worn/digi
+	flags_1 = IS_PLAYER_COLORABLE_1
 
-/obj/item/clothing/under/suit/nova/pencil/black_really
-	name = "executive pencilskirt"
-	desc = "A sleek suit with a tight-fitting black pencilskirt."
-	icon_state = "really_black_pencil"
+/obj/item/clothing/under/suit/nova/pencil/noshirt
+	name = "pencilskirt"
+	desc = "A tight-fitting pencilskirt, perfect to augment an undershirt."
+	icon_state = "pencilskirt"
+	greyscale_colors = "#37373e"
+	greyscale_config = /datum/greyscale_config/pencilskirt
+	greyscale_config_worn = /datum/greyscale_config/pencilskirt/worn
+	greyscale_config_worn_digi = /datum/greyscale_config/pencilskirt/worn/digi
+	body_parts_covered = GROIN|LEGS
 
 /obj/item/clothing/under/suit/nova/pencil/charcoal
 	name = "charcoal pencilskirt"
 	desc = "A clean white shirt with a tight-fitting charcoal pencilskirt."
-	icon_state = "charcoal_pencil"
+	greyscale_colors = "#303030#ffffff"
 
 /obj/item/clothing/under/suit/nova/pencil/navy
 	name = "navy pencilskirt"
 	desc = "A clean white shirt with a tight-fitting navy-blue pencilskirt."
-	icon_state = "navy_pencil"
+	greyscale_colors = "#112334#ffffff"
 
 /obj/item/clothing/under/suit/nova/pencil/burgandy
 	name = "burgandy pencilskirt"
 	desc = "A clean white shirt with a tight-fitting burgandy-red pencilskirt."
-	icon_state = "burgandy_pencil"
-
-/obj/item/clothing/under/suit/nova/pencil/checkered
-	name = "checkered pencilskirt"
-	desc = "A clean white shirt with a tight-fitting grey checkered pencilskirt."
-	icon_state = "checkered_pencil"
+	greyscale_colors = "#3e1111#ffffff"
 
 /obj/item/clothing/under/suit/nova/pencil/tan
 	name = "tan pencilskirt"
 	desc = "A clean white shirt with a tight-fitting tan pencilskirt."
-	icon_state = "tan_pencil"
+	greyscale_colors = "#8b7458#ffffff"
 
 /obj/item/clothing/under/suit/nova/pencil/green
 	name = "green pencilskirt"
 	desc = "A clean white shirt with a tight-fitting green pencilskirt."
-	icon_state = "green_pencil"
+	greyscale_colors = "#113e20#ffffff"
 
+/obj/item/clothing/under/suit/nova/pencil/black_really
+	name = "executive pencilskirt"
+	desc = "A sleek suit with a tight-fitting pencilskirt."
+	icon_state = "pencilskirt_suit"
+	greyscale_colors = "#37373e#37373e#ffffff#ac3232"
+	greyscale_config = /datum/greyscale_config/pencilskirt_withsuit
+	greyscale_config_worn = /datum/greyscale_config/pencilskirt_withsuit/worn
+	greyscale_config_worn_digi = /datum/greyscale_config/pencilskirt_withsuit/worn/digi
+
+/obj/item/clothing/under/suit/nova/pencil/checkered
+	name = "checkered pencilskirt and shirt"
+	desc = "A clean shirt with a tight-fitting checkered pencilskirt."
+	icon_state = "pencilskirt_checkers_shirt"
+	greyscale_colors = "#37373e#232323#ffffff"
+	greyscale_config = /datum/greyscale_config/pencilskirt_checkers_withshirt
+	greyscale_config_worn = /datum/greyscale_config/pencilskirt_checkers_withshirt/worn
+	greyscale_config_worn_digi = /datum/greyscale_config/pencilskirt_checkers_withshirt/worn/digi
+
+/obj/item/clothing/under/suit/nova/pencil/checkered/noshirt
+	name = "checkered pencilskirt"
+	desc = "A tight-fitting checkered pencilskirt."
+	icon_state = "pencilskirt_checkers"
+	greyscale_colors = "#37373e#232323"
+	greyscale_config = /datum/greyscale_config/pencilskirt_checkers
+	greyscale_config_worn = /datum/greyscale_config/pencilskirt_checkers/worn
+	greyscale_config_worn_digi = /datum/greyscale_config/pencilskirt_checkers/worn/digi
+	body_parts_covered = GROIN|LEGS
+
+/*
+*	STATIC SUITS (NO GAGS)
+*/
 /obj/item/clothing/under/suit/nova/scarface
 	name = "cuban suit"
 	desc = "A yayo coloured silk suit with a crimson shirt. You just know how to hide, how to lie. Me, I don't have that problem. Me, I always tell the truth. Even when I lie."