From e33caaddeafb4ae3c9be5f78bdf3984e155fea1d Mon Sep 17 00:00:00 2001 From: py01 Date: Sat, 18 Jul 2020 19:37:17 -0600 Subject: [PATCH] ServerStorage yaml case fix --- .../Components/Items/Storage/ServerStorageComponent.cs | 4 ++-- .../Prototypes/Entities/Buildings/Storage/crate_base.yml | 2 +- Resources/Prototypes/Entities/Items/Clothing/backpacks.yml | 4 ++-- Resources/Prototypes/Entities/Items/Clothing/belts.yml | 2 +- Resources/Prototypes/Entities/Items/Consumables/trash.yml | 4 ++-- Resources/Prototypes/Entities/Items/medical.yml | 2 +- Resources/Prototypes/Entities/Items/toolbox.yml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs index 3c4b9575ab..f097efc45c 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs @@ -44,7 +44,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage private bool _storageInitialCalculated; private int _storageUsed; - private int _storageCapacityMax = 10000; + private int _storageCapacityMax; public readonly HashSet SubscribedSessions = new HashSet(); public IReadOnlyCollection? StoredEntities => _storage?.ContainedEntities; @@ -320,7 +320,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage { base.ExposeData(serializer); - serializer.DataField(ref _storageCapacityMax, "Capacity", 10000); + serializer.DataField(ref _storageCapacityMax, "capacity", 10000); //serializer.DataField(ref StorageUsed, "used", 0); } diff --git a/Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml b/Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml index cdf6ab7c9c..5427458170 100644 --- a/Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml +++ b/Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml @@ -35,7 +35,7 @@ mass: 25 Anchored: false - type: EntityStorage - Capacity: 60 + capacity: 60 CanWeldShut: false - type: PlaceableSurface - type: Damageable diff --git a/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml b/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml index e8038ba125..8a4e97b64f 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml @@ -18,7 +18,7 @@ sprite: Clothing/Back/Backpacks/backpack.rsi HeldPrefix: backpack - type: Storage - Capacity: 100 + capacity: 100 - type: entity parent: BackpackClothing @@ -131,7 +131,7 @@ sprite: Clothing/Back/Satchels/satchel.rsi ClothingPrefix: satchel - type: Storage - Capacity: 300 + capacity: 300 - type: entity parent: BackpackClothing diff --git a/Resources/Prototypes/Entities/Items/Clothing/belts.yml b/Resources/Prototypes/Entities/Items/Clothing/belts.yml index 24227fa41a..a04cd843bf 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/belts.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/belts.yml @@ -23,7 +23,7 @@ QuickEquip: false sprite: Clothing/Belt/belt_utility.rsi - type: Storage - Capacity: 40 # Full tool loadout is 35, plus an extra + capacity: 40 # Full tool loadout is 35, plus an extra - type: entity id: UtilityBeltClothingFilled diff --git a/Resources/Prototypes/Entities/Items/Consumables/trash.yml b/Resources/Prototypes/Entities/Items/Consumables/trash.yml index e028a15231..06cbdacf41 100644 --- a/Resources/Prototypes/Entities/Items/Consumables/trash.yml +++ b/Resources/Prototypes/Entities/Items/Consumables/trash.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: BaseItem id: TrashBase description: This is rubbish. @@ -180,7 +180,7 @@ - type: Icon sprite: Objects/Consumable/Trash/trashbag.rsi - type: Storage - Capacity: 125 + capacity: 125 - type: entity name: tray (trash) diff --git a/Resources/Prototypes/Entities/Items/medical.yml b/Resources/Prototypes/Entities/Items/medical.yml index 6d0557a5d3..f004518590 100644 --- a/Resources/Prototypes/Entities/Items/medical.yml +++ b/Resources/Prototypes/Entities/Items/medical.yml @@ -9,7 +9,7 @@ - type: Icon texture: Objects/Specific/Medical/medkit_r.png - type: Storage - Capacity: 60 + capacity: 60 - type: Item size: 9999 diff --git a/Resources/Prototypes/Entities/Items/toolbox.yml b/Resources/Prototypes/Entities/Items/toolbox.yml index 6ef297718a..47d3a433ca 100644 --- a/Resources/Prototypes/Entities/Items/toolbox.yml +++ b/Resources/Prototypes/Entities/Items/toolbox.yml @@ -4,7 +4,7 @@ abstract: true components: - type: Storage - Capacity: 60 + capacity: 60 - type: Item size: 9999 - type: ItemCooldown