Manual mirror of 543, порты с крыс #1632

Manual mirror of 543, порты с крыс
Fluffy-Frontier · Jan 22, 2024 · 17d9562 · 17d9562
2 parents 6a910f7 + 0b8740e
commit 17d9562
Show file tree

Hide file tree

Showing 8 changed files with 244 additions and 146 deletions.
diff --git a/modular_nova/master_files/icons/mob/clothing/suit.dmi b/modular_nova/master_files/icons/mob/clothing/suit.dmi
diff --git a/modular_nova/master_files/icons/obj/clothing/suits.dmi b/modular_nova/master_files/icons/obj/clothing/suits.dmi
diff --git a/modular_nova/modules/GAGS/greyscale_configs.dm b/modular_nova/modules/GAGS/greyscale_configs.dm
@@ -796,6 +796,17 @@
 	name = "Varsity Jacket (Worn)"
 	json_config = 'modular_nova/modules/GAGS/json_configs/suits/varsity/varsity_worn.json'
 
+//CROPTOP SWEATER
+
+/datum/greyscale_config/croptop
+	name = "Croptop Sweater"
+	icon_file = 'modular_nova/master_files/icons/mob/clothing/suit.dmi'
+	json_config = 'modular_nova/modules/GAGS/json_configs/suits/croptop/croptop.json'
+
+/datum/greyscale_config/croptop/worn
+	name = "Croptop Sweater (Worn)"
+	json_config = 'modular_nova/modules/GAGS/json_configs/suits/croptop/croptop_worn.json'
+
 // TAILORED JACKET
 
 /datum/greyscale_config/tailored_jacket

diff --git a/modular_nova/modules/GAGS/json_configs/suits/croptop/croptop.json b/modular_nova/modules/GAGS/json_configs/suits/croptop/croptop.json
@@ -0,0 +1,10 @@
+{
+	"croptop": [
+		{
+			"type": "icon_state",
+			"icon_state": "croptop",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
diff --git a/modular_nova/modules/GAGS/json_configs/suits/croptop/croptop_worn.json b/modular_nova/modules/GAGS/json_configs/suits/croptop/croptop_worn.json
@@ -0,0 +1,10 @@
+{
+	"croptop": [
+		{
+			"type": "icon_state",
+			"icon_state": "croptop",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
diff --git a/modular_nova/modules/customization/modules/clothing/suits/coats.dm b/modular_nova/modules/customization/modules/clothing/suits/coats.dm
@@ -147,15 +147,24 @@
 	blood_overlay_type = "coat"
 
 /obj/item/clothing/suit/croptop
-	name = "black crop top turtleneck"
-	desc = "A comfy looking turtleneck that exposes your midriff, fashionable but makes the point of a sweater moot."
-	icon_state = "croptop_black"
+	name = "crop top turtleneck"
+	desc = "A comfy looking turtleneck that exposes your midriff, fashionable but makes the point of a sweater moot. Now with Pycroft polychromatic tech!"
+	icon_state = "croptop"
+	greyscale_config = /datum/greyscale_config/croptop
+	greyscale_config_worn = /datum/greyscale_config/croptop/worn
+	greyscale_colors = "#1d1b1b"
 	body_parts_covered = CHEST|ARMS
 	cold_protection = CHEST|ARMS
+	flags_1 = IS_PLAYER_COLORABLE_1
 	icon = 'modular_nova/master_files/icons/obj/clothing/suits.dmi'
 	worn_icon = 'modular_nova/master_files/icons/mob/clothing/suit.dmi'
 	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
 
+/obj/item/clothing/suit/croptop/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/gags_recolorable)
+	update_icon(UPDATE_OVERLAYS)
+
 /obj/item/clothing/suit/varsity
 	name = "varsity jacket"
 	desc = "A simple varsity jacket with no obvious sources."

diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_suit.dm
@@ -346,7 +346,7 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su
 	item_path = /obj/item/clothing/suit/toggle/trackjacket
 
 /datum/loadout_item/suit/croptop
-	name = "Black Crop Top Turtleneck"
+	name = "Crop Top Turtleneck"
 	item_path = /obj/item/clothing/suit/croptop
 
 /*