Skip to content

Commit

Permalink
Очереди на мк и перенос сгущенки (#337)
Browse files Browse the repository at this point in the history
## Описание 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
4 people authored Aug 25, 2024
1 parent edb8cc1 commit 9fe32bf
Show file tree
Hide file tree
Showing 14 changed files with 102 additions and 4 deletions.
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
flavor-complex-adtconsideredmilk = как сгущенка
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ent-ADTFoodTinCondensedMilkTrash = сгущеное молоко (пусто)
.desc = Пустая консервная банка. Из неё можно получить немного металла.
ent-ADTFoodTinCondensedMilk = сгущеное молоко
.desc = Стандартная банка сгущенки с удобным язычком.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ent-ADTFoodSnackChipsOnionAndSourcream = чипсы со вкусом зелён
ent-ADTFoodSnackChipsShrimp = чипсы со вкусом креветки
.desc = Для тех, кто любит вкус креветок, но не может позволить себе их купить.
ent-ADTFoodSnackChipsSpace = космомические Чипсы
ent-ADTFoodSnackChipsSpace = космомические Чипсы
.desc = Кукурузные чипсы в форме треугольника со вкусом сыра чеддер - идеальная закуска для игр.
ent-ADTFoodSnackChipsSpicy = чипсы ФлеймиХат
Expand All @@ -19,9 +19,9 @@ ent-ADTFoodSnackDriedBeef = вяленая говядина
.desc = Толстые куски вяленой говядины. Очень долго хранится, а в мясе много белка, хороший вещь для похода
ent-ADTFoodSnackDriedChicken = сушеное куриное мясо
.desc = Хорошая закуска для охоты.
.desc = Хорошая закуска для охоты.
ent-ADTFoodSnackDriedHorse = сушеная конина
ent-ADTFoodSnackDriedHorse = сушеная конина
.desc = Конина - самое вкусное мясо, в ней низкое содержание жира и богатое содержание белка.
ent-ADTFoodSnackDriedPig = вяленая свинина
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
reagent-name-condensedmilk = сгущенное молоко
reagent-desc-condensedmilk = белая густая и очень сладкая жидкость
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
Original file line number Diff line number Diff line change
Expand Up @@ -500,3 +500,5 @@
components:
- type: Sprite
state: two-trash


1 change: 0 additions & 1 deletion Resources/Prototypes/ADT/Flavors/fill.txt

This file was deleted.

4 changes: 4 additions & 0 deletions Resources/Prototypes/ADT/Flavors/flavors.yml
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 Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml
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
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,12 @@
sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
- type: Gun
fireRate: 5
# ADT: amount of shots while burst
shotsPerBurst: 3
availableModes:
- SemiAuto
# ADT: added burst mode
- Burst
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/mk58.ogg

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9fe32bf

Please sign in to comment.