Merge remote-tracking branch 'origin/master'

space-sunrise · Jul 1, 2024 · 31213f5 · 31213f5
2 parents 883ead4 + ee03dfa
commit 31213f5
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
@@ -1275,3 +1275,26 @@
     type: Remove
   id: 100
   time: '2024-07-01T16:43:43.322289+00:00'
+- author: pacable
+  changes:
+  - message: "\u0412\u0435\u0440\u043D\u0443\u043B \u0446\u0435\u043B\u044C \u043D\
+      \u0430 \u043A\u0440\u0430\u0436\u0443 \u043F\u043B\u0443\u0442\u043E\u043D\u0438\
+      \u0435\u0432\u043E\u0433\u043E \u044F\u0434\u0440\u0430"
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0444\u0430\u043C\u0438\
+      \u043B\u0438\u0430\u0440 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\
+      \u0430\u0440\u044F - \u0424\u043E\u043B\u0438\u0430\u043D\u0442"
+    type: Add
+  - message: "\u0423\u0432\u0435\u043B\u0438\u0447\u0435\u043D\u0430 \u0451\u043C\u043A\
+      \u043E\u0441\u0442\u044C \u0421\u041C\u042D\u0421 \u0438 \u043F\u043E\u0434\u0441\
+      \u0442\u0430\u043D\u0446\u0438\u0439"
+    type: Tweak
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0434\u043E\u043F\
+      \u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u0441\u043E\
+      \u043B\u043D\u0435\u0447\u043D\u044B\u0435 \u043F\u0430\u043D\u0435\u043B\u0438\
+      \ \u0434\u043B\u044F \u0431\u0440\u0438\u0433\u0430 \u0434\u0435\u043B\u044C\
+      \u0442\u044B."
+    type: Add
+  id: 101
+  time: '2024-07-01T19:45:28.0000000+00:00'
+  url: https://github.com/space-sunrise/space-station-14/pull/161