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..ee98314f489 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml @@ -0,0 +1,27 @@ +- 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 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 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 00000000000..2f55451d05b Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/chocopocky.png differ 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 00000000000..51e47493c04 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/closed.png differ 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 00000000000..d49b6f112c0 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/equipped-BELT.png differ 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 00000000000..9abb9390309 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-left.png differ 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 00000000000..7939e045a8d Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-right.png differ 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..f56475f0a6e --- /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/pockypacks.rsi/open.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/open.png new file mode 100644 index 00000000000..67adfbe92e7 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/open.png differ 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 00000000000..0bf12497cf7 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/unlit-equipped-MASK.png differ 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 00000000000..ac331307941 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok1.png differ 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 00000000000..03dbb5602e7 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok2.png differ 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 00000000000..82a27499f1d Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok3.png differ