From 787dee44b052d40500a92d1c94288bb623a71eaf Mon Sep 17 00:00:00 2001 From: Dmitry <57028746+DIMMoon1@users.noreply.github.com> Date: Mon, 22 Dec 2025 03:06:16 +0700 Subject: [PATCH] upstream bugfix --- .../GuideGenerator/HealthChangeReagentsJsonGenerator.cs | 2 +- Resources/Locale/ru-RU/datasets/figurines.ftl | 5 ++--- Resources/Prototypes/Corvax/Maps/Corvax/astra.yml | 2 -- Resources/Prototypes/Corvax/Maps/Corvax/avrite.yml | 4 +--- Resources/Prototypes/Corvax/Maps/Corvax/chloris.yml | 4 +--- Resources/Prototypes/Corvax/Maps/Corvax/delta.yml | 2 -- Resources/Prototypes/Corvax/Maps/Corvax/glacier.yml | 1 - Resources/Prototypes/Corvax/Maps/Corvax/maus.yml | 3 +-- Resources/Prototypes/Corvax/Maps/Corvax/paper.yml | 3 +-- Resources/Prototypes/Corvax/Maps/Corvax/pearl.yml | 2 -- Resources/Prototypes/Corvax/Maps/Corvax/pilgrim.yml | 2 -- Resources/Prototypes/Corvax/Maps/Corvax/split.yml | 1 - Resources/Prototypes/Corvax/Maps/Corvax/terra.yml | 1 - Resources/Prototypes/Corvax/Maps/Corvax/tushkan.yml | 3 +-- 14 files changed, 8 insertions(+), 27 deletions(-) diff --git a/Content.Server/Corvax/GuideGenerator/HealthChangeReagentsJsonGenerator.cs b/Content.Server/Corvax/GuideGenerator/HealthChangeReagentsJsonGenerator.cs index 66e2a545bd..d62b1e3bc8 100644 --- a/Content.Server/Corvax/GuideGenerator/HealthChangeReagentsJsonGenerator.cs +++ b/Content.Server/Corvax/GuideGenerator/HealthChangeReagentsJsonGenerator.cs @@ -3,7 +3,7 @@ using Robust.Shared.Prototypes; using System.IO; using System.Linq; using System.Text.Json; -using Content.Shared.EntityEffects.Effects; +using Content.Shared.EntityEffects.Effects.Damage; namespace Content.Server.Corvax.GuideGenerator; public sealed class HealthChangeReagentsJsonGenerator diff --git a/Resources/Locale/ru-RU/datasets/figurines.ftl b/Resources/Locale/ru-RU/datasets/figurines.ftl index 6f7c5fe013..b9fddc4808 100644 --- a/Resources/Locale/ru-RU/datasets/figurines.ftl +++ b/Resources/Locale/ru-RU/datasets/figurines.ftl @@ -104,9 +104,8 @@ figurines-qm-3 = Я не покупал эти пушки! figurines-qm-4 = Один ящик с игрушками для товарища клоуна! figurines-qm-5 = Пора потратить все деньги на лотерею. figurines-qm-6 = Viva La Cargonia! -figurines-qm-7 = Заполните форму. -figurines-qm-8 = Куда пропали все деньги? -figurines-qm-9 = 99% азартных игроков бросают прямо перед тем, как сорвать куш! +figurines-qm-7 = Куда пропали все деньги? +figurines-qm-8 = 99% азартных игроков бросают прямо перед тем, как сорвать куш! figurines-ce-1 = Все на брифинг! figurines-ce-2 = Подключить соляры! figurines-ce-3 = Как настроить ТЭГ? diff --git a/Resources/Prototypes/Corvax/Maps/Corvax/astra.yml b/Resources/Prototypes/Corvax/Maps/Corvax/astra.yml index 4c7b00765e..13c2787892 100644 --- a/Resources/Prototypes/Corvax/Maps/Corvax/astra.yml +++ b/Resources/Prototypes/Corvax/Maps/Corvax/astra.yml @@ -62,9 +62,7 @@ Musician: [ 2, 2 ] Reporter: [ 1, 1 ] ServiceWorker: [ 3, 4 ] - Zookeeper: [ 1, 1 ] Passenger: [ -1, -1 ] - Boxer: [ 2, 2 ] # silicon StationAi: [ 1, 1 ] Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Corvax/Maps/Corvax/avrite.yml b/Resources/Prototypes/Corvax/Maps/Corvax/avrite.yml index 0bdfe245f3..b5e900eff3 100644 --- a/Resources/Prototypes/Corvax/Maps/Corvax/avrite.yml +++ b/Resources/Prototypes/Corvax/Maps/Corvax/avrite.yml @@ -56,14 +56,12 @@ Chaplain: [ 1, 1 ] Chef: [ 2, 2 ] Clown: [ 1, 1 ] - Boxer: [ 2, 2 ] Janitor: [ 3, 3 ] Librarian: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 1, 2 ] ServiceWorker: [ 3, 4 ] - Zookeeper: [ 1, 1 ] Passenger: [ -1, -1 ] # silicon StationAi: [ 1, 1 ] @@ -72,4 +70,4 @@ SeniorEngineer: [ 1, 1 ] SeniorPhysician: [ 1, 1 ] SeniorResearcher: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] \ No newline at end of file + SeniorOfficer: [ 1, 1 ] diff --git a/Resources/Prototypes/Corvax/Maps/Corvax/chloris.yml b/Resources/Prototypes/Corvax/Maps/Corvax/chloris.yml index 95b240bdd7..b9d290e46a 100644 --- a/Resources/Prototypes/Corvax/Maps/Corvax/chloris.yml +++ b/Resources/Prototypes/Corvax/Maps/Corvax/chloris.yml @@ -62,9 +62,7 @@ Musician: [ 2, 2 ] Reporter: [ 1, 2 ] ServiceWorker: [ 3, 4 ] - Zookeeper: [ 1, 1 ] Passenger: [ -1, -1 ] - Boxer: [ 2, 2 ] # silicon StationAi: [ 1, 1 ] Borg: [ 2, 3 ] @@ -72,4 +70,4 @@ SeniorEngineer: [ 1, 1 ] SeniorPhysician: [ 1, 1 ] SeniorResearcher: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] \ No newline at end of file + SeniorOfficer: [ 1, 1 ] diff --git a/Resources/Prototypes/Corvax/Maps/Corvax/delta.yml b/Resources/Prototypes/Corvax/Maps/Corvax/delta.yml index 67ae5be35e..1fc51ae105 100644 --- a/Resources/Prototypes/Corvax/Maps/Corvax/delta.yml +++ b/Resources/Prototypes/Corvax/Maps/Corvax/delta.yml @@ -53,7 +53,6 @@ HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] Botanist: [ 3, 4 ] - Boxer: [ 2, 2 ] Chaplain: [ 1, 1 ] Chef: [ 1, 2 ] Clown: [ 1, 1 ] @@ -63,7 +62,6 @@ Musician: [ 2, 2 ] Reporter: [ 2, 2 ] ServiceWorker: [ 3, 3 ] - Zookeeper: [ 1, 1 ] Passenger: [ -1, -1 ] # silicon StationAi: [ 1, 1 ] diff --git a/Resources/Prototypes/Corvax/Maps/Corvax/glacier.yml b/Resources/Prototypes/Corvax/Maps/Corvax/glacier.yml index 81152bf37f..a2b830430d 100644 --- a/Resources/Prototypes/Corvax/Maps/Corvax/glacier.yml +++ b/Resources/Prototypes/Corvax/Maps/Corvax/glacier.yml @@ -61,7 +61,6 @@ Musician: [ 1, 1 ] Reporter: [ 1, 2 ] ServiceWorker: [ 2, 3 ] - Zookeeper: [ 1, 1 ] Passenger: [ -1, -1 ] # silicon StationAi: [ 1, 1 ] diff --git a/Resources/Prototypes/Corvax/Maps/Corvax/maus.yml b/Resources/Prototypes/Corvax/Maps/Corvax/maus.yml index d07bdae40a..0de6c02f55 100644 --- a/Resources/Prototypes/Corvax/Maps/Corvax/maus.yml +++ b/Resources/Prototypes/Corvax/Maps/Corvax/maus.yml @@ -54,7 +54,6 @@ HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] Botanist: [ 2, 2 ] - Boxer: [ 1, 1 ] Chaplain: [ 1, 1 ] Chef: [ 1, 1 ] Clown: [ 1, 1 ] @@ -72,4 +71,4 @@ SeniorEngineer: [ 1, 1 ] SeniorPhysician: [ 1, 1 ] SeniorResearcher: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] \ No newline at end of file + SeniorOfficer: [ 1, 1 ] diff --git a/Resources/Prototypes/Corvax/Maps/Corvax/paper.yml b/Resources/Prototypes/Corvax/Maps/Corvax/paper.yml index 7d8711535d..55790632a9 100644 --- a/Resources/Prototypes/Corvax/Maps/Corvax/paper.yml +++ b/Resources/Prototypes/Corvax/Maps/Corvax/paper.yml @@ -61,7 +61,6 @@ Musician: [ 1, 1 ] Reporter: [ 1, 1 ] ServiceWorker: [ 3, 3 ] - Zookeeper: [ 1, 1 ] Passenger: [ -1, -1 ] #silicon StationAi: [ 1, 1 ] @@ -70,4 +69,4 @@ SeniorEngineer: [ 1, 1 ] SeniorPhysician: [ 1, 1 ] SeniorResearcher: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] \ No newline at end of file + SeniorOfficer: [ 1, 1 ] diff --git a/Resources/Prototypes/Corvax/Maps/Corvax/pearl.yml b/Resources/Prototypes/Corvax/Maps/Corvax/pearl.yml index eba71676bb..7739bd886d 100644 --- a/Resources/Prototypes/Corvax/Maps/Corvax/pearl.yml +++ b/Resources/Prototypes/Corvax/Maps/Corvax/pearl.yml @@ -53,7 +53,6 @@ HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 2, 2 ] - Boxer: [ 1, 1 ] Chaplain: [ 1, 1 ] Chef: [ 2, 2 ] Clown: [ 1, 1 ] @@ -63,7 +62,6 @@ Musician: [ 2, 2 ] ServiceWorker: [ 2, 2 ] Passenger: [ -1, -1 ] - Zookeeper: [ 1, 1 ] # silicon Borg: [ 2, 2 ] StationAi: [ 1, 1 ] diff --git a/Resources/Prototypes/Corvax/Maps/Corvax/pilgrim.yml b/Resources/Prototypes/Corvax/Maps/Corvax/pilgrim.yml index dc813d6f34..9ee61ea04c 100644 --- a/Resources/Prototypes/Corvax/Maps/Corvax/pilgrim.yml +++ b/Resources/Prototypes/Corvax/Maps/Corvax/pilgrim.yml @@ -53,7 +53,6 @@ HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] Botanist: [ 3, 3 ] - Boxer: [ 2, 2 ] Chaplain: [ 1, 1 ] Chef: [ 2, 2 ] Clown: [ 1, 1 ] @@ -63,7 +62,6 @@ Musician: [ 1, 1 ] Reporter: [ 2, 2 ] ServiceWorker: [ 3, 3 ] - Zookeeper: [ 1, 1 ] Passenger: [ -1, -1 ] # silicon StationAi: [ 1, 1 ] diff --git a/Resources/Prototypes/Corvax/Maps/Corvax/split.yml b/Resources/Prototypes/Corvax/Maps/Corvax/split.yml index b9d60874a5..6f7e71d4f5 100644 --- a/Resources/Prototypes/Corvax/Maps/Corvax/split.yml +++ b/Resources/Prototypes/Corvax/Maps/Corvax/split.yml @@ -38,7 +38,6 @@ Librarian: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 1, 1 ] - Zookeeper: [ 1, 1 ] # command Captain: [ 1, 1 ] IAA: [ 1, 1 ] diff --git a/Resources/Prototypes/Corvax/Maps/Corvax/terra.yml b/Resources/Prototypes/Corvax/Maps/Corvax/terra.yml index a0c35d31f7..8e0a253a5b 100644 --- a/Resources/Prototypes/Corvax/Maps/Corvax/terra.yml +++ b/Resources/Prototypes/Corvax/Maps/Corvax/terra.yml @@ -73,7 +73,6 @@ Musician: [ 1, 1 ] Reporter: [ 1, 1 ] ServiceWorker: [ 1, 1 ] - Zookeeper: [ 1, 1 ] Passenger: [ -1, -1 ] # silicon Borg: [ 1, 1 ] diff --git a/Resources/Prototypes/Corvax/Maps/Corvax/tushkan.yml b/Resources/Prototypes/Corvax/Maps/Corvax/tushkan.yml index ff808d95a4..3ea651bfe6 100644 --- a/Resources/Prototypes/Corvax/Maps/Corvax/tushkan.yml +++ b/Resources/Prototypes/Corvax/Maps/Corvax/tushkan.yml @@ -53,7 +53,6 @@ HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] Botanist: [ 1, 1 ] - Boxer: [ 1, 1 ] Chaplain: [ 1, 1 ] Chef: [ 1, 1 ] Clown: [ 1, 1 ] @@ -71,4 +70,4 @@ SeniorEngineer: [ 1, 1 ] SeniorPhysician: [ 1, 1 ] SeniorResearcher: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] \ No newline at end of file + SeniorOfficer: [ 1, 1 ]