[MIRROR] New GaGs clothing: Part 1 - 'Dress'ing up! (#1465)

* New GaGs clothing: Part 1 - 'Dress'ing up! (#81785) ## About The Pull Request I'm going to keep this simple, I have added four GaGs configs and the sprites for some outfits, I intend to expand on the recolouring abilities, so you will be able to use more than just spraycans. The outfits are as follows; The Cardigan skirt (formerly named black skirt), the Evening gown (It's no longer the 'RED' gown, since it can be any colour), the striped dress and the sailor dress. ![image](https://github.com/tgstation/tgstation/assets/53197594/04c2e2ee-1d26-484e-9dde-b90cb7c33175) ![image](https://github.com/tgstation/tgstation/assets/53197594/e2ca4171-7b28-4fb2-9cc0-e6916367995e) ![image](https://github.com/tgstation/tgstation/assets/53197594/2c5a0985-b4fc-4fc3-8da1-13923f2742fb) ![image](https://github.com/tgstation/tgstation/assets/53197594/537006c0-1e67-4278-89d6-b4e294c335e8) ## Why It's Good For The Game Customisation is always good, allowing players to express their character how they want isn't a bad thing! ## Changelog :cl: image: added gags sprites for; Sailor dress, Evening gown, Cardigan skirts and striped dresses. /:cl: * New GaGs clothing: Part 1 - 'Dress'ing up! * Fixing this update paths script for downstreams It didn't even work before, your welcome downstreams * Fix paths, * fix missing icon states, This will...probally fuck things up * GAGS configs * attempting this first --------- Co-authored-by: xXPawnStarrXx <[email protected]> Co-authored-by: SomeRandomOwl <[email protected]> Co-authored-by: SomeRandomOwl <[email protected]>
Fluffy-Frontier · Mar 19, 2024 · 3081679 · 3081679
1 parent 4c8f902
commit 3081679
Show file tree

Hide file tree

Showing 16 changed files with 163 additions and 14 deletions.
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -95608,7 +95608,7 @@
 /obj/item/clothing/head/costume/kitty,
 /obj/item/clothing/under/costume/maid,
 /obj/item/clothing/head/costume/rabbitears,
-/obj/item/clothing/under/dress/redeveninggown,
+/obj/item/clothing/under/dress/eveninggown,
 /turf/open/floor/wood,
 /area/station/commons/dorms)
 "xRa" = (

diff --git a/_maps/map_files/generic/CentCom_nova_z2.dmm b/_maps/map_files/generic/CentCom_nova_z2.dmm
@@ -311,7 +311,7 @@
 "agV" = (
 /obj/structure/closet/wardrobe/grey,
 /obj/item/clothing/under/dress/tango,
-/obj/item/clothing/under/dress/redeveninggown,
+/obj/item/clothing/under/dress/eveninggown,
 /turf/open/indestructible/hotelwood,
 /area/centcom/holding/cafe)
 "ahk" = (

diff --git a/code/datums/elements/gags_recolorable.dm b/code/datums/elements/gags_recolorable.dm
@@ -10,7 +10,7 @@
 
 /datum/element/gags_recolorable/proc/on_examine(atom/source, mob/user, list/examine_text)
 	SIGNAL_HANDLER
-	examine_text += span_notice("You could recolor [source.p_them()] with a spraycan...")
+	examine_text += span_notice("Now utilising PPP recolouring technology, capable of absorbing paint and pigments for changing it's colours!")
 
 /datum/element/gags_recolorable/proc/on_attackby(datum/source, obj/item/attacking_item, mob/user)
 	SIGNAL_HANDLER

diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm
@@ -333,6 +333,42 @@ NOVA EDIT END */
 	name = "Sundress (Worn)"
 	icon_file = 'icons/mob/clothing/under/dress.dmi'
 
+/datum/greyscale_config/striped_dress
+	name = "Striped dress"
+	icon_file = 'icons/obj/clothing/under/dress.dmi'
+	json_config = 'code/datums/greyscale/json_configs/striped_dress.json'
+
+/datum/greyscale_config/striped_dress/worn
+	name = "Striped dress (Worn)"
+	icon_file = 'icons/mob/clothing/under/dress.dmi'
+
+/datum/greyscale_config/evening_dress
+	name = "Evening gown"
+	icon_file = 'icons/obj/clothing/under/dress.dmi'
+	json_config = 'code/datums/greyscale/json_configs/eveningdress.json'
+
+/datum/greyscale_config/evening_dress/worn
+	name = "Evening gown (Worn)"
+	icon_file = 'icons/mob/clothing/under/dress.dmi'
+
+/datum/greyscale_config/cardiganskirt
+	name = "Cardigan Skirt"
+	icon_file = 'icons/obj/clothing/under/dress.dmi'
+	json_config = 'code/datums/greyscale/json_configs/cardiganskirt.json'
+
+/datum/greyscale_config/cardiganskirt/worn
+	name = "Cardigan Skirt(Worn)"
+	icon_file = 'icons/mob/clothing/under/dress.dmi'
+
+/datum/greyscale_config/sailor_dress
+	name = "Sailor Dress"
+	icon_file = 'icons/obj/clothing/under/dress.dmi'
+	json_config = 'code/datums/greyscale/json_configs/sailor_dress.json'
+
+/datum/greyscale_config/sailor_dress/worn
+	name = "Sailor Dress(Worn)"
+	icon_file = 'icons/mob/clothing/under/dress.dmi'
+
 // SHIRTS, PANTS AND SHORTS
 /datum/greyscale_config/slacks
 	name = "Slacks"

diff --git a/code/datums/greyscale/json_configs/cardiganskirt.json b/code/datums/greyscale/json_configs/cardiganskirt.json
@@ -0,0 +1,21 @@
+{
+	"cardiganskirt": [
+		{
+			"type": "icon_state",
+			"icon_state": "cardiganskirt_skirt",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "cardiganskirt_cardigan",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "cardiganskirt_collar",
+			"blend_mode": "overlay"
+		}
+	]
+}
diff --git a/code/datums/greyscale/json_configs/eveningdress.json b/code/datums/greyscale/json_configs/eveningdress.json
@@ -0,0 +1,10 @@
+{
+	"evening_gown": [
+		{
+			"type": "icon_state",
+			"icon_state": "evening_gown",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
diff --git a/code/datums/greyscale/json_configs/sailor_dress.json b/code/datums/greyscale/json_configs/sailor_dress.json
@@ -0,0 +1,27 @@
+{
+	"sailor_dress": [
+		{
+			"type": "icon_state",
+			"icon_state": "sailor_dress_skirt",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "sailor_dress_jacket",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "sailor_dress_stripes",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "sailor_dress_badge",
+			"blend_mode": "overlay"
+		}
+	]
+}
diff --git a/code/datums/greyscale/json_configs/striped_dress.json b/code/datums/greyscale/json_configs/striped_dress.json
@@ -0,0 +1,22 @@
+{
+	"stripeddress": [
+		{
+			"type": "icon_state",
+			"icon_state": "stripeddress_jacket",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "stripeddress_base",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "stripeddress_stripes",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		}
+	]
+}
diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm
@@ -6,18 +6,31 @@
 	icon = 'icons/obj/clothing/under/dress.dmi'
 	worn_icon = 'icons/mob/clothing/under/dress.dmi'
 
+/obj/item/clothing/under/dress/striped/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/gags_recolorable)
+	update_icon(UPDATE_OVERLAYS)
+
 /obj/item/clothing/under/dress/striped
 	name = "striped dress"
 	desc = "Fashion in space."
-	icon_state = "striped_dress"
+	icon_state = "stripeddress"
 	inhand_icon_state = null
 	female_sprite_flags = FEMALE_UNIFORM_FULL
+	greyscale_config = /datum/greyscale_config/striped_dress
+	greyscale_config_worn = /datum/greyscale_config/striped_dress/worn
+	flags_1 = IS_PLAYER_COLORABLE_1
+	greyscale_colors = "#003284#000000#ffffff"
 
 /obj/item/clothing/under/dress/sailor
 	name = "sailor dress"
 	desc = "Formal wear for a leading lady."
 	icon_state = "sailor_dress"
-	inhand_icon_state = null
+	greyscale_config = /datum/greyscale_config/sailor_dress
+	greyscale_config_worn = /datum/greyscale_config/sailor_dress/worn
+	greyscale_colors = "#0000ff#cc0000#eaeaea"
+	inhand_icon_state = "blackskirt"
+	flags_1 = IS_PLAYER_COLORABLE_1
 
 /obj/item/clothing/under/dress/wedding_dress
 	name = "wedding dress"
@@ -27,17 +40,25 @@
 	body_parts_covered = CHEST|GROIN|LEGS
 	flags_inv = HIDESHOES
 
-/obj/item/clothing/under/dress/redeveninggown
-	name = "red evening gown"
+/obj/item/clothing/under/dress/eveninggown
+	name = "evening gown"
 	desc = "Fancy dress for space bar singers."
-	icon_state = "red_evening_gown"
+	icon_state = "evening_gown"
 	inhand_icon_state = null
+	greyscale_config = /datum/greyscale_config/evening_dress
+	greyscale_config_worn = /datum/greyscale_config/evening_dress/worn
+	flags_1 = IS_PLAYER_COLORABLE_1
+	greyscale_colors = "#e11f1f"
 
 /obj/item/clothing/under/dress/skirt
-	name = "black skirt"
-	desc = "A black skirt, very fancy!"
-	icon_state = "blackskirt"
+	name = "cardigan skirt"
+	desc = "A nice skirt with a cute cardigan, very fancy!"
+	icon_state = "cardiganskirt"
+	greyscale_config = /datum/greyscale_config/cardiganskirt
+	greyscale_config_worn = /datum/greyscale_config/cardiganskirt/worn
+	greyscale_colors = "#bf504d#545454"
 	inhand_icon_state = "blackskirt"
+	flags_1 = IS_PLAYER_COLORABLE_1
 
 /obj/item/clothing/under/dress/skirt/plaid
 	name = "plaid skirt"

diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
@@ -82,7 +82,7 @@
 				/obj/item/clothing/under/costume/kilt = 1,
 				/obj/item/clothing/under/dress/striped = 1,
 				/obj/item/clothing/under/dress/sailor = 1,
-				/obj/item/clothing/under/dress/redeveninggown = 1,
+				/obj/item/clothing/under/dress/eveninggown = 1,
 				/obj/item/clothing/under/misc/pj/blue = 2,
 				/obj/item/clothing/under/misc/pj/red = 2,
 			),

diff --git a/icons/mob/clothing/under/dress.dmi b/icons/mob/clothing/under/dress.dmi
diff --git a/icons/obj/clothing/under/dress.dmi b/icons/obj/clothing/under/dress.dmi
diff --git a/modular_nova/master_files/code/modules/clothing/under/skirts_dresses.dm b/modular_nova/master_files/code/modules/clothing/under/skirts_dresses.dm
@@ -36,6 +36,9 @@
 	desc = "Formal skirt."
 	icon_state = "skirt_swept"
 	body_parts_covered = GROIN
+	greyscale_config = null
+	greyscale_config_worn = null
+	greyscale_colors = null
 
 /obj/item/clothing/under/dress/skirt/nova/striped_skirt
 	name = "red bra and striped skirt"
@@ -44,6 +47,9 @@
 	body_parts_covered = CHEST|GROIN|LEGS
 	can_adjust = TRUE
 	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
+	greyscale_config = null
+	greyscale_config_worn = null
+	greyscale_colors = null
 
 /obj/item/clothing/under/dress/skirt/nova/red_skirt
 	name = "red bra and skirt"
@@ -52,6 +58,9 @@
 	body_parts_covered = CHEST|GROIN|LEGS
 	can_adjust = TRUE
 	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
+	greyscale_config = null
+	greyscale_config_worn = null
+	greyscale_colors = null
 
 /obj/item/clothing/under/dress/skirt/nova/black_skirt
 	name = "black bra and skirt"
@@ -60,6 +69,9 @@
 	body_parts_covered = CHEST|GROIN|LEGS
 	can_adjust = TRUE
 	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
+	greyscale_config = null
+	greyscale_config_worn = null
+	greyscale_colors = null
 
 /obj/item/clothing/under/dress/skirt/nova/turtleskirt_knit //Essentially the same as the Turtleneck Skirt but with a different texture
 	name = "cableknit skirt"

diff --git a/modular_nova/master_files/icons/obj/clothing/under/skirts_dresses.dmi b/modular_nova/master_files/icons/obj/clothing/under/skirts_dresses.dmi
diff --git a/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm
@@ -776,7 +776,7 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/
 
 /datum/loadout_item/under/formal/red_gown
 	name = "Red Evening Gown"
-	item_path = /obj/item/clothing/under/dress/redeveninggown
+	item_path = /obj/item/clothing/under/dress/eveninggown
 
 /datum/loadout_item/under/formal/sailor
 	name = "Sailor Suit"

diff --git a/tools/UpdatePaths/Scripts/65236_clothingunderrepath.txt b/tools/UpdatePaths/Scripts/65236_clothingunderrepath.txt
@@ -34,7 +34,7 @@
 /obj/item/clothing/under/blacktango : /obj/item/clothing/under/dress/blacktango
 /obj/item/clothing/under/stripeddress : /obj/item/clothing/under/dress/striped
 /obj/item/clothing/under/sailordress : /obj/item/clothing/under/dress/sailor
-/obj/item/clothing/under/redeveninggown : /obj/item/clothing/under/dress/redeveninggown
+/obj/item/clothing/under/redeveninggown : /obj/item/clothing/under/dress/eveninggown
 /obj/item/clothing/under/plaid_skirt : /obj/item/clothing/under/dress/skirt/plaid
 /obj/item/clothing/under/plaid_skirt/blue : /obj/item/clothing/under/dress/skirt/plaid/blue
 /obj/item/clothing/under/plaid_skirt/purple : /obj/item/clothing/under/dress/skirt/plaid/purple