-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Очереди на мк и перенос сгущенки (#337)
## Описание PR Добавлены очереди для МК-58 и перенесена сгущенка Петра - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** :cl: Ne4to_ - add: Добавлен режим стрельбы очередями для МК-58 - add: По просьбам сладкоежек вновь добавлена сгущенка --------- Co-authored-by: bananchiki <[email protected]> Co-authored-by: 1Stepka1 <[email protected]> Co-authored-by: Darki255 <[email protected]>
- Loading branch information
1 parent
edb8cc1
commit 9fe32bf
Showing
14 changed files
with
102 additions
and
4 deletions.
There are no files selected for viewing
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 @@ | ||
flavor-complex-adtconsideredmilk = как сгущенка |
5 changes: 5 additions & 0 deletions
5
Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.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,5 @@ | ||
ent-ADTFoodTinCondensedMilkTrash = сгущеное молоко (пусто) | ||
.desc = Пустая консервная банка. Из неё можно получить немного металла. | ||
ent-ADTFoodTinCondensedMilk = сгущеное молоко | ||
.desc = Стандартная банка сгущенки с удобным язычком. |
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
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/reagents/Consumable/Food/Containers/condensed_milk.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 @@ | ||
reagent-name-condensedmilk = сгущенное молоко | ||
reagent-desc-condensedmilk = белая густая и очень сладкая жидкость |
43 changes: 43 additions & 0 deletions
43
Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.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,43 @@ | ||
#Сгущенка | ||
|
||
- type: entity | ||
parent: FoodTinBase | ||
id: ADTFoodTinCondensedMilk | ||
name: condensed milk | ||
description: A standard issue tin of condensed milk with a convenient pull tab. | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi | ||
# the convenient pull tab | ||
- type: Item | ||
sprite: ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi | ||
size: Small | ||
shape: | ||
- 0,0,0,1 | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 30 | ||
reagents: | ||
- ReagentId: ADTCondensedMilk | ||
Quantity: 30 | ||
- type: Openable | ||
openableByHand: true | ||
sound: | ||
path: /Audio/Items/can_open3.ogg | ||
- type: Food | ||
trash: | ||
- ADTFoodTinCondensedMilkTrash | ||
|
||
- type: entity | ||
parent: FoodTinBaseTrash | ||
id: ADTFoodTinCondensedMilkTrash | ||
name: condensed milk | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi | ||
- type: Item | ||
sprite: ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi | ||
size: Small | ||
shape: | ||
- 0,0,0,1 |
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 |
---|---|---|
|
@@ -500,3 +500,5 @@ | |
components: | ||
- type: Sprite | ||
state: two-trash | ||
|
||
|
This file was deleted.
Oops, something went wrong.
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,4 @@ | ||
- type: flavor | ||
id: adtconsideredmilk | ||
flavorType: Complex | ||
description: flavor-complex-adtconsideredmilk |
18 changes: 18 additions & 0 deletions
18
Resources/Prototypes/ADT/Reagents/Consumable/Food/food.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,18 @@ | ||
- type: reagent | ||
id: ADTCondensedMilk | ||
name: reagent-name-condensedmilk | ||
group: Foods | ||
desc: reagent-desc-condensedmilk | ||
physicalDesc: reagent-physical-desc-gloopy | ||
flavor: adtconsideredmilk | ||
color: "#fcfcf2" | ||
recognizable: true | ||
metabolisms: | ||
Food: | ||
effects: | ||
- !type:AdjustReagent | ||
reagent: Sugar | ||
amount: 0.5 | ||
- !type:AdjustReagent | ||
reagent: Nutriment | ||
amount: 0.2 |
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
+938 Bytes
...extures/ADT/Objects/Consumable/Food/Containers/condensed_milk.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
+667 Bytes
...ces/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.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.
20 changes: 20 additions & 0 deletions
20
Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.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": "by discord not_so_big_chungus", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "icon-open" | ||
}, | ||
{ | ||
"name": "trash" | ||
} | ||
] | ||
} |
Binary file added
BIN
+920 Bytes
...es/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/trash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.