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 8eddea6a931..83eb1fb6351 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm @@ -89,6 +89,15 @@ name = "Santa Hat (Worn)" icon_file = 'icons/mob/clothing/head/costume.dmi' +/datum/greyscale_config/ushanka + name = "Ushanka" + icon_file = 'icons/obj/clothing/head/costume.dmi' + json_config = 'code/datums/greyscale/json_configs/ushanka.json' + +/datum/greyscale_config/ushanka/worn + name = "Ushanka (Worn)" + icon_file = 'icons/mob/clothing/head/costume.dmi' + // // MASKS // diff --git a/code/datums/greyscale/json_configs/ushanka.json b/code/datums/greyscale/json_configs/ushanka.json new file mode 100644 index 00000000000..3099b13278b --- /dev/null +++ b/code/datums/greyscale/json_configs/ushanka.json @@ -0,0 +1,30 @@ +{ + "ushanka_gagup": [ + { + "type": "icon_state", + "icon_state": "ushanka_fur", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "ushanka_base_up", + "blend_mode": "overlay", + "color_ids": [2] + } + ], + "ushanka_gagdown": [ + { + "type": "icon_state", + "icon_state": "ushanka_fur", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "ushanka_base", + "blend_mode": "overlay", + "color_ids": [2] + } + ] +} diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm index 048e7c2285b..b206383ffa0 100644 --- a/code/modules/clothing/head/hat.dm +++ b/code/modules/clothing/head/hat.dm @@ -327,7 +327,13 @@ /obj/item/clothing/head/costume/ushanka name = "ushanka" desc = "Perfect for winter in Siberia, da?" - icon_state = "ushankadown" + icon = 'icons/map_icons/clothing/head/_head.dmi' + icon_state = "/obj/item/clothing/head/costume/ushanka" + post_init_icon_state = "ushanka_gagdown" + greyscale_config = /datum/greyscale_config/ushanka + greyscale_config_worn = /datum/greyscale_config/ushanka/worn + greyscale_colors = "#C7B08B#5A4E44" + flags_1 = IS_PLAYER_COLORABLE_1 inhand_icon_state = null flags_inv = HIDEEARS|HIDEHAIR cold_protection = HEAD @@ -335,9 +341,9 @@ dog_fashion = /datum/dog_fashion/head/ushanka var/earflaps = TRUE ///Sprite visible when the ushanka flaps are folded up. - var/upsprite = "ushankaup" + var/upsprite = "ushanka_gagup" ///Sprite visible when the ushanka flaps are folded down. - var/downsprite = "ushankadown" + var/downsprite = "ushanka_gagdown" /obj/item/clothing/head/costume/ushanka/attack_self(mob/user) if(earflaps) @@ -353,9 +359,17 @@ /obj/item/clothing/head/costume/ushanka/polar name = "bear hunter's ushanka" desc = "Handcrafted in Siberia from real polar bears." - icon_state = "ushankadown_polar" - upsprite = "ushankaup_polar" - downsprite = "ushankadown_polar" + icon_state = "/obj/item/clothing/head/costume/ushanka/polar" + greyscale_colors = "#FCFCFD#CCCED1" + flags_1 = null + +/obj/item/clothing/head/costume/ushanka/sec + name = "security ushanka" + icon_state = "/obj/item/clothing/head/costume/ushanka/sec" + desc = "A warm and comfortable ushanka, dyed with 'all natural flavors' according to the tag." + greyscale_colors = "#C7B08B#A52F29" + armor_type = /datum/armor/head_helmet + flags_1 = null /obj/item/clothing/head/costume/nightcap abstract_type = /obj/item/clothing/head/costume/nightcap diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index e00c74523bf..cbfb1113fb9 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -46,6 +46,7 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE) products = list( /obj/item/clothing/head/beret/sec = 3, /obj/item/clothing/head/soft/sec = 3, + /obj/item/clothing/head/costume/ushanka/sec = 3, /obj/item/clothing/mask/bandana/striped/security = 3, /obj/item/clothing/under/rank/security/officer = 3, /obj/item/clothing/under/rank/security/officer/skirt = 3, diff --git a/icons/map_icons/clothing/head/_head.dmi b/icons/map_icons/clothing/head/_head.dmi index b05d7b9b050..d0a44a1a796 100644 Binary files a/icons/map_icons/clothing/head/_head.dmi and b/icons/map_icons/clothing/head/_head.dmi differ diff --git a/icons/mob/clothing/head/costume.dmi b/icons/mob/clothing/head/costume.dmi index f3f29788961..142319bbf81 100644 Binary files a/icons/mob/clothing/head/costume.dmi and b/icons/mob/clothing/head/costume.dmi differ diff --git a/icons/obj/clothing/head/costume.dmi b/icons/obj/clothing/head/costume.dmi index 11c107f2cde..e1a6c39a91d 100644 Binary files a/icons/obj/clothing/head/costume.dmi and b/icons/obj/clothing/head/costume.dmi differ