diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index c053859610a..e45353dccf5 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -1631,3 +1631,249 @@ desc = "The flag of New Gibson." flag_path = "newgibson" flag_structure = /obj/structure/sign/flag/newgibson + +// Port Antillia + +/obj/item/flag/portantillia + name = "\improper Union of Port Antillia flag" + desc = "The flag of the Union of Port Antillia." + flag_path = "portantillia" + flag_structure = /obj/structure/sign/flag/portantillia + +/obj/structure/sign/flag/portantillia + name = "\improper Union of Port Antillia flag" + desc = "The flag of the Union of Port Antillia." + flag_path = "portantillia" + icon_state = "portantillia" + flag_item = /obj/item/flag/portantillia + +/obj/structure/sign/flag/portantillia/unmovable + unmovable = TRUE + +/obj/item/flag/portantillia/l + name = "large Union of Port Antillia flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/portantillia/large + +/obj/structure/sign/flag/portantillia/large + icon_state = "portantillia_l" + flag_path = "portantillia" + flag_size = TRUE + flag_item = /obj/item/flag/portantillia/l + +/obj/structure/sign/flag/portantillia/large/north/New() + ..(loc, NORTH) + +/obj/structure/sign/flag/portantillia/large/south/New() + ..(loc, SOUTH) + +/obj/structure/sign/flag/portantillia/large/east/New() + ..(loc, EAST) + +/obj/structure/sign/flag/portantillia/large/west/New() + ..(loc, WEST) + +// San Colette + +/obj/item/flag/sancolette + name = "\improper Sovereign Solarian Republic of San Colette flag" + desc = "The flag of the Sovereign Solarian Republic of San Colette." + flag_path = "sancolette" + flag_structure = /obj/structure/sign/flag/sancolette + +/obj/structure/sign/flag/sancolette + name = "\improper Sovereign Solarian Republic of San Colette flag" + desc = "The flag of the Sovereign Solarian Republic of San Colette." + flag_path = "sancolette" + icon_state = "sancolette" + flag_item = /obj/item/flag/sancolette + +/obj/structure/sign/flag/sancolette/unmovable + unmovable = TRUE + +/obj/item/flag/sancolette/l + name = "large Sovereign Solarian Republic of San Colette flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/sancolette/large + +/obj/structure/sign/flag/sancolette/large + icon_state = "sancolette_l" + flag_path = "sancolette" + flag_size = TRUE + flag_item = /obj/item/flag/sancolette/l + +/obj/structure/sign/flag/sancolette/large/north/New() + ..(loc, NORTH) + +/obj/structure/sign/flag/sancolette/large/south/New() + ..(loc, SOUTH) + +/obj/structure/sign/flag/sancolette/large/east/New() + ..(loc, EAST) + +/obj/structure/sign/flag/sancolette/large/west/New() + ..(loc, WEST) + +// Mictlan + +/obj/item/flag/mictlan + name = "\improper Mictlan flag" + desc = "The flag of Mictlan." + flag_path = "mictlan" + flag_structure = /obj/structure/sign/flag/mictlan + +/obj/structure/sign/flag/mictlan + name = "\improper Mictlan flag" + desc = "The flag of Mictlan." + flag_path = "mictlan" + icon_state = "mictlan" + flag_item = /obj/item/flag/mictlan + +/obj/structure/sign/flag/mictlan/unmovable + unmovable = TRUE + +/obj/item/flag/mictlan/l + name = "large Mictlan flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/mictlan/large + +/obj/structure/sign/flag/mictlan/large + icon_state = "mictlan_l" + flag_path = "mictlan" + flag_size = TRUE + flag_item = /obj/item/flag/mictlan/l + +/obj/structure/sign/flag/mictlan/large/north/New() + ..(loc, NORTH) + +/obj/structure/sign/flag/mictlan/large/south/New() + ..(loc, SOUTH) + +/obj/structure/sign/flag/mictlan/large/east/New() + ..(loc, EAST) + +/obj/structure/sign/flag/mictlan/large/west/New() + ..(loc, WEST) + +// Hive Zo'ra + +/obj/item/flag/zora + name = "\improper Hive Zo'ra flag" + desc = "The flag of Hive Zo'ra." + flag_path = "zora" + flag_structure = /obj/structure/sign/flag/zora + +/obj/structure/sign/flag/zora + name = "\improper Hive Zo'ra flag" + desc = "The flag of Hive Zo'ra." + flag_path = "zora" + icon_state = "zora" + flag_item = /obj/item/flag/zora + +/obj/structure/sign/flag/zora/unmovable + unmovable = TRUE + +/obj/item/flag/zora/l + name = "large Hive Zo'ra flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/zora/large + +/obj/structure/sign/flag/zora/large + icon_state = "zora_l" + flag_path = "zora" + flag_size = TRUE + flag_item = /obj/item/flag/zora/l + +/obj/structure/sign/flag/zora/large/north/New() + ..(loc, NORTH) + +/obj/structure/sign/flag/zora/large/south/New() + ..(loc, SOUTH) + +/obj/structure/sign/flag/zora/large/east/New() + ..(loc, EAST) + +/obj/structure/sign/flag/zora/large/west/New() + ..(loc, WEST) + +// Hive K'lax + +/obj/item/flag/klax + name = "\improper Hive K'lax flag" + desc = "The flag of Hive K'lax." + flag_path = "klax" + flag_structure = /obj/structure/sign/flag/klax + +/obj/structure/sign/flag/klax + name = "\improper Hive K'lax flag" + desc = "The flag of Hive K'lax." + flag_path = "klax" + icon_state = "klax" + flag_item = /obj/item/flag/klax + +/obj/structure/sign/flag/klax/unmovable + unmovable = TRUE + +/obj/item/flag/klax/l + name = "large Hive K'lax flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/klax/large + +/obj/structure/sign/flag/klax/large + icon_state = "klax_l" + flag_path = "klax" + flag_size = TRUE + flag_item = /obj/item/flag/klax/l + +/obj/structure/sign/flag/klax/large/north/New() + ..(loc, NORTH) + +/obj/structure/sign/flag/klax/large/south/New() + ..(loc, SOUTH) + +/obj/structure/sign/flag/klax/large/east/New() + ..(loc, EAST) + +/obj/structure/sign/flag/klax/large/west/New() + ..(loc, WEST) + +// Hive C'thur + +/obj/item/flag/cthur + name = "\improper Hive C'thur flag" + desc = "The flag of Hive C'thur." + flag_path = "cthur" + flag_structure = /obj/structure/sign/flag/cthur + +/obj/structure/sign/flag/cthur + name = "\improper Hive C'thur flag" + desc = "The flag of Hive C'thur." + flag_path = "cthur" + icon_state = "cthur" + flag_item = /obj/item/flag/cthur + +/obj/structure/sign/flag/cthur/unmovable + unmovable = TRUE + +/obj/item/flag/cthur/l + name = "large Hive C'thur flag" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/cthur/large + +/obj/structure/sign/flag/cthur/large + icon_state = "cthur_l" + flag_path = "cthur" + flag_size = TRUE + flag_item = /obj/item/flag/cthur/l + +/obj/structure/sign/flag/cthur/large/north/New() + ..(loc, NORTH) + +/obj/structure/sign/flag/cthur/large/south/New() + ..(loc, SOUTH) + +/obj/structure/sign/flag/cthur/large/east/New() + ..(loc, EAST) + +/obj/structure/sign/flag/cthur/large/west/New() + ..(loc, WEST) diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index a32303d1841..34fdb50f05d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -162,6 +162,12 @@ banners["banner, Republic of Assunzione"] = /obj/item/flag/assunzione banners["banner, New Gibson"] = /obj/item/flag/newgibson banners["banner, Visegrad"] = /obj/item/flag/visegrad + banners["banner, Union of Port Antillia"] = /obj/item/flag/portantillia + banners["banner, Sovereign Solarian Republic of San Colette"] = /obj/item/flag/sancolette + banners["banner, Mictlan"] = /obj/item/flag/mictlan + 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 gear_tweaks += new /datum/gear_tweak/path(banners) /datum/gear/standard @@ -216,6 +222,12 @@ flags["flag, Private Military Contracting Group"] = /obj/item/flag/pmcg/l flags["flag, United Syndicates of Himeo"] = /obj/item/flag/himeo/l flags["flag, Republic of Assunzione"] = /obj/item/flag/assunzione/l + flags["flag, Union of Port Antillia"] = /obj/item/flag/portantillia + flags["flag, Sovereign Solarian Republic of San Colette"] = /obj/item/flag/sancolette/l + flags["flag, Mictlan"] = /obj/item/flag/mictlan/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 gear_tweaks += new /datum/gear_tweak/path(flags) /datum/gear/towel diff --git a/html/changelogs/SimpleMaroon-flagchamp.yml b/html/changelogs/SimpleMaroon-flagchamp.yml new file mode 100644 index 00000000000..da548ba0359 --- /dev/null +++ b/html/changelogs/SimpleMaroon-flagchamp.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 six new banners and flags to the loadout: Port Antillia, San Colette, Mictlan, Zo'ra, K'lax, and C'thur." diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index bb82156d38a..aaf611f4c20 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ