diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm
index cce6cdd4603..673d12c27f2 100644
--- a/code/game/objects/structures/flags_banners.dm
+++ b/code/game/objects/structures/flags_banners.dm
@@ -2236,6 +2236,45 @@
 /obj/structure/sign/flag/silversun/large/west/Initialize(mapload)
 	. = ..(mapload, WEST)
 
+// Luna
+
+/obj/item/flag/luna
+	name = "\improper Lunan flag"
+	desc = "The flag of Luna. The crescent represents Luna itself, and is meant to remind viewers of Selene's headpiece."
+	flag_path = "luna"
+	flag_structure = /obj/structure/sign/flag/luna
+
+/obj/structure/sign/flag/luna
+	name = "\improper Lunan flag"
+	desc = "The flag of Luna. The crescent represents Luna itself, and is meant to remind viewers of Selene's headpiece."
+	flag_path = "luna"
+	icon_state = "luna"
+	flag_item = /obj/item/flag/luna
+
+/obj/item/flag/luna/l
+	name = "large Lunan flag"
+	flag_size = TRUE
+	flag_structure = /obj/structure/sign/flag/luna/large
+
+/obj/structure/sign/flag/luna/large
+	icon_state = "luna_l"
+	flag_path = "luna"
+	flag_size = TRUE
+	flag_item = /obj/item/flag/luna/l
+
+/obj/structure/sign/flag/luna/large/north/Initialize(mapload)
+	. = ..(mapload, NORTH)
+
+/obj/structure/sign/flag/luna/large/south/Initialize(mapload)
+	. = ..(mapload, SOUTH)
+
+/obj/structure/sign/flag/luna/large/east/Initialize(mapload)
+	. = ..(mapload, EAST)
+
+/obj/structure/sign/flag/luna/large/west/Initialize(mapload)
+	. = ..(mapload, WEST)
+
+
 // Hive Zo'ra
 
 /obj/item/flag/zora
diff --git a/code/modules/client/preference_setup/loadout/items/accessories.dm b/code/modules/client/preference_setup/loadout/items/accessories.dm
index 7abdba82c95..bb611525f84 100644
--- a/code/modules/client/preference_setup/loadout/items/accessories.dm
+++ b/code/modules/client/preference_setup/loadout/items/accessories.dm
@@ -606,6 +606,7 @@
 	flagpatch_national["flagpatch, silversun"] = /obj/item/clothing/accessory/flagpatch/silversun
 	flagpatch_national["flagpatch, callisto"] = /obj/item/clothing/accessory/flagpatch/callisto
 	flagpatch_national["flagpatch, venus"] = /obj/item/clothing/accessory/flagpatch/venus
+	flagpatch_national["flagpatch, luna"] = /obj/item/clothing/accessory/flagpatch/luna
 	flagpatch_national["flagpatch, konyang"] = /obj/item/clothing/accessory/flagpatch/konyang
 	flagpatch_national["flagpatch, elyra"] = /obj/item/clothing/accessory/flagpatch/elyra
 	flagpatch_national["flagpatch, coalition"] = /obj/item/clothing/accessory/flagpatch/coalition
diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm
index 24ee9e34ef9..be68c513c1a 100644
--- a/code/modules/client/preference_setup/loadout/items/general.dm
+++ b/code/modules/client/preference_setup/loadout/items/general.dm
@@ -175,6 +175,7 @@
 	banners["banner, Mictlan"] = /obj/item/flag/mictlan
 	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, 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
@@ -246,6 +247,7 @@
 	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
+	flags["flag, Luna"] = /obj/item/flag/luna/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/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm
index 3f03010cb4e..444319a2edf 100644
--- a/code/modules/clothing/suits/modular_armor.dm
+++ b/code/modules/clothing/suits/modular_armor.dm
@@ -531,6 +531,12 @@
 	icon_state = "flagpatch_venus"
 	item_state = "flagpatch_venus"
 
+/obj/item/clothing/accessory/flagpatch/luna
+	name = "luna flagpatch"
+	desc = "A flagpatch representing Luna. The crescent represents Luna itself, and is meant to remind viewers of Selene's headpiece."
+	icon_state = "flagpatch_luna"
+	item_state = "flagpatch_luna"
+
 /obj/item/clothing/accessory/flagpatch/coalition
 	name = "coalition flagpatch"
 	desc = "A flagpatch representing the Coalition of Colonies. Although used on many Coalition worlds, this flag has also come \
diff --git a/html/changelogs/lunanflag.yml b/html/changelogs/lunanflag.yml
new file mode 100644
index 00000000000..396a5ce99d3
--- /dev/null
+++ b/html/changelogs/lunanflag.yml
@@ -0,0 +1,6 @@
+author: Pirouette, StevIII
+
+delete-after: True
+
+changes:
+  - imageadd: "Added a Lunan banner, flag, and flagpatch to loadout."
diff --git a/icons/clothing/kit/modular_armor_accessories.dmi b/icons/clothing/kit/modular_armor_accessories.dmi
index 795ed78dcd9..791b86898f9 100644
Binary files a/icons/clothing/kit/modular_armor_accessories.dmi and b/icons/clothing/kit/modular_armor_accessories.dmi differ
diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi
index cac7879d66c..c89b78adf2d 100644
Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ