This repository has been archived by the owner on Nov 1, 2024. It is now read-only.
forked from new-frontiers-14/frontier-station-14
-
Notifications
You must be signed in to change notification settings - Fork 37
Финальный PR японской еды. #368
Merged
Merged
Changes from 5 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
4807791
Add files via upload
Chocosasel 8a2636e
Add files via upload
Chocosasel 0c0b35c
Add files via upload
Chocosasel e99a9b5
Delete Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.r…
Chocosasel c8d3b4a
Add files via upload
Chocosasel 14ce53a
Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Japa…
Chocosasel 8a2183a
Add files via upload
Chocosasel 1dbb388
Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Japa…
Chocosasel 8a32115
Add files via upload
Chocosasel 1990c68
Delete Resources/Prototypes/Catalog/VendingMachines/Inventories/chang…
Chocosasel 1021de2
Add files via upload
Chocosasel a98a85a
Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Japa…
Chocosasel faa1c3f
Add files via upload
Chocosasel 2272cbc
Add files via upload
Chocosasel 65530d6
Delete Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects…
Chocosasel f532898
Add files via upload
Chocosasel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
6 changes: 3 additions & 3 deletions
6
...rces/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
6 changes: 3 additions & 3 deletions
6
...Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
27 changes: 27 additions & 0 deletions
27
Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/pockypack/pockypacks.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+153 Bytes
Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/chocopocky.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,6 +29,9 @@ | |
}, | ||
{ | ||
"name": "onigiri" | ||
} | ||
}, | ||
{ | ||
"name": "chocopocky" | ||
} | ||
] | ||
} |
Binary file added
BIN
+396 Bytes
Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/closed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+159 Bytes
Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/equipped-BELT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+347 Bytes
Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+333 Bytes
Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions
33
Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
} | ||
] | ||
} |
Binary file added
BIN
+399 Bytes
Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+246 Bytes
.../Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/unlit-equipped-MASK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions
20
Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
} | ||
] | ||
} |
Binary file added
BIN
+149 Bytes
Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+149 Bytes
Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+149 Bytes
Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Удали эту строку, она не нужна. Она же и является ошибкой чека YAML.