Fix some abnormally high-capacity boxes (#28314)

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index 5b3f88c1bbd8944f58b2763c01d439df8a91953b..85ee9f9ab89490398d56aad6edff1d103bda8c56 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -39,10 +39,6 @@
   id: BoxLightbulb
   description: This box is shaped on the inside so that only light tubes and bulbs fit.
   components:
-  - type: StorageFill
-    contents:
-      - id: LightBulb
-        amount: 12
   - type: Sprite
     layers:
       - state: box
@@ -53,50 +49,40 @@
     whitelist:
       components:
       - LightBulb
+  - type: StorageFill
+    contents:
+      - id: LightBulb
+        amount: 12
 
 - type: entity
   name: lighttube box
-  parent: BoxCardboard
+  parent: BoxLightbulb
   id: BoxLighttube
-  description: This box is shaped on the inside so that only light tubes and bulbs fit.
   components:
-  - type: StorageFill
-    contents:
-      - id: LightTube
-        amount: 12
   - type: Sprite
     layers:
       - state: box
       - state: lighttube
-  - type: Storage
-    grid:
-    - 0,0,5,3
-    whitelist:
-      components:
-      - LightBulb
+  - type: StorageFill
+    contents:
+      - id: LightTube
+        amount: 12
 
 - type: entity
   name: mixed lights box
-  parent: BoxCardboard
+  parent: BoxLightbulb
   id: BoxLightMixed
-  description: This box is shaped on the inside so that only light tubes and bulbs fit.
   components:
+  - type: Sprite
+    layers:
+      - state: box
+      - state: lightmixed
   - type: StorageFill
     contents:
       - id: LightTube
         amount: 6
       - id: LightBulb
         amount: 6
-  - type: Sprite
-    layers:
-      - state: box
-      - state: lightmixed
-  - type: Storage
-    grid:
-    - 0,0,5,3
-    whitelist:
-      components:
-      - LightBulb
 
 - type: entity
   name: PDA box
@@ -366,28 +352,6 @@
         amount: 2
   - type: Storage
 
-- type: entity
-  name: deathrattle implant box
-  parent: BoxCardboard
-  id: BoxDeathRattleImplants
-  description: Six deathrattle implants and handheld GPS devices for the whole squad.
-  components:
-  - type: Item
-    size: Normal
-  - type: StorageFill
-    contents:
-      - id: DeathRattleImplanter
-        amount: 6
-      - id: HandheldGPSBasic
-        amount: 6
-  - type: Storage
-    grid:
-    - 0,0,5,3
-  - type: Sprite
-    layers:
-      - state: box
-      - state: syringe
-
 - type: entity
   name: lead-lined box
   parent: BoxCardboard
@@ -404,6 +368,7 @@
   name: candle box
   parent: BoxCardboard
   id: BoxCandle
+  description: This box is specifically moulded to only carry candles.
   components:
   - type: Sprite
     layers:
@@ -411,67 +376,59 @@
       - state: candle
   - type: Storage
     grid:
-    - 0,0,9,2
+    - 0,0,5,3
+    whitelist:
+      tags:
+      - Candle
   - type: StorageFill
     contents:
       - id: Candle
-        amount: 3
+        amount: 4
       - id: CandleBlue
-        amount: 3
+        amount: 2
       - id: CandleRed
-        amount: 3
+        amount: 2
       - id: CandleGreen
-        amount: 3
+        amount: 2
       - id: CandlePurple
-        amount: 3
+        amount: 2
 
 - type: entity
   name: small candle box
-  parent: BoxCardboard
+  parent: BoxCandle
   id: BoxCandleSmall
   components:
-  - type: Sprite
-    layers:
-      - state: box
-      - state: candle
-  - type: Storage
-    grid:
-    - 0,0,9,2
   - type: StorageFill
     contents:
       - id: CandleSmall
-        amount: 5
+        amount: 8
       - id: CandleBlueSmall
-        amount: 5
+        amount: 4
       - id: CandleRedSmall
-        amount: 5
+        amount: 4
       - id: CandleGreenSmall
-        amount: 5
+        amount: 4
       - id: CandlePurpleSmall
-        amount: 5
+        amount: 4
 
 - type: entity
   name: darts box
   parent: BoxCardboard
   id: BoxDarts
-  description: This box filled with colorful darts.
+  description: A box filled with colorful darts.
   components:
-  - type: Item
-    size: Normal
+  - type: Sprite
+    layers:
+      - state: box
+      - state: darts
   - type: StorageFill
     contents:
       - id: Dart
-        amount: 3
+        amount: 2
       - id: DartBlue
-        amount: 3
+        amount: 2
       - id: DartPurple
-        amount: 3
+        amount: 2
       - id: DartYellow
-        amount: 3
-  - type: Storage
-    grid:
-    - 0,0,5,3
-  - type: Sprite
-    layers:
-      - state: box
-      - state: darts
+        amount: 2
+

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index d2e889c937d5d110fefe189714967524e67f741a..2bfca8362a366bc1dbc51f501032791fd479f663 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -49,3 +49,23 @@
     layers:
       - state: box_of_doom
       - state: throwing_knives
+
+- type: entity
+  name: deathrattle implant box
+  parent: BoxCardboard
+  id: BoxDeathRattleImplants
+  description: Six deathrattle implants and handheld GPS devices for the whole squad.
+  components:
+  - type: Sprite
+    layers:
+      - state: box_of_doom
+      - state: syringe
+  - type: Storage
+    grid:
+    - 0,0,5,3
+  - type: StorageFill
+    contents:
+      - id: DeathRattleImplanter
+        amount: 6
+      - id: HandheldGPSBasic
+        amount: 6

diff --git a/Resources/Prototypes/Entities/Objects/Misc/candles.yml b/Resources/Prototypes/Entities/Objects/Misc/candles.yml
index bef37e5fd087b2429004b6ddc5c5981639c0ee83..55d3ecb9d3504482af1ba4dd1f9a6f54d3d71b70 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/candles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/candles.yml
@@ -4,6 +4,9 @@
   id: Candle
   description: A thin wick threaded through fat.
   components:
+    - type: Tag
+      tags:
+      - Candle
     - type: Sprite
       noRot: true
       sprite: Objects/Misc/candles.rsi

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 439ad47c0f803dd43fe88f0c584db43d1378d025..d60b6329865b94a41985bb342db9bfefebb0a815 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -254,6 +254,9 @@
 
 - type: Tag
   id: CableCoil
+  
+- type: Tag
+  id: Candle
 
 - type: Tag
   id: Cake