Merge remote-tracking branch 'upstream/master'

2024-07-28 15:08:05 +03:00
parent 5dbbf68af8 2a9344f616
commit decd47769b
91 changed files with 1040 additions and 267 deletions
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/structures/door/airlocks.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/structures/door/airlocks.ftl
@@ -0,0 +1,7 @@
+ent-DoubleGlassAirlock = двойной стеклянный шлюз
+    .desc = { ent-AirlockGlass.desc }
+    .suffix = 2x1
+
+ent-ThreepleGlassAirlock = тройной стеклянный шлюз
+    .desc = { ent-AirlockGlass.desc }
+    .suffix = 3x1
--- a/Resources/Locale/ru-RU/surveillance-camera/surveillance-camera-ui.ftl
+++ b/Resources/Locale/ru-RU/surveillance-camera/surveillance-camera-ui.ftl
@@ -11,3 +11,6 @@ surveillance-camera-setup = Настроить
 surveillance-camera-setup-ui-set = Установить
 surveillance-body-camera-on = { $item } начинает мигать
 surveillance-body-camera-off = { $item } перестает мигать
+
+surveillance-camera-monitor-ui-flavor-left = Большой брат смотрит.
+surveillance-camera-monitor-ui-flavor-right = v1.984