diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
index dd3a3cd0f10..ddf3ebdb9e1 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
@@ -8,17 +8,12 @@
   category: Fun
   group: market
 
-- 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
+- type: cargoProduct
+  id: CapGunSet
+  icon:
+    sprite: Objects/Fun/caps.rsi
+    state: icon
+  product: CrateCapGunSet
+  cost: 1000
+  category: Fun
+  group: market