She can't keep getting away with it | Adds a cropped jacket (#1877)

* byeah * hot girl stuff * oops * 4th element made it not so good * makes the def colours slightly better * tweaks the worn slightly * Update modular_nova/modules/customization/modules/clothing/suits/coats.dm * makes it not fit on the neck --------- Co-authored-by: Paxilmaniac <[email protected]> Co-authored-by: GoldenAlpharex <[email protected]>
Fluffy-Frontier · Feb 9, 2024 · 7a0e357 · 7a0e357
1 parent 7e344ff
commit 7a0e357
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 0 deletions.
diff --git a/modular_nova/modules/GAGS/greyscale_configs.dm b/modular_nova/modules/GAGS/greyscale_configs.dm
@@ -831,6 +831,17 @@
 	name = "Tailored Short Jacket (Worn)"
 	json_config = 'modular_nova/modules/GAGS/json_configs/suits/tailored_short_jacket/tailored_short_jacket_worn.json'
 
+// CROPPED JACKET
+
+/datum/greyscale_config/crop_jacket
+	name = "Tailored Jacket"
+	icon_file = 'modular_nova/modules/GAGS/icons/crop_jacket.dmi'
+	json_config = 'modular_nova/modules/GAGS/json_configs/crop_jacket/crop_jacket.json'
+
+/datum/greyscale_config/crop_jacket/worn
+	name = "Tailored Jacket (Worn)"
+	icon_file = 'modular_nova/modules/GAGS/icons/crop_jacket_worn.dmi'
+
 
 /*
 *	UNDER

diff --git a/modular_nova/modules/GAGS/icons/crop_jacket.dmi b/modular_nova/modules/GAGS/icons/crop_jacket.dmi
diff --git a/modular_nova/modules/GAGS/icons/crop_jacket_worn.dmi b/modular_nova/modules/GAGS/icons/crop_jacket_worn.dmi
diff --git a/modular_nova/modules/GAGS/json_configs/crop_jacket/crop_jacket.json b/modular_nova/modules/GAGS/json_configs/crop_jacket/crop_jacket.json
@@ -0,0 +1,42 @@
+{
+	"crop_jacket": [
+		{
+			"type": "icon_state",
+			"icon_state": "crop_jacket",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "crop_jacket_collar",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "crop_jacket_sleeve",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		}
+	],
+	"crop_jacket_t": [
+		{
+			"type": "icon_state",
+			"icon_state": "crop_jacket",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "crop_jacket_collar",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "crop_jacket_sleeve_short",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		}
+	]
+}
diff --git a/modular_nova/modules/customization/modules/clothing/suits/coats.dm b/modular_nova/modules/customization/modules/clothing/suits/coats.dm
@@ -1,3 +1,15 @@
+#define STUFF_WINTER_COATS_HOLD list( \
+	/obj/item/flashlight, \
+	/obj/item/lighter, \
+	/obj/item/modular_computer/pda, \
+	/obj/item/radio, \
+	/obj/item/storage/bag/books, \
+	/obj/item/storage/fancy/cigarettes, \
+	/obj/item/tank/internals/emergency_oxygen, \
+	/obj/item/tank/internals/plasmaman, \
+	/obj/item/toy, \
+)
+
 /obj/item/clothing/suit/hooded/wintercoat/medical/paramedic
 	allowed = list(
 		/obj/item/analyzer,
@@ -172,6 +184,10 @@
 	flags_1 = IS_PLAYER_COLORABLE_1
 	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
 
+/obj/item/clothing/suit/varsity/Initialize(mapload)
+	. = ..()
+	allowed += STUFF_WINTER_COATS_HOLD
+
 /obj/item/clothing/suit/hooded/leather
 	name = "hooded leather coat"
 	desc = "A simple leather coat with a hoodie underneath it, not really hooded is it?"
@@ -203,6 +219,7 @@
 
 /obj/item/clothing/suit/tailored_jacket/Initialize(mapload)
 	. = ..()
+	allowed += STUFF_WINTER_COATS_HOLD
 	AddComponent(/datum/component/toggle_icon, "sleeves")
 
 /obj/item/clothing/suit/tailored_jacket/short
@@ -224,3 +241,26 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
 	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+
+/obj/item/clothing/suit/warm_coat/Initialize(mapload)
+	. = ..()
+	allowed += STUFF_WINTER_COATS_HOLD
+
+/obj/item/clothing/suit/crop_jacket
+	name = "crop-top jacket"
+	desc = "A jacket that, some time long past, probably made quite the effective outdoors wear. Now, \
+		some barbarian has cut the entire bottom half out."
+	icon_state = "crop_jacket"
+	greyscale_config = /datum/greyscale_config/crop_jacket
+	greyscale_config_worn = /datum/greyscale_config/crop_jacket/worn
+	greyscale_colors = "#ebebeb#a52f29#292929"
+	body_parts_covered = CHEST|ARMS
+	flags_1 = IS_PLAYER_COLORABLE_1
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+
+/obj/item/clothing/suit/crop_jacket/Initialize(mapload)
+	. = ..()
+	allowed += STUFF_WINTER_COATS_HOLD
+	AddComponent(/datum/component/toggle_icon, "sleeves")
+
+#undef STUFF_WINTER_COATS_HOLD
diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_suit.dm
@@ -737,6 +737,10 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su
 	name = "Colourable Heart Sweater"
 	item_path = /obj/item/clothing/suit/heart_sweater
 
+/datum/loadout_item/suit/crop_jacket
+	name = "Colourable Crop-Top Jacket"
+	item_path = /obj/item/clothing/suit/crop_jacket
+
 /*
 *	CHAPLAIN
 */

diff --git a/modular_nova/modules/modular_vending/code/clothesmate.dm b/modular_nova/modules/modular_vending/code/clothesmate.dm
@@ -128,6 +128,7 @@
 				/obj/item/clothing/suit/warm_coat = 5,
 				/obj/item/clothing/suit/warm_sweater = 5,
 				/obj/item/clothing/suit/heart_sweater = 5,
+				/obj/item/clothing/suit/crop_jacket = 5,
 			),
 		),