diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index 697bce83fbf..1f4a4359fa9 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -1380,14 +1380,14 @@ // Dominian Standards /obj/item/flag/diona - name = "\improper Imperial Diona standard" - desc = "A green Dominian standard which represents the Dionae within the Empire." + name = "\improper Strange Imperial standard" + desc = "A strange green flag in Imperial style. What House could it represent?" flag_path = "diona" flag_structure = /obj/structure/sign/flag/diona /obj/structure/sign/flag/diona - name = "\improper Imperial Diona standard" - desc = "A green Dominian standard which represents the Dionae within the Empire." + name = "\improper Strange Imperial standard" + desc = "A strange green flag in Imperial style. What House could it represent?" flag_path = "diona" icon_state = "diona" flag_item = /obj/item/flag/diona @@ -1424,14 +1424,14 @@ /obj/item/flag/kazhkz name = "\improper House Kazhkz standard" - desc = "A red-and-orange standard with a circular chevron which represents House Kazhkz-Han'san, one of the great houses of the \ + desc = "A red-and-orange standard with a circular chevron which represents House Kazhkz-Han'san, one of the unathi 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-Han'san, one of the great houses of the \ + desc = "A red-and-orange standard with a circular chevron which represents House Kazhkz-Han'san, one of the unathi houses of the \ Empire of Dominia. They are known for their more modernist nature and aversion to augmentation." flag_path = "kazhkz" icon_state = "kazhkz" @@ -1440,14 +1440,14 @@ /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." + unathi 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." + unathi 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 @@ -4018,3 +4018,46 @@ /obj/structure/sign/flag/narrows/large/west/Initialize(mapload) . = ..(mapload, WEST) + +// Zhurong + +/obj/item/flag/zhurong + name = "\improper Zhurong flag" + desc = "The white-and-gray flag of Zhurong. Long live the Empire, the Fleet, and House Zhao!" + desc_extended = "Commonly seen across Zhurong and in Zhao buildings, this flag is often regarded as the unofficial symbol of the Imperial Fleet. Zhurong shipbuilders have a tradition of carving this flag into supporting beams in ships, signifying their belief Zhurong’s steel will endure whatever is thrown at it." + flag_path = "zhurong" + flag_structure = /obj/structure/sign/flag/zhurong + +/obj/structure/sign/flag/zhurong + name = "\improper Zhurong flag" + desc = "The white-and-gray flag of Zhurong. Long live the Empire, the Fleet, and House Zhao!" + desc_extended = "Commonly seen across Zhurong and in Zhao buildings, this flag is often regarded as the unofficial symbol of the Imperial Fleet. Zhurong shipbuilders have a tradition of carving this flag into supporting beams in ships, signifying their belief Zhurong’s steel will endure whatever is thrown at it." + flag_path = "zhurong" + icon_state = "zhurong" + flag_item = /obj/item/flag/zhurong + +/obj/structure/sign/flag/zhurong/unmovable + unmovable = TRUE + +/obj/item/flag/zhurong/l + name = "large Zhurong flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/zhurong/large + +/obj/structure/sign/flag/zhurong/large + icon_state = "zhurong_l" + flag_path = "zhurong" + flag_size = TRUE + flag_item = /obj/item/flag/zhurong/l + +/obj/structure/sign/flag/zhurong/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/zhurong/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/zhurong/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/zhurong/large/west/Initialize(mapload) + . = ..(mapload, WEST) diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index d634fcfab94..6827bc4ac41 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -278,6 +278,7 @@ banners["banner, Visegrad"] = /obj/item/flag/visegrad banners["banner, Burzsia"] = /obj/item/flag/burzsia banners["banner, HPS Narrows"] = /obj/item/flag/narrows + banners["banner, Zhurong"] = /obj/item/flag/zhurong gear_tweaks += new /datum/gear_tweak/path(banners) /datum/gear/standard @@ -290,8 +291,6 @@ var/list/standards = list() 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) @@ -379,6 +378,7 @@ flags["flag, Visegrad"] = /obj/item/flag/visegrad/l flags["flag, Burzsia"] = /obj/item/flag/burzsia/l flags["flag, HPS Narrows"] = /obj/item/flag/narrows/l + flags["flag, Zhurong"] = /obj/item/flag/zhurong/l gear_tweaks += new /datum/gear_tweak/path(flags) /datum/gear/towel diff --git a/html/changelogs/Fyni-DomiFlagUpdate.yml b/html/changelogs/Fyni-DomiFlagUpdate.yml new file mode 100644 index 00000000000..1b233053b67 --- /dev/null +++ b/html/changelogs/Fyni-DomiFlagUpdate.yml @@ -0,0 +1,61 @@ +################################ +# 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: Fyni + +# 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: "Adds a Zhurong flag and large flag, available in the loadout." + - rscadd: "Removes Kazhkz and Han'san flags from loadout, per request of unathi lore" + - rscadd: "Change the Kazhkz and Han'san flags descriptions to be in line with new Unathi in Dominia lore, in case they are still present on maps or spawn as random loot." + - rscadd: "Changes the Diona imperial flag to remove all references to diona, in case they are still present on maps or spawn as random loot." diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 52c2d2396ac..ee1b49f515c 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ