forked from AdventureTimeSS14/space_station_ADT
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Добавлены новые виды вредной еды (AdventureTimeSS14#154)
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это комментарии - они не будут видны в PR. --> ## Описание PR Перенос AdventureTimeSS14/space_station#335 **Проверки** <!-- Выполнение всех следующих действий, если это приемлемо для вида изменений сильно ускорит разбор вашего PR --> - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. --------- Co-authored-by: 1Stepka1 <[email protected]> Co-authored-by: 1Stepka1 <[email protected]>
- Loading branch information
1 parent
32f8595
commit 8c6b232
Showing
27 changed files
with
413 additions
and
0 deletions.
There are no files selected for viewing
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.ftl
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,2 @@ | ||
ent-ADTDrinkNoStopCan = Банка энергетика NoStop | ||
.desc = Натуральный энергетический напиток, в нем нет сахара! |
54 changes: 54 additions & 0 deletions
54
Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl
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,54 @@ | ||
|
||
#Чипсеки | ||
|
||
ent-ADTFoodSnackChipsOnionAndSourcream = чипсы со вкусом зелёного лука и сметана | ||
.desc = Золотая классика. | ||
ent-ADTFoodSnackChipsShrimp = чипсы со вкусом креветки | ||
.desc = Для тех, кто любит вкус креветок, но не может позволить себе их купить. | ||
ent-ADTFoodSnackChipsSpace = космомические Чипсы | ||
.desc = Кукурузные чипсы в форме треугольника со вкусом сыра чеддер - идеальная закуска для игр. | ||
ent-ADTFoodSnackChipsSpicy = чипсы ФлеймиХат | ||
.desc = Эти чипсы очень хороши, если вы хотите превратить свой желудок в Адское пекло. Тем, у кого проблемы с желудком, лучше их не есть... | ||
#Сушеное мясо | ||
|
||
ent-ADTFoodSnackDriedBeef = вяленая говядина | ||
.desc = Толстые куски вяленой говядины. Очень долго хранится, а в мясе много белка, хороший вещь для похода | ||
ent-ADTFoodSnackDriedChicken = сушеное куриное мясо | ||
.desc = Хорошая закуска для охоты. | ||
ent-ADTFoodSnackDriedHorse = сушеная конина | ||
.desc = Конина - самое вкусное мясо, в ней низкое содержание жира и богатое содержание белка. | ||
ent-ADTFoodSnackDriedPig = вяленая свинина | ||
.desc = Впринципе хорошая закуска. | ||
#Мусор | ||
|
||
ent-ADTFoodPacketChipsOnionAndSourcreamTrash = пустая упаковка от чипсов со вкусом зелёного лука и сметана | ||
.desc = Мусор | ||
ent-ADTFoodPacketChipsShrimpTrash = пустая упаковка от чипсов со вкусом креветки | ||
.desc = Мусор | ||
ent-ADTFoodPacketChipsSpaceTrash = пустая упаковка от Космомических чипсов | ||
.desc = Мусор | ||
ent-ADTFoodPacketSpicyTrash = пустая упаковка от чипсов ФлеймиХат | ||
.desc = Мусор | ||
ent-ADTFoodPacketBeefTrash = пустая упаковка от вяленой говядины | ||
.desc = Мусор | ||
ent-ADTFoodPacketChickenTrash = пустая упаковка от сушеного куриного мяся | ||
.desc = Мусор | ||
ent-ADTFoodPacketHorseTrash = пустая упаковка от сушеной конины | ||
.desc = Мусор | ||
ent-ADTFoodPacketPigTrash = пустая упаковка от вяленой свинины | ||
.desc = Мусор |
15 changes: 15 additions & 0 deletions
15
Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_cans.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,15 @@ | ||
- type: entity | ||
parent: DrinkCanBaseFull | ||
id: ADTDrinkNoStopCan | ||
name: No Stop Can | ||
description: No Stop Can | ||
components: | ||
- type: SolutionContainerManager | ||
solutions: | ||
drink: | ||
maxVol: 30 | ||
reagents: | ||
- ReagentId: EnergyDrink | ||
Quantity: 30 | ||
- type: Sprite | ||
sprite: ADT/Objects/Consumable/Drinks/nostop.rsi |
233 changes: 233 additions & 0 deletions
233
Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.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,233 @@ | ||
# Чипсеки | ||
|
||
- type: entity | ||
name: chips | ||
parent: FoodSnackBase | ||
id: ADTFoodSnackChipsBase | ||
description: chips | ||
abstract: true | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi | ||
state: onion-and-sourcream | ||
- type: Item | ||
- type: Food | ||
trash: ADTFoodPacketChipsTrash | ||
|
||
- type: entity | ||
name: chips | ||
parent: ADTFoodSnackChipsBase | ||
id: ADTFoodSnackChipsOnionAndSourcream | ||
description: chips | ||
components: | ||
- type: Sprite | ||
state: onion-and-sourcream | ||
- type: Food | ||
trash: ADTFoodPacketChipsOnionAndSourcreamTrash | ||
|
||
- type: entity | ||
name: chips | ||
parent: ADTFoodSnackChipsBase | ||
id: ADTFoodSnackChipsShrimp | ||
description: chips | ||
components: | ||
- type: Sprite | ||
state: shrimp | ||
- type: Food | ||
trash: ADTFoodPacketChipsShrimpTrash | ||
|
||
- type: entity | ||
name: chips | ||
parent: ADTFoodSnackChipsBase | ||
id: ADTFoodSnackChipsSpace | ||
description: chips | ||
components: | ||
- type: Sprite | ||
state: space | ||
- type: Food | ||
trash: ADTFoodPacketChipsSpaceTrash | ||
|
||
- type: entity | ||
name: chips | ||
parent: ADTFoodSnackChipsBase | ||
id: ADTFoodSnackChipsSpicy | ||
description: chips | ||
components: | ||
- type: Sprite | ||
state: spicy | ||
- type: Food | ||
trash: ADTFoodPacketSpicyTrash | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 30 | ||
reagents: | ||
- ReagentId: Nutriment | ||
Quantity: 5 | ||
- ReagentId: CapsaicinOil | ||
Quantity: 5 | ||
|
||
# Сушеное мясо | ||
|
||
- type: entity | ||
name: Dried meat | ||
parent: FoodSnackBase | ||
id: ADTFoodSnackDriedBase | ||
description: Dried meat | ||
abstract: true | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Objects/Consumable/Food/Snacks/Dried/meat.rsi | ||
state: beef | ||
- type: Item | ||
- type: Food | ||
trash: ADTFoodPacketBeefTrash | ||
# Я однако не знаю какое им делать наполнение,по дефолту у них 10 питательных веществ, если нужно то заполните в base свои значения | ||
|
||
- type: entity | ||
name: Dried meat | ||
parent: ADTFoodSnackDriedBase | ||
id: ADTFoodSnackDriedBeef | ||
description: Dried meat | ||
components: | ||
- type: Sprite | ||
state: beef | ||
- type: Item | ||
- type: Food | ||
trash: ADTFoodPacketBeefTrash | ||
|
||
- type: entity | ||
name: Dried meat | ||
parent: ADTFoodSnackDriedBase | ||
id: ADTFoodSnackDriedChicken | ||
description: Dried meat | ||
components: | ||
- type: Sprite | ||
state: chicken | ||
- type: Item | ||
- type: Food | ||
trash: ADTFoodPacketChickenTrash | ||
|
||
- type: entity | ||
name: Dried meat | ||
parent: ADTFoodSnackDriedBase | ||
id: ADTFoodSnackDriedHorse | ||
description: Dried meat | ||
components: | ||
- type: Sprite | ||
state: horse | ||
- type: Item | ||
- type: Food | ||
trash: ADTFoodPacketHorseTrash | ||
|
||
- type: entity | ||
name: Dried meat | ||
parent: ADTFoodSnackDriedBase | ||
id: ADTFoodSnackDriedPig | ||
description: Dried meat | ||
components: | ||
- type: Sprite | ||
state: pig | ||
- type: Item | ||
- type: Food | ||
trash: ADTFoodPacketPigTrash | ||
|
||
# Мусор | ||
|
||
- type: entity | ||
noSpawn: true | ||
parent: FoodPacketTrash | ||
id: ADTFoodPacketChipsTrashBase | ||
description: This is rubbish. | ||
abstract: true | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi | ||
state: onion-and-sourcream-trash | ||
- type: Item | ||
|
||
- type: entity | ||
noSpawn: true | ||
parent: FoodPacketTrash | ||
id: ADTFoodDriedPacketTrashBase | ||
description: This is rubbish. | ||
abstract: true | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Objects/Consumable/Food/Snacks/Dried/trash.rsi | ||
state: beef-trash | ||
- type: Item | ||
|
||
- type: entity | ||
noSpawn: true | ||
parent: ADTFoodPacketChipsTrashBase | ||
id: ADTFoodPacketChipsOnionAndSourcreamTrash | ||
description: This is rubbish. | ||
components: | ||
- type: Sprite | ||
state: onion-and-sourcream-trash | ||
|
||
- type: entity | ||
noSpawn: true | ||
parent: ADTFoodPacketChipsTrashBase | ||
id: ADTFoodPacketChipsShrimpTrash | ||
description: This is rubbish. | ||
components: | ||
- type: Sprite | ||
state: shrimp-trash | ||
|
||
- type: entity | ||
noSpawn: true | ||
parent: ADTFoodPacketChipsTrashBase | ||
id: ADTFoodPacketChipsSpaceTrash | ||
description: This is rubbish. | ||
components: | ||
- type: Sprite | ||
state: space-trash | ||
|
||
- type: entity | ||
noSpawn: true | ||
parent: ADTFoodPacketChipsTrashBase | ||
id: ADTFoodPacketSpicyTrash | ||
description: This is rubbish. | ||
components: | ||
- type: Sprite | ||
state: spicy-trash | ||
|
||
# разделитель | ||
|
||
- type: entity | ||
noSpawn: true | ||
parent: ADTFoodDriedPacketTrashBase | ||
id: ADTFoodPacketBeefTrash | ||
description: This is rubbish. | ||
components: | ||
- type: Sprite | ||
state: beef-trash | ||
|
||
- type: entity | ||
noSpawn: true | ||
parent: ADTFoodDriedPacketTrashBase | ||
id: ADTFoodPacketChickenTrash | ||
description: This is rubbish. | ||
components: | ||
- type: Sprite | ||
state: chicken-trash | ||
|
||
- type: entity | ||
noSpawn: true | ||
parent: ADTFoodDriedPacketTrashBase | ||
id: ADTFoodPacketHorseTrash | ||
description: This is rubbish. | ||
components: | ||
- type: Sprite | ||
state: horse-trash | ||
|
||
- type: entity | ||
noSpawn: true | ||
parent: ADTFoodDriedPacketTrashBase | ||
id: ADTFoodPacketPigTrash | ||
description: This is rubbish. | ||
components: | ||
- type: Sprite | ||
state: pig-trash |
Binary file added
BIN
+600 Bytes
Resources/Textures/ADT/Objects/Consumable/Drinks/nostop.rsi/icon-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
+572 Bytes
Resources/Textures/ADT/Objects/Consumable/Drinks/nostop.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions
17
Resources/Textures/ADT/Objects/Consumable/Drinks/nostop.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,17 @@ | ||
{ | ||
"version": 1, | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by discord:prazat911", | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "icon-open" | ||
} | ||
] | ||
} |
23 changes: 23 additions & 0 deletions
23
Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.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,23 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by Adventure Time", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "onion-and-sourcream" | ||
}, | ||
{ | ||
"name": "shrimp" | ||
}, | ||
{ | ||
"name": "space" | ||
}, | ||
{ | ||
"name": "spicy" | ||
} | ||
] | ||
} |
Binary file added
BIN
+527 Bytes
...ures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/onion-and-sourcream.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
+467 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/shrimp.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
+456 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/space.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
+569 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/spicy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/trash.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,23 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by Adventure Time", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "onion-and-sourcream-trash" | ||
}, | ||
{ | ||
"name": "shrimp-trash" | ||
}, | ||
{ | ||
"name": "space-trash" | ||
}, | ||
{ | ||
"name": "spicy-trash" | ||
} | ||
] | ||
} |
Binary file added
BIN
+643 Bytes
...DT/Objects/Consumable/Food/Snacks/Chips/trash.rsi/onion-and-sourcream-trash.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
+592 Bytes
...es/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi/shrimp-trash.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
+585 Bytes
...ces/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi/space-trash.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
+697 Bytes
...ces/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi/spicy-trash.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
+408 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/meat.rsi/beef.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
+398 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/meat.rsi/chicken.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
+459 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/meat.rsi/horse.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.