Some mild item size balancing + fixes (space-wizards#21250)

keronshb · Oct 26, 2023 · 81f5e34 · 81f5e34
1 parent 7a08a4e
commit 81f5e34
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
@@ -180,14 +180,13 @@ private void OnCreatePillsMessage(Entity<ChemMasterComponent> chemMaster, ref Ch
             var user = message.Session.AttachedEntity;
             var maybeContainer = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.OutputSlotName);
             if (maybeContainer is not { Valid: true } container
-                || !TryComp(container, out StorageComponent? storage)
-                || storage.Container is null)
+                || !TryComp(container, out StorageComponent? storage))
             {
                 return; // output can't fit pills
             }
 
             // Ensure the number is valid.
-            if (message.Number == 0 || _storageSystem.HasSpace((chemMaster, storage)))
+            if (message.Number == 0 || !_storageSystem.HasSpace((container, storage)))
                 return;
 
             // Ensure the amount is valid.

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -267,6 +267,11 @@
   name: syndicate hardsuit bundle
   description: "Contains the Syndicate's signature blood red hardsuit."
   components:
+  - type: Storage
+    maxItemSize: Huge
+    whitelist: #to snub 'dem metagamers
+      components:
+      - Clothing
   - type: StorageFill
     contents:
       - id: ClothingOuterHardsuitSyndie

diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
@@ -86,9 +86,16 @@
   suffix: Filled
   parent: ToolboxSyndicate
   components:
+  - type: Storage
+    maxSlots: 8
   - type: StorageFill
     contents:
-      - id: ClothingBeltUtilityEngineering
+      - id: Crowbar
+      - id: Wrench
+      - id: Screwdriver
+      - id: Wirecutter
+      - id: Welder
+      - id: Multitool
       - id: ClothingHandsGlovesCombat
       - id: ClothingMaskGasSyndicate
 

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
@@ -25,7 +25,7 @@
     maxSlots: 7
     maxItemSize: Normal
   - type: Item
-    size: Large
+    size: Huge
   - type: ContainerContainer
     containers:
       storagebase: !type:Container

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -15,7 +15,7 @@
   id: ClothingOuterBaseLarge
   components:
   - type: Item
-    size: Normal
+    size: Large
   - type: Clothing
     slots:
     - outerClothing
@@ -28,8 +28,6 @@
   parent: ClothingOuterBase
   id: ClothingOuterStorageBase
   components:
-  - type: Item
-    size: Normal
   - type: Storage
     maxSlots: 3
   - type: ContainerContainer
@@ -72,7 +70,7 @@
     walkModifier: 0.4
     sprintModifier: 0.6
   - type: Item
-    size: Large
+    size: Huge
   - type: Armor
     modifiers:
       coefficients:
@@ -107,7 +105,7 @@
     walkModifier: 0.8
     sprintModifier: 0.8
   - type: Item
-    size: Normal
+    size: Large
 
 - type: entity
   parent: ClothingOuterBase
@@ -130,7 +128,7 @@
   id: ClothingOuterBaseMedium
   components:
   - type: Item
-    size: Normal
+    size: Large
   - type: Clothing
     slots:
     - outerClothing
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
@@ -16,7 +16,7 @@
   - type: Item
     size: Huge
   - type: Storage
-    maxSlots: 12
+    maxSlots: 5
     maxItemSize: Normal
     quickInsert: true
     areaInsert: true