From 7d9e25bed9ed8db58d59bbc084a4f579adbc3993 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Sun, 23 Jun 2024 23:42:31 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=B2=D0=BE=20=D1=81=D0=BB=D0=B0=D0=B2?= =?UTF-8?q?=D1=83=20=D0=A0=D0=9F=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=20=D1=81=D0=BE=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D1=8C=20=D1=82=D1=83=D1=85=D0=BB=D1=83=D1=8E=20=D0=B5?= =?UTF-8?q?=D0=B4=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogADT.yml | 6 ++++++ .../Entities/Objects/Consumable/Food/Baked/bread.yml | 3 +++ .../Entities/Objects/Consumable/Food/Baked/pizza.yml | 3 +++ .../Prototypes/Entities/Objects/Consumable/Food/meat.yml | 1 + 4 files changed, 13 insertions(+) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 954b965b274..67ede2e72a1 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1869,3 +1869,9 @@ Entries: - { message: "Добавлена фигурка Бригмедика.", type: Add} id: 55759 #костыль отображения в Обновлениях time: '2024-06-01T18:01:00.0000000+00:00' + +- author: мудрый дуб + changes: + - { message: "НТ усовершенствовали мусорный пакет и теперь уборщик может собирать тухлую еду.", type: Fix} + id: 55761 #костыль отображения в Обновлениях + time: '2024-06-23T23:12:00.0000000+00:00' \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index 200b527157d..8d390b44880 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -789,6 +789,9 @@ id: FoodBreadMoldySlice description: Entire stations have been ripped apart over arguing whether this is still good to eat. components: + - type: Tag + tags: + - Trash - type: Sprite layers: - state: moldy-slice diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index 95bfe6b6b4c..076932a3ec5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -513,6 +513,9 @@ id: FoodPizzaMoldySlice description: Once a perfectly good slice of pizza pie, but now it lies here, rancid and bursting with spores. components: + - type: Tag + tags: + - Trash - type: FlavorProfile flavors: - bitter diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 4be8b0bb01e..d8a2c203c70 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -447,6 +447,7 @@ tags: - Raw - Meat + - Trash - type: Sprite state: rotten - type: SolutionContainerManager From b2040e0aac5da0a8a0166146193096d017ab4532 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 24 Jun 2024 14:28:16 +0300 Subject: [PATCH 2/2] Update ChangelogADT.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit чейнджлог торговца с id:55761, поэтому изменил на 55762 --- Resources/Changelog/ChangelogADT.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 4134b0911d2..4619ffaad9a 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1893,5 +1893,5 @@ Entries: - author: мудрый дуб changes: - { message: "НТ усовершенствовали мусорный пакет и теперь уборщик может собирать тухлую еду.", type: Fix} - id: 55761 #костыль отображения в Обновлениях - time: '2024-06-23T23:12:00.0000000+00:00' \ No newline at end of file + id: 55762 #костыль отображения в Обновлениях + time: '2024-06-23T23:12:00.0000000+00:00'