diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl
index 806b05ff34..99182d8b4d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl
@@ -6,8 +6,8 @@ ent-ActionTurnUndead = Turn Undead
     .desc = Succumb to your infection and become a zombie.
 ent-ActionToggleLight = Toggle Light
     .desc = Turn the light on and off.
-ent-ActionOpenStorageImplant = Open Storage Implant
-    .desc = Opens the storage implant embedded under your skin
+ent-ActionOpenStorageImplant = Toggle Storage Implant
+    .desc = Opens or closes the storage implant embedded under your skin
 ent-ActionActivateMicroBomb = Activate Microbomb
     .desc = Activates your internal microbomb, completely destroying you and your equipment
 ent-ActionActivateDeathAcidifier = Activate Death-Acidifier
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl
index 50390cc63e..b5c2b0407e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl
@@ -28,11 +28,11 @@ ent-BoxHug = box of hugs
 ent-BoxHugNitrogen = { ent-BoxHug }
     .suffix = Emergency N2
     .desc = { ent-BoxHug.desc }
-ent-BoxMime = survival box
-    .desc = It's a box with basic internals inside.
-    .suffix = Emergency
+ent-BoxMime = { ent-BoxSurvival }
+    .suffix = Mime, Emergency
+    .desc = { ent-BoxSurvival.desc }
 ent-BoxMimeNitrogen = { ent-BoxSurvivalNitrogen }
-    .suffix = Emergency N2
+    .suffix = Mime, Emergency N2
     .desc = { ent-BoxSurvivalNitrogen.desc }
 ent-BoxSurvivalSyndicate = extended-capacity survival box
     .desc = It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl
index 890e2da94d..0859c6a37a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl
@@ -26,7 +26,7 @@ ent-ClothingBeltHolster = shoulder holster
     .desc = A holster to carry a handgun and ammo. WARNING: Badasses only.
 ent-ClothingBeltSyndieHolster = syndicate shoulder holster
     .desc = A deep shoulder holster capable of holding many types of ballistics.
-ent-ClothingBeltSecurityWebbing = security webbing
+ent-ClothingBeltSecurityWebbing = security carrier
     .desc = Unique and versatile chest rig, can hold security gear.
 ent-ClothingBeltMercWebbing = mercenary webbing
     .desc = Ideal for storing everything from ammo to weapons and combat essentials.
@@ -36,7 +36,9 @@ ent-ClothingBeltMilitaryWebbing = chest rig
     .desc = A set of tactical webbing worn by Syndicate boarding parties.
 ent-ClothingBeltMilitaryWebbingMed = medical chest rig
     .desc = A set of tactical webbing worn by Gorlex Marauder medic operatives.
-ent-ClothingBeltSuspenders = suspenders
+ent-ClothingBeltSuspendersRed = red suspenders
     .desc = For holding your pants up.
+ent-ClothingBeltSuspendersBlack = black suspenders
+    .desc = { ent-ClothingBeltSuspendersRed.desc }
 ent-ClothingBeltWand = wand belt
     .desc = A belt designed to hold various rods of power. A veritable fanny pack of exotic magic.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl
index 374604b7c7..acc0ccdee6 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl
@@ -20,6 +20,8 @@ ent-ClothingEyesGlassesSunglasses = sun glasses
     .desc = A pair of black sunglasses.
 ent-ClothingEyesGlassesSecurity = security glasses
     .desc = Upgraded sunglasses that provide flash immunity and a security HUD.
+ent-ClothingEyesGlassesCommand = administration glasses
+    .desc = Upgraded sunglasses that provide flash immunity and show ID card status.
 ent-ClothingEyesGlassesMercenary = mercenary glasses
     .desc = Glasses made for combat, to protect the eyes from bright blinding flashes.
 ent-ClothingEyesGlassesThermal = optical thermal scanner
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl
index c120ea1f17..222da61431 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl
@@ -8,6 +8,8 @@ ent-ClothingEyesHudMedical = medical hud
     .desc = A heads-up display that scans the humanoids in view and provides accurate data about their health status.
 ent-ClothingEyesHudSecurity = security hud
     .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records.
+ent-ClothingEyesHudCommand = administration hud
+    .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status.
 ent-ClothingEyesHudBeer = beer goggles
     .desc = A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion.
 ent-ClothingEyesHudFriedOnion = fried onion goggles
@@ -28,22 +30,27 @@ ent-ClothingEyesHudSyndicate = syndicate visor
     .desc = The syndicate's professional head-up display, designed for better detection of humanoids and their subsequent elimination.
 ent-ClothingEyesHudSyndicateAgent = syndicate agent visor
     .desc = The Syndicate Agent's professional heads-up display, designed for quick diagnosis of their team's status.
-ent-ClothingEyesGlassesHiddenSecurity = { ent-ClothingEyesGlassesSunglasses }
+ent-ClothingEyesGlassesHiddenSecurity = { ent-['ClothingEyesGlassesSunglasses', 'ShowSecurityIcons'] }
+
   .suffix = Syndicate
-  .desc = { ent-ClothingEyesGlassesSunglasses.desc }
+  .desc = { ent-['ClothingEyesGlassesSunglasses', 'ShowSecurityIcons'].desc }
 ent-ClothingEyesEyepatchHudMedical = medical hud eyepatch
     .desc = A heads-up display that scans the humanoids in view and provides accurate data about their health status. For true patriots.
 ent-ClothingEyesEyepatchHudMedicalFlipped = medical hud eyepatch
-  .desc = { ent-ClothingEyesEyepatchHudMedical.desc }
+
+  .desc = { ent-['ClothingEyesEyepatchHudMedical', 'ClothingHeadEyeBaseFlipped'].desc }
 ent-ClothingEyesEyepatchHudSecurity = security hud eyepatch
     .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. For true patriots.
 ent-ClothingEyesEyepatchHudSecurityFlipped = security hud eyepatch
-  .desc = { ent-ClothingEyesEyepatchHudSecurity.desc }
+
+  .desc = { ent-['ClothingEyesEyepatchHudSecurity', 'ClothingHeadEyeBaseFlipped'].desc }
 ent-ClothingEyesEyepatchHudBeer = beer hud eyepatch
     .desc = A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. For true patriots.
 ent-ClothingEyesEyepatchHudBeerFlipped = beer hud eyepatch
-  .desc = { ent-ClothingEyesEyepatchHudBeer.desc }
+
+  .desc = { ent-['ClothingEyesEyepatchHudBeer', 'ClothingHeadEyeBaseFlipped'].desc }
 ent-ClothingEyesEyepatchHudDiag = diagnostic hud eyepatch
     .desc = A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium.
 ent-ClothingEyesEyepatchHudDiagFlipped = diagnostic hud eyepatch
-  .desc = { ent-ClothingEyesEyepatchHudDiag.desc }
+
+  .desc = { ent-['ClothingEyesEyepatchHudDiag', 'ClothingHeadEyeBaseFlipped'].desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl
index 1b4b6767bb..1f244bd269 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl
@@ -4,3 +4,5 @@ ent-ClothingHandsButcherable = { ent-ClothingHandsBase }
     .desc = { ent-ClothingHandsBase.desc }
 ent-ClothingHandsGlovesSyntheticBase = { ent-ClothingHandsButcherable }
     .desc = { ent-ClothingHandsButcherable.desc }
+ent-RingBase = { ent-BaseItem }
+    .desc = { ent-BaseItem.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/rings.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/rings.ftl
new file mode 100644
index 0000000000..63c705dbe5
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/rings.ftl
@@ -0,0 +1,12 @@
+ent-GoldRing = gold ring
+    .desc = A precious ring.
+ent-SilverRing = silver ring
+    .desc = Looks slightly less valuable than a gold one.
+ent-GoldRingDiamond = gold diamond ring
+    .desc = Made from ethically mined space diamonds.
+ent-SilverRingDiamond = silver diamond ring
+    .desc = Made from ethically mined space diamonds.
+ent-GoldRingGem = gold gem ring
+    .desc = Shiny and valuable!
+ent-SilverRingGem = silver gem ring
+    .desc = Shiny and not quite as valuable!
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl
index 604617b3f6..3a5f9e8def 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl
@@ -10,3 +10,6 @@ ent-AtmosFixInstantPlasmaFireMarker = Atmos Fix Instant Plasmafire Marker
     .desc = INSTANT PLASMAFIRE
 ent-AtmosFixFreezerMarker = Atmos Fix Freezer Marker
     .desc = Change air temp to 235K, for freezer with a big of wiggle room to get set up.
+ent-AtmosFixVoxMarker = { ent-AtmosFixNitrogenMarker }
+    .desc = Nitrogen @ 101 kPa, 20C
+    .suffix = Vox Atmosphere
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/base.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/base.ftl
index e67e426f57..647e4cac10 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/base.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/base.ftl
@@ -1,5 +1,7 @@
 ent-BaseMob = { "" }
     .desc = { "" }
+ent-MobPolymorphable = { "" }
+    .desc = { "" }
 ent-MobDamageable = { "" }
     .desc = { "" }
 ent-MobCombat = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/observer.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/observer.ftl
index f42338dd12..2f6750a100 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/observer.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/observer.ftl
@@ -1,3 +1,5 @@
+ent-Incorporeal = { "" }
+    .desc = Mobs without physical bodies
 ent-MobObserver = observer
     .desc = Boo!
 ent-ActionGhostBoo = Boo!
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/silicon.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/silicon.ftl
index 984e922264..a35f32e35b 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/silicon.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/silicon.ftl
@@ -1,3 +1,34 @@
+ent-AiHeld = { "" }
+    .desc = Components added / removed from an entity that gets inserted into an AI core.
+ent-ActionJumpToCore = Jump to core
+    .desc = Sends your eye back to the core.
+ent-ActionShowJobIcons = Show job icons
+    .desc = Shows job icons for crew members.
+ent-ActionSurvCameraLights = Toggle camera lights
+    .desc = Enable surveillance camera lights near wherever you're viewing.
+ent-AiHolder = { "" }
+    .desc = Handles AI interactions across holocards + AI cores
+ent-AsimovCircuitBoard = circuit board (Crewsimov)
+    .desc = An electronics board containing the Crewsimov lawset.
+ent-CorporateCircuitBoard = circuit board (Corporate)
+    .desc = An electronics board containing the Corporate lawset.
+ent-NTDefaultCircuitBoard = circuit board (NT Default)
+    .desc = An electronics board containing the NT Default lawset.
+ent-Intellicard = Intellicard
+    .desc = A storage device for AIs.
+    .suffix = Empty
+ent-PlayerStationAiEmpty = AI Core
+    .desc = The latest in Artificial Intelligences.
+    .suffix = Empty
+ent-PlayerStationAi = { ent-PlayerStationAiEmpty }
+    .suffix = Job spawn
+    .desc = { ent-PlayerStationAiEmpty.desc }
+ent-StationAiBrain = { ent-PositronicBrain }
+    .suffix = DO NOT MAP
+    .desc = { ent-PositronicBrain.desc }
+ent-StationAiHolo = AI eye
+    .desc = The AI's viewer.
+    .suffix = DO NOT MAP
 ent-PlayerBorgGeneric = { ent-BorgChassisGeneric }
     .suffix = Battery, Tools
     .desc = { ent-BorgChassisGeneric.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_flasks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_flasks.ftl
index 1ea204681b..7ca52fe235 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_flasks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_flasks.ftl
@@ -18,5 +18,5 @@ ent-DrinkLithiumFlask = lithium flask
     .desc = A flask with a Lithium Atom symbol on it.
 ent-DrinkVacuumFlask = vacuum flask
     .desc = Keeping your drinks at the perfect temperature since 1892.
-ent-Pitcher = Metal Pitcher
+ent-Pitcher = metal pitcher
     .desc = A stainless steel insulated pitcher. Everyone's best friend in the morning.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl
index b6d1c44f61..5657fd21ff 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl
@@ -10,6 +10,10 @@ ent-FoodBreadBanana = banana bread
     .desc = A heavenly and filling treat.
 ent-FoodBreadBananaSlice = banana bread slice
     .desc = A slice of delicious banana bread.
+ent-FoodBreadCotton = cotton bread
+    .desc = Bread, but for moff.
+ent-FoodBreadCottonSlice = cotton bread slice
+    .desc = A slice of (maybe) delicious cotton bread.
 ent-FoodBreadCorn = cornbread
     .desc = Some good down-home country-style, rootin'-tootin', revolver-shootin', dad-gum yeehaw cornbread.
 ent-FoodBreadCornSlice = cornbread slice
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl
index 7adda7453e..e39399a92e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl
@@ -44,3 +44,7 @@ ent-FoodPizzaUranium = spicy rock pizza
     .desc = Spicy pizza covered in peppers and uranium.
 ent-FoodPizzaUraniumSlice = slice of spicy rock pizza
     .desc = A glowing slice of spicy rock pizza.
+ent-FoodPizzaCotton = cotton pizza
+    .desc = Flat fabric cotton dough with cotton topping. Incredible.
+ent-FoodPizzaCottonSlice = slice of cotton pizza
+    .desc = A slice of cotton pizza. Cotton included.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl
index 719a4ff806..3fcd400cb8 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl
@@ -42,6 +42,8 @@ ent-FoodDoughTortillaSlice = tortilla dough slice
     .desc = A slice of tortilla dough.
 ent-FoodDoughTortillaFlat = flattened tortilla dough
     .desc = A flattened slice of tortilla dough, cook this to get a taco shell.
+ent-FoodDoughCotton = cotton dough
+    .desc = A piece of fabric dough.
 ent-FoodDoughPastryBaseRaw = raw pastry base
     .desc = Must be cooked before use.
 ent-FoodDoughPastryBase = pastry base
@@ -50,6 +52,8 @@ ent-FoodDoughPie = pie dough
     .desc = Cook it to get a pie.
 ent-FoodDoughFlat = flat dough
     .desc = A flattened dough.
+ent-FoodDoughCottonFlat = flat cotton dough
+    .desc = A flattened cotton dough.
 ent-FoodDoughPizzaBaked = pizza bread
     .desc = Add ingredients to make a pizza.
 ent-FoodCakeBatter = cake batter
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl
index 85bbc13a5c..bb33fc22a0 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl
@@ -141,3 +141,7 @@ ent-CottonBol = cotton boll
     .desc = Moth people's favorite snack, and just as fluffy as them.
 ent-PyrottonBol = pyrotton boll
     .desc = This will probably set you on fire.
+ent-FoodCherry = cherry
+    .desc = Juicy red cherry with a pit inside.
+ent-TrashCherryPit = cherry pit
+    .desc = { ent-FoodInjectableBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl
index 64dc622984..69eea984a0 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl
@@ -129,3 +129,5 @@ ent-RealCapfruitSeeds = packet of capfruit seeds
 ent-FakeCapfruitSeeds = { ent-RealCapfruitSeeds }
     .suffix = Fake
     .desc = { ent-RealCapfruitSeeds.desc }
+ent-CherrySeeds = packet of cherry seeds
+    .desc = { ent-SeedBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl
new file mode 100644
index 0000000000..e0c4b8eb27
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl
@@ -0,0 +1,8 @@
+ent-BaseBlueprint = blueprint
+    .desc = A blueprint for some machine. It can be inserted into an autolathe.
+ent-BlueprintFulton = fulton blueprint
+    .desc = A blueprint with a schematic of a fulton. It can be inserted into an autolathe.
+ent-BlueprintSeismicCharge = seismic charge blueprint
+    .desc = A blueprint with a schematic of a seismic charge. It can be inserted into an autolathe.
+ent-BlueprintFlare = flare blueprint
+    .desc = A blueprint with a schematic of a flare. It can be inserted into an autolathe.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baguette.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baguette.ftl
index bf244ac774..47234fe284 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baguette.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baguette.ftl
@@ -1,3 +1,3 @@
-ent-WeaponBaguette = baguette
-    .desc = Bon appétit!
+ent-WeaponBaguette = { ent-FoodBreadBaguette }
     .suffix = Weapon
+    .desc = { ent-FoodBreadBaguette.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/croissant.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/croissant.ftl
index f6e5ba0bf7..25bbd5b184 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/croissant.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/croissant.ftl
@@ -1,3 +1,3 @@
-ent-WeaponCroissant = croissant
-    .desc = Buttery, flaky goodness.
+ent-WeaponCroissant = { ent-FoodBakedCroissant }
     .suffix = Weapon
+    .desc = { ent-FoodBakedCroissant.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl
index d0564ea04d..7974c5d9b0 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl
@@ -66,3 +66,5 @@ ent-ComputerSensorMonitoring = sensor monitoring computer
     .suffix = TESTING, DO NOT MAP
 ent-ComputerRoboticsControl = robotics control console
     .desc = Used to remotely monitor, disable and destroy the station's cyborgs.
+ent-StationAiUploadComputer = AI upload console
+    .desc = Used to update the laws of the station AI.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/lathe.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/lathe.ftl
index 7c925c8223..fda36043be 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/lathe.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/lathe.ftl
@@ -5,7 +5,7 @@ ent-BaseLatheLube = { ent-BaseLathe }
 ent-BaseHyperlathe = { "" }
     .desc = { "" }
 ent-Autolathe = autolathe
-    .desc = It produces basic items using metal and glass.
+    .desc = It produces basic items using metal and glass. Has the ability to process blueprints to print new recipes.
 ent-AutolatheHyperConvection = hyper convection autolathe
     .desc = A highly-experimental autolathe that harnesses the power of extreme heat to slowly create objects more cost-effectively.
 ent-Protolathe = protolathe
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl
new file mode 100644
index 0000000000..324b5e5958
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl
@@ -0,0 +1,15 @@
+ent-AirSensorVoxBase = { ent-AirSensorBase }
+    .suffix = Vox Atmosphere
+    .desc = { ent-AirSensorBase.desc }
+ent-AirSensorVox = { ent-['AirSensorVoxBase', 'AirSensor'] }
+
+  .desc = { ent-['AirSensorVoxBase', 'AirSensor'].desc }
+ent-GasVentPumpVox = { ent-['AirSensorVoxBase', 'GasVentPump'] }
+
+  .desc = { ent-['AirSensorVoxBase', 'GasVentPump'].desc }
+ent-GasVentScrubberVox = { ent-['AirSensorVoxBase', 'GasVentScrubber'] }
+
+  .desc = { ent-['AirSensorVoxBase', 'GasVentScrubber'].desc }
+ent-AirAlarmVox = { ent-AirAlarm }
+    .suffix = Vox Atmosphere, auto mode disabled
+    .desc = { ent-AirAlarm.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/xeno.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/xeno.ftl
index 02df8743c8..5def4c94b3 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/xeno.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/xeno.ftl
@@ -2,3 +2,9 @@ ent-XenoWardingTower = xeno warding tower
     .desc = { "" }
 ent-CarpStatue = carp statue
     .desc = A statue of one of the brave carp that got us where we are today. Made with real teeth!
+ent-CarpStatueEmpty = { ent-CarpStatue }
+    .desc = A lump of precious metals, soon to be a brilliant carp statue.
+    .suffix = Empty
+ent-CarpStatueEyes = { ent-CarpStatue }
+    .desc = A statue of one of the brave carp that got us where we are today. This one needs a dentist...
+    .suffix = Eyes
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl
index 4f081db845..16a420cdce 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl
@@ -212,12 +212,12 @@ ent-PosterLegitSafetyMothDelam = Safety Moth - Delamination Safety Precautions
     .desc = This informational poster uses Safety Moth™ to tell the viewer to hide in lockers when the Supermatter Crystal has delaminated, to prevent hallucinations. Evacuating might be a better strategy.
 ent-PosterLegitSafetyMothEpi = Safety Moth - Epinephrine
     .desc = This informational poster uses Safety Moth™ to inform the viewer to help injured/deceased crewmen with their epinephrine injectors. "Prevent organ rot with this one simple trick!"
-ent-PosterLegitSafetyMothHardhat = Safety Moth - Hardhats
-    .desc = This informational poster uses Safety Moth™ to tell the viewer to wear hardhats in cautious areas. "It's like a lamp for your head!"
-ent-PosterLegitSafetyMothMeth = Safety Moth - Methamphetamine
-    .desc = This informational poster uses Safety Moth™ to tell the viewer to seek CMO approval before cooking methamphetamine. "Stay close to the target temperature, and never go over!" ...You shouldn't ever be making this.
 ent-PosterLegitSafetyMothPiping = Safety Moth - Piping
     .desc = This informational poster uses Safety Moth™ to tell atmospheric technicians correct types of piping to be used. "Pipes, not Pumps! Proper pipe placement prevents poor performance!"
+ent-PosterLegitSafetyMothMeth = Safety Moth - Methamphetamine
+    .desc = This informational poster uses Safety Moth™ to tell the viewer to seek CMO approval before cooking methamphetamine. "Stay close to the target temperature, and never go over!" ...You shouldn't ever be making this.
+ent-PosterLegitSafetyMothHardhat = Safety Moth - Hardhats
+    .desc = This informational poster uses Safety Moth™ to tell the viewer to wear hardhats in cautious areas. "It's like a lamp for your head!"
 ent-PosterLegitVacation = Nanotrasen Corporate Perks: Vacation
     .desc = This informational poster provides information on some of the prizes available via the NT Corporate Perks program, including a two-week vacation for two on the resort world Idyllus.
 ent-PosterLegitPeriodicTable = Periodic Table of the Elements
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl
index 445d36ad51..86fa382fe2 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl
@@ -31,6 +31,9 @@ ent-WallPlastitanium = plastitanium wall
 ent-WallPlastitaniumDiagonal = plastitanium wall
     .suffix = diagonal
     .desc = { ent-WallShuttleDiagonal.desc }
+ent-WallPlastitaniumDiagonalIndestructible = plastitanium wall
+    .desc = Keeps the air in and the greytide out.
+    .suffix = diagonal, indestructible
 ent-WallReinforced = reinforced wall
     .desc = { ent-BaseWall.desc }
 ent-WallReinforcedRust = reinforced wall
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl
index 5721651498..fad8ba5d9f 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl
@@ -1,5 +1,18 @@
+ent-PlastitaniumWindowBase = plastitanium window
+    .desc = Don't smudge up the glass down there.
+ent-PlastitaniumWindowSquareBase = plastitanium window
+    .desc = { ent-PlastitaniumWindowBase.desc }
+ent-PlastitaniumWindowIndestructible = plastitanium window
+    .suffix = indestructible
+    .desc = { ent-PlastitaniumWindowSquareBase.desc }
 ent-PlastitaniumWindow = plastitanium window
-    .desc = { ent-Window.desc }
-ent-PlastitaniumWindowDiagonal = { ent-ShuttleWindow }
+    .desc = { ent-PlastitaniumWindowSquareBase.desc }
+ent-PlastitaniumWindowDiagonalBase = plastitanium window
     .suffix = diagonal
-    .desc = { ent-ShuttleWindow.desc }
+    .desc = { ent-PlastitaniumWindowBase.desc }
+ent-PlastitaniumWindowDiagonalIndestructible = plastitanium window
+    .suffix = diagonal, indestructible
+    .desc = { ent-PlastitaniumWindowDiagonalBase.desc }
+ent-PlastitaniumWindowDiagonal = plastitanium window
+    .suffix = diagonal
+    .desc = { ent-PlastitaniumWindowDiagonalBase.desc }
diff --git a/Resources/Locale/ru-RU/access/ui/door-electronics-window.ftl b/Resources/Locale/ru-RU/access/ui/door-electronics-window.ftl
new file mode 100644
index 0000000000..6a7b1c95c2
--- /dev/null
+++ b/Resources/Locale/ru-RU/access/ui/door-electronics-window.ftl
@@ -0,0 +1 @@
+door-electronics-configuration-title = Configure Access
diff --git a/Resources/Locale/ru-RU/administration/ui/silicon-law-ui.ftl b/Resources/Locale/ru-RU/administration/ui/silicon-law-ui.ftl
index 02b5555fee..831bfad9e0 100644
--- a/Resources/Locale/ru-RU/administration/ui/silicon-law-ui.ftl
+++ b/Resources/Locale/ru-RU/administration/ui/silicon-law-ui.ftl
@@ -8,3 +8,4 @@ silicon-law-ui-delete = Удалить
 silicon-law-ui-check-corrupted = Повреждённый закон
 silicon-law-ui-check-corrupted-tooltip = Если идентификатор закона будет установлен как «поврежденный», то символы будут перемешены.
 silicon-law-ui-placeholder = Введите здесь, чтобы изменить текст закона...
+silicon-laws-updated = Updated laws
diff --git a/Resources/Locale/ru-RU/connection-messages.ftl b/Resources/Locale/ru-RU/connection-messages.ftl
index 0fac7f517f..dd0fe58bc8 100644
--- a/Resources/Locale/ru-RU/connection-messages.ftl
+++ b/Resources/Locale/ru-RU/connection-messages.ftl
@@ -1,15 +1,3 @@
-whitelist-not-whitelisted = Вас нет в вайтлисте.
-# proper handling for having a min/max or not
-whitelist-playercount-invalid =
-    { $min ->
-        [0] Вайтлист для этого сервера применяется только для числа игроков ниже { $max }.
-       *[other]
-            Вайтлист для этого сервера применяется только для числа игроков выше { $min } { $max ->
-                [2147483647] ->  так что, возможно, вы сможете присоединиться позже.
-               *[other] ->  и ниже { $max } игроков, так что, возможно, вы сможете присоединиться позже.
-            }
-    }
-whitelist-not-whitelisted-rp = Вас нет в вайтлисте. Чтобы попасть в вайтлист, посетите наш Discord (ссылку можно найти по адресу https://discord.station14.ru).
 cmd-whitelistadd-desc = Добавить игрока в вайтлист сервера.
 cmd-whitelistadd-help = Использование: whitelistadd <username или  User ID>
 cmd-whitelistadd-existing = { $username } уже находится в вайтлисте!
@@ -32,6 +20,26 @@ ban-banned-2 = Причина бана: "{ $reason }"
 ban-banned-3 = Попытки обойти этот бан, например, путём создания нового аккаунта, будут фиксироваться.
 soft-player-cap-full = Сервер заполнен!
 panic-bunker-account-denied = Этот сервер находится в режиме "Бункер", часто используемом в качестве меры предосторожности против рейдов. Новые подключения от аккаунтов, не соответствующих определённым требованиям, временно не принимаются. Повторите попытку позже
+whitelist-playtime = You do not have enough playtime to join this server. You need at least { $minutes } minutes of playtime to join this server.
+whitelist-player-count = This server is currently not accepting players. Please try again later.
+whitelist-notes = You currently have too many admin notes to join this server. You can check your notes by typing /adminremarks in chat.
+whitelist-manual = You are not whitelisted on this server.
+whitelist-blacklisted = You are blacklisted from this server.
+whitelist-always-deny = You are not allowed to join this server.
+whitelist-fail-prefix = Not whitelisted: { $msg }
+whitelist-misconfigured = The server is misconfigured and is not accepting players. Please contact the server owner and try again later.
+cmd-blacklistadd-desc = Adds the player with the given username to the server blacklist.
+cmd-blacklistadd-help = Usage: blacklistadd <username>
+cmd-blacklistadd-existing = { $username } is already on the blacklist!
+cmd-blacklistadd-added = { $username } added to the blacklist
+cmd-blacklistadd-not-found = Unable to find '{ $username }'
+cmd-blacklistadd-arg-player = [player]
+cmd-blacklistremove-desc = Removes the player with the given username from the server blacklist.
+cmd-blacklistremove-help = Usage: blacklistremove <username>
+cmd-blacklistremove-existing = { $username } is not on the blacklist!
+cmd-blacklistremove-removed = { $username } removed from the blacklist
+cmd-blacklistremove-not-found = Unable to find '{ $username }'
+cmd-blacklistremove-arg-player = [player]
 panic-bunker-account-denied-reason = Этот сервер находится в режиме "Бункер", часто используемом в качестве меры предосторожности против рейдов. Новые подключения от аккаунтов, не соответствующих определённым требованиям, временно не принимаются. Повторите попытку позже Причина: "{ $reason }"
 panic-bunker-account-reason-account = Ваш аккаунт Space Station 14 слишком новый. Он должен быть старше { $minutes } минут
 panic-bunker-account-reason-overall =
diff --git a/Resources/Locale/ru-RU/datasets/figurines.ftl b/Resources/Locale/ru-RU/datasets/figurines.ftl
index f908c98739..43930e97ea 100644
--- a/Resources/Locale/ru-RU/datasets/figurines.ftl
+++ b/Resources/Locale/ru-RU/datasets/figurines.ftl
@@ -21,6 +21,9 @@ figurines-mime-5 = ................
 figurines-musician-1 = Never gonna give you up!
 figurines-musician-2 = Never gonna let you down!
 figurines-boxer-1 = Первое правило бойцовского клуба...
+figurines-boxer-2 = We settle this in the ring, alright?
+figurines-boxer-3 = I. AM. THE. CHAMPION!!
+figurines-boxer-4 = Don't look at me, he was shot, not punched.
 figurines-captain-1 = Слава НТ!
 figurines-captain-2 = Как я получил эту должность? Да.
 figurines-captain-3 = Ядерный диск в безопасности. Где? Где-то.
diff --git a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl
index aa119eada1..cda47d02a3 100644
--- a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl
@@ -126,6 +126,7 @@ flavor-complex-vegetables = как овощи
 
 ## Complex foodstuffs (cooked foods, joke flavors, etc)
 
+flavor-complex-cherry = like cherries
 flavor-complex-pink = как розовый
 flavor-complex-curry = как карри
 flavor-complex-borsch-1 = как борщ
diff --git a/Resources/Locale/ru-RU/items/toggle.ftl b/Resources/Locale/ru-RU/items/toggle.ftl
new file mode 100644
index 0000000000..bcf5c161a6
--- /dev/null
+++ b/Resources/Locale/ru-RU/items/toggle.ftl
@@ -0,0 +1,2 @@
+item-toggle-activate = Activate
+item-toggle-deactivate = Deactivate
diff --git a/Resources/Locale/ru-RU/job/department-desc.ftl b/Resources/Locale/ru-RU/job/department-desc.ftl
index 0632002c75..1c2df40c3f 100644
--- a/Resources/Locale/ru-RU/job/department-desc.ftl
+++ b/Resources/Locale/ru-RU/job/department-desc.ftl
@@ -5,4 +5,5 @@ department-Engineering-description = Поддерживайте наличие 
 department-Medical-description = Поддерживайте здоровье экипажа.
 department-Security-description = Поддерживайте порядок на станции.
 department-Science-description = Изучайте артефакты и аномалии, обеспечивайте членов экипажа новыми продвинутыми устройствами.
+department-Silicon-description = Obey your laws and serve the crew.
 department-Specific-description = Должности, которые есть не на всех станциях.
diff --git a/Resources/Locale/ru-RU/job/department.ftl b/Resources/Locale/ru-RU/job/department.ftl
index 238822c978..65620a033e 100644
--- a/Resources/Locale/ru-RU/job/department.ftl
+++ b/Resources/Locale/ru-RU/job/department.ftl
@@ -5,4 +5,5 @@ department-Engineering = Инженерный отдел
 department-Medical = Медицинский отдел
 department-Security = Служба безопасности
 department-Science = Научный отдел
+department-Silicon = Silicon
 department-Specific = На определённых станциях
diff --git a/Resources/Locale/ru-RU/job/job-description.ftl b/Resources/Locale/ru-RU/job/job-description.ftl
index a2deba9868..2217912a39 100644
--- a/Resources/Locale/ru-RU/job/job-description.ftl
+++ b/Resources/Locale/ru-RU/job/job-description.ftl
@@ -43,6 +43,7 @@ job-description-salvagespec = Используйте магнит для при
 job-description-scientist = Исследуйте инопланетные артефакты, открывайте новые технологии, заменяйте оборудование станции новыми и усиленными его версиями, повышайте общую эффективность работы.
 job-description-security = Ловите преступников и врагов станции, следите за соблюдением закона и за тем, чтобы станция не погрузилась в беспорядки.
 job-description-serviceworker = Изучите основы барменского искусства, кулинарии, и выращивания растений.
+job-description-station-ai = Follow your laws, serve the crew.
 job-description-visitor = Наслаждайтесь своим визитом на станцию.
 job-description-warden = Патрулируйте отдел безопасности, следите за тем, чтобы никто не воровал из оружейной, и чтобы все заключённые были оформлены и выпущены по окончании срока.
 job-description-zookeeper = Устройте весёлое шоу с милыми животными и космическими карпами, чтобы все члены экипажа могли ими полюбоваться. Эта должность доступна на станциях Gemini и Avrite.
diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl
index e4e19116d9..a72a9b343d 100644
--- a/Resources/Locale/ru-RU/job/job-names.ftl
+++ b/Resources/Locale/ru-RU/job/job-names.ftl
@@ -33,6 +33,7 @@ job-name-botanist = ботаник
 job-name-bartender = бармен
 job-name-passenger = пассажир
 job-name-salvagespec = утилизатор
+job-name-station-ai = Station AI
 job-name-qm = квартирмейстер
 job-name-cargotech = грузчик
 job-name-chef = шеф-повар
@@ -101,6 +102,7 @@ JobSecurityCadet = кадет СБ
 JobSecurityOfficer = офицер СБ
 JobServiceWorker = сервисный работник
 JobStationEngineer = инженер
+JobStationAi = Station AI
 JobTechnicalAssistant = технический ассистент
 JobWarden = смотритель
 JobVisitor = посетитель
diff --git a/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl b/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl
index 382693ee6e..03d125d433 100644
--- a/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl
+++ b/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl
@@ -1,15 +1,18 @@
 health-analyzer-window-no-patient-data-text = Нет данных о пациенте.
 health-analyzer-window-entity-unknown-text = неизвестно
-health-analyzer-window-entity-health-text = Состояние { $entityName }:
+health-analyzer-window-entity-unknown-species-text = Non-Humanoid
+health-analyzer-window-entity-unknown-value-text = N/A
+health-analyzer-window-entity-alive-text = Alive
+health-analyzer-window-entity-dead-text = Dead
+health-analyzer-window-entity-critical-text = Critical
 health-analyzer-window-entity-temperature-text = Температура: { $temperature }
+health-analyzer-window-entity-status-text = Status:
 health-analyzer-window-entity-blood-level-text = Уровень крови: { $bloodLevel }
 health-analyzer-window-entity-bleeding-text = У пациента кровотечение!
 health-analyzer-window-entity-damage-total-text = Общие повреждения: { $amount }
 health-analyzer-window-damage-group-text = { $damageGroup }: { $amount }
 health-analyzer-window-damage-type-text = { $damageType }: { $amount }
-health-analyzer-window-damage-type-duplicate-text = { $damageType }: { $amount } (повтор)
 health-analyzer-window-scan-mode-text = Режим сканирования:
 health-analyzer-window-scan-mode-active = АКТИВЕН
 health-analyzer-window-scan-mode-inactive = НЕАКТИВЕН
-health-analyzer-window-malnutrition = Тяжёлое недоедание
 health-analyzer-popup-scan-target = { CAPITALIZE($user) } пытается просканировать вас!
diff --git a/Resources/Locale/ru-RU/nutrition/components/food-sequence.ftl b/Resources/Locale/ru-RU/nutrition/components/food-sequence.ftl
index 8f02ceb3b1..189fd24ae1 100644
--- a/Resources/Locale/ru-RU/nutrition/components/food-sequence.ftl
+++ b/Resources/Locale/ru-RU/nutrition/components/food-sequence.ftl
@@ -72,11 +72,11 @@ food-sequence-content-suppermatter = суперматерией
 food-sequence-content-capfruit = пистофруктом
 food-sequence-content-berries = ягодами
 food-sequence-content-spacemans-trumpet = космической трубкой
+food-sequence-content-cherry = cherry
 
 # BURGERS
 
-food-sequence-burger-gen = {$content}бургер
-
+food-sequence-burger-gen = { $content }бургер
 food-sequence-burger-content-raw-meat = сыро
 food-sequence-burger-content-meat = мясо
 food-sequence-burger-content-carp = карпо
@@ -113,8 +113,8 @@ food-sequence-burger-content-spacemans-trumpet = космотруб
 
 # TACO
 
-food-sequence-taco-gen = тако с {$content}
+food-sequence-taco-gen = тако с { $content }
 
 # SKEWER
 
-food-sequence-skewer-gen = шашлык с {$content}
+food-sequence-skewer-gen = шашлык с { $content }
diff --git a/Resources/Locale/ru-RU/paper/stamp-component.ftl b/Resources/Locale/ru-RU/paper/stamp-component.ftl
index f6716499a6..509ccb2af7 100644
--- a/Resources/Locale/ru-RU/paper/stamp-component.ftl
+++ b/Resources/Locale/ru-RU/paper/stamp-component.ftl
@@ -17,3 +17,4 @@ stamp-component-stamped-name-warden = Смотритель
 stamp-component-stamped-name-trader = Торговец
 stamp-component-stamped-name-syndicate = Синдикат
 stamp-component-stamped-name-ce = Старший инженер
+stamp-component-stamped-name-greytide = Greytide
diff --git a/Resources/Locale/ru-RU/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/preferences/loadout-groups.ftl
index 2090cb36cf..8a2dfad262 100644
--- a/Resources/Locale/ru-RU/preferences/loadout-groups.ftl
+++ b/Resources/Locale/ru-RU/preferences/loadout-groups.ftl
@@ -67,6 +67,7 @@ loadout-group-mime-mask = Мим, маска
 loadout-group-mime-jumpsuit = Мим, комбинезон
 loadout-group-mime-backpack = Мим, рюкзак
 loadout-group-mime-outerclothing = Мим, верхняя одежда
+loadout-group-mime-belt = Mime belt
 loadout-group-musician-jumpsuit = Музыкант, комбинезон
 loadout-group-musician-outerclothing = Музыкант, верхняя одежда
 # Cargo
diff --git a/Resources/Locale/ru-RU/preferences/loadouts.ftl b/Resources/Locale/ru-RU/preferences/loadouts.ftl
index f1845514c7..04fe9d64e4 100644
--- a/Resources/Locale/ru-RU/preferences/loadouts.ftl
+++ b/Resources/Locale/ru-RU/preferences/loadouts.ftl
@@ -1,3 +1,6 @@
+# Name
+loadout-name-edit-label = Custom name
+loadout-name-edit-tooltip = 32 characters max. If no name is specified a random one may be chosen for you.
 # Restrictions
 loadout-restrictions = Ограничения
 loadouts-min-limit = Мин. кол-во: { $count }
diff --git a/Resources/Locale/ru-RU/reagents/meta/consumable/drink/juice.ftl b/Resources/Locale/ru-RU/reagents/meta/consumable/drink/juice.ftl
index 2128955ed8..6dca2d4ac8 100644
--- a/Resources/Locale/ru-RU/reagents/meta/consumable/drink/juice.ftl
+++ b/Resources/Locale/ru-RU/reagents/meta/consumable/drink/juice.ftl
@@ -28,3 +28,5 @@ reagent-name-juice-tomato = томатный сок
 reagent-desc-juice-tomato = Томаты превращённые в сок. Какая трата хороших помидоров, а?
 reagent-name-juice-watermelon = арбузный сок
 reagent-desc-juice-watermelon = Вкусный сок арбуза.
+reagent-name-juice-cherry = cherry juice
+reagent-desc-juice-cherry = Tasty cherry juice, sweet and tangy.
diff --git a/Resources/Locale/ru-RU/research/components/blueprint.ftl b/Resources/Locale/ru-RU/research/components/blueprint.ftl
new file mode 100644
index 0000000000..34c3a3c80e
--- /dev/null
+++ b/Resources/Locale/ru-RU/research/components/blueprint.ftl
@@ -0,0 +1,2 @@
+blueprint-receiver-popup-insert = { CAPITALIZE(THE($user)) } inserted { THE($blueprint) } into { THE($receiver) }.
+blueprint-receiver-popup-recipe-exists = The same blueprint was already inserted!
diff --git a/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl b/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl
index f680e834e7..1ab3db57a6 100644
--- a/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl
+++ b/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl
@@ -28,6 +28,8 @@ salvage-magnet-resources-count =
         [5] (Много)
        *[other] (Изобилие)
     }
+# Debris
+salvage-magnet-debris-ChunkDebris = Space Debris
 # Asteroids
 dungeon-config-proto-BlobAsteroid = Астероидный массив
 dungeon-config-proto-ClusterAsteroid = Астероидный кластер
diff --git a/Resources/Locale/ru-RU/seeds/seeds.ftl b/Resources/Locale/ru-RU/seeds/seeds.ftl
index 63daedf14a..51fb338613 100644
--- a/Resources/Locale/ru-RU/seeds/seeds.ftl
+++ b/Resources/Locale/ru-RU/seeds/seeds.ftl
@@ -128,3 +128,5 @@ seeds-pyrotton-name = пирохлопок
 seeds-pyrotton-display-name = куст пирохлопка
 seeds-capfruit-name = пистофрукт
 seeds-capfruit-display-name = пистофруктовое дерево
+seeds-cherry-name = cherry
+seeds-cherry-display-name = cherry tree
diff --git a/Resources/Locale/ru-RU/shuttles/emergency.ftl b/Resources/Locale/ru-RU/shuttles/emergency.ftl
index c1496071e1..a908207a47 100644
--- a/Resources/Locale/ru-RU/shuttles/emergency.ftl
+++ b/Resources/Locale/ru-RU/shuttles/emergency.ftl
@@ -47,3 +47,6 @@ emergency-shuttle-ui-authorize = АВТОРИЗОВАТЬСЯ
 emergency-shuttle-ui-repeal = ПОВТОРИТЬ
 emergency-shuttle-ui-authorizations = Авторизации
 emergency-shuttle-ui-remaining = Осталось: { $remaining }
+# Map Misc.
+map-name-centcomm = Central Command
+map-name-terminal = Arrivals Terminal
diff --git a/Resources/Locale/ru-RU/silicons/station-ai.ftl b/Resources/Locale/ru-RU/silicons/station-ai.ftl
new file mode 100644
index 0000000000..c49e7784b2
--- /dev/null
+++ b/Resources/Locale/ru-RU/silicons/station-ai.ftl
@@ -0,0 +1,11 @@
+# General
+ai-wire-snipped = Wire has been cut at { $coords }.
+wire-name-ai-vision-light = AIV
+wire-name-ai-act-light = AIA
+station-ai-takeover = AI takeover
+# Radial actions
+ai-open = Open actions
+ai-close = Close actions
+bolt-close = Close bolt
+bolt-open = Open bolt
+toggle-light = Toggle light
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl
index 01e33e44c5..564a24784d 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl
@@ -36,7 +36,9 @@ ent-ClothingBeltMilitaryWebbing = армейская РПС
     .desc = Ременно-плечевая система тактических ремней, которую носят абордажные группы Синдиката.
 ent-ClothingBeltMilitaryWebbingMed = армейская РПС медика
     .desc = Ременно-плечевая система тактических ремней, которую носят оперативники-медики Мародёров Горлекса.
-ent-ClothingBeltSuspenders = подтяжки
-    .desc = Для поддержания штанов.
+ent-ClothingBeltSuspendersRed = red suspenders
+    .desc = For holding your pants up.
+ent-ClothingBeltSuspendersBlack = black suspenders
+    .desc = { ent-ClothingBeltSuspendersRed.desc }
 ent-ClothingBeltWand = пояс для палочек
     .desc = Пояс, предназначенный для хранения различных волшебных палочек. Поясная сумка, полная экзотической магии.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl
index e5cced3636..dbeb7aec2e 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl
@@ -20,6 +20,8 @@ ent-ClothingEyesGlassesSunglasses = солнцезащитные очки
     .desc = Пара чёрных солнцезащитных очков.
 ent-ClothingEyesGlassesSecurity = очки охраны
     .desc = Модернизированные солнцезащитные очки с функцией защиты от вспышек и визором СБ.
+ent-ClothingEyesGlassesCommand = administration glasses
+    .desc = Upgraded sunglasses that provide flash immunity and show ID card status.
 ent-ClothingEyesGlassesMercenary = очки наёмника
     .desc = Очки, созданные для ведения боя, для защиты глаз от ярких ослепляющих вспышек.
 ent-ClothingEyesGlassesThermal = оптический термальный сканер
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl
index 8c1a835360..c21769100b 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl
@@ -8,6 +8,8 @@ ent-ClothingEyesHudMedical = медицинский визор
     .desc = Окуляр с индикатором на стекле, который сканирует гуманоидов в поле зрения и предоставляет точные данные о состоянии их здоровья.
 ent-ClothingEyesHudSecurity = визор охраны
     .desc = Окуляр с индикатором на стекле, который сканирует гуманоидов в поле зрения и предоставляет точные данные об их идентификационном статусе и записях в системе безопасности.
+ent-ClothingEyesHudCommand = administration hud
+    .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status.
 ent-ClothingEyesHudBeer = пивные очки
     .desc = Пара солнцезащитных очков, оснащённых сканером реагентов, а также дающих понимание вязкости жидкости во время движения.
 ent-ClothingEyesHudFriedOnion = fried onion goggles
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl
index 1b4b6767bb..1f244bd269 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl
@@ -4,3 +4,5 @@ ent-ClothingHandsButcherable = { ent-ClothingHandsBase }
     .desc = { ent-ClothingHandsBase.desc }
 ent-ClothingHandsGlovesSyntheticBase = { ent-ClothingHandsButcherable }
     .desc = { ent-ClothingHandsButcherable.desc }
+ent-RingBase = { ent-BaseItem }
+    .desc = { ent-BaseItem.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/rings.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/rings.ftl
new file mode 100644
index 0000000000..63c705dbe5
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/rings.ftl
@@ -0,0 +1,12 @@
+ent-GoldRing = gold ring
+    .desc = A precious ring.
+ent-SilverRing = silver ring
+    .desc = Looks slightly less valuable than a gold one.
+ent-GoldRingDiamond = gold diamond ring
+    .desc = Made from ethically mined space diamonds.
+ent-SilverRingDiamond = silver diamond ring
+    .desc = Made from ethically mined space diamonds.
+ent-GoldRingGem = gold gem ring
+    .desc = Shiny and valuable!
+ent-SilverRingGem = silver gem ring
+    .desc = Shiny and not quite as valuable!
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl
index 604617b3f6..3a5f9e8def 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl
@@ -10,3 +10,6 @@ ent-AtmosFixInstantPlasmaFireMarker = Atmos Fix Instant Plasmafire Marker
     .desc = INSTANT PLASMAFIRE
 ent-AtmosFixFreezerMarker = Atmos Fix Freezer Marker
     .desc = Change air temp to 235K, for freezer with a big of wiggle room to get set up.
+ent-AtmosFixVoxMarker = { ent-AtmosFixNitrogenMarker }
+    .desc = Nitrogen @ 101 kPa, 20C
+    .suffix = Vox Atmosphere
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/base.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/base.ftl
index e67e426f57..647e4cac10 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/base.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/base.ftl
@@ -1,5 +1,7 @@
 ent-BaseMob = { "" }
     .desc = { "" }
+ent-MobPolymorphable = { "" }
+    .desc = { "" }
 ent-MobDamageable = { "" }
     .desc = { "" }
 ent-MobCombat = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/observer.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/observer.ftl
index 96ba6227c9..68fd748a51 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/observer.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/observer.ftl
@@ -1,3 +1,5 @@
+ent-Incorporeal = { "" }
+    .desc = Mobs without physical bodies
 ent-MobObserver = наблюдатель
     .desc = Буу!
 ent-ActionGhostBoo = Бу!
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/silicon.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/silicon.ftl
index 6cfa1d4fa0..5f6dc6869e 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/silicon.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/silicon.ftl
@@ -1,3 +1,34 @@
+ent-AiHeld = { "" }
+    .desc = Components added / removed from an entity that gets inserted into an AI core.
+ent-ActionJumpToCore = Jump to core
+    .desc = Sends your eye back to the core.
+ent-ActionShowJobIcons = Show job icons
+    .desc = Shows job icons for crew members.
+ent-ActionSurvCameraLights = Toggle camera lights
+    .desc = Enable surveillance camera lights near wherever you're viewing.
+ent-AiHolder = { "" }
+    .desc = Handles AI interactions across holocards + AI cores
+ent-AsimovCircuitBoard = circuit board (Crewsimov)
+    .desc = An electronics board containing the Crewsimov lawset.
+ent-CorporateCircuitBoard = circuit board (Corporate)
+    .desc = An electronics board containing the Corporate lawset.
+ent-NTDefaultCircuitBoard = circuit board (NT Default)
+    .desc = An electronics board containing the NT Default lawset.
+ent-Intellicard = Intellicard
+    .desc = A storage device for AIs.
+    .suffix = Empty
+ent-PlayerStationAiEmpty = AI Core
+    .desc = The latest in Artificial Intelligences.
+    .suffix = Empty
+ent-PlayerStationAi = { ent-PlayerStationAiEmpty }
+    .suffix = Job spawn
+    .desc = { ent-PlayerStationAiEmpty.desc }
+ent-StationAiBrain = { ent-PositronicBrain }
+    .suffix = DO NOT MAP
+    .desc = { ent-PositronicBrain.desc }
+ent-StationAiHolo = AI eye
+    .desc = The AI's viewer.
+    .suffix = DO NOT MAP
 ent-PlayerBorgGeneric = { ent-BorgChassisGeneric }
     .desc = { ent-BorgChassisGeneric.desc }
     .suffix = Батарея, Инструменты
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl
index 86654057ad..b2907ce88f 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl
@@ -10,6 +10,10 @@ ent-FoodBreadPlain = хлеб
     .desc = Обычный хлеб с Земли.
 ent-FoodBreadPlainSlice = ломтик хлеба
     .desc = Кусочек дома.
+ent-FoodBreadCotton = cotton bread
+    .desc = Bread, but for moff.
+ent-FoodBreadCottonSlice = cotton bread slice
+    .desc = A slice of (maybe) delicious cotton bread.
 ent-FoodBreadCorn = кукурузный хлеб
     .desc = Домашний кукурузный хлеб в стиле кантри, с привкусом стрельбы и ковбойского иии-ха.
 ent-FoodBreadCornSlice = ломтик кукурузного хлеба
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl
index c1c5730ce4..6888b4a964 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl
@@ -44,3 +44,7 @@ ent-FoodPizzaUranium = острокаменная пицца
     .desc = Острая пицца с перчиками и ураном.
 ent-FoodPizzaUraniumSlice = ломтик острокаменной пиццы
     .desc = Светящийся кусочек острокаменной пиццы.
+ent-FoodPizzaCotton = cotton pizza
+    .desc = Flat fabric cotton dough with cotton topping. Incredible.
+ent-FoodPizzaCottonSlice = slice of cotton pizza
+    .desc = A slice of cotton pizza. Cotton included.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl
index 0c8f33751f..648ac94da9 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl
@@ -42,6 +42,8 @@ ent-FoodDoughTortillaSlice = кусок теста тортильи
     .desc = Кусок теста тортильи.
 ent-FoodDoughTortillaFlat = плоское тесто тортильи
     .desc = Расплющенный кусок теста тортильи. Приготовьте его, чтобы получить лепёшку тако.
+ent-FoodDoughCotton = cotton dough
+    .desc = A piece of fabric dough.
 ent-FoodDoughPastryBaseRaw = сырая основа для выпечки
     .desc = Перед использованием необходимо приготовить.
 ent-FoodDoughPastryBase = основа для выпечки
@@ -50,6 +52,8 @@ ent-FoodDoughPie = тесто для пирога
     .desc = Приготовьте его, чтобы получить пирог.
 ent-FoodDoughFlat = плоское тесто
     .desc = Расплющенное тесто.
+ent-FoodDoughCottonFlat = flat cotton dough
+    .desc = A flattened cotton dough.
 ent-FoodDoughPizzaBaked = основа для пиццы
     .desc = Добавьте ингредиенты для приготовления пиццы.
 ent-FoodCakeBatter = тесто для торта
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl
index 738561c8d3..82593a784d 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl
@@ -141,3 +141,7 @@ ent-CottonBol = хлопковый шарик
     .desc = Любимая закуска ниан, такая же пушистая, как и они.
 ent-PyrottonBol = пирохлопковый шарик
     .desc = Скорее всего, оно подожжёт вас.
+ent-FoodCherry = cherry
+    .desc = Juicy red cherry with a pit inside.
+ent-TrashCherryPit = cherry pit
+    .desc = { ent-FoodInjectableBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/scrap.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/scrap.ftl
index fc488443d5..af265af4b0 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/scrap.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/scrap.ftl
@@ -3,64 +3,64 @@ ent-BaseScrap = лом
     .suffix = Лом
 ent-ScrapSteel = взорванная куча стали
     .desc = Груда стали, сваренная вместе при экстремальной жаре. В целом она приличного размера, из неё можно получить достаточное количество листов.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapGlass = бракованные схемы
     .desc = Огромный комок различных схем, странным образом сплавленных вместе. Из него, вероятно, можно извлечь некоторые материалы.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapAirlock1 = дверь шлюза
     .desc = Раньше она задерживала воздух. Теперь, похоже, она вообще ничего не делает.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapAirlock2 = лампа шлюза
     .desc = Заслуживает уважения за то, что всё это время мигала красным.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapBucket = лопнувшее ведро
     .desc = Боже милостивый...
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapCamera = сломанная камера
     .desc = Возможно, она всё ещё наблюдает..
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapCanister1 = ручка канистры
     .desc = Помогает держать канистру. Теперь вам нужна лишь сама канистра.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapCanister2 = вентиль канистры
     .desc = Вентиль от канистры.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapCloset = дверь шкафчика
     .desc = Снесённая дверь из технического шкафа. Выглядит как хороший настенный декор.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapFaxMachine = факс
     .desc = Печальный результат слишком большого количества ASCII-артов, отправленных Центкому.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapFireExtinguisher = расколотый огнетушитель
     .desc = Большая трещина по центру заставляет беспокоиться за предыдущего пользователя.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapFirelock1 = дверь пожарного шлюза
     .desc = По крайней мере, вы всё ещё знаете, для чего она предназначена.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapFirelock2 = дверь пожарного шлюза
     .desc = О! Вот куда делась вторая половина!
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapFirelock3 = каркас пожарного шлюза
     .desc = { ent-BaseScrap.desc }
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapIntercom = обломок интеркома
     .desc = Хотелось бы, чтобы у него были хотя бы какие-то ключи шифрования.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapJetpack = расколотый джетпак
     .desc = Похоже, он больше не будет летать.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapMedkit = сломанная аптечка
     .desc = Надеюсь, она кому-то помогла.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapMopBucket = половина ведра для швабры
     .desc = Тайдеры умирают. Уборщики выживают.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapPAI = персональный ИИ
     .desc = Дружище! Ты ещё там? Алло? Дружище???
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapPAIGold = позолочённый персональный ИИ
     .desc = Вау! Какая находка на миллион! Он мог бы стоить целое состояние... если бы он был в хорошем состоянии.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
 ent-ScrapTube = разбитая пробирка с образцами
     .desc = Стеклянная трубка, содержащая какой-то редкий образец. Или, по крайней мере, раньше содержала. Сейчас там осталось совсем немного.
-    .suffix = {ent-BaseScrap.suffix}
+    .suffix = { ent-BaseScrap.suffix }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl
index c24ef8e389..47e7d353e8 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl
@@ -53,3 +53,5 @@ ent-RubberStampDenied = печать ОТКАЗАНО
 ent-RubberStampDetective = печать детектива
     .suffix = НЕ МАППИТЬ
     .desc = { ent-RubberStampBase.desc }
+ent-RubberStampGreytide = greytide's rubber stamp
+    .desc = A rubber stamp for stamping important documents. The tide washes over you, just looking at it...
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl
index ae42fef6dc..897b0aae5f 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl
@@ -129,3 +129,5 @@ ent-RealCapfruitSeeds = пакет семян (пистофрукт)
 ent-FakeCapfruitSeeds = { ent-RealCapfruitSeeds }
     .suffix = Боевой
     .desc = { ent-RealCapfruitSeeds.desc }
+ent-CherrySeeds = packet of cherry seeds
+    .desc = { ent-SeedBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl
new file mode 100644
index 0000000000..e0c4b8eb27
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl
@@ -0,0 +1,8 @@
+ent-BaseBlueprint = blueprint
+    .desc = A blueprint for some machine. It can be inserted into an autolathe.
+ent-BlueprintFulton = fulton blueprint
+    .desc = A blueprint with a schematic of a fulton. It can be inserted into an autolathe.
+ent-BlueprintSeismicCharge = seismic charge blueprint
+    .desc = A blueprint with a schematic of a seismic charge. It can be inserted into an autolathe.
+ent-BlueprintFlare = flare blueprint
+    .desc = A blueprint with a schematic of a flare. It can be inserted into an autolathe.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl
index 9f71099acc..ba013e2eee 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl
@@ -66,3 +66,5 @@ ent-ComputerSensorMonitoring = консоль мониторинга датчи
     .suffix = ТЕСТ, НЕ МАППИТЬ
 ent-ComputerRoboticsControl = консоль управления робототехникой
     .desc = Используется для дистанционного контроля, отключения и уничтожения киборгов станции.
+ent-StationAiUploadComputer = AI upload console
+    .desc = Used to update the laws of the station AI.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl
new file mode 100644
index 0000000000..324b5e5958
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl
@@ -0,0 +1,15 @@
+ent-AirSensorVoxBase = { ent-AirSensorBase }
+    .suffix = Vox Atmosphere
+    .desc = { ent-AirSensorBase.desc }
+ent-AirSensorVox = { ent-['AirSensorVoxBase', 'AirSensor'] }
+
+  .desc = { ent-['AirSensorVoxBase', 'AirSensor'].desc }
+ent-GasVentPumpVox = { ent-['AirSensorVoxBase', 'GasVentPump'] }
+
+  .desc = { ent-['AirSensorVoxBase', 'GasVentPump'].desc }
+ent-GasVentScrubberVox = { ent-['AirSensorVoxBase', 'GasVentScrubber'] }
+
+  .desc = { ent-['AirSensorVoxBase', 'GasVentScrubber'].desc }
+ent-AirAlarmVox = { ent-AirAlarm }
+    .suffix = Vox Atmosphere, auto mode disabled
+    .desc = { ent-AirAlarm.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/xeno.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/xeno.ftl
index 7b93cdeeb8..94d10c59a4 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/xeno.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/xeno.ftl
@@ -2,3 +2,9 @@ ent-XenoWardingTower = охранная башня ксено
     .desc = { "" }
 ent-CarpStatue = статуя карпа
     .desc = Статуя одного из храбрых карпов, благодаря которому мы находимся там, где находимся. С настоящими зубами!
+ent-CarpStatueEmpty = { ent-CarpStatue }
+    .desc = A lump of precious metals, soon to be a brilliant carp statue.
+    .suffix = Empty
+ent-CarpStatueEyes = { ent-CarpStatue }
+    .desc = A statue of one of the brave carp that got us where we are today. This one needs a dentist...
+    .suffix = Eyes
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl
index c201221300..fa76593612 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl
@@ -31,6 +31,9 @@ ent-WallPlastitanium = пластитановая стена
 ent-WallPlastitaniumDiagonal = пластитановая стена
     .suffix = Диагональ
     .desc = { ent-WallShuttleDiagonal.desc }
+ent-WallPlastitaniumDiagonalIndestructible = plastitanium wall
+    .desc = Keeps the air in and the greytide out.
+    .suffix = diagonal, indestructible
 ent-WallReinforced = укреплённая стена
     .desc = { ent-BaseWall.desc }
 ent-WallReinforcedRust = укреплённая стена
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl
index 54183faebe..0def8b950e 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl
@@ -1,5 +1,18 @@
+ent-PlastitaniumWindowBase = plastitanium window
+    .desc = Don't smudge up the glass down there.
+ent-PlastitaniumWindowSquareBase = plastitanium window
+    .desc = { ent-PlastitaniumWindowBase.desc }
+ent-PlastitaniumWindowIndestructible = plastitanium window
+    .suffix = indestructible
+    .desc = { ent-PlastitaniumWindowSquareBase.desc }
 ent-PlastitaniumWindow = пластитановое стекло
     .desc = { ent-Window.desc }
+ent-PlastitaniumWindowDiagonalBase = plastitanium window
+    .suffix = diagonal
+    .desc = { ent-PlastitaniumWindowBase.desc }
+ent-PlastitaniumWindowDiagonalIndestructible = plastitanium window
+    .suffix = diagonal, indestructible
+    .desc = { ent-PlastitaniumWindowDiagonalBase.desc }
 ent-PlastitaniumWindowDiagonal = { ent-ShuttleWindow }
     .suffix = Дигональ
     .desc = { ent-ShuttleWindow.desc }
diff --git a/Resources/Locale/ru-RU/weather/weather.ftl b/Resources/Locale/ru-RU/weather/weather.ftl
index 78c79755d1..e199ee1426 100644
--- a/Resources/Locale/ru-RU/weather/weather.ftl
+++ b/Resources/Locale/ru-RU/weather/weather.ftl
@@ -1,3 +1,6 @@
 cmd-weather-desc = Устанавливает погоду для текущей карты.
 cmd-weather-help = weather <mapId> <prototype / null>
 cmd-weather-hint = Прототип погоды
+cmd-weather-error-no-arguments = Not enough arguments!
+cmd-weather-error-unknown-proto = Unknown Weather prototype!
+cmd-weather-error-wrong-time = Time is in the wrong format!