diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index bd90f7c6f6..c9c681f1b9 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -98,3 +98,95 @@
       - id: ClothingHeadHelmetBombSuit
       - id: ClothingOuterSuitBomb
       - id: ClothingMaskGas
+
+- type: entity
+  id: ShotgunSafeDisabler
+  suffix: Disabler
+  parent: ShotgunSafe
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponDisabler
+        amount: 5
+
+- type: entity
+  id: ShotgunSafePistolMK58
+  suffix: MK58
+  parent: ShotgunSafe
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponPistolMk58
+        amount: 4
+      - id: MagazinePistol
+        amount: 8
+
+- type: entity
+  id: ShotgunSafeRifleLecter
+  suffix: Lecter
+  parent: ShotgunSafe
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponRifleLecter
+        amount: 2
+      - id: MagazineRifle
+        amount: 4
+
+- type: entity
+  id: ShotgunSafeSubMachineGunVector
+  suffix: Vector
+  parent: ShotgunSafe
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponSubMachineGunVector
+        amount: 2
+      - id: MagazineMagnumSubMachineGun
+        amount: 4
+
+- type: entity
+  id: ShotgunSafeShotgunEnforcer
+  suffix: Enforcer
+  parent: ShotgunSafe
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponShotgunEnforcer
+        amount: 2
+      - id: MagazineShotgun
+        amount: 4
+
+- type: entity
+  id: ShotgunSafeShotgunKammerer
+  suffix: Kammerer
+  parent: ShotgunSafe
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponShotgunKammerer
+        amount: 2
+      - id: MagazineShotgun
+        amount: 4
+
+- type: entity
+  id: ShotgunSafeSubMachineGunWt550
+  suffix: Wt550
+  parent: ShotgunSafe
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponSubMachineGunWt550
+        amount: 2
+      - id: MagazineMagnumSubMachineGun
+        amount: 4
+
+- type: entity
+  id: ShotgunSafeLaserCarbine
+  suffix: Laser Carbine
+  parent: ShotgunSafe
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponLaserCarbine
+        amount: 3
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index a2bbed4943..da60004f20 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -321,6 +321,20 @@
   - type: AccessReader
     access: [["Security"]]
 
+- type: entity
+  id: ShotgunSafe
+  parent: LockerBaseSecure
+  name: shotgun safe
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: shotguncase
+      state_open: shotguncase_open
+      state_closed: shotguncase_door
+  - type: AccessReader
+    access: [["Security"]]
+
 # Detective
 - type: entity
   id: LockerDetective