From 18a5ff737b5b760d040ea857d97b99e677ba6749 Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Sun, 22 Sep 2024 03:33:06 +0300 Subject: [PATCH] =?UTF-8?q?=D1=85=D0=BE=D1=82=D1=84=D0=B8=D0=BA=D1=81=20?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D1=82=D0=B8=D0=BA=D0=B0=20(#507)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Описание PR ## Почему / Баланс **Ссылка на публикацию в Discord** ## Техническая информация ## Медиа ## Требования - [ ] Я прочитал(а) и следую [Руководство по созданию пулл реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению мейнтейнера. - [ ] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие его изменения в игре, **или** этот пулл реквест не требует демонстрации в игре ## Критические изменения **Чейнджлог** --- Resources/Prototypes/ADT/Datasets/tags.yml | 2 +- Resources/Prototypes/ADT/Heretic/Heretic/heretic_rituals.yml | 2 +- Resources/Prototypes/ADT/tags.yml | 5 ++++- Resources/Prototypes/Entities/Clothing/Masks/masks.yml | 2 ++ .../Prototypes/Entities/Objects/Consumable/Food/produce.yml | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/ADT/Datasets/tags.yml b/Resources/Prototypes/ADT/Datasets/tags.yml index e30ba3612ab..8a150dfe853 100644 --- a/Resources/Prototypes/ADT/Datasets/tags.yml +++ b/Resources/Prototypes/ADT/Datasets/tags.yml @@ -161,4 +161,4 @@ - SurgeryTool - Trash - Wirecutter - - Wrench \ No newline at end of file + - Wrench diff --git a/Resources/Prototypes/ADT/Heretic/Heretic/heretic_rituals.yml b/Resources/Prototypes/ADT/Heretic/Heretic/heretic_rituals.yml index 68969abfcb1..6b503653915 100644 --- a/Resources/Prototypes/ADT/Heretic/Heretic/heretic_rituals.yml +++ b/Resources/Prototypes/ADT/Heretic/Heretic/heretic_rituals.yml @@ -28,7 +28,7 @@ id: MaskOfMadness name: heretic-ritual-ash-mask requiredTags: - Mask: 1 + GasMask: 1 Candle: 4 Stunbaton: 1 output: diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index 3fd136dd717..e413369622c 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -104,4 +104,7 @@ id: Table - type: Tag - id: Tongue \ No newline at end of file + id: Tongue + +- type: Tag + id: Poppy diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 90af169572a..cc7ed82bd9b 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -15,6 +15,8 @@ tags: - HamsterWearable - WhitelistChameleon + - GasMask # goob edit + - Mask # goob edit - type: HideLayerClothing slots: - Snout diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index d640dd1bb91..c2bff74a6ca 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1464,6 +1464,7 @@ - type: Tag tags: - Flower # TODO add "RedFlower" or "Poppy" tag, when other color flowers will be + - Poppy # good edit - type: FoodSequenceElement entries: Taco: Poppy