diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index 314f7c4f52..a76620c16b 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -20,7 +20,9 @@
         prob: 0.4
       - id: OxygenTankFilled
         prob: 0.2
-
+      - id: FlareGun
+        prob: 0.05
+        
 - type: entity
   id: ClosetFireFilled
   parent: ClosetFire
@@ -70,3 +72,5 @@
           prob: 0.33
         - id: ClothingHeadHatCone
           prob: 0.2
+        - id: FlareGun
+          prob: 0.1
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index 347215e65f..068ecd6242 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -256,50 +256,3 @@
   - type: Appearance
     visuals:
     - type: BarrelBoltVisualizer
-
-- type: entity
-  name: flare gun
-  parent: LauncherBase
-  id: FlareGun
-  description: A compact, single-shot pistol that fires shotgun shells.
-  components:
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
-    layers:
-      - state: base
-        map: ["enum.RangedBarrelVisualLayers.Base"]
-      - state: bolt-closed
-        map: ["enum.RangedBarrelVisualLayers.Bolt"]
-  - type: Icon
-    sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
-    state: icon
-  - type: Item
-    size: 12
-    sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
-  - type: RangedWeapon
-  - type: BoltActionBarrel
-    caliber: Shotgun
-    currentSelector: Single
-    allSelectors:
-    - Single
-    fillPrototype: ShellShotgun
-    fireRate: 8.0
-    capacity: 1
-    minAngle: 25
-    maxAngle: 70
-    angleIncrease: 30
-    angleDecay: 30
-    ammoSpreadRatio: 0.85
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
-    soundEmpty:
-      path: /Audio/Weapons/Guns/Empty/empty.ogg
-    soundInsert:
-      path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg
-    soundBoltOpen:
-      path: /Audio/Weapons/Guns/Cock/shotgun_open.ogg
-    soundBoltClosed:
-      path: /Audio/Weapons/Guns/Cock/shotgun_close.ogg
-  - type: Appearance
-    visuals:
-    - type: BarrelBoltVisualizer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
new file mode 100644
index 0000000000..497f19dffa
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
@@ -0,0 +1,46 @@
+- type: entity
+  name: flare gun
+  parent: LauncherBase
+  id: FlareGun
+  description: A compact, single-shot pistol that fires shotgun shells.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
+    layers:
+      - state: base
+        map: ["enum.RangedBarrelVisualLayers.Base"]
+      - state: bolt-closed
+        map: ["enum.RangedBarrelVisualLayers.Bolt"]
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
+    state: icon
+  - type: Item
+    size: 12
+    sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
+  - type: RangedWeapon
+  - type: BoltActionBarrel
+    caliber: Shotgun
+    currentSelector: Single
+    allSelectors:
+    - Single
+    fillPrototype: ShellShotgunFlare
+    fireRate: 8.0
+    capacity: 1
+    minAngle: 25
+    maxAngle: 70
+    angleIncrease: 30
+    angleDecay: 30
+    ammoSpreadRatio: 0.85
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
+    soundEmpty:
+      path: /Audio/Weapons/Guns/Empty/empty.ogg
+    soundInsert:
+      path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg
+    soundBoltOpen:
+      path: /Audio/Weapons/Guns/Cock/shotgun_open.ogg
+    soundBoltClosed:
+      path: /Audio/Weapons/Guns/Cock/shotgun_close.ogg
+  - type: Appearance
+    visuals:
+    - type: BarrelBoltVisualizer
\ No newline at end of file