Makes sabre sheathe use ItemSlots (#22792)

* added item slot

* fixed filled

* localized verbs

* github check was acting up

diff --git a/Resources/Locale/en-US/clothing/belts.ftl b/Resources/Locale/en-US/clothing/belts.ftl
new file mode 100644 (file)
index 0000000..c0281b9
--- /dev/null
+++ b/Resources/Locale/en-US/clothing/belts.ftl
@@ -0,0 +1,2 @@
+sheath-insert-verb = Sheathe
+sheath-eject-verb = Unsheathe
\ No newline at end of file

diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 8f66c870fc07ee56e4963cb87403975645b457a9..80eac027976f0ec1e46409e62fc685a935aff20c 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -114,9 +114,10 @@
   parent: ClothingBeltSheath
   suffix: Filled
   components:
-  - type: StorageFill
-    contents:
-      - id: CaptainSabre
+  - type: ContainerFill
+    containers:
+      item:
+      - CaptainSabre
 
 - type: entity
   id: ClothingBeltMilitaryWebbingGrenadeFilled

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index d0ff683cdc87c8ac0baf9b294256d587523f57d8..52de2300569206002d46733a9dfa248a8718bdcd 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -399,7 +399,7 @@
   - type: Appearance
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: [ClothingBeltBase, ClothingSlotBase]
   id: ClothingBeltSheath
   name: sabre sheath
   description: An ornate sheath designed to hold an officer's blade.
@@ -409,12 +409,17 @@
     state: sheath
   - type: Clothing
     sprite: Clothing/Belt/sheath.rsi
-  - type: Storage
-    grid:
-    - 0,0,1,1
-    whitelist:
-      tags:
-        - CaptainSabre
+  - type: Item
+    size: Ginormous
+  - type: ItemSlots
+    slots:
+      item:
+        name: Sabre
+        insertVerbText: sheath-insert-verb
+        ejectVerbText: sheath-eject-verb
+        whitelist:
+          tags:
+          - CaptainSabre
   - type: ItemMapper
     mapLayers:
       sheath-sabre:
@@ -422,7 +427,7 @@
           tags:
           - CaptainSabre
   - type: Appearance
-
+ 
 # Belts without visualizers
 
 - type: entity