From ba5423cdd64168bb57e89fcf3e451d8839bff3a9 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Tue, 7 May 2024 23:14:29 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=B2=D0=B5=D1=89=D0=BC=D0=B5=D1=88=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D0=B4=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Entities/Clothing/Back/duffels.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/duffels.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/duffels.yml index 6a869aff183..b3b95f69534 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/duffels.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/duffels.yml @@ -37,6 +37,3 @@ components: - type: Sprite sprite: ADT/Clothing/Back/paramedic_duffel.rsi - - type: StorageFill - contents: - - id: SpaceCash500 From 762848769273865e77a29105aea5e063f5f354c3 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Tue, 7 May 2024 23:18:38 +0300 Subject: [PATCH 2/5] =?UTF-8?q?Revert=20"=D0=BC=D0=BE=D0=BB=D1=8C=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B6=D0=B5=D1=82=20=D0=BA=D1=83=D1=88=D0=B0=D1=82=D1=8C?= =?UTF-8?q?=20=D0=B2=D0=B8=D0=BD=D0=BE=D0=B3=D1=80=D0=B0=D0=B4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4fcaad1afb83ab4d98d7a9017797df68aa425db3. --- .../Prototypes/Entities/Objects/Consumable/Food/produce.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 0811ea5966a..3d574e157b4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1648,9 +1648,6 @@ reagents: - ReagentId: JuiceGrape Quantity: 10 - - type: Tag - tags: - - ADTMothFriendlyFood - type: entity name: berries From bfd5ef2ead2f0ce16a634903edfae2c4f8429dd5 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Tue, 7 May 2024 23:26:04 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D1=87=D0=B5=D0=B9=D0=BD=D0=B6=D0=BB=D0=BE?= =?UTF-8?q?=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogADT.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 03ab538ddf5..ceca5f63249 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1660,4 +1660,8 @@ Entries: id: 55730 #костыль отображения в Обновлениях time: '2024-04-13T08:20:00.0000000+00:00' - +- author: Мудрый дуб + changes: + - {message: "НТ решили не выдавать бесплатные деньги в вещмешках парамедика, а оставить себе.", type: Fix} + id: 55731 #костыль отображения в Обновлениях + time: '2024-05-07T23:25:00.0000000+00:00' \ No newline at end of file From 4424f85691c9482c68a35f9f7eb68f4212e89c82 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Tue, 7 May 2024 23:27:29 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D1=80=D0=B5=D1=88=D0=B8=D0=BB=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D1=84=D0=BB=D0=B8=D0=BA=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogADT.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index ceca5f63249..cbcc8d2d751 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1663,5 +1663,5 @@ Entries: - author: Мудрый дуб changes: - {message: "НТ решили не выдавать бесплатные деньги в вещмешках парамедика, а оставить себе.", type: Fix} - id: 55731 #костыль отображения в Обновлениях + id: 55746 #костыль отображения в Обновлениях time: '2024-05-07T23:25:00.0000000+00:00' \ No newline at end of file From 4a241b1959b7b50d1e5a09dc16a4ee1c5e6fbd85 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Tue, 7 May 2024 23:41:38 +0300 Subject: [PATCH 5/5] Update ChangelogADT.yml --- Resources/Changelog/ChangelogADT.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index cbcc8d2d751..d8f834b3c6c 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1664,4 +1664,4 @@ Entries: changes: - {message: "НТ решили не выдавать бесплатные деньги в вещмешках парамедика, а оставить себе.", type: Fix} id: 55746 #костыль отображения в Обновлениях - time: '2024-05-07T23:25:00.0000000+00:00' \ No newline at end of file + time: '2024-05-07T23:25:00.0000000+00:00'