Some mild item size balancing + fixes (#21250)

diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
index e9cf661347032113c9869248831203c3ae382bb9..a35cb7703d2cc332e4eaf4a6fad6b7f46155a335 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
@@ -180,14 +180,13 @@ namespace Content.Server.Chemistry.EntitySystems
             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
index 375e831f3c8e90d98a303b8f8d59e96a8ca91d7d..0569c4f58c52de9a9a22ee35cbba5d269b908069 100644 (file)
--- 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
index 234481af8d4c85289e4225512bc3051d138ec3d8..bc9485d7f042a22cbf78f687bda82e8f82dc7a10 100644 (file)
--- 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
index 1f9f266eb4dcbfec6fb5044f1ed045da0abf6c65..ec6b48bf8947833ee5dce45ee3fa040356616f36 100644 (file)
--- 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
index 5ec74294dbc8a2de6aac93cd8c1e9a5a8221cd0d..6af455ab272fb26c7638b211d287a78f27576971 100644 (file)
--- 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
index 5d81dabd84c68979ec3d7e716ec6f99c697cb039..814ddb30da0cf2b13943d4c9a9eea7b1da05be50 100644 (file)
--- 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