diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml
index 50ba7cc6a6f..94d0748b3c4 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml
@@ -65,3 +65,15 @@
     contents:
     - id: WeaponEnergyGunMini
       amount: 3
+
+- type: entity
+  parent: GunSafe
+  id: GunSafeM90Rifle
+  name: M-90 rifle safe
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleM90
+      amount: 2
+    - id: MagazineRifle
+      amount: 4
diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/safes.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/safes.yml
new file mode 100644
index 00000000000..c058d29f4a2
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/safes.yml
@@ -0,0 +1,50 @@
+- type: entity
+  id: BaseGunSafeSpawner
+  name: random safe spawner
+  parent: MarkerBase
+  abstract: true
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Storage/closet.rsi
+          state: shotguncase
+    - type: RandomSpawner
+      offset: 0
+
+- type: entity
+  suffix: Shotgun
+  id: ShotgunSafeSpawner
+  parent: BaseGunSafeSpawner
+  components:
+    - type: RandomSpawner
+      prototypes:
+        - GunSafeShotgunEnforcer
+        - GunSafeShotgunKammerer
+        - GunSafeAdjutantShotgun
+
+- type: entity
+  suffix: Rifle
+  id: RifleSafeSpawner
+  parent: BaseGunSafeSpawner
+  components:
+    - type: RandomSpawner
+      prototypes:
+        - GunSafeVulcanRifle
+        - GunSafeSubMachineGunDrozd
+        - GunSafeRifleLecter
+        - GunSafeM90Rifle
+
+- type: entity
+  suffix: Handgun
+  id: HandgunSafeSpawner
+  parent: BaseGunSafeSpawner
+  components:
+    - type: RandomSpawner
+      prototypes:
+        - GunSafePistolMk58
+      rarePrototypes:
+        - GunSafeEnergyGunMini
+        - GunSafePistolUniversal
+        - GunSafeSubMachineGunWt550
+      rareChance: 0.15