[SEMI-MODULAR] GAGS-based Camo Shorts (#702) (#1782)

* GAGS-based camo pants, for digi & normal legs. * Refactors nonmodular edits out of pants & shorts Also renames camo_shorts to camo_pants to stay in-line with its sprite name & appearance. * Apply suggestions from code review --------- Co-authored-by: CliffracerX <[email protected]> Co-authored-by: Bloop <[email protected]>
Fluffy-Frontier · Feb 6, 2024 · 2aea684 · 2aea684
1 parent 89e26d5
commit 2aea684
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 4 deletions.
diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm
@@ -14,7 +14,6 @@
 	icon_state = "slacks"
 	greyscale_config = /datum/greyscale_config/slacks
 	greyscale_config_worn = /datum/greyscale_config/slacks/worn
-	greyscale_config_worn_digi = /datum/greyscale_config/slacks/worn/digi //NOVA EDIT ADDITION - DigiGreyscale
 	greyscale_colors = "#575757#3E3E3E#75634F"
 	flags_1 = IS_PLAYER_COLORABLE_1
 
@@ -24,7 +23,6 @@
 	icon_state = "jeans"
 	greyscale_config = /datum/greyscale_config/jeans
 	greyscale_config_worn = /datum/greyscale_config/jeans/worn
-	greyscale_config_worn_digi = /datum/greyscale_config/jeans/worn/digi //NOVA EDIT ADDITION - DigiGreyscale
 	greyscale_colors = "#787878#723E0E#4D7EAC"
 	flags_1 = IS_PLAYER_COLORABLE_1
 

diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm
@@ -4,7 +4,6 @@
 	icon_state = "shorts"
 	greyscale_config = /datum/greyscale_config/shorts
 	greyscale_config_worn = /datum/greyscale_config/shorts/worn
-	greyscale_config_worn_digi = /datum/greyscale_config/shorts/worn/digi //NOVA EDIT ADDITION - DigiGreyscale
 	greyscale_colors = "#575757#3E3E3E#75634F"
 	gender = PLURAL
 	body_parts_covered = GROIN
@@ -20,7 +19,6 @@
 	icon_state = "jeanshorts"
 	greyscale_config = /datum/greyscale_config/jeanshorts
 	greyscale_config_worn = /datum/greyscale_config/jeanshorts/worn
-	greyscale_config_worn_digi = /datum/greyscale_config/jeanshorts/worn/digi //NOVA EDIT ADDITION - DigiGreyscale
 	greyscale_colors = "#787878#723E0E#4D7EAC"
 
 /obj/item/clothing/under/shorts/red

diff --git a/modular_nova/master_files/code/modules/clothing/under/shorts_pants.dm b/modular_nova/master_files/code/modules/clothing/under/shorts_pants.dm
@@ -106,3 +106,30 @@
 	greyscale_colors = "#8b2c2c#222227#222227#fbc056"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	flags_1 = IS_PLAYER_COLORABLE_1
+
+/*
+*	Shorts that were previously using nonmodular edits to add their greyscale data, pulled from code/modules/clothing/under/shorts.dm
+*/
+
+/obj/item/clothing/under/shorts
+	greyscale_config_worn_digi = /datum/greyscale_config/shorts/worn/digi
+
+/obj/item/clothing/under/shorts/jeanshorts
+	greyscale_config_worn_digi = /datum/greyscale_config/jeanshorts/worn/digi
+
+/*
+*	Pants that were previously using nonmodular edits to add their greyscale data, pulled from code/modules/clothing/under/pants.dm
+*/
+
+/obj/item/clothing/under/pants/slacks
+	greyscale_config_worn_digi = /datum/greyscale_config/slacks/worn/digi
+
+/obj/item/clothing/under/pants/jeans
+	greyscale_config_worn_digi = /datum/greyscale_config/jeans/worn/digi
+
+/obj/item/clothing/under/pants/camo
+	greyscale_config = /datum/greyscale_config/camo_pants
+	greyscale_config_worn = /datum/greyscale_config/camo_pants/worn
+	greyscale_config_worn_digi = /datum/greyscale_config/camo_pants/worn/digi
+	greyscale_colors = "#69704C#6E5B4C#343741"
+	flags_1 = IS_PLAYER_COLORABLE_1
diff --git a/modular_nova/master_files/icons/mob/clothing/under/shorts_pants_shirts.dmi b/modular_nova/master_files/icons/mob/clothing/under/shorts_pants_shirts.dmi
diff --git a/modular_nova/master_files/icons/mob/clothing/under/shorts_pants_shirts_digi.dmi b/modular_nova/master_files/icons/mob/clothing/under/shorts_pants_shirts_digi.dmi
diff --git a/modular_nova/master_files/icons/obj/clothing/under/shorts_pants_shirts.dmi b/modular_nova/master_files/icons/obj/clothing/under/shorts_pants_shirts.dmi
diff --git a/modular_nova/modules/GAGS/greyscale_configs.dm b/modular_nova/modules/GAGS/greyscale_configs.dm
@@ -965,6 +965,15 @@
 	name = "Yoga Pants (Worn, Digi)"
 	icon_file = SHORTS_PANTS_SHIRTS_DIGIFILE
 
+/datum/greyscale_config/camo_pants
+	name = "Camo Pants"
+	icon_file = 'modular_nova/master_files/icons/obj/clothing/under/shorts_pants_shirts.dmi'
+	json_config = 'modular_nova/modules/GAGS/json_configs/pants_shorts_skirts_dresses/camo_pants.json'
+/datum/greyscale_config/camo_pants/worn
+	name = "Camo Pants (Worn)"
+	icon_file = 'modular_nova/master_files/icons/mob/clothing/under/shorts_pants_shirts.dmi'
+/datum/greyscale_config/camo_pants/worn/digi
+
 // DRESSES / SKIRTS
 
 /datum/greyscale_config/plaidskirt/worn/digi

diff --git a/modular_nova/modules/GAGS/json_configs/pants_shorts_skirts_dresses/camo_pants.json b/modular_nova/modules/GAGS/json_configs/pants_shorts_skirts_dresses/camo_pants.json
@@ -0,0 +1,27 @@
+{
+	"camopants": [
+		{
+			"type": "icon_state",
+			"icon_state": "camopants_camo1",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "camopants_camo2",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "camopants_camo3",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "camopants_buckle",
+			"blend_mode": "overlay"
+		}
+	]
+}