diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 3c9cb261c29..a795f49ad53 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1172,14 +1172,17 @@ starts_with = list( /obj/item/flag/dominia = 8, /obj/item/flag/dominia/l = 6, - /obj/item/flag/strelitz = 4, - /obj/item/flag/volvalaad = 4, + /obj/item/flag/strelitz = 2, + /obj/item/flag/volvalaad = 2, /obj/item/flag/caladius = 2, - /obj/item/flag/zhao = 4, - /obj/item/flag/zhurong = 3, + /obj/item/flag/zhao = 2, + /obj/item/flag/zhurong = 2, /obj/item/flag/zhurong/l = 2, - /obj/item/flag/imperial_frontier = 3, - /obj/item/flag/imperial_frontier/l = 2 + /obj/item/flag/imperial_frontier = 2, + /obj/item/flag/imperial_frontier/l = 2, + /obj/item/flag/seok = 1, + /obj/item/flag/kaneko = 1, + /obj/item/flag/sinzendorf = 1, ) /obj/item/storage/box/large/flags/elyra diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index 083efeb4dc1..fbfe8beb186 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -1401,30 +1401,26 @@ /obj/item/flag/strelitz name = "\improper House Strelitz standard" - desc = "A red-and-dark standard with a gold trim that represents House Strelitz, one of the great houses of the Empire of Dominia. \ - They are known for their military service and emphasis on personal bravery." + desc = "The red and gold standard of House Strelitz represents loyalty and bravery. It proudly flies above thousands of military facilities across the Empire and beyond." flag_path = "strelitz" flag_structure = /obj/structure/sign/flag/strelitz /obj/structure/sign/flag/strelitz name = "\improper House Strelitz standard" - desc = "A red-and-dark standard with a gold trim that represents House Strelitz, one of the great houses of the Empire of Dominia. \ - They are known for their military service and emphasis on personal bravery." + desc = "The red and gold standard of House Strelitz represents loyalty and bravery. It proudly flies above thousands of military facilities across the Empire and beyond." icon_state = "strelitz" flag_path = "strelitz" flag_item = /obj/item/flag/strelitz /obj/item/flag/volvalaad name = "\improper House Volvalaad standard" - desc = "A blue-and-black standard which represents House Volvalaad, one of the great houses of the Empire of Dominia. \ - They are known for their reformist ideals, and scientific prowess." + desc = "The black and dark blue hues of House Volvalaad's standard go hand-in-hand with the Empire's greatest scientific accomplishment: geneboosting. May Crown Princess Keeser live for a thousand years!" flag_path = "volvalaad" flag_structure = /obj/structure/sign/flag/volvalaad /obj/structure/sign/flag/volvalaad name = "\improper House Volvalaad standard" - desc = "A blue-and-black standard which represents House Volvalaad, one of the great houses of the Empire of Dominia. \ - They are known for their reformist ideals and scientific prowess." + desc = "The black and dark blue hues of House Volvalaad's standard go hand-in-hand with the Empire's greatest scientific accomplishment: geneboosting. May Crown Princess Keeser live for a thousand years!" flag_path = "volvalaad" icon_state = "volvalaad" flag_item = /obj/item/flag/volvalaad @@ -1461,34 +1457,84 @@ /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 \ - known for their support of the Dominian clergy as well as the skill of their bureaucrats and economists." + desc = "The purple standard of House Caladius flies proudly from Imperial government buildings, colonies, and merchant vessels. Known for its meritocracy, it also flies above many schools for gifted Ma'zals -- the future of the Imperial colonial bureaucracy." flag_path = "caladius" flag_structure = /obj/structure/sign/flag/caladius /obj/structure/sign/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 \ - known for their support of the Dominian clergy as well as the skill of their bureaucrats and economists." + desc = "The purple standard of House Caladius flies proudly from Imperial government buildings, colonies, and merchant vessels. Known for its meritocracy, it also flies above many schools for gifted Ma'zals -- the future of the Imperial colonial bureaucracy." flag_path = "caladius" icon_state = "caladius" flag_item = /obj/item/flag/caladius /obj/item/flag/zhao name = "\improper House Zhao standard" - desc = "A white Dominian standard with a prominent grey circle which represents House Zhao, one of the great houses of the Empire of Dominia,\ - known for its naval officers and patronage of the Dominian shipbuilding industry." + desc = "Renowned for their naval and engineering prowess, the white-and-silver standard of House Zhao flies proudly from Imperial Fleet facilities and colonial holdings across the southern Spur. Long live the Grand Admiral and the Empire!" flag_path = "zhao" flag_structure = /obj/structure/sign/flag/zhao /obj/structure/sign/flag/zhao name = "\improper House Zhao standard" - desc = "A white Dominian standard with a prominent grey circle which represents House Zhao, one of the great houses of the Empire of Dominia,\ - known for its naval officers and patronage of the Dominian shipbuilding and naval industries." + desc = "Renowned for their naval and engineering prowess, the white-and-silver standard of House Zhao flies proudly from Imperial Fleet facilities and colonial holdings across the southern Spur. Long live the Grand Admiral and the Empire!" flag_path = "zhao" icon_state = "zhao" flag_item = /obj/item/flag/zhao +/obj/item/flag/seok + name = "\improper House Seok standard" + desc = "The red-black-red banner of House Seok. Long live the Empress and her family!" + desc_extended = "House Seok symbolizes itself with a traditional character roughly translating as ancient, signifying its venerable history and \ + ties to the Imperial Household. Many Imperial cultural buildings, from libraries to opera houses, have this symbol engraved somewhere inside them as \ + an enduring testament to House Seok's generosity." + flag_path = "seok" + flag_structure = /obj/structure/sign/flag/seok + +/obj/structure/sign/flag/seok + name = "\improper House Seok standard" + desc = "The red-black-red banner of House Seok. Long live the Empress and her family!" + desc_extended = "House Seok symbolizes itself with a traditional character roughly translating as ancient, signifying its venerable history and \ + ties to the Imperial Household. Many Imperial cultural buildings, from libraries to opera houses, have this symbol engraved somewhere inside them as \ + an enduring testament to House Seok's generosity." + icon_state = "seok" + flag_item = /obj/item/flag/seok + +/obj/item/flag/kaneko + name = "\improper House Kaneko standard" + desc = "The gold-and-silver banner of House Kaneko. Long live Zhurong and Count Kaneko!" + desc_extended = "The sixth great houses' symbol, a golden crysanthemum, symbolises the long history of House Kaneko and its great potential - and ambition. \ + This symbol is often stamped on the support beams of Zhurong's structures and on the interior of Imperial Fleet hulls, symbolizing the steel used to construct \ + it draws from the same great strength as House Kaneko." + flag_path = "kaneko" + flag_structure = /obj/structure/sign/flag/kaneko + +/obj/structure/sign/flag/kaneko + name = "\improper House Kaneko standard" + desc = "The gold-and-silver banner of House Kaneko. Long live Zhurong and Count Kaneko!" + desc_extended = "The sixth great houses' symbol, a golden crysanthemum, symbolises the long history of House Kaneko and its great potential - and ambition. \ + This symbol is often stamped on the support beams of Zhurong's structures and on the interior of Imperial Fleet hulls, symbolizing the steel used to construct \ + it draws from the same great strength as House Kaneko." + icon_state = "kaneko" + flag_item = /obj/item/flag/kaneko + +/obj/item/flag/sinzendorf + name = "\improper House von Sinzendorf standard" + desc = "The black-and-red banner of House von Sinzendorf. En garde!" + desc_extended = "The crossed swords and Imperial Eye of House von Sinzendorf’s crest feature prominently on its banner. The swords symbolize duty, honour, \ + and loyalty until the end. The Imperial Eye symbolizes the Imperial Household, their masters. The Imperial Household's guard is closely associated with the \ + von Sinzendorf's symbol, due to their long history as the Imperial family's bodyguards." + flag_path = "sinzendorf" + flag_structure = /obj/structure/sign/flag/sinzendorf + +/obj/structure/sign/flag/sinzendorf + name = "\improper House von Sinzendorf standard" + desc = "The black-and-red banner of House von Sinzendorf. En garde!" + desc_extended = "The crossed swords and Imperial Eye of House von Sinzendorf’s crest feature prominently on its banner. The swords symbolize duty, honour, \ + and loyalty until the end. The Imperial Eye symbolizes the Imperial Household, their masters. The Imperial Household's guard is closely associated with the \ + von Sinzendorf's symbol, due to their long history as the Imperial family's bodyguards." + icon_state = "sinzendorf" + flag_item = /obj/item/flag/sinzendorf + // Biesel. /obj/item/flag/biesel diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 12f5ae8b6c3..f955f2fc6ae 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -297,6 +297,9 @@ standards["standard, Volvalaad"] = /obj/item/flag/volvalaad standards["standard, Caladius"] = /obj/item/flag/caladius standards["standard, Zhao"] = /obj/item/flag/zhao + standards["standard, Seok"] = /obj/item/flag/seok + standards["standard, Kaneko"] = /obj/item/flag/kaneko + standards["standard, von Sinzendorf"] = /obj/item/flag/sinzendorf gear_tweaks += new /datum/gear_tweak/path(standards) /datum/gear/flag diff --git a/html/changelogs/fyni-domi-banners.yml b/html/changelogs/fyni-domi-banners.yml new file mode 100644 index 00000000000..ca2242712fe --- /dev/null +++ b/html/changelogs/fyni-domi-banners.yml @@ -0,0 +1,4 @@ +author: fyni +delete-after: True +changes: + - rscadd: "Adds three new Domi house banners!" \ No newline at end of file diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index c87c8567eb4..9b4391c8bf9 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ