From 949d9ea8cee4edd8e11d2e9b0e474bbd4c94f5c9 Mon Sep 17 00:00:00 2001 From: Adrian16199 Date: Mon, 1 Jan 2024 14:13:33 +0100 Subject: [PATCH] Reverts - Makes sabre sheathe use ItemSlots. Just no. --- .../Prototypes/Catalog/Fills/Items/belt.yml | 7 +++---- .../Prototypes/Entities/Clothing/Belt/belts.yml | 16 ++++++---------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 2b193fd61bd..82f14c60558 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -114,10 +114,9 @@ parent: ClothingBeltSheath suffix: Filled components: - - type: ContainerFill - containers: - item: - - CaptainSabre + - type: StorageFill # Delta V - Reverts - Makes sabre sheathe use ItemSlots #22792 + contents: + - id: CaptainSabre # Delta V - Reverts till here. - type: entity id: ClothingBeltMilitaryWebbingGrenadeFilled diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 6f80cf4f260..c65b958d333 100644 --- 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: [ClothingBeltBase, ClothingSlotBase] + parent: ClothingBeltStorageBase # was [ClothingBeltBase, ClothingSlotBase], reverted it from Makes sabre sheathe use ItemSlots #22792 id: ClothingBeltSheath name: sabre sheath description: An ornate sheath designed to hold an officer's blade. @@ -409,15 +409,11 @@ state: sheath - type: Clothing sprite: Clothing/Belt/sheath.rsi - - type: ItemSlots - slots: - item: - name: Sabre - insertVerbText: sheath-insert-verb - ejectVerbText: sheath-eject-verb - whitelist: - tags: - - CaptainSabre + - type: Storage # Delta V - Reverts - Makes sabre sheathe use ItemSlots #22792 + capacity: 15 + whitelist: + tags: + - CaptainSabre # Delta V - Reverts till here. - type: ItemMapper mapLayers: sheath-sabre: