Cig packs quick fix (#16152)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
index 0225761b2902b8960a7368babef622637a027a19..22946a9e048f231ee76a2c689de4f5618f3514df 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -14,17 +14,12 @@
   - type: SpaceGarbage
   - type: Storage
     capacity: 5
-    whitelist:
-      tags:
-      - Cigarette
-      - Cigar
-      - Matchstick
   - type: Item
     size: 5
   - type: StorageFill
     contents:
     - id: Cigarette
-      amount: 6
+      amount: 5
   - type: ItemCounter
     count:
       tags: [Cigarette]
@@ -56,7 +51,6 @@
     - state: closed
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
-    size: 6
 
 - type: entity
   id: CigPackRed
@@ -71,7 +65,6 @@
     - state: closed
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
-    size: 6
 
 - type: entity
   id: CigPackBlue
@@ -86,7 +79,6 @@
     - state: closed
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
-    size: 6
 
 - type: entity
   id: CigPackBlack
@@ -101,7 +93,6 @@
     - state: closed
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
-    size: 6
 
 - type: entity
   id: CigPackSyndicate
@@ -112,7 +103,7 @@
   - type: StorageFill
     contents:
     - id: CigaretteSyndicate
-      amount: 6
+      amount: 5
   - type: Sprite
     netsync: false
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi
@@ -120,4 +111,3 @@
     - state: closed
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi
-    size: 6

diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
index e4030856a1b6cf321f827ecdcd1c4371ab39763b..dfbe5474a51eb247a9f2f5b7afc703e2c5ebb297 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -74,16 +74,10 @@
     size: 5
   - type: Storage
     capacity: 5
-    whitelist:
-      tags:
-      - Matchstick
-      - Cigarette
-      - Cigar
-    size: 10
   - type: StorageFill
     contents:
       - id: Matchstick
-        amount: 6
+        amount: 5
   - type: ItemCounter
     count:
       tags: [Matchstick]