From da91246645de3f81cde7e47ae13b25743cc0a57b Mon Sep 17 00:00:00 2001 From: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com> Date: Sat, 20 Aug 2022 22:39:17 +0200 Subject: [PATCH] red dominian tribunal beret (#14622) * beret * gold color match cape * changelog * Update code/modules/client/preference_setup/loadout/loadout_religion.dm Co-authored-by: DreamySkrell <> Co-authored-by: Matt Atlas --- .../loadout/loadout_religion.dm | 1 + code/modules/clothing/factions/dominia.dm | 11 ++++- html/changelogs/DreamySkrell.yml | 41 ++++++++++++++++++ icons/clothing/head/dominia_beret_priest.dmi | Bin 1201 -> 2051 bytes 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/DreamySkrell.yml diff --git a/code/modules/client/preference_setup/loadout/loadout_religion.dm b/code/modules/client/preference_setup/loadout/loadout_religion.dm index afc52b12894..d59b701f2c6 100644 --- a/code/modules/client/preference_setup/loadout/loadout_religion.dm +++ b/code/modules/client/preference_setup/loadout/loadout_religion.dm @@ -77,6 +77,7 @@ var/list/beret = list() beret["tribunal initiate's beret"] = /obj/item/clothing/head/beret/dominia beret["tribunalist's beret"] = /obj/item/clothing/head/beret/dominia/priest + beret["tribunalist's beret, red"] = /obj/item/clothing/head/beret/dominia/priest/red gear_tweaks += new /datum/gear_tweak/path(beret) /datum/gear/religion/dominia/cape diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index 64993660bcf..6ce926f4754 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -417,13 +417,22 @@ /obj/item/clothing/head/beret/dominia/priest name = "tribunalist's beret" - desc = " black beret bearing the sigil of the Moroz Holy Tribunal on its front. Worn by full members of the Tribunal's clergy." + desc = "A black beret bearing the sigil of the Moroz Holy Tribunal on its front. Worn by full members of the Tribunal's clergy." desc_fluff = "With their black and gold clothing designed to resemble that of their noble counterparts, the full clergy of the Moroz Holy Tribunal \ are a sight to behold both inside and outside of the Empire of Dominia. This beret features an emblem luxuriously and painstakingly crafted out of real gold." icon = 'icons/clothing/head/dominia_beret_priest.dmi' icon_state = "dominia_beret_priest" item_state = "dominia_beret_priest" +/obj/item/clothing/head/beret/dominia/priest/red + name = "tribunalist's beret" + desc = "A red beret bearing the sigil of the Moroz Holy Tribunal on its front. Worn by full members of the Tribunal's clergy." + desc_fluff = "With their red and gold clothing designed to resemble that of their noble counterparts, the full clergy of the Moroz Holy Tribunal \ + are a sight to behold both inside and outside of the Empire of Dominia. This beret features an emblem luxuriously and painstakingly crafted out of real gold." + icon = 'icons/clothing/head/dominia_beret_priest.dmi' + icon_state = "dominia_beret_priest_red" + item_state = "dominia_beret_priest_red" + /obj/item/clothing/head/beret/dominia/consular name = "tribunalist's beret" desc = "A beret in gold and red worn by members of the clergy affiliated with His Majesty's Diplomatic Service." diff --git a/html/changelogs/DreamySkrell.yml b/html/changelogs/DreamySkrell.yml new file mode 100644 index 00000000000..a9e09d24f6c --- /dev/null +++ b/html/changelogs/DreamySkrell.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: DreamySkrell + +# 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: "Adds red tribunalist beret." diff --git a/icons/clothing/head/dominia_beret_priest.dmi b/icons/clothing/head/dominia_beret_priest.dmi index 6f855393677b547446db86c4de9ea4979d1884da..bf3dbcea1a2a5ef883d2e81830c62861b68f9412 100644 GIT binary patch literal 2051 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 P00000NkvXXu0mjf_j(=?