diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm index 658c1acd35e..d4154408fa3 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm @@ -689,6 +689,15 @@ name = "Waistcoat (Worn)" icon_file = 'icons/mob/clothing/accessories.dmi' +/datum/greyscale_config/sweatervest + name = "Sweater Vest" + icon_file = 'icons/obj/clothing/accessories.dmi' + json_config = 'code/datums/greyscale/json_configs/sweatervest.json' + +/datum/greyscale_config/sweatervest/worn + name = "Sweater Vest (Worn)" + icon_file = 'icons/mob/clothing/accessories.dmi' + // Digi Stuff /datum/greyscale_config/digitigrade diff --git a/code/datums/greyscale/json_configs/sweatervest.json b/code/datums/greyscale/json_configs/sweatervest.json new file mode 100644 index 00000000000..14dc3789cb0 --- /dev/null +++ b/code/datums/greyscale/json_configs/sweatervest.json @@ -0,0 +1,10 @@ +{ + "sweatervest": [ + { + "type": "icon_state", + "icon_state": "sweatervest", + "blend_mode": "overlay", + "color_ids": [1] + } + ] +} diff --git a/code/modules/clothing/under/accessories/vests.dm b/code/modules/clothing/under/accessories/vests.dm index 969279d3f29..bb30b18840d 100644 --- a/code/modules/clothing/under/accessories/vests.dm +++ b/code/modules/clothing/under/accessories/vests.dm @@ -15,6 +15,22 @@ greyscale_colors = "#414344" flags_1 = IS_PLAYER_COLORABLE_1 +/obj/item/clothing/accessory/sweatervest + name = "sweater vest" + desc = "When you're exceptionally you." + icon = 'icons/map_icons/clothing/accessory.dmi' + icon_state = "/obj/item/clothing/accessory/sweatervest" + post_init_icon_state = "sweatervest" + inhand_icon_state = "svest" + lefthand_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi' + minimize_when_attached = FALSE + attachment_slot = NONE + greyscale_config = /datum/greyscale_config/sweatervest + greyscale_config_worn = /datum/greyscale_config/sweatervest/worn + greyscale_colors = "#A52F29" + flags_1 = IS_PLAYER_COLORABLE_1 + /obj/item/clothing/accessory/vest_sheriff name = "sheriff vest" desc = "Now you just have to pick your favourite deputy." diff --git a/code/modules/loadout/categories/accessories.dm b/code/modules/loadout/categories/accessories.dm index 7f6a5658aa9..2088e7bcfd5 100644 --- a/code/modules/loadout/categories/accessories.dm +++ b/code/modules/loadout/categories/accessories.dm @@ -71,6 +71,10 @@ name = "Waistcoat" item_path = /obj/item/clothing/accessory/waistcoat +/datum/loadout_item/accessory/sweatervest + name = "Sweater Vest" + item_path = /obj/item/clothing/accessory/sweatervest + /datum/loadout_item/accessory/pocket_protector name = "Pocket Protector" item_path = /obj/item/clothing/accessory/pocketprotector diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 18a673a61c2..a3f84af6b40 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -50,6 +50,7 @@ "products" = list( /obj/item/clothing/accessory/pride = 15, /obj/item/clothing/accessory/waistcoat = 4, + /obj/item/clothing/accessory/sweatervest = 4, /obj/item/clothing/suit/toggle/suspenders = 4, /obj/item/clothing/neck/tie/horrible = 3, /obj/item/clothing/neck/robe_cape = 3, diff --git a/icons/map_icons/clothing/accessory.dmi b/icons/map_icons/clothing/accessory.dmi index 4c4244f716a..e4199021545 100644 Binary files a/icons/map_icons/clothing/accessory.dmi and b/icons/map_icons/clothing/accessory.dmi differ diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi index a04df45555a..25ba8311d4c 100644 Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ diff --git a/icons/mob/inhands/clothing/suits_lefthand.dmi b/icons/mob/inhands/clothing/suits_lefthand.dmi index 25ca513e70b..62c6b1f1df4 100644 Binary files a/icons/mob/inhands/clothing/suits_lefthand.dmi and b/icons/mob/inhands/clothing/suits_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/suits_righthand.dmi b/icons/mob/inhands/clothing/suits_righthand.dmi index 3061bd969e9..c840636b9f2 100644 Binary files a/icons/mob/inhands/clothing/suits_righthand.dmi and b/icons/mob/inhands/clothing/suits_righthand.dmi differ diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi index 578aebd0c65..0a6e4b12731 100644 Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ