From 4ca57ca4744d5efdf53ef8a3c4fda3d1fcb347b0 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Feb 2022 05:01:31 +0000 Subject: [PATCH] Quick box size + capacity fix (no more boxed hardsuits) (#6843) --- Resources/Prototypes/Catalog/Fills/Boxes/general.yml | 11 ----------- Resources/Prototypes/Catalog/Fills/Boxes/medical.yml | 12 ------------ Resources/Prototypes/Catalog/Fills/Boxes/science.yml | 4 ---- .../Prototypes/Catalog/Fills/Boxes/security.yml | 4 ---- .../Clothing/OuterClothing/base_clothingouter.yml | 2 +- Resources/Prototypes/Entities/Objects/Misc/box.yml | 6 +++--- 6 files changed, 4 insertions(+), 35 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index b4fec9a01c..a07f1709a7 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -7,11 +7,6 @@ - type: Sprite layers: - state: box - - type: Item - size: 20 - - type: Storage - capacity: 20 - size: 20 - type: entity name: lightbulb box @@ -148,9 +143,6 @@ layers: - state: box - state: writing - - type: Storage - capacity: 30 - size: 30 - type: entity name: box of hugs @@ -168,9 +160,6 @@ contents: - id: Brutepack amount: 6 - - type: Storage - capacity: 30 - size: 30 - type: entity name: inflatable wall box diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml index caa18d2885..044071b499 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml @@ -12,10 +12,6 @@ layers: - state: box - state: syringe - - type: Item - size: 30 - - type: Storage - capacity: 30 - type: entity name: pill canister box @@ -31,10 +27,6 @@ layers: - state: box - state: pillbox - - type: Item - size: 30 - - type: Storage - capacity: 30 - type: entity name: sterile box @@ -76,10 +68,6 @@ contents: - id: BodyBag_Folded amount: 5 - - type: Item - size: 30 - - type: Storage - capacity: 30 - type: Sprite layers: - state: box diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/science.yml b/Resources/Prototypes/Catalog/Fills/Boxes/science.yml index e4947516be..a654c912a3 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/science.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/science.yml @@ -14,7 +14,3 @@ layers: - state: box - state: beaker - - type: Item - size: 30 - - type: Storage - capacity: 30 diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml index f94aadab7f..155799c8fa 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml @@ -71,8 +71,6 @@ - type: Sprite layers: - state: box_beanbag - - type: Storage - capacity: 30 - type: entity name: box of lethal shots @@ -87,5 +85,3 @@ - type: Sprite layers: - state: box_lethalshot - - type: Storage - capacity: 30 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 100f21a20f..b76401693d 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -21,7 +21,7 @@ - type: TemperatureProtection coefficient: 0.001 # yes it needs to be this low, fires are fucking deadly apparently!!!! - type: Clothing - size: 25 + size: 50 - type: Armor modifiers: coefficients: diff --git a/Resources/Prototypes/Entities/Objects/Misc/box.yml b/Resources/Prototypes/Entities/Objects/Misc/box.yml index e49a270c7d..87b472febf 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/box.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/box.yml @@ -8,7 +8,7 @@ sprite: Objects/Storage/boxes.rsi - type: Item sprite: Objects/Storage/boxes.rsi - size: 9999 + size: 31 - type: Storage - capacity: 60 - size: 9999 + capacity: 30 + size: 10