diff --git a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl new file mode 100644 index 00000000000..e921f71467d --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl @@ -0,0 +1 @@ +flavor-complex-adtconsideredmilk = как сгущенка \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl new file mode 100644 index 00000000000..e060ddfb874 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl @@ -0,0 +1,5 @@ +ent-ADTFoodTinCondensedMilkTrash = сгущеное молоко (пусто) + .desc = Пустая консервная банка. Из неё можно получить немного металла. + +ent-ADTFoodTinCondensedMilk = сгущеное молоко + .desc = Стандартная банка сгущенки с удобным язычком. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl index 5d2bbb53894..3f5e24bce35 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl @@ -7,7 +7,7 @@ ent-ADTFoodSnackChipsOnionAndSourcream = чипсы со вкусом зелён ent-ADTFoodSnackChipsShrimp = чипсы со вкусом креветки .desc = Для тех, кто любит вкус креветок, но не может позволить себе их купить. -ent-ADTFoodSnackChipsSpace = космомические Чипсы +ent-ADTFoodSnackChipsSpace = космомические Чипсы .desc = Кукурузные чипсы в форме треугольника со вкусом сыра чеддер - идеальная закуска для игр. ent-ADTFoodSnackChipsSpicy = чипсы ФлеймиХат @@ -19,9 +19,9 @@ ent-ADTFoodSnackDriedBeef = вяленая говядина .desc = Толстые куски вяленой говядины. Очень долго хранится, а в мясе много белка, хороший вещь для похода ent-ADTFoodSnackDriedChicken = сушеное куриное мясо - .desc = Хорошая закуска для охоты. + .desc = Хорошая закуска для охоты. -ent-ADTFoodSnackDriedHorse = сушеная конина +ent-ADTFoodSnackDriedHorse = сушеная конина .desc = Конина - самое вкусное мясо, в ней низкое содержание жира и богатое содержание белка. ent-ADTFoodSnackDriedPig = вяленая свинина diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Food/Containers/condensed_milk.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Food/Containers/condensed_milk.ftl new file mode 100644 index 00000000000..4a7e34bf8c8 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Food/Containers/condensed_milk.ftl @@ -0,0 +1,2 @@ +reagent-name-condensedmilk = сгущенное молоко +reagent-desc-condensedmilk = белая густая и очень сладкая жидкость \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.yml new file mode 100644 index 00000000000..bcb152ca5f8 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.yml @@ -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 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml index 52ebd026aad..03d295bfbe7 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml @@ -500,3 +500,5 @@ components: - type: Sprite state: two-trash + + diff --git a/Resources/Prototypes/ADT/Flavors/fill.txt b/Resources/Prototypes/ADT/Flavors/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Flavors/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Flavors/flavors.yml b/Resources/Prototypes/ADT/Flavors/flavors.yml new file mode 100644 index 00000000000..a4da2ce0991 --- /dev/null +++ b/Resources/Prototypes/ADT/Flavors/flavors.yml @@ -0,0 +1,4 @@ +- type: flavor + id: adtconsideredmilk + flavorType: Complex + description: flavor-complex-adtconsideredmilk \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml new file mode 100644 index 00000000000..0cc31f8e402 --- /dev/null +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 167e21e15f2..fbc1f9e8426 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -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 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon-open.png b/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon-open.png new file mode 100644 index 00000000000..4bc173fc9a1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon-open.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon.png b/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon.png new file mode 100644 index 00000000000..3908b70bb12 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/meta.json new file mode 100644 index 00000000000..5adf723e9eb --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/meta.json @@ -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" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/trash.png b/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/trash.png new file mode 100644 index 00000000000..9188f296812 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/trash.png differ