Added the Sol Alliance canton to the San Colette flag (#17169)

code/game/objects/structures/flags_banners.dm

@@ -1909,6 +1909,45 @@
 /obj/structure/sign/flag/sancolette/large/west/New()
 	..(loc, WEST)
 
+/obj/item/flag/sancolette/old
+	name = "old Sovereign Solarian Republic of San Colette flag"
+	desc = "The flag of the Sovereign Solarian Republic of San Colette, before its re-integration with the Solarian Alliance through the Northern Solarian Reconstruction Mandate. Still common throughout the spur, as volunteers in the war for the Middle Ring Shield Pact often collected them as memorabilia."
+	flag_path = "sancolette_old"
+	flag_structure = /obj/structure/sign/flag/sancolette/old
+
+/obj/structure/sign/flag/sancolette/old
+	name = "old Sovereign Solarian Republic of San Colette flag"
+	desc = "The flag of the Sovereign Solarian Republic of San Colette, before its re-integration with the Solarian Alliance through the Northern Solarian Reconstruction Mandate. Still common throughout the spur, as volunteers in the war for the Middle Ring Shield Pact often collected them as memorabilia."
+	flag_path = "sancolette_old"
+	icon_state = "sancolette_old"
+	flag_item = /obj/item/flag/sancolette/old
+
+/obj/structure/sign/flag/sancolette/old/unmovable
+	unmovable = TRUE
+
+/obj/item/flag/sancolette/old/l
+	name = "large old Sovereign Solarian Republic of San Colette flag"
+	flag_size = TRUE
+	flag_structure = /obj/structure/sign/flag/sancolette/old/large
+
+/obj/structure/sign/flag/sancolette/old/large
+	icon_state = "sancolette_old_l"
+	flag_path = "sancolette_old"
+	flag_size = TRUE
+	flag_item = /obj/item/flag/sancolette/old/l
+
+/obj/structure/sign/flag/sancolette/old/large/north/New()
+	..(loc, NORTH)
+
+/obj/structure/sign/flag/sancolette/old/large/south/New()
+	..(loc, SOUTH)
+
+/obj/structure/sign/flag/sancolette/old/large/east/New()
+	..(loc, EAST)
+
+/obj/structure/sign/flag/sancolette/old/large/west/New()
+	..(loc, WEST)
+
 // Mictlan
 
 /obj/item/flag/mictlan

code/modules/client/preference_setup/loadout/items/general.dm

@@ -169,6 +169,7 @@
 	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, Old Sovereign Solarian Republic of San Colette"] = /obj/item/flag/sancolette/old
 	banners["banner, Mictlan"] = /obj/item/flag/mictlan
 	banners["banner, New Hai Phong"] = /obj/item/flag/nhp
 	banners["banner, Silversun"] = /obj/item/flag/silversun
@@ -237,6 +238,7 @@
 	flags["flag, Republic of Assunzione"] = /obj/item/flag/assunzione/l
 	flags["flag, Union of Port Antillia"] = /obj/item/flag/portantillia/l
 	flags["flag, Sovereign Solarian Republic of San Colette"] = /obj/item/flag/sancolette/l
+	flags["flag, Old Sovereign Solarian Republic of San Colette"] = /obj/item/flag/sancolette/old/l
 	flags["flag, Mictlan"] = /obj/item/flag/mictlan/l
 	flags["flag, New Hai Phong"] = /obj/item/flag/nhp/l
 	flags["flag, Silversun"] = /obj/item/flag/silversun/l

html/changelogs/GeneralCamo - San Colette re-integration.yml

@@ -0,0 +1,42 @@
+################################
+# 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: GeneralCamo
+
+# 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:
+  - tweak: "Added the Sol Alliance canton to the San Colette flag, reflecting its reintegration into the Solarian Alliance."
+  - rscadd: "Added an old San Colette flag without the canton, for those who collected an old flag and do not wish to swap it out."