diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index f1bd3d18120..e59e7e86da5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -317,3 +317,8 @@ gadpathur["gadpathurian sidecap"] = /obj/item/clothing/head/gadpathur gadpathur["gadpathurian beret"] = /obj/item/clothing/head/beret/gadpathur gear_tweaks += new/datum/gear_tweak/path(gadpathur) + +/datum/gear/head/dominia + display_name = "fisanduhian ushanka" + path = /obj/item/clothing/head/ushanka/dominia + flags = GEAR_HAS_DESC_SELECTION diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index 91134d1b919..43dfd07d200 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -377,3 +377,8 @@ item_state = "dominia_amulet" icon_state = "dominia_amulet" contained_sprite = TRUE + +/obj/item/clothing/head/ushanka/dominia + name = "fisanduhian ushanka" + desc = "A warm fur hat with ear flaps that can be raised and tied to be out of the way. This one has a large Fisanduhian flag on the front." + icon_state = "fishushanka" diff --git a/html/changelogs/dansemacabre-master.yml b/html/changelogs/dansemacabre-master.yml new file mode 100644 index 00000000000..d98097f3ab6 --- /dev/null +++ b/html/changelogs/dansemacabre-master.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: DanseMacabre + +# 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 a Fisanduhian ushanka. Great for showing off how much you hate Dominia!" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 9c6457b924f..57dc32e337f 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 edafc81d89f..3acad9311e0 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ