Some mild item size balancing + fixes (#21250)
This commit is contained in:
@@ -180,14 +180,13 @@ namespace Content.Server.Chemistry.EntitySystems
|
|||||||
var user = message.Session.AttachedEntity;
|
var user = message.Session.AttachedEntity;
|
||||||
var maybeContainer = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.OutputSlotName);
|
var maybeContainer = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.OutputSlotName);
|
||||||
if (maybeContainer is not { Valid: true } container
|
if (maybeContainer is not { Valid: true } container
|
||||||
|| !TryComp(container, out StorageComponent? storage)
|
|| !TryComp(container, out StorageComponent? storage))
|
||||||
|| storage.Container is null)
|
|
||||||
{
|
{
|
||||||
return; // output can't fit pills
|
return; // output can't fit pills
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ensure the number is valid.
|
// Ensure the number is valid.
|
||||||
if (message.Number == 0 || _storageSystem.HasSpace((chemMaster, storage)))
|
if (message.Number == 0 || !_storageSystem.HasSpace((container, storage)))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Ensure the amount is valid.
|
// Ensure the amount is valid.
|
||||||
|
|||||||
@@ -267,6 +267,11 @@
|
|||||||
name: syndicate hardsuit bundle
|
name: syndicate hardsuit bundle
|
||||||
description: "Contains the Syndicate's signature blood red hardsuit."
|
description: "Contains the Syndicate's signature blood red hardsuit."
|
||||||
components:
|
components:
|
||||||
|
- type: Storage
|
||||||
|
maxItemSize: Huge
|
||||||
|
whitelist: #to snub 'dem metagamers
|
||||||
|
components:
|
||||||
|
- Clothing
|
||||||
- type: StorageFill
|
- type: StorageFill
|
||||||
contents:
|
contents:
|
||||||
- id: ClothingOuterHardsuitSyndie
|
- id: ClothingOuterHardsuitSyndie
|
||||||
|
|||||||
@@ -86,9 +86,16 @@
|
|||||||
suffix: Filled
|
suffix: Filled
|
||||||
parent: ToolboxSyndicate
|
parent: ToolboxSyndicate
|
||||||
components:
|
components:
|
||||||
|
- type: Storage
|
||||||
|
maxSlots: 8
|
||||||
- type: StorageFill
|
- type: StorageFill
|
||||||
contents:
|
contents:
|
||||||
- id: ClothingBeltUtilityEngineering
|
- id: Crowbar
|
||||||
|
- id: Wrench
|
||||||
|
- id: Screwdriver
|
||||||
|
- id: Wirecutter
|
||||||
|
- id: Welder
|
||||||
|
- id: Multitool
|
||||||
- id: ClothingHandsGlovesCombat
|
- id: ClothingHandsGlovesCombat
|
||||||
- id: ClothingMaskGasSyndicate
|
- id: ClothingMaskGasSyndicate
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
maxSlots: 7
|
maxSlots: 7
|
||||||
maxItemSize: Normal
|
maxItemSize: Normal
|
||||||
- type: Item
|
- type: Item
|
||||||
size: Large
|
size: Huge
|
||||||
- type: ContainerContainer
|
- type: ContainerContainer
|
||||||
containers:
|
containers:
|
||||||
storagebase: !type:Container
|
storagebase: !type:Container
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
id: ClothingOuterBaseLarge
|
id: ClothingOuterBaseLarge
|
||||||
components:
|
components:
|
||||||
- type: Item
|
- type: Item
|
||||||
size: Normal
|
size: Large
|
||||||
- type: Clothing
|
- type: Clothing
|
||||||
slots:
|
slots:
|
||||||
- outerClothing
|
- outerClothing
|
||||||
@@ -28,8 +28,6 @@
|
|||||||
parent: ClothingOuterBase
|
parent: ClothingOuterBase
|
||||||
id: ClothingOuterStorageBase
|
id: ClothingOuterStorageBase
|
||||||
components:
|
components:
|
||||||
- type: Item
|
|
||||||
size: Normal
|
|
||||||
- type: Storage
|
- type: Storage
|
||||||
maxSlots: 3
|
maxSlots: 3
|
||||||
- type: ContainerContainer
|
- type: ContainerContainer
|
||||||
@@ -72,7 +70,7 @@
|
|||||||
walkModifier: 0.4
|
walkModifier: 0.4
|
||||||
sprintModifier: 0.6
|
sprintModifier: 0.6
|
||||||
- type: Item
|
- type: Item
|
||||||
size: Large
|
size: Huge
|
||||||
- type: Armor
|
- type: Armor
|
||||||
modifiers:
|
modifiers:
|
||||||
coefficients:
|
coefficients:
|
||||||
@@ -107,7 +105,7 @@
|
|||||||
walkModifier: 0.8
|
walkModifier: 0.8
|
||||||
sprintModifier: 0.8
|
sprintModifier: 0.8
|
||||||
- type: Item
|
- type: Item
|
||||||
size: Normal
|
size: Large
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: ClothingOuterBase
|
parent: ClothingOuterBase
|
||||||
@@ -130,7 +128,7 @@
|
|||||||
id: ClothingOuterBaseMedium
|
id: ClothingOuterBaseMedium
|
||||||
components:
|
components:
|
||||||
- type: Item
|
- type: Item
|
||||||
size: Normal
|
size: Large
|
||||||
- type: Clothing
|
- type: Clothing
|
||||||
slots:
|
slots:
|
||||||
- outerClothing
|
- outerClothing
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
- type: Item
|
- type: Item
|
||||||
size: Huge
|
size: Huge
|
||||||
- type: Storage
|
- type: Storage
|
||||||
maxSlots: 12
|
maxSlots: 5
|
||||||
maxItemSize: Normal
|
maxItemSize: Normal
|
||||||
quickInsert: true
|
quickInsert: true
|
||||||
areaInsert: true
|
areaInsert: true
|
||||||
|
|||||||
Reference in New Issue
Block a user