From 9cbd9c838814dc06c7a3cca57066220cef498c7d Mon Sep 17 00:00:00 2001
From: Succuberry <Meow>
Date: Sun, 14 Jul 2024 14:37:10 +0300
Subject: [PATCH 1/6] =?UTF-8?q?=D0=96=D0=B0=D0=BF=D0=B0=D0=BD=D1=84=D1=83?=
 =?UTF-8?q?=D0=B4=D0=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ingredients/japaningredients.ftl          |   4 ++
 .../consumable/food/japanfood/japanfoods.ftl  |  13 ++++
 .../VendingMachines/Inventories/chang.yml     |   1 +
 .../Food/JapanFood/Pockypacks/pockypacks.yml  |  65 ++++++++++++++++++
 .../Consumable/Food/JapanFood/chocopocky.yml  |  30 ++++++++
 .../Consumable/Food/JapanFood/hanamidango.yml |   6 +-
 .../Food/JapanFood/mitarasidango.yml          |   6 +-
 .../Consumable/Food/JapanFood/onigiri.yml     |   6 +-
 .../Food/JapanFood/pockypack/pockypacks.yml   |  65 ++++++++++++++++++
 .../Food/JapanFood/porkramennoodles.yml       |   6 +-
 .../Food/JapanFood/spicyporkramen.yml         |   6 +-
 .../Food/japanfood.rsi/chocopocky.png         | Bin 0 -> 153 bytes
 .../Consumable/Food/japanfood.rsi/meta.json   |   5 +-
 .../Consumable/Food/pockypacks.rsi/closed.png | Bin 0 -> 396 bytes
 .../Food/pockypacks.rsi/equipped-BELT.png     | Bin 0 -> 159 bytes
 .../Food/pockypacks.rsi/inhand-left.png       | Bin 0 -> 347 bytes
 .../Food/pockypacks.rsi/inhand-right.png      | Bin 0 -> 333 bytes
 .../Consumable/Food/pockypacks.rsi/meta.json  |  33 +++++++++
 .../Food/pokvisualizer.rsi/meta.json          |  20 ++++++
 .../Food/pokvisualizer.rsi/pok1.png           | Bin 0 -> 149 bytes
 .../Food/pokvisualizer.rsi/pok2.png           | Bin 0 -> 149 bytes
 .../Food/pokvisualizer.rsi/pok3.png           | Bin 0 -> 149 bytes
 22 files changed, 250 insertions(+), 16 deletions(-)
 create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entitites/objects/consumable/food/japanfood/ingredients/japaningredients.ftl
 create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entitites/objects/consumable/food/japanfood/japanfoods.ftl
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Pockypacks/pockypacks.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/pockypack/pockypacks.yml
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/chocopocky.png
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/closed.png
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/equipped-BELT.png
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/meta.json
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok1.png
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok2.png
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok3.png

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entitites/objects/consumable/food/japanfood/ingredients/japaningredients.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entitites/objects/consumable/food/japanfood/ingredients/japaningredients.ftl
new file mode 100644
index 00000000000..3e3bb7ea294
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entitites/objects/consumable/food/japanfood/ingredients/japaningredients.ftl
@@ -0,0 +1,4 @@
+ent-Doughdangoball = шарик данго
+    .desc = Выглядит как шарик из теста.
+ent-rawnoodles = сухая лапша для рамэна
+    .desc = Сухая лапша.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entitites/objects/consumable/food/japanfood/japanfoods.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entitites/objects/consumable/food/japanfood/japanfoods.ftl
new file mode 100644
index 00000000000..5e3427a702e
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entitites/objects/consumable/food/japanfood/japanfoods.ftl
@@ -0,0 +1,13 @@
+ent-hanamidango = трёхцветное данго
+    .desc = Похоже что тебе нравятся разные цвета, не так ли?
+ent-mitarashidango = митараши данго
+    .desc = Рисовая сладость, манящая за собой
+ent-onigiri = онигири
+    .desc = Лучший рис в галактике!
+ent-spicyporkramennoodles = острый рамэн
+    .desc = Выглядит так горячо... И так аппетитно!
+ent-porkramennoodles = свиной рамэн
+    .desc = Оу, да я вижу вы человек высокой культуры...
+ent-ChocolatePockyPack = коробочка шоколадных покки
+ent-chocopocky = шоколадная палочка покки
+    .desc = Не забудьте поиграть в игру со своим спутником...
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml
index 5befd85ca84..5ffda40dc01 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml
@@ -8,4 +8,5 @@
     FoodSnackChowMein: 3
     FoodSnackDanDanNoodles: 3
     PairedChopsticks: 3
+    ChocolatePockyPack: 3
 # rice?
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Pockypacks/pockypacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Pockypacks/pockypacks.yml
new file mode 100644
index 00000000000..0328729b286
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Pockypacks/pockypacks.yml
@@ -0,0 +1,65 @@
+- type: entity
+  id: PockyPackBase
+  parent: [ BaseStorageItem, BaseBagOpenClose ]
+  name: Pocky Pack
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - state: closed
+    - state: open
+      map: ["openLayer"]
+      visible: false
+    - state: pok1
+      map: ["pok1"]
+      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
+      visible: false
+    - state: pok2
+      map: ["pok2"]
+      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
+      visible: false
+    - state: pok3
+      map: ["pok3"]
+      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
+      visible: false
+  - type: Tag
+    tags:
+    - CigPack
+    - Trash
+  - type: PhysicalComposition
+    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: StorageFill
+    contents:
+    - id: chocopocky
+      amount: 10
+  - type: ItemCounter
+    count:
+      tags: [Cigarette]
+    composite: true
+    layerStates:
+    - pok1
+    - pok2
+    - pok3
+  - type: Appearance
+  - type: StaticPrice
+    price: 150
+
+- type: entity
+  id: ChocolatePockyPack
+  parent: PockyPackBase
+  name: Chocolate Pocky Pack
+  description:
+  components:
+  - type: Sprite
+    sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi
+  - type: Item
+    sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml
new file mode 100644
index 00000000000..87a7652f7b1
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml
@@ -0,0 +1,30 @@
+- type: entity
+  name: Chocolate Pocky
+  parent: FoodBakedBase
+  id: chocopocky
+  description: Don't forget to play the game with your date...
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Food
+  - type: Sprite
+    sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
+    state: chocopocky
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+          - ReagentId: Nutriment
+            Quantity: 10
+          - ReagentId: Theobromine
+            Quantity: 3
+          - ReagentId: CocoaPowder
+            Quantity: 1
+  - type: Tag
+    tags:
+    - Cigarette
+  - type: Clothing
+    sprite: Corvax\Objects\Consumable\Food\pockypacks.rsi
+    slots: [ mask ]
+    equippedPrefix: unlit
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml
index 7de170df938..f0121078605 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: трёхцветное данго
+  name: Tricolor Dango
   parent: FoodBakedBase
   id: hanamidango
-  description: Похоже что тебе нравятся разные цвета, не так ли?
+  description: You like that colors, don't you?
   components:
   - type: Item
     storedRotation: -90
@@ -16,4 +16,4 @@
         maxVol: 20
         reagents:
           - ReagentId: Nutriment
-            Quantity: 15
+            Quantity: 15
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml
index c152530afa2..c57264538cb 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: митараши данго
+  name: Mitarashi Dango
   parent: FoodBakedBase
   id: mitarashidango
-  description: Рисовая сладость, манящая за собой
+  description: Rice sweetness that beckons
   components:
   - type: Item
     storedRotation: -90
@@ -16,4 +16,4 @@
         maxVol: 20
         reagents:
           - ReagentId: Nutriment
-            Quantity: 15
+            Quantity: 15
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml
index 1dd3317dbc9..c37070ca7fe 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: онигири
+  name: Onigiri
   parent: FoodBakedBase
   id: onigiri
-  description: Лучший рис в галактике!
+  description: Best fried geometric shape in the galaxy
   components:
   - type: Item
     storedRotation: -90
@@ -16,4 +16,4 @@
         maxVol: 25
         reagents:
           - ReagentId: Nutriment
-            Quantity: 20
+            Quantity: 20
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/pockypack/pockypacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/pockypack/pockypacks.yml
new file mode 100644
index 00000000000..0328729b286
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/pockypack/pockypacks.yml
@@ -0,0 +1,65 @@
+- type: entity
+  id: PockyPackBase
+  parent: [ BaseStorageItem, BaseBagOpenClose ]
+  name: Pocky Pack
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - state: closed
+    - state: open
+      map: ["openLayer"]
+      visible: false
+    - state: pok1
+      map: ["pok1"]
+      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
+      visible: false
+    - state: pok2
+      map: ["pok2"]
+      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
+      visible: false
+    - state: pok3
+      map: ["pok3"]
+      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
+      visible: false
+  - type: Tag
+    tags:
+    - CigPack
+    - Trash
+  - type: PhysicalComposition
+    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: StorageFill
+    contents:
+    - id: chocopocky
+      amount: 10
+  - type: ItemCounter
+    count:
+      tags: [Cigarette]
+    composite: true
+    layerStates:
+    - pok1
+    - pok2
+    - pok3
+  - type: Appearance
+  - type: StaticPrice
+    price: 150
+
+- type: entity
+  id: ChocolatePockyPack
+  parent: PockyPackBase
+  name: Chocolate Pocky Pack
+  description:
+  components:
+  - type: Sprite
+    sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi
+  - type: Item
+    sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml
index 2baf9251484..a610145ea8a 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: свиной рамэн
+  name: Pork Ramen
   parent: FoodBowlBase
   id: porkramennoodles
-  description: Оу, да я вижу вы человек высокой культуры...
+  description: Ah, I See You're a Man of Culture As Well...
   components:
   - type: Item
   - type: Food
@@ -25,4 +25,4 @@
   - type: Tag
     tags:
     - Meat
-    - Soup
+    - Soup
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml
index c9498a2da05..aaf76defda6 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: острый рамэн
+  name: Spicy Ramen
   parent: FoodBowlBase
   id: spicyporkramennoodles
-  description: Выглядит так горячо... И так аппетитно!
+  description: So hot and so cute!
   components:
   - type: Item
   - type: Food
@@ -27,4 +27,4 @@
   - type: Tag
     tags:
     - Meat
-    - Soup
+    - Soup
\ No newline at end of file
diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/chocopocky.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/chocopocky.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f55451d05babfeb04c094f84e4bb33c7d30b299
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mYyz-ArY;~
z2@<S}6GVEN0u8v_4r)lSD$5#7TD0T(l}Gkw9~X%5SwtKDW$;YvgUJ^#F!&a-Fh#Df
k_zyIMFEzq5&DWPf3&`dGVi33#JQ+lJy85}Sb4q9e0A`mbaR2}S

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json
index fa66294b28f..9b52c9f98d2 100644
--- a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json
+++ b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json
@@ -29,6 +29,9 @@
     },
 	{
 	  "name": "onigiri"
-	}
+	},
+    {
+	  "name": "chocopocky"
+    }
   ]
 }
diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/closed.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..51e47493c048590e7fe54bb4a2bd5dba89abb6ba
GIT binary patch
literal 396
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<I-V|$ArY;~
z2@<S}6GVEN7}<K3WO*ct{p|OzJ9pn)W#&nzRm>7Vpk{e8sblT!|1A#>)bGh#JP$0m
z@BSaBbzve0TsoimU%gadX1OmtLBW{imz_;=K*hKIhX?2Q^YA?4;o*Az-_XLq=#oCy
zqF@urxVT>@792WoKw;hS^B+E4a&NOXo<AX3q%u%p-!tXr9dh>0k0$-*0fAMsPx|wx
zEN9$zZ8?wAoH;yksp2QL&B<XeSQcWeBOsm@@Zd?3z@sNA0;kR{n$O&GWT)i5^O>m@
z-=CQt-dUb6DPplxVoQ{i<e6GoNuXrr`-Wou{YD_o20#$AdS&}%b@TV>7T-T<zm;Y9
z{B+V98If6c1Qd4a%}`VAH{YCYTkWxFCOBLI4K^_{^pyq7_YFDh1PnyJ)CkWsUtb0-
XAe#e-LEuvGWDw=)>gTe~DWM4fH$9lw

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/equipped-BELT.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/equipped-BELT.png
new file mode 100644
index 0000000000000000000000000000000000000000..d49b6f112c062ca4deab896a5acd022e4f6faeaa
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=X`U{QAr*7p-rC4}KtX`TF=Z!%
z)^cvG#cWA3R%TW+Q<gPcW|z;?1gd1Hxn3Q=c5CUcKH2i5CD)>!&FNfuKXy64h3+TD
z<enouASFQX!AneYqTPf1lS;0NMZX$kyF?fo8rYqFiEX~~pkWe7g{P~Z%Q~loCIE`w
BG&ukO

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-left.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..9abb9390309a24a39b44e6ec9e88b881b0a4f551
GIT binary patch
literal 347
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|etWt&hE&XX
zd&@BIP=G+oL&awdoJPIMj#G`7EL*am;4o*5;!_2|*5HY4ldN}mIG>h$5i5C8++ns7
ztHP=UwKkD|?lZdWRz7{!juU7Y5bTJYxJ0bFEu%|i>){u=5sb6{8F+k~?Cvpf$+w@s
z7Ol#&eYCD6Dy~S&VbZEyS52y?eGlJo{`oh%*%fYa1)2%9IaSfWZ&!cVI6>DtIyHH^
zQeBy~XV3|uJ8L#=tkkQYxBL9_yFU(A>C0P*L#$(9SYRyoPemSR<DPrUJLVowUh(SN
zBbofupYFGQsde8q|Lew=nx46<E<d{eH2ld*C63Zb@29lK$uTh8c_Y4iW{|VP`HMS%
hM)9Rac&7RKGH3zW98jY#1y2UCJYD@<);T3K0RV&-jQRio

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-right.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..7939e045a8dd512ebadd2315d03c061f5d2d12dc
GIT binary patch
literal 333
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|-g>$?hE&XX
zdrO<|P=G+|!^6qU0tTv@tFj$7GqALYF7SxpSh>PkF;GH<sX3LmLd5q5gCvXQrcBNY
z)erxd7|*nnH4kS3ngawyzS6R*ceQ&hO-xzWz9FxS`+K;4bWQobtc%%}`#D{mGp1?I
zYMbcUFA!rc!CN{>=T=@;<$cjx4XGE*yM?pQr%zhaJTq*&ciuxSUN>jYOaCfr;xFp7
zq+Tem`l|ZUWM0iOfBClQe_jehY-3=kIP#VGW%!?34!b?#CxU;~HXJ=!e8Z&YOndOp
z=+y9}ZsE^=-|s)OJoxAFKVLsEFg#Gd!+703bXKFu{63%&e5nzhX}-P;T0k}j)W}Q0
PlR+#`S3j3^P6<r_n;?4g

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json
new file mode 100644
index 00000000000..c95166b1128
--- /dev/null
+++ b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+	{
+	  "name": "unlit-equipped-MASK",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/meta.json
new file mode 100644
index 00000000000..e0dd7ade3d0
--- /dev/null
+++ b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "pok1"
+    },
+    {
+      "name": "pok2"
+    },
+    {
+      "name": "pok3"
+    }
+  ]
+}
diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok1.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok1.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac3313079413b69ae2f9a96a9501e7893785c7d7
GIT binary patch
literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rk*a2ArY-_
z&pC23C<rhdJe+b(<V=EU_K(YaMFsO`GMsi}_>kFOXKbab9AvcN*~vc)3=7UNf3aiv
nXY+1-CeQ%B)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4f@EI#B

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok2.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok2.png
new file mode 100644
index 0000000000000000000000000000000000000000..03dbb5602e75f1460a0a06db60de609101f2c50f
GIT binary patch
literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rk*a2ArY-_
zF9dQjC<wS5Jgk<)^jYHIqHUK1)bE`4X*j+~kU?dRZT_~4bv&Aze|gw5FgWaFf2Y90
nV&<r^31|RcYJ_K+uP=iZkj(+aAaE&oGKlhY^>bP0l+XkKg&`<|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok3.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok3.png
new file mode 100644
index 0000000000000000000000000000000000000000..82a27499f1d175ac0e798ddef1506a9837e84a1c
GIT binary patch
literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rk*a2ArY-_
z&u!#nP~c&3EHt_<GUwpbn8SYU9tvk;|9@D^C{XgOV&cB^-YL9qN{#Ip7*>2{JX6N<
nPbvL)B+vl9)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4f{&*`P

literal 0
HcmV?d00001


From 32339d02c0d4119d0d60ce481a7a4f9ddd65e542 Mon Sep 17 00:00:00 2001
From: Succuberry <Meow>
Date: Sun, 14 Jul 2024 14:52:03 +0300
Subject: [PATCH 2/6] =?UTF-8?q?Revert=20"=D0=96=D0=B0=D0=BF=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=A4=D1=83=D0=B4"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit caa682e0b7555b9f23837014a582bb527aa2ca85.
---
 .../Food/JapanFood/Pockypacks/pockypacks.yml  |  65 ------------------
 .../Consumable/Food/JapanFood/chocopocky.yml  |  30 --------
 .../Consumable/Food/JapanFood/hanamidango.yml |   6 +-
 .../Food/JapanFood/mitarasidango.yml          |   6 +-
 .../Consumable/Food/JapanFood/onigiri.yml     |   6 +-
 .../Food/JapanFood/porkramennoodles.yml       |   6 +-
 .../Food/JapanFood/spicyporkramen.yml         |   6 +-
 .../Food/japanfood.rsi/chocopocky.png         | Bin 153 -> 0 bytes
 .../Consumable/Food/japanfood.rsi/meta.json   |   5 +-
 .../Consumable/Food/pockypacks.rsi/closed.png | Bin 396 -> 0 bytes
 .../Food/pockypacks.rsi/equipped-BELT.png     | Bin 159 -> 0 bytes
 .../Food/pockypacks.rsi/inhand-left.png       | Bin 347 -> 0 bytes
 .../Food/pockypacks.rsi/inhand-right.png      | Bin 333 -> 0 bytes
 .../Consumable/Food/pockypacks.rsi/meta.json  |  33 ---------
 .../Food/pokvisualizer.rsi/meta.json          |  20 ------
 .../Food/pokvisualizer.rsi/pok1.png           | Bin 149 -> 0 bytes
 .../Food/pokvisualizer.rsi/pok2.png           | Bin 149 -> 0 bytes
 .../Food/pokvisualizer.rsi/pok3.png           | Bin 149 -> 0 bytes
 18 files changed, 16 insertions(+), 167 deletions(-)
 delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Pockypacks/pockypacks.yml
 delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml
 delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/chocopocky.png
 delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/closed.png
 delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/equipped-BELT.png
 delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-left.png
 delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-right.png
 delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json
 delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/meta.json
 delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok1.png
 delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok2.png
 delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok3.png

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Pockypacks/pockypacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Pockypacks/pockypacks.yml
deleted file mode 100644
index 0328729b286..00000000000
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Pockypacks/pockypacks.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-- type: entity
-  id: PockyPackBase
-  parent: [ BaseStorageItem, BaseBagOpenClose ]
-  name: Pocky Pack
-  abstract: true
-  components:
-  - type: Sprite
-    layers:
-    - state: closed
-    - state: open
-      map: ["openLayer"]
-      visible: false
-    - state: pok1
-      map: ["pok1"]
-      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
-      visible: false
-    - state: pok2
-      map: ["pok2"]
-      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
-      visible: false
-    - state: pok3
-      map: ["pok3"]
-      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
-      visible: false
-  - type: Tag
-    tags:
-    - CigPack
-    - Trash
-  - type: PhysicalComposition
-    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: StorageFill
-    contents:
-    - id: chocopocky
-      amount: 10
-  - type: ItemCounter
-    count:
-      tags: [Cigarette]
-    composite: true
-    layerStates:
-    - pok1
-    - pok2
-    - pok3
-  - type: Appearance
-  - type: StaticPrice
-    price: 150
-
-- type: entity
-  id: ChocolatePockyPack
-  parent: PockyPackBase
-  name: Chocolate Pocky Pack
-  description:
-  components:
-  - type: Sprite
-    sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi
-  - type: Item
-    sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml
deleted file mode 100644
index 87a7652f7b1..00000000000
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-- type: entity
-  name: Chocolate Pocky
-  parent: FoodBakedBase
-  id: chocopocky
-  description: Don't forget to play the game with your date...
-  components:
-  - type: Item
-    storedRotation: -90
-  - type: Food
-  - type: Sprite
-    sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
-    state: chocopocky
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 15
-        reagents:
-          - ReagentId: Nutriment
-            Quantity: 10
-          - ReagentId: Theobromine
-            Quantity: 3
-          - ReagentId: CocoaPowder
-            Quantity: 1
-  - type: Tag
-    tags:
-    - Cigarette
-  - type: Clothing
-    sprite: Corvax\Objects\Consumable\Food\pockypacks.rsi
-    slots: [ mask ]
-    equippedPrefix: unlit
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml
index f0121078605..7de170df938 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: Tricolor Dango
+  name: трёхцветное данго
   parent: FoodBakedBase
   id: hanamidango
-  description: You like that colors, don't you?
+  description: Похоже что тебе нравятся разные цвета, не так ли?
   components:
   - type: Item
     storedRotation: -90
@@ -16,4 +16,4 @@
         maxVol: 20
         reagents:
           - ReagentId: Nutriment
-            Quantity: 15
\ No newline at end of file
+            Quantity: 15
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml
index c57264538cb..c152530afa2 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: Mitarashi Dango
+  name: митараши данго
   parent: FoodBakedBase
   id: mitarashidango
-  description: Rice sweetness that beckons
+  description: Рисовая сладость, манящая за собой
   components:
   - type: Item
     storedRotation: -90
@@ -16,4 +16,4 @@
         maxVol: 20
         reagents:
           - ReagentId: Nutriment
-            Quantity: 15
\ No newline at end of file
+            Quantity: 15
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml
index c37070ca7fe..1dd3317dbc9 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: Onigiri
+  name: онигири
   parent: FoodBakedBase
   id: onigiri
-  description: Best fried geometric shape in the galaxy
+  description: Лучший рис в галактике!
   components:
   - type: Item
     storedRotation: -90
@@ -16,4 +16,4 @@
         maxVol: 25
         reagents:
           - ReagentId: Nutriment
-            Quantity: 20
\ No newline at end of file
+            Quantity: 20
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml
index a610145ea8a..2baf9251484 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: Pork Ramen
+  name: свиной рамэн
   parent: FoodBowlBase
   id: porkramennoodles
-  description: Ah, I See You're a Man of Culture As Well...
+  description: Оу, да я вижу вы человек высокой культуры...
   components:
   - type: Item
   - type: Food
@@ -25,4 +25,4 @@
   - type: Tag
     tags:
     - Meat
-    - Soup
\ No newline at end of file
+    - Soup
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml
index aaf76defda6..c9498a2da05 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: Spicy Ramen
+  name: острый рамэн
   parent: FoodBowlBase
   id: spicyporkramennoodles
-  description: So hot and so cute!
+  description: Выглядит так горячо... И так аппетитно!
   components:
   - type: Item
   - type: Food
@@ -27,4 +27,4 @@
   - type: Tag
     tags:
     - Meat
-    - Soup
\ No newline at end of file
+    - Soup
diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/chocopocky.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/chocopocky.png
deleted file mode 100644
index 2f55451d05babfeb04c094f84e4bb33c7d30b299..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mYyz-ArY;~
z2@<S}6GVEN0u8v_4r)lSD$5#7TD0T(l}Gkw9~X%5SwtKDW$;YvgUJ^#F!&a-Fh#Df
k_zyIMFEzq5&DWPf3&`dGVi33#JQ+lJy85}Sb4q9e0A`mbaR2}S

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json
index 9b52c9f98d2..fa66294b28f 100644
--- a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json
+++ b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json
@@ -29,9 +29,6 @@
     },
 	{
 	  "name": "onigiri"
-	},
-    {
-	  "name": "chocopocky"
-    }
+	}
   ]
 }
diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/closed.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/closed.png
deleted file mode 100644
index 51e47493c048590e7fe54bb4a2bd5dba89abb6ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 396
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<I-V|$ArY;~
z2@<S}6GVEN7}<K3WO*ct{p|OzJ9pn)W#&nzRm>7Vpk{e8sblT!|1A#>)bGh#JP$0m
z@BSaBbzve0TsoimU%gadX1OmtLBW{imz_;=K*hKIhX?2Q^YA?4;o*Az-_XLq=#oCy
zqF@urxVT>@792WoKw;hS^B+E4a&NOXo<AX3q%u%p-!tXr9dh>0k0$-*0fAMsPx|wx
zEN9$zZ8?wAoH;yksp2QL&B<XeSQcWeBOsm@@Zd?3z@sNA0;kR{n$O&GWT)i5^O>m@
z-=CQt-dUb6DPplxVoQ{i<e6GoNuXrr`-Wou{YD_o20#$AdS&}%b@TV>7T-T<zm;Y9
z{B+V98If6c1Qd4a%}`VAH{YCYTkWxFCOBLI4K^_{^pyq7_YFDh1PnyJ)CkWsUtb0-
XAe#e-LEuvGWDw=)>gTe~DWM4fH$9lw

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/equipped-BELT.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/equipped-BELT.png
deleted file mode 100644
index d49b6f112c062ca4deab896a5acd022e4f6faeaa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=X`U{QAr*7p-rC4}KtX`TF=Z!%
z)^cvG#cWA3R%TW+Q<gPcW|z;?1gd1Hxn3Q=c5CUcKH2i5CD)>!&FNfuKXy64h3+TD
z<enouASFQX!AneYqTPf1lS;0NMZX$kyF?fo8rYqFiEX~~pkWe7g{P~Z%Q~loCIE`w
BG&ukO

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-left.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-left.png
deleted file mode 100644
index 9abb9390309a24a39b44e6ec9e88b881b0a4f551..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 347
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|etWt&hE&XX
zd&@BIP=G+oL&awdoJPIMj#G`7EL*am;4o*5;!_2|*5HY4ldN}mIG>h$5i5C8++ns7
ztHP=UwKkD|?lZdWRz7{!juU7Y5bTJYxJ0bFEu%|i>){u=5sb6{8F+k~?Cvpf$+w@s
z7Ol#&eYCD6Dy~S&VbZEyS52y?eGlJo{`oh%*%fYa1)2%9IaSfWZ&!cVI6>DtIyHH^
zQeBy~XV3|uJ8L#=tkkQYxBL9_yFU(A>C0P*L#$(9SYRyoPemSR<DPrUJLVowUh(SN
zBbofupYFGQsde8q|Lew=nx46<E<d{eH2ld*C63Zb@29lK$uTh8c_Y4iW{|VP`HMS%
hM)9Rac&7RKGH3zW98jY#1y2UCJYD@<);T3K0RV&-jQRio

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-right.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-right.png
deleted file mode 100644
index 7939e045a8dd512ebadd2315d03c061f5d2d12dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 333
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|-g>$?hE&XX
zdrO<|P=G+|!^6qU0tTv@tFj$7GqALYF7SxpSh>PkF;GH<sX3LmLd5q5gCvXQrcBNY
z)erxd7|*nnH4kS3ngawyzS6R*ceQ&hO-xzWz9FxS`+K;4bWQobtc%%}`#D{mGp1?I
zYMbcUFA!rc!CN{>=T=@;<$cjx4XGE*yM?pQr%zhaJTq*&ciuxSUN>jYOaCfr;xFp7
zq+Tem`l|ZUWM0iOfBClQe_jehY-3=kIP#VGW%!?34!b?#CxU;~HXJ=!e8Z&YOndOp
z=+y9}ZsE^=-|s)OJoxAFKVLsEFg#Gd!+703bXKFu{63%&e5nzhX}-P;T0k}j)W}Q0
PlR+#`S3j3^P6<r_n;?4g

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json
deleted file mode 100644
index c95166b1128..00000000000
--- a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "closed"
-    },
-    {
-      "name": "open"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    },
-	{
-	  "name": "unlit-equipped-MASK",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/meta.json
deleted file mode 100644
index e0dd7ade3d0..00000000000
--- a/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "pok1"
-    },
-    {
-      "name": "pok2"
-    },
-    {
-      "name": "pok3"
-    }
-  ]
-}
diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok1.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok1.png
deleted file mode 100644
index ac3313079413b69ae2f9a96a9501e7893785c7d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rk*a2ArY-_
z&pC23C<rhdJe+b(<V=EU_K(YaMFsO`GMsi}_>kFOXKbab9AvcN*~vc)3=7UNf3aiv
nXY+1-CeQ%B)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4f@EI#B

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok2.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok2.png
deleted file mode 100644
index 03dbb5602e75f1460a0a06db60de609101f2c50f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rk*a2ArY-_
zF9dQjC<wS5Jgk<)^jYHIqHUK1)bE`4X*j+~kU?dRZT_~4bv&Aze|gw5FgWaFf2Y90
nV&<r^31|RcYJ_K+uP=iZkj(+aAaE&oGKlhY^>bP0l+XkKg&`<|

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok3.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok3.png
deleted file mode 100644
index 82a27499f1d175ac0e798ddef1506a9837e84a1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rk*a2ArY-_
z&u!#nP~c&3EHt_<GUwpbn8SYU9tvk;|9@D^C{XgOV&cB^-YL9qN{#Ip7*>2{JX6N<
nPbvL)B+vl9)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4f{&*`P


From 03daf18b408d3673d24bfca07b6340e77d97a458 Mon Sep 17 00:00:00 2001
From: Succuberry <Meow>
Date: Sun, 14 Jul 2024 14:37:10 +0300
Subject: [PATCH 3/6] =?UTF-8?q?=D0=96=D0=B0=D0=BF=D0=B0=D0=BD=D0=A4=D1=83?=
 =?UTF-8?q?=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Food/JapanFood/Pockypacks/pockypacks.yml  |  65 ++++++++++++++++++
 .../Consumable/Food/JapanFood/chocopocky.yml  |  30 ++++++++
 .../Consumable/Food/JapanFood/hanamidango.yml |   6 +-
 .../Food/JapanFood/mitarasidango.yml          |   6 +-
 .../Consumable/Food/JapanFood/onigiri.yml     |   6 +-
 .../Food/JapanFood/porkramennoodles.yml       |   6 +-
 .../Food/JapanFood/spicyporkramen.yml         |   6 +-
 .../Food/japanfood.rsi/chocopocky.png         | Bin 0 -> 153 bytes
 .../Consumable/Food/japanfood.rsi/meta.json   |   5 +-
 .../Consumable/Food/pockypacks.rsi/closed.png | Bin 0 -> 396 bytes
 .../Food/pockypacks.rsi/equipped-BELT.png     | Bin 0 -> 159 bytes
 .../Food/pockypacks.rsi/inhand-left.png       | Bin 0 -> 347 bytes
 .../Food/pockypacks.rsi/inhand-right.png      | Bin 0 -> 333 bytes
 .../Consumable/Food/pockypacks.rsi/meta.json  |  33 +++++++++
 .../Food/pokvisualizer.rsi/meta.json          |  20 ++++++
 .../Food/pokvisualizer.rsi/pok1.png           | Bin 0 -> 149 bytes
 .../Food/pokvisualizer.rsi/pok2.png           | Bin 0 -> 149 bytes
 .../Food/pokvisualizer.rsi/pok3.png           | Bin 0 -> 149 bytes
 18 files changed, 167 insertions(+), 16 deletions(-)
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Pockypacks/pockypacks.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/chocopocky.png
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/closed.png
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/equipped-BELT.png
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/meta.json
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok1.png
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok2.png
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok3.png

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Pockypacks/pockypacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Pockypacks/pockypacks.yml
new file mode 100644
index 00000000000..0328729b286
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Pockypacks/pockypacks.yml
@@ -0,0 +1,65 @@
+- type: entity
+  id: PockyPackBase
+  parent: [ BaseStorageItem, BaseBagOpenClose ]
+  name: Pocky Pack
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - state: closed
+    - state: open
+      map: ["openLayer"]
+      visible: false
+    - state: pok1
+      map: ["pok1"]
+      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
+      visible: false
+    - state: pok2
+      map: ["pok2"]
+      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
+      visible: false
+    - state: pok3
+      map: ["pok3"]
+      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
+      visible: false
+  - type: Tag
+    tags:
+    - CigPack
+    - Trash
+  - type: PhysicalComposition
+    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: StorageFill
+    contents:
+    - id: chocopocky
+      amount: 10
+  - type: ItemCounter
+    count:
+      tags: [Cigarette]
+    composite: true
+    layerStates:
+    - pok1
+    - pok2
+    - pok3
+  - type: Appearance
+  - type: StaticPrice
+    price: 150
+
+- type: entity
+  id: ChocolatePockyPack
+  parent: PockyPackBase
+  name: Chocolate Pocky Pack
+  description:
+  components:
+  - type: Sprite
+    sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi
+  - type: Item
+    sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml
new file mode 100644
index 00000000000..87a7652f7b1
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml
@@ -0,0 +1,30 @@
+- type: entity
+  name: Chocolate Pocky
+  parent: FoodBakedBase
+  id: chocopocky
+  description: Don't forget to play the game with your date...
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Food
+  - type: Sprite
+    sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
+    state: chocopocky
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+          - ReagentId: Nutriment
+            Quantity: 10
+          - ReagentId: Theobromine
+            Quantity: 3
+          - ReagentId: CocoaPowder
+            Quantity: 1
+  - type: Tag
+    tags:
+    - Cigarette
+  - type: Clothing
+    sprite: Corvax\Objects\Consumable\Food\pockypacks.rsi
+    slots: [ mask ]
+    equippedPrefix: unlit
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml
index 7de170df938..f0121078605 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: трёхцветное данго
+  name: Tricolor Dango
   parent: FoodBakedBase
   id: hanamidango
-  description: Похоже что тебе нравятся разные цвета, не так ли?
+  description: You like that colors, don't you?
   components:
   - type: Item
     storedRotation: -90
@@ -16,4 +16,4 @@
         maxVol: 20
         reagents:
           - ReagentId: Nutriment
-            Quantity: 15
+            Quantity: 15
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml
index c152530afa2..c57264538cb 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: митараши данго
+  name: Mitarashi Dango
   parent: FoodBakedBase
   id: mitarashidango
-  description: Рисовая сладость, манящая за собой
+  description: Rice sweetness that beckons
   components:
   - type: Item
     storedRotation: -90
@@ -16,4 +16,4 @@
         maxVol: 20
         reagents:
           - ReagentId: Nutriment
-            Quantity: 15
+            Quantity: 15
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml
index 1dd3317dbc9..c37070ca7fe 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: онигири
+  name: Onigiri
   parent: FoodBakedBase
   id: onigiri
-  description: Лучший рис в галактике!
+  description: Best fried geometric shape in the galaxy
   components:
   - type: Item
     storedRotation: -90
@@ -16,4 +16,4 @@
         maxVol: 25
         reagents:
           - ReagentId: Nutriment
-            Quantity: 20
+            Quantity: 20
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml
index 2baf9251484..a610145ea8a 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: свиной рамэн
+  name: Pork Ramen
   parent: FoodBowlBase
   id: porkramennoodles
-  description: Оу, да я вижу вы человек высокой культуры...
+  description: Ah, I See You're a Man of Culture As Well...
   components:
   - type: Item
   - type: Food
@@ -25,4 +25,4 @@
   - type: Tag
     tags:
     - Meat
-    - Soup
+    - Soup
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml
index c9498a2da05..aaf76defda6 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: острый рамэн
+  name: Spicy Ramen
   parent: FoodBowlBase
   id: spicyporkramennoodles
-  description: Выглядит так горячо... И так аппетитно!
+  description: So hot and so cute!
   components:
   - type: Item
   - type: Food
@@ -27,4 +27,4 @@
   - type: Tag
     tags:
     - Meat
-    - Soup
+    - Soup
\ No newline at end of file
diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/chocopocky.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/chocopocky.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f55451d05babfeb04c094f84e4bb33c7d30b299
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mYyz-ArY;~
z2@<S}6GVEN0u8v_4r)lSD$5#7TD0T(l}Gkw9~X%5SwtKDW$;YvgUJ^#F!&a-Fh#Df
k_zyIMFEzq5&DWPf3&`dGVi33#JQ+lJy85}Sb4q9e0A`mbaR2}S

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json
index fa66294b28f..9b52c9f98d2 100644
--- a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json
+++ b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json
@@ -29,6 +29,9 @@
     },
 	{
 	  "name": "onigiri"
-	}
+	},
+    {
+	  "name": "chocopocky"
+    }
   ]
 }
diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/closed.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..51e47493c048590e7fe54bb4a2bd5dba89abb6ba
GIT binary patch
literal 396
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<I-V|$ArY;~
z2@<S}6GVEN7}<K3WO*ct{p|OzJ9pn)W#&nzRm>7Vpk{e8sblT!|1A#>)bGh#JP$0m
z@BSaBbzve0TsoimU%gadX1OmtLBW{imz_;=K*hKIhX?2Q^YA?4;o*Az-_XLq=#oCy
zqF@urxVT>@792WoKw;hS^B+E4a&NOXo<AX3q%u%p-!tXr9dh>0k0$-*0fAMsPx|wx
zEN9$zZ8?wAoH;yksp2QL&B<XeSQcWeBOsm@@Zd?3z@sNA0;kR{n$O&GWT)i5^O>m@
z-=CQt-dUb6DPplxVoQ{i<e6GoNuXrr`-Wou{YD_o20#$AdS&}%b@TV>7T-T<zm;Y9
z{B+V98If6c1Qd4a%}`VAH{YCYTkWxFCOBLI4K^_{^pyq7_YFDh1PnyJ)CkWsUtb0-
XAe#e-LEuvGWDw=)>gTe~DWM4fH$9lw

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/equipped-BELT.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/equipped-BELT.png
new file mode 100644
index 0000000000000000000000000000000000000000..d49b6f112c062ca4deab896a5acd022e4f6faeaa
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=X`U{QAr*7p-rC4}KtX`TF=Z!%
z)^cvG#cWA3R%TW+Q<gPcW|z;?1gd1Hxn3Q=c5CUcKH2i5CD)>!&FNfuKXy64h3+TD
z<enouASFQX!AneYqTPf1lS;0NMZX$kyF?fo8rYqFiEX~~pkWe7g{P~Z%Q~loCIE`w
BG&ukO

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-left.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..9abb9390309a24a39b44e6ec9e88b881b0a4f551
GIT binary patch
literal 347
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|etWt&hE&XX
zd&@BIP=G+oL&awdoJPIMj#G`7EL*am;4o*5;!_2|*5HY4ldN}mIG>h$5i5C8++ns7
ztHP=UwKkD|?lZdWRz7{!juU7Y5bTJYxJ0bFEu%|i>){u=5sb6{8F+k~?Cvpf$+w@s
z7Ol#&eYCD6Dy~S&VbZEyS52y?eGlJo{`oh%*%fYa1)2%9IaSfWZ&!cVI6>DtIyHH^
zQeBy~XV3|uJ8L#=tkkQYxBL9_yFU(A>C0P*L#$(9SYRyoPemSR<DPrUJLVowUh(SN
zBbofupYFGQsde8q|Lew=nx46<E<d{eH2ld*C63Zb@29lK$uTh8c_Y4iW{|VP`HMS%
hM)9Rac&7RKGH3zW98jY#1y2UCJYD@<);T3K0RV&-jQRio

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-right.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..7939e045a8dd512ebadd2315d03c061f5d2d12dc
GIT binary patch
literal 333
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|-g>$?hE&XX
zdrO<|P=G+|!^6qU0tTv@tFj$7GqALYF7SxpSh>PkF;GH<sX3LmLd5q5gCvXQrcBNY
z)erxd7|*nnH4kS3ngawyzS6R*ceQ&hO-xzWz9FxS`+K;4bWQobtc%%}`#D{mGp1?I
zYMbcUFA!rc!CN{>=T=@;<$cjx4XGE*yM?pQr%zhaJTq*&ciuxSUN>jYOaCfr;xFp7
zq+Tem`l|ZUWM0iOfBClQe_jehY-3=kIP#VGW%!?34!b?#CxU;~HXJ=!e8Z&YOndOp
z=+y9}ZsE^=-|s)OJoxAFKVLsEFg#Gd!+703bXKFu{63%&e5nzhX}-P;T0k}j)W}Q0
PlR+#`S3j3^P6<r_n;?4g

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json
new file mode 100644
index 00000000000..c95166b1128
--- /dev/null
+++ b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+	{
+	  "name": "unlit-equipped-MASK",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/meta.json
new file mode 100644
index 00000000000..e0dd7ade3d0
--- /dev/null
+++ b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "pok1"
+    },
+    {
+      "name": "pok2"
+    },
+    {
+      "name": "pok3"
+    }
+  ]
+}
diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok1.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok1.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac3313079413b69ae2f9a96a9501e7893785c7d7
GIT binary patch
literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rk*a2ArY-_
z&pC23C<rhdJe+b(<V=EU_K(YaMFsO`GMsi}_>kFOXKbab9AvcN*~vc)3=7UNf3aiv
nXY+1-CeQ%B)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4f@EI#B

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok2.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok2.png
new file mode 100644
index 0000000000000000000000000000000000000000..03dbb5602e75f1460a0a06db60de609101f2c50f
GIT binary patch
literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rk*a2ArY-_
zF9dQjC<wS5Jgk<)^jYHIqHUK1)bE`4X*j+~kU?dRZT_~4bv&Aze|gw5FgWaFf2Y90
nV&<r^31|RcYJ_K+uP=iZkj(+aAaE&oGKlhY^>bP0l+XkKg&`<|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok3.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok3.png
new file mode 100644
index 0000000000000000000000000000000000000000..82a27499f1d175ac0e798ddef1506a9837e84a1c
GIT binary patch
literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rk*a2ArY-_
z&u!#nP~c&3EHt_<GUwpbn8SYU9tvk;|9@D^C{XgOV&cB^-YL9qN{#Ip7*>2{JX6N<
nPbvL)B+vl9)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4f{&*`P

literal 0
HcmV?d00001


From 6ff200e962fdd5479e6e2c31e64f0fc5a45f95e9 Mon Sep 17 00:00:00 2001
From: Succuberry <Meow>
Date: Sun, 14 Jul 2024 15:04:15 +0300
Subject: [PATCH 4/6] =?UTF-8?q?=D0=94=D0=B0=20=D1=82=D1=8B=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D1=82=D0=B5=D1=80=D1=8F=D1=88=D0=BA=D0=B0=20=D0=B5=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Food/pockypacks.rsi/unlit-equipped-MASK.png   | Bin 0 -> 246 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/unlit-equipped-MASK.png

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/unlit-equipped-MASK.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/unlit-equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bf12497cf7478d067e4c7020d3e1b0f7fb6759e
GIT binary patch
literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBufiR<}hF1enu-ntcF{C2y?X8WRha4o@9tMkCdcnu17?H-7
zE+C^&Y~gS~a?U}c35uJV&9pe~&D^}v)9c{#%zfXxZa?5>IB<W~6WJ?QpW2*L{`#`Q
z`*UDOZt;0ups676q1a8{gU51>dAG&%e^+n6>xxO-c5D9po$fDR6-hn+`~0<na%5O;
f@mYxa#VsG0c6<_Lw(#D54W!%C)z4*}Q$iB}g2h+}

literal 0
HcmV?d00001


From c937dc143f1bc3b2cf0f4c71720f337d32f7e665 Mon Sep 17 00:00:00 2001
From: Succuberry <Meow>
Date: Sun, 14 Jul 2024 15:06:15 +0300
Subject: [PATCH 5/6] =?UTF-8?q?=D0=95=D1=89=D1=91=20=D0=BE=D0=B4=D0=BD?=
 =?UTF-8?q?=D0=B0...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Consumable/Food/pockypacks.rsi/open.png       | Bin 0 -> 399 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/open.png

diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/open.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..67adfbe92e7aa2676235c759963ad410e708fe6f
GIT binary patch
literal 399
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<`kpS1ArY;~
z2@<S}6GVDS4tT6PCXzPs|Boln|I|89xv8@x%Es4AZvD}k_4^EEe)NZPrt&2K!HGBT
zQ+I4m5}mU?DfMK*^BaY2ch&tT<%kJe@-0wP&}J!UEY{y|WMCj5|6jz?;pi!$*7~B)
zb(3_}PcuG`t4po;kjQoTG`qZ{1P~ng`a?1<?w7|Z!vcpeDS`OU6CGpv=PMSTtYrg%
zt7qe1yk-Eg_FY@f<1}XuPh6__iEVRo*bA1080!d#rv*HCk|glxNs7R!vy0|4_Z-<N
zx$k^ts>SzbriXWy=SzxM?3CCNB_(;LR#p-ynfbl}<Tj9I10aZ5y|VqXy7~L|bmv)C
z49`xhMp|l^>{N6pN_APGccSXsgg0DyB0Wuk23&4x3=FC|!8Hq|@B0A5kuNpEGtJkR
ZK?}&{0Adih6g(M3dAj<!taD0e0sz_3l`jAQ

literal 0
HcmV?d00001


From 85a76ea4606389d8a14d6b9971a14a47136d5b7d Mon Sep 17 00:00:00 2001
From: Succuberry <Meow>
Date: Sun, 14 Jul 2024 15:13:44 +0300
Subject: [PATCH 6/6] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=87=D1=83?=
 =?UTF-8?q?=20=D1=81=20=D0=BF=D0=BE=D0=B7=D0=BE=D1=80=D0=BE=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Food/JapanFood/pockypack/pockypacks.yml   | 65 -------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/pockypack/pockypacks.yml

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/pockypack/pockypacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/pockypack/pockypacks.yml
deleted file mode 100644
index 0328729b286..00000000000
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/pockypack/pockypacks.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-- type: entity
-  id: PockyPackBase
-  parent: [ BaseStorageItem, BaseBagOpenClose ]
-  name: Pocky Pack
-  abstract: true
-  components:
-  - type: Sprite
-    layers:
-    - state: closed
-    - state: open
-      map: ["openLayer"]
-      visible: false
-    - state: pok1
-      map: ["pok1"]
-      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
-      visible: false
-    - state: pok2
-      map: ["pok2"]
-      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
-      visible: false
-    - state: pok3
-      map: ["pok3"]
-      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
-      visible: false
-  - type: Tag
-    tags:
-    - CigPack
-    - Trash
-  - type: PhysicalComposition
-    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: StorageFill
-    contents:
-    - id: chocopocky
-      amount: 10
-  - type: ItemCounter
-    count:
-      tags: [Cigarette]
-    composite: true
-    layerStates:
-    - pok1
-    - pok2
-    - pok3
-  - type: Appearance
-  - type: StaticPrice
-    price: 150
-
-- type: entity
-  id: ChocolatePockyPack
-  parent: PockyPackBase
-  name: Chocolate Pocky Pack
-  description:
-  components:
-  - type: Sprite
-    sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi
-  - type: Item
-    sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi