Adjust cig carton contents and size (#22388)

* reduce carton fill, depends on Big Spin PR

* cursed packs

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
index 54bc12d4fa597453dfd38a18ec876e3791614682..12ad108881a247d07c313f4f5d4d5224582e5625 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
@@ -15,11 +15,11 @@
     size: Normal\r
   - type: Storage\r
     grid:\r
-    - 0,0,5,1\r
+    - 0,0,4,1\r
   - type: StorageFill\r
     contents:\r
       - id: CigPackGreen\r
-        amount: 6\r
+        amount: 5\r
   - type: Tag\r
     tags:\r
     - Trash\r
@@ -43,7 +43,7 @@
   - type: StorageFill\r
     contents:\r
       - id: CigPackRed\r
-        amount: 6\r
+        amount: 5\r
 \r
 - type: entity\r
   id: CigCartonBlue\r
@@ -60,7 +60,7 @@
   - type: StorageFill\r
     contents:\r
       - id: CigPackBlue\r
-        amount: 6\r
+        amount: 5\r
 \r
 - type: entity\r
   id: CigCartonBlack\r
@@ -77,7 +77,7 @@
   - type: StorageFill\r
     contents:\r
       - id: CigPackBlack\r
-        amount: 6\r
+        amount: 5\r
 \r
 - type: entity\r
   id: CigCartonMixed\r

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
index 77c121e4c8347e342675425b6ac91c78b7e06fde..5ef81cc4f0d2c341afd6d6208ed22ac98e68c326 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -42,11 +42,13 @@
     materialComposition:\r
       Steel: 50\r
   - type: SpaceGarbage\r
+  - type: Item\r
+    size: Tiny\r
+    shape: # Yes, this is cursed, but it breaks otherwise, dont question it.\r
+    - 0,0,0,1\r
   - type: Storage\r
     grid:\r
     - 0,0,4,1\r
-  - type: Item\r
-    size: Small\r
   - type: StorageFill\r
     contents:\r
     - id: Cigarette\r
@@ -108,11 +110,13 @@
     materialComposition:\r
       Steel: 50\r
   - type: SpaceGarbage\r
+  - type: Item\r
+    size: Tiny\r
+    shape: # Yes, this is cursed, but it breaks otherwise, dont question it.\r
+    - 0,0,0,1\r
   - type: Storage\r
     grid:\r
     - 0,0,4,1\r
-  - type: Item\r
-    size: Small\r
   - type: StorageFill\r
     contents:\r
     - id: CigaretteRandom\r