diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/effects/hearts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/effects/hearts.ftl
new file mode 100644
index 00000000000..b2be5326f2e
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/effects/hearts.ftl
@@ -0,0 +1,2 @@
+ent-EffectHearts = { "" }
+    .desc = { "" }
diff --git a/Resources/Locale/ru-RU/administration/commands/panicbunker.ftl b/Resources/Locale/ru-RU/administration/commands/panicbunker.ftl
index 83ac1c8092c..85caf4bc6ab 100644
--- a/Resources/Locale/ru-RU/administration/commands/panicbunker.ftl
+++ b/Resources/Locale/ru-RU/administration/commands/panicbunker.ftl
@@ -1,2 +1,28 @@
+cmd-panicbunker-desc = Toggles the panic bunker, which enables stricter restrictions on who's allowed to join the server.
+cmd-panicbunker-help = Usage: panicbunker
 panicbunker-command-enabled = Режим "Бункер" был включён.
 panicbunker-command-disabled = Режим "Бункер" был выключен.
+cmd-panicbunker_disable_with_admins-desc = Toggles whether or not the panic bunker will disable when an admin connects.
+cmd-panicbunker_disable_with_admins-help = Usage: panicbunker_disable_with_admins
+panicbunker-command-disable-with-admins-enabled = The panic bunker will automatically disable with admins online.
+panicbunker-command-disable-with-admins-disabled = The panic bunker will not automatically disable with admins online.
+cmd-panicbunker_enable_without_admins-desc = Toggles whether or not the panic bunker will enable when the last admin disconnects.
+cmd-panicbunker_enable_without_admins-help = Usage: panicbunker_enable_without_admins
+panicbunker-command-enable-without-admins-enabled = The panic bunker will automatically enable without admins online.
+panicbunker-command-enable-without-admins-disabled = The panic bunker will not automatically enable without admins online.
+cmd-panicbunker_count_deadminned_admins-desc = Toggles whether or not to count deadminned admins when automatically enabling and disabling the panic bunker.
+cmd-panicbunker_count_deadminned_admins-help = Usage: panicbunker_count_deadminned_admins
+panicbunker-command-count-deadminned-admins-enabled = The panic bunker will count deadminned admins when made to automatically enable and disable.
+panicbunker-command-count-deadminned-admins-disabled = The panic bunker will not count deadminned admins when made to automatically enable and disable.
+cmd-panicbunker_show_reason-desc = Toggles whether or not to show connecting clients the reason why the panic bunker blocked them from joining.
+cmd-panicbunker_show_reason-help = Usage: panicbunker_show_reason
+panicbunker-command-show-reason-enabled = The panic bunker will now show a reason to users it blocks from connecting.
+panicbunker-command-show-reason-disabled = The panic bunker will no longer show a reason to users it blocks from connecting.
+cmd-panicbunker_min_account_age-desc = Gets or sets the minimum account age in hours that an account must have to be allowed to connect with the panic bunker enabled.
+cmd-panicbunker_min_account_age-help = Usage: panicbunker_min_account_age <hours>
+panicbunker-command-min-account-age-is = The minimum account age for the panic bunker is { $hours } hours.
+panicbunker-command-min-account-age-set = Set the minimum account age for the panic bunker to { $hours } hours.
+cmd-panicbunker_min_overall_hours-desc = Gets or sets the minimum overall playtime in hours that an account must have to be allowed to connect with the panic bunker enabled.
+cmd-panicbunker_min_overall_hours-help = Usage: panicbunker_min_overall_hours <hours>
+panicbunker-command-min-overall-hours-is = The minimum overall playtime for the panic bunker is { $hours } hours.
+panicbunker-command-min-overall-hours-set = Set the minimum overall playtime for the panic bunker to { $hours } hours.
diff --git a/Resources/Locale/ru-RU/administration/ui/admin-menu-window.ftl b/Resources/Locale/ru-RU/administration/ui/admin-menu-window.ftl
index 9a87a014904..340af96e75a 100644
--- a/Resources/Locale/ru-RU/administration/ui/admin-menu-window.ftl
+++ b/Resources/Locale/ru-RU/administration/ui/admin-menu-window.ftl
@@ -6,5 +6,6 @@ admin-menu-adminbus-tab = АдминАбуз
 admin-menu-atmos-tab = Атмос
 admin-menu-round-tab = Раунд
 admin-menu-server-tab = Сервер
+admin-menu-panic-bunker-tab = Panic Bunker
 admin-menu-players-tab = Игроки
 admin-menu-objects-tab = Объекты
diff --git a/Resources/Locale/ru-RU/administration/ui/tabs/panicbunker-tab.ftl b/Resources/Locale/ru-RU/administration/ui/tabs/panicbunker-tab.ftl
new file mode 100644
index 00000000000..3a90e14e4a7
--- /dev/null
+++ b/Resources/Locale/ru-RU/administration/ui/tabs/panicbunker-tab.ftl
@@ -0,0 +1,17 @@
+admin-ui-panic-bunker-window-title = Panic Bunker
+admin-ui-panic-bunker-enabled = Panic Bunker Enabled
+admin-ui-panic-bunker-disabled = Panic Bunker Disabled
+admin-ui-panic-bunker-tooltip = The panic bunker restricts players from joining if their account is too new or they do not have enough overall playtime on this server.
+admin-ui-panic-bunker-disable-automatically = Disable Automatically
+admin-ui-panic-bunker-disable-automatically-tooltip = Disables the panic bunker automatically when an admin connects.
+admin-ui-panic-bunker-enable-automatically = Enable Automatically
+admin-ui-panic-bunker-enable-automatically-tooltip = Enables the panic bunker automatically when no admins are online.
+admin-ui-panic-bunker-count-deadminned-admins = Count Deadmins
+admin-ui-panic-bunker-count-deadminned-admins-tooltip = Count deadminned admins when automatically enabling and disabling the panic bunker.
+admin-ui-panic-bunker-show-reason = Show Reason
+admin-ui-panic-bunker-show-reason-tooltip = Show the user why they were blocked from connecting by the panic bunker.
+admin-ui-panic-bunker-min-account-age = Min. Account Age
+admin-ui-panic-bunker-min-overall-hours = Min. Overall Playtime
+admin-ui-panic-bunker-is-enabled = The panic bunker is currently enabled.
+admin-ui-panic-bunker-enabled-admin-alert = The panic bunker has been enabled.
+admin-ui-panic-bunker-disabled-admin-alert = The panic bunker has been disabled.
diff --git a/Resources/Locale/ru-RU/changelog/changelog-window.ftl b/Resources/Locale/ru-RU/changelog/changelog-window.ftl
index 7766289290e..930a1693e22 100644
--- a/Resources/Locale/ru-RU/changelog/changelog-window.ftl
+++ b/Resources/Locale/ru-RU/changelog/changelog-window.ftl
@@ -8,3 +8,5 @@ changelog-new-changes = новые обновления
 changelog-version-tag = версия v{ $version }
 changelog-button = Обновления
 changelog-button-new-entries = Обновления (!)
+changelog-tab-title-Changelog = Changelog
+changelog-tab-title-Admin = Admin
diff --git a/Resources/Locale/ru-RU/generic.ftl b/Resources/Locale/ru-RU/generic.ftl
index c515822c343..7439d3e3a72 100644
--- a/Resources/Locale/ru-RU/generic.ftl
+++ b/Resources/Locale/ru-RU/generic.ftl
@@ -7,3 +7,4 @@ generic-unknown = неизвестно
 generic-unknown-title = Неизвестно
 generic-error = ошибка
 generic-invalid = недействительно
+generic-hours = hours
diff --git a/Resources/Locale/ru-RU/guidebook/guides.ftl b/Resources/Locale/ru-RU/guidebook/guides.ftl
index ba932e8d791..1fb1614335c 100644
--- a/Resources/Locale/ru-RU/guidebook/guides.ftl
+++ b/Resources/Locale/ru-RU/guidebook/guides.ftl
@@ -49,6 +49,7 @@ guide-entry-antagonists = Антагонисты
 guide-entry-nuclear-operatives = Ядерные оперативники
 guide-entry-traitors = Предатели
 guide-entry-zombies = Зомби
+guide-entry-revolutionaries = Revolutionaries
 guide-entry-minor-antagonists = Малые антагонисты
 guide-entry-space-ninja = Космический ниндзя
 guide-entry-writing = Разметка письма
diff --git a/Resources/Locale/ru-RU/machine/machine.ftl b/Resources/Locale/ru-RU/machine/machine.ftl
index 141fea48752..1800b129165 100644
--- a/Resources/Locale/ru-RU/machine/machine.ftl
+++ b/Resources/Locale/ru-RU/machine/machine.ftl
@@ -12,6 +12,7 @@ machine-part-name-matter-bin = Ёмкость материи
 upgrade-power-draw = потребление энергии
 upgrade-max-charge = максимальный запас энергии
 upgrade-power-supply = производство энергии
+upgrade-power-supply-ramping = power ramp rate
 two-way-lever-left = Вы сдвигаете рычаг влево
 two-way-lever-right = Вы сдвигаете рычаг вправо
 two-way-lever-cant = Рычаг не может быть сдвинут в эту сторону!
diff --git a/Resources/Locale/ru-RU/markings/reptilian.ftl b/Resources/Locale/ru-RU/markings/reptilian.ftl
index fe7a0c7770c..6577510de0d 100644
--- a/Resources/Locale/ru-RU/markings/reptilian.ftl
+++ b/Resources/Locale/ru-RU/markings/reptilian.ftl
@@ -58,3 +58,5 @@ marking-LizardHornsBighorn-horns_bighorn = Унатх, рожки (Бигхор
 marking-LizardHornsBighorn = Унатх, рожки (Бигхорн)
 marking-LizardHornsKoboldEars-horns_kobold_ears = Унатх, уши (Кобольд)
 marking-LizardHornsKoboldEars = Унатх, уши (Кобольд)
+marking-LizardHornsFloppyKoboldEars-horns_floppy_kobold_ears = Lizard Ears (Floppy Kobold)
+marking-LizardHornsFloppyKoboldEars = Lizard Ears (Floppy Kobold)
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/effects/hearts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/effects/hearts.ftl
new file mode 100644
index 00000000000..b2be5326f2e
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/effects/hearts.ftl
@@ -0,0 +1,2 @@
+ent-EffectHearts = { "" }
+    .desc = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/hotplate.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/hotplate.ftl
index bdaaec51589..6867c71fb08 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/hotplate.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/hotplate.ftl
@@ -1,4 +1,4 @@
 ent-BaseHeaterMachine = { ent-BaseMachinePowered }
-  .desc = { ent-BaseMachinePowered.desc }
+    .desc = { ent-BaseMachinePowered.desc }
 ent-ChemistryHotplate = электроплитка
     .desc = Потомок микроволновой печи, наше новейшее изобретение в технологии нагрева мензурок: электроплитка!