wylab/wylab-station-14
1
1
Fork 0
forked from space-syndicate/space-station-14
Code Pull Requests 2 Actions 27 Wiki Activity

upstream bugfix

Browse Source
This commit is contained in:
Dmitry
2025-12-22 03:06:16 +07:00
parent 4f4b71e8de
commit 787dee44b0
14 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Corvax/GuideGenerator/HealthChangeReagentsJsonGenerator.cs
View File

@@ -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

5
Resources/Locale/ru-RU/datasets/figurines.ftl
View File

@@ -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 = Как настроить ТЭГ?

2
Resources/Prototypes/Corvax/Maps/Corvax/astra.yml
View File

@@ -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 ]

4
Resources/Prototypes/Corvax/Maps/Corvax/avrite.yml
View File

@@ -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 ]
SeniorOfficer: [ 1, 1 ]

4
Resources/Prototypes/Corvax/Maps/Corvax/chloris.yml
View File

@@ -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 ]
SeniorOfficer: [ 1, 1 ]

2
Resources/Prototypes/Corvax/Maps/Corvax/delta.yml
View File

@@ -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 ]

1
Resources/Prototypes/Corvax/Maps/Corvax/glacier.yml
View File

@@ -61,7 +61,6 @@
Musician: [ 1, 1 ]
Reporter: [ 1, 2 ]
ServiceWorker: [ 2, 3 ]
Zookeeper: [ 1, 1 ]
Passenger: [ -1, -1 ]
# silicon
StationAi: [ 1, 1 ]

3
Resources/Prototypes/Corvax/Maps/Corvax/maus.yml
View File

@@ -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 ]
SeniorOfficer: [ 1, 1 ]

3
Resources/Prototypes/Corvax/Maps/Corvax/paper.yml
View File

@@ -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 ]
SeniorOfficer: [ 1, 1 ]

2
Resources/Prototypes/Corvax/Maps/Corvax/pearl.yml
View File

@@ -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 ]

2
Resources/Prototypes/Corvax/Maps/Corvax/pilgrim.yml
View File

@@ -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 ]

1
Resources/Prototypes/Corvax/Maps/Corvax/split.yml
View File

@@ -38,7 +38,6 @@
Librarian: [ 1, 1 ]
Musician: [ 1, 1 ]
Reporter: [ 1, 1 ]
Zookeeper: [ 1, 1 ]
# command
Captain: [ 1, 1 ]
IAA: [ 1, 1 ]

1
Resources/Prototypes/Corvax/Maps/Corvax/terra.yml
View File

@@ -73,7 +73,6 @@
Musician: [ 1, 1 ]
Reporter: [ 1, 1 ]
ServiceWorker: [ 1, 1 ]
Zookeeper: [ 1, 1 ]
Passenger: [ -1, -1 ]
# silicon
Borg: [ 1, 1 ]

3
Resources/Prototypes/Corvax/Maps/Corvax/tushkan.yml
View File

@@ -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 ]
SeniorOfficer: [ 1, 1 ]