From 480779156d9153e454fb9ab471479c7a709a9268 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Wed, 10 Jul 2024 10:47:25 +0400 Subject: [PATCH 01/16] Add files via upload --- .../Food/JapanFood/Ingredients/dangodough.yml | 6 +- .../JapanFood/Ingredients/rawramennoodles.yml | 6 +- .../Consumable/Food/JapanFood/chocopocky.yml | 29 +++++++++ .../Consumable/Food/JapanFood/hanamidango.yml | 6 +- .../Food/JapanFood/mitarasidango.yml | 6 +- .../Consumable/Food/JapanFood/onigiri.yml | 6 +- .../Food/JapanFood/pockypack/pockypacks.yml | 63 +++++++++++++++++++ .../Food/JapanFood/porkramennoodles.yml | 6 +- .../Food/JapanFood/spicyporkramen.yml | 6 +- 9 files changed, 113 insertions(+), 21 deletions(-) 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 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml index 6fec93ae645..5ffe3c7b2af 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml @@ -1,12 +1,12 @@ - type: entity - name: шарик данго + name: Dough Dango Ball parent: FoodBakingBase id: Doughdangoball - description: Выглядит как шарик из теста. + description: A ball of dough. components: - type: FlavorProfile flavors: - dough - type: Sprite sprite: Corvax/Objects/Consumable/Food/ingredients.rsi - state: doughdangoball + state: doughdangoball \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml index ec389ea0e06..2f0a29fa3e4 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml @@ -1,10 +1,10 @@ - type: entity - name: сухая лапша для рамэна + name: Raw Ramen Noodles parent: FoodBakingBase id: rawnoodles - description: Сухая лапша. + description: A raw ramen. components: - type: FlavorProfile - type: Sprite sprite: Corvax/Objects/Consumable/Food/ingredients.rsi - state: rawnoodles + state: rawnoodles \ No newline at end of file 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..432a033328b --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml @@ -0,0 +1,29 @@ +- 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: 5 + - ReagentId: Theobromine + Quantity: 1 + - type: Tag + tags: + - Cigarette + - type: Clothing + sprite: Corvax\Objects\Consumable\Food\pockypacks.rsi + state: unlit-equipped-MASK + 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..83295e0a745 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/pockypack/pockypacks.yml @@ -0,0 +1,63 @@ +- 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: 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 From 8a2636ecdc5f13fa4ace1ab6e36cec22ef7fce2a Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Wed, 10 Jul 2024 11:07:49 +0400 Subject: [PATCH 02/16] Add files via upload --- .../Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml index 432a033328b..ee98314f489 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml @@ -17,8 +17,6 @@ reagents: - ReagentId: Nutriment Quantity: 5 - - ReagentId: Theobromine - Quantity: 1 - type: Tag tags: - Cigarette From 0c0b35c455ffed9bbf22dcfd6f39aa1420a5305f Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Wed, 10 Jul 2024 11:09:00 +0400 Subject: [PATCH 03/16] Add files via upload --- .../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 ++++++++++++++++++ .../Consumable/Food/pockypacks.rsi/open.png | Bin 0 -> 399 bytes .../pockypacks.rsi/unlit-equipped-MASK.png | Bin 0 -> 246 bytes .../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 13 files changed, 57 insertions(+), 1 deletion(-) 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/pockypacks.rsi/open.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/unlit-equipped-MASK.png 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/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@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 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!&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^P6SzbriXWy=SzxM?3CCNB_(;LR#p-ynfbl}{N6pN_APGccSXsgg0DyB0Wuk23&4x3=FC|!8Hq|@B0A5kuNpEGtJkR ZK?}&{0Adih6g(M3dAjIBdAG&%e^+n6>xxO-c5D9po$fDR6-hn+`~0kFOXKbab9AvcN*~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-_ zF9dQjCbP0l+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_2{JX6N< nPbvL)B+vl9)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4f{&*`P literal 0 HcmV?d00001 From e99a9b53da6335fc0b7909df3f1b5e9e1c2d560d Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 12 Jul 2024 13:45:48 +0400 Subject: [PATCH 04/16] Delete Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json --- .../Consumable/Food/pockypacks.rsi/meta.json | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json 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 f56475f0a6e..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 - } - ] -} From c8d3b4aeee507875a3ce50d718102414399b28e3 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 12 Jul 2024 13:46:03 +0400 Subject: [PATCH 05/16] Add files via upload --- .../Consumable/Food/pockypacks.rsi/meta.json | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json 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 + } + ] +} From 14ce53ad69318a2de7b3789947a9cc327450ef11 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 13 Jul 2024 11:51:55 +0400 Subject: [PATCH 06/16] Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml --- .../Consumable/Food/JapanFood/chocopocky.yml | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml 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 ee98314f489..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml +++ /dev/null @@ -1,27 +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: 5 - - type: Tag - tags: - - Cigarette - - type: Clothing - sprite: Corvax\Objects\Consumable\Food\pockypacks.rsi - state: unlit-equipped-MASK - slots: [ mask ] - equippedPrefix: unlit \ No newline at end of file From 8a2183a78eaedca3a2bd8adde206414fdc5cc65d Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 13 Jul 2024 11:52:35 +0400 Subject: [PATCH 07/16] Add files via upload --- .../Consumable/Food/JapanFood/chocopocky.yml | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml 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 From 1dbb388e12450b6fae9d98e410223d67f21a05e2 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 13 Jul 2024 15:35:05 +0400 Subject: [PATCH 08/16] Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/pockypack/pockypacks.yml --- .../Food/JapanFood/pockypack/pockypacks.yml | 63 ------------------- 1 file changed, 63 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 83295e0a745..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/pockypack/pockypacks.yml +++ /dev/null @@ -1,63 +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: 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 From 8a32115c3c0308c1dda360201b63364337d42c2f Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 13 Jul 2024 15:36:07 +0400 Subject: [PATCH 09/16] Add files via upload --- .../Food/JapanFood/pockypack/pockypacks.yml | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create 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 new file mode 100644 index 00000000000..d10348d1f79 --- /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 From 1990c68c535092c04d08b12e635f8fccead9f506 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 13 Jul 2024 15:37:48 +0400 Subject: [PATCH 10/16] Delete Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml --- .../Catalog/VendingMachines/Inventories/chang.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml deleted file mode 100644 index 5befd85ca84..00000000000 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: vendingMachineInventory - id: ChangInventory - startingInventory: - FoodCondimentPacketSoy: 5 - FoodSnackCookieFortune: 5 - DrinkRamen: 3 - DrinkHellRamen: 3 - FoodSnackChowMein: 3 - FoodSnackDanDanNoodles: 3 - PairedChopsticks: 3 -# rice? From 1021de204a3d55c6ef7dc2cba5690f2543db7de2 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 13 Jul 2024 15:38:03 +0400 Subject: [PATCH 11/16] Add files via upload --- .../Catalog/VendingMachines/Inventories/chang.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml new file mode 100644 index 00000000000..9e506ad92ef --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml @@ -0,0 +1,12 @@ +- type: vendingMachineInventory + id: ChangInventory + startingInventory: + FoodCondimentPacketSoy: 5 + FoodSnackCookieFortune: 5 + DrinkRamen: 3 + DrinkHellRamen: 3 + FoodSnackChowMein: 3 + FoodSnackDanDanNoodles: 3 + PairedChopsticks: 3 + ChocolatePockyPack: 3 #CorvaxFrontier +# rice? From a98a85a200dcaa112a77e916ff1d024aa442b968 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 13 Jul 2024 15:41:33 +0400 Subject: [PATCH 12/16] Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/pockypack/pockypacks.yml --- .../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 d10348d1f79..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 From faa1c3f99a727b74eb8b0785e36346390285b8a8 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 13 Jul 2024 15:41:47 +0400 Subject: [PATCH 13/16] Add files via upload --- .../Food/JapanFood/pockypack/pockypacks.yml | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create 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 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 From 2272cbc0c08973002ecd35a0dfc85798d52be09e Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 13 Jul 2024 15:46:47 +0400 Subject: [PATCH 14/16] Add files via upload --- .../food/japanfood/ingredients/japaningredients.ftl | 4 ++++ .../consumable/food/japanfood/japanfoods.ftl | 13 +++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/japanfoods.ftl diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl new file mode 100644 index 00000000000..442b020305e --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/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/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/japanfoods.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/japanfoods.ftl new file mode 100644 index 00000000000..14d49e7888f --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/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 From 65530d63da77f17d1e8037a65794a90e4401f506 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 13 Jul 2024 15:50:11 +0400 Subject: [PATCH 15/16] Delete Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood directory --- .../food/japanfood/ingredients/japaningredients.ftl | 4 ---- .../consumable/food/japanfood/japanfoods.ftl | 13 ------------- 2 files changed, 17 deletions(-) delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/japanfoods.ftl diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl deleted file mode 100644 index 442b020305e..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-Doughdangoball = шарик данго - .desc = Выглядит как шарик из теста. -ent-rawnoodles = сухая лапша для рамэна - .desc = Сухая лапша. \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/japanfoods.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/japanfoods.ftl deleted file mode 100644 index 14d49e7888f..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/japanfoods.ftl +++ /dev/null @@ -1,13 +0,0 @@ -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 From f532898b7e6411c88ae87051339b80fd22065acf Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 13 Jul 2024 15:50:22 +0400 Subject: [PATCH 16/16] Add files via upload --- .../food/japanfood/ingredients/japaningredients.ftl | 4 ++++ .../consumable/food/japanfood/japanfoods.ftl | 13 +++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/japanfoods.ftl diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl new file mode 100644 index 00000000000..3e3bb7ea294 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/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/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/japanfoods.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/japanfoods.ftl new file mode 100644 index 00000000000..5e3427a702e --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/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