Merge branch 'Rxup:master' into master

Content.Shared/Inventory/InventorySystem.Slots.cs

@@ -219,7 +219,7 @@ public void SetSlotStatus(EntityUid uid, string slotName, bool isDisabled, Inven
                     _randomHelper.RandomOffset(entityUid, 0.5f);
                 }
             }
-            slot.Disabled = isDisabled;
+            //slot.Disabled = isDisabled; // Backmen: surgery TURNED OFF FEATURE, would be fixed today maybe with proper limbs cutting disables appropriate slot(-s)
             break;
         }
 

Resources/Changelog/ChangelogBkm.yml

@@ -649,3 +649,37 @@
   id: 41
   time: '2024-11-26T15:24:55.0000000+00:00'
   url: https://github.com/Rxup/space-station-14/pull/946
+- author: TokenStyle
+  changes:
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0440\u0430\u0443\u043D\u0434\u0441\
+      \u0442\u0430\u0440\u0442\u043E\u043C \u0434\u043E\u0441\u0442\u0443\u043F\u043D\
+      \u044B \u0432\u0441\u0435 \u0441\u043B\u043E\u0442\u044B \u043F\u043E\u0434\
+      \ \u043F\u0435\u0440\u0447\u0430\u0442\u043A\u0438, \u043D\u0430\u0443\u0448\
+      \u043D\u0438\u043A\u0438, \u0431\u043E\u0442\u0438\u043D\u043A\u0438, \u0433\
+      \u043E\u043B\u043E\u0432\u043D\u043E\u0439 \u0443\u0431\u043E\u0440, \u043A\u043E\
+      \u0433\u0434\u0430 \u0440\u0430\u043D\u0435\u0435 \u043E\u043D\u0438 \u0441\
+      \ \u0448\u0430\u043D\u0441\u043E\u043C \u0431\u044B\u043B\u0438 \u043D\u0435\
+      \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u044B."
+    type: Fix
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043E\u0442\u0440\u0443\u0431\u0430\
+      \u043D\u0438\u0435 \u043A\u043E\u043D\u0435\u0447\u043D\u043E\u0441\u0442\u0435\
+      \u0439 \u043D\u0435 \u0443\u0431\u0438\u0440\u0430\u0435\u0442 \u0432\u043E\u0437\
+      \u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0432\u0437\u0430\u0438\u043C\
+      \u043E\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044F \u0441 \u0441\u043B\u043E\
+      \u0442\u043E\u043C \u043F\u043E\u0434 \u043F\u0440\u0435\u0434\u043C\u0435\u0442\
+      , \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440 \u043E\u0442\u0440\u0443\u0431\
+      \u0430\u043D\u0438\u0435 \u043D\u043E\u0433 \u043F\u043E\u0437\u0432\u043E\u043B\
+      \u044F\u0435\u0442 \u043D\u0430\u0434\u0435\u0442\u044C \u0431\u043E\u0442\u0438\
+      \u043D\u043A\u0438."
+    type: Fix
+  id: 42
+  time: '2024-11-27T11:46:53.0000000+00:00'
+  url: https://github.com/Rxup/space-station-14/pull/952
+- author: no_mad
+  changes:
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0441\u043F\u0430\u0432\u043D\
+      \ \u043D\u0430 \u043A\u043E\u0441\u043C\u043E\u043F\u043E\u0440\u0442"
+    type: Tweak
+  id: 43
+  time: '2024-11-27T12:10:06.0000000+00:00'
+  url: https://github.com/Rxup/space-station-14/pull/953

Resources/ConfigPresets/Backmen/main.toml

@@ -34,7 +34,7 @@ appeal="https://backmen.ru/discord"
 
 [shuttle]
 arrivals = true
-#arrivals_map = "/Maps/Misc/kosmoport.yml"
+arrivals_map = "/Maps/Misc/kosmoport.yml"
 #arrivals_map = "/Maps/Backmen/Etc/terminal.yml"
 #arrivals_map = "/Maps/Misc/terminal.yml"
 arrivals_returns = true
@@ -43,7 +43,7 @@ auto_call_extension_time = 70
 emergency_dock_time = 280
 emergency_authorize_time = 30
 emergency_early_launch_allowed = true
-#arrivals_planet = false
+arrivals_planet = false
 
 [salvage]
 expedition_cooldown = 300