From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Date: Tue, 12 Dec 2023 07:55:55 +0000 (-0500)
Subject: Adjust cig carton contents and size (#22388)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=5be3e324b7a9602827092f2e2c7b53a40e558711;p=space-station-14.git

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 54bc12d4fa..12ad108881 100644
--- 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
   - type: Storage
     grid:
-    - 0,0,5,1
+    - 0,0,4,1
   - type: StorageFill
     contents:
       - id: CigPackGreen
-        amount: 6
+        amount: 5
   - type: Tag
     tags:
     - Trash
@@ -43,7 +43,7 @@
   - type: StorageFill
     contents:
       - id: CigPackRed
-        amount: 6
+        amount: 5
 
 - type: entity
   id: CigCartonBlue
@@ -60,7 +60,7 @@
   - type: StorageFill
     contents:
       - id: CigPackBlue
-        amount: 6
+        amount: 5
 
 - type: entity
   id: CigCartonBlack
@@ -77,7 +77,7 @@
   - type: StorageFill
     contents:
       - id: CigPackBlack
-        amount: 6
+        amount: 5
 
 - type: entity
   id: CigCartonMixed
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
index 77c121e4c8..5ef81cc4f0 100644
--- 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:
       Steel: 50
   - type: SpaceGarbage
+  - type: Item
+    size: Tiny
+    shape: # Yes, this is cursed, but it breaks otherwise, dont question it.
+    - 0,0,0,1
   - type: Storage
     grid:
     - 0,0,4,1
-  - type: Item
-    size: Small
   - type: StorageFill
     contents:
     - id: Cigarette
@@ -108,11 +110,13 @@
     materialComposition:
       Steel: 50
   - type: SpaceGarbage
+  - type: Item
+    size: Tiny
+    shape: # Yes, this is cursed, but it breaks otherwise, dont question it.
+    - 0,0,0,1
   - type: Storage
     grid:
     - 0,0,4,1
-  - type: Item
-    size: Small
   - type: StorageFill
     contents:
     - id: CigaretteRandom