Merge branch 'master' into goals

space-syndicate · Oct 13, 2024 · 04bfd36 · 04bfd36
2 parents b0a1043 + a426cbb
commit 04bfd36
Show file tree

Hide file tree

Showing 13 changed files with 264,517 additions and 116,956 deletions.
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -62,6 +62,7 @@ public sealed class PostMapInitTest
             "CorvaxPearl",
             "CorvaxTushkan",
             "CorvaxGlacier",
+            "CorvaxAwesome",
             // Corvax-End
             "Dev",
             "TestTeg",

diff --git a/Resources/Changelog/ChangelogSyndie.yml b/Resources/Changelog/ChangelogSyndie.yml
@@ -1,51 +1,4 @@
 Entries:
-- author: lapatison
-  changes:
-  - message: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u044B \u043D\u0430\
-      \u0441\u0442\u0435\u043D\u043D\u044B\u0435 \u0442\u0430\u0431\u043B\u0438\u0447\
-      \u043A\u0438"
-    type: Tweak
-  id: 148
-  time: '2022-06-16T00:01:57.0000000+00:00'
-- author: lapatison
-  changes:
-  - message: "\u0440\u0430\u0437\u043B\u0438\u0447\u043D\u044B\u0435 \u043F\u0435\u0440\
-      \u0435\u0432\u043E\u0434\u044B, \u0441\u0442\u0438\u043B\u0438\u0441\u0442\u0438\
-      \u0447\u0435\u0441\u043A\u0438\u0435 \u043F\u0440\u0430\u0432\u043A\u0438"
-    type: Add
-  id: 149
-  time: '2022-06-16T17:30:35.0000000+00:00'
-- author: lapatison
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0430\u0437\
-      \u043B\u0438\u0447\u043D\u044B\u0435 \u043F\u0435\u0440\u0435\u0432\u043E\u0434\
-      \u044B"
-    type: Add
-  id: 150
-  time: '2022-06-17T15:37:37.0000000+00:00'
-- author: lapatison
-  changes:
-  - message: "\u043F\u0440\u0430\u0432\u043A\u0438 \u043F\u0435\u0440\u0435\u0432\u043E\
-      \u0434\u0430"
-    type: Add
-  id: 151
-  time: '2022-06-17T15:46:50.0000000+00:00'
-- author: Morty
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u043E\u0441\
-      \u043B\u0435\u0434\u043D\u0438\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\
-      \u043D\u0438\u044F"
-    type: Add
-  id: 152
-  time: '2022-06-18T05:00:28.0000000+00:00'
-- author: Morty
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u043E\u0441\
-      \u043B\u0435\u0434\u043D\u0438\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\
-      \u043D\u0438\u044F"
-    type: Add
-  id: 153
-  time: '2022-06-18T05:04:12.0000000+00:00'
 - author: lapatison
   changes:
   - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0430\u0437\
@@ -4450,3 +4403,52 @@
   id: 647
   time: '2024-10-05T12:27:07.0000000+00:00'
   url: https://github.com/space-syndicate/space-station-14/pull/2643
+- author: Ko4erga
+  changes:
+  - message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u043A\u0430\u0440\
+      \u0442\u0430 Pilgrim."
+    type: Tweak
+  id: 648
+  time: '2024-10-06T09:28:17.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2647
+- author: Resoid
+  changes:
+  - message: "\u041D\u043E\u0432\u0430\u044F \u0446\u0435\u043B\u044C \u043D\u0430\
+      \ \u0410\u0441\u0442\u0440\u0443."
+    type: Tweak
+  id: 649
+  time: '2024-10-06T16:41:11.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2646
+- author: TiFeRi
+  changes:
+  - message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u043A\u0430\u0440\
+      \u0442\u0430 Paper"
+    type: Tweak
+  id: 650
+  time: '2024-10-10T22:49:37.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2653
+- author: Resoid
+  changes:
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0441\u043F\u0430\
+      \u0432\u043D \u0430\u043D\u043E\u043C\u0430\u043B\u0438\u0439 \u043D\u0430 \u0430\
+      \u0441\u0442\u0440\u0435"
+    type: Fix
+  id: 651
+  time: '2024-10-11T15:48:12.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2656
+- author: Stubaretka24
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043D\u043E\u0432\
+      \u0430\u044F \u0441\u0442\u0430\u043D\u0446\u0438\u044F Awesome"
+    type: Add
+  id: 652
+  time: '2024-10-12T16:38:37.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2657
+- author: Resoid
+  changes:
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0451\u043D \u0431\u0440\u0438\u0433\
+      \ \u043D\u0430 Astra."
+    type: Tweak
+  id: 653
+  time: '2024-10-13T14:38:48.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2661
diff --git a/Resources/Locale/ru-RU/bed/cryostorage/cryogenic-storage.ftl b/Resources/Locale/ru-RU/bed/cryostorage/cryogenic-storage.ftl
@@ -2,10 +2,10 @@
 
 earlyleave-cryo-job-unknown = Должность неизвестна
 earlyleave-cryo-announcement =
-    { $character } ({ $job }) { $gender ->
+    { $character } ({ $job }) { GENDER($entity) ->
         [male] был перемещён
         [female] была перемещена
         [epicene] были перемещены
-       *[neuter] было перемещёно
+       *[neuter] было перемещено
     } в криогенное хранилище!
 earlyleave-cryo-sender = Станция