diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 511aa063c2f..f418d79fb0a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -625,3 +625,8 @@ necklace_uncolored["large golden pendant"] = /obj/item/clothing/accessory/necklace/colorable/twopiece/pendant/fat necklace_uncolored["large silver pendant"] = /obj/item/clothing/accessory/necklace/colorable/twopiece/pendant/silver/fat gear_tweaks += new /datum/gear_tweak/path(necklace_uncolored) + +/datum/gear/accessory/visegradi_sweater + display_name = "visegradi patterned sweater" + path = /obj/item/clothing/accessory/sweater/visegradi + flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 3fb67912c48..cf2c9b63e6c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -415,6 +415,11 @@ path = /obj/item/clothing/head/hairnet flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION +/datum/gear/head/nyakas + display_name = "visegradi nyakas" + path = /obj/item/clothing/head/ushanka/nyakas + flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /* Block Hair Adjustment */ diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index d41c16444f3..a96e12aea19 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -468,4 +468,9 @@ datum/gear/suit/colorvest overalls["overall skirt, high back"] = /obj/item/clothing/accessory/overalls/skirt/high_back overalls["overall skirt, x-shaped back"] = /obj/item/clothing/accessory/overalls/skirt/x_shaped_back - gear_tweaks += new /datum/gear_tweak/path(overalls) \ No newline at end of file + gear_tweaks += new /datum/gear_tweak/path(overalls) + +/datum/gear/suit/ponczo + display_name = "visegradi ponczo" + path = /obj/item/clothing/suit/storage/hooded/wintercoat/colorable/ponczo + flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION \ No newline at end of file diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 2cdfe9c95f7..ee70df94f5b 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -135,14 +135,24 @@ desc = "Perfect for winter in Siberia, da?" icon_state = "greyushanka" +/obj/item/clothing/head/ushanka/nyakas + name = "visegradi nyakas" + desc = "A type of flap hat that is extremely popular on Visegrad. It is designed to keep one's head and neck dry, and the flap can be pinned to the sides of the hat when not needed." + contained_sprite = TRUE + icon = 'icons/obj/item/clothing/head/nyakas.dmi' + icon_state = "nyakas" + item_state = "nyakas" + /obj/item/clothing/head/ushanka/attack_self(mob/user as mob) src.earsup = !src.earsup if(src.earsup) icon_state = "[icon_state]_up" - to_chat(user, "You raise the ear flaps on the ushanka.") + item_state = "[item_state]_up" + to_chat(user, "You raise the ear flaps on the hat.") else src.icon_state = initial(icon_state) - to_chat(user, "You lower the ear flaps on the ushanka.") + item_state = initial(item_state) + to_chat(user, "You lower the ear flaps on the hat.") update_clothing_icon() /* diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm index 2160a52c0f5..49d3d2bc754 100644 --- a/code/modules/clothing/suits/hoodies.dm +++ b/code/modules/clothing/suits/hoodies.dm @@ -357,3 +357,13 @@ /obj/item/clothing/head/winterhood/colorable/update_icon(mob/user) . = ..() +/obj/item/clothing/suit/storage/hooded/wintercoat/colorable/ponczo + name = "visegradi ponczo" + desc = "A type of shelter-half or zeltbahn, the ponczo is a ubiquitous article of clothing on the planet of Visegrad. Resembling a long smock or raincoat, the ponczo is as waterproof as it is rugged. While true shelter-halves can be made into a tent, most ponczos are no longer capable of this." + icon_state = "ponczo" + item_state = "ponczo" + hoodtype = /obj/item/clothing/head/winterhood/colorable/ponczo + +/obj/item/clothing/head/winterhood/colorable/ponczo + name = "visegradi ponczo hood" + desc = "A hood for a Visegradi ponczo." \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/shirts.dm b/code/modules/clothing/under/accessories/shirts.dm index d634f2ab8f3..296a2ae91d1 100644 --- a/code/modules/clothing/under/accessories/shirts.dm +++ b/code/modules/clothing/under/accessories/shirts.dm @@ -96,6 +96,13 @@ icon_state = "argyle_sweater_vest" item_state = "argyle_sweater_vest" +/obj/item/clothing/accessory/sweater/visegradi + name = "visegradi patterned sweater" + desc = "A thick wool sweater, with a meandering pattern. These are typical of the planet Visegrad, where the wool is valued in both keeping the wearer dry and warm on the notoriously wet planet." + icon = 'icons/obj/item/clothing/accessory/visegradi_sweater.dmi' + icon_state = "visegradi_sweater" + item_state = "visegradi_sweater" + // // Shirts // diff --git a/html/changelogs/dansemacabre-nyakas.yml b/html/changelogs/dansemacabre-nyakas.yml new file mode 100644 index 00000000000..6ecdc28877a --- /dev/null +++ b/html/changelogs/dansemacabre-nyakas.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: TheDanseMacabre + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added three Visegradi clothing items to the loadout. The nyakas, the ponczo, and the patterned sweater. Credits to Wezzy for nyakas and ponczo sprites." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 000142dbc58..a8c5e2296da 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index fea6f418fa1..8cfe418bbdd 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/hoodies.dmi b/icons/obj/clothing/hoodies.dmi index 3b358b0c81d..69af6279b0c 100644 Binary files a/icons/obj/clothing/hoodies.dmi and b/icons/obj/clothing/hoodies.dmi differ diff --git a/icons/obj/item/clothing/accessory/visegradi_sweater.dmi b/icons/obj/item/clothing/accessory/visegradi_sweater.dmi new file mode 100644 index 00000000000..cc8a4c58bcb Binary files /dev/null and b/icons/obj/item/clothing/accessory/visegradi_sweater.dmi differ diff --git a/icons/obj/item/clothing/head/nyakas.dmi b/icons/obj/item/clothing/head/nyakas.dmi new file mode 100644 index 00000000000..9f4de4abac4 Binary files /dev/null and b/icons/obj/item/clothing/head/nyakas.dmi differ diff --git a/icons/obj/item/clothing/suit/storage/toggle/ponczo.dmi b/icons/obj/item/clothing/suit/storage/toggle/ponczo.dmi new file mode 100644 index 00000000000..9a67b640161 Binary files /dev/null and b/icons/obj/item/clothing/suit/storage/toggle/ponczo.dmi differ