From bf69a21250a48ad04d01209f6a9d08210e3dcf68 Mon Sep 17 00:00:00 2001
From: Fishfish458 <47410468+Fishfish458@users.noreply.github.com>
Date: Thu, 28 Apr 2022 16:01:07 -0600
Subject: [PATCH] Missing Storage UI hot fix (#7835)

Co-authored-by: fishfish458 <fishfish458>
---
 .../Clothing/Belt/base_clothingbelt.yml       | 12 ++++++
 .../Entities/Clothing/Belt/belts.yml          | 38 ++++++-------------
 .../Clothing/OuterClothing/wintercoats.yml    | 12 +++---
 3 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
index 46edd5f845..464f5e5270 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
@@ -11,3 +11,15 @@
     quickEquip: false
     equipSound:
       path: /Audio/Items/belt_equip.ogg
+
+- type: entity
+  abstract: true
+  parent: ClothingBeltBase
+  id: ClothingBeltStorageBase
+  components:
+  - type: Storage
+    capacity: 40
+  - type: UserInterface
+    interfaces:
+    - key: enum.StorageUiKey.Key
+      type: StorageBoundUserInterface
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 0cb458f1b2..846f7724a2 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -1,7 +1,7 @@
 # Belts that need/have visualizers
 
 - type: entity
-  parent: ClothingBeltBase
+  parent: ClothingBeltStorageBase
   id: ClothingBeltUtility
   name: utility belt
   description: Can hold various things.
@@ -11,7 +11,6 @@
   - type: Clothing
     sprite: Clothing/Belt/utility.rsi
   - type: Storage
-    capacity: 40
     # TODO: Fill this out more.
     whitelist:
       tags:
@@ -62,13 +61,9 @@
     visuals:
     - type: MappedItemVisualizer
       sprite: Clothing/Belt/belt_overlay.rsi
-  - type: UserInterface
-    interfaces:
-    - key: enum.StorageUiKey.Key
-      type: StorageBoundUserInterface
 
 - type: entity
-  parent: ClothingBeltBase
+  parent: ClothingBeltStorageBase
   id: ClothingBeltChiefEngineer
   name: chief engineer's toolbelt
   description: Holds tools, looks snazzy.
@@ -143,7 +138,7 @@
       sprite: Clothing/Belt/belt_overlay.rsi
 
 - type: entity
-  parent: ClothingBeltBase
+  parent: ClothingBeltStorageBase
   id: ClothingBeltAssault
   name: assault belt
   description: A tactical assault belt.
@@ -153,7 +148,6 @@
   - type: Clothing
     sprite: Clothing/Belt/assault.rsi
   - type: Storage
-    capacity: 40
     whitelist:
       tags:
         - CigPack
@@ -181,7 +175,7 @@
       sprite: Clothing/Belt/belt_overlay.rsi
 
 - type: entity
-  parent: ClothingBeltBase
+  parent: ClothingBeltStorageBase
   id: ClothingBeltJanitor
   name: janibelt
   description: A belt used to hold most janitorial supplies.
@@ -191,7 +185,6 @@
   - type: Clothing
     sprite: Clothing/Belt/janitor.rsi
   - type: Storage
-    capacity: 40
     whitelist:
       tags:
         - Wrench
@@ -220,7 +213,7 @@
       sprite: Clothing/Belt/belt_overlay.rsi
 
 - type: entity
-  parent: ClothingBeltBase
+  parent: ClothingBeltStorageBase
   id: ClothingBeltMedical
   name: medical belt
   description: Can hold various medical equipment.
@@ -230,7 +223,6 @@
   - type: Clothing
     sprite: Clothing/Belt/medical.rsi
   - type: Storage
-    capacity: 40
     whitelist:
       tags:
         - Wrench
@@ -282,7 +274,7 @@
       sprite: Clothing/Belt/belt_overlay.rsi
 
 - type: entity
-  parent: ClothingBeltBase
+  parent: ClothingBeltStorageBase
   id: ClothingBeltPlant
   name: botanical belt
   description: A belt used to hold most hydroponics supplies. Suprisingly, not green.
@@ -292,7 +284,6 @@
   - type: Clothing
     sprite: Clothing/Belt/plant.rsi
   - type: Storage
-    capacity: 40
     whitelist:
       tags:
         - BotanyHoe
@@ -337,7 +328,7 @@
       sprite: Clothing/Belt/belt_overlay.rsi
 
 - type: entity
-  parent: ClothingBeltBase
+  parent: ClothingBeltStorageBase
   id: ClothingBeltSecurity
   name: security belt
   description: Can hold security gear like handcuffs and flashes.
@@ -347,7 +338,6 @@
   - type: Clothing
     sprite: Clothing/Belt/security.rsi
   - type: Storage
-    capacity: 40
     whitelist:
       tags:
         - CigPack
@@ -373,7 +363,7 @@
       sprite: Clothing/Belt/belt_overlay.rsi
 
 - type: entity
-  parent: ClothingBeltBase
+  parent: ClothingBeltStorageBase
   id: ClothingBeltSheath
   name: sabre sheath
   description: An ornate sheath designed to hold an officer's blade.
@@ -401,7 +391,7 @@
 # Belts without visualizers
 
 - type: entity
-  parent: ClothingBeltBase
+  parent: ClothingBeltStorageBase
   id: ClothingBeltBandolier
   name: bandolier
   description: A bandolier for holding shotgun ammunition.
@@ -429,7 +419,7 @@
     quickEquip: true
 
 - type: entity
-  parent: ClothingBeltBase
+  parent: ClothingBeltStorageBase
   id: ClothingBeltHolster
   name: shoulder holster
   description: 'A holster to carry a handgun and ammo. WARNING: Badasses only.'
@@ -442,7 +432,7 @@
     capacity: 20
 
 - type: entity
-  parent: ClothingBeltBase
+  parent: ClothingBeltStorageBase
   id: ClothingBeltSecurityWebbing
   name: security webbing
   description: Unique and versatile chest rig, can hold security gear.
@@ -451,11 +441,9 @@
     sprite: Clothing/Belt/securitywebbing.rsi
   - type: Clothing
     sprite: Clothing/Belt/securitywebbing.rsi
-  - type: Storage
-    capacity: 40
 
 - type: entity
-  parent: ClothingBeltBase
+  parent: ClothingBeltStorageBase
   id: ClothingBeltMilitaryWebbing
   name: chest rig
   description: A set of tactical webbing worn by Syndicate boarding parties.
@@ -464,8 +452,6 @@
     sprite: Clothing/Belt/militarywebbing.rsi
   - type: Clothing
     sprite: Clothing/Belt/militarywebbing.rsi
-  - type: Storage
-    capacity: 40
 
 - type: entity
   parent: ClothingBeltBase
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index 055e8c3e58..2f367e6f57 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -1,8 +1,8 @@
 - type: entity
-  parent: ClothingOuterBase
+  parent: ClothingOuterStorageBase
   id: ClothingOuterWinterCoat
   name: winter coat
-  description: A heavy jacket made from 'synthetic' animal furs. 
+  description: A heavy jacket made from 'synthetic' animal furs.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
@@ -15,8 +15,6 @@
       coefficients:
         Slash: 0.95
         Heat: 0.75
-  - type: Storage
-    capacity: 10
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -71,7 +69,7 @@
 - type: entity
   parent: ClothingOuterWinterCoat
   id: ClothingOuterWinterChem
-  name: chemistry winter coat 
+  name: chemistry winter coat
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/WinterCoats/coatchem.rsi
@@ -151,7 +149,7 @@
 - type: entity
   parent: ClothingOuterWinterCoat
   id: ClothingOuterWinterMed
-  name: medical winter coat 
+  name: medical winter coat
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/WinterCoats/coatmed.rsi
@@ -201,7 +199,7 @@
 - type: entity
   parent: ClothingOuterWinterCoat
   id: ClothingOuterWinterRobo
-  name: robotics winter coat 
+  name: robotics winter coat
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/WinterCoats/coatrobo.rsi