diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
index d994967a2aa..ddf3ebdb9e1 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
@@ -7,3 +7,13 @@
   cost: 1000
   category: Fun
   group: market
+
+- type: cargoProduct
+  id: CapGunSet
+  icon:
+    sprite: Objects/Fun/caps.rsi
+    state: icon
+  product: CrateCapGunSet
+  cost: 1000
+  category: Fun
+  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml
index 45e371ac63b..18185d975e3 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml
@@ -8,3 +8,18 @@
         amount: 1
       - id: BoxCartridgeBB
         amount: 2
+
+- type: entity
+  name: cap gun box set
+  description: A box filled with fun, harmless cap guns that are sure to keep security entertained and the air smelling of sulfur.
+  id: CrateCapGunSet
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+      - id: RevolverCapGun
+        amount: 1
+      - id: SpeedLoaderCap
+        amount: 2
+      - id: BoxCartridgeCap
+        amount: 2