diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 89f53df9634..e06cb47c01b 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -1407,7 +1407,9 @@ /obj/item/flag/vaurca, /obj/item/flag/vaurca/l, /obj/item/flag/zenghu, - /obj/item/flag/zenghu/l + /obj/item/flag/zenghu/l, + /obj/item/flag/coalition, + /obj/item/flag/coalition/l ) /obj/random/gift diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index d5dcbe16b46..39317c85d1b 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -426,6 +426,25 @@ /obj/item/flag/eridani/l flag_size = 1 +/obj/structure/sign/flag/coalition + name = "Coalition of Colonies flag" + desc = "The flag of the diverse Coalition of Colonies." + icon_state = "coalition" + +/obj/structure/sign/flag/coalition/left + icon_state = "coalition_l" + +/obj/structure/sign/flag/coalition/right + icon_state = "coalition_r" + +/obj/item/flag/coalition + name = "Coalition of Colonies flag" + desc = "The flag of the diverse Coalition of Colonies." + flag_path = "coalition" + +/obj/item/flag/coalition/l + flag_size = 1 + /obj/structure/sign/flag/vaurca name = "Sedantis flag" desc = "The emblem of Sedantis on a flag, emblematic of Vaurca longing." diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 1248b1ad7e9..ea5b407a5ff 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -102,6 +102,7 @@ banners["banner, Democratic People's Republic of Adhomai"] = /obj/item/flag/dpra banners["banner, New Kingdom of Adhomai"] = /obj/item/flag/nka banners["banner, Republic of Biesel"] = /obj/item/flag/biesel + banners["banner, Coalition of Colonies"] = /obj/item/flag/coalition gear_tweaks += new/datum/gear_tweak/path(banners) /datum/gear/flag @@ -124,6 +125,7 @@ flags["flag, Democratic People's Republic of Adhomai"] = /obj/item/flag/dpra/l flags["flag, New Kingdom of Adhomai"] = /obj/item/flag/nka/l flags["flag, Republic of Biesel"] = /obj/item/flag/biesel/l + flags["flag, Coalition of Colonies"] = /obj/item/flag/coalition/l gear_tweaks += new/datum/gear_tweak/path(flags) /datum/gear/towel diff --git a/html/changelogs/FearTheBlackout-coalitionflags.yml b/html/changelogs/FearTheBlackout-coalitionflags.yml new file mode 100644 index 00000000000..469a6333f02 --- /dev/null +++ b/html/changelogs/FearTheBlackout-coalitionflags.yml @@ -0,0 +1,5 @@ +author: FearTheBlackout +delete-after: True +changes: + - rscadd: "Adds a Coalition of Colonies flag and banner to the loadout." + - imageadd: "Adds sprites for the Coalition of Colonies flags, courtesy of Kyres." diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index e77d352150e..990373946c9 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ