diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/security-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/security-crates.ftl
index 63978178ec..f969e15397 100644
--- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/security-crates.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/security-crates.ftl
@@ -8,7 +8,7 @@ ent-CrateSecurityNonlethal = nonlethals crate
     .desc = Disabler weapons. Requires Security access to open.
 
 ent-CrateSecurityRiot = swat crate
-    .desc = Contains two sets of heavy body armor and helmets and 2 shotguns with 6 rounds of beanbag shells each. Requires Armory access to open.
+    .desc = Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open.
 
 ent-CrateSecuritySupplies = security supplies crate
     .desc = Contains various supplies for the station's Security team. Requires Security access to open.
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
index 8e01183445..c895e00d49 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
@@ -42,11 +42,12 @@
         amount: 2
       - id: ClothingHeadHelmetRiot
         amount: 2
-      - id: WeaponShotgunEnforcer
+      - id: WeaponShotgunEnforcerRubber
         amount: 2
       - id: BoxBeanbag
         amount: 2
-#      - ShieldRiot
+      - id: RiotShield
+        amount: 2
 #      - SecGasmask
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index cbd49c0065..4197905714 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -138,7 +138,21 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
   - type: BallisticAmmoProvider
-
+  
+- type: entity
+  name: Enforcer
+  parent: BaseWeaponShotgun
+  id: WeaponShotgunEnforcerRubber
+  description: A next-generation Frozen Star shotgun. Uses .50 shotgun shells.
+  suffix: Non-Lethal
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
+  - type: BallisticAmmoProvider
+    proto: ShellShotgunBeanbag
+  
 - type: entity
   name: Kammerer
   parent: BaseWeaponShotgun