From 187eb825f33ebc346c86f40e216891eada75c5e5 Mon Sep 17 00:00:00 2001 From: Justin Trotter Date: Tue, 2 Aug 2022 16:30:05 -0500 Subject: [PATCH] fix backpack and duffels in hand display (#10208) --- .../Entities/Clothing/Back/backpacks.yml | 36 +------------------ .../Entities/Clothing/Back/duffel.yml | 32 ++++------------- .../Entities/Clothing/Back/satchel.yml | 17 --------- 3 files changed, 7 insertions(+), 78 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 8ddbe7d648..0ca1cb8d9a 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -9,12 +9,10 @@ state: icon - type: Item size: 9999 - sprite: Clothing/Back/Backpacks/backpack.rsi - type: Clothing quickEquip: false slots: - back - sprite: Clothing/Back/Backpacks/backpack.rsi - type: Storage capacity: 100 - type: UserInterface @@ -30,8 +28,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/clown.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/clown.rsi - type: Storage storageOpenSound: collection: BikeHorn @@ -44,8 +40,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/security.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/security.rsi - type: entity parent: ClothingBackpack @@ -55,8 +49,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/engineering.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/engineering.rsi - type: entity parent: ClothingBackpack @@ -66,8 +58,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/medical.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/medical.rsi - type: entity parent: ClothingBackpack @@ -77,8 +67,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/captain.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/captain.rsi - type: entity parent: ClothingBackpack @@ -88,8 +76,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/mime.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/mime.rsi - type: entity parent: ClothingBackpack @@ -99,8 +85,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/chemistry.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/chemistry.rsi - type: entity parent: ClothingBackpack @@ -110,8 +94,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/botany.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/botany.rsi - type: entity parent: ClothingBackpack @@ -121,8 +103,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/science.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/science.rsi - type: entity parent: ClothingBackpack @@ -132,8 +112,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/virology.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/virology.rsi #ERT - type: entity @@ -144,8 +122,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/ertleader.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/ertleader.rsi - type: Storage capacity: 200 @@ -157,8 +133,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/ertsec.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/ertsec.rsi - type: entity parent: ClothingBackpackERTLeader @@ -168,8 +142,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/ertmed.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/ertmed.rsi - type: entity parent: ClothingBackpackERTLeader @@ -179,8 +151,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/erteng.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/erteng.rsi - type: entity parent: ClothingBackpackERTLeader @@ -190,8 +160,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/ertjanitor.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/ertjanitor.rsi - type: entity parent: ClothingBackpackERTLeader @@ -201,8 +169,6 @@ components: - type: Sprite sprite: Clothing/Back/Backpacks/ertclown.rsi - - type: Clothing - sprite: Clothing/Back/Backpacks/ertclown.rsi #Special - type: entity @@ -219,6 +185,6 @@ - state: holding-unlit shader: unshaded - type: Clothing - sprite: Clothing/Back/Backpacks/holding.rsi + equippedPrefix: holding - type: Storage capacity: 10000 diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 43f560fb2e..04c44d319f 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -8,10 +8,8 @@ sprite: Clothing/Back/Duffels/duffel.rsi state: icon - type: Item - sprite: Clothing/Back/Duffels/duffel.rsi size: 9999 - type: Clothing - sprite: Clothing/Back/Duffels/duffel.rsi quickEquip: false slots: - back @@ -33,8 +31,6 @@ components: - type: Sprite sprite: Clothing/Back/Duffels/engineering.rsi - - type: Clothing - sprite: Clothing/Back/Duffels/engineering.rsi - type: entity parent: ClothingBackpackDuffel @@ -44,8 +40,6 @@ components: - type: Sprite sprite: Clothing/Back/Duffels/medical.rsi - - type: Clothing - sprite: Clothing/Back/Duffels/medical.rsi - type: entity parent: ClothingBackpackDuffel @@ -55,8 +49,6 @@ components: - type: Sprite sprite: Clothing/Back/Duffels/captain.rsi - - type: Clothing - sprite: Clothing/Back/Duffels/captain.rsi - type: entity parent: ClothingBackpackDuffel @@ -66,8 +58,6 @@ components: - type: Sprite sprite: Clothing/Back/Duffels/clown.rsi - - type: Clothing - sprite: Clothing/Back/Duffels/clown.rsi - type: Storage storageOpenSound: collection: BikeHorn @@ -80,8 +70,6 @@ components: - type: Sprite sprite: Clothing/Back/Duffels/security.rsi - - type: Clothing - sprite: Clothing/Back/Duffels/security.rsi - type: entity parent: ClothingBackpackDuffel @@ -91,8 +79,6 @@ components: - type: Sprite sprite: Clothing/Back/Duffels/chemistry.rsi - - type: Clothing - sprite: Clothing/Back/Duffels/chemistry.rsi - type: entity parent: ClothingBackpackDuffel @@ -102,8 +88,6 @@ components: - type: Sprite sprite: Clothing/Back/Duffels/mime.rsi - - type: Clothing - sprite: Clothing/Back/Duffels/mime.rsi storageOpenSound: collection: null storageInsertSound: @@ -117,8 +101,6 @@ components: - type: Sprite sprite: Clothing/Back/Duffels/science.rsi - - type: Clothing - sprite: Clothing/Back/Duffels/science.rsi - type: entity parent: ClothingBackpackDuffel @@ -128,8 +110,6 @@ components: - type: Sprite sprite: Clothing/Back/Duffels/syndicate.rsi - - type: Clothing - sprite: Clothing/Back/Duffels/syndicate.rsi - type: Storage capacity: 131 @@ -141,9 +121,10 @@ - type: Sprite sprite: Clothing/Back/Duffels/syndicate.rsi state: icon-ammo - - type: Clothing - sprite: Clothing/Back/Duffels/syndicate.rsi + - type: Item heldPrefix: ammo + - type: Clothing + equippedPrefix: ammo - type: entity parent: ClothingBackpackDuffelSyndicate @@ -153,9 +134,10 @@ - type: Sprite sprite: Clothing/Back/Duffels/syndicate.rsi state: icon-med - - type: Clothing - sprite: Clothing/Back/Duffels/syndicate.rsi + - type: Item heldPrefix: med + - type: Clothing + equippedPrefix: med - type: entity parent: ClothingBackpackDuffel @@ -170,7 +152,5 @@ - state: icon - state: icon-unlit shader: unshaded - - type: Clothing - sprite: Clothing/Back/Duffels/holding.rsi - type: Storage capacity: 10000 diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index 10b60eb945..c3c665ca31 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -13,7 +13,6 @@ quickEquip: false slots: - back - sprite: Clothing/Back/Satchels/satchel.rsi - type: Storage capacity: 100 - type: UserInterface @@ -29,8 +28,6 @@ components: - type: Sprite sprite: Clothing/Back/Satchels/engineering.rsi - - type: Clothing - sprite: Clothing/Back/Satchels/engineering.rsi - type: entity parent: ClothingBackpackSatchel @@ -40,8 +37,6 @@ components: - type: Sprite sprite: Clothing/Back/Satchels/medical.rsi - - type: Clothing - sprite: Clothing/Back/Satchels/medical.rsi - type: entity parent: ClothingBackpackSatchel @@ -51,8 +46,6 @@ components: - type: Sprite sprite: Clothing/Back/Satchels/chemistry.rsi - - type: Clothing - sprite: Clothing/Back/Satchels/chemistry.rsi - type: entity parent: ClothingBackpackSatchel @@ -62,8 +55,6 @@ components: - type: Sprite sprite: Clothing/Back/Satchels/science.rsi - - type: Clothing - sprite: Clothing/Back/Satchels/science.rsi - type: entity parent: ClothingBackpackSatchel @@ -73,8 +64,6 @@ components: - type: Sprite sprite: Clothing/Back/Satchels/security.rsi - - type: Clothing - sprite: Clothing/Back/Satchels/security.rsi - type: entity parent: ClothingBackpackSatchel @@ -84,8 +73,6 @@ components: - type: Sprite sprite: Clothing/Back/Satchels/captain.rsi - - type: Clothing - sprite: Clothing/Back/Satchels/captain.rsi - type: entity parent: ClothingBackpackSatchel @@ -95,8 +82,6 @@ components: - type: Sprite sprite: Clothing/Back/Satchels/hydroponics.rsi - - type: Clothing - sprite: Clothing/Back/Satchels/hydroponics.rsi - type: entity parent: ClothingBackpackSatchel @@ -111,7 +96,5 @@ - state: icon - state: icon-unlit shader: unshaded - - type: Clothing - sprite: Clothing/Back/Satchels/holding.rsi - type: Storage capacity: 10000