diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index 0fb9fb98048..c596b487b4f 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -2140,3 +2140,87 @@ /obj/structure/sign/flag/cthur/large/west/New() ..(loc, WEST) + +// Orion Express + +/obj/item/flag/orion_express + name = "\improper Orion Express flag" + desc = "The flag of Orion Express." + flag_path = "orion" + flag_structure = /obj/structure/sign/flag/orion_express + +/obj/structure/sign/flag/orion_express + name = "\improper Orion Express flag" + desc = "The flag of Orion Express." + flag_path = "orion" + icon_state = "orion" + flag_item = /obj/item/flag/orion_express + +/obj/structure/sign/flag/orion_express/unmovable + unmovable = TRUE + +/obj/item/flag/orion_express/l + name = "large Orion Express flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/orion_express/large + +/obj/structure/sign/flag/orion_express/large + icon_state = "orion_l" + flag_path = "orion" + flag_size = TRUE + flag_item = /obj/item/flag/orion_express/l + +/obj/structure/sign/flag/orion_express/large/north/New() + ..(loc, NORTH) + +/obj/structure/sign/flag/orion_express/large/south/New() + ..(loc, SOUTH) + +/obj/structure/sign/flag/orion_express/large/east/New() + ..(loc, EAST) + +/obj/structure/sign/flag/orion_express/large/west/New() + ..(loc, WEST) + +// Imperial Frontier + +/obj/item/flag/imperial_frontier + name = "\improper Imperial Frontier flag" + desc = "The multi-colored flag of the Dominian Empire's frontier regions known as the Imperial Frontier. This flag is a common sight on worlds such as Sun Reach." + desc_extended = "The four colors of this flag are symbolic of the most important actors of the Imperial Frontier. Dark red represents the Imperial Army under House Strelitz, purple represents the missionary (and financial) work of House Caladius, red represents the Empire, and white represents the Imperial Fleet under House Zhao." + flag_path = "imperial_frontier" + flag_structure = /obj/structure/sign/flag/imperial_frontier + +/obj/structure/sign/flag/imperial_frontier + name = "\improper Imperial Frontier flag" + desc = "The multi-colored flag of the Dominian Empire's frontier regions known as the Imperial Frontier. This flag is a common sight on worlds such as Sun Reach." + desc_extended = "The four colors of this flag are symbolic of the most important actors of the Imperial Frontier. Dark red represents the Imperial Army under House Strelitz, purple represents the missionary (and financial) work of House Caladius, red represents the Empire, and white represents the Imperial Fleet under House Zhao." + flag_path = "imperial_frontier" + icon_state = "imperial_frontier" + flag_item = /obj/item/flag/imperial_frontier + +/obj/structure/sign/flag/imperial_frontier/unmovable + unmovable = TRUE + +/obj/item/flag/imperial_frontier/l + name = "large Imperial Frontier flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/imperial_frontier/large + +/obj/structure/sign/flag/imperial_frontier/large + icon_state = "imperial_frontier_l" + flag_path = "imperial_frontier" + flag_size = TRUE + flag_item = /obj/item/flag/imperial_frontier/l + +/obj/structure/sign/flag/imperial_frontier/large/north/New() + ..(loc, NORTH) + +/obj/structure/sign/flag/imperial_frontier/large/south/New() + ..(loc, SOUTH) + +/obj/structure/sign/flag/imperial_frontier/large/east/New() + ..(loc, EAST) + +/obj/structure/sign/flag/imperial_frontier/large/west/New() + ..(loc, WEST) diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index c6decd68753..38f12bec0b5 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -175,6 +175,8 @@ banners["banner, Hive Zo'ra"] = /obj/item/flag/zora banners["banner, Hive K'lax"] = /obj/item/flag/klax banners["banner, Hive C'thur"] = /obj/item/flag/cthur + banners["banner, Orion Express"] = /obj/item/flag/orion_express + banners["banner, Imperial Frontier"] = /obj/item/flag/imperial_frontier gear_tweaks += new /datum/gear_tweak/path(banners) /datum/gear/standard @@ -240,6 +242,8 @@ flags["flag, Hive Zo'ra"] = /obj/item/flag/zora/l flags["flag, Hive K'lax"] = /obj/item/flag/klax/l flags["flag, Hive C'thur"] = /obj/item/flag/cthur/l + flags["flag, Orion Express"] = /obj/item/flag/orion_express/l + flags["flag, Imperial Frontier"] = /obj/item/flag/imperial_frontier/l gear_tweaks += new /datum/gear_tweak/path(flags) /datum/gear/towel diff --git a/html/changelogs/SimpleMaroon-moreflags.yml b/html/changelogs/SimpleMaroon-moreflags.yml new file mode 100644 index 00000000000..2457af22ebb --- /dev/null +++ b/html/changelogs/SimpleMaroon-moreflags.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: 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, 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 additional flags/banners to the loadout: Orion Express and the Imperial Frontier." diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 6ce4c964817..1b4eef81df8 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ