diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index 844b4e269dd..8bf62b3c00b 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -252,6 +252,7 @@ zavodskoicape["zavodskoi dominia cape, strelitz"] = /obj/item/clothing/accessory/poncho/dominia_cape/strelitz/zavod zavodskoicape["zavodskoi dominia cape, volvalaad"] = /obj/item/clothing/accessory/poncho/dominia_cape/volvalaad/zavod zavodskoicape["zavodskoi dominia cape, kazhkz"] = /obj/item/clothing/accessory/poncho/dominia_cape/kazhkz/zavod + zavodskoicape["zavodskoi dominia cape, han'san"] = /obj/item/clothing/accessory/poncho/dominia_cape/hansan/zavod zavodskoicape["zavodskoi dominia cape, caladius"] = /obj/item/clothing/accessory/poncho/dominia_cape/caladius/zavod zavodskoicape["zavodskoi dominia cape, zhao"] = /obj/item/clothing/accessory/poncho/dominia_cape/zhao/zavod gear_tweaks += new /datum/gear_tweak/path(zavodskoicape) diff --git a/code/modules/client/preference_setup/loadout/items/suit.dm b/code/modules/client/preference_setup/loadout/items/suit.dm index b953d1234ad..873772d0c6e 100644 --- a/code/modules/client/preference_setup/loadout/items/suit.dm +++ b/code/modules/client/preference_setup/loadout/items/suit.dm @@ -287,6 +287,8 @@ dominiacape["white dominian cape, volvalaad"] = /obj/item/clothing/accessory/poncho/dominia_cape/volvalaad/white dominiacape["dominian cape, kazhkz"] = /obj/item/clothing/accessory/poncho/dominia_cape/kazhkz dominiacape["white dominian cape, kazhkz"] = /obj/item/clothing/accessory/poncho/dominia_cape/kazhkz/white + dominiacape["dominian cape, han'san"] = /obj/item/clothing/accessory/poncho/dominia_cape/hansan + dominiacape["white dominian cape, han'san"] = /obj/item/clothing/accessory/poncho/dominia_cape/hansan/white dominiacape["dominian cape, caladius"] = /obj/item/clothing/accessory/poncho/dominia_cape/caladius dominiacape["white dominian cape, caladius"] = /obj/item/clothing/accessory/poncho/dominia_cape/caladius/white dominiacape["dominian cape, zhao"] = /obj/item/clothing/accessory/poncho/dominia_cape/zhao diff --git a/code/modules/client/preference_setup/loadout/items/uniform.dm b/code/modules/client/preference_setup/loadout/items/uniform.dm index 23404eb6e0f..da4db41a928 100644 --- a/code/modules/client/preference_setup/loadout/items/uniform.dm +++ b/code/modules/client/preference_setup/loadout/items/uniform.dm @@ -261,6 +261,7 @@ suit["strelitz dominian suit"] = /obj/item/clothing/under/dominia/imperial_suit/strelitz suit["volvalaad dominian suit"] = /obj/item/clothing/under/dominia/imperial_suit/volvalaad suit["kazhkz dominian suit"] = /obj/item/clothing/under/dominia/imperial_suit/kazhkz + suit["han'san dominian suit"] = /obj/item/clothing/under/dominia/imperial_suit/hansan suit["caladius dominian suit"] = /obj/item/clothing/under/dominia/imperial_suit/caladius suit["zhao dominian suit"] = /obj/item/clothing/under/dominia/imperial_suit/zhao suit["lyodsuit"] = /obj/item/clothing/under/dominia/lyodsuit diff --git a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm index 2f590b9d9f2..053a28a02be 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm @@ -21,7 +21,7 @@ path = /obj/item/clothing/accessory/poncho/unathimantle/forest cost = 1 whitelisted = list(SPECIES_UNATHI) - origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles) + origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/dominian_unathi) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_COLOR_SELECTION @@ -406,7 +406,7 @@ path = /obj/item/clothing/accessory/poncho/rockstone cost = 1 whitelisted = list(SPECIES_UNATHI) - origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles) + origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/dominian_unathi) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION @@ -414,7 +414,7 @@ display_name = "jeweled bracers" path = /obj/item/clothing/wrists/unathi/jeweled whitelisted = list(SPECIES_UNATHI) - origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles) + origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/dominian_unathi) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -431,7 +431,7 @@ path = /obj/item/clothing/suit/unathi/jokfar cost = 1 whitelisted = list(SPECIES_UNATHI) - origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles) + origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/dominian_unathi) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index 7c0d78dc06c..79933f733d7 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -129,6 +129,24 @@ item_state = "kazhkz_capez" cape_backing_state = "capez_backing" +/obj/item/clothing/accessory/poncho/dominia_cape/hansan + name = "clan han'san cape" + desc = "This is a cape in the style of Dominian nobility. This one is in the colours of Clan Han'san." + icon_state = "hansan_cape" + item_state = "hansan_cape" + +/obj/item/clothing/accessory/poncho/dominia_cape/hansan/white + name = "white clan han'san cape" + icon_state = "hansan_capew" + item_state = "hansan_capew" + cape_backing_state = "capew_backing" + +/obj/item/clothing/accessory/poncho/dominia_cape/hansan/zavod + name = "zavodskoi clan han'san cape" + icon_state = "hansan_capez" + item_state = "hansan_capez" + cape_backing_state = "capez_backing" + /obj/item/clothing/accessory/poncho/dominia_cape/caladius name = "house caladius cape" desc = "This is a cape in the style of Dominian nobility. This one is in the colours of House Caladius." @@ -277,6 +295,10 @@ name = "house kazhkz suit" house = "kazhkz" +/obj/item/clothing/under/dominia/imperial_suit/hansan + name = "house han'san suit" + house = "hansan" + /obj/item/clothing/under/dominia/imperial_suit/caladius name = "house caladius suit" house = "caladius" @@ -436,6 +458,10 @@ name = "kazhkz noble dress" house = "kazhkz" +/obj/item/clothing/under/dominia/dress/noble/hansan + name = "han'san noble dress" + house = "hansan" + /obj/item/clothing/under/dominia/dress/noble/caladius name = "caladius noble dress" house = "caladius" @@ -460,6 +486,10 @@ name = "black kazhkz noble dress" house = "kazhkz" +/obj/item/clothing/under/dominia/dress/noble/black/hansan + name = "black han'san noble dress" + house = "hansan" + /obj/item/clothing/under/dominia/dress/noble/black/caladius name = "black caladius noble dress" house = "caladius" @@ -750,6 +780,10 @@ name = "house kazhkz Morozi dress" house = "kazhkz" +/obj/item/clothing/under/dominia/dress/fancy/hansan + name = "clan han'san Morozi dress" + house = "hansan" + /obj/item/clothing/under/dominia/fleet name = "fleet voidsman uniform" desc = "The uniform of an enlisted sailor of the Imperial Fleet." diff --git a/html/changelogs/SimpleMaroon-dominianathi.yml b/html/changelogs/SimpleMaroon-dominianathi.yml new file mode 100644 index 00000000000..bcf1223345c --- /dev/null +++ b/html/changelogs/SimpleMaroon-dominianathi.yml @@ -0,0 +1,59 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: SimpleMaroon + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added Han'san variants of Dominian capes and clothing." + - qol: "Dominian Unathi can now take Unathite items associated with Moghesian nobility." diff --git a/icons/clothing/suits/capes/dominia.dmi b/icons/clothing/suits/capes/dominia.dmi index 37859cea1f4..19efb6c9530 100644 Binary files a/icons/clothing/suits/capes/dominia.dmi and b/icons/clothing/suits/capes/dominia.dmi differ diff --git a/icons/clothing/under/uniforms/dominia_dresses.dmi b/icons/clothing/under/uniforms/dominia_dresses.dmi index 42688048dee..cdc9f5eed79 100644 Binary files a/icons/clothing/under/uniforms/dominia_dresses.dmi and b/icons/clothing/under/uniforms/dominia_dresses.dmi differ diff --git a/icons/clothing/under/uniforms/dominia_noble_dress.dmi b/icons/clothing/under/uniforms/dominia_noble_dress.dmi index 931fc2088de..36cab25ff59 100644 Binary files a/icons/clothing/under/uniforms/dominia_noble_dress.dmi and b/icons/clothing/under/uniforms/dominia_noble_dress.dmi differ diff --git a/icons/clothing/under/uniforms/dominia_suits.dmi b/icons/clothing/under/uniforms/dominia_suits.dmi index a1c99657e6c..25db430fddd 100644 Binary files a/icons/clothing/under/uniforms/dominia_suits.dmi and b/icons/clothing/under/uniforms/dominia_suits.dmi differ diff --git a/icons/clothing/under/uniforms/dominia_summer_dress.dmi b/icons/clothing/under/uniforms/dominia_summer_dress.dmi index f78cd7f970a..bc6c90fe86a 100644 Binary files a/icons/clothing/under/uniforms/dominia_summer_dress.dmi and b/icons/clothing/under/uniforms/dominia_summer_dress.dmi differ