diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index fe4896bd0ae..49db94622c6 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -251,7 +251,7 @@ /obj/structure/sign/flag/blank name = "blank banner" - desc = "A blank blue flag" + desc = "A blank blue flag." icon_state = "flag" /obj/structure/sign/flag/blank/left @@ -261,7 +261,7 @@ icon_state = "flag_r" /obj/structure/sign/flag/sol - name = "Sol Alliance Flag" + name = "Sol Alliance flag" desc = "The bright blue flag of the Alliance of Sovereign Solarian Nations." icon_state = "solgov" @@ -272,7 +272,7 @@ icon_state = "solgov_r" /obj/item/weapon/flag/sol - name = "Sol Alliance Flag" + name = "Sol Alliance flag" desc = "The bright blue flag of the Alliance of Sovereign Solarian Nations." flag_path = "solgov" @@ -280,8 +280,8 @@ flag_size = 1 /obj/structure/sign/flag/dominia - name = "Dominian Empire Flag" - desc = "The Imperial Standard of Emperor Boleslaw Keeser of Dominia" + name = "Dominian Empire flag" + desc = "The Imperial Standard of Emperor Boleslaw Keeser of Dominia." icon_state = "dominia" /obj/structure/sign/flag/dominia/left @@ -291,15 +291,15 @@ icon_state = "dominia_r" /obj/item/weapon/flag/dominia - name = "Dominian Empire Flag" - desc = "The Imperial Standard of Emperor Boleslaw Keeser of Dominia" + name = "Dominian Empire flag" + desc = "The Imperial Standard of Emperor Boleslaw Keeser of Dominia." flag_path = "dominia" /obj/item/weapon/flag/dominia/l flag_size = 1 /obj/structure/sign/flag/elyra - name = "Elyran Flag" + name = "Elyran flag" desc = "The hopeful colors of the Serene Republic of Elyra." icon_state = "elyra" @@ -310,7 +310,7 @@ icon_state = "elyra_r" /obj/item/weapon/flag/elyra - name = "Elyran Flag" + name = "Elyran flag" desc = "The hopeful colors of the Serene Republic of Elyra." flag_path = "elyra" @@ -318,7 +318,7 @@ flag_size = 1 /obj/structure/sign/flag/hegemony - name = "Hegemony Flag" + name = "Hegemony flag" desc = "The feudal standard of the Izweski Hegemony." icon_state = "izweski" @@ -329,7 +329,7 @@ icon_state = "izweski_r" /obj/item/weapon/flag/hegemony - name = "Hegemony Flag" + name = "Hegemony flag" desc = "The feudal standard of the Izweski Hegemony." flag_path = "izweski" @@ -337,8 +337,8 @@ flag_size = 1 /obj/structure/sign/flag/jargon - name = "Jargon Federation Flag" - desc = "The insignia of the Jargon Federation" + name = "Jargon Federation flag" + desc = "The insignia of the Jargon Federation." icon_state = "jargon" /obj/structure/sign/flag/jargon/left @@ -348,7 +348,7 @@ icon_state = "jargon_r" /obj/item/weapon/flag/jargon - name = "Jargon Federation Flag" + name = "Jargon Federation flag" desc = "The insignia of the Jargon Federation" flag_path = "jargon" @@ -356,7 +356,7 @@ flag_size = 1 /obj/structure/sign/flag/nanotrasen - name = "NanoTrasen Corporation Flag" + name = "NanoTrasen Corporation flag" desc = "The logo of NanoTrasen on a flag." icon_state = "nanotrasen" @@ -367,13 +367,32 @@ icon_state = "nanotrasen_r" /obj/item/weapon/flag/nanotrasen - name = "NanoTrasen Corporation Flag" - desc = "The logo of NanoTrasen on a flag" + name = "NanoTrasen Corporation flag" + desc = "The logo of NanoTrasen on a flag." flag_path = "nanotrasen" /obj/item/weapon/flag/nanotrasen/l flag_size = 1 +/obj/structure/sign/flag/eridani + name = "Eridani Corporate Federation flag" + desc = "The logo of the Eridani Corporate Federation on a flag." + icon_state = "eridani" + +/obj/structure/sign/flag/eridani/left + icon_state = "eridani_l" + +/obj/structure/sign/flag/eridani/right + icon_state = "eridani_r" + +/obj/item/weapon/flag/eridani + name = "Eridani Corporate Federation flag" + desc = "The logo of the Eridani Corporate Federation on a flag." + flag_path = "eridani" + +/obj/item/weapon/flag/eridani/l + flag_size = 1 + /obj/item/weapon/flag name = "boxed flag" desc = "A flag neatly folded into a wooden container." diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 8cca5fb3994..81b42ab4c84 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -76,6 +76,7 @@ banners["banner, Hegemony"] = /obj/item/weapon/flag/hegemony banners["banner, Jargon"] = /obj/item/weapon/flag/jargon banners["banner, NanoTrasen"] = /obj/item/weapon/flag/nanotrasen + banners["banner, Eridani Fed"] = /obj/item/weapon/flag/eridani gear_tweaks += new/datum/gear_tweak/path(banners) /datum/gear/flag @@ -92,6 +93,7 @@ flags["flag, Hegemony"] = /obj/item/weapon/flag/hegemony/l flags["flag, Jargon"] = /obj/item/weapon/flag/jargon/l flags["flag, NanoTrasen"] = /obj/item/weapon/flag/nanotrasen/l + flags["flag, Eridani Fed"] = /obj/item/weapon/flag/eridani/l gear_tweaks += new/datum/gear_tweak/path(flags) @@ -101,4 +103,4 @@ /datum/gear/towel/New() ..() - gear_tweaks = list(gear_tweak_free_color_choice) \ No newline at end of file + gear_tweaks = list(gear_tweak_free_color_choice) diff --git a/html/changelogs/skull132-eridani_flag.yml b/html/changelogs/skull132-eridani_flag.yml new file mode 100644 index 00000000000..07f466a9834 --- /dev/null +++ b/html/changelogs/skull132-eridani_flag.yml @@ -0,0 +1,5 @@ +author: Skull132 +delete-after: True + +changes: + - rscadd: "Added the flag of the best nation: the Eridani Corporate Federation." diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index c6ed8d50099..91ab669e3d3 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ