diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml index 8ca8e9e46a..8c00b4b487 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml @@ -7,3 +7,6 @@ DrinkEnergyDrinkCan: 2 FoodSnackPopcorn: 2 FoodSnackEnergy: 2 + FoodSnackKirieshkiSalami: 2 + FoodSnackKirieshkiSirom: 2 + FoodSnackKirieshkiKyrichey: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml index a4801c75cd..f90b0f393f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml @@ -10,7 +10,9 @@ FoodSnackPistachios: 3 FoodSnackSus: 3 FoodSnackSemki: 3 - + FoodSnackKirieshkiSalami: 2 + FoodSnackKirieshkiSirom: 2 + FoodSnackKirieshkiKyrichey: 2 emaggedInventory: FoodSnackSyndi: 3 diff --git a/Resources/Prototypes/_Honk/Entities/Objects/Comsumable/Food/snacks.yml b/Resources/Prototypes/_Honk/Entities/Objects/Comsumable/Food/snacks.yml new file mode 100644 index 0000000000..3a725aeb0d --- /dev/null +++ b/Resources/Prototypes/_Honk/Entities/Objects/Comsumable/Food/snacks.yml @@ -0,0 +1,84 @@ +- type: entity + name: Кириешки с салями + parent: FoodSnackBase + id: FoodSnackKirieshkiSalami + description: Легендарные кириешки со вкусом салями + components: + - type: FlavorProfile + flavors: + - bread + - flavorhard + - type: Sprite + sprite: Objects/Consumable/Food/snacks.rsi + state: kirieshkisalami + - type: Item + - type: Food + trash: FoodPacketKirieshkiSalami + +- type: entity + noSpawn: true + parent: FoodPacketTrash + id: FoodPacketKirieshkiSalami + name: Кириешки с салями + components: + - type: Sprite + sprite: Objects/Consumable/Food/snacks.rsi + state: kirieshkisalami-trash + + +- type: entity + name: Кириешки с ветчиной и сыром + parent: FoodSnackBase + id: FoodSnackKirieshkiSirom + description: Легендарные кириешки со вкусом ветчины и сыра + components: + - type: FlavorProfile + flavors: + - cheesy + - bread + - flavorhard + - type: Sprite + sprite: Objects/Consumable/Food/snacks.rsi + state: kirieshkivet + - type: Item + - type: Food + trash: FoodPacketKirieshkiSirom + +- type: entity + noSpawn: true + parent: FoodPacketTrash + id: FoodPacketKirieshkiSirom + name: Кириешки с ветчиной и сыром + components: + - type: Sprite + sprite: Objects/Consumable/Food/snacks.rsi + state: kirieshkivet-trash + + + +- type: entity + name: Кириешки с ветчиной и сыром + parent: FoodSnackBase + id: FoodSnackKirieshkiKyrichey + description: Легендарные кириешки со вкусом курицы + components: + - type: FlavorProfile + flavors: + - bread + - flavorhard + - type: Sprite + sprite: Objects/Consumable/Food/snacks.rsi + state: kirieshkikyr + - type: Item + - type: Food + trash: FoodPacketKirieshkiKyrichey + +- type: entity + noSpawn: true + parent: FoodPacketTrash + id: FoodPacketKirieshkiKyrichey + name: Кириешки с курицей + components: + - type: Sprite + sprite: Objects/Consumable/Food/snacks.rsi + state: kirieshkikyr-trash diff --git a/Resources/Prototypes/_Honk/Flavors/flavors.yml b/Resources/Prototypes/_Honk/Flavors/flavors.yml new file mode 100644 index 0000000000..2e76d0067e --- /dev/null +++ b/Resources/Prototypes/_Honk/Flavors/flavors.yml @@ -0,0 +1,4 @@ +- type: flavor + id: flavorhard + flavorType: Complex + description: жёстко diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chips-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chips-trash.png index 2c4bb27550..6de4eb3251 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chips-trash.png and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chips-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chips.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chips.png index 12ea29ebfb..235d2c56d4 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chips.png and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chips.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkikyr-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkikyr-trash.png new file mode 100644 index 0000000000..44bb811622 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkikyr-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkikyr.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkikyr.png new file mode 100644 index 0000000000..44bb811622 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkikyr.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkisalami-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkisalami-trash.png new file mode 100644 index 0000000000..bf7f11eb44 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkisalami-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkisalami.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkisalami.png new file mode 100644 index 0000000000..bf7f11eb44 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkisalami.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkivet-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkivet-trash.png new file mode 100644 index 0000000000..762b39cd7e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkivet-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkivet.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkivet.png new file mode 100644 index 0000000000..762b39cd7e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/kirieshkivet.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json index 6f69910384..134ed529a2 100644 --- a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json @@ -7,6 +7,24 @@ "y": 32 }, "states": [ + { + "name": "kirieshkisalami" + }, + { + "name": "kirieshkisalami-trash" + }, + { + "name": "kirieshkivet" + }, + { + "name": "kirieshkivet-trash" + }, + { + "name": "kirieshkikyr" + }, + { + "name": "kirieshkikyr-trash" + }, { "name": "boritos" },