From 32339d02c0d4119d0d60ce481a7a4f9ddd65e542 Mon Sep 17 00:00:00 2001 From: Succuberry Date: Sun, 14 Jul 2024 14:52:03 +0300 Subject: [PATCH] =?UTF-8?q?Revert=20"=D0=96=D0=B0=D0=BF=D0=B0=D0=BD=D0=A4?= =?UTF-8?q?=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@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&NOXo0k0$-*0fAMsPx|wx zEN9$zZ8?wAoH;yksp2QL&Bm@ z-=CQt-dUb6DPplxVoQ{i7T-TgTe~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!&FNfuKXy64h3+TD zh$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$?hE&XX zdrO<|P=G+|!^6qU0tTv@tFj$7GqALYF7SxpSh>PkF;GH=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^P6kFOXKbab9AvcN*~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-_ zF9dQjCbP0l+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_2{JX6N< nPbvL)B+vl9)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4f{&*`P