diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index 1b2cf30261d..0fb9fb98048 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -458,6 +458,78 @@ /obj/structure/sign/flag/hegemony/large/west/New() ..(loc, WEST) +/obj/item/flag/ouerea + name = "\improper Ouerea flag" + desc = "The modern day flag of Ouerea. Due to the incorporation of red stripes to symbolize the blood of the nobility spilled in the rebellion, this is not the current official flag of the planet." + flag_path = "ouerea" + flag_structure = /obj/structure/sign/flag/ouerea + +/obj/structure/sign/flag/ouerea + name = "\improper Ouerea flag" + desc = "The modern day flag of Ouerea. Due to the incorporation of red stripes to symbolize the blood of the nobility spilled in the rebellion, this is not the current official flag of the planet." + icon_state = "ouerea" + flag_path = "ouerea" + flag_item = /obj/item/flag/ouerea + +/obj/item/flag/ouerea/l + name = "large Ouerea flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/ouerea/large + +/obj/structure/sign/flag/ouerea/large + icon_state = "ouerea_l" + flag_path = "ouerea" + flag_size = TRUE + flag_item = /obj/item/flag/ouerea/l + +/obj/structure/sign/flag/ouerea/large/north/New() + ..(loc, NORTH) + +/obj/structure/sign/flag/ouerea/large/south/New() + ..(loc, SOUTH) + +/obj/structure/sign/flag/ouerea/large/east/New() + ..(loc, EAST) + +/obj/structure/sign/flag/ouerea/large/west/New() + ..(loc, WEST) + +/obj/item/flag/ouerea/old + name = "old Ouerea flag" + desc = "The old flag of Ouerea, dating back to its days as a joint mandate between the Nralakk Federation and, to a lesser extent, the Solarian Alliance. Due to controversy over the current flag, it remains the official flag of Ouerea." + flag_path = "ouerea_old" + flag_structure = /obj/structure/sign/flag/ouerea/old + +/obj/structure/sign/flag/ouerea/old + name = "old Ouerea flag" + desc = "The old flag of Ouerea, dating back to its days as a joint mandate between the Nralakk Federation and, to a lesser extent, the Solarian Alliance. Due to controversy over the current flag, it remains the official flag of Ouerea." + icon_state = "ouerea_old" + flag_path = "ouerea_old" + flag_item = /obj/item/flag/ouerea/old + +/obj/item/flag/ouerea/old/l + name = "large old Ouerea flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/ouerea/old/large + +/obj/structure/sign/flag/ouerea/old/large + icon_state = "ouerea_old_l" + flag_path = "ouerea_old" + flag_size = TRUE + flag_item = /obj/item/flag/ouerea/old/l + +/obj/structure/sign/flag/ouerea/old/large/north/New() + ..(loc, NORTH) + +/obj/structure/sign/flag/ouerea/old/large/south/New() + ..(loc, SOUTH) + +/obj/structure/sign/flag/ouerea/old/large/east/New() + ..(loc, EAST) + +/obj/structure/sign/flag/ouerea/old/large/west/New() + ..(loc, WEST) + // Nralakk /obj/item/flag/nralakk diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 5bc5e78ab8f..c6decd68753 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -138,6 +138,8 @@ banners["banner, Dominia"] = /obj/item/flag/dominia banners["banner, Elyra"] = /obj/item/flag/elyra banners["banner, Hegemony"] = /obj/item/flag/hegemony + banners["banner, Ouerea"] = /obj/item/flag/ouerea + banners["banner, Old Ouerea"] = /obj/item/flag/ouerea/old banners["banner, Nralakk"] = /obj/item/flag/nralakk banners["banner, Traverse"] = /obj/item/flag/traverse banners["banner, NanoTrasen"] = /obj/item/flag/nanotrasen @@ -204,6 +206,8 @@ flags["flag, Dominia"] = /obj/item/flag/dominia/l flags["flag, Elyra"] = /obj/item/flag/elyra/l flags["flag, Hegemony"] = /obj/item/flag/hegemony/l + flags["flag, Ouerea"] = /obj/item/flag/ouerea/l + flags["flag, Old Ouerea"] = /obj/item/flag/ouerea/old/l flags["flag, Nralakk"] = /obj/item/flag/nralakk/l flags["flag, Traverse"] = /obj/item/flag/traverse/l flags["flag, NanoTrasen"] = /obj/item/flag/nanotrasen/l diff --git a/html/changelogs/GeneralCamo - Ouerea flags.yml b/html/changelogs/GeneralCamo - Ouerea flags.yml new file mode 100644 index 00000000000..b72bc3e7f08 --- /dev/null +++ b/html/changelogs/GeneralCamo - Ouerea flags.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: 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 two flags based on Ouerea's flags to the loadout." diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 0cbc6c47e68..6ce4c964817 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ