Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverts - Makes sabre sheathe use ItemSlots. #629

Closed
wants to merge 2 commits into from
Closed

Reverts - Makes sabre sheathe use ItemSlots. #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
949d9ea
Reverts - Makes sabre sheathe use ItemSlots.
Adrian16199 Jan 1, 2024
532d948
Merge branch 'master' into captain_sabre
Adrian16199 Jan 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Resources/Prototypes/Catalog/Fills/Items/belt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 6 additions & 10 deletions Resources/Prototypes/Entities/Clothing/Belt/belts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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:
Expand Down
Loading