diff --git a/code/__DEFINES/__starfly.dm b/code/__DEFINES/__starfly.dm
index 5c49118a1c..8bac6b67be 100644
--- a/code/__DEFINES/__starfly.dm
+++ b/code/__DEFINES/__starfly.dm
@@ -38,6 +38,7 @@
 
 #define STARFLY13_MODULE_ADMIN_VERB_FREEZE_ENABLED
 #define STARFLY13_MODULE_CRYOSLEEP_SYMPTOMS_FLAG_ENABLED
+#define STARFLY13_MODULE_GUN_LORE_ENABLED
 #define STARFLY13_MODULE_OXYGEN_DAMAGE_MOD_ENABLED
 #define STARFLY13_MODULE_PATCH_UPSTREAM_ENABLED
 #define STARFLY13_MODULE_RKSH_UNATHI_ENABLED
diff --git a/code/__DEFINES/guns.dm b/code/__DEFINES/guns.dm
index d1a0da6c9d..e579d1f0aa 100644
--- a/code/__DEFINES/guns.dm
+++ b/code/__DEFINES/guns.dm
@@ -56,7 +56,19 @@
 #define MANUFACTURER_SHARPLITE "the Sharplite Defense logo"
 #define MANUFACTURER_SHARPLITE_NEW "the Nanotrasen-Sharplite logo"
 #define MANUFACTURER_HUNTERSPRIDE "the Hunter's Pride Arms and Ammunition logo"
+//---------------------------------------------------------------------------------------------------------------------
+// STARFLY EDIT - CHANGE BEGIN
+#ifndef STARFLY13_MODULE_GUN_LORE_ENABLED
+//---------------------------------------------------------------------------------------------------------------------
 #define MANUFACTURER_SOLARARMORIES "the Solarbundswaffenkammer emblem"
+//---------------------------------------------------------------------------------------------------------------------
+#else
+//---------------------------------------------------------------------------------------------------------------------
+#define MANUFACTURER_SOLARARMORIES "the Solarian emblem"
+//---------------------------------------------------------------------------------------------------------------------
+#endif // #ifndef STARFLY13_MODULE_GUN_LORE_ENABLED
+// STARFLY EDIT - CHANGE END
+//---------------------------------------------------------------------------------------------------------------------
 #define MANUFACTURER_SCARBOROUGH "the Scarborough Arms logo"
 #define MANUFACTURER_EOEHOMA "the Eoehoma Firearms emblem"
 #define MANUFACTURER_NANOTRASEN_OLD "an outdated Nanotrasen logo"
diff --git a/modular_starfly/NOTES.md b/modular_starfly/NOTES.md
index a225b94b53..98a8dad66b 100644
--- a/modular_starfly/NOTES.md
+++ b/modular_starfly/NOTES.md
@@ -4,7 +4,7 @@ Some notes about the current state of modularization of previous STARFLY-13 cont
 
 
 ## More Needs
-More things that we'll need to create to suport Modular Starfly
+More things that we'll need to create to support Modular Starfly
 
 - [ ] Create a CI action to compile shiptest.dmb with each module enabled/disabled
 - [ ] Create a CI action to compare `code/__DEFINES/__STARFLY/__modules.dm` with `tgui/packages/tgui/starfly.ts`
@@ -56,3 +56,8 @@ Upstream changes we don't intend to modularize
 
 - [-] Create MAGIC module (https://github.com/shiptest-ss13/Shiptest/pull/2877)
 - [-] Create MUTATION_TOXIN module (https://github.com/shiptest-ss13/Shiptest/pull/2659)
+
+## Further Ports
+Changes to sister servers that we would like to copy/influence our own.
+
+- [-] MODS touch-up! (https://github.com/PentestSS13/Pentest/pull/443)
\ No newline at end of file
diff --git a/modular_starfly/modules/gun_lore/README.md b/modular_starfly/modules/gun_lore/README.md
new file mode 100644
index 0000000000..640a033bd0
--- /dev/null
+++ b/modular_starfly/modules/gun_lore/README.md
@@ -0,0 +1,40 @@
+# Starfly-13 Gun Lore
+
+Module ID: `GUN_LORE`
+
+## Description
+
+Updates weapon availability in the marketplace, introduces new manufacturers, adds weapons, reassigns weapons, big lore changes all around.
+
+## TG Proc/File Changes
+
+- N/A
+<!-- If you edited any core procs, you should list them here. You should specify the files and procs you changed.
+E.g:
+- `code/modules/mob/living.dm`: `proc/overriden_proc`, `var/overriden_var`
+-->
+
+## Modular Overrides
+
+- N/A
+<!-- If you added a new modular override (file or code-wise) for your module, you should list it here. Code files should specify what procs they changed, in case of multiple modules using the same file.
+E.g:
+- `modular_starfly/master_files/sound/my_cool_sound.ogg`
+- `modular_starfly/master_files/code/my_modular_override.dm`: `proc/overriden_proc`, `var/overriden_var`
+-->
+
+## Defines
+
+- N/A
+<!-- If you needed to add any defines, mention the files you added those defines in, along with the name of the defines. -->
+
+## Included files that are not contained in this module
+
+- N/A
+<!-- Likewise, be it a non-modular file or a modular one that's not contained within the folder belonging to this specific module, it should be mentioned here. Good examples are icons or sounds that are used between multiple modules, or other such edge-cases. -->
+
+## Credits
+
+- Patrick Meade created this module.
+- LectroNyx is the original author of the content of this module.
+- Most of this content first appeared here: https://github.com/Starfly-13/STARFLY-13/pull/55
diff --git a/modular_starfly/modules/gun_lore/_defines.dm b/modular_starfly/modules/gun_lore/_defines.dm
new file mode 100644
index 0000000000..9395705bee
--- /dev/null
+++ b/modular_starfly/modules/gun_lore/_defines.dm
@@ -0,0 +1,30 @@
+#ifdef STARFLY13_MODULE_GUN_LORE_ENABLED
+//---------------------------------------------------------------------------------------------------------------------
+
+// _defines.dm
+// Copyright 2024 LectroNyx.
+// Copyright 2026 Patrick Meade.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+//---------------------------------------------------------------------------
+
+// See also: code/__DEFINES/guns.dm
+
+#define MANUFACTURER_ROSEUS "the Roseus Galactic logo"
+#define MANUFACTURER_ADHOMAI "a Tajaran emblem"
+#define MANUFACTURER_LAKVAR "the letters LKV"
+#define MANUFACTURER_HEPHAESTUS "the Hephaestus Industries logo"
+
+//---------------------------------------------------------------------------------------------------------------------
+#endif // #ifdef STARFLY13_MODULE_GUN_LORE_ENABLED
diff --git a/shiptest.dme b/shiptest.dme
index 688b8a92bf..a67274acac 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -3790,6 +3790,7 @@
 #include "modular_starfly\modules\admin_verb_freeze\overlays.dm"
 #include "modular_starfly\modules\cryosleep_symptoms\cryopod.dm"
 #include "modular_starfly\modules\cryosleep_symptoms\game_options.dm"
+#include "modular_starfly\modules\gun_lore\_defines.dm"
 #include "modular_starfly\modules\rksh_unathi\_defines.dm"
 #include "modular_starfly\modules\rksh_unathi\lizardpeople.dm"
 #include "modular_starfly\modules\roseus_galactic\syndicate.dm"
diff --git a/tgui/packages/tgui/starfly.ts b/tgui/packages/tgui/starfly.ts
index f996d83bba..54b769c565 100644
--- a/tgui/packages/tgui/starfly.ts
+++ b/tgui/packages/tgui/starfly.ts
@@ -25,6 +25,7 @@
 export const STARFLY13 = {
 	MODULE_ADMIN_VERB_FREEZE_ENABLED: true,
 	MODULE_CRYOSLEEP_SYMPTOMS_FLAG_ENABLED: true,
+	MODULE_GUN_LORE_ENABLED: true,
 	MODULE_OXYGEN_DAMAGE_MOD_ENABLED: true,
 	MODULE_PATCH_UPSTREAM_ENABLED: true,
 	MODULE_RKSH_UNATHI_ENABLED: true,