diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index 673d12c27f2..bae15035d51 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -2274,6 +2274,192 @@ /obj/structure/sign/flag/luna/large/west/Initialize(mapload) . = ..(mapload, WEST) +//Persepolis + +/obj/item/flag/persepolis + name = "\improper Persepolis flag" + desc = "The flag of Persepolis. The colors are similar to the Presepolean sky during sunrise over the planet's oceans. The writing on the flag reads: Freedom and Justice." + flag_path = "persepolis" + flag_structure = /obj/structure/sign/flag/persepolis + +/obj/structure/sign/flag/persepolis + name = "\improper Persepolis flag" + desc = "The flag of Persepolis. The colors are similar to the Presepolean sky during sunrise over the planet's oceans. The writing on the flag reads: Freedom and Justice.." + flag_path = "persepolis" + icon_state = "persepolis" + flag_item = /obj/item/flag/persepolis + +/obj/item/flag/persepolis/l + name = "large Persepolis flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/persepolis/large + +/obj/structure/sign/flag/persepolis/large + icon_state = "persepolis_l" + flag_path = "persepolis" + flag_size = TRUE + flag_item = /obj/item/flag/persepolis/l + +/obj/structure/sign/flag/persepolis/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/persepolis/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/persepolis/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/persepolis/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +//Damascus + +/obj/item/flag/damascus + name = "\improper Damascus flag" + desc = "The flag of Damascus. Popularized during the Elyran Revolution among protestors, the writing on the flag bears the famed slogan: At Any Price." + flag_path = "damascus" + flag_structure = /obj/structure/sign/flag/damascus + +/obj/structure/sign/flag/damascus + name = "\improper Damascus flag" + desc = "The flag of Damascus. Popularized during the Elyran Revolution among protestors, the writing on the flag bears the famed slogan: At Any Price." + flag_path = "damascus" + icon_state = "damascus" + flag_item = /obj/item/flag/damascus + +/obj/item/flag/damascus/l + name = "large Damascus flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/damascus/large + +/obj/structure/sign/flag/damascus/large + icon_state = "damascus_l" + flag_path = "damascus" + flag_size = TRUE + flag_item = /obj/item/flag/damascus/l + +/obj/structure/sign/flag/damascus/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/damascus/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/damascus/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/damascus/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +//Medina +/obj/item/flag/medina + name = "\improper Medina flag" + desc = "The flag of Medina. The colors represent wealth, progress, purity, and phoron." + flag_path = "medina" + flag_structure = /obj/structure/sign/flag/medina + +/obj/structure/sign/flag/medina + name = "\improper Medina flag" + desc = "The flag of Medina. The colors represent wealth, progress, purity, and phoron." + flag_path = "medina" + icon_state = "medina" + flag_item = /obj/item/flag/medina + +/obj/item/flag/medina/l + name = "large Medina flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/medina/large + +/obj/structure/sign/flag/medina/large + icon_state = "medina_l" + flag_path = "medina" + flag_size = TRUE + flag_item = /obj/item/flag/medina/l + +/obj/structure/sign/flag/medina/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/medina/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/medina/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/medina/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +//Aemaq +/obj/item/flag/aemaq + name = "\improper Aemaq flag" + desc = "The flag of Aemaq. The colors of the flag represent wealth, energy, the planet's oceans, and the pure hearts of the Aemaqans." + flag_path = "aemaq" + flag_structure = /obj/structure/sign/flag/aemaq + +/obj/structure/sign/flag/aemaq + name = "\improper Aemaq flag" + desc = "The flag of Aemaq. The colors of the flag represent wealth, energy, the planet's oceans, and the pure hearts of the Aemaqans." + flag_path = "aemaq" + icon_state = "aemaq" + flag_item = /obj/item/flag/aemaq + +/obj/item/flag/aemaq/l + name = "large Aemaq flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/aemaq/large + +/obj/structure/sign/flag/aemaq/large + icon_state = "aemaq_l" + flag_path = "aemaq" + flag_size = TRUE + flag_item = /obj/item/flag/aemaq/l + +/obj/structure/sign/flag/aemaq/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/aemaq/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/aemaq/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/aemaq/large/west/Initialize(mapload) + . = ..(mapload, WEST) + +//New Suez +/obj/item/flag/newsuez + name = "\improper New Suez flag" + desc = "The flag of New Suez. The moon of Persepolis is surrounded by the stars that represent the parties of the 2381 New Suez Accords." + flag_path = "newsuez" + flag_structure = /obj/structure/sign/flag/newsuez + +/obj/structure/sign/flag/newsuez + name = "\improper New Suez flag" + desc = "The flag of New Suez. The moon of Persepolis is surrounded by the stars that represent the parties of the 2381 New Suez Accords." + flag_path = "newsuez" + icon_state = "newsuez" + flag_item = /obj/item/flag/newsuez + +/obj/item/flag/newsuez/l + name = "large New Suez flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/newsuez/large + +/obj/structure/sign/flag/newsuez/large + icon_state = "newsuez_l" + flag_path = "newsuez" + flag_size = TRUE + flag_item = /obj/item/flag/newsuez/l + +/obj/structure/sign/flag/newsuez/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/newsuez/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/newsuez/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/newsuez/large/west/Initialize(mapload) + . = ..(mapload, WEST) // Hive Zo'ra diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index be68c513c1a..5905e75eda6 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -176,6 +176,11 @@ banners["banner, New Hai Phong"] = /obj/item/flag/nhp banners["banner, Silversun"] = /obj/item/flag/silversun banners["banner, Luna"] = /obj/item/flag/luna + banners["banner, Persepolis"] = /obj/item/flag/persepolis + banners["banner, Damascus"] = /obj/item/flag/damascus + banners["banner, Medina"] = /obj/item/flag/medina + banners["banner, Aemaq"] = /obj/item/flag/aemaq + banners["banner, New Suez"] = /obj/item/flag/newsuez 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 @@ -248,6 +253,11 @@ flags["flag, New Hai Phong"] = /obj/item/flag/nhp/l flags["flag, Silversun"] = /obj/item/flag/silversun/l flags["flag, Luna"] = /obj/item/flag/luna/l + flags["flag, Persepolis"] = /obj/item/flag/persepolis/l + flags["flag, Damascus"] = /obj/item/flag/damascus/l + flags["flag, Medina"] = /obj/item/flag/medina/l + flags["flag, Aemaq"] = /obj/item/flag/aemaq/l + flags["flag, New Suez"] = /obj/item/flag/newsuez/l 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 diff --git a/html/changelogs/CampinKiller24-serene.yml b/html/changelogs/CampinKiller24-serene.yml new file mode 100644 index 00000000000..ac11a696a8c --- /dev/null +++ b/html/changelogs/CampinKiller24-serene.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: CampinKiller24 + +# 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: "Adds the new Elyran flags." diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index c89b78adf2d..1a559c59bb6 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ