diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index ce2c692f9ee..a9d3204924b 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -2821,3 +2821,208 @@ flag_path = "raskara" flag_item = /obj/item/flag/raskara stand_icon = "wood_stand" + +// Federal Technocracy of Galatea + +/obj/item/flag/galatea_government + name = "\improper Federal Technocracy of Galatea flag" + desc = "The flag of the Federal Technocracy of Galatea." + flag_path = "galatea_government" + flag_structure = /obj/structure/sign/flag/galatea_government + +/obj/structure/sign/flag/galatea_government + name = "\improper Federal Technocracy of Galatea flag" + desc = "The flag of the Federal Technocracy of Galatea." + flag_path = "galatea_government" + icon_state = "galatea_government" + flag_item = /obj/item/flag/galatea_government + +/obj/structure/sign/flag/galatea_government/unmovable + unmovable = TRUE + +/obj/item/flag/galatea_government/l + name = "large Federal Technocracy of Galatea flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/galatea_government/large + +/obj/structure/sign/flag/galatea_government/large + icon_state = "galatea_government_l" + flag_path = "galatea_government" + flag_size = TRUE + flag_item = /obj/item/flag/galatea_government/l + +/obj/structure/sign/flag/galatea_government/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/galatea_government/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/galatea_government/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/galatea_government/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +// Galatea + +/obj/item/flag/galatea + name = "\improper Galatea flag" + desc = "The flag of Galatea, the premier member-state of the Federal Technocracy of Galatea." + flag_path = "galatea" + flag_structure = /obj/structure/sign/flag/galatea + +/obj/structure/sign/flag/galatea + name = "\improper Galatea flag" + desc = "The flag of Galatea, the premier member-state of the Federal Technocracy of Galatea." + flag_path = "galatea" + icon_state = "galatea" + flag_item = /obj/item/flag/galatea + +/obj/structure/sign/flag/galatea/unmovable + unmovable = TRUE + +/obj/item/flag/galatea/l + name = "large Galatea flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/galatea/large + +/obj/structure/sign/flag/galatea/large + icon_state = "galatea_l" + flag_path = "galatea" + flag_size = TRUE + flag_item = /obj/item/flag/galatea/l + +/obj/structure/sign/flag/galatea/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/galatea/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/galatea/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/galatea/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +// Tsukuyomi + +/obj/item/flag/tsukuyomi + name = "\improper Tsukuyomi flag" + desc = "The flag of Tsukuyomi, a member-state of the Federal Technocracy of Galatea." + flag_path = "tsukuyomi" + flag_structure = /obj/structure/sign/flag/tsukuyomi + +/obj/structure/sign/flag/tsukuyomi + name = "\improper Tsukuyomi flag" + desc = "The flag of Tsukuyomi, a member-state of the Federal Technocracy of Galatea." + flag_path = "tsukuyomi" + icon_state = "tsukuyomi" + flag_item = /obj/item/flag/tsukuyomi + +/obj/structure/sign/flag/tsukuyomi/unmovable + unmovable = TRUE + +/obj/item/flag/tsukuyomi/l + name = "large Tsukuyomi flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/tsukuyomi/large + +/obj/structure/sign/flag/tsukuyomi/large + icon_state = "tsukuyomi_l" + flag_path = "tsukuyomi" + flag_size = TRUE + flag_item = /obj/item/flag/tsukuyomi/l + +/obj/structure/sign/flag/tsukuyomi/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/tsukuyomi/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/tsukuyomi/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/tsukuyomi/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +// Svarog + +/obj/item/flag/svarog + name = "\improper Svarog flag" + desc = "The flag of Svarog, a member-state of the Federal Technocracy of Galatea." + flag_path = "svarog" + flag_structure = /obj/structure/sign/flag/svarog + +/obj/structure/sign/flag/svarog + name = "\improper Svarog flag" + desc = "The flag of Svarog, a member-state of the Federal Technocracy of Galatea." + flag_path = "svarog" + icon_state = "svarog" + flag_item = /obj/item/flag/svarog + +/obj/structure/sign/flag/svarog/unmovable + unmovable = TRUE + +/obj/item/flag/svarog/l + name = "large Svarog flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/svarog/large + +/obj/structure/sign/flag/svarog/large + icon_state = "svarog_l" + flag_path = "svarog" + flag_size = TRUE + flag_item = /obj/item/flag/svarog/l + +/obj/structure/sign/flag/svarog/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/svarog/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/svarog/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/svarog/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +// Empyrean + +/obj/item/flag/empyrean + name = "\improper Empyrean flag" + desc = "The flag of Empyrean, a member-state of the Federal Technocracy of Galatea." + flag_path = "empyrean" + flag_structure = /obj/structure/sign/flag/empyrean + +/obj/structure/sign/flag/empyrean + name = "\improper Empyrean flag" + desc = "The flag of Empyrean, a member-state of the Federal Technocracy of Galatea." + flag_path = "empyrean" + icon_state = "empyrean" + flag_item = /obj/item/flag/empyrean + +/obj/structure/sign/flag/empyrean/unmovable + unmovable = TRUE + +/obj/item/flag/empyrean/l + name = "large Empyrean flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/empyrean/large + +/obj/structure/sign/flag/empyrean/large + icon_state = "empyrean_l" + flag_path = "empyrean" + flag_size = TRUE + flag_item = /obj/item/flag/empyrean/l + +/obj/structure/sign/flag/empyrean/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/empyrean/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/empyrean/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/empyrean/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 5905e75eda6..3f1776b2ea1 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -186,6 +186,11 @@ 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 + banners["banner, Federal Technocracy of Galatea"] = /obj/item/flag/galatea_government + banners["banner, Galatea"] = /obj/item/flag/galatea + banners["banner, Tsukuyomi"] = /obj/item/flag/tsukuyomi + banners["banner, Svarog"] = /obj/item/flag/svarog + banners["banner, Empyrean"] = /obj/item/flag/empyrean gear_tweaks += new /datum/gear_tweak/path(banners) /datum/gear/standard @@ -263,6 +268,11 @@ 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 + flags["flag, Federal Technocracy of Galatea"] = /obj/item/flag/galatea_government/l + flags["flag, Galatea"] = /obj/item/flag/galatea/l + flags["flag, Tsukuyomi"] = /obj/item/flag/tsukuyomi/l + flags["flag, Svarog"] = /obj/item/flag/svarog/l + flags["flag, Empyrean"] = /obj/item/flag/empyrean/l gear_tweaks += new /datum/gear_tweak/path(flags) /datum/gear/towel diff --git a/html/changelogs/SimpleMaroon-galateaflags.yml b/html/changelogs/SimpleMaroon-galateaflags.yml new file mode 100644 index 00000000000..8e20dd82cdc --- /dev/null +++ b/html/changelogs/SimpleMaroon-galateaflags.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 flags and banners for the Federal Technocracy of Galatea, Galatea, Tsukuyomi, Svarog, and Empyrean to the loadout." diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 1a559c59bb6..8f09ab88d7b 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ