Merge remote-tracking branch 'upstream/master' into upstream

space-syndicate · Dec 15, 2024 · c89fd75 · c89fd75
2 parents 4a803db + 7fa704a
commit c89fd75
Show file tree

Hide file tree

Showing 21 changed files with 126,198 additions and 65,723 deletions.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
@@ -1,2 +1,4 @@
 ent-SpawnPointPilot = pilot
     .desc = { ent-SpawnPointJobBase.desc }
+ent-SpawnPointSurgeon = surgeon
+    .desc = { ent-SpawnPointJobBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
@@ -1,2 +1,4 @@
 ent-SpawnPointPilot = пилот
     .desc = { ent-SpawnPointJobBase.desc }
+ent-SpawnPointSurgeon = хирург
+    .desc = { ent-SpawnPointJobBase.desc }
diff --git a/Resources/Maps/corvax_astra.yml b/Resources/Maps/corvax_astra.yml
diff --git a/Resources/Maps/corvax_avrite.yml b/Resources/Maps/corvax_avrite.yml
diff --git a/Resources/Maps/corvax_awesome.yml b/Resources/Maps/corvax_awesome.yml