diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index c596b487b4f..f9b44548f2b 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -1289,19 +1289,34 @@ /obj/item/flag/kazhkz name = "\improper House Kazhkz standard" - desc = "A red-and-orange standard with a circular chevron which represents House Kazhkz, one of the great houses of the \ - Empire of Dominia. They are known for their conservative nature and aversion to augmentation." + desc = "A red-and-orange standard with a circular chevron which represents House Kazhkz-Han'san, one of the great houses of the \ + Empire of Dominia. They are known for their more modernist nature and aversion to augmentation." flag_path = "kazhkz" flag_structure = /obj/structure/sign/flag/kazhkz /obj/structure/sign/flag/kazhkz name = "\improper House Kazhkz standard" - desc = "A red-and-orange standard with a circular chevron which represents House Kazhkz, one of the great houses of the \ - Empire of Dominia. They are known for their conservative nature and aversion to augmentation." + desc = "A red-and-orange standard with a circular chevron which represents House Kazhkz-Han'san, one of the great houses of the \ + Empire of Dominia. They are known for their more modernist nature and aversion to augmentation." flag_path = "kazhkz" icon_state = "kazkhz" flag_item = /obj/item/flag/kazhkz +/obj/item/flag/hansan + name = "\improper House Han'san standard" + desc = "A green standard with a circular chevron which represents the Clan Han'san, currently sidelined in the \ + great House Kazhkz-Han'san. They are known for their conservative and militant nature." + flag_path = "hansan" + flag_structure = /obj/structure/sign/flag/hansan + +/obj/structure/sign/flag/hansan + name = "\improper House Han'san standard" + desc = "A green standard with a circular chevron which represents the Clan Han'san, currently sidelined in the \ + great House Kazhkz-Han'san. They are known for their conservative and militant nature." + flag_path = "hansan" + icon_state = "hansan" + flag_item = /obj/item/flag/hansan + /obj/item/flag/caladius name = "\improper House Caladius standard" desc = "A purple standard which represents House Caladius, one of the great houses of the Empire of Dominia. They are \ diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 38f12bec0b5..6732a0f30c4 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -190,6 +190,7 @@ standards["standard, Strelitz"] = /obj/item/flag/strelitz standards["standard, Volvalaad"] = /obj/item/flag/volvalaad standards["standard, Kazhkz"] = /obj/item/flag/kazhkz + standards["standard, Han'san"] = /obj/item/flag/hansan standards["standard, Caladius"] = /obj/item/flag/caladius standards["standard, Zhao"] = /obj/item/flag/zhao gear_tweaks += new /datum/gear_tweak/path(standards) diff --git a/html/changelogs/GeneralCamo - Han'san Standard.yml b/html/changelogs/GeneralCamo - Han'san Standard.yml new file mode 100644 index 00000000000..8c31487adf0 --- /dev/null +++ b/html/changelogs/GeneralCamo - Han'san Standard.yml @@ -0,0 +1,42 @@ +################################ +# 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: GeneralCamo + +# 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 Dominian standard for Clan Han'san." + - tweak: "Adjusted the description of the House Kazhkz to match current lore." diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 1b4eef81df8..d04c99f5408 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ