diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/body/organs/goblin_organs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/body/organs/goblin_organs.ftl
new file mode 100644
index 00000000000..9f38ba0e8ae
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/body/organs/goblin_organs.ftl
@@ -0,0 +1,30 @@
+ent-OrganGoblinBrain = brain
+ .desc = The source of your woes.
+ .suffix = Goblin
+ent-OrganGoblinEyes = eyes
+ .suffix = Goblin
+ .desc = { ent-OrganHumanEyes.desc }
+ent-OrganGoblinTongue = tongue
+ .suffix = Goblin
+ .desc = { ent-OrganHumanTongue.desc }
+ent-OrganGoblinAppendix = appendix
+ .suffix = Goblin
+ .desc = { ent-OrganHumanAppendix.desc }
+ent-OrganGoblinEars = ears
+ .suffix = Goblin
+ .desc = { ent-OrganHumanEars.desc }
+ent-OrganGoblinLungs = lungs
+ .desc = They breathe business.
+ .suffix = Goblin
+ent-OrganGoblinHeart = heart
+ .suffix = Goblin
+ .desc = { ent-OrganHumanHeart.desc }
+ent-OrganGoblinStomach = stomach
+ .desc = Shrooms go in here.
+ .suffix = Goblin
+ent-OrganGoblinLiver = liver
+ .suffix = Goblin
+ .desc = { ent-OrganHumanLiver.desc }
+ent-OrganGoblinKidneys = kidneys
+ .suffix = Goblin
+ .desc = { ent-OrganHumanKidneys.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/body/parts/goblin_parts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/body/parts/goblin_parts.ftl
new file mode 100644
index 00000000000..1dfea82839d
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/body/parts/goblin_parts.ftl
@@ -0,0 +1,22 @@
+ent-PartGoblin = goblin body part
+ .desc = { ent-BasePart.desc }
+ent-TorsoGoblin = Goblin torso
+ .desc = { ent-PartGoblin.desc }
+ent-HeadGoblin = Goblin head
+ .desc = { ent-PartGoblin.desc }
+ent-LeftArmGoblin = left Goblin arm
+ .desc = { ent-PartGoblin.desc }
+ent-RightArmGoblin = right Goblin arm
+ .desc = { ent-PartGoblin.desc }
+ent-LeftHandGoblin = left Goblin hand
+ .desc = { ent-PartGoblin.desc }
+ent-RightHandGoblin = right Goblin hand
+ .desc = { ent-PartGoblin.desc }
+ent-LeftLegGoblin = left Goblin leg
+ .desc = { ent-PartGoblin.desc }
+ent-RightLegGoblin = right Goblin leg
+ .desc = { ent-PartGoblin.desc }
+ent-LeftFootGoblin = left Goblin foot
+ .desc = { ent-PartGoblin.desc }
+ent-RightFootGoblin = right Goblin foot
+ .desc = { ent-PartGoblin.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/duffelbag.ftl
index 03d963e7449..526df73e89d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/duffelbag.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/duffelbag.ftl
@@ -1,2 +1,6 @@
ent-ClothingBackpackDuffelSyndicateFilledEmpGrenadeLauncher = China-Lake EMP bundle
.desc = An old China-Lake grenade launcher bundled with 8 rounds of EMP.
+ent-ClothingBackpackDuffelSurgeryImpovFilled = improvised surgical duffel bag
+ .desc = This looks like set of improvised surgical tools put together by someone.
+ent-ClothingBackpackDuffelSurgeryAdvancedFilled = advanced surgical duffel bag
+ .desc = A large duffel bag for holding extra medical supplies - this one seems to be designed for holding advanced surgical tools.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/duffelbag_npc_loot.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/duffelbag_npc_loot.ftl
index 4200f995517..c73f355bd67 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/duffelbag_npc_loot.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/duffelbag_npc_loot.ftl
@@ -89,3 +89,11 @@ ent-ClothingBackpackBloodCultZealotLootC = { ent-ClothingBackpackBloodCultZealot
.desc = { ent-ClothingBackpackBloodCultZealotLootA.desc }
ent-ClothingBackpackBloodCultZealotLootD = { ent-ClothingBackpackBloodCultZealotLootA }
.desc = { ent-ClothingBackpackBloodCultZealotLootA.desc }
+ent-ClothingBackpackBloodCultLootA = { ent-ClothingBackpackBloodCultZealotLootA }
+ .desc = { ent-ClothingBackpackBloodCultZealotLootA.desc }
+ent-ClothingBackpackBloodCultLootB = { ent-ClothingBackpackBloodCultZealotLootA }
+ .desc = { ent-ClothingBackpackBloodCultZealotLootA.desc }
+ent-ClothingBackpackBloodCultLootC = { ent-ClothingBackpackBloodCultZealotLootA }
+ .desc = { ent-ClothingBackpackBloodCultZealotLootA.desc }
+ent-ClothingBackpackBloodCultLootD = { ent-ClothingBackpackBloodCultZealotLootA }
+ .desc = { ent-ClothingBackpackBloodCultZealotLootA.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/backpack.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/backpack.ftl
index 50f873bcab1..2bf3f3094bb 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/backpack.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/backpack.ftl
@@ -1,16 +1,20 @@
ent-ClothingBackpackMercenaryFilled = { ent-ClothingBackpackMercenary }
- .desc = { ent-ClothingBackpackMercenary.desc }
-ent-ClothingBackpackReporterFilled = { ent-ClothingBackpack }
- .desc = { ent-ClothingBackpack.desc }
-ent-ClothingBackpackPsychologistFilled = { ent-ClothingBackpackMedical }
- .desc = { ent-ClothingBackpackMedical.desc }
-ent-ClothingBackpackLawyerFilled = { ent-ClothingBackpack }
- .desc = { ent-ClothingBackpack.desc }
-ent-ClothingBackpackStcFilled = { ent-ClothingBackpack }
- .desc = { ent-ClothingBackpack.desc }
+ .desc = { ent-ClothingBackpackMercenary.desc }
ent-ClothingBackpackPilotFilled = { ent-ClothingBackpackPilot }
- .desc = { ent-ClothingBackpackPilot.desc }
-ent-ClothingBackpackOfficerFilled = { ent-ClothingBackpacknfsd }
- .desc = { ent-ClothingBackpacknfsd.desc }
+ .desc = { ent-ClothingBackpackPilot.desc }
ent-ClothingBackpackERTMailCarrierFilled = { ent-ClothingBackpackERTMailCarrier }
.desc = { ent-ClothingBackpackERTMailCarrier.desc }
+ent-ClothingBackpackSrFilled = { ent-ClothingBackpack }
+ .desc = { ent-ClothingBackpack.desc }
+ent-ClothingBackpackIanSrFilled = { ent-ClothingBackpackIan }
+ .desc = { ent-ClothingBackpackIan.desc }
+ent-ClothingBackpackNfsdBrownFilled = { ent-ClothingBackpackNfsdBrown }
+ .desc = { ent-ClothingBackpackNfsdBrown.desc }
+ent-ClothingBackpackNfsdCreamFilled = { ent-ClothingBackpackNfsdBrownFilled }
+ .desc = { ent-ClothingBackpackNfsdBrownFilled.desc }
+ent-ClothingBackpackNfsdBrownDetectiveFilled = { ent-ClothingBackpackNfsdBrown }
+ .desc = { ent-ClothingBackpackNfsdBrown.desc }
+ent-ClothingBackpackNfsdBrownRadioFilled = { ent-ClothingBackpackNfsdBrown }
+ .desc = { ent-ClothingBackpackNfsdBrown.desc }
+ent-ClothingBackpackNfsdBrownSheriffFilled = { ent-ClothingBackpackNfsdBrown }
+ .desc = { ent-ClothingBackpackNfsdBrown.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/duffelbag.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/duffelbag.ftl
index eccc73530f5..1683f265b0c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/duffelbag.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/duffelbag.ftl
@@ -1,14 +1,16 @@
ent-ClothingBackpackDuffelMercenaryFilled = { ent-ClothingBackpackDuffelMercenary }
- .desc = { ent-ClothingBackpackDuffelMercenary.desc }
-ent-ClothingBackpackDuffelReporterFilled = { ent-ClothingBackpackDuffel }
- .desc = { ent-ClothingBackpackDuffel.desc }
-ent-ClothingBackpackDuffelPsychologistFilled = { ent-ClothingBackpackDuffelMedical }
- .desc = { ent-ClothingBackpackDuffelMedical.desc }
-ent-ClothingBackpackDuffelLawyerFilled = { ent-ClothingBackpackDuffel }
- .desc = { ent-ClothingBackpackDuffel.desc }
-ent-ClothingBackpackDuffelStcFilled = { ent-ClothingBackpackDuffel }
- .desc = { ent-ClothingBackpackDuffel.desc }
+ .desc = { ent-ClothingBackpackDuffelMercenary.desc }
ent-ClothingBackpackDuffelPilotFilled = { ent-ClothingBackpackDuffelPilot }
- .desc = { ent-ClothingBackpackDuffelPilot.desc }
-ent-ClothingBackpackDuffelOfficerFilled = { ent-ClothingBackpackDuffelnfsd }
- .desc = { ent-ClothingBackpackDuffelnfsd.desc }
+ .desc = { ent-ClothingBackpackDuffelPilot.desc }
+ent-ClothingBackpackDuffelSrFilled = { ent-ClothingBackpackDuffel }
+ .desc = { ent-ClothingBackpackDuffel.desc }
+ent-ClothingBackpackDuffelNfsdBrownFilled = { ent-ClothingBackpackDuffelNfsdBrown }
+ .desc = { ent-ClothingBackpackDuffelNfsdBrown.desc }
+ent-ClothingBackpackDuffelNfsdCreamFilled = { ent-ClothingBackpackDuffelNfsdBrownFilled }
+ .desc = { ent-ClothingBackpackDuffelNfsdBrownFilled.desc }
+ent-ClothingBackpackDuffelNfsdBrownDetectiveFilled = { ent-ClothingBackpackDuffelNfsdBrown }
+ .desc = { ent-ClothingBackpackDuffelNfsdBrown.desc }
+ent-ClothingBackpackDuffelNfsdBrownRadioFilled = { ent-ClothingBackpackDuffelNfsdBrown }
+ .desc = { ent-ClothingBackpackDuffelNfsdBrown.desc }
+ent-ClothingBackpackDuffelNfsdBrownSheriffFilled = { ent-ClothingBackpackDuffelNfsdBrown }
+ .desc = { ent-ClothingBackpackDuffelNfsdBrown.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/messenger.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/messenger.ftl
index 0f541fe0f5b..b7d1dfca1b7 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/messenger.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/messenger.ftl
@@ -1,68 +1,62 @@
ent-ClothingBackpackMessengerFilled = { ent-ClothingBackpackMessenger }
- .desc = { ent-ClothingBackpackMessenger.desc }
+ .desc = { ent-ClothingBackpackMessenger.desc }
ent-ClothingBackpackMessengerClownFilled = { ent-ClothingBackpackMessengerClown }
- .desc = { ent-ClothingBackpackMessengerClown.desc }
-ent-ClothingBackpackMessengerSecurityFilled = { ent-ClothingBackpackMessengerSecurity }
- .desc = { ent-ClothingBackpackMessengerSecurity.desc }
-ent-ClothingBackpackMessengerSecurityFilledDetective = { ent-ClothingBackpackMessengerSecurity }
- .desc = { ent-ClothingBackpackMessengerSecurity.desc }
+ .desc = { ent-ClothingBackpackMessengerClown.desc }
ent-ClothingBackpackMessengerMedicalFilled = { ent-ClothingBackpackMessengerMedical }
- .desc = { ent-ClothingBackpackMessengerMedical.desc }
+ .desc = { ent-ClothingBackpackMessengerMedical.desc }
ent-ClothingBackpackMessengerCaptainFilled = { ent-ClothingBackpackMessengerCaptain }
- .desc = { ent-ClothingBackpackMessengerCaptain.desc }
+ .desc = { ent-ClothingBackpackMessengerCaptain.desc }
ent-ClothingBackpackMessengerChiefEngineerFilled = { ent-ClothingBackpackMessengerEngineering }
- .desc = { ent-ClothingBackpackMessengerEngineering.desc }
+ .desc = { ent-ClothingBackpackMessengerEngineering.desc }
ent-ClothingBackpackMessengerResearchDirectorFilled = { ent-ClothingBackpackMessengerScience }
- .desc = { ent-ClothingBackpackMessengerScience.desc }
+ .desc = { ent-ClothingBackpackMessengerScience.desc }
ent-ClothingBackpackMessengerHOPFilled = { ent-ClothingBackpackMessenger }
- .desc = { ent-ClothingBackpackMessenger.desc }
+ .desc = { ent-ClothingBackpackMessenger.desc }
ent-ClothingBackpackMessengerCMOFilled = { ent-ClothingBackpackMessengerMedical }
- .desc = { ent-ClothingBackpackMessengerMedical.desc }
+ .desc = { ent-ClothingBackpackMessengerMedical.desc }
ent-ClothingBackpackMessengerQuartermasterFilled = { ent-ClothingBackpackMessengerCargo }
- .desc = { ent-ClothingBackpackMessengerCargo.desc }
-ent-ClothingBackpackMessengerHOSFilled = { ent-ClothingBackpackMessengerSecurity }
- .desc = { ent-ClothingBackpackMessengerSecurity.desc }
+ .desc = { ent-ClothingBackpackMessengerCargo.desc }
ent-ClothingBackpackMessengerEngineeringFilled = { ent-ClothingBackpackMessengerEngineering }
- .desc = { ent-ClothingBackpackMessengerEngineering.desc }
+ .desc = { ent-ClothingBackpackMessengerEngineering.desc }
ent-ClothingBackpackMessengerAtmosphericsFilled = { ent-ClothingBackpackMessengerAtmospherics }
- .desc = { ent-ClothingBackpackMessengerAtmospherics.desc }
+ .desc = { ent-ClothingBackpackMessengerAtmospherics.desc }
ent-ClothingBackpackMessengerScienceFilled = { ent-ClothingBackpackMessengerScience }
- .desc = { ent-ClothingBackpackMessengerScience.desc }
+ .desc = { ent-ClothingBackpackMessengerScience.desc }
ent-ClothingBackpackMessengerHydroponicsFilled = { ent-ClothingBackpackMessengerHydroponics }
- .desc = { ent-ClothingBackpackMessengerHydroponics.desc }
+ .desc = { ent-ClothingBackpackMessengerHydroponics.desc }
ent-ClothingBackpackMessengerMimeFilled = { ent-ClothingBackpackMessengerMime }
- .desc = { ent-ClothingBackpackMessengerMime.desc }
+ .desc = { ent-ClothingBackpackMessengerMime.desc }
ent-ClothingBackpackMessengerChemistryFilled = { ent-ClothingBackpackMessengerChemistry }
- .desc = { ent-ClothingBackpackMessengerChemistry.desc }
+ .desc = { ent-ClothingBackpackMessengerChemistry.desc }
ent-ClothingBackpackMessengerChaplainFilled = { ent-ClothingBackpackMessenger }
- .desc = { ent-ClothingBackpackMessenger.desc }
+ .desc = { ent-ClothingBackpackMessenger.desc }
ent-ClothingBackpackMessengerMusicianFilled = { ent-ClothingBackpackMessenger }
.desc = { ent-ClothingBackpackMessenger.desc }
ent-ClothingBackpackMessengerLibrarianFilled = { ent-ClothingBackpackMessenger }
- .desc = { ent-ClothingBackpackMessenger.desc }
-ent-ClothingBackpackMessengerDetectiveFilled = { ent-ClothingBackpackMessenger }
- .desc = { ent-ClothingBackpackMessenger.desc }
+ .desc = { ent-ClothingBackpackMessenger.desc }
ent-ClothingBackpackMessengerCargoFilled = { ent-ClothingBackpackMessengerCargo }
- .desc = { ent-ClothingBackpackMessengerCargo.desc }
+ .desc = { ent-ClothingBackpackMessengerCargo.desc }
ent-ClothingBackpackMessengerSalvageFilled = { ent-ClothingBackpackMessengerSalvage }
- .desc = { ent-ClothingBackpackMessengerSalvage.desc }
-ent-ClothingBackpackMessengerBrigmedicFilled = { ent-ClothingBackpackMessengerBrigmedic }
- .desc = { ent-ClothingBackpackMessengerBrigmedic.desc }
+ .desc = { ent-ClothingBackpackMessengerSalvage.desc }
ent-ClothingBackpackMessengerMercenaryFilled = { ent-ClothingBackpackMessengerMercenary }
- .desc = { ent-ClothingBackpackMessengerMercenary.desc }
-ent-ClothingBackpackMessengerReporterFilled = { ent-ClothingBackpackMessenger }
- .desc = { ent-ClothingBackpackMessenger.desc }
-ent-ClothingBackpackMessengerPsychologistFilled = { ent-ClothingBackpackMessengerMedical }
- .desc = { ent-ClothingBackpackMessengerMedical.desc }
+ .desc = { ent-ClothingBackpackMessengerMercenary.desc }
ent-ClothingBackpackMessengerLawyerFilled = { ent-ClothingBackpackMessenger }
- .desc = { ent-ClothingBackpackMessenger.desc }
-ent-ClothingBackpackMessengerStcFilled = { ent-ClothingBackpackMessenger }
- .desc = { ent-ClothingBackpackMessenger.desc }
+ .desc = { ent-ClothingBackpackMessenger.desc }
ent-ClothingBackpackMessengerPilotFilled = { ent-ClothingBackpackMessengerPilot }
- .desc = { ent-ClothingBackpackMessengerPilot.desc }
+ .desc = { ent-ClothingBackpackMessengerPilot.desc }
ent-ClothingBackpackMessengerJanitorFilled = { ent-ClothingBackpackMessengerJanitor }
- .desc = { ent-ClothingBackpackMessengerJanitor.desc }
-ent-ClothingBackpackMessengerMailmanFilled = { ent-ClothingBackpackMessengerMailman }
- .desc = { ent-ClothingBackpackMessengerMailman.desc }
-ent-ClothingBackpackMessengerOfficerFilled = { ent-ClothingBackpackMessengerSecurity }
- .desc = { ent-ClothingBackpackMessengerSecurity.desc }
\ No newline at end of file
+ .desc = { ent-ClothingBackpackMessengerJanitor.desc }
+ent-ClothingBackpackMessengerMailCarrierFilled = { ent-ClothingBackpackMessengerMailCarrier }
+ .desc = { ent-ClothingBackpackMessengerMailCarrier.desc }
+ent-ClothingBackpackMessengerSrFilled = { ent-ClothingBackpackMessenger }
+ .desc = { ent-ClothingBackpackMessenger.desc }
+ent-ClothingBackpackMessengerNfsdBrownFilled = { ent-ClothingBackpackMessengerNfsdBrown }
+ .desc = { ent-ClothingBackpackMessengerNfsdBrown.desc }
+ent-ClothingBackpackMessengerNfsdCreamFilled = { ent-ClothingBackpackMessengerNfsdCream }
+ .desc = { ent-ClothingBackpackMessengerNfsdCream.desc }
+ent-ClothingBackpackMessengerNfsdBrownDetectiveFilled = { ent-ClothingBackpackMessengerNfsdBrown }
+ .desc = { ent-ClothingBackpackMessengerNfsdBrown.desc }
+ent-ClothingBackpackMessengerNfsdBrownRadioFilled = { ent-ClothingBackpackMessengerNfsdBrown }
+ .desc = { ent-ClothingBackpackMessengerNfsdBrown.desc }
+ent-ClothingBackpackMessengerNfsdBrownSheriffFilled = { ent-ClothingBackpackMessengerNfsdBrown }
+ .desc = { ent-ClothingBackpackMessengerNfsdBrown.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/satchel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/satchel.ftl
index 9ab46db6e99..6cded5e9177 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/satchel.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/satchel.ftl
@@ -1,14 +1,16 @@
ent-ClothingBackpackSatchelMercenaryFilled = { ent-ClothingBackpackSatchelMercenary }
- .desc = { ent-ClothingBackpackSatchelMercenary.desc }
-ent-ClothingBackpackSatchelReporterFilled = { ent-ClothingBackpackSatchel }
- .desc = { ent-ClothingBackpackSatchel.desc }
-ent-ClothingBackpackSatchelPsychologistFilled = { ent-ClothingBackpackSatchelMedical }
- .desc = { ent-ClothingBackpackSatchelMedical.desc }
-ent-ClothingBackpackSatchelLawyerFilled = { ent-ClothingBackpackSatchel }
- .desc = { ent-ClothingBackpackSatchel.desc }
-ent-ClothingBackpackSatchelStcFilled = { ent-ClothingBackpackSatchel }
- .desc = { ent-ClothingBackpackSatchel.desc }
+ .desc = { ent-ClothingBackpackSatchelMercenary.desc }
ent-ClothingBackpackSatchelPilotFilled = { ent-ClothingBackpackSatchelPilot }
- .desc = { ent-ClothingBackpackSatchelPilot.desc }
-ent-ClothingBackpackSatchelOfficerFilled = { ent-ClothingBackpackSatchelnfsd }
- .desc = { ent-ClothingBackpackSatchelnfsd.desc }
+ .desc = { ent-ClothingBackpackSatchelPilot.desc }
+ent-ClothingBackpackSatchelSrFilled = { ent-ClothingBackpackSatchel }
+ .desc = { ent-ClothingBackpackSatchel.desc }
+ent-ClothingBackpackSatchelNfsdBrownFilled = { ent-ClothingBackpackSatchelNfsdBrown }
+ .desc = { ent-ClothingBackpackSatchelNfsdBrown.desc }
+ent-ClothingBackpackSatchelNfsdCreamFilled = { ent-ClothingBackpackSatchelNfsdBrownFilled }
+ .desc = { ent-ClothingBackpackSatchelNfsdBrownFilled.desc }
+ent-ClothingBackpackSatchelNfsdBrownDetectiveFilled = { ent-ClothingBackpackSatchelNfsdBrown }
+ .desc = { ent-ClothingBackpackSatchelNfsdBrown.desc }
+ent-ClothingBackpackSatchelNfsdBrownRadioFilled = { ent-ClothingBackpackSatchelNfsdBrown }
+ .desc = { ent-ClothingBackpackSatchelNfsdBrown.desc }
+ent-ClothingBackpackSatchelNfsdBrownSheriffFilled = { ent-ClothingBackpackSatchelNfsdBrown }
+ .desc = { ent-ClothingBackpackSatchelNfsdBrown.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/emergency.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/emergency.ftl
new file mode 100644
index 00000000000..ba8253eead1
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/emergency.ftl
@@ -0,0 +1,3 @@
+ent-BoxSurvivalNfsd = survival box
+ .desc = It's a box with basic internals inside. This one is labelled to contain an double extended-capacity tank.
+ .suffix = NFSD
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/general.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/general.ftl
index a7b83eb1f61..aa294be0019 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/general.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/general.ftl
@@ -10,5 +10,5 @@ ent-MysteryFigureBoxBulk = mystery spacemen minifigure bulk box
.desc = A box containing six mystery minifigure boxes.
ent-BoxT3SuperCapacitor = Thruster upgrade kit
.desc = A box of super capacitors.
-ent-BoxEncryptionKeyNFSD = nfsd encryption key box
- .desc = { ent-BoxEncryptionKeyPassenger.desc }
+ent-BoxEncryptionKeyNfsd = nfsd encryption key box
+ .desc = { ent-BoxEncryptionKeySecurity.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/nfsd.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/nfsd.ftl
new file mode 100644
index 00000000000..793c58f7dc3
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/nfsd.ftl
@@ -0,0 +1,20 @@
+ent-BoxBundleNfsd = box of nfsd items
+ .desc = A box full of nfsd items.
+ent-BoxExplosiveGrenades = box of explosive grenades
+ .desc = A box full of explosive grenades.
+ent-BoxIncendiaryGrenades = box of incendiary grenades
+ .desc = A box full of incendiary grenades.
+ent-BoxShrapnelGrenades = box of shrapnel grenades
+ .desc = A box full of shrapnel grenades.
+ent-BoxSmokeGrenades = box of smoke grenades
+ .desc = A box full of smoke grenades.
+ent-BoxTeargasGrenades = box of tear gas grenades
+ .desc = A box full of tear gas grenades.
+ent-BoxEMPGrenades = { ent-BoxBundleNfsd }
+ .desc = A box full of EMP grenades.
+ent-BoxFlashBangGrenades = box of flashbang grenades
+ .desc = A box full of flashbang grenades.
+ent-BoxStingerGrenades = box of stinger grenades
+ .desc = A box full of stinger grenades.
+ent-BoxBreachingCharges = box of breaching charges grenades
+ .desc = A box full of breaching charges.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/armory.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/armory.ftl
new file mode 100644
index 00000000000..d8dead7bb1f
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/armory.ftl
@@ -0,0 +1,10 @@
+ent-CrateArmorySMGExpedition = SMG crate
+ .desc = Contains two high-powered, SMGs with four mags. Requires Armory access to open. Unregistered.
+ent-CrateArmoryShotgunExpedition = shotgun crate
+ .desc = For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open. Unregistered.
+ent-CrateArmoryLaserExpedition = lasers crate
+ .desc = Contains three standard-issue laser carbines. Requires Armory access to open. Unregistered.
+ent-CrateArmoryEnergyGunExpedition = energy guns crate
+ .desc = Contains three energy guns. Requires Armory access to open. Unregistered.
+ent-CrateArmoryPistolsExpedition = pistols crate
+ .desc = Contains two standard NT pistols with four mags. Requires Armory access to open. Unregistered.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/chemistry.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/chemistry.ftl
index 74499cd6e96..a30d375f5c1 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/chemistry.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/chemistry.ftl
@@ -1,2 +1,2 @@
-ent-CrateSpaceCleaner = { ent-CrateGenericSteel }
- .desc = { ent-CrateGenericSteel.desc }
+ent-CrateSpaceCleaner = bulk space cleaner crate
+ .desc = For a large mess.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/engines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/engines.ftl
index 49350dddeb3..0e7f0cca014 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/engines.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/engines.ftl
@@ -1,8 +1,4 @@
-ent-CrateGyroscope = { ent-CrateEngineering }
+ent-CrateEngineeringSmallThruster = small thruster crate
.desc = { ent-CrateEngineering.desc }
-ent-CrateThruster = { ent-CrateEngineering }
- .desc = { ent-CrateEngineering.desc }
-ent-CrateSmallGyroscope = { ent-CrateEngineering }
- .desc = { ent-CrateEngineering.desc }
-ent-CrateSmallThruster = { ent-CrateEngineering }
+ent-CrateEngineeringSmallGyroscope = small gyroscope crate
.desc = { ent-CrateEngineering.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/fun.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/fun.ftl
index 478e3a3aa9e..d76a380800d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/fun.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/fun.ftl
@@ -1,2 +1,4 @@
-ent-CrateFloorsFun = { ent-CrateGenericSteel }
- .desc = { ent-CrateGenericSteel.desc }
+ent-CrateFloorsFun = fun floors tiles crate
+ .desc = A crate full of 30 random tiles, used for decoration.
+ent-CrateFunHoverbikeNF = hoverbike crate
+ .desc = Harder, better, faster, stronger? No, just faster, faster, faster.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/materials.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/materials.ftl
index 559fc5e2294..539c8436b23 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/materials.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/materials.ftl
@@ -1,2 +1,2 @@
-ent-CrateMaterials = { ent-CrateGenericSteel }
- .desc = { ent-CrateGenericSteel.desc }
+ent-CrateMaterials = materials crate
+ .desc = 1 stack of glass, plastic, steel, plasma and plasteel.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsd.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsd.ftl
index 13b2c1e7091..a77d322d522 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsd.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsd.ftl
@@ -1,16 +1,16 @@
-ent-CrateNFSDArmor = nfsd armor crate
+ent-CrateNfsdArmor = nfsd armor crate
.desc = Three vests of well-rounded, decently-protective armor. Requires Security access to open.
-ent-CrateNFSDHelmet = nfsd helmet crate
+ent-CrateNfsdHelmet = nfsd helmet crate
.desc = Contains three standard-issue brain buckets. Requires Security access to open.
-ent-CrateNFSDNonlethal = nfsd nonlethals crate
+ent-CrateNfsdNonlethal = nfsd nonlethals crate
.desc = Disabler weapons. Requires Security access to open.
-ent-CrateNFSDRiot = nfsd swat crate
+ent-CrateNfsdRiot = nfsd swat crate
.desc = Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open.
-ent-CrateNFSDSupplies = nfsd supplies crate
+ent-CrateNfsdSupplies = nfsd supplies crate
.desc = Contains various supplies for the station's Security team. Requires Security access to open.
-ent-CrateNFSDRestraints = nfsd restraints crate
+ent-CrateNfsdRestraints = nfsd restraints crate
.desc = Contains two boxes each of handcuffs and zipties. Requires Security access to open.
-ent-CrateNFSDBioSuit = nfsd bio suit crate
+ent-CrateNfsdBioSuit = nfsd bio suit crate
.desc = Contains 2 biohazard suits to ensure that no disease will distract you from your duties. Requires Security access to open.
-ent-CrateNFSDImplants = nfsd implanter crate
+ent-CrateNfsdImplants = nfsd implanter crate
.desc = Contains 4 MindShield implants and 4 tracking implant. Requires Security access to open.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsdarmory.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsdarmory.ftl
index 09d19df8e54..e2e2e795eb3 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsdarmory.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsdarmory.ftl
@@ -1,12 +1,14 @@
-ent-CrateArmorySMGNFSD = nfsd SMG crate
+ent-CrateArmorySMGNfsd = nfsd SMG crate
.desc = Contains two high-powered, semiautomatic rifles with four mags. Requires Armory access to open.
-ent-CrateArmoryShotgunNFSD = nfsd shotgun crate
+ent-CrateArmoryShotgunNfsd = nfsd shotgun crate
.desc = For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open.
-ent-CrateTrackingImplantsNFSD = nfsd tracking implants
+ent-CrateTrackingImplantsNfsd = nfsd tracking implants
.desc = Contains a handful of tracking implanters. Good for prisoners you'd like to release but still keep track of.
-ent-CrateTrainingBombsNFSD = nfsd training bombs
+ent-CrateTrainingBombsNfsd = nfsd training bombs
.desc = Contains three low-yield training bombs for security to learn defusal and safe ordnance disposal, EOD suit not included. Requires Armory access to open.
-ent-CrateArmoryLaserNFSD = nfsd lasers crate
+ent-CrateArmoryLaserNfsd = nfsd lasers crate
.desc = Contains three standard-issue laser rifles. Requires Armory access to open.
-ent-CrateArmoryPistolsNFSD = nfsd pistols crate
+ent-CrateArmoryPistolsNfsd = nfsd pistols crate
.desc = Contains two standard NT pistols with four mags. Requires Armory access to open.
+ent-CrateArmoryLethalNfsd = nfsd lethal armory crate
+ .desc = Contains a standard armory stock kit.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/npc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/npc.ftl
index 312353640a0..45dc830b4b4 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/npc.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/npc.ftl
@@ -1,5 +1,9 @@
-ent-CrateNPCEmotionalSupport = Emotional support pet crate
- .desc = { ent-CrateLivestock.desc }
-ent-CrateNPCEmotionalSupportSafe = Emotional support pet crate
+ent-CrateNPCEmotionalSupport = emotional support pet crate
+ .desc = A crate containing a single emotional support pet.
+ent-FillNPCEmotionalSupportSafe = { "" }
.suffix = Safe
- .desc = { ent-CrateLivestock.desc }
+ .desc = { "" }
+ent-CrateNPCEmotionalSupportSafe = { ent-CrateNPCEmotionalSupport }
+ .desc = { ent-CrateNPCEmotionalSupport.desc }
+ent-PetCarrierNPCEmotionalSupportSafe = emotional support pet in a pet carrier
+ .desc = { ent-PetCarrier.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/science.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/science.ftl
index d5aa7955ab8..a5ce5ad007c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/science.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/science.ftl
@@ -1,2 +1,2 @@
-ent-CrateScienceLabBundle = { ent-CrateScienceSecure }
- .desc = { ent-CrateScienceSecure.desc }
+ent-CrateScienceLabBundle = scientist lab kit
+ .desc = Contains a full kit to build your very own science lab.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/service.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/service.ftl
index 4fafb4939d9..0c2a4b9e793 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/service.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/service.ftl
@@ -1,4 +1,4 @@
-ent-CrateServiceJanitorialSupplies2 = { ent-CratePlastic }
- .desc = { ent-CratePlastic.desc }
-ent-CrateVehicleJanicart = { ent-CrateLivestock }
- .desc = { ent-CrateLivestock.desc }
+ent-CrateServiceJanitorialSupplies2 = janitorial supplies crate B
+ .desc = Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains two trash bag boxes, one box of wet floor signs and 2 spray cleaners.
+ent-CrateVehicleJanicart = janicart crate
+ .desc = The janitor's trusty steed.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/syndicate.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/syndicate.ftl
index 7cdceb83b42..b021100e3d7 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/syndicate.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/syndicate.ftl
@@ -1,2 +1,2 @@
-ent-CrateSyndicateLightSurplusBundle = { ent-CrateSyndicate }
- .desc = { ent-CrateSyndicate.desc }
+ent-CrateSyndicateLightSurplusBundle = Syndicate light surplus crate
+ .desc = Contains 20 telecrystals worth of completely random Syndicate items. It can be useless junk or really good.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/trade.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/trade.ftl
index aca4a654d37..158cca41115 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/trade.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/trade.ftl
@@ -1,7 +1,7 @@
-ent-CrateTradeSecureNormalFilled = { ent-CrateTradeBaseSecureNormal }
- .desc = { ent-CrateTradeBaseSecureNormal.desc }
-ent-CrateTradeSecureHighFilled = { ent-CrateTradeBaseSecureHigh }
- .desc = { ent-CrateTradeBaseSecureHigh.desc }
+ent-CrateTradeSecureNormalFilled = cargo trading crate
+ .desc = Contains goods made in the Frontier sector, ready to be sold on a cargo depot for higher value. MAKE SURE THE CRATE IS INTACT.
+ent-CrateTradeSecureHighFilled = high value cargo trading crate
+ .desc = Contains high value goods made in the Frontier sector, ready to be sold on a cargo depot for higher value. MAKE SURE THE CRATE IS INTACT.
ent-CrateTradeContrabandSecureNormalFilled = { ent-CrateTradeContrabandSecureNormal }
.desc = { ent-CrateTradeContrabandSecureNormal.desc }
ent-CrateTradeContrabandSecureDonkFilled = { ent-CrateTradeContrabandSecureDonk }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/vending.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/vending.ftl
index 4c786beb044..e432f0d0619 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/vending.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/vending.ftl
@@ -1,14 +1,14 @@
-ent-CrateVendingMachineRestockAstroVendFilled = { ent-CratePlasticBiodegradable }
- .desc = { ent-CratePlasticBiodegradable.desc }
-ent-CrateVendingMachineRestockAmmoFilled = { ent-CratePlasticBiodegradable }
- .desc = { ent-CratePlasticBiodegradable.desc }
-ent-CrateVendingMachineRestockFlatpackVendFilled = { ent-CratePlasticBiodegradable }
- .desc = { ent-CratePlasticBiodegradable.desc }
-ent-CrateVendingMachineRestockCuddlyCritterVendFilled = { ent-CratePlasticBiodegradable }
- .desc = { ent-CratePlasticBiodegradable.desc }
-ent-CrateVendingMachineRestockLessLethalVendFilled = { ent-CratePlasticBiodegradable }
- .desc = { ent-CratePlasticBiodegradable.desc }
-ent-CrateVendingMachineRestockAutoTuneVendFilled = { ent-CratePlasticBiodegradable }
- .desc = { ent-CratePlasticBiodegradable.desc }
-ent-CrateVendingMachineRestockPottedPlantVendFilled = { ent-CratePlasticBiodegradable }
- .desc = { ent-CratePlasticBiodegradable.desc }
+ent-CrateVendingMachineRestockAstroVendFilled = AstroVend restock crate
+ .desc = Contains two restock boxes for the AstroVend vending machine.
+ent-CrateVendingMachineRestockAmmoFilled = Liberation restock crate
+ .desc = Contains two restock boxes for the Liberation vending machine.
+ent-CrateVendingMachineRestockFlatpackVendFilled = FlatpackVend restock crate
+ .desc = Contains two restock boxes for a FlatpackVend vending machine.
+ent-CrateVendingMachineRestockCuddlyCritterVendFilled = CuddlyCritterVend restock crate
+ .desc = Contains two restock boxes for a CuddlyCritterVend vending machine.
+ent-CrateVendingMachineRestockLessLethalVendFilled = LessLethalVend restock crate
+ .desc = Contains two restock boxes for the LessLethalVend vending machine.
+ent-CrateVendingMachineRestockAutoTuneVendFilled = AutoTuneVend restock crate
+ .desc = Contains two restock boxes for the AutoTuneVend vending machine.
+ent-CrateVendingMachineRestockPottedPlantVendFilled = Plant-O-Matic restock crate
+ .desc = Contains two restock boxes for the Plant-O-Matic vending machine.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/belt.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/belt.ftl
index 67bc6be38dc..e4ce9fe0df8 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/belt.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/belt.ftl
@@ -9,3 +9,9 @@ ent-ClothingBeltNfsdWebbingFilledBrigmedic = { ent-ClothingBeltNfsdWebbing }
ent-ClothingBeltNfsdWebbingFilled = { ent-ClothingBeltNfsdWebbing }
.suffix = Filled
.desc = { ent-ClothingBeltNfsdWebbing.desc }
+ent-ClothingBeltSalvageWebbingFilledNF = { ent-ClothingBeltSalvageWebbing }
+ .suffix = Filled
+ .desc = { ent-ClothingBeltSalvageWebbing.desc }
+ent-ClothingBeltChaplainSashFilled = { ent-ClothingBeltChaplainSash }
+ .suffix = Filled
+ .desc = { ent-ClothingBeltChaplainSash.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/misc.ftl
index 540394addfb..0504811087b 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/misc.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/misc.ftl
@@ -1,8 +1,14 @@
ent-ClothingShoesBootsMagCombatFilled = { ent-ClothingShoesBootsMagCombat }
- .desc = { ent-lothingShoesBootsMagCombat.desc }
+ .desc = { ent-ClothingShoesBootsMagCombat.desc }
ent-ClothingShoesBootsMagNfsdFilled = { ent-ClothingShoesBootsMagNfsd }
.desc = { ent-ClothingShoesBootsMagNfsd.desc }
ent-ClothingShoesBootsMagPirateFilled = { ent-ClothingShoesBootsMagPirate }
.desc = { ent-ClothingShoesBootsMagPirate.desc }
ent-ClothingShoesBootsMagMercenaryFilled = { ent-ClothingShoesBootsMagMercenary }
- .desc = { ent-ClothingShoesBootsMagMercenary.desc }
\ No newline at end of file
+ .desc = { ent-ClothingShoesBootsMagMercenary.desc }
+ent-ClothingShoesBootsNfsdBrownFilled = { ent-ClothingShoesBootsNfsdBrown }
+ .desc = { ent-ClothingShoesBootsNfsdBrown.desc }
+ent-ClothingShoesBootsNfsdCreamFilled = { ent-ClothingShoesBootsNfsdCream }
+ .desc = { ent-ClothingShoesBootsNfsdCream.desc }
+ent-ChaplainHolywaterBottleFilled = holy water bottle
+ .desc = Blessed be this holy water by the deity of your choosing.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/weapon_cases_expedition.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/weapon_cases_expedition.ftl
new file mode 100644
index 00000000000..793b316c583
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/weapon_cases_expedition.ftl
@@ -0,0 +1,69 @@
+ent-WeaponCaseShortMk58Expedition = { ent-WeaponCaseShort }
+ .suffix = Dungeon, Mk58
+ .desc = { ent-WeaponCaseShort.desc }
+ent-WeaponCaseShortN1984Expedition = { ent-WeaponCaseShort }
+ .suffix = Dungeon, N1984
+ .desc = { ent-WeaponCaseShort.desc }
+ent-WeaponCaseShortDeckardExpedition = { ent-WeaponCaseShort }
+ .suffix = Dungeon, Deckard
+ .desc = { ent-WeaponCaseShort.desc }
+ent-WeaponCaseLongKammererExpedition = { ent-WeaponCaseLong }
+ .suffix = Dungeon, Kammerer
+ .desc = { ent-WeaponCaseLong.desc }
+ent-WeaponCaseLongWT550Expedition = { ent-WeaponCaseLong }
+ .suffix = Dungeon, SMG, WT550
+ .desc = { ent-WeaponCaseLong.desc }
+ent-WeaponCaseLongAtreidesExpedition = { ent-WeaponCaseLong }
+ .suffix = Dungeon, SMG, Atreides
+ .desc = { ent-WeaponCaseLong.desc }
+ent-WeaponCaseLongDrozdExpedition = { ent-WeaponCaseLong }
+ .suffix = Dungeon, SMG, Drozd
+ .desc = { ent-WeaponCaseLong.desc }
+ent-WeaponCaseLongLecterExpedition = { ent-WeaponCaseLong }
+ .suffix = Dungeon, Lecter
+ .desc = { ent-WeaponCaseLong.desc }
+ent-WeaponCaseLongAkExpedition = { ent-WeaponCaseLong }
+ .suffix = Dungeon, AKMS
+ .desc = { ent-WeaponCaseLong.desc }
+ent-WeaponCaseLongM90Expedition = { ent-WeaponCaseLong }
+ .suffix = Dungeon, M90
+ .desc = { ent-WeaponCaseLong.desc }
+ent-WeaponCaseShortLaserGunExpedition = { ent-WeaponCaseShort }
+ .suffix = Dungeon, Retro Laser
+ .desc = { ent-WeaponCaseShort.desc }
+ent-WeaponCaseShortSvalinnExpedition = { ent-WeaponCaseShort }
+ .suffix = Dungeon, Svalinn
+ .desc = { ent-WeaponCaseShort.desc }
+ent-WeaponCaseLongLaserCarbineExpedition = { ent-WeaponCaseLong }
+ .suffix = Dungeon, Laser Carbine
+ .desc = { ent-WeaponCaseLong.desc }
+ent-WeaponCaseLongEnergyGunExpedition = { ent-WeaponCaseLong }
+ .suffix = Dungeon, Energy Gun
+ .desc = { ent-WeaponCaseLong.desc }
+ent-WeaponCaseShortAdvancedLaserExpedition = { ent-WeaponCaseShort }
+ .suffix = Dungeon, Advanced Laser
+ .desc = { ent-WeaponCaseShort.desc }
+ent-WeaponCaseLongHristovExpedition = { ent-WeaponCaseLong }
+ .suffix = Dungeon, Hristov
+ .desc = { ent-WeaponCaseLong.desc }
+ent-WeaponCaseLongRepeaterExpedition = { ent-WeaponCaseLong }
+ .suffix = Dungeon, Repeater
+ .desc = { ent-WeaponCaseLong.desc }
+ent-WeaponCaseLongLauncherRocketExpedition = { ent-WeaponCaseLong }
+ .suffix = Dungeon, RPG
+ .desc = { ent-WeaponCaseLong.desc }
+ent-WeaponCaseShortEnergyShieldExpedition = { ent-WeaponCaseShort }
+ .suffix = Dungeon, Energy Shield
+ .desc = { ent-WeaponCaseShort.desc }
+ent-WeaponCaseShortEnergySwordExpedition = { ent-WeaponCaseShort }
+ .suffix = Dungeon, Energy Sword
+ .desc = { ent-WeaponCaseShort.desc }
+ent-WeaponCaseShortEnergyDaggerExpedition = { ent-WeaponCaseShort }
+ .suffix = Dungeon, Energy Dagger
+ .desc = { ent-WeaponCaseShort.desc }
+ent-WeaponCaseShortEnergyCutlassExpedition = { ent-WeaponCaseShort }
+ .suffix = Dungeon, Energy Cutlass
+ .desc = { ent-WeaponCaseShort.desc }
+ent-WeaponCaseShortEnergySwordDoubleExpedition = { ent-WeaponCaseShort }
+ .suffix = Dungeon, Energy Sword Double
+ .desc = { ent-WeaponCaseShort.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/weapon_cases_shuttle_guns.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/weapon_cases_shuttle_guns.ftl
new file mode 100644
index 00000000000..64e992a59a4
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/weapon_cases_shuttle_guns.ftl
@@ -0,0 +1,30 @@
+ent-WeaponCaseLongShuttle = { ent-WeaponCaseLong }
+ .suffix = Shuttle Guns
+ .desc = { ent-WeaponCaseLong.desc }
+ent-WeaponCaseShortShuttle = { ent-WeaponCaseShort }
+ .suffix = Shuttle Guns
+ .desc = { ent-WeaponCaseShort.desc }
+ent-ShuttleWeaponLaserGun = { ent-WeaponCaseShortShuttle }
+ .desc = { ent-WeaponCaseShortShuttle.desc }
+ent-ShuttleWeaponDisabler = { ent-WeaponCaseShortShuttle }
+ .desc = { ent-WeaponCaseShortShuttle.desc }
+ent-ShuttleWeaponRevolverArgenti = { ent-WeaponCaseShortShuttle }
+ .desc = { ent-WeaponCaseShortShuttle.desc }
+ent-ShuttleWeaponSniperMosin = { ent-WeaponCaseLongShuttle }
+ .desc = { ent-WeaponCaseLongShuttle.desc }
+ent-ShuttleWeaponPistolMk58 = { ent-WeaponCaseShortShuttle }
+ .desc = { ent-WeaponCaseShortShuttle.desc }
+ent-ShuttleWeaponRevolverDeckard = { ent-WeaponCaseShortShuttle }
+ .desc = { ent-WeaponCaseShortShuttle.desc }
+ent-ShuttleWeaponShotgunDoubleBarreled = { ent-WeaponCaseLongShuttle }
+ .desc = { ent-WeaponCaseLongShuttle.desc }
+ent-ShuttleWeaponShotgunSawn = { ent-WeaponCaseShortShuttle }
+ .desc = { ent-WeaponCaseShortShuttle.desc }
+ent-ShuttleWeaponShotgunSawnNonlethal = { ent-WeaponCaseShortShuttle }
+ .desc = { ent-WeaponCaseShortShuttle.desc }
+ent-ShuttleWeaponEnergyGun = { ent-WeaponCaseLongShuttle }
+ .desc = { ent-WeaponCaseLongShuttle.desc }
+ent-ShuttleWeaponShotgunKammerer = { ent-WeaponCaseLongShuttle }
+ .desc = { ent-WeaponCaseLongShuttle.desc }
+ent-ShuttleWeaponShotgunKammererNonlethal = { ent-WeaponCaseLongShuttle }
+ .desc = { ent-WeaponCaseLongShuttle.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/dressers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/dressers.ftl
new file mode 100644
index 00000000000..298442f9a70
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/dressers.ftl
@@ -0,0 +1,3 @@
+ent-DresserStationRepresentativeFilled = { ent-Dresser }
+ .suffix = Filled, Station Representative
+ .desc = { ent-Dresser.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/heads.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/heads.ftl
index a72daf75150..32b2851d72c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/heads.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/heads.ftl
@@ -1,3 +1,6 @@
ent-LockerQuarterMasterFilledHardsuit = { ent-LockerQuarterMaster }
.suffix = Filled, Hardsuit
.desc = { ent-LockerQuarterMaster.desc }
+ent-LockerStationRepresentativeFilled = { ent-LockerStationRepresentative }
+ .suffix = Filled
+ .desc = { ent-LockerStationRepresentative.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage.ftl
index f990467034d..af4aeb6de84 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage.ftl
@@ -1,15 +1,21 @@
ent-SuitStorageParamedic = { ent-SuitStorageBase }
.suffix = Paramedic
.desc = { ent-SuitStorageBase.desc }
-ent-SuitStorageBrigmedic = { ent-SuitStorageBase }
- .suffix = Brigmedic
+ent-SuitStorageHydro = { ent-SuitStorageBase }
+ .suffix = Hydroponics
.desc = { ent-SuitStorageBase.desc }
ent-SuitStorageQuartermaster = { ent-SuitStorageBase }
.suffix = Quartermaster
.desc = { ent-SuitStorageBase.desc }
+ent-SuitStorageMining = { ent-SuitStorageBase }
+ .suffix = Mining
+ .desc = { ent-SuitStorageBase.desc }
ent-SuitStorageMercenary = { ent-SuitStorageBase }
.suffix = Mercenary
.desc = { ent-SuitStorageBase.desc }
+ent-SuitStorageScaf = { ent-SuitStorageBase }
+ .suffix = SCAF
+ .desc = { ent-SuitStorageBase.desc }
ent-SuitStoragePilot = { ent-SuitStorageBase }
.suffix = Pilot
.desc = { ent-SuitStorageBase.desc }
@@ -17,20 +23,29 @@ ent-SuitStorageClown = { ent-SuitStorageBase }
.suffix = Clown
.desc = { ent-SuitStorageBase.desc }
ent-SuitStorageCadet = { ent-SuitStorageBase }
- .suffix = NFSDCadet
+ .suffix = NFSD Cadet
.desc = { ent-SuitStorageBase.desc }
ent-SuitStorageDeputy = { ent-SuitStorageBase }
- .suffix = NFSDDeputy
+ .suffix = NFSD Deputy
.desc = { ent-SuitStorageBase.desc }
-ent-SuitStorageBrigmed = { ent-SuitStorageBase }
- .suffix = NFSDBrigMedic
+ent-SuitStorageBrigmedic = { ent-SuitStorageBase }
+ .suffix = NFSD Brigmedic
.desc = { ent-SuitStorageBase.desc }
ent-SuitStorageSergeant = { ent-SuitStorageBase }
- .suffix = NFSDSergeant
+ .suffix = NFSD Sergeant
.desc = { ent-SuitStorageBase.desc }
ent-SuitStorageBailiff = { ent-SuitStorageBase }
- .suffix = NFSDBailiff
+ .suffix = NFSD Bailiff
.desc = { ent-SuitStorageBase.desc }
ent-SuitStorageSheriff = { ent-SuitStorageBase }
- .suffix = NFSDSheriff
+ .suffix = NFSD Sheriff
+ .desc = { ent-SuitStorageBase.desc }
+ent-SuitStorageNfsdCombat = { ent-SuitStorageBase }
+ .suffix = NFSD Combat
+ .desc = { ent-SuitStorageBase.desc }
+ent-SuitStorageNfsdCommand = { ent-SuitStorageBase }
+ .suffix = NFSD Command
+ .desc = { ent-SuitStorageBase.desc }
+ent-SuitStorageMailCarrier = { ent-SuitStorageBase }
+ .suffix = Mail Carrier
.desc = { ent-SuitStorageBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage_wallmount.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage_wallmount.ftl
index f816a86d9ec..d0a76dbbfc7 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage_wallmount.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage_wallmount.ftl
@@ -1,11 +1,15 @@
ent-SuitStorageWallmountParamedic = { ent-SuitStorageParamedic }
.desc = { ent-SuitStorageParamedic.desc }
-ent-SuitStorageWallmountBrigmedic = { ent-SuitStorageBrigmedic }
- .desc = { ent-SuitStorageBrigmedic.desc }
+ent-SuitStorageWallmountHydro = { ent-SuitStorageHydro }
+ .desc = { ent-SuitStorageHydro.desc }
ent-SuitStorageWallmountQuartermaster = { ent-SuitStorageQuartermaster }
.desc = { ent-SuitStorageQuartermaster.desc }
+ent-SuitStorageWallmountMining = { ent-SuitStorageMining }
+ .desc = { ent-SuitStorageMining.desc }
ent-SuitStorageWallmountMercenary = { ent-SuitStorageMercenary }
.desc = { ent-SuitStorageMercenary.desc }
+ent-SuitStorageWallmountScaf = { ent-SuitStorageScaf }
+ .desc = { ent-SuitStorageScaf.desc }
ent-SuitStorageWallmountPilot = { ent-SuitStoragePilot }
.desc = { ent-SuitStoragePilot.desc }
ent-SuitStorageWallmountEVA = { ent-SuitStorageEVA }
@@ -21,7 +25,7 @@ ent-SuitStorageWallmountEVASyndicate = { ent-SuitStorageEVASyndicate }
ent-SuitStorageWallmountEVAPirate = { ent-SuitStorageEVAPirate }
.desc = { ent-SuitStorageEVAPirate.desc }
ent-SuitStorageWallmountNTSRA = { ent-SuitStorageNTSRA }
- .desc = { ent-SuitStorageNTSRA.desc }
+ .desc = { ent-SuitStorageNTSRA.desc }
ent-SuitStorageWallmountBasic = { ent-SuitStorageBasic }
.desc = { ent-SuitStorageBasic.desc }
ent-SuitStorageWallmountEngi = { ent-SuitStorageEngi }
@@ -53,14 +57,20 @@ ent-SuitStorageWallmountWizard = { ent-SuitStorageWizard }
ent-SuitStorageWallmountClown = { ent-SuitStorageClown }
.desc = { ent-SuitStorageClown.desc }
ent-SuitStorageWallmountCadet = { ent-SuitStorageCadet }
- .desc = { ent-SuitStorageCadet.desc }
+ .desc = { ent-SuitStorageCadet.desc }
ent-SuitStorageWallmountDeputy = { ent-SuitStorageDeputy }
- .desc = { ent-SuitStorageDeputy.desc }
-ent-SuitStorageWallmountBrigmed = { ent-SuitStorageBrigmed }
- .desc = { ent-SuitStorageBrigmed.desc }
+ .desc = { ent-SuitStorageDeputy.desc }
+ent-SuitStorageWallmountBrigmedic = { ent-SuitStorageBrigmedic }
+ .desc = { ent-SuitStorageBrigmedic.desc }
ent-SuitStorageWallmountSergeant = { ent-SuitStorageSergeant }
- .desc = { ent-SuitStorageSergeant.desc }
+ .desc = { ent-SuitStorageSergeant.desc }
ent-SuitStorageWallmountBailiff = { ent-SuitStorageBailiff }
- .desc = { ent-SuitStorageBailiff.desc }
+ .desc = { ent-SuitStorageBailiff.desc }
ent-SuitStorageWallmountSheriff = { ent-SuitStorageSheriff }
- .desc = { ent-SuitStorageSheriff.desc }
\ No newline at end of file
+ .desc = { ent-SuitStorageSheriff.desc }
+ent-SuitStorageWallmountNfsdCombat = { ent-SuitStorageNfsdCombat }
+ .desc = { ent-SuitStorageNfsdCombat.desc }
+ent-SuitStorageWallmountNfsdCommand = { ent-SuitStorageNfsdCommand }
+ .desc = { ent-SuitStorageNfsdCommand.desc }
+ent-SuitStorageWallmountMailCarrier = { ent-SuitStorageMailCarrier }
+ .desc = { ent-SuitStorageMailCarrier.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/paper/shipyard/manuals.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/paper/shipyard/manuals.ftl
new file mode 100644
index 00000000000..35bbeec8794
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/paper/shipyard/manuals.ftl
@@ -0,0 +1,2 @@
+ent-ShipyardPioneerInfo = pioneer user manual
+ .desc = preflight checklist
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/backpacks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/backpacks.ftl
index 3781bf1588d..0af3671843a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/backpacks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/backpacks.ftl
@@ -6,18 +6,7 @@ ent-ClothingBackpackERTMailCarrier = ERT mail carrier backpack
.desc = A spacious backpack with lots of pockets, worn by Mail Carrier's of an Emergency Response Team.
ent-ClothingBackpackClippy = Clippy's backpack
.desc = Made from a real Clippy.
-ent-ClothingBackpacknfsdFilled = nfsd backpack
- .desc = A backpack for Deputy Sheriff.
- .suffix = Filled
-ent-ClothingBackpacknfsd = nfsd backpack
- .desc = A backpack for Deputy Sheriff.
-ent-ClothingBackpacknfsdsheriffFilled = nfsd backpack
- .desc = A backpack for the Sheriff.
- .suffix = Filled - Sheriff
-ent-ClothingBackpacknfsdsheriff = nfsd backpack
- .desc = A backpack for the Sheriff.
-ent-ClothingBackpacknfsdBrigmedFilled = nfsd brigmedic backpack
- .desc = A backpack for Deputized Physician.
- .suffix = Filled
-ent-ClothingBackpacknfsdBrigmed = nfsd brigmedic backpack
- .desc = A backpack for Deputized Physician.
+ent-ClothingBackpackNfsdBrown = nfsd backpack
+ .desc = { ent-ClothingBackpackSecurity.desc }
+ent-ClothingBackpackNfsdCream = { ent-ClothingBackpackNfsdBrown }
+ .desc = { ent-ClothingBackpackNfsdBrown.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/duffel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/duffel.ftl
index c4cd291460a..e0fc8d2fb46 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/duffel.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/duffel.ftl
@@ -4,16 +4,7 @@ ent-ClothingBackpackDuffelArcadia = arcadia duffel
.desc = A duffelbag produced by Arcadia Industries
ent-ClothingBackpackDuffelPilot = pilot duffel
.desc = A duffelbag produced for a True Ace.
-ent-ClothingBackpackDuffelnfsdFilled = nfsd duffel
- .desc = A duffelbag produced for a Deputy Sheriff.
- .suffix = Filled
-ent-ClothingBackpackDuffelnfsd = nfsd duffel
- .desc = A duffelbag produced for a Deputy Sheriff.
-ent-ClothingBackpackDuffelnfsdsheriffFilled = nfsd duffel
- .desc = A duffelbag produced for a Deputy Sheriff.
- .suffix = Filled - Sheriff
-ent-ClothingBackpackDuffelnfsdBrigmed = nfsd brigmedic duffel
- .desc = A duffelbag produced for a Deputized Physician.
-ent-ClothingBackpackDuffelnfsdBrigmedFilled = nfsd brigmedic duffel
- .desc = A duffelbag produced for a Deputized Physician.
- .suffix = Filled
+ent-ClothingBackpackDuffelNfsdBrown = nfsd duffel
+ .desc = { ent-ClothingBackpackDuffelSecurity.desc }
+ent-ClothingBackpackDuffelNfsdCream = { ent-ClothingBackpackDuffelNfsdBrown }
+ .desc = { ent-ClothingBackpackDuffelNfsdBrown.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/messenger.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/messenger.ftl
index a302870e3bc..fd07cdd3518 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/messenger.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/messenger.ftl
@@ -16,10 +16,6 @@ ent-ClothingBackpackMessengerGenetics = genetics messenger bag
.desc = A sterile messenger bag with geneticist colours.
ent-ClothingBackpackMessengerScience = science messenger bag
.desc = Useful for holding research materials.
-ent-ClothingBackpackMessengerSecurity = security messenger bag
- .desc = A robust messenger bag for security related needs.
-ent-ClothingBackpackMessengerBrigmedic = brigmedic messenger bag
- .desc = A sterile messenger bag for medical related needs.
ent-ClothingBackpackMessengerCaptain = captain's messenger bag
.desc = An exclusive messenger bag for Nanotrasen officers.
ent-ClothingBackpackMessengerHydroponics = hydroponics messenger bag
@@ -42,3 +38,9 @@ ent-ClothingBackpackMessengerJanitor = janitor messenger bag
.desc = A robust messenger bag for waging war against dirt.
ent-ClothingBackpackMessengerMime = mime messenger bag
.desc = A robust messenger bag for waging war against clowns.
+ent-ClothingBackpackMessengerNfsdBrown = nfsd messenger bag
+ .desc = { ent-ClothingBackpackMessenger.desc }
+ent-ClothingBackpackMessengerNfsdCream = { ent-ClothingBackpackMessenger }
+ .desc = { ent-ClothingBackpackMessenger.desc }
+ent-ClothingBackpackMessengerBloodCult = cultist messenger bag
+ .desc = { ent-ClothingBackpackMessenger.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/satchel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/satchel.ftl
index 4c3656a5aa6..7d37ca25262 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/satchel.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/satchel.ftl
@@ -4,18 +4,7 @@ ent-ClothingBackpackSatchelArcadia = arcadia satchel
.desc = A satchel produced by Arcadia Industries.
ent-ClothingBackpackSatchelPilot = pilot satchel
.desc = A satchel produced for a True Ace.
-ent-ClothingBackpackSatchelnfsdFilled = nfsd satchel
- .desc = A satchel produced for a Deputy Sheriff.
- .suffix = Filled
-ent-ClothingBackpackSatchelnfsd = nfsd satchel
- .desc = A satchel produced for a Deputy Sheriff.
-ent-ClothingBackpackSatchelnfsdsheriffFilled = nfsd satchel
- .desc = A satchel produced for the Sheriff.
- .suffix = Filled - Sheriff
-ent-ClothingBackpackSatchelnfsdsheriff = nfsd satchel
- .desc = A satchel produced for the Sheriff.
-ent-ClothingBackpackSatchelnfsdBrigmedFilled = nfsd brigmedic satchel
- .desc = A satchel produced for a Deputized Physician.
- .suffix = Filled
-ent-ClothingBackpackSatchelnfsdBrigmed = nfsd brigmedic satchel
- .desc = A satchel produced for a Deputized Physician.
+ent-ClothingBackpackSatchelNfsdBrown = nfsd satchel
+ .desc = { ent-ClothingBackpackSatchelSecurity.desc }
+ent-ClothingBackpackSatchelNfsdCream = { ent-ClothingBackpackSatchelNfsdBrown }
+ .desc = { ent-ClothingBackpackSatchelNfsdBrown.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/belt/belts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/belt/belts.ftl
index b2506fe3794..d834d4ca234 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/belt/belts.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/belt/belts.ftl
@@ -8,3 +8,7 @@ ent-ClothingBeltNfsd = nfsd belt
.desc = A tactical assault belt.
ent-ClothingBeltNfsdWebbing = nfsd webbing
.desc = A tactical assault webbing.
+ent-ClothingBeltCultForceField = cult runic belt buckle
+ .desc = { ent-ClothingBeltBase.desc }
+ent-ClothingBeltCultWebbing = cult webbing
+ .desc = A webbing with pockets lined with waterproof (water, huh?) material.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets.ftl
index d116c5303d3..573be781ff4 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets.ftl
@@ -1,19 +1,21 @@
ent-ClothingHeadsetSecuritySafe = { ent-ClothingHeadsetSecurity }
.suffix = Safe
.desc = { ent-ClothingHeadsetSecurity.desc }
-ent-ClothingHeadsetMailCarrier = mail carrier headset
- .desc = A headset used by mail carrier employees.
-ent-ClothingHeadsetNFSD = nfsd headset
+ent-ClothingHeadsetNfsdSafe = nfsd headset
+ .desc = { ent-ClothingHeadsetSecuritySafe.desc }
+ent-ClothingHeadsetNfsd = nfsd headset
.desc = This is used by your elite sheriff's department force.
-ent-ClothingHeadsetNFSDgreen = nfsd headset
- .desc = A headset for deputy sheriff's.
-ent-ClothingHeadsetNFSDbrown = nfsd headset
- .desc = A headset for deputy sheriff's.
-ent-ClothingHeadsetNFSDcb = nfsd headset
- .desc = A headset for deputy sheriff's.
-ent-ClothingHeadsetNFSDgreenSafe = nfsd headset
- .desc = A headset for deputy sheriff's.
-ent-ClothingHeadsetNFSDbrownSafe = nfsd headset
- .desc = A headset for deputy sheriff's.
-ent-ClothingHeadsetNFSDcbSafe = nfsd headset
- .desc = A headset for deputy sheriff's.
+ent-ClothingHeadsetNfsdGreen = { ent-ClothingHeadsetNfsd }
+ .desc = { ent-ClothingHeadsetNfsd.desc }
+ent-ClothingHeadsetNfsdBrown = { ent-ClothingHeadsetNfsd }
+ .desc = { ent-ClothingHeadsetNfsd.desc }
+ent-ClothingHeadsetNfsdCream = { ent-ClothingHeadsetNfsd }
+ .desc = { ent-ClothingHeadsetNfsd.desc }
+ent-ClothingHeadsetNfsdGreenSafe = { ent-ClothingHeadsetNfsdSafe }
+ .desc = { ent-ClothingHeadsetNfsdSafe.desc }
+ent-ClothingHeadsetNfsdBrownSafe = { ent-ClothingHeadsetNfsdSafe }
+ .desc = { ent-ClothingHeadsetNfsdSafe.desc }
+ent-ClothingHeadsetNfsdCreamSafe = { ent-ClothingHeadsetNfsdSafe }
+ .desc = { ent-ClothingHeadsetNfsdSafe.desc }
+ent-ClothingHeadsetNfsdCreamMed = { ent-ClothingHeadsetNfsdCream }
+ .desc = { ent-ClothingHeadsetNfsdCream.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets_alt.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets_alt.ftl
index cfbdb4d60bd..f93c8870a25 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets_alt.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets_alt.ftl
@@ -1,12 +1,10 @@
-ent-ClothingHeadsetAltSecurityWarden = bailiff's over-ear headset
- .desc = { ent-ClothingHeadsetAlt.desc }
ent-ClothingHeadsetAltMercenary = mercenary over-ear headset
.desc = { ent-ClothingHeadsetAlt.desc }
ent-ClothingHeadsetAltPilot = pilot over-ear headset
.desc = { ent-ClothingHeadsetAlt.desc }
-ent-ClothingHeadsetAltNFSDgreen = nfsd over-ear headset
- .desc = { ent-ClothingHeadsetAltSecurityWarden.desc }
-ent-ClothingHeadsetAltNFSDbrown = nfsd over-ear headset
- .desc = { ent-ClothingHeadsetAltSecurityWarden.desc }
-ent-ClothingHeadsetAltNFSDCreamandBrown = sheriff's over-ear headset
- .desc = { ent-ClothingHeadsetAltCommand.desc }
+ent-ClothingHeadsetAltNfsdGreen = nfsd over-ear headset
+ .desc = { ent-ClothingHeadsetAlt.desc }
+ent-ClothingHeadsetAltNfsdBrown = nfsd over-ear headset
+ .desc = { ent-ClothingHeadsetAlt.desc }
+ent-ClothingHeadsetAltNfsdCreamandBrown = sheriff's over-ear headset
+ .desc = { ent-ClothingHeadsetAlt.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/glasses.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/glasses.ftl
index b513937006f..59d34f50f93 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/glasses.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/glasses.ftl
@@ -2,5 +2,5 @@ ent-ClothingEyesArcadiaVisor = arcadia visor
.desc = A visor produced by Arcadia Industries, with some high tech optics systems built in.
ent-ClothingEyesGlassesPilot = pilot goggles
.desc = I'm sorry, but you can't pilot a ship without cool glasses. Those are the Rules. Has a GPS built in them too.
-ent-ClothingEyesGlassesNFSD = nfsd glasses
+ent-ClothingEyesGlassesNfsd = nfsd glasses
.desc = Upgraded sunglasses that provide flash immunity and a security HUD.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/hud.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/hud.ftl
index d0d364e910d..95956247b3e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/hud.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/hud.ftl
@@ -1,4 +1,8 @@
ent-ClothingEyesHudNfsd = nfsd hud
- .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records.
+ .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status and criminal records.
ent-ClothingEyesHudMail = mail hud
.desc = A heads-up display that scans mail in view and provides accurate mail data.
+ent-ClothingEyesHudNfsdMed = brigmedic hud
+ .desc = An eye display that looks like a mixture of medical and nfsd huds.
+ent-ClothingEyesHudNfsdPatch = nfsd hud eyepatch
+ .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status and criminal records.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/hands/gloves.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/hands/gloves.ftl
index ad1fe7d468e..4c4f250a2eb 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/hands/gloves.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/hands/gloves.ftl
@@ -6,6 +6,12 @@ ent-ClothingHandsGlovesCombatNfsdBrown = nfsd combat gloves
.desc = Insulated gloves for a deputy sheriff.
ent-ClothingHandsGlovesCombatNfsdCream = nfsd combat gloves
.desc = Insulated gloves for a deputy sheriff.
+ent-ClothingHandsGlovesSr = { ent-ClothingHandsGlovesHop }
+ .suffix = Insulated
+ .desc = { ent-ClothingHandsGlovesHop.desc }
+ent-ClothingHandsGlovesForensicNF = { ent-ClothingHandsGlovesForensic }
+ .suffix = Insulated
+ .desc = { ent-ClothingHandsGlovesForensic.desc }
ent-ClothingHandsGlovesColorBlackSMG = combat gloves
.desc = Regular black gloves that do not keep you from frying.
.suffix = smg
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/base_clothinghead.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/base_clothinghead.ftl
new file mode 100644
index 00000000000..e39d0a57398
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/base_clothinghead.ftl
@@ -0,0 +1,4 @@
+ent-ClothingHeadHardsuitWithLightBaseNF = { ent-ClothingHeadHardsuitWithLightBase }
+ .desc = { ent-ClothingHeadHardsuitWithLightBase.desc }
+ent-ClothingHeadHardsuitWithLightBaseNfsd = { ent-ClothingHeadHardsuitWithLightBaseNF }
+ .desc = { ent-ClothingHeadHardsuitWithLightBaseNF.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hardsuit-helmets.ftl
index de8cb8c0f72..b547014a0f6 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hardsuit-helmets.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hardsuit-helmets.ftl
@@ -1,5 +1,3 @@
-ent-ClothingHeadHelmetHardsuitSecuritypatrol = security patrol hardsuit helmet
- .desc = Lightly armored hardsuit helmet for security beat-cop needs.
ent-ClothingHeadHelmetHardsuitMercenary = mercenary hardsuit helmet
.desc = Lightly armored hardsuit helmet for mercenary needs.
ent-ClothingHeadHelmetHardsuitPilot = pilot hardsuit helmet
@@ -8,17 +6,21 @@ ent-ClothingHeadHelmetHardsuitERTMailCarrier = ERT mail carrier hardsuit helmet
.desc = A special hardsuit helmet worn by members of an emergency response team.
ent-ClothingHeadHelmetHardsuitMaximPrototype = experimental salvager helmet
.desc = A predication of decay washes over your mind.
-ent-ClothingHeadHelmetHardsuitSundie = sundicate crimson-red hardsuit helmet
- .desc = A heavily armored helmet designed for work in special operations. Manufactored in Twinwine Colony by Goreblox Looters LLC.
ent-ClothingHeadHelmetHardsuitNfsdBronze = nfsd patrol hardsuit helmet
.desc = Lightly armored hardsuit helmet for beat-cop needs.
-ent-ClothingHeadHelmetHardsuitNfsdSilver = nfsd patrol hardsuit helmet
- .desc = Lightly armored hardsuit helmet for beat-cop needs.
+ent-ClothingHeadHelmetHardsuitNfsdSilver = { ent-ClothingHeadHelmetHardsuitNfsdBronze }
+ .desc = { ent-ClothingHeadHelmetHardsuitNfsdBronze.desc }
ent-ClothingHeadHelmetHardsuitNfsdGold = nfsd patrol hardsuit helmet
.desc = Lightly armored hardsuit helmet for beat-cop needs.
-ent-ClothingHeadHelmetHardsuitNfsdBrigmed = nfsd patrol hardsuit helmet
- .desc = Lightly armored hardsuit helmet for beat-cop needs.
-ent-ClothingHeadHelmetHardsuitNfsdSheriff = nfsd sheriff hardsuit helmet
- .desc = Lightly armored hardsuit helmet for beat-cop-cop needs.
-ent-ClothingHeadHelmetHardsuitNfsdExperimental = nfsd experimental hardsuit helmet
- .desc = An experimental nfsd hardsuit helmet.
+ent-ClothingHeadHelmetHardsuitNfsdBrigmedic = { ent-ClothingHeadHelmetHardsuitNfsdBronze }
+ .desc = { ent-ClothingHeadHelmetHardsuitNfsdBronze.desc }
+ent-ClothingHeadHelmetHardsuitNfsdSheriff = { ent-ClothingHeadHelmetHardsuitNfsdBronze }
+ .desc = { ent-ClothingHeadHelmetHardsuitNfsdBronze.desc }
+ent-ClothingHeadHelmetHardsuitNfsdExperimental = experimental nfsd hardsuit helmet
+ .desc = experimental nfsd hardsuit helmet
+ent-ClothingHeadHelmetHardsuitNfsdCombat = nfsd combat hardsuit helmet
+ .desc = Medium armored hardsuit helmet for NFSD raids.
+ent-ClothingHeadHelmetHardsuitNfsdCommand = nfsd command hardsuit helmet
+ .desc = Medium armored hardsuit helmet for NFSD raids.
+ent-ClothingHeadHelmetHardsuitScaf = scaf hardsuit helmet
+ .desc = A robust, strong helmet. On the inside smells of pent up anger.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hats.ftl
index 0eca164e736..63b7bf23643 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hats.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hats.ftl
@@ -26,5 +26,10 @@ ent-ClothingHeadHatNfsdBeretCream = nfsd beret
.desc = a cream beret produced for deputy sheriff's.
ent-ClothingHeadHatNfsdCampaign = nfsd campaign hat
.desc = yee-haw partner.
+ent-ClothingHeadHatNfsdCampaignFilled = nfsd campaign hat
+ .desc = yee-haw partner.
+ .suffix = Filled
ent-ClothingHeadHatNfsdSmallCampaign = nfsd campaign cap
.desc = yee partner.
+ent-ClothingHeadHatSrCap = station representative's cap
+ .desc = A cap issued to Frontier Outpost's station representative. Try not to lose it.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/helmets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/helmets.ftl
index a6dcc313ce7..1553d796e1f 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/helmets.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/helmets.ftl
@@ -6,5 +6,7 @@ ent-ClothingHeadHelmetHardsuitSyndieEliteUnremoveable = { ent-ClothingHeadHelmet
.desc = { ent-ClothingHeadHelmetHardsuitSyndie.desc }
ent-ClothingHeadHelmetHardsuitSyndieUnremoveable = { ent-ClothingHeadHelmetHardsuitSyndie }
.desc = { ent-ClothingHeadHelmetHardsuitSyndie.desc }
-ent-ClothingHeadHelmetNFSD = nfsd helmet
+ent-ClothingHeadHelmetNfsd = nfsd helmet
.desc = an nfsd issued helmet to protect your head
+ent-ClothingHeadHelmetCultJanitor = cult leader helmet
+ .desc = { ent-ClothingHeadHelmetBasic.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hoods.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hoods.ftl
index 844cd679cc1..499b84f4302 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hoods.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hoods.ftl
@@ -5,3 +5,7 @@ ent-ClothingHeadHatHoodBioArmoredSyndicate = bio hood
.suffix = Syndicate
ent-ClothingHeadHatHoodWinterSyndieUnremoveable = syndicate coat hood
.desc = { ent-ClothingHeadHatHoodWinterBase.desc }
+ent-ClothingHeadHatHoodBloodCulthood = cult hood
+ .desc = { ent-ClothingHeadBase.desc }
+ent-ClothingHeadHatHoodBloodCulthoodUnremoveable = cult hood
+ .desc = { ent-ClothingHeadHatHoodBloodCulthood.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/masks/masks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/masks/masks.ftl
index ab66537e5ea..814497df3a4 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/masks/masks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/masks/masks.ftl
@@ -4,3 +4,9 @@ ent-FaceHuggerPlushie = facehugger plushie
.desc = The perfect plushie to scare your friends with aliens!
ent-ClothingMaskPilot = pilot breathing mask
.desc = A close-fitting breathing mask designed for, it would seems, minimal comfort of wearer.
+ent-ClothingMaskGasNfsd = nfsd gas mask
+ .desc = A standard issue nfsd gas mask.
+ent-ClothingMaskGasSheriff = nfsd sheriff gas mask
+ .desc = A gas mask worthy of a sheriff.
+ent-ClothingMaskCultJanitor = cult leader mask
+ .desc = A close-fitting imposing breathing mask designed for cult leaders who value style.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/cloaks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/cloaks.ftl
index f9a109f820f..cc626af406c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/cloaks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/cloaks.ftl
@@ -1,2 +1,4 @@
ent-ClothingNeckCloakSheriff = sheriff's cloak
.desc = An exquisite brown and green cloak fitting for those who can assert dominance over wrongdoers. Take a stab at being civil in prosecution!
+ent-ClothingNeckCloakSr = station representative's cloak
+ .desc = A top of the line cloak for Frontier Outpost's station representative. Made from exquisite fibers and furs, this thing must have cost a fortune! The fact this cloak was even issued shows the trust Central Command is placing in their representative on this outpost.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/mantles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/mantles.ftl
index ec6d95a1017..dd6f6e0f484 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/mantles.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/mantles.ftl
@@ -5,3 +5,5 @@ ent-ClothingNeckCloakJanitorFilled = { ent-ClothingNeckCloakJanitor }
.desc = { ent-ClothingNeckCloakJanitor.desc }
ent-ClothingNeckMantleSheriff = sheriff's mantle
.desc = Shootouts with nukies are just another Tuesday for this Sheriff. This mantle is a symbol of commitment to the station.
+ent-ClothingNeckMantleSr = station representative's mantle
+ .desc = This mantle protects the station representative's neck and shoulders from vicious papercuts. This mantle is a symbol of Central Command's trust.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/scarfs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/scarfs.ftl
index 984f1183c6a..6e489ac9a96 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/scarfs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/scarfs.ftl
@@ -10,7 +10,7 @@ ent-ClothingNeckNfsdBadgeSecurityCadet = { ent-ClothingNeckNfsdBadge }
ent-ClothingNeckNfsdBadgeSecurity = { ent-ClothingNeckNfsdBadge }
.suffix = Silver - Deputy
.desc = { ent-ClothingNeckNfsdBadge.desc }
-ent-ClothingNeckNfsdBadgeSecurityBrigmed = { ent-ClothingNeckNfsdBadge }
+ent-ClothingNeckNfsdBadgeSecurityBrigmedic = { ent-ClothingNeckNfsdBadge }
.suffix = Silver - Brigmedic
.desc = { ent-ClothingNeckNfsdBadge.desc }
ent-ClothingNeckNfsdBadgeDetective = { ent-ClothingNeckNfsdBadge }
@@ -22,6 +22,6 @@ ent-ClothingNeckNfsdBadgeSeniorOfficer = { ent-ClothingNeckNfsdBadge }
ent-ClothingNeckNfsdBadgeWarden = { ent-ClothingNeckNfsdBadge }
.suffix = Gold - Bailiff
.desc = { ent-ClothingNeckNfsdBadge.desc }
-ent-ClothingNeckNfsdBadgeHoS = { ent-ClothingNeckNfsdBadge }
+ent-ClothingNeckNfsdBadgeSheriff = { ent-ClothingNeckNfsdBadge }
.suffix = Star - Sheriff
.desc = { ent-ClothingNeckNfsdBadge.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/armor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/armor.ftl
index ec7073a589a..f9bebe3c14b 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/armor.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/armor.ftl
@@ -1,7 +1,7 @@
-ent-ClothingOuterArmorSRCarapace = station rep's carapace
+ent-ClothingOuterArmorSrCarapace = station representative's carapace
.desc = A premium armored chestpiece that provides above average protection for its size. It offers maximum mobility and flexibility thanks to the premium composite materials. Issued only to the station representative.
ent-ClothingOuterBioArmoredSyndicate = bio suit
.desc = Favorite protective gear of any syndicate chemical warfare enjoyers.
.suffix = Syndicate
-ent-ClothingOuterArmorNfsdArmor = nfsd armor
+ent-ClothingOuterArmorNfsd = nfsd armor
.desc = get shot, maybe survive?
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/base_clothingouter.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/base_clothingouter.ftl
new file mode 100644
index 00000000000..8ce03837636
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/base_clothingouter.ftl
@@ -0,0 +1,4 @@
+ent-ClothingOuterHardsuitBaseNF = { ent-ClothingOuterHardsuitBase }
+ .desc = { ent-ClothingOuterHardsuitBase.desc }
+ent-ClothingOuterHardsuitBaseNFNfsd = { ent-ClothingOuterHardsuitBaseNF }
+ .desc = { ent-ClothingOuterHardsuitBaseNF.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/coats.ftl
index c0ff226e1fb..6484728ef39 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/coats.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/coats.ftl
@@ -16,3 +16,10 @@ ent-ClothingOuterCoatNfsdFormalSheriff = nfsd sheriff's formal coat
.desc = Snazzier.
ent-ClothingOuterCoatNfsdLongCoat = nfsd long coat
.desc = Big iron on his hip..
+ent-ClothingOuterCoatCultJanitor = cult leader armored robes
+ .desc = Regal robes fitting for a cult leader.
+ent-ClothingOuterCoatBloodCultRobes = cult robes
+ .desc = There's no cult without classic red/crimson cult robes with bulletproof vests.
+ .suffix = Frontier
+ent-ClothingOuterJacketSr = station representative's jacket
+ .desc = The upper part of the station representative's uniform.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/hardsuits.ftl
index f1535a1c96b..237a6e60f50 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/hardsuits.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/hardsuits.ftl
@@ -1,5 +1,3 @@
-ent-ClothingOuterHardsuitSecuritypatrol = security patrol hardsuit
- .desc = A special suit that protects from the danger of space, employed by security patrol officers. Not certified to be blunderbuss proof.
ent-ClothingOuterHardsuitMercenary = mercenary hardsuit
.desc = A special suit that protects from the danger of space, employed by mercenary forces. Not certified to be blunderbuss proof.
ent-ClothingOuterHardsuitPilot = pilot hardsuit
@@ -8,8 +6,6 @@ ent-ClothingOuterHardsuitERTMailCarrier = ERT mail carrier's hardsuit
.desc = A protective hardsuit worn by the mail carriers of an emergency response team.
ent-ClothingOuterHardsuitMaximPrototype = experimental salvager hardsuit
.desc = Fire. Heat. These things forge great weapons, they also forge great salvagers.
-ent-ClothingOuterHardsuitSundie = sundicate crimson-red hardsuit
- .desc = A heavily armored hardsuit designed for work in special operations. Manufactored in Twinwine Colony by Goreblox Looters LLC.
ent-ClothingOuterHardsuitSyndieEliteUnremoveable = syndicate hardsuit
.desc = { ent-ClothingOuterHardsuitSyndie.desc }
ent-ClothingOuterHardsuitSyndieBloodRedUnremoveable = syndicate hardsuit
@@ -22,7 +18,13 @@ ent-ClothingOuterHardsuitNfsdGold = nfsd gold patrol hardsuit
.desc = A special suit that protects from the danger of space, employed by nfsd patrol officers. Not certified to be blunderbuss proof.
ent-ClothingOuterHardsuitNfsdSheriff = nfsd sheriff patrol hardsuit
.desc = A special suit that protects from the danger of space, employed by nfsd patrol officers. Not certified to be blunderbuss proof.
-ent-ClothingOuterHardsuitNfsdBrigMed = nfsd brigmedic patrol hardsuit
+ent-ClothingOuterHardsuitNfsdBrigmedic = nfsd brigmedic patrol hardsuit
.desc = A special suit that protects from the danger of space, employed by nfsd patrol officers. Not certified to be blunderbuss proof.
-ent-ClothingOuterHardsuitNfsdExperimental = an experimental nfsd hardsuit
+ent-ClothingOuterHardsuitNfsdExperimental = experimental nfsd hardsuit
.desc = An experimental nfsd hardsuit, never before seen!
+ent-ClothingOuterHardsuitNfsdCombat = nfsd combat hardsuit
+ .desc = Medium armored hardsuit helmet for NFSD raids.
+ent-ClothingOuterHardsuitNfsdCommand = nfsd command hardsuit
+ .desc = Medium armored hardsuit helmet for NFSD raids.
+ent-ClothingOuterHardsuitScaf = scaf hardsuit
+ .desc = A green and brown combat hardsuit. Old yet sturdy nonetheless.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/shoes/boots.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/shoes/boots.ftl
index c791e993554..f482454eb12 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/shoes/boots.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/shoes/boots.ftl
@@ -1,6 +1,6 @@
ent-ClothingShoesBootsPilot = pilot boots
.desc = Stylish boots for running in circles on a deck during emergencies.
-ent-ClothingShoesBootsNFSDBrown = nfsd brown boots
+ent-ClothingShoesBootsNfsdBrown = nfsd brown boots
.desc = Stylish boots for running in circles on a deck during emergencies.
-ent-ClothingShoesBootsNFSDCream = nfsd cream boots
+ent-ClothingShoesBootsNfsdCream = nfsd cream boots
.desc = Stylish boots for running in circles on a deck during emergencies.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpskirts.ftl
index 6dcf1d636e2..40a43fbec83 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpskirts.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpskirts.ftl
@@ -8,9 +8,13 @@ ent-ClothingUniformJumpskirtBHGrey = noir suit
.desc = A grey suit, complete with tie clip.
ent-ClothingUniformJumpskirtMercenary = mercenary jumpskirt
.desc = Clothing for real mercenaries who have gone through fire, water and the jungle of planets flooded with dangerous monsters or targets for which a reward has been assigned.
-ent-ClothingUniformJumpskirtSecGuard = security guard jumpskirt
- .desc = A specialized uniform for a security guard. Crisp and official to let dock loiterers know you mean business.
+ent-ClothingUniformJumpskirtSecGuard = security guard's uniform
+ .desc = A specialized uniform for Frontier Outpost's station guard. Crisp and official to let dock loiterers know you mean business.
ent-ClothingUniformJumpskirtNfsd = nfsd jumpskirt
.desc = A long sleeved jumpskirt produced for deputy sheriff's. Designed to reduce chaffing between the legs for the comfort of skin, slime, scales, fluff, and wood
ent-ClothingUniformJumpskirtNfsdShort = nfsd jumpskirt
.desc = A short sleeved jumpskirt produced for deputy sheriff's. Designed to reduce chaffing between the legs for the comfort of skin, slime, scales, fluff, and wood
+ent-ClothingUniformJumpskirtPrivateSec = private security jumpskirt
+ .desc = A specialized uniform for a private security guard. For the discerning private contractor in need of a professional look.
+ent-ClothingUniformJumpskirtSr = station representative's uniform
+ .desc = A top of the line outfit for Frontier Outpost's station representative. No expense was spared in the tailoring, every stitch is a masterpiece. The fact this suit was even issued shows the trust Central Command is placing in their representative on this outpost.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpsuits.ftl
index fdf795505e9..627ffeef675 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpsuits.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpsuits.ftl
@@ -8,8 +8,8 @@ ent-ClothingUniformJumpsuitBHGrey = noir suit
.desc = A grey suit, complete with tie clip.
ent-ClothingUniformJumpsuitChaplainPilgrimVest = pilgrim jumpsuit
.desc = Knock-knock. Would you care to have a word about our Lord-n-Savior Nar-Sss.. Err.. Space Jeebus?
-ent-ClothingUniformJumpsuitSecGuard = security guard jumpsuit
- .desc = A specialized uniform for a security guard. Crisp and official to let dock loiterers know you mean business.
+ent-ClothingUniformJumpsuitSecGuard = security guard's uniform
+ .desc = A specialized uniform for Frontier Outpost's station guard. Crisp and official to let dock loiterers know you mean business.
ent-ClothingUniformJumpsuitPilot = pilot jumpsuit
.desc = You too think there should be a pocket for your fav smokes?
ent-ClothingUniformJumpsuitERTMailCarrier = ERT mail carrier uniform
@@ -26,3 +26,21 @@ ent-ClothingUniformJumpsuitNfsdTacCamo = nfsd tactical jumpsuit
.desc = A tactical jumpsuit for deputies in the field.
ent-ClothingUniformJumpsuitNfsdTacCream = nfsd tactical jumpsuit
.desc = A tactical jumpsuit for deputies in the field.
+ent-ClothingUniformJumpsuitRecruitSyndieNF = { ent-ClothingUniformJumpsuitRecruitSyndie }
+ .desc = { ent-ClothingUniformJumpsuitRecruitSyndie.desc }
+ent-ClothingUniformJumpsuitRepairmanSyndieNF = { ent-ClothingUniformJumpsuitRepairmanSyndie }
+ .desc = { ent-ClothingUniformJumpsuitRepairmanSyndie.desc }
+ent-ClothingUniformJumpsuitParamedicSyndieNF = { ent-ClothingUniformJumpsuitParamedicSyndie }
+ .desc = { ent-ClothingUniformJumpsuitParamedicSyndie.desc }
+ent-ClothingUniformJumpsuitChiefEngineerSyndieNF = { ent-ClothingUniformJumpsuitChiefEngineerSyndie }
+ .desc = { ent-ClothingUniformJumpsuitChiefEngineerSyndie.desc }
+ent-ClothingUniformJumpsuitSyndieFormalNF = { ent-ClothingUniformJumpsuitSyndieFormal }
+ .desc = { ent-ClothingUniformJumpsuitSyndieFormal.desc }
+ent-ClothingUniformJumpsuitPrivateSec = private security jumpsuit
+ .desc = A specialized uniform for a private security guard. For the discerning private contractor in need of a professional look.
+ent-ClothingUniformJumpsuitSr = station representative's uniform
+ .desc = A top of the line outfit for Frontier Outpost's station representative. No expense was spared in the tailoring, every stitch is a masterpiece. The fact this suit was even issued shows the trust Central Command is placing in their representative on this outpost.
+ent-ClothingUniformJumpsuitGalaxyRed = red galaxy suit
+ .desc = Red lawsuit for those that conduct business on a galactic scale.
+ent-ClothingUniformJumpsuitGalaxyBlue = blue galaxy suit
+ .desc = Blue lawsuit or those that conduct business on a galactic scale.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/debugging/tippyclippy.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/debugging/tippyclippy.ftl
new file mode 100644
index 00000000000..08ce219797d
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/debugging/tippyclippy.ftl
@@ -0,0 +1,2 @@
+ent-TippyClippy = { "" }
+ .desc = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/conditional/bloodcultmobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/conditional/bloodcultmobs.ftl
new file mode 100644
index 00000000000..002eb62353f
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/conditional/bloodcultmobs.ftl
@@ -0,0 +1,24 @@
+ent-SpawnMobBloodCultistPriest = Blood Cult Priest Spawner
+ .suffix = AI, Hostile, Caster
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobBloodCultistAcolyte = Blood Cult Acolyte
+ .suffix = AI, Hostile, Melee
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobBloodCultistZealotMelee = Blood Cult Zealot
+ .suffix = AI, Hostile, Melee
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobBloodCultistZealotRanged = Blood Cult Zealot
+ .suffix = AI, Hostile, Ranged
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobBloodCultistCaster = Blood Cult Zealot
+ .suffix = AI, Hostile, Caster
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobBloodCultLeech = Blood Cult Leech
+ .suffix = AI, Hostile, Melee, Fast
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobBloodCultistAscended = Ascended Cultist
+ .suffix = AI, Hostile, Caster, Megafauna
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobBloodCultistJanitor = Blood Cult Janitor
+ .suffix = AI, Hostile, Melee
+ .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/bloodcult_inhand_weapons.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/bloodcult_inhand_weapons.ftl
new file mode 100644
index 00000000000..04e84049f01
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/bloodcult_inhand_weapons.ftl
@@ -0,0 +1,6 @@
+ent-SpawnInhandMeleeWeaponBloodCultLow = random melee weapon
+ .suffix = Blood cult, Low
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnInhandMeleeWeaponBloodCultHigh = random melee weapon
+ .suffix = Blood cult, High
+ .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rnd_items_general.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rnd_items_general.ftl
new file mode 100644
index 00000000000..3ffbfab697f
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rnd_items_general.ftl
@@ -0,0 +1,59 @@
+ent-MarkerBasePlaceFree = { ent-MarkerBase }
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootBureaucracy = random clutter
+ .suffix = Dungeon, Bureaucracy
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootBureaucracyPen = random pen
+ .suffix = Dungeon
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootLockersGeneral = random locker
+ .suffix = Dungeon, Generic
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootLockersProtectiveGear = random locker
+ .suffix = Dungeon, Protective Gear
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootLathe = random machine techfab
+ .suffix = Dungeon
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonVendomatsRecreational = random vendomat
+ .suffix = Dungeon, Recreational
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonVendomatsClothes = random vendomat
+ .suffix = Dungeon, Clothes
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonVendomatsTools = random vendomat
+ .suffix = Dungeon, Tools
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonMachineFrame = random machine frame
+ .suffix = Dungeon
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootCircuitBoard = random machine board
+ .suffix = Dungeon, General
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootSpesos = random spesos
+ .suffix = Dungeon
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootMaterialsBasicFull = random materials
+ .suffix = Dungeon, Basic
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootMaterialsValuableFull = random materials
+ .suffix = Dungeon, Valuable
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootMaterialsBasicSingle = random materials
+ .suffix = Dungeon, Basic, Single
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootMaterialsValuableSingle = random materials
+ .suffix = Dungeon, Valuable, Single
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootOresFull = random ores
+ .suffix = Dungeon, Full
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootOresSingle = random ores
+ .suffix = Dungeon, Single
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootCrateVehicle = random vehicle crate
+ .suffix = Dungeon
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootCanister = random canister
+ .suffix = Dungeon
+ .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rnd_items_kitchen.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rnd_items_kitchen.ftl
new file mode 100644
index 00000000000..d8d33223ee2
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rnd_items_kitchen.ftl
@@ -0,0 +1,21 @@
+ent-SpawnDungeonLootClutterKitchen = random clutter
+ .suffix = Dungeon, Kitchen
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootCutlery = random cutlery
+ .suffix = Dungeon
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootMugs = random mug
+ .suffix = Dungeon
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootClothesKitchen = random clothes
+ .suffix = Dungeon, Kitchen
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonFurnitureKitchen = random furniture
+ .suffix = Dungeon, Kitchen
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootKitchenTabletop = random machine techfab
+ .suffix = Dungeon, Kitchen, Tabletop
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootFood = random food
+ .suffix = Dungeon, Spoiled
+ .desc = { ent-MarkerBasePlaceFree.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rnd_items_research.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rnd_items_research.ftl
new file mode 100644
index 00000000000..8c011b5a63c
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rnd_items_research.ftl
@@ -0,0 +1,15 @@
+ent-SpawnDungeonLootClutterScience = random clutter
+ .suffix = Dungeon, Science
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootClothesScience = random clothes
+ .suffix = Dungeon, Science
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonFurnitureScience = random furniture
+ .suffix = Dungeon, Science
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootRnDDisk = random disk
+ .suffix = Dungeon
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootCircuitBoardScience = random machine board
+ .suffix = Dungeon, Sciense
+ .desc = { ent-MarkerBasePlaceFree.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rng_items_armory.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rng_items_armory.ftl
new file mode 100644
index 00000000000..e6cb395cc73
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rng_items_armory.ftl
@@ -0,0 +1,36 @@
+ent-SpawnDungeonLootArmoryClutter = random clutter
+ .suffix = Dungeon, Mercenary
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootArmoryClutterSec = random clutter
+ .suffix = Dungeon, Security
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootArmoryGuns = random weapon
+ .suffix = Dungeon, Armory, Gun
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootVaultGuns = random weapon
+ .suffix = Dungeon, Vault, Gun
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootArmoryMelee = random weapon
+ .suffix = Dungeon, Armory, Melee
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootArmoryRare = random weapon
+ .suffix = Dungeon, Vault, Rare
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootClothesMercenary = random clothes
+ .suffix = Dungeon, Mercenary
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootLockersArmory = random locker
+ .suffix = Dungeon, Armory, Mercenary
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootCrateArmoryWeapon = random crate
+ .suffix = Dungeon, Armory, Weapon
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootCrateArmoryArmor = random crate
+ .suffix = Dungeon, Armory, Armor
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonVendomatsArmory = random vendomat
+ .suffix = Dungeon, Armory
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootLatheArmory = random machine techfab
+ .suffix = Dungeon, Armory
+ .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rng_items_engineering.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rng_items_engineering.ftl
new file mode 100644
index 00000000000..d43d2a551be
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rng_items_engineering.ftl
@@ -0,0 +1,33 @@
+ent-SpawnDungeonLootClutterEngi = random clutter
+ .suffix = Dungeon, Engineering
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootToolsBasicEngineering = random tool
+ .suffix = Dungeon, Engineering
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootToolsAdvancedEngineering = random tool
+ .suffix = Dungeon, Chief Engineer
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootToolbox = random toolbox
+ .suffix = Dungeon
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootClothesEngi = random clothes
+ .suffix = Dungeon, Engineering
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootLockersEngi = random locker
+ .suffix = Dungeon, Engineering
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootLatheEngi = random machine techfab
+ .suffix = Dungeon, Engineering
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonVendomatsEngi = random vendomats
+ .suffix = Dungeon, Engineering
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootPartsEngi = random parts
+ .suffix = Dungeon
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootPowerCell = random power cell
+ .suffix = Dungeon
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootCircuitBoardEngi = random machine board
+ .suffix = Dungeon, Engineering
+ .desc = { ent-MarkerBasePlaceFree.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rng_items_hydroponics.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rng_items_hydroponics.ftl
new file mode 100644
index 00000000000..08056ffafc0
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rng_items_hydroponics.ftl
@@ -0,0 +1,15 @@
+ent-SpawnDungeonLootClutterHydroponics = random clutter
+ .suffix = Dungeon, Hydroponics
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootToolsHydroponics = random tool
+ .suffix = Dungeon, Hydroponics
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootClothesHydroponics = random clothes
+ .suffix = Dungeon, Hydroponics
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootChemsHydroponics = random chemicals
+ .suffix = Dungeon, Hydroponics
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootSeed = random seed
+ .suffix = Dungeon, Hydroponics
+ .desc = { ent-MarkerBasePlaceFree.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rng_items_medical.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rng_items_medical.ftl
new file mode 100644
index 00000000000..5c98ec374d1
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rng_items_medical.ftl
@@ -0,0 +1,57 @@
+ent-SpawnDungeonClutterMedical = random clutter
+ .suffix = Dungeon, Medical
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootKitsFirstAid = random medkit
+ .suffix = Dungeon
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootToolsSurgeryCrude = random tool
+ .suffix = Dungeon, Surgery, Improvised
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootToolsSurgery = random tool
+ .suffix = Dungeon, Surgery
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootToolsSurgeryAdvanced = random tool
+ .suffix = Dungeon, Surgery, Advanced
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootKitSurgery = random surgery kit
+ .suffix = Dungeon
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonClutterBeakerEmpty = random beaker
+ .suffix = Dungeon, Empty
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonClutterMedipens = random medipens
+ .suffix = Dungeon
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonClutterMedsFull = random meds
+ .suffix = Dungeon, Full
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonClutterMedsSingle = random meds
+ .suffix = Dungeon, Single
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonClutterPatientTransport = random patient transport
+ .suffix = Dungeon
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonClutterImplanter = random implanter
+ .suffix = Dungeon
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonClutterSyringe = random syringe
+ .suffix = Dungeon
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonClutterHypospray = random hypospray
+ .suffix = Dungeon
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootClothesMed = random clothes
+ .suffix = Dungeon, Medical
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootLockersMed = random locker
+ .suffix = Dungeon, Medical
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonVendomatsMed = random vendomat
+ .suffix = Dungeon, Medical
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootChems = random chemicals
+ .suffix = Dungeon, Chemistry
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootCircuitBoardMed = random machine board
+ .suffix = Dungeon, Medical
+ .desc = { ent-MarkerBasePlaceFree.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rng_items_supply.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rng_items_supply.ftl
new file mode 100644
index 00000000000..8f113bc794c
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/dungeon_rng_items_supply.ftl
@@ -0,0 +1,21 @@
+ent-SpawnDungeonLootClutterSalvage = random clutter
+ .suffix = Dungeon, Salvaging
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootToolsSalvage = random tool
+ .suffix = Dungeon, Salvaging
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootClothesSalvage = random clothes
+ .suffix = Dungeon, Salvage
+ .desc = { ent-MarkerBasePlaceFree.desc }
+ent-SpawnDungeonLootLockersSalvage = random locker
+ .suffix = Dungeon, Salvaging
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootLatheSalvage = random machine techfab
+ .suffix = Dungeon, Salvaging
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonVendomatsSalvage = random vendomats
+ .suffix = Dungeon, Salvaging
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnDungeonLootCircuitBoardSalvage = random machine board
+ .suffix = Dungeon, Salvaging
+ .desc = { ent-MarkerBasePlaceFree.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/syndicatemobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/syndicatemobs.ftl
new file mode 100644
index 00000000000..48dc4f7517a
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/syndicatemobs.ftl
@@ -0,0 +1,41 @@
+ent-SpawnMobSyndicateNavalCaptain = Syndicate Naval Captain Spawner
+ .suffix = AI, Hostile, RND
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobSyndicateNavalEngineer = Syndicate Naval Engineer Spawner
+ .suffix = AI, Hostile, RND
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobSyndicateNavalMedic = Syndicate Naval Medic Spawner
+ .suffix = AI, Hostile, RND
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobSyndicateNavalSecondOfficer = Syndicate Naval Second Officer Spawner
+ .suffix = AI, Hostile, RND
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobSyndicateNavalOperator = Syndicate Naval Operator Spawner
+ .suffix = AI, Hostile, RND
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobSyndicateNavalGrenadier = Syndicate Naval Grenadier Spawner
+ .suffix = AI, Hostile, RND
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobSyndicateNavalSaboteur = Syndicate Naval Saboteur Spawner
+ .suffix = AI, Hostile, RND
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobExperimentationVictim = Victim of Experimentation Spawner
+ .suffix = AI, Hostile
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobSyndicateNavalCommander = Syndicate Naval Commander Spawner
+ .suffix = AI, Hostile, RND
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobSyndicateNavalDeckhand = Syndicate Naval Deckhand Spawner
+ .suffix = AI, Hostile, RND
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobCatSyndy = syndicat
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobSyndicateNavalMime = Syndicate Naval Mime Spawner
+ .suffix = AI, Hostile
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobSyndicateNavalChemwarrior = Syndicate Naval Chemwarrior Spawner
+ .suffix = AI, Hostile, RND
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobSyndicateNavalHorror = Syndicate Naval Horror Spawner
+ .suffix = AI, Hostile, RND
+ .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/wizardfederationmobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/wizardfederationmobs.ftl
new file mode 100644
index 00000000000..60b4ace22f6
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/wizardfederationmobs.ftl
@@ -0,0 +1,30 @@
+ent-SpawnMobWizFedWizard = Random Wizard Spawner
+ .suffix = AI
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobWizFedWizardHardsuit = Random Wizard Spawner
+ .suffix = AI, Hardsuit
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobWizFedWizardBlue = Blue Wizard Spawner
+ .suffix = AI
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobWizFedWizardRed = Red Wizard Spawner
+ .suffix = AI
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobWizFedWizardViolet = Violet Wizard Spawner
+ .suffix = AI
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobWizFedWizardSoap = Soap Wizard Spawner
+ .suffix = AI
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobWizFedWizardBlueHardsuit = Blue Wizard Spawner
+ .suffix = AI, Hardsuit
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobWizFedWizardRedHardsuit = Red Wizard Spawner
+ .suffix = AI, Hardsuit
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobWizFedWizardVioletHardsuit = Violet Wizard Spawner
+ .suffix = AI, Hardsuit
+ .desc = { ent-MarkerBase.desc }
+ent-SpawnMobWizFedWizardSoapHardsuit = Soap Wizard Spawner
+ .suffix = AI, Hardsuit
+ .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/vehicles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/vehicles.ftl
new file mode 100644
index 00000000000..c0337881554
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/vehicles.ftl
@@ -0,0 +1,2 @@
+ent-SpawnVehicleHoverbikeNF = hoverbike spawner
+ .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/artifact_construct.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/artifact_construct.ftl
index df882b0d2fb..bb04518a9c0 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/artifact_construct.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/artifact_construct.ftl
@@ -1,7 +1,8 @@
-ent-SimpleArtifactMobBase = { ent-MobCombat }
+ent-SimpleArtifactMobBase = { ent-BaseSimpleMob }
.suffix = AI
- .desc = { ent-MobCombat.desc }
+ .desc = { ent-BaseSimpleMob.desc }
ent-BaseMobArtifactConstruct = artifact construct
+ .desc = { ent-SimpleArtifactMobBase.desc }
+ent-MobGrimForged = Grimforged Construct
.desc = A towering golem crafted from twisted metal and ancient stones.
-ent-MobGrimForged = artifact construct 1
- .desc = { ent-BaseMobArtifactConstruct.desc }
+ .suffix = AI
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/bloodcultistmob.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/bloodcultistmob.ftl
index 4a7e07c203b..b45b4e4db19 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/bloodcultistmob.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/bloodcultistmob.ftl
@@ -1,31 +1,24 @@
ent-MobBloodCultistBase = Blood Cultist
.desc = { ent-MobHumanoidHostileBase.desc }
ent-MobBloodCultistPriest = Blood Cult Priest
- .suffix = AI, Ranged
+ .desc = { ent-MobBloodCultistBase.desc }
+ent-MobBloodCultistJanitor = Blood Cult Janitor
.desc = { ent-MobBloodCultistBase.desc }
ent-MobBloodCultistAcolyte = Blood Cult Acolyte
- .suffix = AI, Melee
.desc = { ent-MobBloodCultistBase.desc }
ent-MobBloodCultistZealotMelee = Blood Cult Zealot
- .suffix = AI, Melee
.desc = { ent-MobBloodCultistBase.desc }
ent-MobBloodCultistZealotRanged = Blood Cult Zealot
- .suffix = AI, Crossbow
.desc = { ent-MobBloodCultistBase.desc }
ent-MobBloodCultistCaster = Blood Cult Zealot
- .suffix = AI, Ranged
.desc = { ent-MobBloodCultistBase.desc }
ent-MobBloodCultistAscended = Ascended Cultist
- .suffix = AI, Ranged
- .desc = { ent-MobBloodCultistBase.desc }
+ .desc = { ent-MobNonHumanHostileBase.desc }
ent-MobBloodCultLeech = Blood Leech
- .suffix = AI, Melee
- .desc = { ent-MobBloodCultistBase.desc }
+ .desc = { ent-MobNonHumanHostileBase.desc }
ent-MobBloodCultDrainedOne = Drained One
- .suffix = AI, Melee
- .desc = { ent-MobBloodCultistBase.desc }
+ .desc = { ent-MobNonHumanHostileBase.desc }
ent-MobBloodCultDrainedOneNanoTrasen = Drained One
- .suffix = AI, Melee
.desc = { ent-MobBloodCultDrainedOne.desc }
ent-BloodCultTurret = blood pylon
.desc = { ent-BaseWeaponTurret.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/emotionalsupportanimals.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/emotionalsupportanimals.ftl
index 90eeb51b54e..ffeef9bf001 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/emotionalsupportanimals.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/emotionalsupportanimals.ftl
@@ -5,29 +5,29 @@ ent-BaseEmotionalGhostCat = { "" }
ent-BaseEmotionalGhostDog = { "" }
.desc = { "" }
ent-MobCatGhost = { ent-MobCat }
- .suffix = Ghost
- .desc = { ent-MobCat.desc }
+ .suffix = Ghost
+ .desc = { ent-MobCat.desc }
ent-MobCatCalicoGhost = { ent-MobCatCalico }
- .suffix = Ghost
- .desc = { ent-MobCatCalico.desc }
+ .suffix = Ghost
+ .desc = { ent-MobCatCalico.desc }
ent-MobCatCaracalGhost = { ent-MobCatCaracal }
- .suffix = Ghost
- .desc = { ent-MobCatCaracal.desc }
+ .suffix = Ghost
+ .desc = { ent-MobCatCaracal.desc }
ent-MobCatSpaceGhost = { ent-MobCatSpace }
- .suffix = Ghost
- .desc = { ent-MobCatSpace.desc }
+ .suffix = Ghost
+ .desc = { ent-MobCatSpace.desc }
ent-MobBingusGhost = { ent-MobBingus }
- .suffix = Ghost
- .desc = { ent-MobBingus.desc }
+ .suffix = Ghost
+ .desc = { ent-MobBingus.desc }
ent-MobCorgiGhost = { ent-MobCorgi }
- .suffix = Ghost
- .desc = { ent-MobCorgi.desc }
+ .suffix = Ghost
+ .desc = { ent-MobCorgi.desc }
ent-MobCorgiPuppyGhost = { ent-MobCorgiPuppy }
- .suffix = Ghost
- .desc = { ent-MobCorgiPuppy.desc }
+ .suffix = Ghost
+ .desc = { ent-MobCorgiPuppy.desc }
ent-MobPibbleGhost = { ent-MobPibble }
- .suffix = Ghost
- .desc = { ent-MobPibble.desc }
+ .suffix = Ghost
+ .desc = { ent-MobPibble.desc }
ent-MobChickenGhost = { ent-MobChicken }
- .suffix = Ghost
- .desc = { ent-MobChicken.desc }
\ No newline at end of file
+ .suffix = Ghost
+ .desc = { ent-MobChicken.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/wizardfederationmob.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/wizardfederationmob.ftl
index 194924d10e0..70d2ae33d91 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/wizardfederationmob.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/wizardfederationmob.ftl
@@ -1,6 +1,5 @@
ent-MobWizFedlBase = Wizard
- .suffix = AI
- .desc = { ent-MobWizFedlBase.desc }
+ .desc = { ent-MobHumanoidHostileBase.desc }
ent-MobWizFedWizardBlue = Blue Wizard
.desc = { ent-MobWizFedlBase.desc }
ent-MobWizFedWizardRed = Red Wizard
@@ -8,20 +7,15 @@ ent-MobWizFedWizardRed = Red Wizard
ent-MobWizFedWizardViolet = Violet Wizard
.desc = { ent-MobWizFedlBase.desc }
ent-MobWizFedWizardSoap = Soap Wizard
- .suffix = AI
.desc = { ent-MobWizFedlBase.desc }
ent-MobWizFedWizardBlueHardsuit = Blue Wizard
- .suffix = AI, Hardsuit
.desc = { ent-MobWizFedWizardBlue.desc }
ent-MobWizFedWizardRedHardsuit = Red Wizard
- .suffix = AI, Hardsuit
.desc = { ent-MobWizFedWizardRed.desc }
ent-MobWizFedWizardVioletHardsuit = Violet Wizard
- .suffix = AI, Hardsuit
.desc = { ent-MobWizFedWizardViolet.desc }
ent-MobWizFedWizardSoapHardsuit = Soap Wizard
.suffix = AI, Hardsuit
.desc = { ent-MobWizFedWizardSoap.desc }
ent-WaterElementalConjured = Blue Curacao Elemental
- .suffix = AI
- .desc = { ent-MobNonHumanHostileBase.desc }
\ No newline at end of file
+ .desc = { ent-MobNonHumanHostileBase.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/player/goblin_player.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/player/goblin_player.ftl
new file mode 100644
index 00000000000..50ba2ef6205
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/player/goblin_player.ftl
@@ -0,0 +1,2 @@
+ent-MobGoblin = Urist McGoblin
+ .desc = { ent-MobGoblinBase.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/species/goblin.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/species/goblin.ftl
new file mode 100644
index 00000000000..8fdd9fb9228
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/species/goblin.ftl
@@ -0,0 +1,4 @@
+ent-MobGoblinBase = Urist McGoblin
+ .desc = { ent-BaseMobHuman.desc }
+ent-MobGoblinDummy = Urist McGoblin
+ .desc = A dummy goblin meant to be used in character setup.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/spoiled.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/spoiled.ftl
new file mode 100644
index 00000000000..6c7058378f1
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/spoiled.ftl
@@ -0,0 +1,24 @@
+ent-FoodSpoiledMoldy = moldy food
+ .desc = It's probably still edible, just need to scrape this thing off. And this one too. And this one.
+ent-FoodSpoiledRotten = rotten food
+ .desc = It's probably still edible, just need to scrape this thing off. And this one too. And this one.
+ent-FoodBurgerBaconRotten = rotten burger
+ .desc = { ent-FoodSpoiledRotten.desc }
+ent-FoodBurgerBigBiteRotten = rotten burger
+ .desc = { ent-FoodSpoiledRotten.desc }
+ent-FoodBurgerCheeseRotten = rotten burger
+ .desc = { ent-FoodSpoiledRotten.desc }
+ent-FoodBurgerEmpoweredRotten = rotten burger
+ .desc = { ent-FoodSpoiledRotten.desc }
+ent-FoodBurgerPlainRotten = rotten burger
+ .desc = { ent-FoodSpoiledRotten.desc }
+ent-FoodRiceEggMoldy = moldy food
+ .desc = { ent-FoodSpoiledMoldy.desc }
+ent-FoodSoupMeatballMoldy = moldy food
+ .desc = { ent-FoodSpoiledMoldy.desc }
+ent-FoodNoodlesMoldy = moldy food
+ .desc = { ent-FoodSpoiledMoldy.desc }
+ent-FoodNoodlesMeatballMoldy = moldy food
+ .desc = { ent-FoodSpoiledMoldy.desc }
+ent-FoodSaladCaesarMoldy = moldy food
+ .desc = { ent-FoodSpoiledMoldy.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/door_remote.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/door_remote.ftl
new file mode 100644
index 00000000000..4d436132613
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/door_remote.ftl
@@ -0,0 +1,2 @@
+ent-DoorRemoteNfsd = nfsd door remote
+ .desc = { ent-DoorRemoteDefault.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/electronics/door_access.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/electronics/door_access.ftl
new file mode 100644
index 00000000000..7e365f80514
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/electronics/door_access.ftl
@@ -0,0 +1,15 @@
+ent-DoorElectronicsFrontier = { ent-DoorElectronics }
+ .suffix = Frontier, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsFrontierBridge = { ent-DoorElectronics }
+ .suffix = Theatre, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsFrontierCommand = { ent-DoorElectronics }
+ .suffix = Chapel, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsMailCarrier = { ent-DoorElectronics }
+ .suffix = Mail, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsMercenary = { ent-DoorElectronics }
+ .suffix = Mercenary, Locked
+ .desc = { ent-DoorElectronics.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/encryption_keys.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/encryption_keys.ftl
index b888426b0f6..b3d917ccc85 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/encryption_keys.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/encryption_keys.ftl
@@ -1,5 +1,5 @@
ent-EncryptionKeyTraffic = traffic control encryption key
.desc = An encryption key for the space traffic control channel.
-ent-EncryptionKeyNFSD = nfsd encryption key
+ent-EncryptionKeyNfsd = nfsd encryption key
.desc = An encryption key for the new frontier security department channel.
.suffix = DO NOT MAP
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/flatpacks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/flatpacks.ftl
index d913277a4d9..7fef403fa9f 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/flatpacks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/flatpacks.ftl
@@ -22,13 +22,9 @@ ent-AmeControllerUnanchoredFlatpack = AME controller flatpack
.desc = A flatpack used for constructing an AME controller.
ent-RadiationCollectorFullTankFlatpack = radiation collector flatpack
.desc = A flatpack used for constructing a radiation collector.
-ent-GyroscopeUnanchoredFlatpack = gyroscope flatpack
- .desc = A flatpack used for constructing a gyroscope.
-ent-SmallGyroscopeUnanchoredFlatpack = small gyroscope flatpack
+ent-SmallGyroscopeFlatpack = small gyroscope flatpack
.desc = A flatpack used for constructing a small gyroscope.
-ent-ThrusterUnanchoredFlatpack = thruster flatpack
- .desc = A flatpack used for constructing a thruster.
-ent-SmallThrusterUnanchoredFlatpack = small thruster flatpack
+ent-SmallThrusterFlatpack = small thruster flatpack
.desc = A flatpack used for constructing a small thruster.
ent-ExosuitFabricatorFlatpack = exosuit fabricator flatpack
.desc = A flatpack used for constructing an exosuit fabricator.
@@ -108,3 +104,13 @@ ent-UprightPianoInstrumentFlatpack = upright piano flatpack
.desc = A flatpack containing a upright piano.
ent-DawInstrumentFlatpack = daw flatpack
.desc = A flatpack containing a daw.
+ent-NfsdTechFabFlatpack = nfsd tech fab flatpack
+ .desc = A flatpack used for constructing a nfsd tech fab.
+ent-HoverbikeFlatpack = hoverbike flatpack
+ .desc = A flatpack used for constructing a hoverbike. Keys already slotted in the ignition.
+ent-HoverbikeMailcarrierFlatpack = mail carrier hoverbike flatpack
+ .desc = A flatpack used for constructing a hoverbike. Keys already slotted in the ignition.
+ent-HoverbikeNfsdFlatpack = nfsd hoverbike flatpack
+ .desc = A flatpack used for constructing a hoverbike. Keys already slotted in the ignition.
+ent-HoverbikeSyndicateFlatpack = syndicate hoverbike flatpack
+ .desc = A flatpack used for constructing a hoverbike. Keys already slotted in the ignition.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/holoprojectors.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/holoprojectors.ftl
new file mode 100644
index 00000000000..8abbddf2c70
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/holoprojectors.ftl
@@ -0,0 +1,5 @@
+ent-HoloprojectorNfsd = nfsd holobarrier projector
+ .desc = Creates a solid but fragile holographic barrier.
+ent-HoloprojectorNfsdEmpty = { ent-HoloprojectorSecurityEmpty }
+ .suffix = Empty
+ .desc = { ent-HoloprojectorSecurityEmpty.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/misc/identification_cards.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/misc/identification_cards.ftl
index 98b9a9e53c4..530218cf1d0 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/misc/identification_cards.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/misc/identification_cards.ftl
@@ -4,19 +4,23 @@ ent-PilotIDCard = pilot ID card
.desc = { ent-IDCardStandard.desc }
ent-StcIDCard = station traffic controller ID card
.desc = { ent-IDCardStandard.desc }
-ent-nfsdcadetID = nfsd cadet ID card
+ent-CadetIDCard = nfsd cadet ID card
.desc = { ent-IDCardStandard.desc }
-ent-nfsddeputyID = nfsd deputy ID card
+ent-DeputyIDCard = nfsd deputy ID card
.desc = { ent-IDCardStandard.desc }
-ent-nfsdbrigmedicID = nfsd brigmedic ID card
+ent-BrigmedicNFIDCard = nfsd brigmedic ID card
.desc = { ent-IDCardStandard.desc }
-ent-nfsdsergeantID = nfsd sergeant ID card
+ent-SergeantIDCard = nfsd sergeant ID card
.desc = { ent-IDCardStandard.desc }
-ent-nfsdbailiffID = nfsd bailiff ID card
+ent-BailiffIDCard = nfsd bailiff ID card
.desc = { ent-IDCardStandard.desc }
-ent-nfsdsheriffID = nfsd sheriff ID card
+ent-ShriffIDCard = nfsd sheriff ID card
+ .desc = { ent-IDCardStandard.desc }
+ent-DetectiveNFIDCard = detective ID card
.desc = { ent-IDCardStandard.desc }
ent-SecurityGuardIDCard = security guard ID card
.desc = { ent-SecurityIDCard.desc }
ent-ERTMailCarrierIDCard = ERT mail carrier ID card
.desc = { ent-ERTChaplainIDCard.desc }
+ent-SrIDCard = station representative ID card
+ .desc = { ent-HoPIDCard.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/pda.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/pda.ftl
index 8a655eddfd9..0f08f222428 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/pda.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/pda.ftl
@@ -11,15 +11,19 @@ ent-SecurityGuardPDA = security guard PDA
ent-ERTMailCarrierPDA = { ent-ERTLeaderPDA }
.suffix = Mail Carrier
.desc = { ent-ERTLeaderPDA.desc }
-ent-NfsdSheriff = sheriff PDA
+ent-SheriffPDA = sheriff PDA
.desc = Whosoever bears this PDA is the law.
-ent-NfsdCadet = cadet PDA
+ent-CadetPDA = cadet PDA
.desc = Whosoever bears this PDA could be the law.
-ent-NfsdDeputy = deputy PDA
+ent-DeputyPDA = deputy PDA
.desc = Whosoever bears this PDA is close to being the law.
-ent-NfsdBrigmedic = brigmedic PDA
+ent-BrigmedicNFPDA = brigmedic PDA
.desc = Whosoever bears this PDA heals the law.
-ent-NfsdSergeant = sergeant PDA
+ent-SergeantPDA = sergeant PDA
.desc = Whosoever bears this PDA puts the law on their back.
-ent-NfsdBailiff = bailiff PDA
+ent-BailiffPDA = bailiff PDA
.desc = Whosoever bears this PDA puts the law on their back.
+ent-DetectiveNFPDA = detective PDA
+ .desc = Smells like rain... pouring down the rooftops...
+ent-SrPDA = station representative PDA
+ .desc = Looks like it's been clawed on.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/production.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/production.ftl
index 9111dff1712..46459f83a50 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/production.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/production.ftl
@@ -1,12 +1,24 @@
ent-ShredderMachineCircuitboard = shredder machine board
.desc = A machine printed circuit board for a shredder.
-ent-SmallThrusterMachineCircuitboard = small thruster machine board
- .desc = { ent-BaseMachineCircuitboard.desc }
-ent-SmallGyroscopeMachineCircuitboard = small gyroscope machine board
- .desc = { ent-BaseMachineCircuitboard.desc }
-ent-ThrusterSecurityMachineCircuitboard = security thruster machine board
- .desc = { ent-BaseMachineCircuitboard.desc }
ent-TilePrinterNFMachineCircuitboard = tile-meister 5000 machine board
.desc = A machine printed circuit board for an tile-meister 5000
ent-SalvageTechFabCircuitboardNF = salvage techfab machine board
.desc = A machine printed circuit board for a salvage techfab
+ent-NfsdTechFabCircuitboard = nfsd techfab machine board
+ .desc = A machine printed circuit board for an nfsd techfab.
+ent-ThrusterSecurityMachineCircuitboard = security thruster machine board
+ .desc = { ent-BaseMachineCircuitboard.desc }
+ent-ThrusterNfsdMachineCircuitboard = nfsd thruster machine board
+ .desc = { ent-BaseMachineCircuitboard.desc }
+ent-SmallThrusterMachineCircuitboard = small thruster machine board
+ .desc = { ent-BaseMachineCircuitboard.desc }
+ent-GyroscopeSecurityMachineCircuitboard = security gyroscope machine board
+ .desc = { ent-BaseMachineCircuitboard.desc }
+ent-SmallGyroscopeSecurityMachineCircuitboard = small security gyroscope machine board
+ .desc = { ent-BaseMachineCircuitboard.desc }
+ent-GyroscopeNfsdMachineCircuitboard = nfsd gyroscope machine board
+ .desc = { ent-BaseMachineCircuitboard.desc }
+ent-SmallGyroscopeNfsdMachineCircuitboard = small nfsd gyroscope machine board
+ .desc = { ent-BaseMachineCircuitboard.desc }
+ent-SmallGyroscopeMachineCircuitboard = small gyroscope machine board
+ .desc = { ent-BaseMachineCircuitboard.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/fun/whistles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/fun/whistles.ftl
new file mode 100644
index 00000000000..ace2226aa9a
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/fun/whistles.ftl
@@ -0,0 +1,2 @@
+ent-NfsdWhistle = nfsd whistle
+ .desc = Sound of it make you feel fear.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/bedsheets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/bedsheets.ftl
new file mode 100644
index 00000000000..7a31bb0d20d
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/bedsheets.ftl
@@ -0,0 +1,6 @@
+ent-BedsheetNfsd = nfsd bedsheet
+ .desc = { ent-BedsheetBase.desc }
+ent-BedsheetNfsdBrigmedic = brigmedic bedsheet
+ .desc = { ent-BedsheetBase.desc }
+ent-BedsheetNfsdSheriff = sheriff bedsheet
+ .desc = { ent-BedsheetBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/books_author.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/books_author.ftl
new file mode 100644
index 00000000000..8943e893c5e
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/books_author.ftl
@@ -0,0 +1,8 @@
+ent-BookScienceTextbook = scientific academia vol.i
+ .desc = Volume One of the Science Textbook series.
+ent-BookSciencePhilospher = cooking with the philospher's stone
+ .desc = A CentCom issued mixologist's book? All in the name of science, I guess.
+ent-BookScienceDwarven = dwarven guide to free thinking
+ .desc = A CentCom issued account of a fisherman's journey. They really expect you to read this?
+ent-BookScienceClown = honker's hilarious tight-five
+ .desc = A CentCom issued Standup Comedy Script..? This is getting ridiculous!
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/implanters.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/implanters.ftl
index dfedb32fa06..43768e229e1 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/implanters.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/implanters.ftl
@@ -1,5 +1,8 @@
-ent-MedicalTrackingImplanter = medical insurance tracking implanter
+ent-MedicalTrackingImplanter = medical tracking implanter
.desc = { ent-BaseImplantOnlyImplanter.desc }
+ent-FreelanceTrackingImplanter = freelance tracking implanter
+ .suffix = Freelance
+ .desc = { ent-BaseImplantOnlyImplanterSyndi.desc }
ent-DeathAcidifierImplanterNF = death acidifier implanter
.suffix = All
.desc = { ent-BaseImplantOnlyImplanterSyndi.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/rubber_stamp.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/rubber_stamp.ftl
new file mode 100644
index 00000000000..44ac715f16d
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/rubber_stamp.ftl
@@ -0,0 +1,8 @@
+ent-RubberStampSr = station representative's rubber stamp
+ .desc = { ent-RubberStampHop.desc }
+ent-RubberStampPsychologist = psychologist rubber stamp
+ .suffix = DO NOT MAP
+ .desc = { ent-RubberStampBase.desc }
+ent-RubberStampStc = station traffic controller's rubber stamp
+ .suffix = DO NOT MAP
+ .desc = { ent-RubberStampBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/space_cash.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/space_cash.ftl
new file mode 100644
index 00000000000..92e2246fb87
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/space_cash.ftl
@@ -0,0 +1,11 @@
+ent-SpaceCash5000Expedition = spesos (5000)
+ .desc = { ent-SpaceCash5000.desc }
+ent-SpaceCash10000Expedition = spesos (10000)
+ .desc = { ent-SpaceCash10000.desc }
+ent-SpaceCash15000Expedition = spesos (15000)
+ .suffix = 15000
+ .desc = { ent-SpaceCash.desc }
+ent-SpaceCash20000Expedition = spesos (20000)
+ .desc = { ent-SpaceCash20000.desc }
+ent-SpaceCash25000Expedition = spesos (25000)
+ .desc = { ent-SpaceCash.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/subdermal_implants.ftl
index d5e646f6c27..c862ad54004 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/subdermal_implants.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/subdermal_implants.ftl
@@ -1,4 +1,6 @@
-ent-MedicalTrackingImplant = medical insurance tracking implant
+ent-MedicalTrackingImplant = medical tracking implant
.desc = This implant has a tracking device monitor for the Medical radio channel.
+ent-FreelanceTrackingImplant = freelance tracking implant
+ .desc = This implant has a tracking device monitor for the Freelance radio channel.
ent-DeathAcidifierImplantNF = death-acidifier implant
.desc = This implant melts the user and their equipment upon death.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/security.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/security.ftl
index 0345f0ec4a6..c8c185268bb 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/security.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/security.ftl
@@ -17,10 +17,10 @@ ent-BaseSecurityUplinkRadioDebug = { ent-BaseSecurityUplinkRadio }
.suffix = Security, DEBUG
.desc = { ent-BaseSecurityUplinkRadio.desc }
ent-BaseSecurityUplinkRadioSheriff = { ent-BaseSecurityUplinkRadio }
- .suffix = Sheriff 15
+ .suffix = Sheriff 20
.desc = { ent-BaseSecurityUplinkRadio.desc }
ent-BaseSecurityUplinkRadioOfficer = { ent-BaseSecurityUplinkRadio }
- .suffix = Officer 10
+ .suffix = Officer 15
.desc = { ent-BaseSecurityUplinkRadio.desc }
-ent-NFSDDeployableBarrier = nfsd deployable barrier
+ent-NfsdDeployableBarrier = nfsd deployable barrier
.desc = A deployable barrier. Swipe your ID card to lock/unlock it.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/service/vending_machine_restock.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/service/vending_machine_restock.ftl
index 227db85d94d..21d2010e417 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/service/vending_machine_restock.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/service/vending_machine_restock.ftl
@@ -14,7 +14,3 @@ ent-VendingMachineRestockAutoTuneVend = AutoTuneVend restock box
.desc = A box containing music and stuff for the Auto Tune vending machine. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM.
ent-VendingMachineRestockPottedPlantVend = Plant-O-Matic restock box
.desc = A box containing potted plants for the Plant-O-Matic vending machine. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM.
-ent-VendingMachineRestockNFSDDrobe = NFSDDrobe restock box
- .desc = nfsddrobe restock box - may explode on contact with appendages.
-ent-VendingMachineRestockNFSDTec = NFSDTec restock box
- .desc = nfsdtec restock box - may unleash a singulo on contact with appendages
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/wizard/conjured_items.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/wizard/conjured_items.ftl
index d0a4415c185..2946512add2 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/wizard/conjured_items.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/wizard/conjured_items.ftl
@@ -2,4 +2,10 @@ ent-ConjuredObject10 = { "" }
.desc = A magically created entity, that'll vanish from existence eventually.
.suffix = Conjured
ent-SoapConjured = soap
- .desc = { ent-Soap.desc }
\ No newline at end of file
+ .desc = { ent-Soap.desc }
+ent-SoapletBloodCult = soaplet
+ .desc = { ent-SoapConjured.desc }
+ent-SoapConjuredBloodCultCluster = soap
+ .desc = { ent-Soap.desc }
+ent-ShellSoapConjuredBloodCultCluster = { ent-SoapConjured }
+ .desc = { ent-SoapConjured.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/flashlights.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/flashlights.ftl
new file mode 100644
index 00000000000..0748de9f16c
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/flashlights.ftl
@@ -0,0 +1,2 @@
+ent-FlashlightNfsdLite = nfsdlite
+ .desc = A robust flashlight used by the nfsd.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/jetpacks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/jetpacks.ftl
index d5406936b81..ac9ac2323f5 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/jetpacks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/jetpacks.ftl
@@ -1,6 +1,6 @@
-ent-Jetpacknfsd = nfsd jetpack
+ent-JetpackNfsd = nfsd jetpack
.suffix = Empty
- .desc = { ent-BaseJetpack.desc }
-ent-JetpackNFSDFilled = nfsd jetpack
- .suffix = Filled
- .desc = { ent-Jetpacknfsd.desc }
+ .desc = { ent-JetpackSecurity.desc }
+ent-JetpackNfsdFilled = nfsd jetpack
+ .suffix = Filled
+ .desc = { ent-JetpackNfsd.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/weapon_cases.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/weapon_cases.ftl
new file mode 100644
index 00000000000..675e00cc09a
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/weapon_cases.ftl
@@ -0,0 +1,6 @@
+ent-WeaponCaseLong = weapon case
+ .desc = A reinforced casing for storing long weapons and accessories.
+ .suffix = Long
+ent-WeaponCaseShort = weapon case
+ .desc = A reinforced casing for storing side arms and weapon accessories.
+ .suffix = Short
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/vehicles/keys.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/vehicles/keys.ftl
new file mode 100644
index 00000000000..0a1bb611289
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/vehicles/keys.ftl
@@ -0,0 +1,2 @@
+ent-VehicleKeyHoverbikeNF = hoverbike keys
+ .desc = Cute bibelot.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/vehicles/vehicles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/vehicles/vehicles.ftl
new file mode 100644
index 00000000000..5030d824f5c
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/vehicles/vehicles.ftl
@@ -0,0 +1,29 @@
+ent-VehicleATVNF = ATV
+ .desc = All-Tile Vehicle.
+ent-VehicleSkeletonMotorcycleNF = skeleton motorcycle
+ .desc = Bad to the Bone.
+ent-VehicleHoverbikeNF = hoverbike
+ .desc = A turbine with bike handles. Very safe.
+ent-VehicleHoverbikeNFKeys = { ent-VehicleHoverbikeNF }
+ .suffix = With key
+ .desc = { ent-VehicleHoverbikeNF.desc }
+ent-VehicleHoverbikeMailcarrier = mail carrier hoverbike
+ .desc = You better run, better run, faster than my mail.
+ent-VehicleHoverbikeMailcarrierKey = { ent-VehicleHoverbikeMailcarrier }
+ .suffix = With key
+ .desc = { ent-VehicleHoverbikeMailcarrier.desc }
+ent-VehicleHoverbikeNfsd = nfsd hoverbike
+ .desc = An NFSD issued turbine with bike handles. Very safe.
+ent-VehicleHoverbikeNfsdKey = { ent-VehicleHoverbikeNfsd }
+ .suffix = With key
+ .desc = { ent-VehicleHoverbikeNfsd.desc }
+ent-VehicleHoverbikePirate = pirate hoverbike
+ .desc = Yarr! Dis be me sovereign space shuttle. Now, whaur me rum?
+ent-VehicleHoverbikePirateKey = { ent-VehicleHoverbikePirate }
+ .suffix = With key
+ .desc = { ent-VehicleHoverbikePirate.desc }
+ent-VehicleHoverbikeSyndicate = syndicate hoverbike
+ .desc = This thing screams style. And war crimes.
+ent-VehicleHoverbikeSyndicateKey = { ent-VehicleHoverbikeSyndicate }
+ .suffix = With key
+ .desc = { ent-VehicleHoverbikeSyndicate.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/expedition_guns.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/expedition_guns.ftl
new file mode 100644
index 00000000000..2bddbd9c50b
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/expedition_guns.ftl
@@ -0,0 +1,27 @@
+ent-UnregisteredFirearmBase = { "" }
+ .suffix = Unregistered
+ .desc = { "" }
+ent-WeaponPistolMk58Expedition = { ent-WeaponPistolMk58 }
+ .desc = { ent-WeaponPistolMk58.desc }
+ent-WeaponRevolverDeckardExpedition = { ent-WeaponRevolverDeckard }
+ .desc = { ent-WeaponRevolverDeckard.desc }
+ent-WeaponShotgunKammererExpedition = { ent-WeaponShotgunKammerer }
+ .desc = { ent-WeaponShotgunKammerer.desc }
+ent-WeaponSubMachineGunWt550Expedition = { ent-WeaponSubMachineGunWt550 }
+ .desc = { ent-WeaponSubMachineGunWt550.desc }
+ent-WeaponSubMachineGunAtreidesExpedition = { ent-WeaponSubMachineGunAtreides }
+ .desc = { ent-WeaponSubMachineGunAtreides.desc }
+ent-WeaponSubMachineGunDrozdExpedition = { ent-WeaponSubMachineGunDrozd }
+ .desc = { ent-WeaponSubMachineGunDrozd.desc }
+ent-WeaponLaserGunExpedition = { ent-WeaponLaserGun }
+ .desc = { ent-WeaponLaserGun.desc }
+ent-WeaponLaserSvalinnExpedition = { ent-WeaponLaserSvalinn }
+ .desc = { ent-WeaponLaserSvalinn.desc }
+ent-WeaponEnergyGunExpedition = { ent-WeaponEnergyGun }
+ .desc = { ent-WeaponEnergyGun.desc }
+ent-WeaponLaserCarbineExpedition = laser carbine
+ .desc = { ent-WeaponLaserCarbine.desc }
+ent-WeaponAdvancedLaserExpedition = { ent-WeaponAdvancedLaser }
+ .desc = { ent-WeaponAdvancedLaser.desc }
+ent-WeaponSniperRepeaterExpedition = { ent-WeaponSniperRepeater }
+ .desc = { ent-WeaponSniperRepeater.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/guns/revolvers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/guns/revolvers.ftl
index fc476182cba..e736ae425bc 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/guns/revolvers.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/guns/revolvers.ftl
@@ -1,8 +1,2 @@
ent-WeaponRevolverArgenti = Argenti
- .desc = Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo.
-ent-WeaponRevolverArgentiNonlethal = { ent-WeaponRevolverArgenti }
- .suffix = Non-lethal
- .desc = { ent-WeaponRevolverArgenti.desc }
-ent-WeaponRevolverDeckardNonlethal = { ent-WeaponRevolverDeckard }
- .suffix = Non-lethal
- .desc = { ent-WeaponRevolverDeckard.desc }
+ .desc = The civilian grade Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/launchers/launchers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/launchers/launchers.ftl
index 677aec9c0b7..864ad811a9f 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/launchers/launchers.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/launchers/launchers.ftl
@@ -2,7 +2,7 @@ ent-WeaponLauncherChinaLakeEmp = china lake
.desc = PLOOP
.suffix = EMP
ent-WeaponLauncherRocketEmp = RPG-7
- .desc = A modified ancient rocket-propelled grenade launcher.
+ .desc = A modified ancient rocket-propelled grenade launcher. On the handle is a label that says 'for authorized use only.'
.suffix = EMP
ent-WeaponMailLake = mail RPDS
.desc = Rap(b?)id Parcel Delivery System
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/melee/wizard_staff.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/melee/wizard_staff.ftl
index 4b29d5dee42..6221f9e48c2 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/melee/wizard_staff.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/melee/wizard_staff.ftl
@@ -1,10 +1,13 @@
ent-WizardStaffMeleeBase = wizard staff
.desc = Symbol of wizard's mastery of arcane arts.
-ent-WizardStaffMeleeRed = red wizard staff
+ent-WizardStaffMeleeRed = inert red wizard staff
.desc = { ent-WizardStaffMeleeBase.desc }
-ent-WizardStaffMeleeViolet = violet wizard staff
+ent-WizardStaffMeleeViolet = inert violet wizard staff
.desc = { ent-WizardStaffMeleeBase.desc }
-ent-WizardStaffMeleeSoap = soap wizard staff
+ent-WizardStaffMeleeSoap = inert soap wizard staff
.desc = { ent-WizardStaffMeleeBase.desc }
-ent-WizardStaffMeleeBlood = blood cult staff
+ent-WizardStaffMeleeBlood = inert cultist staff
.desc = { ent-WizardStaffMeleeRed.desc }
+ent-WizardStaffDarkBolt = cultist staff
+ .suffix = Dark bolt
+ .desc = { ent-WizardStaffMeleeBlood.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/snipers/snipers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/snipers/snipers.ftl
new file mode 100644
index 00000000000..07c00eb0f68
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/snipers/snipers.ftl
@@ -0,0 +1,2 @@
+ent-WeaponSniperRepeater = N2524 Pattern Repeater
+ .desc = A civilian grade lever action firearm, favored by space cowboys across the Frontier for its reliability and stopping power. Uses .45 magnum ammo.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/atm.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/atm.ftl
new file mode 100644
index 00000000000..59724dbed02
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/atm.ftl
@@ -0,0 +1,21 @@
+ent-ComputerBankATMBase = { "" }
+ .desc = { "" }
+ent-ComputerBankATMDeposit = bank atm
+ .desc = Used to deposit and withdraw funds from a personal bank account.
+ent-ComputerBankATMWithdraw = bank atm withdraw-only
+ .desc = Used to withdraw funds from a personal bank account, unable to deposit.
+ent-ComputerBankATM = { ent-ComputerBankATMDeposit }
+ .desc = { ent-ComputerBankATMDeposit.desc }
+ent-ComputerWithdrawBankATM = { ent-ComputerBankATMWithdraw }
+ .desc = { ent-ComputerBankATMWithdraw.desc }
+ent-ComputerWallmountBankATM = { ent-ComputerBankATMDeposit }
+ .suffix = Wallmount
+ .desc = { ent-ComputerBankATMDeposit.desc }
+ent-ComputerWallmountWithdrawBankATM = { ent-ComputerBankATMWithdraw }
+ .suffix = Wallmount
+ .desc = { ent-ComputerBankATMWithdraw.desc }
+ent-ComputerBlackMarketBankATM = { ent-ComputerBankATMDeposit }
+ .desc = Has some sketchy looking modifications and a sticker that says DEPOSIT FEE 30%
+ .suffix = BlackMarket
+ent-StationAdminBankATM = station administration console
+ .desc = Used to pay out from the station's bank account
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/decoration/banners.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/decoration/banners.ftl
index 3480cf74f26..41ceb497014 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/decoration/banners.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/decoration/banners.ftl
@@ -1,4 +1,6 @@
-ent-BannerNFSD = nfsd banner
+ent-BannerNfsd = nfsd banner
.desc = A banner displaying the colors of the new frontier sheriff's department.
-ent-FlagNFSD = nfsd flag
+ent-FlagNfsd = nfsd flag
.desc = A flag displaying the colors of the new frontier sheriff's department.
+ent-BannerGoblin01 = goblin banner
+ .desc = A banner displaying one of goblin clan symbols.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/access.ftl
index 965ff59bbd7..d99b27f8934 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/access.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/access.ftl
@@ -1,30 +1,69 @@
-ent-AirlockFrontierLocked = { ent-AirlockCommand }
+ent-AirlockFrontierLocked = { ent-AirlockCommandLocked }
.suffix = Frontier, Locked
- .desc = { ent-AirlockCommand.desc }
-ent-AirlockFrontierCommandLocked = { ent-AirlockCommand }
+ .desc = { ent-AirlockCommandLocked.desc }
+ent-AirlockSeviceFrontierLocked = { ent-AirlockServiceLocked }
+ .suffix = Frontier, Locked
+ .desc = { ent-AirlockServiceLocked.desc }
+ent-AirlockFrontierBridgeLocked = { ent-AirlockCommandLocked }
+ .suffix = Frontier Bridge, Locked
+ .desc = { ent-AirlockCommandLocked.desc }
+ent-AirlockMaintFrontierBridgeLocked = { ent-AirlockMaintCommandLocked }
+ .suffix = Frontier Bridge, Locked
+ .desc = { ent-AirlockMaintCommandLocked.desc }
+ent-AirlockFrontierCommandLocked = { ent-AirlockCommandLocked }
+ .suffix = Frontier Command, Locked
+ .desc = { ent-AirlockCommandLocked.desc }
+ent-HighSecFrontierCommandLocked = { ent-HighSecDoor }
.suffix = Frontier Command, Locked
- .desc = { ent-AirlockCommand.desc }
-ent-AirlockMailCarrierLocked = { ent-Airlock }
+ .desc = { ent-HighSecDoor.desc }
+ent-AirlockMailCarrierLocked = { ent-AirlockServiceLocked }
.suffix = Mail, Locked
- .desc = { ent-Airlock.desc }
+ .desc = { ent-AirlockServiceLocked.desc }
ent-AirlockMercenaryLocked = { ent-AirlockMercenary }
.suffix = Mercenary, Locked
.desc = { ent-AirlockMercenary.desc }
-ent-AirlockFrontierGlassLocked = { ent-AirlockCommandGlass }
+ent-AirlockNfsdGlassLocked = { ent-AirlockNfsdGlass }
+ .suffix = NFSD, Locked
+ .desc = { ent-AirlockNfsdGlass.desc }
+ent-AirlockNfsdLocked = { ent-AirlockNfsd }
+ .suffix = NFSD, Locked
+ .desc = { ent-AirlockNfsd.desc }
+ent-AirlockNfsdBrigLocked = { ent-AirlockNfsd }
+ .suffix = NFSD Brig, Locked
+ .desc = { ent-AirlockNfsd.desc }
+ent-AirlockNfsdBrigGlassLocked = { ent-AirlockNfsdGlass }
+ .suffix = NFSD Brig, Locked
+ .desc = { ent-AirlockNfsdGlass.desc }
+ent-AirlockNfsdDetectiveLocked = { ent-AirlockNfsd }
+ .suffix = NFSD Detective, Locked
+ .desc = { ent-AirlockNfsd.desc }
+ent-AirlockNfsdDetectiveGlassLocked = { ent-AirlockNfsdGlass }
+ .suffix = NFSD Detective, Locked
+ .desc = { ent-AirlockNfsdGlass.desc }
+ent-AirlockNfsdLawyerLocked = { ent-AirlockNfsd }
+ .suffix = NFSD Lawyer, Locked
+ .desc = { ent-AirlockNfsd.desc }
+ent-AirlockNfsdLawyerGlassLocked = { ent-AirlockNfsdGlass }
+ .suffix = NFSD Lawyer, Locked
+ .desc = { ent-AirlockNfsdGlass.desc }
+ent-AirlockNfsdArmoryLocked = { ent-AirlockNfsd }
+ .suffix = NFSD Armory, Locked
+ .desc = { ent-AirlockNfsd.desc }
+ent-AirlockNfsdArmoryGlassLocked = { ent-AirlockNfsdGlass }
+ .suffix = NFSD Armory, Locked
+ .desc = { ent-AirlockNfsdGlass.desc }
+ent-AirlockFrontierGlassLocked = { ent-AirlockCommandGlassLocked }
.suffix = Frontier, Locked
- .desc = { ent-AirlockCommandGlass.desc }
-ent-AirlockFrontierCommandGlassLocked = { ent-AirlockCommandGlass }
+ .desc = { ent-AirlockCommandGlassLocked.desc }
+ent-AirlockFrontierBridgeGlassLocked = { ent-AirlockCommandGlassLocked }
+ .suffix = Frontier Bridge, Locked
+ .desc = { ent-AirlockCommandGlassLocked.desc }
+ent-AirlockFrontierCommandGlassLocked = { ent-AirlockCommandGlassLocked }
.suffix = Frontier Command, Locked
- .desc = { ent-AirlockCommandGlass.desc }
+ .desc = { ent-AirlockCommandGlassLocked.desc }
ent-AirlockMailCarrierGlassLocked = { ent-AirlockGlass }
.suffix = Mail, Locked
.desc = { ent-AirlockGlass.desc }
ent-AirlockMercenaryGlassLocked = { ent-AirlockMercenaryGlass }
.suffix = Mercenary, Locked
.desc = { ent-AirlockMercenaryGlass.desc }
-ent-AirlockExternalGlassShuttleTransit = { ent-AirlockGlassShuttle }
- .suffix = External, PubTrans, Glass, Docking
- .desc = { ent-AirlockGlassShuttle.desc }
-ent-AirlockNFSDGlassLocked = { ent-AirlockNFSDGlass }
- .suffix = NFSD, Locked
- .desc = { ent-AirlockNFSDGlass.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/airlocks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/airlocks.ftl
index 8f2072b8e4e..128e1e2020e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/airlocks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/airlocks.ftl
@@ -1,9 +1,15 @@
ent-AirlockMercenary = { ent-Airlock }
.suffix = Mercenary
.desc = { ent-Airlock.desc }
+ent-AirlockNfsd = { ent-Airlock }
+ .suffix = NFSD
+ .desc = { ent-Airlock.desc }
ent-AirlockMercenaryGlass = { ent-AirlockGlass }
.suffix = Mercenary
.desc = { ent-AirlockGlass.desc }
-ent-AirlockNFSDGlass = { ent-AirlockGlass }
+ent-AirlockNfsdGlass = { ent-AirlockGlass }
.suffix = NFSD
.desc = { ent-AirlockGlass.desc }
+ent-AirlockExternalGlassShuttleTransit = { ent-AirlockGlassShuttle }
+ .suffix = External, PubTrans, Glass, Docking
+ .desc = { ent-AirlockGlassShuttle.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/holographic/projections.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/holographic/projections.ftl
new file mode 100644
index 00000000000..4dd3e6b7da3
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/holographic/projections.ftl
@@ -0,0 +1,2 @@
+ent-HolosignNfsd = nfsd holographic barrier
+ .desc = A barrier of hard light that blocks movement, but pretty weak.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers.ftl
index 6c9fc2b7b30..8143be1a46c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers.ftl
@@ -1,15 +1,3 @@
-ent-ComputerShipyard = shipyard console
- .desc = Used to purchase and sell shuttles
-ent-ComputerShipyardSecurity = security shipyard console
- .desc = Used to enlist into Nanotrasen Security Forces
-ent-ComputerShipyardNFSD = nfsd shipyard console
- .desc = Used to buy nfsd patrol vessels
-ent-ComputerShipyardBlackMarket = black market shipyard console
- .desc = Used to buy ships not available through other means. Has a sticker that says SALES TAX 30%
-ent-ComputerShipyardExpedition = expedition shipyard console
- .desc = Used to buy ships outfitted for planetary expeditions
-ent-ComputerShipyardScrap = scrapyard console
- .desc = Used to purchase and sell "shuttles"
ent-ComputerPalletConsoleNFNormalMarket = cargo sale computer
.desc = Used to sell goods loaded onto cargo pallets
.suffix = Normal
@@ -24,3 +12,8 @@ ent-ComputerPalletConsoleNFVeryLowMarket = { ent-ComputerPalletConsoleNFNormalMa
.suffix = VeryLow
ent-ComputerContrabandPalletConsole = contraband exchange computer
.desc = Used to exchange contraband
+ent-ComputerShuttleAntag = { ent-ComputerShuttle }
+ .desc = { ent-ComputerShuttle.desc }
+ent-ComputerIFFPOI = IFF computer
+ .desc = Allows you to control the IFF and stealth characteristics of this station.
+ .suffix = POI
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_shipyard.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_shipyard.ftl
new file mode 100644
index 00000000000..cf10c81f72f
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_shipyard.ftl
@@ -0,0 +1,14 @@
+ent-ComputerShipyard = shipyard console
+ .desc = Used to purchase and sell shuttles
+ent-ComputerShipyardSecurity = security shipyard console
+ .desc = Used to enlist into Nanotrasen Security Forces
+ent-ComputerShipyardNfsd = nfsd shipyard console
+ .desc = Used to buy nfsd patrol vessels
+ent-ComputerShipyardSyndicate = syndicate shipyard console
+ .desc = Used to buy ships not available through other means. Has a sticker that says SALES TAX 30%
+ent-ComputerShipyardBlackMarket = black market shipyard console
+ .desc = Used to buy ships not available through other means. Has a sticker that says SALES TAX 30%
+ent-ComputerShipyardExpedition = expedition shipyard console
+ .desc = Used to buy ships outfitted for planetary expeditions
+ent-ComputerShipyardScrap = scrapyard console
+ .desc = Used to purchase and sell "shuttles"
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_shipyard_mothership.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_shipyard_mothership.ftl
new file mode 100644
index 00000000000..ccca0c44acd
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_shipyard_mothership.ftl
@@ -0,0 +1,15 @@
+ent-BaseMothershipComputer = { ent-ComputerShipyard }
+ .desc = Used on motherships to purchase and sell ships without returning to a station.
+ .suffix = Mothership
+ent-EmpressMothershipComputer = empress shipyard console
+ .desc = { ent-BaseMothershipComputer.desc }
+ent-McCargoMothershipComputer = mccargo shipyard console
+ .desc = { ent-BaseMothershipComputer.desc }
+ent-CaduceusMothershipComputer = caduceus shipyard console
+ .desc = { ent-BaseMothershipComputer.desc }
+ent-GasbenderMothershipComputer = gasbender shipyard console
+ .desc = { ent-BaseMothershipComputer.desc }
+ent-CrescentMothershipComputer = crescent shipyard console
+ .desc = { ent-BaseMothershipComputer.desc }
+ent-MailCarrierMothershipComputer = mail carrier shipyard console
+ .desc = { ent-BaseMothershipComputer.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_tabletop.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_tabletop.ftl
index 14cf2d4c3b1..930e08ec3a5 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_tabletop.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_tabletop.ftl
@@ -1,94 +1,83 @@
ent-ComputerTabletopAlert = { ent-ComputerAlert }
- .desc = { ent-ComputerAlert.desc }
+ .desc = { ent-ComputerAlert.desc }
ent-ComputerTabletopEmergencyShuttle = { ent-ComputerEmergencyShuttle }
- .desc = { ent-ComputerEmergencyShuttle.desc }
+ .desc = { ent-ComputerEmergencyShuttle.desc }
ent-ComputerTabletopShuttle = { ent-ComputerShuttle }
- .desc = { ent-ComputerShuttle.desc }
+ .desc = { ent-ComputerShuttle.desc }
ent-ComputerTabletopShuttleSyndie = { ent-ComputerShuttleSyndie }
- .desc = { ent-ComputerShuttleSyndie.desc }
+ .desc = { ent-ComputerShuttleSyndie.desc }
ent-ComputerTabletopShuttleCargo = { ent-ComputerShuttleCargo }
- .desc = { ent-ComputerShuttleCargo.desc }
+ .desc = { ent-ComputerShuttleCargo.desc }
ent-ComputerTabletopShuttleSalvage = { ent-ComputerShuttleSalvage }
- .desc = { ent-ComputerShuttleSalvage.desc }
+ .desc = { ent-ComputerShuttleSalvage.desc }
ent-ComputerTabletopIFF = { ent-ComputerIFF }
- .desc = { ent-ComputerIFF.desc }
+ .desc = { ent-ComputerIFF.desc }
ent-ComputerTabletopIFFSyndicate = { ent-ComputerIFFSyndicate }
- .suffix = Syndicate, Tabletop
- .desc = { ent-ComputerIFFSyndicate.desc }
+ .suffix = Syndicate, Tabletop
+ .desc = { ent-ComputerIFFSyndicate.desc }
ent-ComputerTabletopPowerMonitoring = { ent-ComputerPowerMonitoring }
- .desc = { ent-ComputerPowerMonitoring.desc }
+ .desc = { ent-ComputerPowerMonitoring.desc }
ent-ComputerTabletopMedicalRecords = { ent-ComputerMedicalRecords }
- .desc = { ent-ComputerMedicalRecords.desc }
+ .desc = { ent-ComputerMedicalRecords.desc }
ent-ComputerTabletopCriminalRecords = { ent-ComputerCriminalRecords }
- .desc = { ent-ComputerCriminalRecords.desc }
+ .desc = { ent-ComputerCriminalRecords.desc }
ent-ComputerTabletopStationRecords = { ent-ComputerStationRecords }
- .desc = { ent-ComputerStationRecords.desc }
+ .desc = { ent-ComputerStationRecords.desc }
ent-ComputerTabletopCrewMonitoring = { ent-ComputerCrewMonitoring }
- .desc = { ent-ComputerCrewMonitoring.desc }
+ .desc = { ent-ComputerCrewMonitoring.desc }
ent-ComputerTabletopResearchAndDevelopment = { ent-ComputerResearchAndDevelopment }
- .desc = { ComputerResearchAndDevelopment.desc }
+ .desc = { ent-ComputerResearchAndDevelopment.desc }
ent-ComputerTabletopAnalysisConsole = { ent-ComputerAnalysisConsole }
- .desc = { ent-ComputerAnalysisConsole.desc }
+ .desc = { ent-ComputerAnalysisConsole.desc }
ent-ComputerTabletopId = { ent-ComputerId }
- .desc = { ent-ComputerId.desc }
+ .desc = { ent-ComputerId.desc }
ent-ComputerTabletopBodyScanner = { ent-computerBodyScanner }
- .desc = { ent-computerBodyScanner.desc }
+ .desc = { ent-computerBodyScanner.desc }
ent-ComputerTabletopComms = { ent-ComputerComms }
.desc = { ent-ComputerComms.desc }
ent-SyndicateComputerTabletopComms = { ent-SyndicateComputerComms }
- .desc = { ent-SyndicateComputerComms.desc }
+ .desc = { ent-SyndicateComputerComms.desc }
ent-ComputerTabletopSolarControl = { ent-ComputerSolarControl }
.desc = { ent-ComputerSolarControl.desc }
ent-ComputerTabletopRadar = { ent-ComputerRadar }
- .desc = { ent-ComputerRadar.desc }
+ .desc = { ent-ComputerRadar.desc }
+ent-ComputerTabletopAdvancedRadar = { ent-ComputerAdvancedRadar }
+ .desc = { ent-ComputerAdvancedRadar.desc }
ent-ComputerTabletopCargoShuttle = { ent-ComputerCargoShuttle }
.desc = { ent-ComputerCargoShuttle.desc }
ent-ComputerTabletopCargoOrders = { ent-ComputerCargoOrders }
- .desc = { ent-ComputerCargoOrders.desc }
+ .desc = { ent-ComputerCargoOrders.desc }
ent-ComputerTabletopCargoBounty = { ent-ComputerCargoBounty }
- .desc = { ent-ComputerCargoBounty.desc }
+ .desc = { ent-ComputerCargoBounty.desc }
ent-ComputerTabletopCloningConsole = { ent-ComputerCloningConsole }
- .desc = { ent-ComputerCloningConsole.desc }
-ent-ComputerTabletopSalvageExpedition = { ent-BaseStructureComputerTabletop }
- .desc = { ent-ComputerSalvageExpedition.desc }
+ .desc = { ent-ComputerCloningConsole.desc }
+ent-ComputerTabletopSalvageExpedition = { ent-ComputerSalvageExpedition }
+ .desc = { ent-ComputerSalvageExpedition.desc }
ent-ComputerTabletopSurveillanceCameraMonitor = { ent-ComputerSurveillanceCameraMonitor }
- .desc = { ent-ComputerSurveillanceCameraMonitor.desc }
+ .desc = { ent-ComputerSurveillanceCameraMonitor.desc }
ent-ComputerTabletopSurveillanceWirelessCameraMonitor = { ent-ComputerSurveillanceWirelessCameraMonitor }
- .desc = { ent-ComputerSurveillanceWirelessCameraMonitor.desc }
+ .desc = { ent-ComputerSurveillanceWirelessCameraMonitor.desc }
ent-ComputerTabletopMassMedia = { ent-ComputerMassMedia }
- .desc = { ent-ComputerMassMedia.desc }
+ .desc = { ent-ComputerMassMedia.desc }
ent-ComputerTabletopSensorMonitoring = { ent-ComputerSensorMonitoring }
- .suffix = Tabletop, TESTING, DO NOT MAP
- .desc = { ent-ComputerSensorMonitoring.desc }
-ent-ComputerTabletopShipyard = { ent-ComputerShipyard }
- .desc = { ent-ComputerShipyard.desc }
-ent-BaseMothershipComputerTabletop = { ent-BaseMothershipComputer }
- .desc = { ent-BaseMothershipComputer.desc }
-ent-ComputerTabletopShipyardSecurity = { ent-ComputerShipyardSecurity }
- .desc = { ent-ComputerShipyardSecurity.desc }
-ent-ComputerTabletopShipyardBlackMarket = { ent-ComputerShipyardBlackMarket }
- .desc = { ent-ComputerShipyardBlackMarket.desc }
-ent-ComputerTabletopShipyardExpedition = { ent-ComputerShipyardExpedition }
- .desc = { ent-ComputerShipyardExpedition.desc }
-ent-ComputerTabletopShipyardScrap = { ent-ComputerShipyardScrap }
- .desc = { ent-ComputerShipyardScrap.desc }
+ .suffix = Tabletop, TESTING, DO NOT MAP
+ .desc = { ent-ComputerSensorMonitoring.desc }
ent-ComputerTabletopPalletConsoleNFHighMarket = { ent-ComputerPalletConsoleNFHighMarket }
- .suffix = High, Tabletop
- .desc = { ent-ComputerPalletConsoleNFHighMarket.desc }
+ .suffix = High, Tabletop
+ .desc = { ent-ComputerPalletConsoleNFHighMarket.desc }
ent-ComputerTabletopPalletConsoleNFNormalMarket = { ent-ComputerPalletConsoleNFNormalMarket }
- .suffix = Normal, Tabletop
- .desc = { ent-ComputerPalletConsoleNFNormalMarket.desc }
+ .suffix = Normal, Tabletop
+ .desc = { ent-ComputerPalletConsoleNFNormalMarket.desc }
ent-ComputerTabletopPalletConsoleNFLowMarket = { ent-ComputerPalletConsoleNFLowMarket }
- .suffix = Low, Tabletop
- .desc = { ent-ComputerPalletConsoleNFLowMarket.desc }
+ .suffix = Low, Tabletop
+ .desc = { ent-ComputerPalletConsoleNFLowMarket.desc }
ent-ComputerTabletopPalletConsoleNFVeryLowMarket = { ent-ComputerPalletConsoleNFVeryLowMarket }
- .suffix = VeryLow, Tabletop
- .desc = { ent-ComputerPalletConsoleNFVeryLowMarket.desc }
+ .suffix = VeryLow, Tabletop
+ .desc = { ent-ComputerPalletConsoleNFVeryLowMarket.desc }
ent-ComputerTabletopStationAdminBankATM = { ent-StationAdminBankATM }
- .desc = { ent-StationAdminBankATM.desc }
+ .desc = { ent-StationAdminBankATM.desc }
ent-ComputerTabletopContrabandPalletConsole = { ent-ComputerContrabandPalletConsole }
- .desc = { ent-ComputerContrabandPalletConsole.desc }
-ent-ComputerTabletopAdvancedRadar = { ent-ComputerAdvancedRadar }
- .desc = { ent-ComputerAdvancedRadar.desc }
-ent-ComputerTabletopShipyardNFSD = { ent-ComputerShipyardNFSD }
- .desc = { ent-ComputerShipyardNFSD.desc }
\ No newline at end of file
+ .desc = { ent-ComputerContrabandPalletConsole.desc }
+ent-ComputerTabletopComputerIFFPOI = { ent-ComputerIFFPOI }
+ .suffix = POI, Tabletop
+ .desc = { ent-ComputerIFFPOI.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_tabletop_shipyard.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_tabletop_shipyard.ftl
new file mode 100644
index 00000000000..11a45249d50
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_tabletop_shipyard.ftl
@@ -0,0 +1,14 @@
+ent-ComputerTabletopShipyard = { ent-ComputerShipyard }
+ .desc = { ent-ComputerShipyard.desc }
+ent-BaseMothershipComputerTabletop = { ent-BaseMothershipComputer }
+ .desc = { ent-BaseMothershipComputer.desc }
+ent-ComputerTabletopShipyardSecurity = { ent-ComputerShipyardSecurity }
+ .desc = { ent-ComputerShipyardSecurity.desc }
+ent-ComputerTabletopShipyardNfsd = { ent-ComputerShipyardNfsd }
+ .desc = { ent-ComputerShipyardNfsd.desc }
+ent-ComputerTabletopShipyardBlackMarket = { ent-ComputerShipyardBlackMarket }
+ .desc = { ent-ComputerShipyardBlackMarket.desc }
+ent-ComputerTabletopShipyardExpedition = { ent-ComputerShipyardExpedition }
+ .desc = { ent-ComputerShipyardExpedition.desc }
+ent-ComputerTabletopShipyardScrap = { ent-ComputerShipyardScrap }
+ .desc = { ent-ComputerShipyardScrap.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/cryopod.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/cryopod.ftl
new file mode 100644
index 00000000000..b399b778886
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/cryopod.ftl
@@ -0,0 +1,2 @@
+ent-MachineCryoSleepPod = cryo sleep chamber
+ .desc = cold pillow guaranteed
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/fax_machine.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/fax_machine.ftl
index c6fbd77f1e2..f0e4d540363 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/fax_machine.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/fax_machine.ftl
@@ -1,3 +1,6 @@
ent-FaxMachineShip = { ent-FaxMachineBase }
.suffix = Ship
.desc = { ent-FaxMachineBase.desc }
+ent-FaxMachineShipAntag = { ent-FaxMachineShip }
+ .suffix = Ship, Antag
+ .desc = { ent-FaxMachineShip.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/lathe.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/lathe.ftl
index a0d6235de08..bb71fcbf508 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/lathe.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/lathe.ftl
@@ -4,5 +4,5 @@ ent-TilePrinterNF = tile-meister 5000
.desc = Prints floor tiles. No mercy.
ent-SalvageTechfabNF = salvage techfab
.desc = Prints equipment for salvagers.
-ent-NFSDTechFab = nfsd techfab
+ent-NfsdTechFab = nfsd techfab
.desc = Prints equipment for use by nfsd.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/telecomms.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/telecomms.ftl
index 444fca7feb0..ceb6a358450 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/telecomms.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/telecomms.ftl
@@ -4,3 +4,9 @@ ent-TelecomServerFilledShuttle = { ent-TelecomServer }
ent-TelecomServerFilledSecurity = { ent-TelecomServer }
.suffix = Ship, Security
.desc = { ent-TelecomServer.desc }
+ent-TelecomServerFilledSyndicate = { ent-TelecomServer }
+ .suffix = Syndicate
+ .desc = { ent-TelecomServer.desc }
+ent-TelecomServerFilledFreelance = { ent-TelecomServer }
+ .suffix = Freelance
+ .desc = { ent-TelecomServer.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/vending_machines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/vending_machines.ftl
index 5c7cd85ee3a..4ac6468529a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/vending_machines.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/vending_machines.ftl
@@ -4,6 +4,8 @@ ent-VendingMachineAstroVend = AstroVend
.desc = Essential gear for the space-men on the go
ent-VendingMachineFlatpackVend = FlatpackVend
.desc = Essential tech for the space-men on the go
+ent-VendingMachineExpeditionaryFlatpackVend = Expeditionary FlatpackVend
+ .desc = Essential tech for the space-men on an expedition
ent-VendingMachineSyndieContraband = ContraVend
.desc = Wanted across multiple sectors!
ent-VendingMachineBountyVend = BountyVend
@@ -16,7 +18,10 @@ ent-VendingMachineAutoTuneVend = AutoTune
.desc = feeling BASSed? time to TUNE into AutoVend! Take NOTES and let your audience TREBLE
ent-VendingMachinePottedPlantVend = Plant-O-Matic
.desc = Sometimes potted plants are the best crewmates money can get.
-ent-VendingMachineNFSDDrobe = NFSDDrobe
+ent-VendingMachineNfsdDrobe = NFSDDrobe
.desc = A vending machine for NFSD and NFSD clothing!
-ent-VendingMachineNFSDTec = NFSDTec
+ent-VendingMachineNfsdTech = NFSDTech
.desc = A vending machine for NFSD and NFSD tech!
+ent-VendingMachineCartNfsd = { ent-VendingMachineCart }
+ .suffix = NFSD
+ .desc = { ent-VendingMachineCart.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters.ftl
index cb08782a6b8..a4fc97669cf 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters.ftl
@@ -1,36 +1,4 @@
-ent-BaseThrusterSecurity = { ent-BaseThruster }
- .desc = { ent-BaseThruster.desc }
-ent-ThrusterSecurity = thruster
- .suffix = Security
- .desc = { ent-BaseThrusterSecurity.desc }
-ent-ThrusterSecurityUnanchored = { ent-ThrusterUnanchored }
- .suffix = Unanchored, Security
- .desc = { ent-ThrusterUnanchored.desc }
-ent-DebugThrusterSecurity = thruster
- .suffix = DEBUG, Security
- .desc = { ent-DebugThruster.desc }
ent-SmallThruster = small thruster
.desc = { ent-Thruster.desc }
-ent-SmallThrusterUnanchored = { ent-SmallThruster }
- .suffix = Unanchored
- .desc = { ent-SmallThruster.desc }
-ent-GyroscopeSecurity = { ent-Gyroscope }
- .suffix = Security
- .desc = { ent-Gyroscope.desc }
-ent-GyroscopeSecurityUnanchored = { ent-GyroscopeSecurity }
- .suffix = Unanchored, Security
- .desc = { ent-GyroscopeSecurity.desc }
-ent-DebugGyroscopeSecurity = gyroscope
- .suffix = DEBUG, Security
- .desc = { ent-DebugGyroscope.desc }
-ent-SmallGyroscopeSecurity = small gyroscope
- .suffix = Security
- .desc = { ent-GyroscopeSecurity.desc }
-ent-SmallGyroscopeSecurityUnanchored = { ent-SmallGyroscopeSecurity }
- .suffix = Unanchored, Security
- .desc = { ent-SmallGyroscopeSecurity.desc }
ent-SmallGyroscope = small gyroscope
.desc = { ent-Gyroscope.desc }
-ent-SmallGyroscopeUnanchored = { ent-SmallGyroscope }
- .suffix = Unanchored
- .desc = { ent-SmallGyroscope.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters_nfsd.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters_nfsd.ftl
new file mode 100644
index 00000000000..300967f91c6
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters_nfsd.ftl
@@ -0,0 +1,15 @@
+ent-ThrusterNfsd = { ent-ThrusterSecurity }
+ .suffix = NFSD
+ .desc = { ent-ThrusterSecurity.desc }
+ent-DebugThrusterNfsd = { ent-DebugThrusterSecurity }
+ .suffix = DEBUG, NFSD
+ .desc = { ent-DebugThrusterSecurity.desc }
+ent-GyroscopeNfsd = { ent-GyroscopeSecurity }
+ .suffix = NFSD
+ .desc = { ent-GyroscopeSecurity.desc }
+ent-DebugGyroscopeNfsd = { ent-DebugGyroscopeSecurity }
+ .suffix = DEBUG, NFSD
+ .desc = { ent-DebugGyroscopeSecurity.desc }
+ent-SmallGyroscopeNfsd = small gyroscope
+ .suffix = NFSD
+ .desc = { ent-GyroscopeSecurity.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters_security.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters_security.ftl
new file mode 100644
index 00000000000..f644304ac7a
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters_security.ftl
@@ -0,0 +1,15 @@
+ent-ThrusterSecurity = thruster
+ .suffix = Security
+ .desc = { ent-Thruster.desc }
+ent-DebugThrusterSecurity = thruster
+ .suffix = DEBUG, Security
+ .desc = { ent-DebugThruster.desc }
+ent-GyroscopeSecurity = { ent-Gyroscope }
+ .suffix = Security
+ .desc = { ent-Gyroscope.desc }
+ent-DebugGyroscopeSecurity = gyroscope
+ .suffix = DEBUG, Security
+ .desc = { ent-DebugGyroscope.desc }
+ent-SmallGyroscopeSecurity = small gyroscope
+ .suffix = Security
+ .desc = { ent-GyroscopeSecurity.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/specific/bloodcult.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/specific/bloodcult.ftl
index 1e014b34416..feeccd679c9 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/specific/bloodcult.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/specific/bloodcult.ftl
@@ -17,12 +17,12 @@ ent-BloodCultAlwaysPoweredLight = blood cult light
.suffix = Always powered
ent-BloodCultProp01 = curious object
.desc = Huh, I wonder what this thing is and what does it do.
-ent-BloodCultProp02 = curious object
- .desc = Huh, I wonder what this thing is and what does it do.
-ent-BloodCultProp03 = curious object
- .desc = Huh, I wonder what this thing is and what does it do.
-ent-BloodCultProp04 = curious object
- .desc = Huh, I wonder what this thing is and what does it do.
+ent-BloodCultProp02 = blood cult forge
+ .desc = A forge for weapon and armor production.
+ent-BloodCultProp03 = blood cult shrine
+ .desc = An occult shrine for imbuing objects with vile energies.
+ent-BloodCultProp04 = blood cult workbench
+ .desc = An occult workbench with handy drawers. There is a severed hand in one.
ent-BloodCultProp05 = curious object
.desc = Huh, I wonder what this thing is and what does it do.
ent-BloodCultProp07 = curious object
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/closets/lockers/lockers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/closets/lockers/lockers.ftl
index deede1b9bd0..86f3db5ac3e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/closets/lockers/lockers.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/closets/lockers/lockers.ftl
@@ -8,17 +8,19 @@ ent-LockerPilot = pilot's locker
.desc = { ent-LockerBaseSecure.desc }
ent-LockerWoodenGeneric = wooden cabinet
.desc = Dusty old wooden cabinet. Smells like grandparents.
-ent-LockernfsdEvidence = nfsd evidence locker
+ent-LockerNfsdEvidence = nfsd evidence locker
.desc = { ent-LockerBaseSecure.desc }
-ent-LockernfsdCopper = nfsd cadet locker
+ent-LockerNfsdCopper = nfsd cadet locker
.desc = { ent-LockerBaseSecure.desc }
-ent-LockernfsdSilver = nfsd deputy locker
+ent-LockerNfsdSilver = nfsd deputy locker
.desc = { ent-LockerBaseSecure.desc }
-ent-LockernfsdBrigmedic = nfsd brigmedic locker
+ent-LockerNfsdBrigmedic = nfsd brigmedic locker
.desc = { ent-LockerBaseSecure.desc }
-ent-LockernfsdSergeant = nfsd sergeant locker
+ent-LockerNfsdSergeant = nfsd sergeant locker
.desc = { ent-LockerBaseSecure.desc }
-ent-LockernfsdBailiff = nfsd bailiff locker
+ent-LockerNfsdBailiff = nfsd bailiff locker
.desc = { ent-LockerBaseSecure.desc }
-ent-LockernfsdSheriff = nfsd sheriff's locker
+ent-LockerNfsdSheriff = nfsd sheriff's locker
.desc = { ent-LockerBaseSecure.desc }
+ent-LockerStationRepresentative = station representative's locker
+ .desc = { ent-LockerBaseSecure.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/crates/crates.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/crates/crates.ftl
index b454b2a314b..98ec60039fb 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/crates/crates.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/crates/crates.ftl
@@ -12,9 +12,11 @@ ent-CrateTradeContrabandSecureDonk = Donk Co. contraband crate
.desc = { ent-CrateTradeBaseSecure.desc }
ent-CrateTradeContrabandSecureCyberSun = Cybersun Industries contraband crate
.desc = { ent-CrateTradeBaseSecure.desc }
-ent-CratenfsdBrigmedic = brigmedic crate
+ent-CrateNfsdBrigmedic = brigmedic crate
.desc = { ent-CrateSecgear.desc }
-ent-CratenfsdSecure1 = nfsd crate
+ent-CrateNfsdSecure1 = nfsd crate
.desc = { ent-CrateSecgear.desc }
-ent-CratenfsdSecure2 = nfsd crate
+ent-CrateNfsdSecure2 = nfsd crate
.desc = { ent-CrateSecgear.desc }
+ent-CratePirateGrey = pirate chest
+ .desc = A space pirate chest, not for station lubbers.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/wallmounts/intercom.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/wallmounts/intercom.ftl
index e52112df425..29fe1b1d57e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/wallmounts/intercom.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/wallmounts/intercom.ftl
@@ -1,3 +1,3 @@
-ent-IntercomNFSD = { ent-Intercom }
+ent-IntercomNfsd = { ent-IntercomSecurity }
.suffix = NFSD
- .desc = { ent-Intercom.desc }
+ .desc = { ent-IntercomSecurity.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/wallmounts/signs/signs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/wallmounts/signs/signs.ftl
new file mode 100644
index 00000000000..6f99d53be17
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/wallmounts/signs/signs.ftl
@@ -0,0 +1,4 @@
+ent-BaseSignDirectionalNF = { ent-BaseSignDirectional }
+ .desc = { ent-BaseSignDirectional.desc }
+ent-SignDirectionalSr = sr sign
+ .desc = A direction sign, pointing out which way the station representative's office is.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/tiles/water.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/tiles/water.ftl
new file mode 100644
index 00000000000..f575ea3fa03
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/tiles/water.ftl
@@ -0,0 +1,3 @@
+ent-FloorWaterDecorativeEntity = water
+ .desc = A real thirst quencher.
+ .suffix = Decorative
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events.ftl
index cf186cebcc0..8f6d88abf20 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events.ftl
@@ -1,24 +1,24 @@
-ent-BluespaceCargo = { ent-BaseGameRule }
+ent-BreakerFlip = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
-ent-BluespaceSyndicateCrate = { ent-BaseGameRule }
+ent-FalseAlarm = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
-ent-BluespaceCacheError = { ent-BaseGameRule }
+ent-GasLeak = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
-ent-BluespaceVaultError = { ent-BaseGameRule }
+ent-MouseMigration = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
-ent-BluespaceVaultSmallError = { ent-BaseGameRule }
+ent-CockroachMigration = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
-ent-BluespaceAsteroid = { ent-BaseGameRule }
+ent-PowerGridCheck = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
-ent-BluespaceAsteroidBunker = { ent-BaseGameRule }
+ent-RandomSentience = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
-ent-BluespaceCargoniaShip = { ent-BaseGameRule }
+ent-SolarFlare = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
-ent-BluespaceArcIndDataCarrier = { ent-BaseGameRule }
+ent-VentClog = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
-ent-BluespaceSyndicateFTLInterception = { ent-BaseGameRule }
+ent-MassHallucinations = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
-ent-BluespaceWizardFederationScout = { ent-BaseGameRule }
+ent-IonStorm = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
-ent-BluespaceBloodMoon = { ent-BaseGameRule }
+ent-LoneOpsSpawn = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events_bluespace.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events_bluespace.ftl
new file mode 100644
index 00000000000..fa6d5dfaf54
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events_bluespace.ftl
@@ -0,0 +1,14 @@
+ent-BluespaceCacheError = { ent-BaseGameRule }
+ .desc = { ent-BaseGameRule.desc }
+ent-BluespaceVaultError = { ent-BaseGameRule }
+ .desc = { ent-BaseGameRule.desc }
+ent-BluespaceVaultSmallError = { ent-BaseGameRule }
+ .desc = { ent-BaseGameRule.desc }
+ent-BluespaceArcIndDataCarrier = { ent-BaseGameRule }
+ .desc = { ent-BaseGameRule.desc }
+ent-BluespaceSyndicateFTLInterception = { ent-BaseGameRule }
+ .desc = { ent-BaseGameRule.desc }
+ent-BluespaceWizardFederationScout = { ent-BaseGameRule }
+ .desc = { ent-BaseGameRule.desc }
+ent-BluespaceBloodMoon = { ent-BaseGameRule }
+ .desc = { ent-BaseGameRule.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events_nf.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events_nf.ftl
new file mode 100644
index 00000000000..3834ceb4f86
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events_nf.ftl
@@ -0,0 +1,4 @@
+ent-BluespaceCargo = { ent-BaseGameRule }
+ .desc = { ent-BaseGameRule.desc }
+ent-BluespaceSyndicateCrate = { ent-BaseGameRule }
+ .desc = { ent-BaseGameRule.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/markers/spawners/jobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/markers/spawners/jobs.ftl
index c8f9ed8964e..f57fca1e425 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/markers/spawners/jobs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/markers/spawners/jobs.ftl
@@ -1,10 +1,26 @@
+ent-SpawnPointContractor = contractor
+ .desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointMercenary = mercenary
.desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointPilot = pilot
.desc = { ent-SpawnPointJobBase.desc }
+ent-SpawnPointPirate = pirate
+ .desc = { ent-SpawnPointJobBase.desc }
+ent-SpawnPointPirateCaptain = pirate captain
+ .desc = { ent-SpawnPointJobBase.desc }
+ent-SpawnPointPirateFirstMate = pirate first mate
+ .desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointStc = stc
.desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointSecurityGuard = security guard
.desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointERTMailCarrier = ERTmailcarrier
.desc = { ent-SpawnPointJobBase.desc }
+ent-SpawnPointStationRepresentative = station representative
+ .desc = { ent-SpawnPointHeadOfPersonnel.desc }
+ent-SpawnPointSheriff = sheriff
+ .desc = { ent-SpawnPointHeadOfSecurity.desc }
+ent-SpawnPointBailiff = bailiff
+ .desc = { ent-SpawnPointWarden.desc }
+ent-SpawnPointDetectiveNF = detective nf
+ .desc = { ent-SpawnPointDetective.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/markers/spawners/untimedAISpawners.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/markers/spawners/untimedAISpawners.ftl
index 0e1ba1c7455..aba7b859d07 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/markers/spawners/untimedAISpawners.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/markers/spawners/untimedAISpawners.ftl
@@ -1,12 +1,12 @@
-ent-XenoAISpawnerEasy = NPC Xeno Spawner
+ent-XenoAISpawnerEasy = Xeno Spawner
.suffix = Easy
.desc = { ent-MarkerBase.desc }
-ent-XenoAISpawnerMedium = NPC Xeno Spawner
+ent-XenoAISpawnerMedium = Xeno Spawner
.suffix = Medium
.desc = { ent-MarkerBase.desc }
-ent-XenoAISpawnerHard = NPC Xeno Spawner
+ent-XenoAISpawnerHard = Xeno Spawner
.suffix = Hard
.desc = { ent-MarkerBase.desc }
-ent-XenoAISpawnerQueen = NPC Xeno Spawner
+ent-XenoAISpawnerQueen = Xeno Spawner
.suffix = Queen
.desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/objects/consumable/food/meat_goblin.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/objects/consumable/food/meat_goblin.ftl
new file mode 100644
index 00000000000..9744d3d7c00
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/objects/consumable/food/meat_goblin.ftl
@@ -0,0 +1,2 @@
+ent-FoodMeatGoblin = raw goblin meat
+ .desc = Just look at that marbling! Wait, is that microplastic?
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/shipyard/base.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/shipyard/base.ftl
index 2277553c1f6..442e3a1b2dc 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/shipyard/base.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/shipyard/base.ftl
@@ -8,10 +8,10 @@ ent-StandardFrontierVessel = { ent-BaseStation }
.desc = { ent-BaseStation.desc }
ent-StandardFrontierSecurityVessel = { ent-BaseStation }
.desc = { ent-BaseStation.desc }
-ent-StandardFrontierSecurityExpeditionVessel = { ent-BaseStationExpeditions }
- .desc = { ent-BaseStationExpeditions.desc }
-ent-StandardFrontierExpeditionVessel = { ent-BaseStationExpeditions }
- .desc = { ent-BaseStationExpeditions.desc }
+ent-StandardFrontierSecurityExpeditionVessel = { ent-BaseStation }
+ .desc = { ent-BaseStation.desc }
+ent-StandardFrontierExpeditionVessel = { ent-BaseStation }
+ .desc = { ent-BaseStation.desc }
ent-BaseStationSiliconLawFrontierStation = { "" }
.desc = { "" }
ent-BaseStationSiliconLawFrontierShips = { "" }
@@ -21,4 +21,4 @@ ent-BaseStationRenameFaxes = { "" }
ent-BaseStationRenameWarpPoints = { "" }
.desc = { "" }
ent-BaseStationEmpImmune = { "" }
- .desc = { "" }
\ No newline at end of file
+ .desc = { "" }
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 70d8858d267..fafd87f7e85 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl
@@ -1,3 +1,5 @@
+ent-BaseSuicideAction = { "" }
+ .desc = { "" }
ent-ActionScream = Scream
.desc = AAAAAAAAAAAAAAAAAAAAAAAAA
ent-ActionTurnUndead = Turn Undead
@@ -20,6 +22,8 @@ ent-ActionActivateScramImplant = SCRAM!
.desc = Randomly teleports you within a large distance.
ent-ActionActivateDnaScramblerImplant = Scramble DNA
.desc = Randomly changes your name and appearance.
+ent-ActionMorphGeras = Morph into Geras
+ .desc = Morphs you into a Geras - a miniature version of you which allows you to move fast, at the cost of your inventory.
ent-ActionToggleSuitPiece = Toggle Suit Piece
.desc = Remember to equip the important pieces of your suit before going into action.
ent-ActionCombatModeToggle = [color=red]Combat Mode[/color]
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/alerts/alerts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/alerts/alerts.ftl
new file mode 100644
index 00000000000..8ef83838d76
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/alerts/alerts.ftl
@@ -0,0 +1,2 @@
+ent-AlertSpriteView = { "" }
+ .desc = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/alerts/revenant.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/alerts/revenant.ftl
new file mode 100644
index 00000000000..f510cdc0397
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/alerts/revenant.ftl
@@ -0,0 +1,2 @@
+ent-AlertEssenceSpriteView = { "" }
+ .desc = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/arachnid.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/arachnid.ftl
index acf9788f892..759ad5afe83 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/arachnid.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/arachnid.ftl
@@ -1,22 +1,22 @@
ent-PartArachnid = arachnid body part
.desc = { ent-BasePart.desc }
ent-TorsoArachnid = arachnid torso
- .desc = { ent-BaseTorso.desc }
+ .desc = { ent-PartArachnid.desc }
ent-HeadArachnid = arachnid head
- .desc = { ent-BaseHead.desc }
+ .desc = { ent-PartArachnid.desc }
ent-LeftArmArachnid = left arachnid arm
- .desc = { ent-BaseLeftArm.desc }
+ .desc = { ent-PartArachnid.desc }
ent-RightArmArachnid = right arachnid arm
- .desc = { ent-BaseRightArm.desc }
+ .desc = { ent-PartArachnid.desc }
ent-LeftHandArachnid = left arachnid hand
- .desc = { ent-BaseLeftHand.desc }
+ .desc = { ent-PartArachnid.desc }
ent-RightHandArachnid = right arachnid hand
- .desc = { ent-BaseRightHand.desc }
+ .desc = { ent-PartArachnid.desc }
ent-LeftLegArachnid = left arachnid leg
- .desc = { ent-BaseLeftLeg.desc }
+ .desc = { ent-PartArachnid.desc }
ent-RightLegArachnid = right arachnid leg
- .desc = { ent-BaseRightLeg.desc }
+ .desc = { ent-PartArachnid.desc }
ent-LeftFootArachnid = left arachnid foot
- .desc = { ent-BaseLeftFoot.desc }
+ .desc = { ent-PartArachnid.desc }
ent-RightFootArachnid = right arachnid foot
- .desc = { ent-BaseRightFoot.desc }
\ No newline at end of file
+ .desc = { ent-PartArachnid.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/diona.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/diona.ftl
index 1d191488436..3ab8787ffc3 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/diona.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/diona.ftl
@@ -1,22 +1,22 @@
ent-PartDiona = diona body part
.desc = { ent-BasePart.desc }
ent-TorsoDiona = diona torso
- .desc = { ent-BaseTorso.desc }
+ .desc = { ent-PartDiona.desc }
ent-HeadDiona = diona head
- .desc = { ent-BaseHead.desc }
+ .desc = { ent-PartDiona.desc }
ent-LeftArmDiona = left diona arm
- .desc = { ent-BaseLeftArm.desc }
+ .desc = { ent-PartDiona.desc }
ent-RightArmDiona = right diona arm
- .desc = { ent-BaseRightArm.desc }
+ .desc = { ent-PartDiona.desc }
ent-LeftHandDiona = left diona hand
- .desc = { ent-BaseLeftHand.desc }
+ .desc = { ent-PartDiona.desc }
ent-RightHandDiona = right diona hand
- .desc = { ent-BaseRightHand.desc }
+ .desc = { ent-PartDiona.desc }
ent-LeftLegDiona = left diona leg
- .desc = { ent-BaseLeftLeg.desc }
+ .desc = { ent-PartDiona.desc }
ent-RightLegDiona = right diona leg
- .desc = { ent-BaseRightLeg.desc }
+ .desc = { ent-PartDiona.desc }
ent-LeftFootDiona = left diona foot
- .desc = { ent-BaseLeftFoot.desc }
+ .desc = { ent-PartDiona.desc }
ent-RightFootDiona = right diona foot
- .desc = { ent-BaseRightFoot.desc }
\ No newline at end of file
+ .desc = { ent-PartDiona.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/gingerbread.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/gingerbread.ftl
index c2f1aa0a3e0..be2db3977d8 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/gingerbread.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/gingerbread.ftl
@@ -1,22 +1,22 @@
ent-PartGingerbread = gingerbead body part
.desc = { ent-BasePart.desc }
ent-TorsoGingerbread = gingerbread torso
- .desc = { ent-BaseTorso.desc }
+ .desc = { ent-PartGingerbread.desc }
ent-HeadGingerbread = gingerbread head
- .desc = { ent-BaseHead.desc }
+ .desc = { ent-PartGingerbread.desc }
ent-LeftArmGingerbread = left gingerbread arm
- .desc = { ent-BaseLeftArm.desc }
+ .desc = { ent-PartGingerbread.desc }
ent-RightArmGingerbread = right gingerbread arm
- .desc = { ent-BaseRightArm.desc }
+ .desc = { ent-PartGingerbread.desc }
ent-LeftHandGingerbread = left gingerbread hand
- .desc = { ent-BaseLeftHand.desc }
+ .desc = { ent-PartGingerbread.desc }
ent-RightHandGingerbread = right gingerbread hand
- .desc = { ent-BaseRightHand.desc }
+ .desc = { ent-PartGingerbread.desc }
ent-LeftLegGingerbread = left gingerbread leg
- .desc = { ent-BaseLeftLeg.desc }
+ .desc = { ent-PartGingerbread.desc }
ent-RightLegGingerbread = right gingerbread leg
- .desc = { ent-BaseRightLeg.desc }
+ .desc = { ent-PartGingerbread.desc }
ent-LeftFootGingerbread = left gingerbread foot
- .desc = { ent-BaseLeftFoot.desc }
+ .desc = { ent-PartGingerbread.desc }
ent-RightFootGingerbread = right gingerbread foot
- .desc = { ent-BaseRightFoot.desc }
\ No newline at end of file
+ .desc = { ent-PartGingerbread.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/human.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/human.ftl
index 972e1c89848..2455c5b09e5 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/human.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/human.ftl
@@ -1,22 +1,22 @@
ent-PartHuman = human body part
.desc = { ent-BasePart.desc }
ent-TorsoHuman = human torso
- .desc = { ent-BaseTorso.desc }
+ .desc = { ent-PartHuman.desc }
ent-HeadHuman = human head
- .desc = { ent-BaseHead.desc }
+ .desc = { ent-PartHuman.desc }
ent-LeftArmHuman = left human arm
- .desc = { ent-BaseLeftArm.desc }
+ .desc = { ent-PartHuman.desc }
ent-RightArmHuman = right human arm
- .desc = { ent-BaseRightArm.desc }
+ .desc = { ent-PartHuman.desc }
ent-LeftHandHuman = left human hand
- .desc = { ent-BaseLeftHand.desc }
+ .desc = { ent-PartHuman.desc }
ent-RightHandHuman = right human hand
- .desc = { ent-BaseRightHand.desc }
+ .desc = { ent-PartHuman.desc }
ent-LeftLegHuman = left human leg
- .desc = { ent-BaseLeftLeg.desc }
+ .desc = { ent-PartHuman.desc }
ent-RightLegHuman = right human leg
- .desc = { ent-BaseRightLeg.desc }
+ .desc = { ent-PartHuman.desc }
ent-LeftFootHuman = left human foot
- .desc = { ent-BaseLeftFoot.desc }
+ .desc = { ent-PartHuman.desc }
ent-RightFootHuman = right human foot
- .desc = { ent-BaseRightFoot.desc }
\ No newline at end of file
+ .desc = { ent-PartHuman.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/moth.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/moth.ftl
index 67948d4868e..8c2ed8cba42 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/moth.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/moth.ftl
@@ -1,22 +1,22 @@
ent-PartMoth = moth body part
.desc = { ent-BasePart.desc }
ent-TorsoMoth = moth torso
- .desc = { ent-BaseTorso.desc }
+ .desc = { ent-PartMoth.desc }
ent-HeadMoth = moth head
- .desc = { ent-BaseHead.desc }
+ .desc = { ent-PartMoth.desc }
ent-LeftArmMoth = left moth arm
- .desc = { ent-BaseLeftArm.desc }
+ .desc = { ent-PartMoth.desc }
ent-RightArmMoth = right moth arm
- .desc = { ent-BaseRightArm.desc }
+ .desc = { ent-PartMoth.desc }
ent-LeftHandMoth = left moth hand
- .desc = { ent-BaseLeftHand.desc }
+ .desc = { ent-PartMoth.desc }
ent-RightHandMoth = right moth hand
- .desc = { ent-BaseRightHand.desc }
+ .desc = { ent-PartMoth.desc }
ent-LeftLegMoth = left moth leg
- .desc = { ent-BaseLeftLeg.desc }
+ .desc = { ent-PartMoth.desc }
ent-RightLegMoth = right moth leg
- .desc = { ent-BaseRightLeg.desc }
+ .desc = { ent-PartMoth.desc }
ent-LeftFootMoth = left moth foot
- .desc = { ent-BaseLeftFoot.desc }
+ .desc = { ent-PartMoth.desc }
ent-RightFootMoth = right moth foot
- .desc = { ent-BaseRightFoot.desc }
\ No newline at end of file
+ .desc = { ent-PartMoth.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/reptilian.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/reptilian.ftl
index b2faffe0cd5..5627a17c21b 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/reptilian.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/reptilian.ftl
@@ -1,22 +1,22 @@
ent-PartReptilian = reptilian body part
.desc = { ent-BasePart.desc }
ent-TorsoReptilian = reptilian torso
- .desc = { ent-BaseTorso.desc }
+ .desc = { ent-PartReptilian.desc }
ent-HeadReptilian = reptilian head
- .desc = { ent-BaseHead.desc }
+ .desc = { ent-PartReptilian.desc }
ent-LeftArmReptilian = left reptilian arm
- .desc = { ent-BaseLeftArm.desc }
+ .desc = { ent-PartReptilian.desc }
ent-RightArmReptilian = right reptilian arm
- .desc = { ent-BaseRightArm.desc }
+ .desc = { ent-PartReptilian.desc }
ent-LeftHandReptilian = left reptilian hand
- .desc = { ent-BaseLeftHand.desc }
+ .desc = { ent-PartReptilian.desc }
ent-RightHandReptilian = right reptilian hand
- .desc = { ent-BaseRightHand.desc }
+ .desc = { ent-PartReptilian.desc }
ent-LeftLegReptilian = left reptilian leg
- .desc = { ent-BaseLeftLeg.desc }
+ .desc = { ent-PartReptilian.desc }
ent-RightLegReptilian = right reptilian leg
- .desc = { ent-BaseRightLeg.desc }
+ .desc = { ent-PartReptilian.desc }
ent-LeftFootReptilian = left reptilian foot
- .desc = { ent-BaseLeftFoot.desc }
+ .desc = { ent-PartReptilian.desc }
ent-RightFootReptilian = right reptilian foot
- .desc = { ent-BaseRightFoot.desc }
\ No newline at end of file
+ .desc = { ent-PartReptilian.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/slime.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/slime.ftl
index 442a2457db1..7c082758ab2 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/slime.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/slime.ftl
@@ -1,22 +1,22 @@
ent-PartSlime = slime body part
.desc = { ent-BasePart.desc }
ent-TorsoSlime = slime torso
- .desc = { ent-BaseTorso.desc }
+ .desc = { ent-PartSlime.desc }
ent-HeadSlime = slime head
- .desc = { ent-BaseHead.desc }
+ .desc = { ent-PartSlime.desc }
ent-LeftArmSlime = left slime arm
- .desc = { ent-BaseLeftArm.desc }
+ .desc = { ent-PartSlime.desc }
ent-RightArmSlime = right slime arm
- .desc = { ent-BaseRightArm.desc }
+ .desc = { ent-PartSlime.desc }
ent-LeftHandSlime = left slime hand
- .desc = { ent-BaseLeftHand.desc }
+ .desc = { ent-PartSlime.desc }
ent-RightHandSlime = right slime hand
- .desc = { ent-BaseRightHand.desc }
+ .desc = { ent-PartSlime.desc }
ent-LeftLegSlime = left slime leg
- .desc = { ent-BaseLeftLeg.desc }
+ .desc = { ent-PartSlime.desc }
ent-RightLegSlime = right slime leg
- .desc = { ent-BaseRightLeg.desc }
+ .desc = { ent-PartSlime.desc }
ent-LeftFootSlime = left slime foot
- .desc = { ent-BaseLeftFoot.desc }
+ .desc = { ent-PartSlime.desc }
ent-RightFootSlime = right slime foot
- .desc = { ent-BaseRightFoot.desc }
\ No newline at end of file
+ .desc = { ent-PartSlime.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl
index f7241e97668..dda9d4bf12d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl
@@ -50,3 +50,5 @@ ent-ClothingBackpackDuffelSyndicateOperativeMedic = operative medic duffelbag
.desc = A large duffel bag for holding extra medical supplies.
ent-ClothingBackpackDuffelSyndicateMedicalBundleFilled = medical bundle
.desc = All you need to get your comrades back in the fight.
+ent-ClothingBackpackDuffelSyndicateDecoyKitFilled = decoy bundle
+ .desc = Contains distractions, both auditory and visual. Smell coming soon.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl
index 4b622764dab..efdb3790a46 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl
@@ -4,8 +4,8 @@ ent-ClothingBackpackClownFilled = { ent-ClothingBackpackClown }
.desc = { ent-ClothingBackpackClown.desc }
ent-ClothingBackpackSecurityFilled = { ent-ClothingBackpackSecurity }
.desc = { ent-ClothingBackpackSecurity.desc }
-ent-ClothingBackpackFilledDetective = { ent-ClothingBackpack }
- .desc = { ent-ClothingBackpack.desc }
+ent-ClothingBackpackSecurityFilledDetective = { ent-ClothingBackpackSecurity }
+ .desc = { ent-ClothingBackpackSecurity.desc }
ent-ClothingBackpackMedicalFilled = { ent-ClothingBackpackMedical }
.desc = { ent-ClothingBackpackMedical.desc }
ent-ClothingBackpackParamedicFilled = { ent-ClothingBackpackMedical }
@@ -18,6 +18,8 @@ ent-ClothingBackpackResearchDirectorFilled = { ent-ClothingBackpackScience }
.desc = { ent-ClothingBackpackScience.desc }
ent-ClothingBackpackHOPFilled = { ent-ClothingBackpack }
.desc = { ent-ClothingBackpack.desc }
+ent-ClothingBackpackHOPIanFilled = { ent-ClothingBackpackIan }
+ .desc = { ent-ClothingBackpackIan.desc }
ent-ClothingBackpackCMOFilled = { ent-ClothingBackpackMedical }
.desc = { ent-ClothingBackpackMedical.desc }
ent-ClothingBackpackQuartermasterFilled = { ent-ClothingBackpackCargo }
@@ -38,6 +40,8 @@ ent-ClothingBackpackChemistryFilled = { ent-ClothingBackpackChemistry }
.desc = { ent-ClothingBackpackChemistry.desc }
ent-ClothingBackpackChaplainFilled = { ent-ClothingBackpack }
.desc = { ent-ClothingBackpack.desc }
+ent-ClothingBackpackLawyerFilled = { ent-ClothingBackpack }
+ .desc = { ent-ClothingBackpack.desc }
ent-ClothingBackpackMusicianFilled = { ent-ClothingBackpack }
.desc = { ent-ClothingBackpack.desc }
ent-ClothingBackpackLibrarianFilled = { ent-ClothingBackpack }
@@ -54,6 +58,8 @@ ent-ClothingBackpackERTEngineerFilled = { ent-ClothingBackpackERTEngineer }
.desc = { ent-ClothingBackpackERTEngineer.desc }
ent-ClothingBackpackERTJanitorFilled = { ent-ClothingBackpackERTJanitor }
.desc = { ent-ClothingBackpackERTJanitor.desc }
+ent-ClothingBackpackERTChaplainFilled = { ent-ClothingBackpackERTChaplain }
+ .desc = { ent-ClothingBackpackERTChaplain.desc }
ent-ClothingBackpackDeathSquadFilled = death squad backpack
.desc = Holds the kit of CentComm's most feared agents.
ent-ClothingBackpackCargoFilled = { ent-ClothingBackpackCargo }
@@ -63,5 +69,3 @@ ent-ClothingBackpackSalvageFilled = { ent-ClothingBackpackSalvage }
ent-ClothingBackpackPirateFilled = { ent-ClothingBackpackSatchelLeather }
.suffix = Filled, Pirate
.desc = { ent-ClothingBackpackSatchelLeather.desc }
-ent-ClothingBackpackBrigmedicFilled = { ent-ClothingBackpackBrigmedic }
- .desc = { ent-ClothingBackpackBrigmedic.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/duffelbag.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/duffelbag.ftl
index 7e724fa9020..90b8dccb45b 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/duffelbag.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/duffelbag.ftl
@@ -4,10 +4,8 @@ ent-ClothingBackpackDuffelClownFilled = { ent-ClothingBackpackDuffelClown }
.desc = { ent-ClothingBackpackDuffelClown.desc }
ent-ClothingBackpackDuffelSecurityFilled = { ent-ClothingBackpackDuffelSecurity }
.desc = { ent-ClothingBackpackDuffelSecurity.desc }
-ent-ClothingBackpackDuffelFilledDetective = { ent-ClothingBackpackDuffel }
- .desc = { ent-ClothingBackpackDuffel.desc }
-ent-ClothingBackpackDuffelBrigmedicFilled = { ent-ClothingBackpackDuffelBrigmedic }
- .desc = { ent-ClothingBackpackDuffelBrigmedic.desc }
+ent-ClothingBackpackDuffelSecurityFilledDetective = { ent-ClothingBackpackDuffelSecurity }
+ .desc = { ent-ClothingBackpackDuffelSecurity.desc }
ent-ClothingBackpackDuffelMedicalFilled = { ent-ClothingBackpackDuffelMedical }
.desc = { ent-ClothingBackpackDuffelMedical.desc }
ent-ClothingBackpackDuffelParamedicFilled = { ent-ClothingBackpackDuffelMedical }
@@ -40,6 +38,8 @@ ent-ClothingBackpackDuffelChemistryFilled = { ent-ClothingBackpackDuffelChemistr
.desc = { ent-ClothingBackpackDuffelChemistry.desc }
ent-ClothingBackpackDuffelChaplainFilled = { ent-ClothingBackpackDuffel }
.desc = { ent-ClothingBackpackDuffel.desc }
+ent-ClothingBackpackDuffelLawyerFilled = { ent-ClothingBackpackDuffel }
+ .desc = { ent-ClothingBackpackDuffel.desc }
ent-ClothingBackpackDuffelMusicianFilled = { ent-ClothingBackpackDuffel }
.desc = { ent-ClothingBackpackDuffel.desc }
ent-ClothingBackpackDuffelLibrarianFilled = { ent-ClothingBackpackDuffel }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl
index 60aedc0f060..7ca2f340523 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl
@@ -6,10 +6,8 @@ ent-ClothingBackpackSatchelClownFilled = { ent-ClothingBackpackSatchelClown }
.desc = { ent-ClothingBackpackSatchelClown.desc }
ent-ClothingBackpackSatchelSecurityFilled = { ent-ClothingBackpackSatchelSecurity }
.desc = { ent-ClothingBackpackSatchelSecurity.desc }
-ent-ClothingBackpackSatchelFilledDetective = { ent-ClothingBackpackSatchel }
- .desc = { ent-ClothingBackpackSatchel.desc }
-ent-ClothingBackpackSatchelBrigmedicFilled = { ent-ClothingBackpackSatchelBrigmedic }
- .desc = { ent-ClothingBackpackSatchelBrigmedic.desc }
+ent-ClothingBackpackSatchelSecurityFilledDetective = { ent-ClothingBackpackSatchelSecurity }
+ .desc = { ent-ClothingBackpackSatchelSecurity.desc }
ent-ClothingBackpackSatchelMedicalFilled = { ent-ClothingBackpackSatchelMedical }
.desc = { ent-ClothingBackpackSatchelMedical.desc }
ent-ClothingBackpackSatchelParamedicFilled = { ent-ClothingBackpackSatchelMedical }
@@ -40,6 +38,8 @@ ent-ClothingBackpackSatchelChemistryFilled = { ent-ClothingBackpackSatchelChemis
.desc = { ent-ClothingBackpackSatchelChemistry.desc }
ent-ClothingBackpackSatchelChaplainFilled = { ent-ClothingBackpackSatchel }
.desc = { ent-ClothingBackpackSatchel.desc }
+ent-ClothingBackpackSatchelLawyerFilled = { ent-ClothingBackpackSatchel }
+ .desc = { ent-ClothingBackpackSatchel.desc }
ent-ClothingBackpackSatchelMusicianFilled = { ent-ClothingBackpackSatchel }
.desc = { ent-ClothingBackpackSatchel.desc }
ent-ClothingBackpackSatchelLibrarianFilled = { ent-ClothingBackpackSatchel }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl
index 1858f509596..f3d9f619b5c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl
@@ -4,40 +4,28 @@ ent-BoxMagazinePistolCaselessRifle = box of .25 caseless magazines
.desc = A box full of .25 caseless magazines.
ent-BoxMagazinePistolCaselessRiflePractice = box of .25 caseless (practice) magazines
.desc = A box full of .25 caseless practice magazines.
-ent-BoxMagazineCaselessRifleRubber = box of .25 caseless (rubber) magazines
- .desc = A box full of
ent-BoxMagazineLightRifle = box of .30 rifle magazines
.desc = A box full of .30 rifle magazines.
ent-BoxMagazineLightRiflePractice = box of .30 rifle (practice) magazines
.desc = A box full of .30 rifle (practice) magazines.
-ent-BoxMagazineLightRifleRubber = box of .30 rifle (rubber) magazines
- .desc = A box full of .30 rifle (practice) magazines.
ent-BoxMagazineMagnumSubMachineGun = box of Vector magazines
.desc = A box full of Vector magazines.
ent-BoxMagazineMagnumSubMachineGunPractice = box of Vector (practice) magazines
.desc = A box full of Vector (practice) magazines.
-ent-BoxMagazineMagnumSubMachineGunRubber = box of Vector (rubber) magazines
- .desc = A box full of Vector (rubber) magazines.
ent-BoxMagazinePistolSubMachineGunTopMounted = box of WT550 .35 auto magazines
.desc = A box full of WT550 .35 auto magazines.
ent-BoxMagazinePistol = box of pistol .35 auto magazines
.desc = A box full of pistol .35 auto magazines.
ent-BoxMagazinePistolPractice = box of pistol .35 auto (practice) magazines
.desc = A box full of magazines.
-ent-BoxMagazinePistolRubber = box of pistol .35 auto (rubber) magazines
- .desc = A box full of pistol .35 auto (rubber) magazines.
ent-BoxMagazinePistolHighCapacity = box of machine pistol .35 auto magazines
.desc = A box full of machine pistol .35 auto magazines.
ent-BoxMagazinePistolHighCapacityPractice = box of machine pistol .35 auto (practice) magazines
.desc = A box full of machine pistol .35 auto (practice) magazines.
-ent-BoxMagazinePistolHighCapacityRubber = box of machine pistol .35 auto (rubber) magazines
- .desc = A box full of machine pistol .35 auto (rubber) magazines.
ent-BoxMagazinePistolSubMachineGun = box of SMG .35 auto magazines
.desc = A box full of SMG .35 auto magazines.
ent-BoxMagazinePistolSubMachineGunPractice = box of SMG .35 auto (practice) magazines
.desc = A box full of SMG .35 auto (practice) magazines.
-ent-BoxMagazinePistolSubMachineGunRubber = box of SMG .35 auto (rubber) magazines
- .desc = A box full of SMG .35 auto (rubber) magazines.
ent-BoxMagazinePistolSubMachineGunEmp = box of SMG .35 auto (emp) magazines
.desc = A box full of SMG .35 auto (emp) magazines.
ent-BoxMagazineShotgun = box of (.50 pellet) ammo drums
@@ -52,5 +40,3 @@ ent-BoxMagazineRifle = box of .20 rifle magazines
.desc = A box full of .20 rifle magazines.
ent-BoxMagazineRiflePractice = box of .20 rifle (practice) magazines
.desc = A box full of .20 rifle (practice) magazines.
-ent-BoxMagazineRifleRubber = box of .20 rifle (rubber) magazines
- .desc = A box full of .20 rifle (rubber) magazines.
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 a37bf83c3db..927a69525ce 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
@@ -3,15 +3,13 @@ ent-BoxSurvival = survival box
ent-BoxSurvivalEngineering = extended-capacity survival box
.desc = It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank.
ent-BoxSurvivalSecurity = survival box
- .desc = It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank.
+ .desc = It's a box with basic internals inside.
.suffix = Security
-ent-BoxSurvivalBrigmedic = survival box
- .desc = It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank.
- .suffix = MedSec
ent-BoxSurvivalMedical = survival box
.desc = It's a box with basic internals inside.
.suffix = Medical
ent-BoxHug = box of hugs
.desc = A special box for sensitive people.
+ .suffix = Emergency
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/catalog/fills/boxes/general.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/general.ftl
index 74562991ed7..01e78ecca32 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/general.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/general.ftl
@@ -18,8 +18,9 @@ ent-BoxMesonScanners = meson box
.desc = A box of spare meson goggles.
ent-BoxMRE = M.R.E.
.desc = A box of decades old military surplus rations. It is surprisingly not rotten.
-ent-BoxHugHealing = box of hugs
- .desc = A special box for sensitive people.
+ent-BoxHugHealing = { ent-BoxHug }
+ .suffix = Medical
+ .desc = { ent-BoxHug.desc }
ent-BoxInflatable = inflatable wall box
.desc = Inflatable walls are not to be used as floatation devices.
ent-BoxPerformer = hatsune miku day bag
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl
index ca3dcb9949f..fe300db1bc1 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl
@@ -10,8 +10,6 @@ ent-BoxLatexGloves = latex gloves box
.desc = Contains sterile latex gloves.
ent-BoxNitrileGloves = nitrile gloves box
.desc = Contains sterile nitrile gloves. Better than latex.
-ent-BoxMouthSwab = sterile swab box
- .desc = { ent-BoxCardboard.desc }
ent-BoxBodyBag = body bag box
.desc = Contains body bags.
ent-BoxVial = vial box
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl
index f1c897772ba..1360537ab35 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl
@@ -3,3 +3,5 @@ ent-ElectricalDisruptionKit = electrical disruption kit
.desc = { ent-BoxCardboard.desc }
ent-ChemicalSynthesisKit = chemical synthesis kit
.desc = A starter kit for the aspiring chemist, includes toxin and vestine for all your criminal needs!
+ent-ThrowingKnivesKit = throwing knives kit
+ .desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl
index 5921e53eeaa..987bdffbccf 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl
@@ -22,9 +22,9 @@ ent-CrateAirlockKit = airlock kit
.desc = A kit for building 6 airlocks, doesn't include tools.
ent-CrateEvaKit = EVA kit
.desc = A set consisting of two prestigious EVA suits and helmets.
-ent-CrateRCDAmmo = RCD ammo crate
- .desc = 3 RCD ammo, each restoring 5 charges.
+ent-CrateRCDAmmo = compressed matter crate
+ .desc = Contains three compressed matter cartridges.
ent-CrateRCD = RCD crate
- .desc = A crate containing a single Rapid Construction Device.
+ .desc = A crate containing a single rapid construction device.
ent-CrateParticleDecelerators = particle decelerators crate
.desc = A crate containing 3 Particle Decelerators.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engines.ftl
index 67cfbf012d5..fc213777970 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engines.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engines.ftl
@@ -7,7 +7,7 @@ ent-CrateEngineeringAMEControl = antimatter control unit crate
ent-CrateEngineeringSingularityEmitter = emitter crate
.desc = An emitter, best used for singularity engines.
ent-CrateEngineeringSingularityCollector = radiation collector crate
- .desc = A radiation collector, best used for singularity engines.
+ .desc = A radiation collector, best used for singularity engines. Plasma is included.
ent-CrateEngineeringSingularityContainment = containment field generator crate
.desc = A containment field generator, keeps the singulo in submission.
ent-CrateEngineeringSingularityGenerator = singularity generator crate
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/materials.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/materials.ftl
index 183968d14d7..00bbd234428 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/materials.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/materials.ftl
@@ -8,6 +8,8 @@ ent-CrateMaterialPlastic = plastic sheet crate
.desc = 90 sheets of plastic.
ent-CrateMaterialWood = wood crate
.desc = Bunch of wood planks.
+ent-CrateMaterialBrass = brass crate
+ .desc = 90 sheets of brass.
ent-CrateMaterialPlasteel = plasteel crate
.desc = 90 sheets of plasteel.
ent-CrateMaterialPlasma = solid plasma crate
@@ -16,5 +18,5 @@ ent-CrateMaterialCardboard = cardboard crate
.desc = 60 pieces of cardboard.
ent-CrateMaterialPaper = paper crate
.desc = 90 sheets of paper.
-ent-CrateMaterialUranium = { ent-CrateUranium }
- .desc = { ent-CrateUranium.desc }
+ent-CrateMaterialUranium = uranium crate
+ .desc = 90 sheets of uranium.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/vending.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/vending.ftl
index e41565e2997..887bb193a75 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/vending.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/vending.ftl
@@ -3,7 +3,9 @@ ent-CrateVendingMachineRestockBoozeFilled = Booze-O-Mat restock crate
ent-CrateVendingMachineRestockChefvendFilled = ChefVend restock crate
.desc = Contains a restock box for the ChefVend.
ent-CrateVendingMachineRestockClothesFilled = clothing restock crate
- .desc = Contains a pair of restock boxes, one for the ClothesMate and one for the AutoDrobe.
+ .desc = Contains a restock box for the clothes vending machines.
+ent-CrateVendingMachineRestockAutoDrobeFilled = AutoDrobe restock crate
+ .desc = Contains a restock box for the AutoDrobe.
ent-CrateVendingMachineRestockCondimentStationFilled = condiment station restock crate
.desc = Contains a restock box for the condiment station.
ent-CrateVendingMachineRestockDinnerwareFilled = Plasteel Chef restock crate
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/belt.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/belt.ftl
index fafa1a7baa7..6320b28618f 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/belt.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/belt.ftl
@@ -10,6 +10,9 @@ ent-ClothingBeltChiefEngineerFilled = { ent-ClothingBeltChiefEngineer }
ent-ClothingBeltSecurityFilled = { ent-ClothingBeltSecurity }
.suffix = Filled
.desc = { ent-ClothingBeltSecurity.desc }
+ent-ClothingBeltSecurityWebbingFilled = { ent-ClothingBeltSecurityWebbing }
+ .suffix = Filled
+ .desc = { ent-ClothingBeltSecurityWebbing.desc }
ent-ClothingBeltJanitorFilled = { ent-ClothingBeltJanitor }
.suffix = Filled
.desc = { ent-ClothingBeltJanitor.desc }
@@ -40,6 +43,3 @@ ent-ClothingBeltHolsterFilled = { ent-ClothingBeltHolster }
ent-ClothingBeltChefFilled = { ent-ClothingBeltChef }
.suffix = Filled
.desc = { ent-ClothingBeltChef.desc }
-ent-ClothingNeckMantleSheriffFilled = { ent-ClothingNeckMantleSheriff }
- .suffix = Filled
- .desc = { ent-ClothingNeckMantleSheriff.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/briefcases.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/briefcases.ftl
index 748709bd238..74f47ccc4ac 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/briefcases.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/briefcases.ftl
@@ -1,12 +1,12 @@
-ent-BriefcaseBrownFilled = brown briefcase
+ent-BriefcaseBrownFilled = { ent-BriefcaseBrown }
.suffix = Filled, Paper
.desc = { ent-BriefcaseBrown.desc }
-ent-BriefcaseSyndieSniperBundleFilled = brown briefcase
- .suffix = SniperBundle
+ent-BriefcaseSyndieSniperBundleFilled = { ent-BriefcaseSyndie }
+ .suffix = Syndicate, Sniper Bundle
.desc = { ent-BriefcaseSyndie.desc }
-ent-BriefcaseSyndieLobbyingBundleFilled = brown briefcase
+ent-BriefcaseSyndieLobbyingBundleFilled = { ent-BriefcaseSyndie }
.suffix = Syndicate, Spesos
.desc = { ent-BriefcaseSyndie.desc }
-ent-BriefcaseThiefBribingBundleFilled = brown briefcase
+ent-BriefcaseThiefBribingBundleFilled = { ent-BriefcaseSyndie }
.suffix = Thief, Spesos
.desc = { ent-BriefcaseSyndie.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/misc.ftl
index 0fc5433d0c5..0de3e0cadbd 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/misc.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/misc.ftl
@@ -7,6 +7,9 @@ ent-ClosetEmergencyFilledRandom = { ent-ClosetEmergency }
ent-ClosetWallEmergencyFilledRandom = { ent-ClosetWallEmergency }
.suffix = Filled, Random
.desc = { ent-ClosetWallEmergency.desc }
+ent-ClosetEmergencyN2FilledRandom = { ent-ClosetEmergencyN2 }
+ .suffix = Filled, Random
+ .desc = { ent-ClosetEmergencyN2.desc }
ent-ClosetFireFilled = { ent-ClosetFire }
.suffix = Filled
.desc = { ent-ClosetFire.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/space_ruin.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/space_ruin.ftl
index d472c43299d..fde48669cbc 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/space_ruin.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/space_ruin.ftl
@@ -1,3 +1,9 @@
ent-LockerOldAISat = closet
.suffix = NTSRA voidsuit locker
.desc = { ent-LockerSyndicate.desc }
+ent-LockerSyndicateShipGearBasic = { ent-LockerSyndicate }
+ .suffix = Basic ship gear, Random
+ .desc = { ent-LockerSyndicate.desc }
+ent-LockerSyndicateShipGearBasicChameleonKit = { ent-LockerSyndicateShipGearBasic }
+ .suffix = Basic ship gear, Random, Chameleon Kit
+ .desc = { ent-LockerSyndicateShipGearBasic.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/actions/translator.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/actions/translator.ftl
new file mode 100644
index 00000000000..dc3a8015aba
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/actions/translator.ftl
@@ -0,0 +1,2 @@
+ent-ActionToggleTranslator = Toggle Translator
+ .desc = Turn the translator on and off.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/organs/elzuosa.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/organs/elzuosa.ftl
new file mode 100644
index 00000000000..11a053e7580
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/organs/elzuosa.ftl
@@ -0,0 +1,10 @@
+ent-BaseElzuosaOrgan = { ent-BaseHumanOrganUnGibbable }
+ .desc = { ent-BaseHumanOrganUnGibbable.desc }
+ent-OrganElzuosaBrain = brain
+ .desc = The source of incredible, unending intelligence. Honk.
+ent-OrganElzuosaLungs = lungs
+ .desc = Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier.
+ent-OrganElzuosaHeart = heart
+ .desc = I feel bad for the heartless bastard who lost this.
+ent-OrganElzuosaStomach = stomach
+ .desc = Gross. This is hard to stomach.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/organs/resomi.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/organs/resomi.ftl
new file mode 100644
index 00000000000..16d3c288b66
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/organs/resomi.ftl
@@ -0,0 +1,20 @@
+ent-BaseResomiOrgan = { ent-BaseItem }
+ .desc = { ent-BaseItem.desc }
+ent-OrganResomiBrain = brain
+ .desc = The source of incredible, unending intelligence. Honk.
+ent-OrganResomiEyes = eyes
+ .desc = I see you!
+ent-OrganResomiTongue = tongue
+ .desc = A fleshy muscle mostly used for lying.
+ent-OrganResomiAppendix = appendix
+ .desc = { ent-BaseResomiOrgan.desc }
+ent-OrganResomiLungs = lungs
+ .desc = Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier.
+ent-OrganResomiHeart = heart
+ .desc = I feel bad for the heartless bastard who lost this.
+ent-OrganResomiStomach = stomach
+ .desc = Gross. This is hard to stomach.
+ent-OrganResomiLiver = liver
+ .desc = Pairing suggestion: chianti and fava beans.
+ent-OrganResomiKidneys = kidneys
+ .desc = Filters toxins from the bloodstream.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/parts/elzuosa.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/parts/elzuosa.ftl
new file mode 100644
index 00000000000..1125e8725da
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/parts/elzuosa.ftl
@@ -0,0 +1,18 @@
+ent-PartElzuosa = elzuosa body part
+ .desc = { ent-BasePart.desc }
+ent-TorsoElzuosa = elzuosa torso
+ .desc = { ent-BaseTorso.desc }
+ent-HeadElzuosa = elzuosa head
+ .desc = { ent-PartElzuosa.desc }
+ent-LeftArmElzuosa = left elzuosa arm
+ .desc = { ent-PartElzuosa.desc }
+ent-RightArmElzuosa = right elzuosa arm
+ .desc = { ent-PartElzuosa.desc }
+ent-LeftHandElzuosa = left elzuosa hand
+ .desc = { ent-PartElzuosa.desc }
+ent-RightHandElzuosa = right elzuosa hand
+ .desc = { ent-PartElzuosa.desc }
+ent-LeftLegElzuosa = left elzuosa leg
+ .desc = { ent-PartElzuosa.desc }
+ent-RightLegElzuosa = right elzuosa leg
+ .desc = { ent-PartElzuosa.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/parts/resomi.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/parts/resomi.ftl
new file mode 100644
index 00000000000..f7d5d49cba4
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/parts/resomi.ftl
@@ -0,0 +1,22 @@
+ent-PartHumanoidResomi = resomi body part
+ .desc = { ent-BaseItem.desc }
+ent-TorsoHumanoidResomi = resomi torso
+ .desc = { ent-PartHumanoidResomi.desc }
+ent-HeadHumanoidResomi = resomi head
+ .desc = { ent-PartHumanoidResomi.desc }
+ent-LeftArmHumanoidResomi = left resomi arm
+ .desc = { ent-PartHumanoidResomi.desc }
+ent-RightArmHumanoidResomi = right resomi arm
+ .desc = { ent-PartHumanoidResomi.desc }
+ent-LeftHandHumanoidResomi = left resomi hand
+ .desc = { ent-PartHumanoidResomi.desc }
+ent-RightHandHumanoidResomi = right resomi hand
+ .desc = { ent-PartHumanoidResomi.desc }
+ent-LeftLegHumanoidResomi = left resomi leg
+ .desc = { ent-PartHumanoidResomi.desc }
+ent-RightLegHumanoidResomi = right resomi leg
+ .desc = { ent-PartHumanoidResomi.desc }
+ent-LeftFootHumanoidResomi = left resomi foot
+ .desc = { ent-PartHumanoidResomi.desc }
+ent-RightFootHumanoidResomi = right resomi foot
+ .desc = { ent-PartHumanoidResomi.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/parts/xenoslime.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/parts/xenoslime.ftl
new file mode 100644
index 00000000000..8a43f9db461
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/parts/xenoslime.ftl
@@ -0,0 +1,22 @@
+ent-PartXenoslime = xenoslime body part
+ .desc = { ent-BasePart.desc }
+ent-TorsoXenoslime = xenoslime torso
+ .desc = { ent-PartXenoslime.desc }
+ent-HeadXenoslime = xenoslime head
+ .desc = { ent-PartXenoslime.desc }
+ent-LeftArmXenoslime = left xenoslime arm
+ .desc = { ent-PartXenoslime.desc }
+ent-RightArmXenoslime = right xenoslime arm
+ .desc = { ent-PartXenoslime.desc }
+ent-LeftHandXenoslime = left xenoslime hand
+ .desc = { ent-PartXenoslime.desc }
+ent-RightHandXenoslime = right xenoslime hand
+ .desc = { ent-PartXenoslime.desc }
+ent-LeftLegXenoslime = left xenoslime leg
+ .desc = { ent-PartXenoslime.desc }
+ent-RightLegXenoslime = right xenoslime leg
+ .desc = { ent-PartXenoslime.desc }
+ent-LeftFootXenoslime = left xenoslime foot
+ .desc = { ent-PartXenoslime.desc }
+ent-RightFootXenoslime = right xenoslime foot
+ .desc = { ent-PartXenoslime.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/catalog/fills/backpacks/backpack.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/catalog/fills/backpacks/backpack.ftl
new file mode 100644
index 00000000000..7c5af973f2e
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/catalog/fills/backpacks/backpack.ftl
@@ -0,0 +1,2 @@
+ent-ClothingMilitaryBackpackFilled = { ent-ClothingMilitaryBackpack }
+ .desc = { ent-ClothingMilitaryBackpack.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/catalog/fills/backpacks/duffelbag.ftl
new file mode 100644
index 00000000000..cfab7b25e7b
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/catalog/fills/backpacks/duffelbag.ftl
@@ -0,0 +1,2 @@
+ent-ClothingBackpackDuffelMilitaryFilled = { ent-ClothingBackpackDuffelMilitary }
+ .desc = { ent-ClothingBackpackDuffelMilitary.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/catalog/fills/backpacks/satchel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/catalog/fills/backpacks/satchel.ftl
new file mode 100644
index 00000000000..bcf2b98a22d
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/catalog/fills/backpacks/satchel.ftl
@@ -0,0 +1,2 @@
+ent-ClothingBackpackMilitarySatchelFilled = { ent-ClothingBackpackMilitarySatchel }
+ .desc = { ent-ClothingBackpackMilitarySatchel.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/belt/belts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/belt/belts.ftl
new file mode 100644
index 00000000000..a397a3000c3
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/belt/belts.ftl
@@ -0,0 +1,2 @@
+ent-ClothingBeltSecondSalvageWebbing = salvage rig
+ .desc = Universal unloading system for work in space.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/shoes/magboots.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/shoes/magboots.ftl
new file mode 100644
index 00000000000..efd830572ca
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/shoes/magboots.ftl
@@ -0,0 +1,4 @@
+ent-ClothingShoesBootsJetBoots = jump boots
+ .desc = One moment and you are already here.
+ent-ActionToggleJetBoots = { ent-ActionBaseToggleMagboots }
+ .desc = { ent-ActionBaseToggleMagboots.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl
index c653258b2aa..e538f112b25 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl
@@ -2,8 +2,6 @@ ent-ClothingUniformJumpskirtCentcomOfficial = CentCom officer's suitskirt
.desc = It's a suitskirt worn by CentCom's highest-tier Commanders.
ent-ClothingUniformJumpskirtCentcomOfficer = CentCom turtleneck skirt
.desc = A skirt version of the CentCom turtleneck, rarer and more sought after than the original.
-ent-ClothingUniformJumpskirtElegantMaid = elegant maid uniform
- .desc = Call me master and bring me some beer.
ent-ClothingUniformColorJumpskirtRainbow = rainbow jumpskirt
.desc = A multi-colored jumpskirt!
ent-ClothingUniformJumpskirtPsychologist = psychologist suitskirt
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpsuits.ftl
index 1e9c0ab5d20..e5bc82593fa 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpsuits.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpsuits.ftl
@@ -6,3 +6,5 @@ ent-ClothingUniformJumpsuitCentcomOfficerBlack = special operations officer unif
.desc = Special Operations Officer uniform, nothing like that. Although... If you have time to read this, it's too late...
ent-ClothingUniformJumpsuitCentcomAdmiral = admiral's uniform
.desc = A uniform worn by those with the rank Admiral in the Nanotrasen Navy.
+ent-ClothingUniformJumpskirtElegantMaid = elegant maid uniform
+ .desc = Call me master and bring me some beer.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/effects/mobspawn.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/effects/mobspawn.ftl
new file mode 100644
index 00000000000..c579177c028
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/effects/mobspawn.ftl
@@ -0,0 +1,60 @@
+ent-MobSpawnBananiumCrabSalvage = mobspawner bananium crab
+ .suffix = salvage
+ .desc = { "" }
+ent-MobSpawnCoalCrabSalvage = mobspawner coal crab
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnGoldCrabSalvage = mobspawner gold crab
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnIronCrabSalvage = mobspawner iron crab
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnMagmiteCrabSalvage = mobspawner magmite crab
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnPlasmaCrabSalvage = mobspawner plasma crab
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnQuartzCrabSalvage = mobspawner quartz crab
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnSaltCrabSalvage = mobspawner salt crab
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnSilverCrabSalvage = mobspawner silver crab
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnUraniumCrabSalvage = mobspawner uranium crab
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnBananiumGolemSalvage = mobspawner bananium golem
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnCoalGolemSalvage = mobspawner coal golem
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnGoldGolemSalvage = mobspawner gold golem
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnIronGolemSalvage = mobspawner iron golem
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnMagmiteGolemSalvage = mobspawner magmite golem
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnPlasmaGolemSalvage = mobspawner plasma golem
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnQuartzGolemSalvage = mobspawner quartz golem
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnSaltGolemSalvage = mobspawner salt golem
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnSilverGolemSalvage = mobspawner silver golem
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
+ent-MobSpawnUraniumGolemSalvage = mobspawner uranium golem
+ .suffix = salvage
+ .desc = { ent-MobSpawnBananiumCrabSalvage.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/mobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/mobs.ftl
index 344282df8c3..6c8f0b66570 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/mobs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/mobs.ftl
@@ -1,2 +1,14 @@
ent-SpawnMobGorillaLargo = Gorilla Largo Spawner
.desc = { ent-MarkerBase.desc }
+ent-SalvageAndesiteElementalSpawner = Salvage Andesite Elemental Spawner
+ .desc = { ent-MarkerBase.desc }
+ent-SalvageBasaltElementalSpawner = Salvage Basalt Elemental Spawner
+ .desc = { ent-MarkerBase.desc }
+ent-SalvageRockElementalSpawner = Salvage Rock Elemental Spawner
+ .desc = { ent-MarkerBase.desc }
+ent-SalvageSandElementalSpawner = Salvage Sand Elemental Spawner
+ .desc = { ent-MarkerBase.desc }
+ent-SalvageSnowElementalSpawner = Salvage Snow Elemental Spawner
+ .desc = { ent-MarkerBase.desc }
+ent-SalvageChromiteElementalSpawner = Salvage Chromite Elemental Spawner
+ .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/npcs/elemental.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/npcs/elemental.ftl
new file mode 100644
index 00000000000..2c60460d162
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/npcs/elemental.ftl
@@ -0,0 +1,47 @@
+ent-MobElementalBaseSalvage = { "" }
+ .desc = { "" }
+ent-MobOreElementalSalvage = ore crab
+ .desc = { ent-MobElementalBaseSalvage.desc }
+ent-MobBananiumCrabSalvage = { ent-MobOreElementalSalvage }
+ .desc = An ore crab made from Bananium.
+ent-MobCoalCrabSalvage = { ent-MobOreElementalSalvage }
+ .desc = An ore crab made from Coal.
+ent-MobGoldCrabSalvage = { ent-MobOreElementalSalvage }
+ .desc = An ore crab made from Gold.
+ent-MobIronCrabSalvage = { ent-MobOreElementalSalvage }
+ .desc = An ore crab made from Iron.
+ent-MobMagmiteCrabSalvage = { ent-MobOreElementalSalvage }
+ .desc = An ore crab made from Magmite.
+ent-MobPlasmaCrabSalvage = { ent-MobOreElementalSalvage }
+ .desc = An ore crab made from Plasma.
+ent-MobQuartzCrabSalvage = { ent-MobOreElementalSalvage }
+ .desc = An ore crab made from Quartz.
+ent-MobSaltCrabSalvage = { ent-MobOreElementalSalvage }
+ .desc = An ore crab made from Salt.
+ent-MobSilverCrabSalvage = { ent-MobOreElementalSalvage }
+ .desc = An ore crab made from Silver.
+ent-MobUraniumCrabSalvage = { ent-MobOreElementalSalvage }
+ .desc = An ore crab made from Uranium.
+ent-MobBananiumGolemSalvage = ore golem
+ .desc = An ore golem made from Bananium.
+ent-MobCoalGolemSalvage = ore golem
+ .desc = An ore golem made from Coal.
+ent-MobGoldGolemSalvage = ore golem
+ .desc = An ore golem made from Gold.
+ent-MobIronGolemSalvage = ore golem
+ .desc = An ore golem made from Iron.
+ent-MobMagmiteGolemSalvage = ore golem
+ .desc = An ore golem made from Magmite.
+ent-MobPlasmaGolemSalvage = ore golem
+ .desc = An ore golem made from Plasma.
+ent-MobQuartzGolemSalvage = ore golem
+ .desc = An ore golem made from Quartz.
+ent-MobSaltGolemSalvage = ore golem
+ .desc = An ore golem made from Salt.
+ent-MobSilverGolemSalvage = ore golem
+ .desc = An ore golem made from Silver.
+ent-MobUraniumGolemSalvage = ore golem
+ .desc = An ore golem made from Uranium.
+ent-GolemCore = { ent-BaseAnomalyCore }
+ .suffix = Golem
+ .desc = { ent-BaseAnomalyCore.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/player/elzuosa.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/player/elzuosa.ftl
new file mode 100644
index 00000000000..d7a06645102
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/player/elzuosa.ftl
@@ -0,0 +1,2 @@
+ent-MobElzuosa = Urist McElzuosa
+ .desc = { ent-BaseMobElzuosa.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/player/resomi.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/player/resomi.ftl
new file mode 100644
index 00000000000..6af010bf92f
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/player/resomi.ftl
@@ -0,0 +1,2 @@
+ent-MobHumanoidResomi = Urist McResomi
+ .desc = { ent-BaseMobHumanoidResomi.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/player/xenoslime.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/player/xenoslime.ftl
new file mode 100644
index 00000000000..0811ee7b39a
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/player/xenoslime.ftl
@@ -0,0 +1,2 @@
+ent-MobXenoslime = Urist McXenoslime
+ .desc = { ent-BaseMobXenoslime.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/species/elzuosa.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/species/elzuosa.ftl
new file mode 100644
index 00000000000..551628c8986
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/species/elzuosa.ftl
@@ -0,0 +1,4 @@
+ent-BaseMobElzuosa = Urist McElzuosa
+ .desc = { ent-BaseMobSpeciesOrganic.desc }
+ent-MobElzuosaDummy = { ent-BaseSpeciesDummy }
+ .desc = { ent-BaseSpeciesDummy.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/species/resomi.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/species/resomi.ftl
new file mode 100644
index 00000000000..2aa480ee407
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/species/resomi.ftl
@@ -0,0 +1,4 @@
+ent-BaseMobHumanoidResomi = Urist McResomi
+ .desc = { ent-BaseMobSpeciesOrganic.desc }
+ent-MobHumanoidResomiDummy = Urist McResomi
+ .desc = A dummy Resomi meant to be used in character setup.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/species/xenoslime.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/species/xenoslime.ftl
new file mode 100644
index 00000000000..5bc2ec16039
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/species/xenoslime.ftl
@@ -0,0 +1,4 @@
+ent-BaseMobXenoslime = Urist McXenoclime
+ .desc = { ent-BaseMobSpeciesOrganic.desc }
+ent-MobXenoslimeDummy = Urist McHands
+ .desc = A dummy Xenoslime meant to be used in character setup.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/devices/translator.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/devices/translator.ftl
new file mode 100644
index 00000000000..604df7b5696
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/devices/translator.ftl
@@ -0,0 +1,5 @@
+ent-Translator = universal-translator
+ .desc = universal-translator-desc
+ent-EmptyTranslator = { ent-Translator }
+ .suffix = Empty
+ .desc = { ent-Translator.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/materials/gems.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/materials/gems.ftl
new file mode 100644
index 00000000000..0f2f636d978
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/materials/gems.ftl
@@ -0,0 +1,30 @@
+ent-BaseGem = { ent-BaseItem }
+ .desc = { ent-BaseItem.desc }
+ent-GemRuby = ruby
+ .desc = red and shiny.
+ent-GemSapphire = sapphire
+ .desc = blue and shiny.
+ent-GemEmerald = emerald
+ .desc = green and shiny.
+ent-GemTopaz = topaz
+ .desc = orange and shiny.
+ent-GemRuperiumBroken = broken ruperium
+ .desc = green...
+ent-GemRuperium = ruperium
+ .desc = green and shiny.
+ent-GemFrozenDiamond = diamond
+ .desc = shiny.
+ent-GemHardenedShell = hardened shell
+ .desc = yellow and shiny.
+ent-GemStabilizedBaroxuldium = stabilized baroxuldium
+ .desc = purple and shiny.
+ent-GemCompactedDilithium = compacted dilithium
+ .desc = purple and shiny.
+ent-GemDragonPearls = dragon pearls
+ .desc = yellow and shiny.
+ent-GemHollowCrystal = hollow crystal
+ .desc = blue and shiny.
+ent-GemBloodStone = blood stone
+ .desc = red and shiny.
+ent-GemBluespaceDataCrystal = bluespace data crystal
+ .desc = blue, glitters and dazzles.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/materials/ore.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/materials/ore.ftl
new file mode 100644
index 00000000000..48a8c079718
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/materials/ore.ftl
@@ -0,0 +1,6 @@
+ent-MagmiteOre = magmite ore
+ .suffix = Full
+ .desc = { ent-OreBase.desc }
+ent-MagmiteOre1 = { ent-MagmiteOre }
+ .suffix = Single
+ .desc = { ent-MagmiteOre.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/materials/sheets/metal.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/materials/sheets/metal.ftl
new file mode 100644
index 00000000000..1546671be0c
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/materials/sheets/metal.ftl
@@ -0,0 +1,6 @@
+ent-SheetMagmite = magmite
+ .suffix = Full
+ .desc = { ent-SheetOtherBase.desc }
+ent-SheetMagmite1 = magmite
+ .suffix = Single
+ .desc = { ent-SheetMagmite.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/specific/salvage/gem_bag.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/specific/salvage/gem_bag.ftl
new file mode 100644
index 00000000000..83720cb3aa6
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/specific/salvage/gem_bag.ftl
@@ -0,0 +1,2 @@
+ent-GemsBag = gems bag
+ .desc = A bag made of polyester, covered with a layer of ash, for storing gems.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/tools/jetpacks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/tools/jetpacks.ftl
new file mode 100644
index 00000000000..02bedafea54
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/tools/jetpacks.ftl
@@ -0,0 +1,6 @@
+ent-JetpackMining = jetpack
+ .suffix = Empty
+ .desc = { ent-BaseJetpack.desc }
+ent-JetpackMiningFilled = jetpack
+ .suffix = Filled
+ .desc = { ent-JetpackMining.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/weapons/melee/magmitecrushers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/weapons/melee/magmitecrushers.ftl
new file mode 100644
index 00000000000..a99b3c3a8b3
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/weapons/melee/magmitecrushers.ftl
@@ -0,0 +1,6 @@
+ent-BulletMagnaCharge = charge bolt
+ .desc = Marks a target for additional damage.
+ent-WeaponMagmiteCrusher = { ent-WeaponCrusher }
+ .desc = { ent-WeaponCrusher.desc }
+ent-WeaponMagmiteCrusherGlaive = crusher glaive
+ .desc = An early design of the proto-kinetic accelerator, in glaive form.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/structures/walls/asteroid.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/structures/walls/asteroid.ftl
new file mode 100644
index 00000000000..396758f2ffa
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/structures/walls/asteroid.ftl
@@ -0,0 +1,438 @@
+ent-WallRockAndesiteBananiumCrabSalvage = { ent-WallRockAndesiteBananium }
+ .suffix = Bananium Crab
+ .desc = { ent-WallRockAndesiteBananium.desc }
+ent-WallRockBasaltBananiumCrabSalvage = { ent-WallRockBasaltBananium }
+ .suffix = Bananium Crab
+ .desc = { ent-WallRockBasaltBananium.desc }
+ent-AsteroidRockBananiumCrabSalvage = { ent-AsteroidRockBananium }
+ .suffix = Bananium Crab
+ .desc = { ent-AsteroidRockBananium.desc }
+ent-WallRockBananiumCrabSalvage = { ent-WallRockBananium }
+ .suffix = Bananium Crab
+ .desc = { ent-WallRockBananium.desc }
+ent-WallRockSandBananiumCrabSalvage = { ent-WallRockSandBananium }
+ .suffix = Bananium Crab
+ .desc = { ent-WallRockSandBananium.desc }
+ent-WallRockSnowBananiumCrabSalvage = { ent-WallRockSnowBananium }
+ .suffix = Bananium Crab
+ .desc = { ent-WallRockSnowBananium.desc }
+ent-WallRockChromiteBananiumCrabSalvage = { ent-WallRockChromiteBananium }
+ .suffix = Bananium Crab
+ .desc = { ent-WallRockChromiteBananium.desc }
+ent-WallRockAndesiteBananiumGolemSalvage = { ent-WallRockAndesiteBananium }
+ .suffix = Bananium Golem
+ .desc = { ent-WallRockAndesiteBananium.desc }
+ent-WallRockBasaltBananiumGolemSalvage = { ent-WallRockBasaltBananium }
+ .suffix = Bananium Golem
+ .desc = { ent-WallRockBasaltBananium.desc }
+ent-AsteroidRockBananiumGolemSalvage = { ent-AsteroidRockBananium }
+ .suffix = Bananium Golem
+ .desc = { ent-AsteroidRockBananium.desc }
+ent-WallRockBananiumGolemSalvage = { ent-WallRockBananium }
+ .suffix = Bananium Golem
+ .desc = { ent-WallRockBananium.desc }
+ent-WallRockSandBananiumGolemSalvage = { ent-WallRockSandBananium }
+ .suffix = Bananium Golem
+ .desc = { ent-WallRockSandBananium.desc }
+ent-WallRockSnowBananiumGolemSalvage = { ent-WallRockSnowBananium }
+ .suffix = Bananium Golem
+ .desc = { ent-WallRockSnowBananium.desc }
+ent-WallRockChromiteBananiumGolemSalvage = { ent-WallRockChromiteBananium }
+ .suffix = Bananium Golem
+ .desc = { ent-WallRockChromiteBananium.desc }
+ent-WallRockAndesiteCoalCrabSalvage = { ent-WallRockAndesiteCoal }
+ .suffix = Coal Crab
+ .desc = { ent-WallRockAndesiteCoal.desc }
+ent-WallRockBasaltCoalCrabSalvage = { ent-WallRockBasaltCoal }
+ .suffix = Coal Crab
+ .desc = { ent-WallRockBasaltCoal.desc }
+ent-AsteroidRockCoalCrabSalvage = { ent-AsteroidRockCoal }
+ .suffix = Coal Crab
+ .desc = { ent-AsteroidRockCoal.desc }
+ent-WallRockCoalCrabSalvage = { ent-WallRockCoal }
+ .suffix = Coal Crab
+ .desc = { ent-WallRockCoal.desc }
+ent-WallRockSandCoalCrabSalvage = { ent-WallRockSandCoal }
+ .suffix = Coal Crab
+ .desc = { ent-WallRockSandCoal.desc }
+ent-WallRockSnowCoalCrabSalvage = { ent-WallRockSnowCoal }
+ .suffix = Coal Crab
+ .desc = { ent-WallRockSnowCoal.desc }
+ent-WallRockChromiteCoalCrabSalvage = { ent-WallRockChromiteCoal }
+ .suffix = Coal Crab
+ .desc = { ent-WallRockChromiteCoal.desc }
+ent-WallRockAndesiteCoalGolemSalvage = { ent-WallRockAndesiteCoal }
+ .suffix = Coal Golem
+ .desc = { ent-WallRockAndesiteCoal.desc }
+ent-WallRockBasaltCoalGolemSalvage = { ent-WallRockBasaltCoal }
+ .suffix = Coal Golem
+ .desc = { ent-WallRockBasaltCoal.desc }
+ent-AsteroidRockCoalGolemSalvage = { ent-AsteroidRockCoal }
+ .suffix = Coal Golem
+ .desc = { ent-AsteroidRockCoal.desc }
+ent-WallRockCoalGolemSalvage = { ent-WallRockCoal }
+ .suffix = Coal Golem
+ .desc = { ent-WallRockCoal.desc }
+ent-WallRockSandCoalGolemSalvage = { ent-WallRockSandCoal }
+ .suffix = Coal Golem
+ .desc = { ent-WallRockSandCoal.desc }
+ent-WallRockSnowCoalGolemSalvage = { ent-WallRockSnowCoal }
+ .suffix = Coal Golem
+ .desc = { ent-WallRockSnowCoal.desc }
+ent-WallRockChromiteCoalGolemSalvage = { ent-WallRockChromiteCoal }
+ .suffix = Coal Golem
+ .desc = { ent-WallRockChromiteCoal.desc }
+ent-WallRockAndesiteGoldCrabSalvage = { ent-WallRockAndesiteGold }
+ .suffix = Gold Crab
+ .desc = { ent-WallRockAndesiteGold.desc }
+ent-WallRockBasaltGoldCrabSalvage = { ent-WallRockBasaltGold }
+ .suffix = Gold Crab
+ .desc = { ent-WallRockBasaltGold.desc }
+ent-AsteroidRockGoldCrabSalvage = { ent-AsteroidRockGold }
+ .suffix = Gold Crab
+ .desc = { ent-AsteroidRockGold.desc }
+ent-WallRockGoldCrabSalvage = { ent-WallRockGold }
+ .suffix = Gold Crab
+ .desc = { ent-WallRockGold.desc }
+ent-WallRockSandGoldCrabSalvage = { ent-WallRockSandGold }
+ .suffix = Gold Crab
+ .desc = { ent-WallRockSandGold.desc }
+ent-WallRockSnowGoldCrabSalvage = { ent-WallRockSnowGold }
+ .suffix = Gold Crab
+ .desc = { ent-WallRockSnowGold.desc }
+ent-WallRockChromiteGoldCrabSalvage = { ent-WallRockChromiteGold }
+ .suffix = Gold Crab
+ .desc = { ent-WallRockChromiteGold.desc }
+ent-WallRockAndesiteGoldGolemSalvage = { ent-WallRockAndesiteGold }
+ .suffix = Gold Golem
+ .desc = { ent-WallRockAndesiteGold.desc }
+ent-WallRockBasaltGoldGolemSalvage = { ent-WallRockBasaltGold }
+ .suffix = Gold Golem
+ .desc = { ent-WallRockBasaltGold.desc }
+ent-AsteroidRockGoldGolemSalvage = { ent-AsteroidRockGold }
+ .suffix = Gold Golem
+ .desc = { ent-AsteroidRockGold.desc }
+ent-WallRockGoldGolemSalvage = { ent-WallRockGold }
+ .suffix = Gold Golem
+ .desc = { ent-WallRockGold.desc }
+ent-WallRockSandGoldGolemSalvage = { ent-WallRockSandGold }
+ .suffix = Gold Golem
+ .desc = { ent-WallRockSandGold.desc }
+ent-WallRockSnowGoldGolemSalvage = { ent-WallRockSnowGold }
+ .suffix = Gold Golem
+ .desc = { ent-WallRockSnowGold.desc }
+ent-WallRockChromiteGoldGolemSalvage = { ent-WallRockChromiteGold }
+ .suffix = Gold Golem
+ .desc = { ent-WallRockChromiteGold.desc }
+ent-WallRockAndesiteIronCrabSalvage = { ent-WallRockAndesiteTin }
+ .suffix = Iron Crab
+ .desc = { ent-WallRockAndesiteTin.desc }
+ent-WallRockBasaltIronCrabSalvage = { ent-WallRockBasaltTin }
+ .suffix = Iron Crab
+ .desc = { ent-WallRockBasaltTin.desc }
+ent-AsteroidRockIronCrabSalvage = { ent-AsteroidRockTin }
+ .suffix = Iron Crab
+ .desc = { ent-AsteroidRockTin.desc }
+ent-WallRockIronCrabSalvage = { ent-WallRockTin }
+ .suffix = Iron Crab
+ .desc = { ent-WallRockTin.desc }
+ent-WallRockSandIronCrabSalvage = { ent-WallRockSandTin }
+ .suffix = Iron Crab
+ .desc = { ent-WallRockSandTin.desc }
+ent-WallRockSnowIronCrabSalvage = { ent-WallRockSnowTin }
+ .suffix = Iron Crab
+ .desc = { ent-WallRockSnowTin.desc }
+ent-WallRockChromiteIronCrabSalvage = { ent-WallRockChromiteTin }
+ .suffix = Iron Crab
+ .desc = { ent-WallRockChromiteTin.desc }
+ent-WallRockAndesiteIronGolemSalvage = { ent-WallRockAndesiteTin }
+ .suffix = Iron Golem
+ .desc = { ent-WallRockAndesiteTin.desc }
+ent-WallRockBasaltIronGolemSalvage = { ent-WallRockBasaltTin }
+ .suffix = Iron Golem
+ .desc = { ent-WallRockBasaltTin.desc }
+ent-AsteroidRockIronGolemSalvage = { ent-AsteroidRockTin }
+ .suffix = Iron Golem
+ .desc = { ent-AsteroidRockTin.desc }
+ent-WallRockIronGolemSalvage = { ent-WallRockTin }
+ .suffix = Iron Golem
+ .desc = { ent-WallRockTin.desc }
+ent-WallRockSandIronGolemSalvage = { ent-WallRockSandTin }
+ .suffix = Iron Golem
+ .desc = { ent-WallRockSandTin.desc }
+ent-WallRockSnowIronGolemSalvage = { ent-WallRockSnowTin }
+ .suffix = Iron Golem
+ .desc = { ent-WallRockSnowTin.desc }
+ent-WallRockChromiteIronGolemSalvage = { ent-WallRockChromiteTin }
+ .suffix = Iron Golem
+ .desc = { ent-WallRockChromiteTin.desc }
+ent-WallRockAndesiteMagmiteCrabSalvage = { ent-WallRockAndesiteMagmite }
+ .suffix = Magmite Crab
+ .desc = { ent-WallRockAndesiteMagmite.desc }
+ent-WallRockBasaltMagmiteCrabSalvage = { ent-WallRockBasaltMagmite }
+ .suffix = Magmite Crab
+ .desc = { ent-WallRockBasaltMagmite.desc }
+ent-AsteroidRockMagmiteCrabSalvage = { ent-AsteroidRockMagmite }
+ .suffix = Magmite Crab
+ .desc = { ent-AsteroidRockMagmite.desc }
+ent-WallRockMagmiteCrabSalvage = { ent-WallRockMagmite }
+ .suffix = Magmite Crab
+ .desc = { ent-WallRockMagmite.desc }
+ent-WallRockChromiteMagmiteCrabSalvage = { ent-WallRockChromiteMagmite }
+ .suffix = Magmite Crab
+ .desc = { ent-WallRockChromiteMagmite.desc }
+ent-WallRockAndesiteMagmiteGolemSalvage = { ent-WallRockAndesiteMagmite }
+ .suffix = Magmite Golem
+ .desc = { ent-WallRockAndesiteMagmite.desc }
+ent-WallRockBasaltMagmiteGolemSalvage = { ent-WallRockBasaltMagmite }
+ .suffix = Magmite Golem
+ .desc = { ent-WallRockBasaltMagmite.desc }
+ent-AsteroidRockMagmiteGolemSalvage = { ent-AsteroidRockMagmite }
+ .suffix = Magmite Golem
+ .desc = { ent-AsteroidRockMagmite.desc }
+ent-WallRockMagmiteGolemSalvage = { ent-WallRockMagmite }
+ .suffix = Magmite Golem
+ .desc = { ent-WallRockMagmite.desc }
+ent-WallRockChromiteMagmiteGolemSalvage = { ent-WallRockChromiteMagmite }
+ .suffix = Magmite Golem
+ .desc = { ent-WallRockChromiteMagmite.desc }
+ent-WallRockAndesitePlasmaCrabSalvage = { ent-WallRockAndesitePlasma }
+ .suffix = Plasma Crab
+ .desc = { ent-WallRockAndesitePlasma.desc }
+ent-WallRockBasaltPlasmaCrabSalvage = { ent-WallRockBasaltPlasma }
+ .suffix = Plasma Crab
+ .desc = { ent-WallRockBasaltPlasma.desc }
+ent-AsteroidRockPlasmaCrabSalvage = { ent-AsteroidRockPlasma }
+ .suffix = Plasma Crab
+ .desc = { ent-AsteroidRockPlasma.desc }
+ent-WallRockPlasmaCrabSalvage = { ent-WallRockPlasma }
+ .suffix = Plasma Crab
+ .desc = { ent-WallRockPlasma.desc }
+ent-WallRockSandPlasmaCrabSalvage = { ent-WallRockSandPlasma }
+ .suffix = Plasma Crab
+ .desc = { ent-WallRockSandPlasma.desc }
+ent-WallRockSnowPlasmaCrabSalvage = { ent-WallRockSnowPlasma }
+ .suffix = Plasma Crab
+ .desc = { ent-WallRockSnowPlasma.desc }
+ent-WallRockChromitePlasmaCrabSalvage = { ent-WallRockChromitePlasma }
+ .suffix = Plasma Crab
+ .desc = { ent-WallRockChromitePlasma.desc }
+ent-WallRockAndesitePlasmaGolemSalvage = { ent-WallRockAndesitePlasma }
+ .suffix = Plasma Golem
+ .desc = { ent-WallRockAndesitePlasma.desc }
+ent-WallRockBasaltPlasmaGolemSalvage = { ent-WallRockBasaltPlasma }
+ .suffix = Plasma Golem
+ .desc = { ent-WallRockBasaltPlasma.desc }
+ent-AsteroidRockPlasmaGolemSalvage = { ent-AsteroidRockPlasma }
+ .suffix = Plasma Golem
+ .desc = { ent-AsteroidRockPlasma.desc }
+ent-WallRockPlasmaGolemSalvage = { ent-WallRockPlasma }
+ .suffix = Plasma Golem
+ .desc = { ent-WallRockPlasma.desc }
+ent-WallRockSandPlasmaGolemSalvage = { ent-WallRockSandPlasma }
+ .suffix = Plasma Golem
+ .desc = { ent-WallRockSandPlasma.desc }
+ent-WallRockSnowPlasmaGolemSalvage = { ent-WallRockSnowPlasma }
+ .suffix = Plasma Golem
+ .desc = { ent-WallRockSnowPlasma.desc }
+ent-WallRockChromitePlasmaGolemSalvage = { ent-WallRockChromitePlasma }
+ .suffix = Plasma Golem
+ .desc = { ent-WallRockChromitePlasma.desc }
+ent-WallRockAndesiteQuartzCrabSalvage = { ent-WallRockAndesiteQuartz }
+ .suffix = Quartz Crab
+ .desc = { ent-WallRockAndesiteQuartz.desc }
+ent-WallRockBasaltQuartzCrabSalvage = { ent-WallRockBasaltQuartz }
+ .suffix = Quartz Crab
+ .desc = { ent-WallRockBasaltQuartz.desc }
+ent-AsteroidRockQuartzCrabSalvage = { ent-AsteroidRockQuartz }
+ .suffix = Quartz Crab
+ .desc = { ent-AsteroidRockQuartz.desc }
+ent-WallRockQuartzCrabSalvage = { ent-WallRockQuartz }
+ .suffix = Quartz Crab
+ .desc = { ent-WallRockQuartz.desc }
+ent-WallRockSandQuartzCrabSalvage = { ent-WallRockSandQuartz }
+ .suffix = Quartz Crab
+ .desc = { ent-WallRockSandQuartz.desc }
+ent-WallRockSnowQuartzCrabSalvage = { ent-WallRockSnowQuartz }
+ .suffix = Quartz Crab
+ .desc = { ent-WallRockSnowQuartz.desc }
+ent-WallRockChromiteQuartzCrabSalvage = { ent-WallRockChromiteQuartz }
+ .suffix = Quartz Crab
+ .desc = { ent-WallRockChromiteQuartz.desc }
+ent-WallRockAndesiteQuartzGolemSalvage = { ent-WallRockAndesiteQuartz }
+ .suffix = Quartz Golem
+ .desc = { ent-WallRockAndesiteQuartz.desc }
+ent-WallRockBasaltQuartzGolemSalvage = { ent-WallRockBasaltQuartz }
+ .suffix = Quartz Golem
+ .desc = { ent-WallRockBasaltQuartz.desc }
+ent-AsteroidRockQuartzGolemSalvage = { ent-AsteroidRockQuartz }
+ .suffix = Quartz Golem
+ .desc = { ent-AsteroidRockQuartz.desc }
+ent-WallRockQuartzGolemSalvage = { ent-WallRockQuartz }
+ .suffix = Quartz Golem
+ .desc = { ent-WallRockQuartz.desc }
+ent-WallRockSandQuartzGolemSalvage = { ent-WallRockSandQuartz }
+ .suffix = Quartz Golem
+ .desc = { ent-WallRockSandQuartz.desc }
+ent-WallRockSnowQuartzGolemSalvage = { ent-WallRockSnowQuartz }
+ .suffix = Quartz Golem
+ .desc = { ent-WallRockSnowQuartz.desc }
+ent-WallRockChromiteQuartzGolemSalvage = { ent-WallRockChromiteQuartz }
+ .suffix = Quartz Golem
+ .desc = { ent-WallRockChromiteQuartz.desc }
+ent-WallRockAndesiteSaltCrabSalvage = { ent-WallRockAndesiteSalt }
+ .suffix = Salt Crab
+ .desc = { ent-WallRockAndesiteSalt.desc }
+ent-WallRockBasaltSaltCrabSalvage = { ent-WallRockBasaltSalt }
+ .suffix = Salt Crab
+ .desc = { ent-WallRockBasaltSalt.desc }
+ent-AsteroidRockSaltCrabSalvage = { ent-AsteroidRockSalt }
+ .suffix = Salt Crab
+ .desc = { ent-AsteroidRockSalt.desc }
+ent-WallRockSaltCrabSalvage = { ent-WallRockSalt }
+ .suffix = Salt Crab
+ .desc = { ent-WallRockSalt.desc }
+ent-WallRockSandSaltCrabSalvage = { ent-WallRockSandSalt }
+ .suffix = Salt Crab
+ .desc = { ent-WallRockSandSalt.desc }
+ent-WallRockSnowSaltCrabSalvage = { ent-WallRockSnowSalt }
+ .suffix = Salt Crab
+ .desc = { ent-WallRockSnowSalt.desc }
+ent-WallRockChromiteSaltCrabSalvage = { ent-WallRockChromiteSalt }
+ .suffix = Salt Crab
+ .desc = { ent-WallRockChromiteSalt.desc }
+ent-WallRockAndesiteSaltGolemSalvage = { ent-WallRockAndesiteSalt }
+ .suffix = Salt Golem
+ .desc = { ent-WallRockAndesiteSalt.desc }
+ent-WallRockBasaltSaltGolemSalvage = { ent-WallRockBasaltSalt }
+ .suffix = Salt Golem
+ .desc = { ent-WallRockBasaltSalt.desc }
+ent-AsteroidRockSaltGolemSalvage = { ent-AsteroidRockSalt }
+ .suffix = Salt Golem
+ .desc = { ent-AsteroidRockSalt.desc }
+ent-WallRockSaltGolemSalvage = { ent-WallRockSalt }
+ .suffix = Salt Golem
+ .desc = { ent-WallRockSalt.desc }
+ent-WallRockSandSaltGolemSalvage = { ent-WallRockSandSalt }
+ .suffix = Salt Golem
+ .desc = { ent-WallRockSandSalt.desc }
+ent-WallRockSnowSaltGolemSalvage = { ent-WallRockSnowSalt }
+ .suffix = Salt Golem
+ .desc = { ent-WallRockSnowSalt.desc }
+ent-WallRockChromiteSaltGolemSalvage = { ent-WallRockChromiteSalt }
+ .suffix = Salt Golem
+ .desc = { ent-WallRockChromiteSalt.desc }
+ent-WallRockAndesiteSilverCrabSalvage = { ent-WallRockAndesiteSilver }
+ .suffix = Silver Crab
+ .desc = { ent-WallRockAndesiteSilver.desc }
+ent-WallRockBasaltSilverCrabSalvage = { ent-WallRockBasaltSilver }
+ .suffix = Silver Crab
+ .desc = { ent-WallRockBasaltSilver.desc }
+ent-AsteroidRockSilverCrabSalvage = { ent-AsteroidRockSilver }
+ .suffix = Silver Crab
+ .desc = { ent-AsteroidRockSilver.desc }
+ent-WallRockSilverCrabSalvage = { ent-WallRockSilver }
+ .suffix = Silver Crab
+ .desc = { ent-WallRockSilver.desc }
+ent-WallRockSandSilverCrabSalvage = { ent-WallRockSandSilver }
+ .suffix = Silver Crab
+ .desc = { ent-WallRockSandSilver.desc }
+ent-WallRockSnowSilverCrabSalvage = { ent-WallRockSnowSilver }
+ .suffix = Silver Crab
+ .desc = { ent-WallRockSnowSilver.desc }
+ent-WallRockChromiteSilverCrabSalvage = { ent-WallRockChromiteSilver }
+ .suffix = Silver Crab
+ .desc = { ent-WallRockChromiteSilver.desc }
+ent-WallRockAndesiteSilverGolemSalvage = { ent-WallRockAndesiteSilver }
+ .suffix = Silver Golem
+ .desc = { ent-WallRockAndesiteSilver.desc }
+ent-WallRockBasaltSilverGolemSalvage = { ent-WallRockBasaltSilver }
+ .suffix = Silver Golem
+ .desc = { ent-WallRockBasaltSilver.desc }
+ent-AsteroidRockSilverGolemSalvage = { ent-AsteroidRockSilver }
+ .suffix = Silver Golem
+ .desc = { ent-AsteroidRockSilver.desc }
+ent-WallRockSilverGolemSalvage = { ent-WallRockSilver }
+ .suffix = Silver Golem
+ .desc = { ent-WallRockSilver.desc }
+ent-WallRockSandSilverGolemSalvage = { ent-WallRockSandSilver }
+ .suffix = Silver Golem
+ .desc = { ent-WallRockSandSilver.desc }
+ent-WallRockSnowSilverGolemSalvage = { ent-WallRockSnowSilver }
+ .suffix = Silver Golem
+ .desc = { ent-WallRockSnowSilver.desc }
+ent-WallRockChromiteSilverGolemSalvage = { ent-WallRockChromiteSilver }
+ .suffix = Silver Golem
+ .desc = { ent-WallRockChromiteSilver.desc }
+ent-WallRockAndesiteUraniumCrabSalvage = { ent-WallRockAndesiteUranium }
+ .suffix = Uranium Crab
+ .desc = { ent-WallRockAndesiteUranium.desc }
+ent-WallRockBasaltUraniumCrabSalvage = { ent-WallRockBasaltUranium }
+ .suffix = Uranium Crab
+ .desc = { ent-WallRockBasaltUranium.desc }
+ent-AsteroidRockUraniumCrabSalvage = { ent-AsteroidRockUranium }
+ .suffix = Uranium Crab
+ .desc = { ent-AsteroidRockUranium.desc }
+ent-WallRockUraniumCrabSalvage = { ent-WallRockUranium }
+ .suffix = Uranium Crab
+ .desc = { ent-WallRockUranium.desc }
+ent-WallRockSandUraniumCrabSalvage = { ent-WallRockSandUranium }
+ .suffix = Uranium Crab
+ .desc = { ent-WallRockSandUranium.desc }
+ent-WallRockSnowUraniumCrabSalvage = { ent-WallRockSnowUranium }
+ .suffix = Uranium Crab
+ .desc = { ent-WallRockSnowUranium.desc }
+ent-WallRockChromiteUraniumCrabSalvage = { ent-WallRockChromiteUranium }
+ .suffix = Uranium Crab
+ .desc = { ent-WallRockChromiteUranium.desc }
+ent-WallRockAndesiteUraniumGolemSalvage = { ent-WallRockAndesiteUranium }
+ .suffix = Uranium Golem
+ .desc = { ent-WallRockAndesiteUranium.desc }
+ent-WallRockBasaltUraniumGolemSalvage = { ent-WallRockBasaltUranium }
+ .suffix = Uranium Golem
+ .desc = { ent-WallRockBasaltUranium.desc }
+ent-AsteroidRockUraniumGolemSalvage = { ent-AsteroidRockUranium }
+ .suffix = Uranium Golem
+ .desc = { ent-AsteroidRockUranium.desc }
+ent-WallRockUraniumGolemSalvage = { ent-WallRockUranium }
+ .suffix = Uranium Golem
+ .desc = { ent-WallRockUranium.desc }
+ent-WallRockSandUraniumGolemSalvage = { ent-WallRockSandUranium }
+ .suffix = Uranium Golem
+ .desc = { ent-WallRockSandUranium.desc }
+ent-WallRockSnowUraniumGolemSalvage = { ent-WallRockSnowUranium }
+ .suffix = Uranium Golem
+ .desc = { ent-WallRockSnowUranium.desc }
+ent-WallRockChromiteUraniumGolemSalvage = { ent-WallRockChromiteUranium }
+ .suffix = Uranium Golem
+ .desc = { ent-WallRockChromiteUranium.desc }
+ent-AsteroidRockGems = { ent-AsteroidRock }
+ .desc = An ore vein rich with gems.
+ .suffix = Gems
+ent-WallRockGems = { ent-WallRock }
+ .desc = An ore vein rich with gems.
+ .suffix = Gems
+ent-WallRockBasaltGems = { ent-WallRockBasalt }
+ .desc = An ore vein rich with gems.
+ .suffix = Gems
+ent-WallRockAndesiteGems = { ent-WallRockAndesite }
+ .desc = An ore vein rich with gems.
+ .suffix = Gems
+ent-WallRockChromiteGems = { ent-WallRockChromite }
+ .desc = An ore vein rich with gems.
+ .suffix = Gems
+ent-AsteroidRockMagmite = { ent-AsteroidRock }
+ .desc = An ore vein rich with gems.
+ .suffix = Magmite
+ent-WallRockMagmite = { ent-WallRock }
+ .desc = An ore vein rich with gems.
+ .suffix = Magmite
+ent-WallRockBasaltMagmite = { ent-WallRockBasalt }
+ .desc = An ore vein rich with gems.
+ .suffix = Magmite
+ent-WallRockAndesiteMagmite = { ent-WallRockAndesite }
+ .desc = An ore vein rich with gems.
+ .suffix = Magmite
+ent-WallRockChromiteMagmite = { ent-WallRockChromite }
+ .desc = An ore vein rich with gems.
+ .suffix = Magmite
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/clothing/shoes/winter-boots.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/clothing/shoes/winter-boots.ftl
index 04a19bcc7ec..bb0f4312b96 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/clothing/shoes/winter-boots.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/clothing/shoes/winter-boots.ftl
@@ -16,9 +16,9 @@ ent-ClothingShoesBootsWinterCMO = chief medical officer winter boots
.desc = { ent-ClothingShoesBaseWinterBoots.desc }
ent-ClothingShoesBootsWinterGenetics = genetics winter boots
.desc = { ent-ClothingShoesBaseWinterBoots.desc }
-ent-ClothingShoesBootsWinterHoP = station representative's winter boots
+ent-ClothingShoesBootsWinterHoP = head of personnel's winter boots
.desc = { ent-ClothingShoesBaseWinterBoots.desc }
-ent-ClothingShoesBootsWinterHoS = sheriff's winter boots
+ent-ClothingShoesBootsWinterHoS = head of security winter boots
.desc = { ent-ClothingShoesBaseWinterBoots.desc }
ent-ClothingShoesBootsWinterHydro = botanist winter boots
.desc = { ent-ClothingShoesBaseWinterBoots.desc }
@@ -38,5 +38,5 @@ ent-ClothingShoesBootsWinterRobo = robotics winter boots
.desc = { ent-ClothingShoesBaseWinterBoots.desc }
ent-ClothingShoesBootsWinterViro = virology winter boots
.desc = { ent-ClothingShoesBaseWinterBoots.desc }
-ent-ClothingShoesBootsWinterWarden = bailiff's winter boots
+ent-ClothingShoesBootsWinterWarden = warden's winter boots
.desc = { ent-ClothingShoesBaseWinterBoots.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/weapons/bombs/plastic.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/weapons/bombs/plastic.ftl
new file mode 100644
index 00000000000..4f75f3176c9
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/weapons/bombs/plastic.ftl
@@ -0,0 +1,2 @@
+ent-BreachingCharge = breaching charge
+ .desc = A breaching explosive for security officers to break through walls.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/battery/battery_guns.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/battery/battery_guns.ftl
index c56a862ea14..c9e9bd66880 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/battery/battery_guns.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/battery/battery_guns.ftl
@@ -1,5 +1,5 @@
ent-WeaponEnergyGun = energy gun
- .desc = A basic hybrid energy gun with two settings: disable and kill.
+ .desc = A basic hybrid energy gun with two settings: disable and kill. On the handle is a label that says 'for authorized use only.'
ent-WeaponEnergyGunMultiphase = x-01 multiphase energy gun
- .desc = This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time.
+ .desc = This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time. On the handle is a label that says 'for authorized use only.'
.suffix = DO NOT MAP
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl
index 3afef2747a0..39d110f3983 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl
@@ -46,6 +46,10 @@ ent-ClothingBackpackERTJanitor = ERT janitor backpack
.desc = A spacious backpack with lots of pockets, worn by Janitors of an Emergency Response Team.
ent-ClothingBackpackERTClown = ERT clown backpack
.desc = A spacious backpack with lots of pockets, worn by Clowns of an Emergency Response Team.
+ent-ClothingBackpackERTChaplain = ERT chaplain backpack
+ .desc = A spacious backpack with lots of pockets, worn by Chaplains of an Emergency Response Team.
+ent-ClothingBackpackSyndicate = syndicate backpack
+ .desc = { ent-ClothingBackpack.desc }
ent-ClothingBackpackHolding = bag of holding
.desc = A backpack that opens into a localized pocket of bluespace.
ent-ClothingBackpackCluwne = jiggles von jonkerton
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/base_clothing.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/base_clothing.ftl
index 67e132403d6..799e24a559f 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/base_clothing.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/base_clothing.ftl
@@ -2,6 +2,8 @@ ent-Clothing = { ent-BaseItem }
.desc = { ent-BaseItem.desc }
ent-GeigerCounterClothing = { "" }
.desc = { "" }
+ent-AllowSuitStorageClothing = { "" }
+ .desc = { "" }
ent-ClothingSlotBase = { "" }
.desc = { "" }
ent-ContentsExplosionResistanceBase = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets.ftl
index 73c24fc1831..82b906fc48a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets.ftl
@@ -28,8 +28,8 @@ ent-ClothingHeadsetRobotics = robotics headset
.desc = Made specifically for the roboticists, who cannot decide between departments.
ent-ClothingHeadsetRD = rd headset
.desc = Lamarr used to love chewing on this...
-ent-ClothingHeadsetSecurity = deputy headset
- .desc = This is used by your elite sheriff's department force.
+ent-ClothingHeadsetSecurity = security headset
+ .desc = This is used by your elite security force.
ent-ClothingHeadsetBrigmedic = brigmedic headset
.desc = A headset that helps to hear the death cries.
ent-ClothingHeadsetService = service headset
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl
index 1afb5975ec7..15208f60eae 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl
@@ -13,7 +13,7 @@ ent-ClothingHeadsetAltEngineering = chief engineer's over-ear headset
.desc = { ent-ClothingHeadsetAlt.desc }
ent-ClothingHeadsetAltMedical = chief medical officer's over-ear headset
.desc = { ent-ClothingHeadsetAlt.desc }
-ent-ClothingHeadsetAltSecurity = sheriff's over-ear headset
+ent-ClothingHeadsetAltSecurity = head of security's over-ear headset
.desc = { ent-ClothingHeadsetAlt.desc }
ent-ClothingHeadsetAltScience = research director's over-ear headset
.desc = { ent-ClothingHeadsetAlt.desc }
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 037fd3dde7a..374604b7c70 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
@@ -14,6 +14,8 @@ ent-ClothingEyesGlassesJamjar = jamjar glasses
.desc = Also known as Virginity Protectors.
ent-ClothingEyesGlassesOutlawGlasses = outlaw glasses
.desc = A must for every self-respecting undercover agent.
+ent-ClothingEyesGlassesCheapSunglasses = cheap sunglasses
+ .desc = A pair of black sunglasses. Doesn't block light well, more of an accessory than something useful.
ent-ClothingEyesGlassesSunglasses = sun glasses
.desc = A pair of black sunglasses.
ent-ClothingEyesGlassesSecurity = security glasses
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 4634450ddb1..220c5c97c9b 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
@@ -1,3 +1,5 @@
+ent-ShowSecurityIcons = { "" }
+ .desc = { "" }
ent-ClothingEyesHudDiagnostic = diagnostic hud
.desc = A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium.
ent-ClothingEyesHudMedical = medical hud
@@ -22,9 +24,11 @@ ent-ClothingEyesHudOmni = omni hud
.desc = Filler
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 }
- .suffix = Syndicate
- .desc = { ent-ClothingEyesGlassesSunglasses.desc }
+ .suffix = Syndicate
+ .desc = { ent-ClothingEyesGlassesSunglasses.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-ClothingEyesEyepatchHudSecurity = security hud eyepatch
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 8582dc3bbf3..1b4b6767bb7 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
@@ -2,3 +2,5 @@ ent-ClothingHandsBase = { ent-Clothing }
.desc = { ent-Clothing.desc }
ent-ClothingHandsButcherable = { ent-ClothingHandsBase }
.desc = { ent-ClothingHandsBase.desc }
+ent-ClothingHandsGlovesSyntheticBase = { ent-ClothingHandsButcherable }
+ .desc = { ent-ClothingHandsButcherable.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/colored.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/colored.ftl
index 86836b52a05..e75d8745ad7 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/colored.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/colored.ftl
@@ -1,11 +1,7 @@
-ent-ClothingHandsGlovesSyntheticBase = { ent-ClothingHandsButcherable }
- .desc = { ent-ClothingHandsButcherable.desc }
ent-ClothingHandsGlovesColorPurple = purple gloves
.desc = Regular purple gloves that do not keep you from frying.
ent-ClothingHandsGlovesColorRed = red gloves
.desc = Regular red gloves that do not keep you from frying.
-ent-ClothingHandsGlovesColorBlack = black gloves
- .desc = Regular black gloves that do not keep you from frying.
ent-ClothingHandsGlovesColorBlue = blue gloves
.desc = Regular blue gloves that do not keep you from frying.
ent-ClothingHandsGlovesColorBrown = brown gloves
@@ -19,7 +15,9 @@ ent-ClothingHandsGlovesColorLightBrown = light brown gloves
ent-ClothingHandsGlovesColorOrange = orange gloves
.desc = Regular orange gloves that do not keep you from frying.
ent-ClothingHandsGlovesColorWhite = white gloves
- .desc = Those gloves look fancy.
+ .desc = Regular white gloves that do not keep you from frying.
+ent-ClothingHandsGlovesColorBlack = black gloves
+ .desc = Regular black gloves that do not keep you from frying.
ent-ClothingHandsGlovesColorYellow = insulated gloves
.desc = These gloves will protect the wearer from electric shocks.
ent-ClothingHandsGlovesColorYellowBudget = budget insulated gloves
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/bandanas.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/bandanas.ftl
index 5d09c5f100e..669cddc0b83 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/bandanas.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/bandanas.ftl
@@ -1,7 +1,7 @@
ent-ClothingHeadBandBase = { ent-BaseFoldable }
- .desc = { ent-BaseFoldable.desc }
+ .desc = { ent-ClothingHeadBaseButcherable.desc }
ent-ClothingHeadBandBlack = black bandana
- .desc = { ent-ClothingMaskBandBlack.desc }
+ .desc = { ent-ClothingHeadBandBase.desc }
ent-ClothingHeadBandBlue = blue bandana
.desc = { ent-ClothingMaskBandBlue.desc }
ent-ClothingHeadBandBotany = botany bandana
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl
index 14ad6558a30..2a0455ac9eb 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl
@@ -14,7 +14,7 @@ ent-ClothingHeadHelmetHardsuitSecurity = security hardsuit helmet
.desc = Armored hardsuit helmet for security needs.
ent-ClothingHeadHelmetHardsuitBrigmedic = brigmedic hardsuit helmet
.desc = The lightweight helmet of the brigmedic hardsuit. Protects against viruses, and clowns.
-ent-ClothingHeadHelmetHardsuitWarden = bailiff's hardsuit helmet
+ent-ClothingHeadHelmetHardsuitWarden = warden's hardsuit helmet
.desc = A modified riot helmet. Oddly comfortable.
ent-ClothingHeadHelmetHardsuitCap = captain's hardsuit helmet
.desc = Special hardsuit helmet, made for the captain of the station.
@@ -24,8 +24,8 @@ ent-ClothingHeadHelmetHardsuitMedical = chief medical officer's hardsuit helmet
.desc = Lightweight medical hardsuit helmet that doesn't restrict your head movements.
ent-ClothingHeadHelmetHardsuitRd = experimental research hardsuit helmet
.desc = Lightweight hardsuit helmet that doesn't restrict your head movements.
-ent-ClothingHeadHelmetHardsuitSecurityRed = sheriff's hardsuit helmet
- .desc = Security hardsuit helmet with the latest top secret NT-HUD software. Belongs to the Sheriff.
+ent-ClothingHeadHelmetHardsuitSecurityRed = head of security's hardsuit helmet
+ .desc = Security hardsuit helmet with the latest top secret NT-HUD software. Belongs to the HoS.
ent-ClothingHeadHelmetHardsuitLuxury = luxury mining hardsuit helmet
.desc = A refurbished mining hardsuit helmet, fitted with satin cushioning and an extra (non-functioning) antenna, because you're that extra.
ent-ClothingHeadHelmetHardsuitSyndie = blood-red hardsuit helmet
@@ -50,6 +50,8 @@ ent-ClothingHeadHelmetHardsuitPirateCap = pirate captain's hardsuit helmet
.suffix = Pirate
ent-ClothingHeadHelmetHardsuitERTLeader = ERT leader hardsuit helmet
.desc = A special hardsuit helmet worn by members of an emergency response team.
+ent-ClothingHeadHelmetHardsuitERTChaplain = ERT chaplain hardsuit helmet
+ .desc = A special hardsuit helmet worn by members of an emergency response team.
ent-ClothingHeadHelmetHardsuitERTEngineer = ERT engineer hardsuit helmet
.desc = A special hardsuit helmet worn by members of an emergency response team.
ent-ClothingHeadHelmetHardsuitERTMedical = ERT medic hardsuit helmet
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl
index 9705147b0c1..144889ff873 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl
@@ -14,10 +14,10 @@ ent-ClothingHeadHatBeretEngineering = engineering beret
.desc = A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety.
ent-ClothingHeadHatBeretQM = quartermaster's beret
.desc = A beret with the cargo's insignia emblazoned on it. For quartermasters that are more inclined towards style.
-ent-ClothingHeadHatBeretHoS = sheriff's beret
- .desc = A black beret with a sheriff's rank emblem. For officers that are more inclined towards style than safety.
-ent-ClothingHeadHatBeretWarden = bailiff's beret
- .desc = A corporate blue beret with a bailiff's rank emblem. For officers that are more inclined towards style than safety.
+ent-ClothingHeadHatBeretHoS = head of security's beret
+ .desc = A black beret with a commander's rank emblem. For officers that are more inclined towards style than safety.
+ent-ClothingHeadHatBeretWarden = warden's beret
+ .desc = A corporate blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety.
ent-ClothingHeadHatBeretSeniorPhysician = physician beret
.desc = Donning the colours of medical and chemistry, physicians are the pride of this department!
ent-ClothingHeadHatBeretBrigmedic = brigmedical beret
@@ -40,9 +40,9 @@ ent-ClothingHeadHatFedoraGrey = grey fedora
.desc = It's a grey fedora.
ent-ClothingHeadHatFez = fez
.desc = A red fez.
-ent-ClothingHeadHatHopcap = station representative's cap
- .desc = A grand, stylish station representative's cap.
-ent-ClothingHeadHatHoshat = sheriff's hat
+ent-ClothingHeadHatHopcap = head of personnel's cap
+ .desc = A grand, stylish head of personnel's cap.
+ent-ClothingHeadHatHoshat = head of security's hat
.desc = There's a new sheriff in station.
ent-ClothingHeadHatOutlawHat = outlaw's hat
.desc = A hat that makes you look like you carry a notched pistol, numbered one and nineteen more.
@@ -72,8 +72,8 @@ ent-ClothingHeadHatUshanka = ushanka
.desc = Perfect for winter in Siberia, da?
ent-ClothingHeadHatVioletwizard = violet wizard hat
.desc = Strange-looking violet hat-wear that most certainly belongs to a real magic user.
-ent-ClothingHeadHatWarden = bailiff's cap
- .desc = A bailiff's Hat. This hat emphasizes that you are THE LAW.
+ent-ClothingHeadHatWarden = warden's cap
+ .desc = A police officer's Hat. This hat emphasizes that you are THE LAW
ent-ClothingHeadHatWitch = witch hat
.desc = A witch hat.
ent-ClothingHeadHatWizardFake = fake wizard hat
@@ -120,8 +120,8 @@ ent-ClothingHeadHatTacticalMaidHeadband = tactical maid headband
.desc = A red headband - don't imagine yourself a Rambo and don't pick up a few machine guns.
ent-ClothingHeadHatHetmanHat = hetman hat
.desc = From the Zaporozhian Sich with love.
-ent-ClothingHeadHatMagician = magician's top hat.
- .desc = A magician's top hat.
+ent-ClothingHeadHatMagician = magician's tophat
+ .desc = A magician's tophat.
ent-ClothingHeadHatCapcap = cap cap
.desc = A grand, stylish captain cap.
ent-ClothingHeadHatCentcomcap = CentCom cap
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/helmets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/helmets.ftl
index 226bfdd895e..6e819002679 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/helmets.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/helmets.ftl
@@ -16,8 +16,6 @@ ent-ClothingHeadHelmetJanitorBombSuit = janitorial bombsuit helmet
.suffix = DO NOT MAP
ent-ClothingHeadHelmetCult = cult helmet
.desc = A robust, evil-looking cult helmet.
-ent-ClothingHeadHelmetScaf = scaf helmet
- .desc = A robust, strong helmet.
ent-ClothingHeadHelmetSpaceNinja = space ninja helmet
.desc = What may appear to be a simple black garment is in fact a highly sophisticated nano-weave helmet. Standard issue ninja gear.
ent-ClothingHeadHelmetTemplar = templar helmet
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hoods.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hoods.ftl
index 47760775333..fe350bfc598 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hoods.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hoods.ftl
@@ -50,7 +50,7 @@ ent-ClothingHeadHatHoodWinterCMO = chief medical officer's winter coat hood
.desc = { ent-ClothingHeadHatHoodWinterBase.desc }
ent-ClothingHeadHatHoodWinterEngineer = engineer winter coat hood
.desc = { ent-ClothingHeadHatHoodWinterBase.desc }
-ent-ClothingHeadHatHoodWinterHOP = station representative's winter coat hood
+ent-ClothingHeadHatHoodWinterHOP = head of personnel's winter coat hood
.desc = { ent-ClothingHeadHatHoodWinterBase.desc }
ent-ClothingHeadHatHoodWinterHOS = sheriff's winter coat hood
.desc = { ent-ClothingHeadHatHoodWinterBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/misc.ftl
index 7e15d688efe..9de98b822fd 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/misc.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/misc.ftl
@@ -4,10 +4,8 @@ ent-ClothingHeadHatCake = cake hat
.desc = You put the cake on your head. Brilliant.
ent-ClothingHeadHatChickenhead = chicken head
.desc = It's a chicken head. Bok bok bok!
-ent-ClothingHeadHatFlowerCrown = flower crown
- .desc = A coronet of fresh and fragrant flowers.
-ent-ClothingHeadHatHairflower = hairflower
- .desc = A red flower for beautiful ladies.
+ent-ClothingHeadHatFlowerWreath = flower wreath
+ .desc = A wreath of colourful flowers. Can be worn both on head and neck.
ent-ClothingHeadHatPumpkin = pumpkin hat
.desc = A jack o' lantern! Believed to ward off evil spirits.
ent-ClothingHeadHatPwig = pwig
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/bandanas.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/bandanas.ftl
index 7c8c918af33..2cfa21964a3 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/bandanas.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/bandanas.ftl
@@ -1,5 +1,5 @@
-ent-ClothingMaskBandanaBase = { ent-BaseFoldable }
- .desc = { ent-BaseFoldable.desc }
+ent-ClothingMaskBandanaBase = { ent-ClothingMaskBaseButcherable }
+ .desc = { ent-ClothingMaskBaseButcherable.desc }
ent-ClothingMaskBandBlack = black bandana
.desc = A black bandana to make you look cool.
ent-ClothingMaskBandBlue = blue bandana
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl
index 3792e7066eb..d03696c237b 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl
@@ -61,6 +61,8 @@ ent-ClothingMaskBat = bat mask
.desc = A bloodsucker by night, and a cute, blinded beast by day.
ent-ClothingMaskNeckGaiter = neck gaiter
.desc = Stylish neck gaiter for your neck, can protect from the cosmic wind?...
+ent-ClothingMaskNeckGaiterRed = red neck gaiter
+ .desc = { ent-ClothingMaskNeckGaiter.desc }
ent-ClothingMaskSexyClown = sexy clown mask
.desc = Some naughty clowns think this is what the Honkmother looks like.
ent-ClothingMaskSexyMime = sexy mime mask
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/specific.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/specific.ftl
index 4d55c539f94..b77a9e8bafa 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/specific.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/specific.ftl
@@ -4,3 +4,5 @@ ent-ClothingMaskGasChameleon = gas mask
ent-ClothingMaskGasVoiceChameleon = { ent-ClothingMaskGasChameleon }
.suffix = Voice Mask, Chameleon, Radio Unknown Name
.desc = { ent-ClothingMaskGasChameleon.desc }
+ent-ClothingMaskWeldingGas = welding gas mask
+ .desc = A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl
index fa25f564613..d6cd68ba56d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl
@@ -2,7 +2,7 @@ ent-ClothingNeckCloakCentcom = central commander's cloak
.desc = A pompous and elite green cloak with a nice gold trim, tailored specifically to the Central Commander. It's so heavy, the gold trim might be real.
ent-ClothingNeckCloakCap = captain's cloak
.desc = A pompous and comfy blue cloak with a nice gold trim, while not particularly valuable as your other possessions, it sure is fancy.
-ent-ClothingNeckCloakHos = sheriff's cloak
+ent-ClothingNeckCloakHos = head of security's cloak
.desc = An exquisite dark and red cloak fitting for those who can assert dominance over wrongdoers. Take a stab at being civil in prosecution!
ent-ClothingNeckCloakCe = chief engineer's cloak
.desc = A dark green cloak with light blue ornaments, given to those who proved themselves to master the precise art of engineering.
@@ -12,7 +12,7 @@ ent-ClothingNeckCloakRd = research director's cloak
.desc = A white cloak with violet stripes, showing your status as the arbiter of cutting-edge technology.
ent-ClothingNeckCloakQm = quartermaster's cloak
.desc = A strong brown cloak with a reflective stripe, while not as fancy as others, it does show your managing skills.
-ent-ClothingNeckCloakHop = station representative's cloak
+ent-ClothingNeckCloakHop = head of personnel's cloak
.desc = A blue cloak with red shoulders and gold buttons, proving you are the gatekeeper to any airlock on the station.
ent-ClothingNeckCloakHerald = herald's cloak
.desc = An evil-looking red cloak with spikes on its shoulders.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/mantles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/mantles.ftl
index ffbf37c17ac..59eab574b89 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/mantles.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/mantles.ftl
@@ -4,9 +4,9 @@ ent-ClothingNeckMantleCE = chief engineer's mantle
.desc = High visibility, check. RIG system, check. High capacity cell, check. Everything a chief engineer could need in a stylish mantle.
ent-ClothingNeckMantleCMO = chief medical officer's mantle
.desc = For a CMO that has been in enough medbays to know that more PPE means less central command dry cleaning visits when the shift is over.
-ent-ClothingNeckMantleHOP = station representative's mantle
- .desc = A good SR knows that paper pushing is only half the job... petting your dog and looking fashionable is the other half.
-ent-ClothingNeckMantleHOS = sheriff's mantle
+ent-ClothingNeckMantleHOP = head of personnel's mantle
+ .desc = A good HOP knows that paper pushing is only half the job... petting your dog and looking fashionable is the other half.
+ent-ClothingNeckMantleHOS = head of security's mantle
.desc = Shootouts with nukies are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station.
ent-ClothingNeckMantleRD = research director's mantle
.desc = For when long days in the office consist of explosives, poisonous gas, murder robots, and a fresh pizza from cargo; this mantle will keep you comfy.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/medals.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/medals.ftl
index cfae2a2a949..464609d4838 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/medals.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/medals.ftl
@@ -10,7 +10,7 @@ ent-ClothingNeckMedicalmedal = medical medal
.desc = Given for the best work in the medical department.
ent-ClothingNeckSciencemedal = science medal
.desc = Given for the best work in the science department.
-ent-ClothingNeckSecuritymedal = sheriff's medal of valor
- .desc = Given for the best work in the new frontier sheriff's department.
+ent-ClothingNeckSecuritymedal = security medal
+ .desc = Given for the best work in the security department.
ent-ClothingNeckClownmedal = clown medal
.desc = Given for the best joke in the universe. HONK!
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/misc.ftl
index 50ee42a3f6a..91dd45c5294 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/misc.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/misc.ftl
@@ -8,5 +8,3 @@ ent-ClothingNeckLawyerbadge = lawyer badge
.desc = A badge to show that the owner is a 'legitimate' lawyer who passed the NT bar exam required to practice law.
ent-ActionStethoscope = Listen with stethoscope
.desc = { "" }
-ent-ClothingNeckFlowerWreath = flower wreath
- .desc = A wreath of colourful flowers.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/pins.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/pins.ftl
index b76940000a1..5da8f2a14a7 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/pins.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/pins.ftl
@@ -18,3 +18,7 @@ ent-ClothingNeckPansexualPin = pansexual pin
.desc = be pan do crime
ent-ClothingNeckTransPin = transgender pin
.desc = be trans do crime
+ent-ClothingNeckAutismPin = autism pin
+ .desc = be autism do crime
+ent-ClothingNeckGoldAutismPin = golden autism pin
+ .desc = be autism do warcrime
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/armor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/armor.ftl
index 25038843707..f58c5f79b89 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/armor.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/armor.ftl
@@ -21,8 +21,6 @@ ent-ClothingOuterArmorMagusblue = blue magus armor
.desc = An blue armored suit that provides good protection.
ent-ClothingOuterArmorMagusred = red magus armor
.desc = A red armored suit that provides good protection.
-ent-ClothingOuterArmorScaf = scaf suit
- .desc = A green and brown tactical suit for combat situations.
ent-ClothingOuterArmorCaptainCarapace = captain's carapace
.desc = An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the captain's of luxury vessels.
ent-ClothingOuterArmorChangeling = chitinous armor
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/base_clothingouter.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/base_clothingouter.ftl
index b1ab48521c6..1d66236ff44 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/base_clothingouter.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/base_clothingouter.ftl
@@ -4,6 +4,11 @@ ent-ClothingOuterBaseLarge = { ent-ClothingOuterBase }
.desc = { ent-ClothingOuterBase.desc }
ent-ClothingOuterStorageBase = { ent-ClothingOuterBase }
.desc = { ent-ClothingOuterBase.desc }
+ent-ClothingOuterStorageFoldableBase = { ent-ClothingOuterStorageBase }
+ .desc = { ent-ClothingOuterStorageBase.desc }
+ent-ClothingOuterStorageFoldableBaseOpened = { ent-ClothingOuterStorageFoldableBase }
+ .suffix = opened
+ .desc = { ent-ClothingOuterStorageFoldableBase.desc }
ent-ClothingOuterStorageToggleableBase = { ent-ClothingOuterStorageBase }
.desc = { ent-ClothingOuterStorageBase.desc }
ent-ClothingOuterHardsuitBase = base hardsuit
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl
index 708a03cfb8f..2968d76c3e1 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl
@@ -2,9 +2,15 @@ ent-ClothingOuterCoatBomber = bomber jacket
.desc = A thick, well-worn WW2 leather bomber jacket.
ent-ClothingOuterCoatDetective = detective trenchcoat
.desc = A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Wearing it makes you feel for the plight of the Tibetans.
+ent-ClothingOuterCoatDetectiveLoadout = { ent-ClothingOuterCoatDetective }
+ .desc = { ent-ClothingOuterCoatDetective.desc }
ent-ClothingOuterCoatGentle = gentle coat
.desc = A gentle coat for a gentle man, or woman.
-ent-ClothingOuterCoatHoSTrench = sheriff's armored trenchcoat
+ent-ClothingOuterArmorHoS = { ent-AllowSuitStorageClothing }
+ .desc = { ent-AllowSuitStorageClothing.desc }
+ent-ClothingOuterArmorWarden = { ent-AllowSuitStorageClothing }
+ .desc = { ent-AllowSuitStorageClothing.desc }
+ent-ClothingOuterCoatHoSTrench = head of security's armored trenchcoat
.desc = A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence.
ent-ClothingOuterCoatInspector = inspector's coat
.desc = A strict inspector's coat for being intimidating during inspections.
@@ -14,24 +20,40 @@ ent-ClothingOuterCoatTrench = trench coat
.desc = A comfy trench coat.
ent-ClothingOuterCoatLab = lab coat
.desc = A suit that protects against minor chemical spills.
+ent-ClothingOuterCoatLabOpened = lab coat
+ .desc = { ent-ClothingOuterCoatLab.desc }
ent-ClothingOuterCoatLabChem = chemist lab coat
.desc = A suit that protects against minor chemical spills. Has an orange stripe on the shoulder.
+ent-ClothingOuterCoatLabChemOpened = chemist lab coat
+ .desc = { ent-ClothingOuterCoatLab.desc }
ent-ClothingOuterCoatLabViro = virologist lab coat
.desc = A suit that protects against bacteria and viruses. Has an green stripe on the shoulder.
+ent-ClothingOuterCoatLabViroOpened = virologist lab coat
+ .desc = { ent-ClothingOuterCoatLabViro.desc }
ent-ClothingOuterCoatLabGene = geneticist lab coat
.desc = A suit that protects against minor chemical spills. Has an blue stripe on the shoulder.
+ent-ClothingOuterCoatLabGeneOpened = geneticist lab coat
+ .desc = { ent-ClothingOuterCoatLabGene.desc }
ent-ClothingOuterCoatLabCmo = chief medical officer's lab coat
- .desc = Bluer than the standard model.
+ .desc = Custom made blue lab coat for the Chief Medical Officer, offers improved protection against chemical spills and minor cuts
+ent-ClothingOuterCoatLabCmoOpened = chief medical officer's lab coat
+ .desc = { ent-ClothingOuterCoatLabCmo.desc }
ent-ClothingOuterCoatRnd = scientist lab coat
.desc = A suit that protects against minor chemical spills. Has a purple stripe on the shoulder.
+ent-ClothingOuterCoatRndOpened = scientist lab coat
+ .desc = { ent-ClothingOuterCoatRnd.desc }
ent-ClothingOuterCoatRobo = roboticist lab coat
.desc = More like an eccentric coat than a labcoat. Helps pass off bloodstains as part of the aesthetic. Comes with red shoulder pads.
+ent-ClothingOuterCoatRoboOpened = roboticist lab coat
+ .desc = { ent-ClothingOuterCoatRobo.desc }
ent-ClothingOuterCoatRD = research director lab coat
.desc = Woven with top of the line technology, this labcoat helps protect against radiation in similar way to the experimental hardsuit.
+ent-ClothingOuterCoatRDOpened = research director lab coat
+ .desc = { ent-ClothingOuterCoatRD.desc }
ent-ClothingOuterCoatPirate = pirate garb
.desc = Yarr.
-ent-ClothingOuterCoatWarden = bailiff's armored jacket
- .desc = A sturdy, utilitarian jacket designed to protect a bailiff from any brig-bound threats.
+ent-ClothingOuterCoatWarden = warden's armored jacket
+ .desc = A sturdy, utilitarian jacket designed to protect a warden from any brig-bound threats.
ent-ClothingOuterDameDane = yakuza coat
.desc = Friday...
ent-ClothingOuterClownPriest = robes of the honkmother
@@ -52,3 +74,5 @@ ent-ClothingOuterCoatLabSeniorPhysician = senior physician lab coat
.desc = A suit that protects against minor chemical spills. Has light blue sleeves and an orange waist trim.
ent-ClothingOuterCoatSpaceAsshole = the coat of space asshole
.desc = And there he was...
+ent-ClothingOuterCoatExpensive = expensive coat
+ .desc = Very fluffy pink coat, made out of very expensive fur (clearly).
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl
index c4544b913a1..cf6b49312c4 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl
@@ -14,17 +14,17 @@ ent-ClothingOuterHardsuitSecurity = security hardsuit
.desc = A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
ent-ClothingOuterHardsuitBrigmedic = brigmedic hardsuit
.desc = Special hardsuit of the guardian angel of the brig. It is the medical version of the security hardsuit.
-ent-ClothingOuterHardsuitWarden = bailiff's hardsuit
+ent-ClothingOuterHardsuitWarden = warden's hardsuit
.desc = A specialized riot suit geared to combat low pressure environments.
ent-ClothingOuterHardsuitCap = captain's armored spacesuit
- .desc = A formal armored spacesuit, made for a captain.
+ .desc = A formal armored spacesuit, made for the station's captain.
ent-ClothingOuterHardsuitEngineeringWhite = chief engineer's hardsuit
.desc = A special hardsuit that protects against hazardous, low pressure environments, made for the chief engineer of the station.
ent-ClothingOuterHardsuitMedical = chief medical officer's hardsuit
.desc = A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement.
ent-ClothingOuterHardsuitRd = experimental research hardsuit
- .desc = A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. Able to be compressed to small sizes.
-ent-ClothingOuterHardsuitSecurityRed = sheriff's hardsuit
+ .desc = A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
+ent-ClothingOuterHardsuitSecurityRed = head of security's hardsuit
.desc = A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
ent-ClothingOuterHardsuitLuxury = luxury mining hardsuit
.desc = A refurbished mining hardsuit, fashioned after the Quartermaster's colors. Graphene lining provides less protection, but is much easier to move.
@@ -49,6 +49,8 @@ ent-ClothingOuterHardsuitPirateCap = pirate captain's hardsuit
.desc = An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags.
ent-ClothingOuterHardsuitERTLeader = ERT leader's hardsuit
.desc = A protective hardsuit worn by the leader of an emergency response team.
+ent-ClothingOuterHardsuitERTChaplain = ERT chaplain's hardsuit
+ .desc = A protective hardsuit worn by the chaplains of an Emergency Response Team.
ent-ClothingOuterHardsuitERTEngineer = ERT engineer's hardsuit
.desc = A protective hardsuit worn by the engineers of an emergency response team.
ent-ClothingOuterHardsuitERTMedical = ERT medic's hardsuit
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl
index 334c54953dc..19b08724ab1 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl
@@ -26,10 +26,12 @@ ent-ClothingOuterWinterEngi = engineering winter coat
.desc = { ent-ClothingOuterWinterCoatToggleable.desc }
ent-ClothingOuterWinterGen = genetics winter coat
.desc = { ent-ClothingOuterWinterCoatToggleable.desc }
-ent-ClothingOuterWinterHoP = station representative's winter coat
- .desc = { ent-ClothingOuterWinterCoatToggleable.desc }
-ent-ClothingOuterWinterHoS = sheriff's winter coat
+ent-ClothingOuterWinterHoP = head of personnel's winter coat
.desc = { ent-ClothingOuterWinterCoatToggleable.desc }
+ent-ClothingOuterWinterHoS = head of security's armored winter coat
+ .desc = A sturdy, utilitarian winter coat designed to protect a head of security from any brig-bound threats and hypothermic events.
+ent-ClothingOuterWinterHoSUnarmored = head of security's winter coat
+ .desc = A sturdy coat, a warm coat, but not an armored coat.
ent-ClothingOuterWinterHydro = hydroponics winter coat
.desc = { ent-ClothingOuterWinterCoatToggleable.desc }
ent-ClothingOuterWinterJani = janitorial winter coat
@@ -54,8 +56,10 @@ ent-ClothingOuterWinterSec = security winter coat
.desc = { ent-ClothingOuterWinterCoatToggleable.desc }
ent-ClothingOuterWinterViro = virology winter coat
.desc = { ent-ClothingOuterWinterCoatToggleable.desc }
-ent-ClothingOuterWinterWarden = bailiff's armored winter coat
- .desc = A sturdy, utilitarian winter coat designed to protect a bailiff from any brig-bound threats and hypothermic events.
+ent-ClothingOuterWinterWarden = warden's armored winter coat
+ .desc = A sturdy, utilitarian winter coat designed to protect a warden from any brig-bound threats and hypothermic events.
+ent-ClothingOuterWinterWardenUnarmored = warden's winter coat
+ .desc = A sturdy coat, a warm coat, but not an armored coat.
ent-ClothingOuterWinterSyndieCap = syndicate's winter coat
.desc = The syndicate's winter coat is made of durable fabric, with gilded patterns, and coarse wool.
ent-ClothingOuterWinterSyndieCapArmored = syndicate's armored winter coat
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/color.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/color.ftl
index 42f6cd79bd9..501fd467862 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/color.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/color.ftl
@@ -1,5 +1,7 @@
ent-ClothingShoesColorBlack = black shoes
.desc = Stylish black shoes.
+ent-ClothingShoesColorWhite = white shoes
+ .desc = Don't take them off at your office Christmas party.
ent-ClothingShoesColorBlue = blue shoes
.desc = Stylish blue shoes.
ent-ClothingShoesColorBrown = brown shoes
@@ -8,11 +10,9 @@ ent-ClothingShoesColorGreen = green shoes
.desc = Stylish green shoes.
ent-ClothingShoesColorOrange = orange shoes
.desc = Stylish orange shoes.
-ent-ClothingShoesColorPurple = purple shoes
- .desc = Stylish purple shoes.
ent-ClothingShoesColorRed = red shoes
.desc = Stylish red shoes.
-ent-ClothingShoesColorWhite = white shoes
- .desc = Don't take them off at your office Christmas party.
ent-ClothingShoesColorYellow = yellow shoes
.desc = Stylish yellow shoes.
+ent-ClothingShoesColorPurple = purple shoes
+ .desc = Stylish purple shoes.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/specific.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/specific.ftl
index 9940719addc..3d1aae7ec90 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/specific.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/specific.ftl
@@ -1,5 +1,7 @@
ent-ClothingShoesChef = chef shoes
.desc = Sturdy shoes that minimize injury from falling objects or knives.
+ent-ClothingShoesClownBase = { ent-ClothingSlotBase }
+ .desc = { ent-ClothingSlotBase.desc }
ent-ClothingShoesClown = clown shoes
.desc = The prankster's standard-issue clowning shoes. Damn they're huge!
ent-ClothingShoesClownBanana = banana clown shoes
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpskirts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpskirts.ftl
new file mode 100644
index 00000000000..037824dd463
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpskirts.ftl
@@ -0,0 +1,32 @@
+ent-ClothingUniformJumpskirtColorWhite = white jumpskirt
+ .desc = A generic white jumpskirt with no rank markings.
+ent-ClothingUniformJumpskirtColorGrey = grey jumpskirt
+ .desc = A tasteful grey jumpskirt that reminds you of the good old days.
+ent-ClothingUniformJumpskirtColorBlack = black jumpskirt
+ .desc = A generic black jumpskirt with no rank markings.
+ent-ClothingUniformJumpskirtColorBlue = blue jumpskirt
+ .desc = A generic blue jumpskirt with no rank markings.
+ent-ClothingUniformJumpskirtColorDarkBlue = dark blue jumpskirt
+ .desc = A generic dark blue jumpskirt with no rank markings.
+ent-ClothingUniformJumpskirtColorTeal = teal jumpskirt
+ .desc = A generic teal jumpskirt with no rank markings.
+ent-ClothingUniformJumpskirtColorGreen = green jumpskirt
+ .desc = A generic green jumpskirt with no rank markings.
+ent-ClothingUniformJumpskirtColorDarkGreen = dark green jumpskirt
+ .desc = A generic dark green jumpskirt with no rank markings.
+ent-ClothingUniformJumpskirtColorOrange = orange jumpskirt
+ .desc = Don't wear this near paranoid security officers.
+ent-ClothingUniformJumpskirtColorPink = pink jumpskirt
+ .desc = Just looking at this makes you feel fabulous.
+ent-ClothingUniformJumpskirtColorRed = red jumpskirt
+ .desc = A generic red jumpskirt with no rank markings.
+ent-ClothingUniformJumpskirtColorYellow = yellow jumpskirt
+ .desc = A generic yellow jumpskirt with no rank markings.
+ent-ClothingUniformJumpskirtColorPurple = purple jumpskirt
+ .desc = A generic light purple jumpskirt with no rank markings.
+ent-ClothingUniformJumpskirtColorLightBrown = light brown jumpskirt
+ .desc = A generic light brown jumpskirt with no rank markings.
+ent-ClothingUniformJumpskirtColorBrown = brown jumpskirt
+ .desc = A generic brown jumpskirt with no rank markings.
+ent-ClothingUniformJumpskirtColorMaroon = maroon jumpskirt
+ .desc = A generic maroon jumpskirt with no rank markings.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpsuits.ftl
new file mode 100644
index 00000000000..02be453cd06
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpsuits.ftl
@@ -0,0 +1,34 @@
+ent-ClothingUniformJumpsuitColorWhite = white jumpsuit
+ .desc = A generic white jumpsuit with no rank markings.
+ent-ClothingUniformJumpsuitColorGrey = grey jumpsuit
+ .desc = A tasteful grey jumpsuit that reminds you of the good old days.
+ent-ClothingUniformJumpsuitColorBlack = black jumpsuit
+ .desc = A generic black jumpsuit with no rank markings.
+ent-ClothingUniformJumpsuitColorBlue = blue jumpsuit
+ .desc = A generic blue jumpsuit with no rank markings.
+ent-ClothingUniformJumpsuitColorDarkBlue = dark blue jumpsuit
+ .desc = A generic dark blue jumpsuit with no rank markings.
+ent-ClothingUniformJumpsuitColorTeal = teal jumpsuit
+ .desc = A generic teal jumpsuit with no rank markings.
+ent-ClothingUniformJumpsuitColorGreen = green jumpsuit
+ .desc = A generic green jumpsuit with no rank markings.
+ent-ClothingUniformJumpsuitColorDarkGreen = dark green jumpsuit
+ .desc = A generic dark green jumpsuit with no rank markings.
+ent-ClothingUniformJumpsuitColorOrange = orange jumpsuit
+ .desc = Don't wear this near paranoid security officers.
+ent-ClothingUniformJumpsuitColorPink = pink jumpsuit
+ .desc = Just looking at this makes you feel fabulous.
+ent-ClothingUniformJumpsuitColorRed = red jumpsuit
+ .desc = A generic red jumpsuit with no rank markings.
+ent-ClothingUniformJumpsuitColorYellow = yellow jumpsuit
+ .desc = A generic yellow jumpsuit with no rank markings.
+ent-ClothingUniformJumpsuitColorPurple = purple jumpsuit
+ .desc = A generic light purple jumpsuit with no rank markings.
+ent-ClothingUniformJumpsuitColorLightBrown = light brown jumpsuit
+ .desc = A generic light brown jumpsuit with no rank markings.
+ent-ClothingUniformJumpsuitColorBrown = brown jumpsuit
+ .desc = A generic brown jumpsuit with no rank markings.
+ent-ClothingUniformJumpsuitColorMaroon = maroon jumpsuit
+ .desc = A generic maroon jumpsuit with no rank markings.
+ent-ClothingUniformColorRainbow = rainbow jumpsuit
+ .desc = A multi-colored jumpsuit!
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl
index 12db2f9a37d..1e3146e0752 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl
@@ -5,7 +5,7 @@ ent-ClothingUniformJumpskirtCaptain = captain's jumpskirt
ent-ClothingUniformJumpskirtCargo = cargo tech jumpskirt
.desc = A sturdy jumpskirt, issued to members of the Cargo department.
ent-ClothingUniformJumpskirtChiefEngineer = chief engineer's jumpskirt
- .desc = It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding.
+ .desc = It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer.
ent-ClothingUniformJumpskirtChiefEngineerTurtle = chief engineer's turtleneck
.desc = A yellow turtleneck designed specifically for work in conditions of the engineering department.
ent-ClothingUniformJumpskirtChaplain = chaplain's jumpskirt
@@ -26,14 +26,14 @@ ent-ClothingUniformJumpskirtDetectiveGrey = detective noir suit
.desc = A hard-boiled private investigator's grey suit, complete with tie clip.
ent-ClothingUniformJumpskirtEngineering = engineering jumpskirt
.desc = If this suit was non-conductive, maybe engineers would actually do their damn job.
-ent-ClothingUniformJumpskirtHoP = station representative's jumpskirt
+ent-ClothingUniformJumpskirtHoP = head of personnel's jumpskirt
.desc = Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
-ent-ClothingUniformJumpskirtHoS = sheriff's jumpskirt
- .desc = It's bright red and rather crisp, much like the department's victims tend to be. Its sturdy fabric provides minor protection from slash and pierce damage.
-ent-ClothingUniformJumpskirtHoSAlt = sheriff's turtleneck
- .desc = It's a turtleneck worn by those strong and disciplined enough to achieve the position of Sheriff. Its sturdy fabric provides minor protection from slash and pierce damage.
-ent-ClothingUniformJumpskirtHoSParadeMale = sheriff's parade uniform
- .desc = A sheriff's luxury-wear, for special occasions.
+ent-ClothingUniformJumpskirtHoS = head of security's jumpskirt
+ .desc = It's bright red and rather crisp, much like security's victims tend to be.
+ent-ClothingUniformJumpskirtHoSAlt = head of security's turtleneck
+ .desc = It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security.
+ent-ClothingUniformJumpskirtHoSParadeMale = head of security's parade uniform
+ .desc = A head of security's luxury-wear, for special occasions.
ent-ClothingUniformJumpskirtHydroponics = hydroponics jumpskirt
.desc = Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
ent-ClothingUniformJumpskirtJanitor = janitor jumpskirt
@@ -55,45 +55,13 @@ ent-ClothingUniformJumpskirtQMTurtleneck = quartermasters's turtleneck
ent-ClothingUniformJumpskirtResearchDirector = research director's turtleneck
.desc = It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
ent-ClothingUniformJumpskirtScientist = scientist jumpskirt
- .desc = It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist.
+ .desc = It's made of a special fiber that increases perceived intelligence and decreases personal ethics. It has markings that denote the wearer as a scientist.
ent-ClothingUniformJumpskirtRoboticist = roboticist jumpskirt
.desc = It's a slimming black with reinforced seams; great for industrial work.
-ent-ClothingUniformJumpskirtSec = deputy jumpskirt
+ent-ClothingUniformJumpskirtSec = security jumpskirt
.desc = A jumpskirt made of strong material, providing robust protection.
-ent-ClothingUniformJumpskirtWarden = bailiff's jumpskirt
+ent-ClothingUniformJumpskirtWarden = warden's uniform
.desc = A formal security suit for officers complete with Nanotrasen belt buckle.
-ent-ClothingUniformJumpskirtColorGrey = grey jumpskirt
- .desc = A tasteful grey jumpskirt that reminds you of the good old days.
-ent-ClothingUniformJumpskirtColorBlack = black jumpskirt
- .desc = A generic black jumpskirt with no rank markings.
-ent-ClothingUniformJumpskirtColorBlue = blue jumpskirt
- .desc = A generic blue jumpskirt with no rank markings.
-ent-ClothingUniformJumpskirtColorGreen = green jumpskirt
- .desc = A generic green jumpskirt with no rank markings.
-ent-ClothingUniformJumpskirtColorOrange = orange jumpskirt
- .desc = Don't wear this near paranoid security officers.
-ent-ClothingUniformJumpskirtColorPink = pink jumpskirt
- .desc = Just looking at this makes you feel fabulous.
-ent-ClothingUniformJumpskirtColorRed = red jumpskirt
- .desc = A generic red jumpskirt with no rank markings.
-ent-ClothingUniformJumpskirtColorWhite = white jumpskirt
- .desc = A generic white jumpskirt with no rank markings.
-ent-ClothingUniformJumpskirtColorYellow = yellow jumpskirt
- .desc = A generic yellow jumpskirt with no rank markings.
-ent-ClothingUniformJumpskirtColorDarkBlue = dark blue jumpskirt
- .desc = A generic dark blue jumpskirt with no rank markings.
-ent-ClothingUniformJumpskirtColorTeal = teal jumpskirt
- .desc = A generic teal jumpskirt with no rank markings.
-ent-ClothingUniformJumpskirtColorPurple = purple jumpskirt
- .desc = A generic purple jumpskirt with no rank markings.
-ent-ClothingUniformJumpskirtColorDarkGreen = dark green jumpskirt
- .desc = A generic dark green jumpskirt with no rank markings.
-ent-ClothingUniformJumpskirtColorLightBrown = light brown jumpskirt
- .desc = A generic light brown jumpskirt with no rank markings.
-ent-ClothingUniformJumpskirtColorBrown = brown jumpskirt
- .desc = A generic brown jumpskirt with no rank markings.
-ent-ClothingUniformJumpskirtColorMaroon = maroon jumpskirt
- .desc = A generic maroon jumpskirt with no rank markings.
ent-ClothingUniformJumpskirtLibrarian = librarian jumpskirt
.desc = A cosy green jumper fit for a curator of books.
ent-ClothingUniformJumpskirtCurator = sensible skirt
@@ -138,9 +106,9 @@ ent-ClothingUniformJumpskirtSeniorResearcher = senior researcher jumpskirt
.desc = A sign of skill and prestige within the science department.
ent-ClothingUniformJumpskirtSeniorPhysician = senior physician jumpskirt
.desc = A sign of skill and prestige within the medical department.
-ent-ClothingUniformJumpskirtSeniorOfficer = sergeant jumpskirt
- .desc = A sign of skill and prestige within the sheriff's department.
-ent-ClothingUniformJumpskirtSecGrey = grey deputy jumpskirt
+ent-ClothingUniformJumpskirtSeniorOfficer = senior officer jumpskirt
+ .desc = A sign of skill and prestige within the security department.
+ent-ClothingUniformJumpskirtSecGrey = grey security jumpskirt
.desc = A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood.
ent-ClothingUniformJumpskirtWeb = web jumpskirt
.desc = Makes it clear that you are one with the webs.
@@ -150,3 +118,5 @@ ent-ClothingUniformJumpskirtCasualPurple = casual purple jumpskirt
.desc = A loose worn purple shirt with a grey skirt, perfect for someone looking to relax.
ent-ClothingUniformJumpskirtCasualRed = casual red jumpskirt
.desc = A loose worn red shirt with a grey skirt, perfect for someone looking to relax.
+ent-ClothingUniformJumpskirtOldDress = old dress
+ .desc = A worn-looking dress from a very long time ago.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl
index f26e1902bdd..c94d97c872c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl
@@ -15,7 +15,7 @@ ent-ClothingUniformJumpsuitCargo = cargo tech jumpsuit
ent-ClothingUniformJumpsuitSalvageSpecialist = salvage specialist's jumpsuit
.desc = It's a snappy jumpsuit with a sturdy set of overalls. It's very dirty.
ent-ClothingUniformJumpsuitChiefEngineer = chief engineer's jumpsuit
- .desc = It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding.
+ .desc = It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer.
ent-ClothingUniformJumpsuitChiefEngineerTurtle = chief engineer's turtleneck
.desc = A yellow turtleneck designed specifically for work in conditions of the engineering department.
ent-ClothingUniformJumpsuitChaplain = chaplain's jumpsuit
@@ -52,18 +52,18 @@ ent-ClothingUniformJumpsuitEngineering = engineering jumpsuit
.desc = If this suit was non-conductive, maybe engineers would actually do their damn job.
ent-ClothingUniformJumpsuitEngineeringHazard = hazard jumpsuit
.desc = Woven in a grungy, warm orange. Lets others around you know that you really mean business when it comes to work.
-ent-ClothingUniformJumpsuitHoP = station representative's jumpsuit
+ent-ClothingUniformJumpsuitHoP = head of personnel's jumpsuit
.desc = Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
-ent-ClothingUniformJumpsuitHoS = sheriff's jumpsuit
- .desc = It's bright red and rather crisp, much like the department's victims tend to be.
-ent-ClothingUniformJumpsuitHoSAlt = sheriff's turtleneck
- .desc = It's a turtleneck worn by those strong and disciplined enough to achieve the position of Sheriff.
-ent-ClothingUniformJumpsuitHoSBlue = sheriff's blue jumpsuit
- .desc = A blue jumpsuit worn by the Sheriff.
-ent-ClothingUniformJumpsuitHoSGrey = sheriff's grey jumpsuit
- .desc = A grey jumpsuit of a Sheriff, which make them look somewhat like a passenger.
-ent-ClothingUniformJumpsuitHoSParadeMale = sheriff's parade uniform
- .desc = A male sheriff's luxury-wear, for special occasions.
+ent-ClothingUniformJumpsuitHoS = head of security's jumpsuit
+ .desc = It's bright red and rather crisp, much like security's victims tend to be.
+ent-ClothingUniformJumpsuitHoSAlt = head of security's turtleneck
+ .desc = It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security.
+ent-ClothingUniformJumpsuitHoSBlue = head of security's blue jumpsuit
+ .desc = A blue jumpsuit of Head of Security.
+ent-ClothingUniformJumpsuitHoSGrey = head of security's grey jumpsuit
+ .desc = A grey jumpsuit of Head of Security, which make him look somewhat like a passenger.
+ent-ClothingUniformJumpsuitHoSParadeMale = head of security's parade uniform
+ .desc = A male head of security's luxury-wear, for special occasions.
ent-ClothingUniformJumpsuitHydroponics = hydroponics jumpsuit
.desc = Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
ent-ClothingUniformJumpsuitJanitor = janitor jumpsuit
@@ -89,63 +89,25 @@ ent-ClothingUniformJumpsuitQMFormal = quartermasters's formal suit
ent-ClothingUniformJumpsuitResearchDirector = research director's turtleneck
.desc = It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
ent-ClothingUniformJumpsuitScientist = scientist jumpsuit
- .desc = It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist.
+ .desc = It's made of a special fiber that increases perceived intelligence and decreases personal ethics. It has markings that denote the wearer as a scientist.
ent-ClothingUniformJumpsuitScientistFormal = scientist's formal jumpsuit
.desc = A uniform for sophisticated scientists, best worn with its matching tie.
ent-ClothingUniformJumpsuitRoboticist = roboticist jumpsuit
.desc = It's a slimming black with reinforced seams; great for industrial work.
-ent-ClothingUniformJumpsuitSec = deputy jumpsuit
+ent-ClothingUniformJumpsuitSec = security jumpsuit
.desc = A jumpsuit made of strong material, providing robust protection.
-ent-ClothingUniformJumpsuitSecBlue = blue deputy jumpsuit
- .desc = A jumpsuit made of strong material, providing robust protection.
-ent-ClothingUniformJumpsuitSecGrey = grey deputy jumpsuit
+ent-ClothingUniformJumpsuitSecBlue = blue shirt and tie
+ .desc = I'm a little busy right now, Calhoun.
+ent-ClothingUniformJumpsuitSecGrey = grey security jumpsuit
.desc = A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood.
-ent-ClothingUniformJumpsuitWarden = bailiff's jumpsuit
+ent-ClothingUniformJumpsuitWarden = warden's uniform
.desc = A formal security suit for officers complete with Nanotrasen belt buckle.
-ent-ClothingUniformJumpsuitColorGrey = grey jumpsuit
- .desc = A tasteful grey jumpsuit that reminds you of the good old days.
-ent-ClothingUniformJumpsuitColorBlack = black jumpsuit
- .desc = A generic black jumpsuit with no rank markings.
-ent-ClothingUniformJumpsuitColorBlue = blue jumpsuit
- .desc = A generic blue jumpsuit with no rank markings.
-ent-ClothingUniformJumpsuitColorGreen = green jumpsuit
- .desc = A generic green jumpsuit with no rank markings.
-ent-ClothingUniformJumpsuitColorOrange = orange jumpsuit
- .desc = Don't wear this near paranoid security officers.
-ent-ClothingUniformJumpsuitColorPink = pink jumpsuit
- .desc = Just looking at this makes you feel fabulous.
-ent-ClothingUniformJumpsuitColorRed = red jumpsuit
- .desc = A generic red jumpsuit with no rank markings.
-ent-ClothingUniformJumpsuitColorWhite = white jumpsuit
- .desc = A generic white jumpsuit with no rank markings.
-ent-ClothingUniformJumpsuitColorYellow = yellow jumpsuit
- .desc = A generic yellow jumpsuit with no rank markings.
-ent-ClothingUniformJumpsuitColorDarkBlue = dark blue jumpsuit
- .desc = A generic dark blue jumpsuit with no rank markings.
-ent-ClothingUniformJumpsuitColorTeal = teal jumpsuit
- .desc = A generic teal jumpsuit with no rank markings.
-ent-ClothingUniformJumpsuitColorPurple = purple jumpsuit
- .desc = A generic purple jumpsuit with no rank markings.
-ent-ClothingUniformJumpsuitColorDarkGreen = dark green jumpsuit
- .desc = A generic dark green jumpsuit with no rank markings.
-ent-ClothingUniformJumpsuitColorLightBrown = light brown jumpsuit
- .desc = A generic light brown jumpsuit with no rank markings.
-ent-ClothingUniformJumpsuitColorBrown = brown jumpsuit
- .desc = A generic brown jumpsuit with no rank markings.
-ent-ClothingUniformJumpsuitColorMaroon = maroon jumpsuit
- .desc = A generic maroon jumpsuit with no rank markings.
-ent-ClothingUniformColorRainbow = rainbow jumpsuit
- .desc = A multi-colored jumpsuit!
ent-ClothingUniformOveralls = overalls
.desc = Great for working outdoors.
ent-ClothingUniformJumpsuitLibrarian = librarian jumpsuit
.desc = A cosy green jumper fit for a curator of books.
ent-ClothingUniformJumpsuitCurator = sensible suit
.desc = It's sensible. Too sensible...
-ent-ClothingUniformJumpsuitGalaxyRed = red galaxy suit
- .desc = Red lawsuit for those that conduct business on a galactic scale.
-ent-ClothingUniformJumpsuitGalaxyBlue = blue galaxy suit
- .desc = Blue lawsuit or those that conduct business on a galactic scale.
ent-ClothingUniformJumpsuitLawyerRed = red lawyer suit
.desc = A flashy red suit worn by lawyers and show-offs.
ent-ClothingUniformJumpsuitLawyerBlue = blue lawyer suit
@@ -196,6 +158,8 @@ ent-ClothingUniformJumpsuitMonasticRobeLight = light monastic robe
.desc = It's a light robe, often worn by religious folk.
ent-ClothingUniformJumpsuitMusician = musician's tuxedo
.desc = A fancy tuxedo for the musically inclined. Perfect for any lounge act!
+ent-ClothingUniformJumpsuitERTChaplain = ERT chaplain uniform
+ .desc = A special suit made for Central Command's elite chaplain corps.
ent-ClothingUniformJumpsuitERTEngineer = ERT engineering uniform
.desc = A special suit made for the elite engineers under CentCom.
ent-ClothingUniformJumpsuitERTJanitor = ERT janitorial uniform
@@ -233,8 +197,8 @@ ent-ClothingUniformJumpsuitSeniorResearcher = senior researcher jumpsuit
.desc = A sign of skill and prestige within the science department.
ent-ClothingUniformJumpsuitSeniorPhysician = senior physician jumpsuit
.desc = A sign of skill and prestige within the medical department.
-ent-ClothingUniformJumpsuitSeniorOfficer = sergeant jumpsuit
- .desc = A sign of skill and prestige within the sheriff's department.
+ent-ClothingUniformJumpsuitSeniorOfficer = senior officer jumpsuit
+ .desc = A sign of skill and prestige within the security department.
ent-ClothingUniformJumpsuitWeb = web jumpsuit
.desc = Makes it clear that you are one with the webs.
ent-ClothingUniformJumpsuitLoungewear = loungewear
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/random_suit.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/random_suit.ftl
index d6cf5ddc9c5..7e54980293f 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/random_suit.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/random_suit.ftl
@@ -5,7 +5,7 @@ ent-ClothingRandomSpawner = random colorful costume
.desc = { ent-ClothingUniformRandom.desc }
ent-ClothingUniformRandomArmless = colorful hands-free costume
.desc = { ent-ClothingUniformRandom.desc }
-ent-ClothingUniformRandomStandart = colorful costume
+ent-ClothingUniformRandomStandard = colorful costume
.desc = { ent-ClothingUniformRandom.desc }
ent-ClothingUniformRandomBra = colorful bra
.desc = { ent-ClothingUniformRandom.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/debugging/tippy.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/debugging/tippy.ftl
new file mode 100644
index 00000000000..aefa8d8ba31
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/debugging/tippy.ftl
@@ -0,0 +1,2 @@
+ent-Tippy = { "" }
+ .desc = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/effects/rcd.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/effects/rcd.ftl
index 4217dee5c40..37a7e669feb 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/effects/rcd.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/effects/rcd.ftl
@@ -1,2 +1,22 @@
-ent-EffectRCDConstruction = { "" }
+ent-EffectRCDBase = { "" }
.desc = { "" }
+ent-EffectRCDDeconstructPreview = { ent-EffectRCDBase }
+ .desc = { ent-EffectRCDBase.desc }
+ent-EffectRCDConstruct0 = { ent-EffectRCDBase }
+ .desc = { ent-EffectRCDBase.desc }
+ent-EffectRCDConstruct1 = { ent-EffectRCDBase }
+ .desc = { ent-EffectRCDBase.desc }
+ent-EffectRCDConstruct2 = { ent-EffectRCDBase }
+ .desc = { ent-EffectRCDBase.desc }
+ent-EffectRCDConstruct3 = { ent-EffectRCDBase }
+ .desc = { ent-EffectRCDBase.desc }
+ent-EffectRCDConstruct4 = { ent-EffectRCDBase }
+ .desc = { ent-EffectRCDBase.desc }
+ent-EffectRCDDeconstruct2 = { ent-EffectRCDBase }
+ .desc = { ent-EffectRCDBase.desc }
+ent-EffectRCDDeconstruct4 = { ent-EffectRCDBase }
+ .desc = { ent-EffectRCDBase.desc }
+ent-EffectRCDDeconstruct6 = { ent-EffectRCDBase }
+ .desc = { ent-EffectRCDBase.desc }
+ent-EffectRCDDeconstruct8 = { ent-EffectRCDBase }
+ .desc = { ent-EffectRCDBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/shuttle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/shuttle.ftl
index 20afb6ac4f1..580e5467a65 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/shuttle.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/shuttle.ftl
@@ -1,2 +1,4 @@
ent-FTLPoint = FTL point
.desc = { ent-MarkerBase.desc }
+ent-FTLExclusion = FTL exclusion point
+ .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/ghost_roles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/ghost_roles.ftl
index 66c946f4446..6edda3a127e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/ghost_roles.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/ghost_roles.ftl
@@ -19,5 +19,3 @@ ent-SpawnPointGhostDragon = ghost role spawn point
ent-SpawnPointGhostSpaceNinja = ghost role spawn point
.suffix = space ninja
.desc = { ent-MarkerBase.desc }
-ent-SpawnPointGhostTerminator = terminator spawn point
- .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl
index c8a5fff491e..33134932e6d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl
@@ -81,6 +81,8 @@ ent-SpawnPointBrigmedic = brigmedic
.desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointERTLeader = ERTleader
.desc = { ent-SpawnPointJobBase.desc }
+ent-SpawnPointERTChaplain = ERTchaplain
+ .desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointERTEngineer = ERTengineer
.desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointERTMedical = ERTmedical
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl
index 1ca831e7fcd..ba46376a1d4 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl
@@ -118,3 +118,5 @@ ent-SpawnMobLuminousObject = luminous object spawner
.desc = { ent-MarkerBase.desc }
ent-SpawnMobLuminousEntity = luminous entity spawner
.desc = { ent-MarkerBase.desc }
+ent-SpawnMobLuminousRandom = luminous random spawner
+ .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl
index 44ba4b49e95..b47ce3a876d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl
@@ -59,8 +59,19 @@ ent-MobMonkeySyndicateAgent = { ent-MobBaseSyndicateMonkey }
ent-MobMonkeySyndicateAgentNukeops = { ent-MobBaseSyndicateMonkey }
.suffix = NukeOps
.desc = { ent-MobBaseSyndicateMonkey.desc }
+ent-MobBaseKobold = kobold
+ .desc = Cousins to the sentient race of lizard people, kobolds blend in with their natural habitat and are as nasty as monkeys; ready to pull out your hair and stab you to death.
ent-MobKobold = kobold
.desc = Cousins to the sentient race of lizard people, kobolds blend in with their natural habitat and are as nasty as monkeys; ready to pull out your hair and stab you to death.
+ent-MobBaseSyndicateKobold = { ent-MobBaseKobold }
+ .suffix = syndicate base
+ .desc = { ent-MobBaseKobold.desc }
+ent-MobKoboldSyndicateAgent = { ent-MobBaseSyndicateKobold }
+ .suffix = syndicate agent
+ .desc = { ent-MobBaseSyndicateKobold.desc }
+ent-MobKoboldSyndicateAgentNukeops = { ent-MobBaseSyndicateKobold }
+ .suffix = NukeOps
+ .desc = { ent-MobBaseSyndicateKobold.desc }
ent-MobGuidebookMonkey = guidebook monkey
.desc = A hopefully helpful monkey whose only purpose in life is for you to click on. Does this count as having a monkey give you a tutorial?
ent-MobMouse = mouse
@@ -75,6 +86,8 @@ ent-MobMouse1 = { ent-MobMouse }
.desc = { ent-MobMouse.desc }
ent-MobMouse2 = { ent-MobMouse }
.desc = { ent-MobMouse.desc }
+ent-MobMouseCancer = cancer mouse
+ .desc = Toxic. Squeak!
ent-MobLizard = lizard
.desc = A harmless dragon.
ent-MobSlug = slug
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/argocyte.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/argocyte.ftl
index 1ad9ca90631..d51912f1c92 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/argocyte.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/argocyte.ftl
@@ -1,4 +1,4 @@
-ent-BaseMobArgocyte = { ent-MobCombat }
+ent-BaseMobArgocyte = { ent-BaseSimpleMob }
.desc = A dangerous alien found on the wrong side of planets, known for their propensity for munching on ruins.
.suffix = AI
ent-MobArgocyteSlurva = slurva
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/elemental.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/elemental.ftl
index 1b655d1f407..9f848b2e731 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/elemental.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/elemental.ftl
@@ -1,7 +1,7 @@
ent-MobElementalBase = { "" }
.desc = { "" }
ent-MobOreCrab = ore crab
- .desc = { ent-MobCombat.desc }
+ .desc = { ent-MobElementalBase.desc }
ent-MobQuartzCrab = { ent-MobOreCrab }
.desc = An ore crab made from Quartz.
ent-MobIronCrab = { ent-MobOreCrab }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/human.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/human.ftl
index 682d2d6b289..a82f4fe83b6 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/human.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/human.ftl
@@ -4,8 +4,12 @@ ent-MobSalvager = salvager
.desc = { ent-BaseMobHuman.desc }
ent-MobSpirate = spirate
.desc = Yarr!
+ent-MobSyndicateFootsoldier = syndicate footsoldier
+ .desc = { ent-BaseMobHuman.desc }
+ent-MobSyndicateFootsoldierPilot = syndicate shuttle pilot
+ .desc = { ent-MobSyndicateFootsoldier.desc }
ent-SalvageHumanCorpse = unidentified corpse
- .desc = I think he's dead.
+ .desc = I think they're dead.
.suffix = Dead
ent-MobCluwne = person
.desc = A polymorphed unfortunate.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/miscellaneous.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/miscellaneous.ftl
index 3387b09cc9c..639f3b6a337 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/miscellaneous.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/miscellaneous.ftl
@@ -1,2 +1,4 @@
ent-MobLaserRaptor = laser raptor
.desc = From the Viking age.
+ent-MobTomatoKiller = tomato killer
+ .desc = it seems today it's not you eating tomatoes, it's the tomatoes eating you.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/simplemob.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/simplemob.ftl
index b03588ddbec..ebc5c78a400 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/simplemob.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/simplemob.ftl
@@ -1,9 +1,9 @@
ent-BaseSimpleMob = { ent-BaseMob }
.suffix = AI
.desc = { ent-BaseMob.desc }
-ent-SimpleSpaceMobBase = { ent-SimpleSpaceMobBase }
+ent-SimpleSpaceMobBase = { ent-BaseSimpleMob }
.suffix = AI
- .desc = { ent-SimpleSpaceMobBase.desc }
-ent-SimpleMobBase = { ent-BaseSimpleMob }
+ .desc = { ent-BaseSimpleMob.desc }
+ent-SimpleMobBase = { ent-MobRespirator }
.suffix = AI
- .desc = { ent-BaseSimpleMob.desc }
\ No newline at end of file
+ .desc = { ent-MobRespirator.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl
index 81f1b70b60f..4fe569c7a1c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl
@@ -1,5 +1,9 @@
+ent-BaseMobAdultSlimes = basic slime
+ .desc = It looks so much like jelly. I wonder what it tastes like?
ent-MobAdultSlimes = basic slime
.desc = It looks so much like jelly. I wonder what it tastes like?
+ent-MobSlimesGeras = geras
+ .desc = A geras of a slime - the name is ironic, isn't it?
ent-MobAdultSlimesBlue = blue slime
.desc = { ent-MobAdultSlimes.desc }
ent-MobAdultSlimesBlueAngry = blue slime
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/human.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/human.ftl
index c850c6219ff..0328e828b6e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/human.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/human.ftl
@@ -1,11 +1,14 @@
ent-MobHuman = Urist McHands
.desc = { ent-BaseMobHuman.desc }
-ent-MobHumanSyndicateAgent = syndicate agent
- .suffix = Human
+ent-MobHumanSyndicateAgentBase = syndicate agent
+ .suffix = Human, Base
.desc = { ent-MobHuman.desc }
-ent-MobHumanSyndicateAgentNukeops = { ent-MobHumanSyndicateAgent }
- .suffix = NukeOps
- .desc = { ent-MobHumanSyndicateAgent.desc }
+ent-MobHumanSyndicateAgent = syndicate agent
+ .suffix = Human, Traitor
+ .desc = { ent-MobHumanSyndicateAgentBase.desc }
+ent-MobHumanSyndicateAgentNukeops = { ent-MobHumanSyndicateAgentBase }
+ .suffix = Human, NukeOps
+ .desc = { ent-MobHumanSyndicateAgentBase.desc }
ent-MobHumanNukeOp = Nuclear Operative
.desc = { ent-MobHuman.desc }
ent-MobHumanLoneNuclearOperative = Lone Operative
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl
index 94c41f9f03a..b6f71cd9946 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl
@@ -10,6 +10,12 @@ ent-RandomHumanoidSpawnerERTLeaderEVA = ERT leader
ent-RandomHumanoidSpawnerERTLeaderEVALecter = { ent-RandomHumanoidSpawnerERTLeaderEVA }
.suffix = ERTRole, Lecter, EVA
.desc = { ent-RandomHumanoidSpawnerERTLeaderEVA.desc }
+ent-RandomHumanoidSpawnerERTChaplain = ERT chaplain
+ .suffix = ERTRole, Basic
+ .desc = { ent-RandomHumanoidSpawnerERTLeader.desc }
+ent-RandomHumanoidSpawnerERTChaplainEVA = ERT chaplain
+ .suffix = ERTRole, Enviro EVA
+ .desc = { ent-RandomHumanoidSpawnerERTChaplain.desc }
ent-RandomHumanoidSpawnerERTJanitor = ERT janitor
.suffix = ERTRole, Basic
.desc = { ent-RandomHumanoidSpawnerERTLeader.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/reptilian.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/reptilian.ftl
index 47cfbb9cc23..98264db63fd 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/reptilian.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/reptilian.ftl
@@ -1,2 +1,3 @@
-ent-MobReptilian = Urisst' Mzhand
+ent-MobReptilian = Urist McScales
+ .suffix = Urisst' Mzhand
.desc = { ent-BaseMobReptilian.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/vox.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/vox.ftl
index 53f3bda379e..a65a8396af6 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/vox.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/vox.ftl
@@ -1,2 +1,2 @@
-ent-MobVox = Vox
+ent-MobVox = Urist McVox
.desc = { ent-BaseMobVox.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/species/base.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/species/base.ftl
index 8ab860c0c77..1a891056b75 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/species/base.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/species/base.ftl
@@ -3,4 +3,4 @@ ent-BaseMobSpecies = { ent-BaseMob }
ent-BaseMobSpeciesOrganic = { ent-BaseMobSpecies }
.desc = { ent-BaseMobSpecies.desc }
ent-BaseSpeciesDummy = { "" }
- .desc = { "" }
\ No newline at end of file
+ .desc = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl
index f7f6cf76818..d93ac50df48 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl
@@ -1,5 +1,8 @@
ent-DrinkCartonBaseFull = { ent-DrinkBase }
+ .suffix = Full
.desc = { ent-DrinkBase.desc }
+ent-DrinkCartonBaseLargeFull = { ent-DrinkCartonBaseFull }
+ .desc = { ent-DrinkCartonBaseFull.desc }
ent-DrinkCartonVisualsOpenable = { "" }
.desc = { "" }
ent-DrinkJuiceLimeCarton = lime juice
@@ -8,6 +11,8 @@ ent-DrinkJuiceOrangeCarton = orange juice
.desc = Full of vitamins and deliciousness!
ent-DrinkJuiceTomatoCarton = tomato juice
.desc = Well, at least it LOOKS like tomato juice. You can't tell with all that redness.
+ent-DrinkCoconutWaterCarton = coconut water
+ .desc = It's the inside of the coconut that counts.
ent-DrinkCreamCarton = milk cream
.desc = It's cream. Made from milk. What else did you think you'd find in there?
ent-DrinkMilkCarton = milk
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl
index 57a79d02638..f7e9940974a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl
@@ -30,6 +30,9 @@ ent-DrinkAndalusia = { ent-DrinkGlass }
ent-DrinkAntifreeze = { ent-DrinkGlass }
.suffix = antifreeze
.desc = { ent-DrinkGlass.desc }
+ent-DrinkArnoldPalmer = { ent-DrinkGlass }
+ .suffix = arnold palmer
+ .desc = { ent-DrinkGlass.desc }
ent-DrinkAtomicBombGlass = { ent-DrinkGlass }
.suffix = atomic bomb
.desc = { ent-DrinkGlass.desc }
@@ -63,24 +66,42 @@ ent-DrinkBlueCuracaoGlass = { ent-DrinkGlass }
ent-DrinkBloodyMaryGlass = { ent-DrinkGlass }
.suffix = bloody mary
.desc = { ent-DrinkGlass.desc }
+ent-DrinkBlueHawaiianGlass = { ent-DrinkGlass }
+ .suffix = blue hawaiian
+ .desc = { ent-DrinkGlass.desc }
ent-DrinkBooger = { ent-DrinkGlass }
.suffix = booger
.desc = { ent-DrinkGlass.desc }
ent-DrinkBraveBullGlass = { ent-DrinkGlass }
.suffix = brave bull
.desc = { ent-DrinkGlass.desc }
+ent-BudgetInsulsDrinkGlass = { ent-DrinkGlass }
+ .suffix = budget insuls
+ .desc = { ent-DrinkGlass.desc }
ent-DrinkCarrotJuice = { ent-DrinkGlass }
.suffix = carrot juice
.desc = { ent-DrinkGlass.desc }
ent-DrinkChocolateGlass = { ent-DrinkGlass }
.suffix = chocolate
.desc = { ent-DrinkGlass.desc }
+ent-RubberneckGlass = { ent-DrinkGlass }
+ .suffix = rubberneck
+ .desc = { ent-DrinkGlass.desc }
+ent-DrinkCoconutRum = { ent-DrinkGlass }
+ .suffix = coconut rum
+ .desc = { ent-DrinkGlass.desc }
+ent-DrinkCoconutWaterGlass = { ent-DrinkGlass }
+ .suffix = coconut water
+ .desc = { ent-DrinkGlass.desc }
ent-DrinkCoffee = { ent-DrinkGlass }
.suffix = coffee
.desc = { ent-DrinkGlass.desc }
ent-DrinkCognacGlass = { ent-DrinkGlass }
.suffix = cognac
.desc = { ent-DrinkGlass.desc }
+ent-DrinkCosmopolitan = { ent-DrinkGlass }
+ .suffix = cosmopolitan
+ .desc = { ent-DrinkGlass.desc }
ent-DrinkCream = { ent-DrinkGlass }
.suffix = cream
.desc = { ent-DrinkGlass.desc }
@@ -165,6 +186,9 @@ ent-DrinkIceGlass = { ent-DrinkGlass }
ent-DrinkIceCreamGlass = { ent-DrinkGlass }
.suffix = ice cream
.desc = { ent-DrinkGlass.desc }
+ent-IrishBoolGlass = { ent-DrinkGlass }
+ .suffix = irish bool
+ .desc = { ent-DrinkGlass.desc }
ent-DrinkIrishCarBomb = { ent-DrinkGlass }
.suffix = irish car bomb
.desc = { ent-DrinkGlass.desc }
@@ -234,9 +258,15 @@ ent-DrinkNuclearColaGlass = { ent-DrinkGlass }
ent-DrinkOrangeJuice = { ent-DrinkGlass }
.suffix = orange juice
.desc = { ent-DrinkGlass.desc }
+ent-DrinkPainkillerGlass = { ent-DrinkGlass }
+ .suffix = painkiller
+ .desc = { ent-DrinkGlass.desc }
ent-DrinkPatronGlass = { ent-DrinkGlass }
.suffix = patron
.desc = { ent-DrinkGlass.desc }
+ent-DrinkPinaColadaGlass = { ent-DrinkGlass }
+ .suffix = piña colada
+ .desc = { ent-DrinkGlass.desc }
ent-DrinkPoisonBerryJuice = { ent-DrinkGlass }
.suffix = poison berry juice
.desc = { ent-DrinkGlass.desc }
@@ -261,6 +291,9 @@ ent-DrinkRootBeerFloatGlass = { ent-DrinkGlass }
ent-DrinkRumGlass = { ent-DrinkGlass }
.suffix = rum
.desc = { ent-DrinkGlass.desc }
+ent-DrinkRoyRogersGlass = { ent-DrinkGlass }
+ .suffix = roy rogers
+ .desc = { ent-DrinkGlass.desc }
ent-DrinkSakeGlass = { ent-DrinkGlass }
.suffix = sake
.desc = { ent-DrinkGlass.desc }
@@ -285,12 +318,18 @@ ent-DrinkMoonshineGlass = { ent-DrinkGlass }
ent-DrinkGlassWhite = { ent-DrinkGlass }
.suffix = milk
.desc = { ent-DrinkGlass.desc }
+ent-DrinkShirleyTempleGlass = { ent-DrinkGlass }
+ .suffix = shirley temple
+ .desc = { ent-DrinkGlass.desc }
ent-DrinkSilencerGlass = { ent-DrinkGlass }
.suffix = silencer
.desc = { ent-DrinkGlass.desc }
ent-DrinkSingulo = { ent-DrinkGlass }
.suffix = singulo
.desc = { ent-DrinkGlass.desc }
+ent-DrinkSolDryGlass = { ent-DrinkGlass }
+ .suffix = sol dry
+ .desc = { ent-DrinkGlass.desc }
ent-DrinkSnowWhite = { ent-DrinkGlass }
.suffix = snow white
.desc = { ent-DrinkGlass.desc }
@@ -338,6 +377,9 @@ ent-DrinkVodkaGlass = { ent-DrinkGlass }
ent-DrinkVodkaMartiniGlass = { ent-DrinkGlass }
.suffix = vodka martini
.desc = { ent-DrinkGlass.desc }
+ent-DrinkVodkaRedBool = { ent-DrinkGlass }
+ .suffix = vodka red bool
+ .desc = { ent-DrinkGlass.desc }
ent-DrinkVodkaTonicGlass = { ent-DrinkGlass }
.suffix = vodka tonic
.desc = { ent-DrinkGlass.desc }
@@ -346,6 +388,9 @@ ent-DrinkWaterJug = water jug
ent-DrinkWatermelonJuice = { ent-DrinkGlass }
.suffix = watermelon juice
.desc = { ent-DrinkGlass.desc }
+ent-DrinkWatermelonWakeup = { ent-DrinkGlass }
+ .suffix = watermelon wakeup
+ .desc = { ent-DrinkGlass.desc }
ent-DrinkWhiskeyColaGlass = { ent-DrinkGlass }
.suffix = whiskey cola
.desc = { ent-DrinkGlass.desc }
@@ -361,6 +406,9 @@ ent-DrinkWhiteRussianGlass = { ent-DrinkGlass }
ent-DrinkWineGlass = { ent-DrinkGlass }
.suffix = wine
.desc = { ent-DrinkGlass.desc }
+ent-XenoBasherGlass = { ent-DrinkGlass }
+ .suffix = xeno basher
+ .desc = { ent-DrinkGlass.desc }
ent-DrinkShakeBlue = blue milkshake
.desc = { ent-DrinkGlassBase.desc }
ent-DrinkShakeEmpty = shakeempty
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl
index 59a46a427f4..b952213bc69 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl
@@ -1,4 +1,5 @@
ent-DrinkBottlePlasticBaseFull = { ent-DrinkBase }
+ .suffix = Full
.desc = { ent-DrinkBase.desc }
ent-DrinkBottleGlassBaseFull = { ent-DrinkBottlePlasticBaseFull }
.desc = { ent-DrinkBottlePlasticBaseFull.desc }
@@ -70,13 +71,15 @@ ent-DrinkCreamCartonXL = Milk Cream XL
.desc = It's cream. Made from milk. What else did you think you'd find in there?
ent-DrinkSugarJug = sugar jug
.desc = some people put this in their coffee...
- .suffix = for drinks
+ .suffix = For Drinks, Full
ent-DrinkLemonLimeJug = lemon lime jug
.desc = a dual citrus sensation.
ent-DrinkMeadJug = mead jug
.desc = storing mead in a plastic jug should be a crime.
ent-DrinkIceJug = ice jug
.desc = stubborn water. pretty cool.
+ent-DrinkCoconutWaterJug = coconut water jug
+ .desc = It's on the inside of the coconut that counts.
ent-DrinkCoffeeJug = coffee jug
.desc = wake up juice, of the heated kind.
ent-DrinkTeaJug = tea jug
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cans.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cans.ftl
index 363d165b61f..7c5efcba549 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cans.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cans.ftl
@@ -19,6 +19,8 @@ ent-DrinkSpaceMountainWindCan = space mountain wind can
.desc = Blows right through you like a space wind.
ent-DrinkSpaceUpCan = space-up can
.desc = Tastes like a hull breach in your mouth.
+ent-DrinkSolDryCan = sol dry
+ .desc = Sweet ginger soda from outer space!
ent-DrinkStarkistCan = starkist can
.desc = The taste of a star in liquid form. And, a bit of tuna...?
ent-DrinkTonicWaterCan = tonic water can
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_special.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_special.ftl
index 85cbcab662d..8c697ec86cc 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_special.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_special.ftl
@@ -6,3 +6,9 @@ ent-DrinkJar = jar
.desc = The hipster's cup
ent-DrinkJarWhat = jar of something
.desc = You can't really tell what this is.
+ent-BartenderMixer = { "" }
+ .desc = { "" }
+ent-DrinkJigger = jigger
+ .desc = Like a shaker, but smaller. Used to control the amount of ingredients.
+ent-DrinkIceBucket = ice bucket
+ .desc = A special bucket of refreshy ice. Prohibited use for challenge with the same name!
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl
index daffab44509..655495d0f21 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl
@@ -1,20 +1,26 @@
ent-DrinkBottleBaseEmpty = base empty bottle
.desc = An empty bottle.
+ .suffix = Empty
+ent-DrinkBottleBaseSmallEmpty = base empty bottle
+ .desc = { ent-DrinkBottleBaseEmpty.desc }
ent-DrinkCartonBaseEmpty = base empty carton
.desc = An empty carton.
+ .suffix = Empty
+ent-DrinkCartonBaseLargeEmpty = base empty bottle
+ .desc = { ent-DrinkCartonBaseEmpty.desc }
ent-DrinkBottleAbsinthe = Jailbreaker Verte bottle
.desc = { ent-DrinkBottleBaseEmpty.desc }
ent-DrinkBottleAlcoClear = alcohol bottle
.desc = { ent-DrinkBottleBaseEmpty.desc }
ent-DrinkBottleAle = ale bottle
- .desc = { ent-DrinkBottleBaseEmpty.desc }
+ .desc = { ent-DrinkBottleBaseSmallEmpty.desc }
ent-DrinkBottleBeer = beer bottle
- .desc = { ent-DrinkBottleBaseEmpty.desc }
+ .desc = { ent-DrinkBottleBaseSmallEmpty.desc }
ent-DrinkBottleCognac = cognac bottle
.desc = { ent-DrinkBottleBaseEmpty.desc }
ent-DrinkBottleGin = Griffeater gin bottle
.desc = { ent-DrinkBottleBaseEmpty.desc }
-ent-DrinkBottleGoldschlager = goldschlager bottle
+ent-DrinkBottleGildlager = gildlager bottle
.desc = { ent-DrinkBottleBaseEmpty.desc }
ent-DrinkBottleCoffeeLiqueur = coffee liqueur bottle
.desc = { ent-DrinkBottleBaseEmpty.desc }
@@ -45,8 +51,8 @@ ent-DrinkCartonTomato = tomato juice carton
ent-DrinkCartonCream = milk cream carton
.desc = { ent-DrinkCartonBaseEmpty.desc }
ent-DrinkCartonMilk = milk carton
- .desc = { ent-DrinkCartonBaseEmpty.desc }
+ .desc = { ent-DrinkCartonBaseLargeEmpty.desc }
ent-DrinkCartonSoyMilk = soy milk carton
- .desc = { ent-DrinkCartonBaseEmpty.desc }
+ .desc = { ent-DrinkCartonBaseLargeEmpty.desc }
ent-DrinkCartonOatMilk = oat milk carton
- .desc = { ent-DrinkCartonBaseEmpty.desc }
+ .desc = { ent-DrinkCartonBaseLargeEmpty.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/donut.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/donut.ftl
index 6d674f575f5..cb0271ed2c3 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/donut.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/donut.ftl
@@ -1,4 +1,4 @@
-ent-FoodDonutBase = { ent-VendPriceFoodBase100 }
+ent-FoodDonutBase = { ent-FoodInjectableBase }
.desc = Goes great with robust coffee.
ent-FoodDonutPlain = plain donut
.desc = { ent-FoodDonutBase.desc }
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 dff96009ad3..dcb46286634 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
@@ -78,9 +78,9 @@ ent-FoodOnionSlice = onion slice
.desc = Nothing to cry over.
ent-FoodOnionRedSlice = red onion slice
.desc = Purple despite the name.
-ent-FoodChili = chili
+ent-FoodChiliPepper = chili pepper
.desc = Spicy, best not touch your eyes.
-ent-FoodChilly = chilly pepper
+ent-FoodChillyPepper = chilly pepper
.desc = Icy hot.
ent-FoodAloe = aloe
.desc = A fragrant plant with soothing properties.
@@ -126,3 +126,5 @@ ent-FoodPumpkin = pumpkin
.desc = A large, orange... berry. Seriously.
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.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/cigarettes/joints.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/cigarettes/joints.ftl
index 457cb530e22..93f58720f68 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/cigarettes/joints.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/cigarettes/joints.ftl
@@ -1,4 +1,10 @@
ent-Joint = joint
.desc = A roll of dried plant matter wrapped in thin paper.
+ent-JointRainbow = joint
+ .desc = A roll of dried plant matter wrapped in thin paper. Seems to be colorful inside.
+ .suffix = Rainbow
ent-Blunt = blunt
.desc = A roll of dried plant matter wrapped in a dried tobacco leaf.
+ent-BluntRainbow = blunt
+ .desc = A roll of dried plant matter wrapped in a dried tobacco leaf. Seems to be colorful inside.
+ .suffix = Rainbow
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/pipes/pipe.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/pipes/pipe.ftl
index 9e3977c4c33..5677f9ac27e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/pipes/pipe.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/pipes/pipe.ftl
@@ -6,3 +6,6 @@ ent-SmokingPipeFilledTobacco = pipe
ent-SmokingPipeFilledCannabis = pipe
.desc = Just like grandpappy used to smoke.
.suffix = Cannabis
+ent-SmokingPipeFilledCannabisRainbow = pipe
+ .desc = Just like grandpappy used to smoke.
+ .suffix = Rainbow Cannabis
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/flora.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/flora.ftl
index cb2fa851860..6049849a4dc 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/flora.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/flora.ftl
@@ -26,6 +26,18 @@ ent-FloraStalagmite5 = { ent-FloraStalagmite1 }
.desc = { ent-FloraStalagmite1.desc }
ent-FloraStalagmite6 = { ent-FloraStalagmite1 }
.desc = { ent-FloraStalagmite1.desc }
+ent-FloraGreyStalagmite1 = { ent-FloraStalagmite1 }
+ .desc = { ent-FloraStalagmite1.desc }
+ent-FloraGreyStalagmite2 = { ent-FloraGreyStalagmite1 }
+ .desc = { ent-FloraGreyStalagmite1.desc }
+ent-FloraGreyStalagmite3 = { ent-FloraGreyStalagmite1 }
+ .desc = { ent-FloraGreyStalagmite1.desc }
+ent-FloraGreyStalagmite4 = { ent-FloraGreyStalagmite1 }
+ .desc = { ent-FloraGreyStalagmite1.desc }
+ent-FloraGreyStalagmite5 = { ent-FloraGreyStalagmite1 }
+ .desc = { ent-FloraGreyStalagmite1.desc }
+ent-FloraGreyStalagmite6 = { ent-FloraGreyStalagmite1 }
+ .desc = { ent-FloraGreyStalagmite1.desc }
ent-FloraTree01 = tree
.desc = { ent-BaseTree.desc }
ent-FloraTree02 = tree
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/present.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/present.ftl
index 885c5cd227b..2ef8081d0b1 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/present.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/present.ftl
@@ -19,4 +19,4 @@ ent-PresentRandomCash = { ent-PresentBase }
.suffix = Filled Cash
.desc = { ent-PresentBase.desc }
ent-PresentTrash = Wrapping Paper
- .desc = Carefully folded, taped, and tied with a bow. Then ceremoniously ripped apart and tossed on the floor.
\ No newline at end of file
+ .desc = Carefully folded, taped, and tied with a bow. Then ceremoniously ripped apart and tossed on the floor.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/boombox.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/boombox.ftl
new file mode 100644
index 00000000000..e3d27d37809
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/boombox.ftl
@@ -0,0 +1,32 @@
+ent-BaseBoomBox = Бумбокс
+ .desc = Бумбокс, который покажет всем, кто здесь главный.
+ent-BaseBoomBoxTape = { ent-BaseItem }
+ .desc = { ent-BaseItem.desc }
+ent-BaseBoomBoxTapeSpaceOddity = Chris Hadfield - Space Oddity
+ .desc = Музыка
+ent-BaseBoomBoxTapeSpaceAsshole = Chris Remo - Space AssHole
+ .desc = Музыка
+ent-BaseBoomBoxTapeStarman = David Bowie - Starman
+ .desc = Музыка
+ent-BaseBoomBoxTapeTheChain = Fleetwood Mac - The Chain
+ .desc = Музыка
+ent-BaseBoomBoxTapeCantSmile = Barry Manilow - Cant Smile Without You
+ .desc = Музыка
+ent-BaseBoomBoxTapeUnderStars = AURORA - Under Stars
+ .desc = Музыка
+ent-BaseBoomBoxTapeCarelessWhisper = Careless Whisper
+ .desc = Музыка
+ent-BaseBoomBoxTapeComingHome = Coming Home
+ .desc = Музыка
+ent-BaseBoomBoxTapeSignals = Signals
+ .desc = Музыка
+ent-BaseBoomBoxTapeDemonKittyRag = Demon Kitty Rag
+ .desc = Музыка
+ent-BaseBoomBoxTapeKissTheSky = Kiss The Sky
+ .desc = Музыка
+ent-BaseBoomBoxTapeRetrograde = Retrograde
+ .desc = Музыка
+ent-BaseBoomBoxTapeThisAintNoPlaceForNoHero = This Aint No Place For No Hero
+ .desc = Музыка
+ent-BaseBoomBoxTapeMrKittyAfterDark = Mr Kitty - After Dark
+ .desc = Музыка
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/cartridges.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/cartridges.ftl
index fcd161e0ac7..69f73930df2 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/cartridges.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/cartridges.ftl
@@ -1,6 +1,6 @@
ent-NotekeeperCartridge = notekeeper cartridge
.desc = A program for keeping notes
-ent-NewsReadCartridge = news cartridge
+ent-NewsReaderCartridge = news cartridge
.desc = A program for reading news
ent-CrewManifestCartridge = crew manifest cartridge
.desc = A program for listing your fellow crewmembers
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/chameleon_projector.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/chameleon_projector.ftl
new file mode 100644
index 00000000000..ab0cb61db5c
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/chameleon_projector.ftl
@@ -0,0 +1,8 @@
+ent-ChameleonProjector = chameleon projector
+ .desc = Holoparasite technology used to create a hard-light replica of any object around you. Disguise is destroyed when picked up or deactivated.
+ent-ChameleonDisguise = Urist McKleiner
+ .desc = { ent-BaseMob.desc }
+ent-ActionDisguiseNoRot = Toggle Rotation
+ .desc = Use this to prevent your disguise from rotating, making it easier to hide in some scenarios.
+ent-ActionDisguiseAnchor = Toggle Anchored
+ .desc = For many objects you will want to be anchored to not be completely obvious.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/computer.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/computer.ftl
index d7fe815797a..8613e679689 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/computer.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/computer.ftl
@@ -8,6 +8,8 @@ ent-MedicalRecordsComputerCircuitboard = medical records computer board
.desc = A computer printed circuit board for a medical records computer.
ent-CriminalRecordsComputerCircuitboard = criminal records computer board
.desc = A computer printed circuit board for a criminal records computer.
+ent-NFSDCriminalRecordsComputerCircuitboard = nfsd criminal records computer board
+ .desc = A computer printed circuit board for a criminal records computer.
ent-StationRecordsComputerCircuitboard = station records computer board
.desc = A computer printed circuit board for a station records computer.
ent-CargoRequestComputerCircuitboard = cargo request computer board
@@ -48,6 +50,8 @@ ent-RadarConsoleCircuitboard = radar console computer board
.desc = { ent-BaseComputerCircuitboard.desc }
ent-AdvancedRadarConsoleCircuitboard = advanced radar console computer board
.desc = { ent-BaseComputerCircuitboard.desc }
+ent-NFSDAdvancedRadarConsoleCircuitboard = nfsd advanced radar console computer board
+ .desc = { ent-BaseComputerCircuitboard.desc }
ent-SolarControlComputerCircuitboard = solar control computer board
.desc = A computer printed circuit board for a solar control console.
ent-SpaceVillainArcadeComputerCircuitboard = space villain arcade board
@@ -68,7 +72,7 @@ ent-ComputerIFFSyndicateCircuitboard = syndicate IFF console board
.desc = Allows you to control the IFF and stealth characteristics of this vessel.
ent-ShipyardComputerCircuitboard = shipyard computer board
.desc = A computer printed circuit board for a shipyard computer.
-ent-ComputerMassMediaCircuitboard = mass-media console board
+ent-ComputerMassMediaCircuitboard = news manager console board
.desc = Write your message to the world!
ent-SensorConsoleCircuitboard = sensor monitoring console board
.desc = A computer printed circuit board for a sensor monitoring console.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
index 29c8892a2b0..49070b62c5a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
@@ -16,6 +16,8 @@ ent-MedicalTechFabCircuitboard = medical techfab machine board
.desc = A machine printed circuit board for a medical techfab.
ent-CircuitImprinterMachineCircuitboard = circuit imprinter machine board
.desc = { ent-BaseMachineCircuitboard.desc }
+ent-CircuitImprinterHyperConvectionMachineCircuitboard = hyper convection circuit imprinter machine board
+ .desc = A machine printed circuit board for a hyper convection circuit imprinter.
ent-ExosuitFabricatorMachineCircuitboard = exosuit fabricator machine board
.desc = { ent-BaseMachineCircuitboard.desc }
ent-ResearchAndDevelopmentServerMachineCircuitboard = R&D server machine board
@@ -28,8 +30,6 @@ ent-DiagnoserMachineCircuitboard = diagnoser machine board
.desc = { ent-BaseMachineCircuitboard.desc }
ent-ArtifactAnalyzerMachineCircuitboard = artifact analyzer machine board
.desc = A machine printed circuit board for an artifact analyzer.
-ent-TraversalDistorterMachineCircuitboard = traversal distorter machine board
- .desc = A machine printed circuit board for a traversal distorter.
ent-ArtifactCrusherMachineCircuitboard = artifact crusher machine board
.desc = A machine printed circuit board for an artifact crusher.
ent-AnomalyVesselCircuitboard = anomaly vessel machine board
@@ -51,7 +51,9 @@ ent-HellfireHeaterMachineCircuitBoard = hellfire heater machine board
ent-CondenserMachineCircuitBoard = condenser machine board
.desc = A machine printed circuit board for a condenser.
ent-PortableScrubberMachineCircuitBoard = portable scrubber machine board
- .desc = A PCB for a portable scrubber.
+ .desc = A machine printed circuit board for a portable scrubber.
+ent-SpaceHeaterMachineCircuitBoard = space heater machine board
+ .desc = A machine printed circuit board for a space heater.
ent-CloningPodMachineCircuitboard = cloning pod machine board
.desc = A machine printed circuit board for a cloning pod.
ent-MedicalScannerMachineCircuitboard = medical scanner machine board
@@ -156,5 +158,9 @@ ent-ShuttleGunDusterCircuitboard = EXP-2100g "Duster" machine board
.desc = A machine printed circuit board for an EXP-2100g "Duster"
ent-ShuttleGunKineticCircuitboard = PTK-800 "Matter Dematerializer" machine board
.desc = A machine printed circuit board for an PTK-800 "Matter Dematerializer"
+ent-ReagentGrinderIndustrialMachineCircuitboard = industrial reagent grinder machine board
+ .desc = { ent-BaseMachineCircuitboard.desc }
+ent-JukeboxCircuitBoard = jukebox machine board
+ .desc = A machine printed circuit board for a jukebox.
ent-M_EmpMachineCircuitboard = M_EMP Generator machine board
.desc = A machine printed circuit board for a mobile EMP generator.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl
new file mode 100644
index 00000000000..3beb7defe30
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl
@@ -0,0 +1,114 @@
+ent-DoorElectronicsCaptain = { ent-DoorElectronics }
+ .suffix = Captain, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsHeadOfPersonnel = { ent-DoorElectronics }
+ .suffix = HeadOfPersonnel, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsCommand = { ent-DoorElectronics }
+ .suffix = Command, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsBar = { ent-DoorElectronics }
+ .suffix = Bar, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsBarKitchen = { ent-DoorElectronics }
+ .suffix = Bar, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsHydroponics = { ent-DoorElectronics }
+ .suffix = Hydroponics, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsChapel = { ent-DoorElectronics }
+ .suffix = Chapel, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsTheatre = { ent-DoorElectronics }
+ .suffix = Theatre, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsKitchen = { ent-DoorElectronics }
+ .suffix = Kitchen, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsKitchenHydroponics = { ent-DoorElectronics }
+ .suffix = Kitchen/Hydroponics, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsJanitor = { ent-DoorElectronics }
+ .suffix = Janitor, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsLawyer = { ent-DoorElectronics }
+ .suffix = Lawyer, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsService = { ent-DoorElectronics }
+ .suffix = Service, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsQuartermaster = { ent-DoorElectronics }
+ .suffix = Quartermaster, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsSalvage = { ent-DoorElectronics }
+ .suffix = Salvage, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsCargo = { ent-DoorElectronics }
+ .suffix = Cargo, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsChiefEngineer = { ent-DoorElectronics }
+ .suffix = ChiefEngineer, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsAtmospherics = { ent-DoorElectronics }
+ .suffix = Atmospherics, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsEngineering = { ent-DoorElectronics }
+ .suffix = Engineering, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsMorgue = { ent-DoorElectronics }
+ .suffix = Morgue, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsResearchDirector = { ent-DoorElectronics }
+ .suffix = ResearchDirector, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsMedicalResearch = { ent-DoorElectronics }
+ .suffix = Medical/Science, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsResearch = { ent-DoorElectronics }
+ .suffix = Research, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsHeadOfSecurity = { ent-DoorElectronics }
+ .suffix = HeadOfSecurity, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsArmory = { ent-DoorElectronics }
+ .suffix = Armory, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsDetective = { ent-DoorElectronics }
+ .suffix = Detective, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsSecurity = { ent-DoorElectronics }
+ .suffix = Security, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsSecurityLawyer = { ent-DoorElectronics }
+ .suffix = Security/Lawyer, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsBrig = { ent-DoorElectronics }
+ .suffix = Brig, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsChiefMedicalOfficer = { ent-DoorElectronics }
+ .suffix = ChiefMedicalOfficer, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsChemistry = { ent-DoorElectronics }
+ .suffix = Chemistry, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsMedical = { ent-DoorElectronics }
+ .suffix = Medical, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsNukeop = { ent-DoorElectronics }
+ .suffix = Nukeop, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsSyndicateAgent = { ent-DoorElectronics }
+ .suffix = SyndicateAgent, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsCentralCommand = { ent-DoorElectronics }
+ .suffix = CentralCommand, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsExternal = { ent-DoorElectronics }
+ .suffix = External, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsMaintenance = { ent-DoorElectronics }
+ .suffix = Maintenance, Locked
+ .desc = { ent-DoorElectronics.desc }
+ent-DoorElectronicsVault = { ent-DoorElectronics }
+ .suffix = Vault, Locked
+ .desc = { ent-DoorElectronics.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl
index ccb89ad85c8..29f7d2642c9 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl
@@ -4,3 +4,21 @@ ent-SolarAssemblyFlatpack = solar assembly flatpack
.desc = A flatpack used for constructing a solar assembly.
ent-AmePartFlatpack = AME flatpack
.desc = A flatpack used for constructing an antimatter engine reactor.
+ent-SingularityGeneratorFlatpack = singularity generator flatpack
+ .desc = A flatpack used for constructing a singularity generator.
+ent-RadiationCollectorFlatpack = radiation collector flatpack
+ .desc = A flatpack used for constructing a radiation collector.
+ent-ContainmentFieldGeneratorFlatpack = containment field generator flatpack
+ .desc = A flatpack used for constructing a containment field generator.
+ent-EmitterFlatpack = emitter flatpack
+ .desc = A flatpack used for constructing an emitter.
+ent-TeslaGeneratorFlatpack = tesla generator flatpack
+ .desc = A flatpack used for constructing a tesla generator.
+ent-TeslaCoilFlatpack = tesla coil flatpack
+ .desc = A flatpack used for constructing a tesla coil.
+ent-TeslaGroundingRodFlatpack = grounding rod flatpack
+ .desc = A flatpack used for constructing a grounding rod.
+ent-GyroscopeFlatpack = gyroscope flatpack
+ .desc = A flatpack used for constructing a gyroscope.
+ent-ThrusterFlatpack = thruster flatpack
+ .desc = A flatpack used for constructing a thruster.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/holoprojectors.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/holoprojectors.ftl
index 07f3b2ce023..f783483d87e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/holoprojectors.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/holoprojectors.ftl
@@ -1,12 +1,21 @@
ent-Holoprojector = holographic sign projector
.desc = A handy-dandy holographic projector that displays a janitorial sign.
+ent-HoloprojectorEmpty = { ent-Holoprojector }
+ .suffix = Empty
+ .desc = { ent-Holoprojector.desc }
ent-HoloprojectorBorg = { ent-Holoprojector }
.suffix = borg
.desc = { ent-Holoprojector.desc }
ent-HolofanProjector = holofan projector
.desc = Stop suicidal passengers from killing everyone during atmos emergencies.
+ent-HolofanProjectorEmpty = { ent-HolofanProjector }
+ .suffix = Empty
+ .desc = { ent-HolofanProjector.desc }
ent-HoloprojectorField = force field projector
.desc = Creates an impassable forcefield that won't let anything through. Close proximity may or may not cause cancer.
+ent-HoloprojectorFieldEmpty = { ent-HoloprojectorField }
+ .suffix = Empty
+ .desc = { ent-HoloprojectorField.desc }
ent-HoloprojectorSecurity = holobarrier projector
.desc = Creates a solid but fragile holographic barrier.
ent-HoloprojectorSecurityEmpty = { ent-HoloprojectorSecurity }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/pda.ftl
index 45b4e0e7d3e..6f2820fb685 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/pda.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/pda.ftl
@@ -8,7 +8,7 @@ ent-TechnicalAssistantPDA = technical assistant PDA
.desc = Why isn't it yellow?
ent-MedicalInternPDA = medical intern PDA
.desc = Why isn't it white? Has a built-in health analyzer.
-ent-SecurityCadetPDA = cadet PDA
+ent-SecurityCadetPDA = security cadet PDA
.desc = Why isn't it red?
ent-ResearchAssistantPDA = research assistant PDA
.desc = Why isn't it purple?
@@ -40,7 +40,7 @@ ent-JanitorPDA = janitor PDA
.desc = Smells like bleach.
ent-CaptainPDA = captain PDA
.desc = Surprisingly no different from your PDA.
-ent-HoPPDA = station representative PDA
+ent-HoPPDA = head of personnel PDA
.desc = Looks like it's been chewed on.
ent-CEPDA = chief engineer PDA
.desc = Looks like it's barely been used.
@@ -58,11 +58,11 @@ ent-RnDPDA = research director PDA
.desc = It appears surprisingly ordinary.
ent-SciencePDA = science PDA
.desc = It's covered with an unknown gooey substance.
-ent-HoSPDA = sheriff PDA
+ent-HoSPDA = head of security PDA
.desc = Whosoever bears this PDA is the law.
-ent-WardenPDA = bailiff PDA
+ent-WardenPDA = warden PDA
.desc = The OS appears to have been jailbroken.
-ent-SecurityPDA = deputy PDA
+ent-SecurityPDA = security PDA
.desc = Red to hide the stains of passenger blood.
ent-CentcomPDA = CentCom PDA
.desc = Light green sign of walking bureaucracy.
@@ -82,24 +82,24 @@ ent-ClearPDA = clear PDA
.desc = 99 and 44/100ths percent pure plastic.
ent-SyndiPDA = syndicate PDA
.desc = Ok, time to be a productive member of- oh cool I'm a bad guy time to kill people!
-ent-ERTLeaderPDA = ERT PDA
+ent-ERTLeaderPDA = ERT Leader PDA
.desc = Red for firepower.
.suffix = Leader
-ent-ERTChaplainPDA = ERT PDA
+ent-ERTChaplainPDA = ERT Chaplain PDA
+ .desc = Red for firepower, it's blessed.
.suffix = Chaplain
- .desc = { ent-ERTLeaderPDA.desc }
-ent-ERTEngineerPDA = { ent-ERTLeaderPDA }
+ent-ERTEngineerPDA = ERT Engineer PDA
+ .desc = Red for firepower, it's well-worn.
.suffix = Engineer
- .desc = { ent-ERTLeaderPDA.desc }
-ent-ERTJanitorPDA = { ent-ERTLeaderPDA }
+ent-ERTJanitorPDA = ERT Janitor PDA
+ .desc = Red for firepower, it's squeaky clean.
.suffix = Janitor
- .desc = { ent-ERTLeaderPDA.desc }
-ent-ERTMedicPDA = { ent-ERTLeaderPDA }
+ent-ERTMedicPDA = ERT Medic PDA
+ .desc = Red for firepower, it's shiny and sterile. Has a built-in rapid health analyzer.
.suffix = Medic
- .desc = { ent-ERTLeaderPDA.desc }
-ent-ERTSecurityPDA = { ent-ERTLeaderPDA }
+ent-ERTSecurityPDA = ERT Security PDA
+ .desc = Red for firepower, it has tally marks etched on the side.
.suffix = Security
- .desc = { ent-ERTLeaderPDA.desc }
ent-CBURNPDA = CBURN PDA
.desc = Smells like rotten flesh.
ent-PsychologistPDA = psychologist PDA
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/radio.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/radio.ftl
index 9e2b8667184..83de35c5220 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/radio.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/radio.ftl
@@ -1,2 +1,4 @@
ent-RadioHandheld = handheld radio
.desc = A handy handheld radio.
+ent-RadioHandheldSecurity = security radio
+ .desc = A handy security radio.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_map.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_map.ftl
index 4610941c965..a7094dfdf3d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_map.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_map.ftl
@@ -3,6 +3,9 @@ ent-BaseHandheldStationMap = station map
ent-HandheldStationMap = { ent-BaseHandheldStationMap }
.suffix = Handheld, Powered
.desc = { ent-BaseHandheldStationMap.desc }
+ent-HandheldStationMapEmpty = { ent-HandheldStationMap }
+ .suffix = Handheld, Empty
+ .desc = { ent-HandheldStationMap.desc }
ent-HandheldStationMapUnpowered = { ent-BaseHandheldStationMap }
.suffix = Handheld, Unpowered
.desc = { ent-BaseHandheldStationMap.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl
index 7513825ad06..6e7edc53a23 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl
@@ -3,11 +3,11 @@ ent-ReinforcementRadioSyndicate = syndicate reinforcement radio
ent-ReinforcementRadioSyndicateNukeops = { ent-ReinforcementRadioSyndicate }
.suffix = NukeOps
.desc = { ent-ReinforcementRadioSyndicate.desc }
-ent-ReinforcementRadioSyndicateMonkey = syndicate monkey reinforcement radio
- .desc = Calls in a specially trained monkey to assist you.
-ent-ReinforcementRadioSyndicateMonkeyNukeops = { ent-ReinforcementRadioSyndicateMonkey }
+ent-ReinforcementRadioSyndicateAncestor = syndicate genetic ancestor reinforcement radio
+ .desc = Calls in a specially trained ancestor of your choosing to assist you.
+ent-ReinforcementRadioSyndicateAncestorNukeops = { ent-ReinforcementRadioSyndicateAncestor }
.suffix = NukeOps
- .desc = { ent-ReinforcementRadioSyndicateMonkey.desc }
+ .desc = { ent-ReinforcementRadioSyndicateAncestor.desc }
ent-ReinforcementRadioSyndicateCyborgAssault = syndicate assault cyborg reinforcement radio
.desc = Call in a well armed assault cyborg, instantly!
.suffix = NukeOps
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/war_declarator.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/war_declarator.ftl
index dcfb8fc512f..712e36c0f64 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/war_declarator.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/war_declarator.ftl
@@ -1,2 +1,2 @@
-ent-NukeOpsDeclarationOfWar = declaration of war
+ent-NukeOpsDeclarationOfWar = war declarator
.desc = Use to send a declaration of hostilities to the target, delaying your shuttle departure while they prepare for your assault. Such a brazen move will attract the attention of powerful benefactors within the Syndicate, who will supply your team with a massive amount of bonus telecrystals. Must be used at start of mission, or your benefactors will lose interest.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/figurines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/figurines.ftl
index 7ad03d91ef3..174f75dad60 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/figurines.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/figurines.ftl
@@ -1,7 +1,7 @@
ent-BaseFigurine = figurine
.desc = A small miniature.
-ent-ToyFigurineHeadOfPersonnel = station representative figure
- .desc = A figurine depicting the glorious representative of all the station, away from their office as usual.
+ent-ToyFigurineHeadOfPersonnel = head of personnel figure
+ .desc = A figurine depicting the glorious head of all personnel, away from their office as usual.
ent-ToyFigurinePassenger = passenger figure
.desc = A figurine depicting an every day, run-of-the-mill passenger. No funny business here.
ent-ToyFigurineGreytider = greytider figure
@@ -18,20 +18,20 @@ ent-ToyFigurineBoxer = boxer figure
.desc = A figurine depicting a Boxer holding their red gloves.
ent-ToyFigurineCaptain = captain figure
.desc = A figurine depicting the standard outfit of a captain belonging to a civilian-sector Nanotrasen vessel.
-ent-ToyFigurineHeadOfSecurity = sheriff figure
- .desc = A figurine depicting the glorious head of the New Frontier Sheriff's Department.
-ent-ToyFigurineWarden = bailiff figure
- .desc = A figurine depicting a Bailiff, ready to jail someone at any moment.
+ent-ToyFigurineHeadOfSecurity = head of security figure
+ .desc = A figurine depicting the glorious head of the Security department.
+ent-ToyFigurineWarden = warden figure
+ .desc = A figurine depicting a Warden, ready to jail someone at any moment.
ent-ToyFigurineDetective = detective figure
.desc = A figurine depicting a Detective wearing their iconic trench coat.
-ent-ToyFigurineSecurity = deputy figure
- .desc = A figurine depicting a Deputy holding a stunbaton, ready to defend the station.
+ent-ToyFigurineSecurity = security officer figure
+ .desc = A figurine depicting a Security Officer holding a stunbaton, ready to defend the station.
ent-ToyFigurineLawyer = lawyer figure
.desc = A figurine depicting a Lawyer sporting a freshly tailored suit.
ent-ToyFigurineCargoTech = cargo technican figure
.desc = A figurine depicting a reptillian Cargo Technican.
-ent-ToyFigurineSalvage = salvage technican figure
- .desc = A figurine depicting a Salvage Technician holding a survival knife.
+ent-ToyFigurineSalvage = salvage specialist figure
+ .desc = A figurine depicting a Salvage Specialist holding a survival knife.
ent-ToyFigurineQuartermaster = quartermaster figure
.desc = A figurine depicting the glorious head of the Cargo department.
ent-ToyFigurineChiefEngineer = chief engineer figure
@@ -67,7 +67,7 @@ ent-ToyFigurineJanitor = janitor figure
ent-ToyFigurineNukie = syndicate operative figure
.desc = A figurine depicting someone in a blood-red hardsuit, similar to what someone on a nuclear operative team might wear.
ent-ToyFigurineNukieElite = elite syndicate operative figure
- .desc = A figurine depicting someone in an elite blood-red hardsuit, similar to what the medic of a nuclear operative team might wear.
+ .desc = A figurine depicting someone in an elite blood-red hardsuit, similar to what someone on a nuclear operative team might wear.
ent-ToyFigurineNukieCommander = syndicate operative commander figure
.desc = A figurine depicting someone in a beefed-up blood-red hardsuit, similar to what the commander of a nuclear operative team might wear.
ent-ToyFigurineFootsoldier = syndicate footsoldier figure
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/immovable_rod.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/immovable_rod.ftl
index b0182c58c0c..6524297c2fc 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/immovable_rod.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/immovable_rod.ftl
@@ -1,11 +1,31 @@
ent-ImmovableRod = immovable rod
.desc = You can sense that it's hungry. That's usually a bad sign.
-ent-ImmovableRodSlow = { ent-ImmovableRod }
- .suffix = Slow
+ent-ImmovableRodDespawn = { ent-ImmovableRod }
+ .suffix = Despawn
.desc = { ent-ImmovableRod.desc }
-ent-ImmovableRodKeepTiles = { ent-ImmovableRod }
+ent-ImmovableRodSlow = { ent-ImmovableRodDespawn }
+ .suffix = Slow
+ .desc = { ent-ImmovableRodDespawn.desc }
+ent-ImmovableRodKeepTiles = { ent-ImmovableRodDespawn }
.suffix = Keep Tiles
+ .desc = { ent-ImmovableRodDespawn.desc }
+ent-ImmovableRodWizard = { ent-ImmovableRod }
+ .suffix = Wizard
.desc = { ent-ImmovableRod.desc }
ent-ImmovableRodKeepTilesStill = { ent-ImmovableRodKeepTiles }
.suffix = Keep Tiles, Still
.desc = { ent-ImmovableRodKeepTiles.desc }
+ent-ImmovableRodMop = immovable mop
+ .desc = Hurled like a javelin, with the power of a thousand furious janitors.
+ent-ImmovableRodShark = immovable shark
+ .desc = SHARK TORNADO!
+ent-ImmovableRodClown = immovable clown
+ .desc = Ejected from the neighbouring station one solar system over. HONK!
+ent-ImmovableRodBanana = immovable banana
+ .desc = At least you won't slip on it.
+ent-ImmovableRodHammer = immovable hammer
+ .desc = Bwoink.
+ent-ImmovableRodThrongler = immovable throngler
+ .desc = If you catch it, you can keep it.
+ent-ImmovableRodGibstick = immovable gibstick
+ .desc = What did you expect?
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_wind.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_wind.ftl
index df20fbdc1de..77e7e3da350 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_wind.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_wind.ftl
@@ -3,7 +3,7 @@ ent-SaxophoneInstrument = saxophone
ent-AccordionInstrument = accordion
.desc = { ent-BaseHandheldInstrument.desc }
ent-HarmonicaInstrument = harmonica
- .desc = { ent-BaseHandheldInstrument.desc }
+ .desc = { ent-BaseHandheldInstrument.desc }
ent-ClarinetInstrument = clarinet
.desc = Skweedward tintacklays.
ent-FluteInstrument = flute
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/snap_pops.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/snap_pops.ftl
index 006015dd480..adcac3b5c7c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/snap_pops.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/snap_pops.ftl
@@ -1,4 +1,4 @@
ent-SnapPop = snap pop
.desc = Throw it at the floor and listen to it POP!
ent-SnapPopBox = snap pop box
- .desc = Contains twenty snap pops for a few minutes of popping fun!
+ .desc = Contains snap pops for a few minutes of popping fun!
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl
index b3f905fbd0c..a17e7eb0ca9 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl
@@ -39,6 +39,12 @@ ent-PlushieNar = nar'sie plushie
.desc = A small stuffed doll of the elder goddess Nar'Sie.
ent-PlushieCarp = carp plushie
.desc = An adorable stuffed toy that resembles the monstrous space carp.
+ent-PlushieMagicarp = magicarp plushie
+ .desc = An adorable stuffed toy resembling the exceedingly rare magicarp.
+ent-PlushieRainbowCarp = rainbow carp plushie
+ .desc = An adorable stuffed toy resembling the legendary rainbow carp.
+ent-PlushieHolocarp = holocarp plushie
+ .desc = A holographic stuffed toy resembling science's nemesis - the holocarp.
ent-PlushieSlime = slime plushie
.desc = An adorable stuffed toy that resembles a slime. It's basically a hacky sack.
ent-PlushieSnake = snake plushie
@@ -88,6 +94,8 @@ ent-BeachBall = beach ball
.desc = The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen
ent-BalloonSyn = syndie balloon
.desc = Handed out to the bravest souls who survived the "atomic twister" ride at Syndieland.
+ent-BalloonNT = nanotrasen balloon
+ .desc = Specially designed to inflict maximum psychological damage to Syndicate operatives.
ent-BalloonCorgi = corgi balloon
.desc = Just like owning a real dog - but a lot floatier.
ent-SingularityToy = singuloth-brand toy
@@ -98,7 +106,7 @@ ent-PonderingOrb = pondering orb
.desc = Ponderous, man... Really ponderous.
ent-ToySword = toy sword
.desc = New Sandy-Cat plastic sword! Comes with realistic sound and full color! Looks almost like the real thing!
-ent-ToyAmongPequeno = among pequeno
+ent-ToyAmongPequeno = among pequeño
.desc = sus!
ent-FoamCutlass = foam cutlass
.desc = Cosplay as a pirate and force your friends to walk the plank.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/whistles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/whistles.ftl
index f02e169f7bc..9afda65e472 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/whistles.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/whistles.ftl
@@ -1,4 +1,8 @@
ent-BaseWhistle = whistle
.desc = Someone forgot to turn off kettle?
+ent-Whistle = { ent-BaseWhistle }
+ .desc = { ent-BaseWhistle.desc }
ent-SecurityWhistle = { ent-BaseWhistle }
.desc = Sound of it make you feel fear.
+ent-SyndicateWhistle = trench whistle
+ .desc = A whistle used by Syndicate commanders to draw attention. Avanti!
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/crystal_shard.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/crystal_shard.ftl
index 79552576295..70c4fabdf9e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/crystal_shard.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/crystal_shard.ftl
@@ -12,3 +12,5 @@ ent-ShardCrystalGreen = green crystal shard
.desc = { ent-ShardCrystalBase.desc }
ent-ShardCrystalRed = red crystal shard
.desc = { ent-ShardCrystalBase.desc }
+ent-ShardCrystalRandom = random crystal shard
+ .desc = { ent-ShardCrystalBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/ingots.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/ingots.ftl
index 2ea6f8c2a62..e7692be755f 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/ingots.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/ingots.ftl
@@ -6,6 +6,9 @@ ent-IngotGold = gold bar
ent-IngotGold1 = gold bar
.suffix = Single
.desc = { ent-IngotGold.desc }
+ent-IngotGold30 = gold bar
+ .suffix = 30
+ .desc = { ent-IngotGold.desc }
ent-IngotSilver = silver bar
.suffix = Full
.desc = { ent-IngotBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/materials.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/materials.ftl
index 147ecdf73bb..57af2d1777a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/materials.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/materials.ftl
@@ -55,6 +55,12 @@ ent-MaterialCotton = cotton
ent-MaterialCotton1 = { ent-MaterialCotton }
.suffix = Single
.desc = { ent-MaterialCotton.desc }
+ent-MaterialPyrotton = pyrotton
+ .suffix = Full
+ .desc = { ent-MaterialBase.desc }
+ent-MaterialPyrotton1 = { ent-MaterialPyrotton }
+ .suffix = Single
+ .desc = { ent-MaterialPyrotton.desc }
ent-MaterialBananium = bananium
.suffix = Full
.desc = { ent-MaterialBase.desc }
@@ -76,3 +82,5 @@ ent-MaterialBones = bones
ent-MaterialBones1 = { ent-MaterialBones }
.suffix = 1
.desc = { ent-MaterialBones.desc }
+ent-MaterialGunpowder = gunpowder
+ .desc = An explosive compound.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/ore.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/ore.ftl
index 837f3d5f1bd..261704b81e4 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/ore.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/ore.ftl
@@ -48,3 +48,9 @@ ent-Coal = coal
ent-Coal1 = { ent-Coal }
.suffix = Single
.desc = { ent-Coal.desc }
+ent-SaltOre = salt
+ .suffix = Full
+ .desc = { ent-OreBase.desc }
+ent-Salt1 = { ent-SaltOre }
+ .suffix = Single
+ .desc = { ent-SaltOre.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/shards.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/shards.ftl
index 8d63c2b848a..787b76f1f78 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/shards.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/shards.ftl
@@ -8,3 +8,5 @@ ent-ShardGlassPlasma = plasma glass shard
.desc = A small piece of plasma glass.
ent-ShardGlassUranium = uranium glass shard
.desc = A small piece of uranium glass.
+ent-ShardGlassClockwork = clockwork glass shard
+ .desc = A small piece of brass-infused glass.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl
index 2010737e248..82ec64f8e36 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl
@@ -41,3 +41,9 @@ ent-SheetRUGlass = reinforced uranium glass
ent-SheetRUGlass1 = reinforced uranium glass
.suffix = Single
.desc = { ent-SheetRUGlass.desc }
+ent-SheetClockworkGlass = clockwork glass
+ .desc = A sheet of brass-hardened glass, primarily used by clockwork enthusiasts and remnants of Ratvarian cults.
+ .suffix = Full
+ent-SheetClockworkGlass1 = clockwork glass
+ .suffix = Single
+ .desc = { ent-SheetClockworkGlass.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl
index d244db0dc62..bfa6da7551b 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl
@@ -12,6 +12,15 @@ ent-SheetSteel1 = steel
ent-SheetSteelLingering0 = { ent-SheetSteel }
.suffix = Lingering, 0
.desc = { ent-SheetSteel.desc }
+ent-SheetBrass = brass
+ .desc = A sheet of brass, primarily used by clockwork enthusiasts and the remnants of Ratvarian cults.
+ .suffix = Full
+ent-SheetBrass10 = brass
+ .suffix = 10
+ .desc = { ent-SheetBrass.desc }
+ent-SheetBrass1 = brass
+ .suffix = Single
+ .desc = { ent-SheetBrass.desc }
ent-SheetPlasteel = plasteel
.suffix = Full
.desc = { ent-SheetMetalBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/other.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/other.ftl
index b750e51b871..2f99e4581b8 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/other.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/other.ftl
@@ -12,6 +12,9 @@ ent-SheetPlasma = plasma
ent-SheetPlasma1 = plasma
.suffix = Single
.desc = { ent-SheetPlasma.desc }
+ent-SheetPlasma30 = plasma
+ .suffix = 30
+ .desc = { ent-SheetPlasma.desc }
ent-SheetPlastic = plastic
.suffix = Full
.desc = { ent-SheetOtherBase.desc }
@@ -27,6 +30,9 @@ ent-SheetUranium = uranium
ent-SheetUranium1 = uranium
.suffix = Single
.desc = { ent-SheetUranium.desc }
+ent-SheetUranium30 = uranium
+ .suffix = 30
+ .desc = { ent-SheetUranium.desc }
ent-MaterialSheetMeat = meat sheet
.suffix = Full
.desc = { ent-SheetOtherBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/books.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/books.ftl
index b0858dce50b..142e3713e9e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/books.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/books.ftl
@@ -27,12 +27,11 @@ ent-BookHowToSurvive = how to survive
ent-BookChemicalCompendium = chempendium
.desc = A comprehensive guide written by some old skeleton of a professor about chemical synthesis.
ent-BookRandom = { ent-BookBase }
- .suffix = random
- .desc = { ent-BookBase.desc }
-ent-BookEscalation = Robert's Rules of Escalation
- .desc = The book is stained with blood. It seems to have been used more as a weapon than reading material.
-ent-BookEscalationSecurity = Robert's Rules of Escalation: Security Edition
- .desc = The book is stained with blood. It seems to have been used more as a weapon than reading material.
+ .desc = Each book is unique! What is hidden in this one?
+ .suffix = random visual
+ent-BookRandomStory = { ent-BookRandom }
+ .suffix = random visual, random story
+ .desc = { ent-BookRandom.desc }
ent-BookAtmosDistro = Newton's Guide to Atmos: The Distro
.desc = There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks.
ent-BookAtmosWaste = Newton's Guide to Atmos: Waste
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/books_author.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/books_author.ftl
new file mode 100644
index 00000000000..dbd557ac5be
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/books_author.ftl
@@ -0,0 +1,62 @@
+ent-BookNarsieLegend = the legend of nar'sie
+ .desc = The book is an old, leather-bound tome with intricate engravings on the cover. The pages are yellowed and fragile with age, with the ink of the text faded in some places. It appears to have been well-read and well-loved, with dog-eared pages and marginalia scrawled in the margins. Despite its aged appearance, the book still exudes a sense of mystical power and wonder, hinting at the secrets and knowledge contained within its pages.
+ent-BookTruth = exploring different philosophical perspectives on truth and the complexity of lying
+ .desc = A book exploring the different philosophical perspectives on truth and lying has a worn cover, with creases and marks indicating frequent use and thoughtful contemplation. The spine shows signs of wear from being pulled off the shelf again and again. The pages themselves are filled with underlines, notes in the margins, and highlighted passages as readers grapple with the nuances and complexities of the topic.
+ent-BookWorld = shaping the state of the world - interplay of forces and choices
+ .desc = The book is a well-preserved hardcover with a simple, elegant design on the cover, depicting the image of a world in motion. The pages are crisp and clean, with no signs of wear or tear, suggesting that it has been well-cared for and valued by its previous owner. The text is printed in a clear, legible font, and the chapters are organized in a logical and easy-to-follow manner, making it accessible to readers of all levels of expertise.
+ent-BookIanAntarctica = adventures of robert & ian - exploring antarctica
+ .desc = The book is a small paperback in good condition, with an illustration of Ian the corgi and the colony of penguins on the cover. The title, "Ian and Robert's Antarctic Adventure", is written in bold white letters against a blue background. The back cover features a brief summary of the story, highlighting the themes of humility, resilience, and the beauty of nature.
+ent-BookSlothClownSSS = the sloth and the clown - space station shenanigans
+ .desc = The book looks new, with a glossy cover featuring Chuckles the clown and Snuggles the sloth floating in space with a backdrop of stars and planets. Chuckles is dressed in his banana costume and Snuggles is sleeping on a hammock made of space ropes. The title "The Sloth and the Clown - Space Station Shenanigans" is written in bold and colorful letters.
+ent-BookSlothClownPranks = the sloth and the clown - pranks on zorgs
+ .desc = The book is in excellent condition, with crisp pages and a bright cover. The cover of the book features Chuckles and Snuggles, surrounded by the different species they encountered during their adventures in space. In the background, the Zorgs can be seen peeking out from behind a spaceship.
+ent-BookSlothClownMMD = the sloth and the clown - maze maze danger
+ .desc = The book looks new and vibrant, with an image of Chuckles and Snuggles standing in front of the changing maze on the cover. The title "The Sloth and the Clown - Maze Maze Danger" is written in bold, colorful letters that pop against a background of space and stars.
+ent-BookStruck = the humbling and transformative experience of being struck by lightning
+ .desc = The cover of the book is an electrifying image of lightning striking the ground, with a silhouette of a person standing in the midst of it. The title is written in bold letters in white against a black background, conveying the power and intensity of the experience. The subtitle is written in smaller letters below the title, providing a hint of the philosophical and spiritual themes explored within.
+ent-BookSun = reaching for the sun - a plant's quest for life
+ .desc = The book is new, with a bright and vibrant cover featuring a plant stretching its leaves towards the sun. The title, "Reaching for the Sun - A Plant's Quest for Life," is written in bold, green letters, with an image of the sun rising behind the plant. The cover evokes a sense of growth, energy, and the beauty of nature.
+ent-BookPossum = fallen ambitions - the tragic tale of morty the possum
+ .desc = The book is in good condition, with a hardcover and a dark green forest background. In the center of the cover, there is a sad looking possum sitting on a branch, with a distant and lonely expression on its face. The title, "Fallen Ambitions - The Tragic Tale of Morty the Possum," is written in bold, gold letters above the possum.
+ent-BookCafe = the cafe possum
+ .desc = The book is in new condition, with a vibrant and whimsical cover that features a charming illustration of a tiny possum peeking out from behind a coffee cup, with a colorful and bustling cafe scene in the background. The title "The Cafe Possum" is written in bold, playful lettering, and the author's name is printed in a smaller font below it.
+ent-BookFeather = a feather of magic - the wandering bird's journey to belonging
+ .desc = The book would be in new condition, with a glossy cover depicting the wandering bird surrounded by a glowing forest, with the magical feather at the center. The title, "A Feather of Magic," would be written in bold, glittering letters, while the subtitle, "The Wandering Bird's Journey to Belonging," would be written in smaller print underneath. The back cover would feature a brief summary of the story, along with reviews from critics praising the book's themes of hope and renewal.
+ent-BookIanLostWolfPup = the adventures of ian and renault - finding the lost wolf pup
+ .desc = The book is a new condition with a colorful cover, depicting Ian the corgi and Renault the fox on a journey through the forest, with the lost wolf pup to their feet. The title "The Adventures of Ian and Renault - Finding the Lost Wolf Pup" is prominently displayed at the top, with the author's name below. The cover has a whimsical and adventurous feel to it, attracting readers of all ages.
+ent-BookIanRanch = the adventures of ian and renault - ranch expedition
+ .desc = The book appears to be new, with crisp pages and an unblemished cover. The cover features a colorful illustration of Ian and Renault, surrounded by various animals they encountered on the ranch, including horses, cows, and chickens. The title, "The Adventures of Ian and Renault - Ranch Expedition," is written in bold letters above the image, with the subtitle, "Helping Animals in Need," written below.
+ent-BookIanOcean = the adventures of ian and renault - an ocean adventure
+ .desc = The book is new and in excellent condition. The cover shows Ian and Renault running and playing on the beach, with the blue ocean and golden sand in the background. The title is written in bold, playful letters, and the subtitle reads "An Ocean Adventure."
+ent-BookIanMountain = the adventures of ian and renault - A mountain expedition
+ .desc = The book is in new condition. The cover is a stunning mountain landscape with Ian and Renault in the foreground, looking out over the vista of the surrounding peaks and valleys. The title is written in bold, block letters at the top, with the subtitle, "A Mountain Expedition," written underneath.
+ent-BookIanCity = the adventures of ian and renault - exploring the city
+ .desc = The book is in new condition, with crisp pages and a glossy cover. The cover features a colorful illustration of Ian and Renault exploring the city, with tall buildings and bustling streets in the background. Ian is leading the way, with his tail wagging excitedly, while Renault follows close behind, her ears perked up and her eyes wide with wonder. The title, "The Adventures of Ian and Renault," is written in bold, playful letters, with the subtitle, "Exploring the City," written below in smaller font.
+ent-BookIanArctic = the adventures of ian and renault - an arctic journey of courage and friendship
+ .desc = The book looks new and adventurous, with a picture of Ian and Renault standing in front of an icy landscape with snowflakes falling all around them. The title, "The Adventures of Ian and Renault," is written in bold letters at the top, with a subtitle that reads, "An Arctic Journey of Courage and Friendship."
+ent-BookIanDesert = the adventures of ian and renault - exploring the mysterious desert
+ .desc = The book is in new condition and would have a colorful cover depicting Ian and Renault against a desert backdrop. The cover would feature images of various animals and plants that the two encountered on their adventure, such as a rattlesnake, coyotes, sand dunes, and an oasis. The title, "The Adventures of Ian and Renault" is prominently displayed on the cover in bold letters, while the subtitle "Exploring the Mysterious Desert" is written in smaller letters underneath.
+ent-BookNames = the power of names - a philosophical exploration
+ .desc = The book is a gently used philosophy text, with a cover that features a close-up of a person's mouth, with the word "names" written on their lips. The title is "The Power of Names - A Philosophical Exploration," and the author's name is prominently displayed underneath. The overall design is simple and elegant, with the focus on the text rather than any flashy graphics or images.
+ent-BookEarth = earthly longing
+ .desc = The book is in good condition, with a slightly faded cover due to exposure to sunlight. The cover of the book depicts a panoramic view of the Earth from space, with a bright blue ocean and green landmasses. In the foreground, a lone astronaut is seen sitting in front of a window, gazing wistfully at the Earth. The title of the book, "Earthly Longing," is written in bold white letters against a black background at the top of the cover.
+ent-BookAurora = journey beyond - the starship aurora mission
+ .desc = The book is in excellent condition, with a shiny cover depicting a spaceship hovering above a planet, perhaps with the Earth in the background. The title "Journey Beyond - The Starship Aurora Mission" is written in bold, silver letters. The cover also features a quote from a review, "A breathtaking tale of human achievement and exploration" to entice potential readers.
+ent-BookTemple = the nature of the divine - embracing the many gods
+ .desc = The book appears new with crisp pages and an uncreased spine. The cover features an image of a temple with a glowing, multicolored aura around it, symbolizing the various gods discussed in the book. The title is displayed prominently in gold lettering, with the author's name and a brief summary of the book written in smaller text below.
+ent-BookWatched = watched
+ .desc = The book is in good condition, with a slightly worn cover that features a dark and ominous space station looming in the background. The title "Watched" is written in bold letters that seem to be staring back at the reader, conveying the feeling of being constantly observed. The blurb on the back cover hints at a thrilling and suspenseful tale of paranoia and danger in a confined setting.
+ent-BookMedicalOfficer = horizon's battle - a medical officer's tale of trust and survival
+ .desc = The cover features Smith, the medical officer, in his uniform, looking determined and ready to face any challenge. The backdrop shows the SS Horizon under attack, with explosions and smoke filling the space station. In the foreground, a wizard with a staff can be seen, adding an element of mystery and intrigue to the scene. The title is prominently displayed in bold letters, with the author's name and a tagline indicating the book's action-packed and suspenseful nature.
+ent-BookMorgue = the ghostly residents of the abandoned morgue
+ .desc = The book looks old and worn, with faded lettering on the cover. The cover depicts a dark and eerie morgue, with a full moon casting an ominous glow over the scene. In the foreground are Morty the possum and Morticia the raccoon, with mischievous expressions on their faces, peeking out from behind a metal shelf. The title is written in bold, spooky letters, with the subtitle "A Tale of Animal Spirits" written in smaller font below.
+ent-BookRufus = rufus and the mischievous fairy
+ .desc = The book is in new condition, with vibrant colors and illustrations on the cover. The cover shows Rufus on his bicycle, with Blossom flying beside him in a playful manner. The title is written in bold, whimsical font, with the characters' names highlighted in a contrasting color. The overall aesthetic is charming and inviting, appealing to children and adults alike.
+ent-BookMap = the map of adventure
+ .desc = The book is in a good condition, with a glossy cover depicting a jungle scene with vibrant colors and intricate details. The title "The Map of Adventure," is written in bold, gold lettering. The cover also features an image of a mysterious suitcase with the map spilling out of it.
+ent-BookJourney = a journey of music, mountains, and self-discovery
+ .desc = The book is in excellent condition, with crisp pages and a glossy cover. The cover features a striking image of a mountain range, with a silhouette of a climber with a guitar on their back in the foreground. The title is bold and eye-catching, with the subtitle "A Journey of Music, Mountains, and Self-Discovery."
+ent-BookInspiration = finding inspiration - a writer's journey through the woods
+ .desc = The book is in a new condition with a cover depicting a serene forest scene with a waterfall and colorful wildflowers. The title of the book "Finding Inspiration - A Writer's Journey Through the Woods" and the author's name are prominently displayed at the bottom.
+ent-BookJanitorTale = the tales of a tired janitor
+ .desc = A clean looking book, smelling vaguely of soap and bleach.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl
index a694534bb4c..b37a3326c44 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl
@@ -1,9 +1,7 @@
ent-BriefcaseBase = { ent-BaseStorageItem }
.desc = Useful for carrying items in your hands.
ent-BriefcaseBrown = brown briefcase
- .desc = A handy briefcase.
-ent-BriefcaseSyndieBase = { ent-BriefcaseBase }
- .desc = Useful for carrying items in your hands.
+ .desc = { ent-BriefcaseBase.desc }
+ent-BriefcaseSyndie = { ent-BriefcaseBrown }
.suffix = Syndicate, Empty
-ent-BriefcaseSyndie = brown briefcase
- .desc = A handy briefcase.
+ .desc = { ent-BriefcaseBrown.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/carpets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/carpets.ftl
index c02894b5407..edf947a2ab4 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/carpets.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/carpets.ftl
@@ -1,16 +1,30 @@
-ent-FloorCarpetItemRed = red carpet
- .desc = { ent-FloorTileItemBase.desc }
-ent-FloorCarpetItemBlack = black carpet
- .desc = { ent-FloorTileItemBase.desc }
-ent-FloorCarpetItemBlue = blue carpet
- .desc = { ent-FloorTileItemBase.desc }
-ent-FloorCarpetItemGreen = green carpet
- .desc = { ent-FloorTileItemBase.desc }
-ent-FloorCarpetItemOrange = orange carpet
- .desc = { ent-FloorTileItemBase.desc }
-ent-FloorCarpetItemSkyBlue = sky blue carpet
- .desc = { ent-FloorTileItemBase.desc }
-ent-FloorCarpetItemPurple = purple carpet
- .desc = { ent-FloorTileItemBase.desc }
-ent-FloorCarpetItemPink = pink carpet
- .desc = { ent-FloorTileItemBase.desc }
+ent-FloorCarpetItemRed = carpet
+ .suffix = Red
+ .desc = { ent-FloorTileItemBase.desc }
+ent-FloorCarpetItemBlack = { ent-FloorCarpetItemRed }
+ .suffix = Black
+ .desc = { ent-FloorCarpetItemRed.desc }
+ent-FloorCarpetItemBlue = { ent-FloorCarpetItemRed }
+ .suffix = Blue
+ .desc = { ent-FloorCarpetItemRed.desc }
+ent-FloorCarpetItemGreen = { ent-FloorCarpetItemRed }
+ .suffix = Green
+ .desc = { ent-FloorCarpetItemRed.desc }
+ent-FloorCarpetItemOrange = { ent-FloorCarpetItemRed }
+ .suffix = Orange
+ .desc = { ent-FloorCarpetItemRed.desc }
+ent-FloorCarpetItemSkyBlue = { ent-FloorCarpetItemRed }
+ .suffix = Sky Blue
+ .desc = { ent-FloorCarpetItemRed.desc }
+ent-FloorCarpetItemPurple = { ent-FloorCarpetItemRed }
+ .suffix = Purple
+ .desc = { ent-FloorCarpetItemRed.desc }
+ent-FloorCarpetItemPink = { ent-FloorCarpetItemRed }
+ .suffix = Pink
+ .desc = { ent-FloorCarpetItemRed.desc }
+ent-FloorCarpetItemCyan = { ent-FloorCarpetItemRed }
+ .suffix = Cyan
+ .desc = { ent-FloorCarpetItemRed.desc }
+ent-FloorCarpetItemWhite = { ent-FloorCarpetItemRed }
+ .suffix = White
+ .desc = { ent-FloorCarpetItemRed.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/cds.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/cds.ftl
new file mode 100644
index 00000000000..23434de6c4a
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/cds.ftl
@@ -0,0 +1,2 @@
+ent-CoordinatesDisk = coordinates disk
+ .desc = A disk containing the coordinates to a location in space. Necessary for any FTL-traversing vessel to reach their destination. Fits inside shuttle consoles.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/chopsticks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/chopsticks.ftl
new file mode 100644
index 00000000000..bae6f3e5417
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/chopsticks.ftl
@@ -0,0 +1,4 @@
+ent-ChopSticks = chopsticks
+ .desc = A very traditional utensil.
+ent-PairedChopsticks = paired chopsticks
+ .desc = You should probably seperate them.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/diskcases.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/diskcases.ftl
new file mode 100644
index 00000000000..e4000db46f5
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/diskcases.ftl
@@ -0,0 +1,2 @@
+ent-DiskCase = diskcase
+ .desc = Case for storing a coordinates disk.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl
index 034984eeb3a..6e497fa16f2 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl
@@ -8,15 +8,15 @@ ent-MedicalInternIDCard = medical intern ID card
.desc = { ent-PassengerIDCard.desc }
ent-ResearchAssistantIDCard = research assistant ID card
.desc = { ent-PassengerIDCard.desc }
-ent-SecurityCadetIDCard = cadet ID card
+ent-SecurityCadetIDCard = security cadet ID card
.desc = { ent-PassengerIDCard.desc }
ent-ServiceWorkerIDCard = service worker ID card
.desc = { ent-PassengerIDCard.desc }
ent-CaptainIDCard = captain ID card
.desc = { ent-IDCardStandard.desc }
-ent-SecurityIDCard = deputy ID card
+ent-SecurityIDCard = security ID card
.desc = { ent-IDCardStandard.desc }
-ent-WardenIDCard = bailiff ID card
+ent-WardenIDCard = warden ID card
.desc = { ent-IDCardStandard.desc }
ent-EngineeringIDCard = engineer ID card
.desc = { ent-IDCardStandard.desc }
@@ -54,7 +54,7 @@ ent-LibrarianIDCard = librarian ID card
.desc = { ent-IDCardStandard.desc }
ent-LawyerIDCard = lawyer ID card
.desc = { ent-IDCardStandard.desc }
-ent-HoPIDCard = station representative ID card
+ent-HoPIDCard = head of personnel ID card
.desc = { ent-IDCardStandard.desc }
ent-CEIDCard = chief engineer ID card
.desc = { ent-IDCardStandard.desc }
@@ -62,7 +62,7 @@ ent-CMOIDCard = chief medical officer ID card
.desc = { ent-IDCardStandard.desc }
ent-RDIDCard = research director ID card
.desc = { ent-IDCardStandard.desc }
-ent-HoSIDCard = sheriff ID card
+ent-HoSIDCard = head of security ID card
.desc = { ent-IDCardStandard.desc }
ent-BrigmedicIDCard = brigmedic ID card
.desc = { ent-IDCardStandard.desc }
@@ -116,10 +116,10 @@ ent-CluwneIDCard = cluwne ID card
.suffix = Unremoveable
.desc = { ent-IDCardStandard.desc }
ent-SeniorEngineerIDCard = senior engineer ID card
- .desc = { ent-IDCardStandard.desc }
+ .desc = { ent-EngineeringIDCard.desc }
ent-SeniorResearcherIDCard = senior researcher ID card
- .desc = { ent-IDCardStandard.desc }
+ .desc = { ent-ResearchIDCard.desc }
ent-SeniorPhysicianIDCard = senior physician ID card
- .desc = { ent-IDCardStandard.desc }
+ .desc = { ent-MedicalIDCard.desc }
ent-SeniorOfficerIDCard = senior officer ID card
- .desc = { ent-IDCardStandard.desc }
+ .desc = { ent-SecurityIDCard.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/kudzu.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/kudzu.ftl
index e81396cd721..f36ae9760a6 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/kudzu.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/kudzu.ftl
@@ -14,6 +14,6 @@ ent-KudzuFlowerAngry = { ent-KudzuFlowerFriendly }
ent-FleshKudzu = tendons
.desc = A rapidly growing cluster of meaty tendons. WHY ARE YOU STOPPING TO LOOK AT IT?!
ent-ShadowKudzu = dark haze
- .desc = { ent-BaseShadow.desc }
+ .desc = { ent-BaseKudzu.desc }
ent-ShadowKudzuWeak = Haze
.desc = { ent-ShadowKudzu.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl
index 42dd00fa8a4..eafc7e97b3b 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl
@@ -11,6 +11,9 @@ ent-RubberStampCentcom = CentCom rubber stamp
ent-RubberStampChaplain = chaplain's rubber stamp
.suffix = DO NOT MAP
.desc = { ent-RubberStampBase.desc }
+ent-RubberStampLawyer = lawyer's rubber stamp
+ .suffix = DO NOT MAP
+ .desc = { ent-RubberStampBase.desc }
ent-RubberStampClown = clown's rubber stamp
.suffix = DO NOT MAP
.desc = { ent-RubberStampBase.desc }
@@ -47,3 +50,6 @@ ent-RubberStampApproved = APPROVED rubber stamp
.desc = { ent-RubberStampBaseAlt.desc }
ent-RubberStampDenied = DENIED rubber stamp
.desc = { ent-RubberStampBaseAlt.desc }
+ent-RubberStampDetective = detective's rubber stamp
+ .suffix = DO NOT MAP
+ .desc = { ent-RubberStampBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl
index c242ecd3520..0ba39a65e69 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl
@@ -22,6 +22,10 @@ ent-FloorTileItemMono = mono tile
.desc = { ent-FloorTileItemBase.desc }
ent-FloorTileItemLino = linoleum floor
.desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemBrassFilled = filled brass plate
+ .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemBrassReebe = smooth brass plate
+ .desc = { ent-FloorTileItemBase.desc }
ent-FloorTileItemDirty = dirty tile
.desc = { ent-FloorTileItemBase.desc }
ent-FloorTileItemElevatorShaft = elevator shaft tile
@@ -122,7 +126,13 @@ ent-FloorTileItemWeb = web tile
.desc = { ent-FloorTileItemBase.desc }
ent-FloorTileItemAstroGrass = astro-grass
.desc = Fake grass that covers up wires and even comes with realistic NanoTrimmings!
+ent-FloorTileItemMowedAstroGrass = mowed astro-grass
+ .desc = Fake grass that covers up wires and even comes with realistic NanoTrimmings!
+ent-FloorTileItemJungleAstroGrass = jungle astro-grass
+ .desc = Fake grass that covers up wires and even comes with realistic NanoTrimmings!
ent-FloorTileItemAstroIce = astro-ice
.desc = Fake ice that's as slippery as the real thing, while being easily removable!
+ent-FloorTileItemAstroSnow = astro-snow
+ .desc = Fake snow that's as fluffy as the real thing, while being easily removable!
ent-FloorTileItemWoodLarge = large wood floor
.desc = { ent-FloorTileItemBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/utensils.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/utensils.ftl
index 183dbfb7d05..b59633f5877 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/utensils.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/utensils.ftl
@@ -12,3 +12,5 @@ ent-SpoonPlastic = plastic spoon
.desc = There is no spoon.
ent-KnifePlastic = plastic knife
.desc = That's not a knife. This is a knife.
+ent-BarSpoon = bar spoon
+ .desc = Your personal helper to mix drinks and changes lives.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/power/lights.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/power/lights.ftl
index bddd9d40b4b..ab826de9e0a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/power/lights.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/power/lights.ftl
@@ -4,6 +4,8 @@ ent-BaseLightTube = { ent-BaseLightbulb }
.desc = { ent-BaseLightbulb.desc }
ent-LightBulb = incandescent light bulb
.desc = A light bulb.
+ent-LedLightBulb = led light bulb
+ .desc = A power efficient light bulb.
ent-LightBulbOld = old incandescent light bulb
.desc = An aging light bulb.
ent-LightBulbBroken = incandescent light bulb
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/power/portable_recharger.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/power/portable_recharger.ftl
new file mode 100644
index 00000000000..219a5bb97d4
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/power/portable_recharger.ftl
@@ -0,0 +1,2 @@
+ent-PortableRecharger = portable recharger
+ .desc = High-tech recharger adapted for portability
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/cargo/cargo_pallet.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/cargo/cargo_pallet.ftl
index aaae1ec67d6..5bdb9856e5a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/cargo/cargo_pallet.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/cargo/cargo_pallet.ftl
@@ -1,2 +1,6 @@
ent-CargoPallet = cargo pallet
- .desc = Designates valid items to sell to CentCom when a shuttle is recalled.
+ .desc = Designates valid items to sell to CentCom.
+ent-CargoPalletSell = cargo selling pallet
+ .desc = Designates valid items to sell.
+ent-CargoPalletBuy = cargo buying pallet
+ .desc = Designates where orders will appear when purchased.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/chemistry.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/chemistry.ftl
index 0a07b40785e..0fad94dd9b1 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/chemistry.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/chemistry.ftl
@@ -20,6 +20,8 @@ ent-BaseSyringe = syringe
.desc = Used to draw blood samples from mobs, or to inject them with reagents.
ent-Syringe = { ent-BaseSyringe }
.desc = { ent-BaseSyringe.desc }
+ent-PrefilledSyringe = { ent-BaseSyringe }
+ .desc = { ent-BaseSyringe.desc }
ent-SyringeBluespace = bluespace syringe
.desc = Injecting with advanced bluespace technology.
ent-SyringeCryostasis = cryostasis syringe
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/leaves.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/leaves.ftl
index 34695704ebe..dc63fc38934 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/leaves.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/leaves.ftl
@@ -4,6 +4,12 @@ ent-LeavesCannabisDried = dried cannabis leaves
.desc = Dried cannabis leaves, ready to be ground.
ent-GroundCannabis = ground cannabis
.desc = Ground cannabis, ready to take you on a trip.
+ent-LeavesCannabisRainbow = rainbow cannabis leaves
+ .desc = Is it supposed to be glowing like that...?
+ent-LeavesCannabisRainbowDried = dried rainbow cannabis leaves
+ .desc = Dried rainbow cannabis leaves, ready to be ground.
+ent-GroundCannabisRainbow = ground rainbow cannabis
+ .desc = Ground rainbow cannabis, ready to take you on a trip.
ent-LeavesTobacco = tobacco leaves
.desc = Dry them out to make some smokes.
ent-LeavesTobaccoDried = dried tobacco leaves
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 e8392b3b13a..1cf9147ad36 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
@@ -40,6 +40,8 @@ ent-BlueTomatoSeeds = packet of blue tomato seeds
.desc = { ent-SeedBase.desc }
ent-BloodTomatoSeeds = packet of blood tomato seeds
.desc = { ent-SeedBase.desc }
+ent-KillerTomatoSeeds = packet of killer tomato seeds
+ .desc = { ent-SeedBase.desc }
ent-EggplantSeeds = packet of eggplant seeds
.desc = { ent-SeedBase.desc }
ent-AppleSeeds = packet of apple seeds
@@ -54,6 +56,8 @@ ent-TobaccoSeeds = packet of tobacco seeds
.desc = These seeds grow into tobacco plants.
ent-CannabisSeeds = packet of cannabis seeds
.desc = Taxable.
+ent-RainbowCannabisSeeds = packet of rainbow cannabis seeds
+ .desc = These seeds grow into rainbow weed. Groovy... and also highly addictive.
ent-NettleSeeds = packet of nettle seeds
.desc = Handle with gloves.
ent-DeathNettleSeeds = packet of death nettle seeds
@@ -108,3 +112,5 @@ ent-PumpkinSeeds = packet of pumpkin seeds
.desc = { ent-SeedBase.desc }
ent-CottonSeeds = packet of cotton seeds
.desc = { ent-SeedBase.desc }
+ent-PyrottonSeeds = packet of pyrotton seeds
+ .desc = { ent-SeedBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl
index c49cce472f7..46a43f0361f 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl
@@ -2,20 +2,11 @@ ent-MopItem = mop
.desc = A mop that can't be stopped, viscera cleanup detail awaits.
ent-AdvMopItem = advanced mop
.desc = Motorized mop that has a bigger reservoir and quickly replaces reagents inside with water. Automatic Clown Countermeasure not included.
-ent-MopBucket = mop bucket
- .desc = Holds water and the tears of the janitor.
-ent-MopBucketFull = mop bucket
- .suffix = full
- .desc = { ent-MopBucket.desc }
ent-WetFloorSign = wet floor sign
.desc = Caution! Wet Floor!
ent-WetFloorSignMineExplosive = { ent-WetFloorSign }
.suffix = Explosive
.desc = { ent-WetFloorSign.desc }
-ent-JanitorialTrolley = janitorial trolley
- .desc = This is the alpha and omega of sanitation.
-ent-FloorDrain = drain
- .desc = Drains puddles around it. Useful for dumping mop buckets or keeping certain rooms clean.
ent-Plunger = plunger
.desc = A plunger with a red plastic suction-cup and a wooden handle. Used to unclog drains.
ent-RagItem = damp rag
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/disease.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/disease.ftl
index 9c62b95ae55..71e25241f9e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/disease.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/disease.ftl
@@ -1,4 +1,6 @@
ent-DiseaseSwab = sterile swab
.desc = Used for taking and transfering samples. Sterile until open. Single use only.
+ent-BoxMouthSwab = sterile swab dispenser
+ .desc = Dispenses 30 sterile swabs, extremely useful for botany.
ent-Vaccine = vaccine
.desc = Prevents people who DON'T already have a disease from catching it.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl
index 52d4663343b..9ecb5c349c0 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl
@@ -114,30 +114,30 @@ ent-PillCanisterRandom = { ent-PillCanister }
.suffix = Random
.desc = { ent-PillCanister.desc }
ent-SyringeEphedrine = ephedrine syringe
- .desc = { ent-BaseSyringe.desc }
+ .desc = { ent-PrefilledSyringe.desc }
ent-SyringeInaprovaline = inaprovaline syringe
- .desc = { ent-BaseSyringe.desc }
+ .desc = { ent-PrefilledSyringe.desc }
ent-SyringeTranexamicAcid = tranexamic acid syringe
- .desc = { ent-BaseSyringe.desc }
+ .desc = { ent-PrefilledSyringe.desc }
ent-SyringeBicaridine = bicaridine syringe
- .desc = { ent-BaseSyringe.desc }
+ .desc = { ent-PrefilledSyringe.desc }
ent-SyringeDermaline = dermaline syringe
- .desc = { ent-BaseSyringe.desc }
+ .desc = { ent-PrefilledSyringe.desc }
ent-SyringeHyronalin = hyronalin syringe
- .desc = { ent-BaseSyringe.desc }
+ .desc = { ent-PrefilledSyringe.desc }
ent-SyringeIpecac = ipecac syringe
- .desc = { ent-BaseSyringe.desc }
+ .desc = { ent-PrefilledSyringe.desc }
ent-SyringeAmbuzol = ambuzol syringe
- .desc = { ent-BaseSyringe.desc }
+ .desc = { ent-PrefilledSyringe.desc }
ent-SyringeSigynate = sigynate syringe
- .desc = { ent-BaseSyringe.desc }
+ .desc = { ent-PrefilledSyringe.desc }
ent-SyringeEthylredoxrazine = ethylredoxrazine syringe
- .desc = { ent-BaseSyringe.desc }
+ .desc = { ent-PrefilledSyringe.desc }
ent-SyringePhalanximine = phalanximine syringe
- .desc = { ent-BaseSyringe.desc }
+ .desc = { ent-PrefilledSyringe.desc }
ent-SyringeSaline = saline syringe
- .desc = { ent-BaseSyringe.desc }
+ .desc = { ent-PrefilledSyringe.desc }
ent-SyringeRomerol = romerol syringe
- .desc = { ent-BaseSyringe.desc }
+ .desc = { ent-PrefilledSyringe.desc }
ent-SyringeStimulants = stimulants syringe
- .desc = { ent-BaseSyringe.desc }
+ .desc = { ent-PrefilledSyringe.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healthanalyzer.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healthanalyzer.ftl
index 96997df4dc4..4e6e44c2a71 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healthanalyzer.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healthanalyzer.ftl
@@ -5,4 +5,4 @@ ent-HandheldHealthAnalyzer = { ent-HandheldHealthAnalyzerUnpowered }
.desc = { ent-HandheldHealthAnalyzerUnpowered.desc }
ent-HandheldHealthAnalyzerEmpty = { ent-HandheldHealthAnalyzer }
.suffix = Empty
- .desc = { ent-HandheldHealthAnalyzer.desc }
+ .desc = { ent-HandheldHealthAnalyzer.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl
index 2d63adab82d..013c2946f48 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl
@@ -1,6 +1,6 @@
-ent-BodyBag_Container = body bag
+ent-BodyBag = body bag
.desc = A plastic bag designed for the storage and transportation of cadavers to stop body decomposition.
-ent-BodyBag_Folded = body bag
+ent-BodyBagFolded = body bag
.desc = A plastic bag designed for the storage and transportation of cadavers to stop body decomposition.
.suffix = folded
ent-Ash = ash
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl
index 7795cb0f187..1eb816aea2a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl
@@ -19,60 +19,62 @@ ent-BaseBorgModuleSyndicate = { ent-BaseBorgModule }
ent-BaseBorgModuleSyndicateAssault = { ent-BaseBorgModule }
.desc = { ent-BaseBorgModule.desc }
ent-BorgModuleCable = cable cyborg module
- .desc = { ent-BaseBorgModule.desc }
+ .desc = { ent-BaseBorgModule.desc }
ent-BorgModuleFireExtinguisher = fire extinguisher cyborg module
- .desc = { ent-BaseBorgModule.desc }
+ .desc = { ent-BaseBorgModule.desc }
ent-BorgModuleGPS = GPS cyborg module
- .desc = { ent-BaseBorgModule.desc }
+ .desc = { ent-BaseBorgModule.desc }
ent-BorgModuleRadiationDetection = radiation detection cyborg module
- .desc = { ent-BaseBorgModule.desc }
+ .desc = { ent-BaseBorgModule.desc }
ent-BorgModuleTool = tool cyborg module
- .desc = { ent-BaseBorgModule.desc }
+ .desc = { ent-BaseBorgModule.desc }
ent-BorgModuleAppraisal = appraisal cyborg module
- .desc = { ent-BaseBorgModuleCargo.desc }
+ .desc = { ent-BaseBorgModuleCargo.desc }
ent-BorgModuleMining = mining cyborg module
- .desc = { ent-BaseBorgModuleCargo.desc }
+ .desc = { ent-BaseBorgModuleCargo.desc }
ent-BorgModuleGrapplingGun = grappling gun cyborg module
- .desc = { ent-BaseBorgModuleCargo.desc }
+ .desc = { ent-BaseBorgModuleCargo.desc }
ent-BorgModuleAdvancedTool = advanced tool cyborg module
- .desc = { ent-BaseBorgModuleEngineering.desc }
+ .desc = { ent-BaseBorgModuleEngineering.desc }
ent-BorgModuleConstruction = construction cyborg module
- .desc = { ent-BaseBorgModuleEngineering.desc }
+ .desc = { ent-BaseBorgModuleEngineering.desc }
ent-BorgModuleRCD = RCD cyborg module
- .desc = { ent-BaseBorgModuleEngineering.desc }
+ .desc = { ent-BaseBorgModuleEngineering.desc }
ent-BorgModuleLightReplacer = light replacer cyborg module
- .desc = { ent-BaseBorgModuleJanitor.desc }
+ .desc = { ent-BaseBorgModuleJanitor.desc }
ent-BorgModuleCleaning = cleaning cyborg module
- .desc = { ent-BaseBorgModuleJanitor.desc }
+ .desc = { ent-BaseBorgModuleJanitor.desc }
ent-BorgModuleAdvancedCleaning = advanced cleaning cyborg module
- .desc = { ent-BaseBorgModuleJanitor.desc }
+ .desc = { ent-BaseBorgModuleJanitor.desc }
ent-BorgModuleDiagnosis = diagnosis cyborg module
- .desc = { ent-BaseBorgModuleMedical.desc }
+ .desc = { ent-BaseBorgModuleMedical.desc }
ent-BorgModuleTreatment = treatment cyborg module
- .desc = { ent-BaseBorgModuleMedical.desc }
+ .desc = { ent-BaseBorgModuleMedical.desc }
ent-BorgModuleDefibrillator = defibrillator cyborg module
- .desc = { ent-BaseBorgModuleMedical.desc }
+ .desc = { ent-BaseBorgModuleMedical.desc }
ent-BorgModuleAdvancedTreatment = advanced treatment cyborg module
- .desc = { ent-BaseBorgModuleMedical.desc }
+ .desc = { ent-BaseBorgModuleMedical.desc }
ent-BorgModuleArtifact = artifact cyborg module
- .desc = { ent-BaseBorgModule.desc }
+ .desc = { ent-BaseBorgModule.desc }
ent-BorgModuleAnomaly = anomaly cyborg module
- .desc = { ent-BaseBorgModule.desc }
+ .desc = { ent-BaseBorgModule.desc }
ent-BorgModuleService = service cyborg module
- .desc = { ent-BaseBorgModuleService.desc }
+ .desc = { ent-BaseBorgModuleService.desc }
ent-BorgModuleMusique = musique cyborg module
- .desc = { ent-BaseBorgModuleService.desc }
+ .desc = { ent-BaseBorgModuleService.desc }
ent-BorgModuleGardening = gardening cyborg module
- .desc = { ent-BaseBorgModuleService.desc }
+ .desc = { ent-BaseBorgModuleService.desc }
ent-BorgModuleHarvesting = harvesting cyborg module
- .desc = { ent-BaseBorgModuleService.desc }
+ .desc = { ent-BaseBorgModuleService.desc }
ent-BorgModuleClowning = clowning cyborg module
- .desc = { ent-BaseBorgModuleService.desc }
+ .desc = { ent-BaseBorgModuleService.desc }
ent-BorgModuleSyndicateWeapon = weapon cyborg module
- .desc = { ent-BaseBorgModule.desc }
+ .desc = { ent-BaseBorgModule.desc }
ent-BorgModuleOperative = operative cyborg module
.desc = A module that comes with a crowbar, an Emag and a syndicate pinpointer.
ent-BorgModuleEsword = energy sword cyborg module
.desc = A module that comes with a double energy sword.
ent-BorgModuleL6C = L6C ROW cyborg module
- .desc = A module that comes with a L6C.
\ No newline at end of file
+ .desc = A module that comes with a L6C.
+ent-BorgModuleMartyr = martyr cyborg module
+ .desc = A module that comes with an explosive you probably don't want to handle yourself.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/syndicate.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/syndicate.ftl
index 14ebbb86d8e..1559a4f2e6d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/syndicate.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/syndicate.ftl
@@ -22,6 +22,9 @@ ent-BaseUplinkRadio25TC = { ent-BaseUplinkRadio }
ent-BaseUplinkRadio40TC = { ent-BaseUplinkRadio }
.suffix = 40 TC, NukeOps
.desc = { ent-BaseUplinkRadio.desc }
+ent-BaseUplinkRadio60TC = { ent-BaseUplinkRadio }
+ .suffix = 60 TC, LoneOps
+ .desc = { ent-BaseUplinkRadio.desc }
ent-BaseUplinkRadioDebug = { ent-BaseUplinkRadio }
.suffix = DEBUG
.desc = { ent-BaseUplinkRadio.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/decoys.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/decoys.ftl
index da6779ef077..9bf9d3a9dd1 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/decoys.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/decoys.ftl
@@ -1,5 +1,5 @@
-ent-BaseDecoy = { ent-BaseItem }
- .desc = { ent-BaseItem.desc }
+ent-BaseDecoy = { ent-BaseFoldable }
+ .desc = { ent-BaseFoldable.desc }
ent-BalloonOperative = operative balloon
.desc = Upon closer inspection, this Syndicate operative is actually a balloon.
ent-BalloonAgent = agent balloon
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/handheld_mass_scanner.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/handheld_mass_scanner.ftl
index 1e74f069b71..4e8339a8911 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/handheld_mass_scanner.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/handheld_mass_scanner.ftl
@@ -1,5 +1,3 @@
-ent-HandHeldMassScanner = handheld mass scanner
- .desc = A hand-held mass scanner.
ent-HandHeldMassScannerEmpty = { ent-HandHeldMassScanner }
.suffix = Empty
.desc = { ent-HandHeldMassScanner.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/jammer.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/jammer.ftl
index 4c822de1288..8713d550956 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/jammer.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/jammer.ftl
@@ -1,2 +1,2 @@
ent-RadioJammer = radio jammer
- .desc = This device will disrupt any nearby outgoing radio communication when activated.
+ .desc = This device will disrupt any nearby outgoing radio communication as well as suit sensors when activated.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/tools.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/tools.ftl
index 50b5368f4c4..ec59a1f7e90 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/tools.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/tools.ftl
@@ -15,18 +15,18 @@ ent-NetworkConfigurator = network configurator
ent-PowerDrill = power drill
.desc = A simple powered hand drill.
ent-RCD = RCD
- .desc = An advanced construction device which can place/remove walls, floors, and airlocks quickly.
+ .desc = The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function.
ent-RCDEmpty = { ent-RCD }
.suffix = Empty
.desc = { ent-RCD.desc }
-ent-RCDRecharging = experimental rcd
- .desc = A bluespace-enhanced RCD that regenerates charges passively.
+ent-RCDRecharging = experimental RCD
+ .desc = A bluespace-enhanced rapid construction device that passively generates its own compressed matter.
.suffix = AutoRecharge
-ent-RCDExperimental = experimental rcd
- .desc = A bluespace-enhanced RCD that regenerates charges passively.
+ent-RCDExperimental = experimental RCD
+ .desc = A bluespace-enhanced rapid construction device that passively generates its own compressed matter.
.suffix = Admeme
-ent-RCDAmmo = RCD Ammo
- .desc = Ammo cartridge for an RCD.
+ent-RCDAmmo = compressed matter
+ .desc = A cartridge of raw matter compacted by bluespace technology. Used in rapid construction devices.
ent-Omnitool = omnitool
.desc = A drone's best friend.
ent-Shovel = shovel
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl
index 20428907ce2..850b0a8e5e9 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl
@@ -4,11 +4,7 @@ ent-MagazineBoxCaselessRifle10x24 = ammunition box (.25 caseless)
.desc = { ent-BaseMagazineBoxCaselessRifle.desc }
ent-MagazineBoxCaselessRifleBig = ammunition box (.25 caseless)
.desc = { ent-BaseMagazineBoxCaselessRifle.desc }
-ent-MagazineBoxCaselessRifleBigRubber = ammunition box (.25 caseless rubber)
- .desc = { ent-BaseMagazineBoxCaselessRifle.desc }
ent-MagazineBoxCaselessRifle = ammunition box (.25 caseless)
.desc = { ent-BaseMagazineBoxCaselessRifle.desc }
ent-MagazineBoxCaselessRiflePractice = ammunition box (.25 caseless practice)
.desc = { ent-BaseMagazineBoxCaselessRifle.desc }
-ent-MagazineBoxCaselessRifleRubber = ammunition box (.25 caseless rubber)
- .desc = { ent-BaseMagazineBoxCaselessRifle.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl
index 66fde99b175..d0364a5089c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl
@@ -6,8 +6,6 @@ ent-MagazineBoxLightRifle = ammunition box (.30 rifle)
.desc = { ent-BaseMagazineBoxLightRifle.desc }
ent-MagazineBoxLightRiflePractice = ammunition box (.30 rifle practice)
.desc = { ent-BaseMagazineBoxLightRifle.desc }
-ent-MagazineBoxLightRifleRubber = ammunition box (.30 rifle rubber)
- .desc = { ent-BaseMagazineBoxLightRifle.desc }
ent-MagazineBoxLightRifleIncendiary = ammunition box (.30 rifle incendiary)
.desc = { ent-BaseMagazineBoxLightRifle.desc }
ent-MagazineBoxLightRifleUranium = ammunition box (.30 rifle uranium)
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl
index ae1c07a5652..2d9d9a68484 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl
@@ -4,8 +4,6 @@ ent-MagazineBoxMagnum = ammunition box (.45 magnum)
.desc = { ent-BaseMagazineBoxMagnum.desc }
ent-MagazineBoxMagnumPractice = ammunition box (.45 magnum practice)
.desc = { ent-BaseMagazineBoxMagnum.desc }
-ent-MagazineBoxMagnumRubber = ammunition box (.45 magnum rubber)
- .desc = { ent-BaseMagazineBoxMagnum.desc }
ent-MagazineBoxMagnumIncendiary = ammunition box (.45 magnum incendiary)
.desc = { ent-BaseMagazineBoxMagnum.desc }
ent-MagazineBoxMagnumUranium = ammunition box (.45 magnum uranium)
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl
index cb3ee93c7fc..5c454c0d68c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl
@@ -4,8 +4,6 @@ ent-MagazineBoxPistol = ammunition box (.35 auto)
.desc = { ent-BaseMagazineBoxPistol.desc }
ent-MagazineBoxPistolPractice = ammunition box (.35 auto practice)
.desc = { ent-BaseMagazineBoxPistol.desc }
-ent-MagazineBoxPistolRubber = ammunition box (.35 auto rubber)
- .desc = { ent-BaseMagazineBoxPistol.desc }
ent-MagazineBoxPistolIncendiary = ammunition box (.35 auto incendiary)
.desc = { ent-BaseMagazineBoxPistol.desc }
ent-MagazineBoxPistolUranium = ammunition box (.35 auto uranium)
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl
index 0396ac76ac7..9b23c2ee4ea 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl
@@ -2,14 +2,10 @@ ent-BaseMagazineBoxRifle = { ent-BaseItem }
.desc = { ent-BaseItem.desc }
ent-MagazineBoxRifleBig = ammunition box (.20 rifle)
.desc = { ent-BaseMagazineBoxRifle.desc }
-ent-MagazineBoxRifleBigRubber = ammunition box (.20 rifle rubber)
- .desc = { ent-BaseMagazineBoxRifle.desc }
ent-MagazineBoxRifle = ammunition box (.20 rifle)
.desc = { ent-BaseMagazineBoxRifle.desc }
ent-MagazineBoxRiflePractice = ammunition box (.20 rifle practice)
.desc = { ent-BaseMagazineBoxRifle.desc }
-ent-MagazineBoxRifleRubber = ammunition box (.20 rifle rubber)
- .desc = { ent-BaseMagazineBoxRifle.desc }
ent-MagazineBoxRifleIncendiary = ammunition box (.20 rifle incendiary)
.desc = { ent-BaseMagazineBoxRifle.desc }
ent-MagazineBoxRifleUranium = ammunition box (.20 rifle uranium)
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl
index 0fcb3501fef..6ea6810eb6f 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl
@@ -12,6 +12,8 @@ ent-BoxShotgunFlare = shotgun flare cartridges dispenser
.desc = A dispenser box full of flare cartridges, designed for riot shotguns.
ent-BoxShotgunIncendiary = shotgun incendiary cartridges dispenser
.desc = A dispenser box full of incendiary cartridges, designed for riot shotguns.
+ent-BoxShotgunUranium = shotgun uranium cartridges dispenser
+ .desc = A dispenser box full of uranium cartridges, designed for riot shotguns.
ent-BoxShotgunPractice = shotgun practice cartridges dispenser
.desc = A dispenser box full of practice cartridges, designed for riot shotguns.
ent-BoxShellTranquilizer = tranquilizer cartridges dispenser
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl
index afe83629543..c45fd3f8ac7 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl
@@ -4,5 +4,3 @@ ent-CartridgeCaselessRifle = cartridge (.25 caseless)
.desc = { ent-BaseCartridgeCaselessRifle.desc }
ent-CartridgeCaselessRiflePractice = cartridge (.25 caseless practice)
.desc = { ent-BaseCartridgeCaselessRifle.desc }
-ent-CartridgeCaselessRifleRubber = cartridge (.25 caseless rubber)
- .desc = { ent-BaseCartridgeCaselessRifle.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl
index 7c07b506645..067fadb22a9 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl
@@ -4,8 +4,6 @@ ent-CartridgeLightRifle = cartridge (.30 rifle)
.desc = { ent-BaseCartridgeLightRifle.desc }
ent-CartridgeLightRiflePractice = cartridge (.30 rifle practice)
.desc = { ent-BaseCartridgeLightRifle.desc }
-ent-CartridgeLightRifleRubber = cartridge (.30 rifle rubber)
- .desc = { ent-BaseCartridgeLightRifle.desc }
ent-CartridgeLightRifleIncendiary = cartridge (.30 rifle incendiary)
.desc = { ent-BaseCartridgeLightRifle.desc }
ent-CartridgeLightRifleUranium = cartridge (.30 rifle uranium)
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl
index d0d74d06655..131b0f9346a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl
@@ -4,8 +4,6 @@ ent-CartridgeMagnum = cartridge (.45 magnum)
.desc = { ent-BaseCartridgeMagnum.desc }
ent-CartridgeMagnumPractice = cartridge (.45 magnum practice)
.desc = { ent-BaseCartridgeMagnum.desc }
-ent-CartridgeMagnumRubber = cartridge (.45 magnum rubber)
- .desc = { ent-BaseCartridgeMagnum.desc }
ent-CartridgeMagnumIncendiary = cartridge (.45 magnum incendiary)
.desc = { ent-BaseCartridgeMagnum.desc }
ent-CartridgeMagnumAP = cartridge (.45 magnum armor-piercing)
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl
index 293080ad5f8..a35b46ab6bb 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl
@@ -4,8 +4,6 @@ ent-CartridgePistol = cartridge (.35 auto)
.desc = { ent-BaseCartridgePistol.desc }
ent-CartridgePistolPractice = cartridge (.35 auto practice)
.desc = { ent-BaseCartridgePistol.desc }
-ent-CartridgePistolRubber = cartridge (.35 auto rubber)
- .desc = { ent-BaseCartridgePistol.desc }
ent-CartridgePistolIncendiary = cartridge (.35 auto incendiary)
.desc = { ent-BaseCartridgePistol.desc }
ent-CartridgePistolUranium = cartridge (.35 auto uranium)
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl
index f929f52beab..ff045da1b28 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl
@@ -4,8 +4,6 @@ ent-CartridgeRifle = cartridge (.20 rifle)
.desc = { ent-BaseCartridgeRifle.desc }
ent-CartridgeRiflePractice = cartridge (.20 rifle practice)
.desc = { ent-BaseCartridgeRifle.desc }
-ent-CartridgeRifleRubber = cartridge (.20 rifle rubber)
- .desc = { ent-BaseCartridgeRifle.desc }
ent-CartridgeRifleIncendiary = cartridge (.20 rifle incendiary)
.desc = { ent-BaseCartridgeRifle.desc }
ent-CartridgeRifleUranium = cartridge (.20 rifle uranium)
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/shotgun.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/shotgun.ftl
index 6fcd2b5fb13..9c3983ad331 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/shotgun.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/shotgun.ftl
@@ -15,6 +15,6 @@ ent-ShellShotgunPractice = shell (.50 practice)
ent-ShellTranquilizer = shell (.50 tranquilizer)
.desc = { ent-BaseShellShotgun.desc }
ent-ShellShotgunImprovised = improvised shotgun shell
- .desc = A homemade shotgun shell that shoots painful metal shrapnel. The spread is so wide that it couldn't hit the broad side of a barn.
+ .desc = A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a barn.
ent-ShellShotgunUranium = uranium shotgun shell
.desc = { ent-BaseShellShotgun.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl
index 1a0fc91323d..d90d2602c6c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl
@@ -10,17 +10,11 @@ ent-MagazinePistolCaselessRifle = pistol magazine (.25 caseless)
.desc = { ent-BaseMagazinePistolCaselessRifle.desc }
ent-MagazinePistolCaselessRiflePractice = pistol magazine (.25 caseless practice)
.desc = { ent-BaseMagazinePistolCaselessRifle.desc }
-ent-MagazinePistolCaselessRifleRubber = pistol magazine (.25 caseless rubber)
- .desc = { ent-BaseMagazinePistolCaselessRifle.desc }
ent-MagazineCaselessRifle = magazine (.25 caseless)
.desc = { ent-BaseMagazineCaselessRifle.desc }
ent-MagazineCaselessRiflePractice = magazine (.25 caseless practice)
.desc = { ent-BaseMagazineCaselessRifle.desc }
-ent-MagazineCaselessRifleRubber = magazine (.25 caseless rubber)
- .desc = { ent-BaseMagazineCaselessRifle.desc }
ent-MagazineCaselessRifleShort = short magazine (.25 caseless)
.desc = { ent-BaseMagazineCaselessRifleShort.desc }
ent-MagazineCaselessRifleShortPractice = short magazine (.25 caseless practice)
.desc = { ent-BaseMagazineCaselessRifleShort.desc }
-ent-MagazineCaselessRifleShortRubber = short magazine (.25 caseless rubber)
- .desc = { ent-BaseMagazineCaselessRifleShort.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
index 3d22f32d7ab..56fea5c902f 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
@@ -4,11 +4,14 @@ ent-MagazineLightRifleBox = L6 SAW magazine box (.30 rifle)
.desc = { ent-BaseMagazineLightRifle.desc }
ent-MagazineLightRifle = magazine (.30 rifle)
.desc = { ent-BaseMagazineLightRifle.desc }
+ent-MagazineLightRifleEmpty = magazine (.30 rifle any)
+ .suffix = empty
+ .desc = { ent-MagazineLightRifle.desc }
ent-MagazineLightRiflePractice = magazine (.30 rifle practice)
.desc = { ent-BaseMagazineLightRifle.desc }
-ent-MagazineLightRifleRubber = magazine (.30 rifle rubber)
- .desc = { ent-BaseMagazineLightRifle.desc }
ent-MagazineLightRifleUranium = magazine (.30 rifle uranium)
.desc = { ent-BaseMagazineLightRifle.desc }
+ent-MagazineLightRifleIncendiary = magazine (.30 rifle incendiary)
+ .desc = { ent-MagazineLightRifle.desc }
ent-MagazineLightRifleMaxim = pan magazine (.30 rifle)
.desc = { ent-BaseMagazineLightRifle.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl
index 75e59fe4f3b..4d0a7c65ee7 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl
@@ -2,22 +2,24 @@ ent-BaseMagazineMagnum = pistol magazine (.45 magnum)
.desc = { ent-BaseMagazinePistol.desc }
ent-BaseMagazineMagnumSubMachineGun = Vector magazine (.45 magnum)
.desc = { ent-BaseItem.desc }
+ent-MagazineMagnumEmpty = pistol magazine (.45 magnum any)
+ .suffix = empty
+ .desc = { ent-BaseMagazineMagnum.desc }
ent-MagazineMagnum = pistol magazine (.45 magnum)
.desc = { ent-BaseMagazineMagnum.desc }
ent-MagazineMagnumPractice = pistol magazine (.45 magnum practice)
.desc = { ent-BaseMagazineMagnum.desc }
-ent-MagazineMagnumRubber = pistol magazine (.45 magnum rubber)
- .desc = { ent-BaseMagazineMagnum.desc }
ent-MagazineMagnumUranium = pistol magazine (.45 magnum uranium)
.desc = { ent-BaseMagazineMagnum.desc }
ent-MagazineMagnumAP = pistol magazine (.45 magnum armor-piercing)
.desc = { ent-BaseMagazineMagnum.desc }
+ent-MagazineMagnumSubMachineGunEmpty = Vector magazine (.45 magnum any)
+ .suffix = empty
+ .desc = { ent-BaseMagazineMagnumSubMachineGun.desc }
ent-MagazineMagnumSubMachineGun = Vector magazine (.45 magnum)
.desc = { ent-BaseMagazineMagnumSubMachineGun.desc }
ent-MagazineMagnumSubMachineGunPractice = Vector magazine (.45 magnum practice)
.desc = { ent-BaseMagazineMagnumSubMachineGun.desc }
-ent-MagazineMagnumSubMachineGunRubber = Vector magazine (.45 magnum rubber)
- .desc = { ent-BaseMagazineMagnumSubMachineGun.desc }
ent-MagazineMagnumSubMachineGunUranium = Vector magazine (.45 magnum uranium)
.desc = { ent-BaseMagazineMagnumSubMachineGun.desc }
ent-MagazineMagnumSubMachineGunPiercing = Vector magazine (.45 magnum armor-piercing)
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl
index 42584975093..4689a29cbc5 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl
@@ -6,12 +6,22 @@ ent-BaseMagazinePistolSubMachineGun = SMG magazine (.35 auto)
.desc = { ent-BaseItem.desc }
ent-MagazinePistolSubMachineGunTopMounted = WT550 magazine (.35 auto top-mounted)
.desc = { ent-BaseItem.desc }
+ent-MagazinePistolSubMachineGunTopMountedEmpty = WT550 magazine (.35 auto top-mounted any)
+ .desc = { ent-MagazinePistolSubMachineGunTopMounted.desc }
ent-MagazinePistol = pistol magazine (.35 auto)
.desc = { ent-BaseMagazinePistol.desc }
+ent-MagazinePistolEmpty = pistol magazine (.35 auto any)
+ .suffix = empty
+ .desc = { ent-MagazinePistol.desc }
+ent-MagazinePistolIncendiary = pistol magazine (.35 auto incendiary)
+ .desc = { ent-MagazinePistol.desc }
ent-MagazinePistolPractice = pistol magazine (.35 auto practice)
.desc = { ent-BaseMagazinePistol.desc }
-ent-MagazinePistolRubber = pistol magazine (.35 auto rubber)
+ent-MagazinePistolUranium = pistol magazine (.35 auto uranium)
.desc = { ent-BaseMagazinePistol.desc }
+ent-MagazinePistolHighCapacityEmpty = machine pistol magazine (.35 auto any)
+ .suffix = empty
+ .desc = { ent-BaseMagazinePistolHighCapacity.desc }
ent-MagazinePistolHighCapacity = machine pistol magazine (.35 auto)
.desc = { ent-BaseMagazinePistolHighCapacity.desc }
ent-MagazinePistolHighCapacityPractice = machine pistol magazine (.35 auto practice)
@@ -20,9 +30,10 @@ ent-MagazinePistolHighCapacityRubber = machine pistol magazine (.35 auto rubber)
.desc = { ent-BaseMagazinePistolHighCapacity.desc }
ent-MagazinePistolSubMachineGun = SMG magazine (.35 auto)
.desc = { ent-BaseMagazinePistolSubMachineGun.desc }
-ent-MagazinePistolSubMachineGunPractice = SMG magazine (.35 auto practice)
+ent-MagazinePistolSubMachineGunEmpty = SMG magazine (.35 auto any)
+ .suffix = empty
.desc = { ent-BaseMagazinePistolSubMachineGun.desc }
-ent-MagazinePistolSubMachineGunRubber = SMG magazine (.35 auto rubber)
+ent-MagazinePistolSubMachineGunPractice = SMG magazine (.35 auto practice)
.desc = { ent-BaseMagazinePistolSubMachineGun.desc }
ent-MagazinePistolSubMachineGunUranium = SMG magazine (.35 auto rubber)
.desc = { ent-BaseMagazinePistolSubMachineGun.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl
index a4c85f0400d..af9dc33ad20 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl
@@ -2,9 +2,12 @@ ent-BaseMagazineRifle = magazine (.20 rifle)
.desc = { ent-BaseItem.desc }
ent-MagazineRifle = magazine (.20 rifle)
.desc = { ent-BaseMagazineRifle.desc }
+ent-MagazineRifleEmpty = magazine (.20 rifle any)
+ .suffix = empty
+ .desc = { ent-MagazineRifle.desc }
+ent-MagazineRifleIncendiary = magazine (.20 rifle incendiary)
+ .desc = { ent-MagazineRifle.desc }
ent-MagazineRiflePractice = magazine (.20 rifle practice)
.desc = { ent-BaseMagazineRifle.desc }
-ent-MagazineRifleRubber = magazine (.20 rifle rubber)
- .desc = { ent-BaseMagazineRifle.desc }
ent-MagazineRifleUranium = magazine (.20 rifle uranium)
.desc = { ent-BaseMagazineRifle.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl
index 9b7752fbf40..0d1f45af0bc 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl
@@ -1,5 +1,8 @@
ent-BaseMagazineShotgun = ammo drum (.50 shells)
.desc = { ent-BaseItem.desc }
+ent-MagazineShotgunEmpty = ammo drum (.50 shells any)
+ .suffix = empty
+ .desc = { ent-BaseMagazineShotgun.desc }
ent-MagazineShotgun = ammo drum (.50 pellet)
.desc = { ent-BaseMagazineShotgun.desc }
ent-MagazineShotgunBeanbag = ammo drum (.50 beanbags)
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/caseless_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/caseless_rifle.ftl
index b98a7f82be5..f6357d7c3a4 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/caseless_rifle.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/caseless_rifle.ftl
@@ -2,5 +2,3 @@ ent-BulletCaselessRifle = bullet (.25 caseless)
.desc = { ent-BaseBullet.desc }
ent-BulletCaselessRiflePractice = bullet (.25 caseless practice)
.desc = { ent-BaseBulletPractice.desc }
-ent-BulletCaselessRifleRubber = bullet (.25 caseless rubber)
- .desc = { ent-BaseBulletRubber.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/light_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/light_rifle.ftl
index 0250e09da6a..343cae67d12 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/light_rifle.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/light_rifle.ftl
@@ -2,8 +2,6 @@ ent-BulletLightRifle = bullet (.20 rifle)
.desc = { ent-BaseBullet.desc }
ent-BulletLightRiflePractice = bullet (.20 rifle practice)
.desc = { ent-BaseBulletPractice.desc }
-ent-BulletLightRifleRubber = bullet (.20 rifle rubber)
- .desc = { ent-BaseBulletRubber.desc }
ent-BulletLightRifleIncendiary = bullet (.20 rifle incendiary)
.desc = { ent-BaseBulletIncendiary.desc }
ent-BulletLightRifleUranium = bullet (.20 rifle uranium)
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/magnum.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/magnum.ftl
index 4e1186af254..a0f05bc001d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/magnum.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/magnum.ftl
@@ -2,8 +2,6 @@ ent-BulletMagnum = bullet (.45 magnum)
.desc = { ent-BaseBullet.desc }
ent-BulletMagnumPractice = bullet (.45 magnum practice)
.desc = { ent-BaseBulletPractice.desc }
-ent-BulletMagnumRubber = bullet (.45 magnum rubber)
- .desc = { ent-BaseBulletRubber.desc }
ent-BulletMagnumIncendiary = bullet (.45 magnum incendiary)
.desc = { ent-BaseBulletIncendiary.desc }
ent-BulletMagnumAP = bullet (.45 magnum armor-piercing)
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/pistol.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/pistol.ftl
index 1c153146492..f3aa8f862ec 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/pistol.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/pistol.ftl
@@ -2,8 +2,6 @@ ent-BulletPistol = bullet (.35 auto)
.desc = { ent-BaseBullet.desc }
ent-BulletPistolPractice = bullet (.35 auto practice)
.desc = { ent-BaseBulletPractice.desc }
-ent-BulletPistolRubber = bullet (.35 auto rubber)
- .desc = { ent-BaseBulletRubber.desc }
ent-BulletPistolIncendiary = bullet (.35 auto incendiary)
.desc = { ent-BaseBulletIncendiary.desc }
ent-BulletPistolUranium = bullet (.35 auto uranium)
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/rifle.ftl
index c413c8a6bb7..c2c27fa9575 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/rifle.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/rifle.ftl
@@ -2,8 +2,6 @@ ent-BulletRifle = bullet (0.20 rifle)
.desc = { ent-BaseBullet.desc }
ent-BulletRiflePractice = bullet (0.20 rifle practice)
.desc = { ent-BaseBulletPractice.desc }
-ent-BulletRifleRubber = bullet (0.20 rifle rubber)
- .desc = { ent-BaseBulletRubber.desc }
ent-BulletRifleIncendiary = bullet (0.20 rifle incendiary)
.desc = { ent-BaseBulletIncendiary.desc }
ent-BulletRifleUranium = bullet (0.20 rifle uranium)
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl
index 1684b99a371..35abf592cca 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl
@@ -2,10 +2,12 @@ ent-BaseSpeedLoaderMagnum = speed loader (.45 magnum)
.desc = { ent-BaseItem.desc }
ent-SpeedLoaderMagnum = speed loader (.45 magnum)
.desc = { ent-BaseSpeedLoaderMagnum.desc }
+ent-SpeedLoaderMagnumEmpty = speed loader (.45 magnum any)
+ .desc = { ent-SpeedLoaderMagnum.desc }
+ent-SpeedLoaderMagnumIncendiary = speed loader (.45 magnum incendiary)
+ .desc = { ent-SpeedLoaderMagnum.desc }
ent-SpeedLoaderMagnumPractice = speed loader (.45 magnum practice)
.desc = { ent-BaseSpeedLoaderMagnum.desc }
-ent-SpeedLoaderMagnumRubber = speed loader (.45 magnum rubber)
- .desc = { ent-BaseSpeedLoaderMagnum.desc }
ent-SpeedLoaderMagnumAP = speed loader (.45 magnum armor-piercing)
.desc = { ent-BaseSpeedLoaderMagnum.desc }
ent-SpeedLoaderMagnumUranium = speed loader (.45 magnum uranium)
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/pistol.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/pistol.ftl
index c515ba04657..4e6b1edb003 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/pistol.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/pistol.ftl
@@ -4,5 +4,3 @@ ent-SpeedLoaderPistol = speed loader (.35 auto)
.desc = { ent-BaseSpeedLoaderPistol.desc }
ent-SpeedLoaderPistolPractice = speed loader (.35 auto practice)
.desc = { ent-BaseSpeedLoaderPistol.desc }
-ent-SpeedLoaderPistolRubber = speed loader (.35 auto rubber)
- .desc = { ent-BaseSpeedLoaderPistol.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl
index 6001551ef35..4be627fc894 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl
@@ -9,42 +9,42 @@ ent-BaseWeaponPowerCellSmall = { ent-BaseWeaponPowerCell }
ent-WeaponLaserSvalinn = svalinn laser pistol
.desc = A cheap and widely used laser pistol.
ent-WeaponLaserGun = retro laser pistol
- .desc = A weapon using light amplified by the stimulated emission of radiation.
+ .desc = A civilian grade weapon using light amplified by the stimulated emission of radiation.
ent-WeaponMakeshiftLaser = makeshift laser pistol
- .desc = Better pray it won't burn your hands off.
+ .desc = Better pray it won't burn your hands off. At least it's legal.
ent-WeaponTeslaGun = tesla gun
- .desc = The power of the primordial element of lightning in your hands.
+ .desc = The power of the primordial element of lightning in your hands. An experimental and illegal weapon.
ent-WeaponLaserCarbine = laser rifle
- .desc = Favoured by Nanotrasen Security for being cheap and easy to use.
+ .desc = A simple civilian grade laser carbine, the workhorse of many private security organizations.
ent-WeaponLaserCarbinePractice = practice laser rifle
- .desc = This modified laser rifle fires harmless beams in the 40-watt range, for target practice.
+ .desc = This modified laser rifle fires nearly harmless beams in the 40-watt range, for target practice.
ent-WeaponPulsePistol = pulse pistol
- .desc = A state of the art energy pistol favoured as a sidearm by the NT operatives.
+ .desc = A state of the art energy pistol favoured as a sidearm by the NT operatives. On the handle is a label that says 'for authorized use only.'
ent-WeaponPulseCarbine = pulse carbine
- .desc = A high tech energy carbine favoured by the NT-ERT operatives.
+ .desc = A high tech energy carbine favoured by the NT-ERT operatives. On the handle is a label that says 'for authorized use only.'
ent-WeaponPulseRifle = pulse rifle
- .desc = A weapon that is almost as infamous as its users.
+ .desc = A weapon that is almost as infamous as its users. On the handle is a label that says 'for authorized use only.'
ent-WeaponLaserCannon = laser cannon
- .desc = A heavy duty, high powered laser weapon.
+ .desc = A heavy duty, high powered laser weapon. On the handle is a label that says 'for authorized use only.'
ent-WeaponParticleDecelerator = portable particle decelerator
.desc = A portable particle decelerator capable of decomposing a tesla or singularity.
ent-WeaponXrayCannon = x-ray cannon
- .desc = An experimental weapon that uses concentrated x-ray energy against its target.
+ .desc = An illegal and experimental weapon that uses concentrated x-ray energy against its target.
ent-WeaponDisabler = disabler
- .desc = A self-defense weapon that exhausts organic targets, weakening them until they collapse.
+ .desc = A civilian grade self-defense weapon that exhausts organic targets, weakening them until they collapse.
ent-WeaponDisablerSMG = disabler SMG
- .desc = Advanced weapon that exhausts organic targets, weakening them until they collapse.
+ .desc = Advanced weapon that exhausts organic targets, weakening them until they collapse. On the handle is a label that says 'for authorized use only.'
ent-WeaponDisablerPractice = practice disabler
- .desc = A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for cadets.
+ .desc = A civilian-grade self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for firearm training.
ent-WeaponTaser = taser
- .desc = A low-capacity, energy-based stun gun used by security teams to subdue targets at range.
+ .desc = A low-capacity, energy-based stun gun used by security teams to subdue targets at range. On the handle is a label that says 'for authorized use only.'
ent-WeaponAntiqueLaser = antique laser pistol
- .desc = This is an antique laser pistol. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy.
+ .desc = This is a civilian grade antique laser pistol. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy.
ent-WeaponAdvancedLaser = advanced laser pistol
- .desc = An experimental high-energy laser pistol with a self-charging nuclear battery.
+ .desc = An experimental civilian grade high-energy laser pistol with a self-charging nuclear battery.
ent-WeaponPistolCHIMP = C.H.I.M.P. handcannon
.desc = Just because it's a little C.H.I.M.P. doesn't mean it can't punch like an A.P.E.
ent-WeaponPistolCHIMPUpgraded = experimental C.H.I.M.P. handcannon
.desc = This C.H.I.M.P. seems to have a greater punch than is usual...
ent-WeaponBehonkerLaser = eye of a behonker
- .desc = The eye of a behonker, it fires a laser when squeezed.
+ .desc = The eye of a behonker, it fires a laser when squeezed. An illegal weapon often used by the cult of the Honkmother.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/hmgs/hmgs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/hmgs/hmgs.ftl
index 06c12b19b40..2255108ff70 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/hmgs/hmgs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/hmgs/hmgs.ftl
@@ -1,4 +1,4 @@
ent-BaseWeaponHeavyMachineGun = BaseWeaponHeavyMachineGun
.desc = Spray and pray
ent-WeaponMinigun = minigun
- .desc = Vzzzzzt! Rahrahrahrah! Vrrrrr! Uses .10 rifle ammo.
+ .desc = Vzzzzzt! Rahrahrahrah! Vrrrrr! Uses .10 rifle ammo. Illegal for use in the Frontier sector.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/lmgs/lmgs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/lmgs/lmgs.ftl
index e3769e1c8fa..4df8d44dfb4 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/lmgs/lmgs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/lmgs/lmgs.ftl
@@ -1,6 +1,6 @@
ent-BaseWeaponLightMachineGun = BaseWeaponLightMachineGun
.desc = A rooty tooty point and shooty.
ent-WeaponLightMachineGunL6 = L6 SAW
- .desc = A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. Uses .30 rifle ammo.
+ .desc = A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. Uses .30 rifle ammo. An illegal firearm often used by Syndicate agents.
ent-WeaponLightMachineGunL6C = L6C ROW
- .desc = A L6 SAW for use by cyborgs. Creates .30 rifle ammo on the fly from an internal ammo fabricator, which slowly self-charges.
+ .desc = A L6 SAW for use by cyborgs. Creates .30 rifle ammo on the fly from an internal ammo fabricator, which slowly self-charges. An illegal firearm often used by Syndicate agents.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl
index e8221a95739..a12d47539b6 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl
@@ -1,16 +1,10 @@
ent-BaseWeaponPistol = BasePistol
.desc = A rooty tooty point and shooty.
ent-WeaponPistolViper = viper
- .desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses .35 auto ammo.
+ .desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses .35 auto ammo. An illegal firearm often used by Syndicate agents.
ent-WeaponPistolCobra = cobra
- .desc = A rugged, robust operator handgun with inbuilt silencer. Uses .25 caseless ammo.
+ .desc = A rugged, robust operator handgun with inbuilt silencer. Uses .25 caseless ammo. An illegal firearm often used by Syndicate agents.
ent-WeaponPistolMk58 = mk 58
- .desc = A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo.
-ent-WeaponPistolMk58Nonlethal = { ent-WeaponPistolMk58 }
- .suffix = Non-lethal
- .desc = { ent-WeaponPistolMk58.desc }
+ .desc = A cheap, civilian grade, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo.
ent-WeaponPistolN1984 = N1984
- .desc = The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber.
-ent-WeaponPistolN1984Nonlethal = N1984
- .suffix = Non-lethal
- .desc = { ent-WeaponPistolN1984.desc }
+ .desc = The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber. On the handle is a label that says 'for authorized use only.'
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl
index 787f7247b7f..519635dfa29 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl
@@ -6,8 +6,6 @@ ent-BaseBulletTrigger = { ent-BaseBullet }
.desc = { ent-BaseBullet.desc }
ent-BaseBulletPractice = base bullet practice
.desc = { ent-BaseBullet.desc }
-ent-BaseBulletRubber = base bullet rubber
- .desc = { ent-BaseBullet.desc }
ent-BaseBulletIncendiary = base bullet incendiary
.desc = { ent-BaseBullet.desc }
ent-BaseBulletAP = base bullet armor-piercing
@@ -46,6 +44,10 @@ ent-AnomalousParticleZetaStrong = { ent-AnomalousParticleZeta }
.desc = { ent-AnomalousParticleZeta.desc }
ent-AnomalousParticleOmegaStrong = omega particles
.desc = { ent-AnomalousParticleDelta.desc }
+ent-AnomalousParticleSigma = sigma particles
+ .desc = { ent-AnomalousParticleDelta.desc }
+ent-AnomalousParticleSigmaStrong = sigma particles
+ .desc = { ent-AnomalousParticleSigma.desc }
ent-BulletRocket = rocket
.desc = { ent-BaseBulletTrigger.desc }
ent-BulletWeakRocket = weak rocket
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl
index 607cc1a518b..5e685dbbfe1 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl
@@ -1,15 +1,15 @@
ent-BaseWeaponRevolver = BaseWeaponRevolver
.desc = A rooty tooty point and shooty.
ent-WeaponRevolverDeckard = Deckard
- .desc = A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo.
+ .desc = A rare, civilian grade custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo.
ent-WeaponRevolverInspector = Inspector
- .desc = A detective's best friend. Uses .45 magnum ammo.
+ .desc = A detective's best friend. Uses .45 magnum ammo. On the handle is a label that says 'for authorized use only.'
ent-WeaponRevolverMateba = Mateba
- .desc = The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo.
+ .desc = The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. On the handle is a label that says 'for authorized use only.'
ent-WeaponRevolverPython = Python
- .desc = A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo.
+ .desc = An illegal revolver favoured by Syndicate agents. Uses .45 magnum ammo.
ent-WeaponRevolverPythonAP = Python
- .desc = A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo.
+ .desc = An illegal revolver favoured by Syndicate agents. Uses .45 magnum ammo.
.suffix = armor-piercing
ent-WeaponRevolverPirate = pirate revolver
- .desc = An odd, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo.
+ .desc = An odd, illegal, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl
index 623b3433375..d840fc6b108 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl
@@ -1,11 +1,8 @@
ent-BaseWeaponRifle = BaseWeaponRifle
.desc = A rooty tooty point and shooty.
ent-WeaponRifleAk = AKMS
- .desc = An iconic weapon of war. Uses .30 rifle ammo.
+ .desc = An iconic weapon of war. Uses .30 rifle ammo. An illegal firearm often used by Syndicate agents.
ent-WeaponRifleM90GrenadeLauncher = M-90gl
- .desc = An older bullpup carbine model, with an attached underbarrel grenade launcher. Uses .20 rifle ammo.
+ .desc = An older bullpup carbine model, with an attached underbarrel grenade launcher. Uses .20 rifle ammo. An illegal firearm often used by Syndicate agents.
ent-WeaponRifleLecter = Lecter
- .desc = A high end military grade assault rifle. Uses .20 rifle ammo.
-ent-WeaponRifleLecterRubber = Lecter
- .suffix = Non-lethal
- .desc = { ent-WeaponRifleLecter.desc }
+ .desc = A high end military grade assault rifle. Uses .20 rifle ammo. On the receiver is a label that says 'for authorized use only.'
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/shotguns/shotguns.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/shotguns/shotguns.ftl
index 0a8e70e3845..29945815f88 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/shotguns/shotguns.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/shotguns/shotguns.ftl
@@ -1,31 +1,31 @@
ent-BaseWeaponShotgun = BaseWeaponShotgun
.desc = A rooty tooty point and shooty.
ent-WeaponShotgunBulldog = Bulldog
- .desc = It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells.
+ .desc = It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells. An illegal firearm often used by Syndicate agents.
ent-WeaponShotgunDoubleBarreled = double-barreled shotgun
- .desc = An immortal classic. Uses .50 shotgun shells.
+ .desc = An immortal classic. A civilian grade shotgun. Uses .50 shotgun shells.
ent-WeaponShotgunDoubleBarreledRubber = double-barreled shotgun
.desc = An immortal classic. Uses .50 shotgun shells.
.suffix = Non-Lethal
ent-WeaponShotgunEnforcer = Enforcer
- .desc = A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells.
+ .desc = A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells. On the receiver is a label that says 'for authorized use only.'
ent-WeaponShotgunEnforcerRubber = { ent-WeaponShotgunEnforcer }
.suffix = Non-Lethal
.desc = { ent-WeaponShotgunEnforcer.desc }
ent-WeaponShotgunKammerer = Kammerer
- .desc = When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells.
+ .desc = When an old Remington design meets modern materials, this is the result. A civilian grade shotgun, favored by militia forces throughout many worlds. Uses .50 shotgun shells.
ent-WeaponShotgunSawn = sawn-off shotgun
- .desc = Groovy! Uses .50 shotgun shells.
+ .desc = Groovy! Uses .50 shotgun shells. A modified civilian grade shotgun.
ent-WeaponShotgunSawnEmpty = sawn-off shogun
- .desc = Groovy! Uses .50 shotgun shells.
+ .desc = Groovy! Uses .50 shotgun shells. A modified civilian grade shotgun.
.suffix = Empty
ent-WeaponShotgunHandmade = handmade pistol
- .desc = Looks unreliable. Uses .50 shotgun shells.
+ .desc = Looks unreliable, but legal. Uses .50 shotgun shells.
ent-WeaponShotgunBlunderbuss = blunderbuss
- .desc = Deadly at close range.
+ .desc = Deadly at close range, an illegal shotgun often found at the side of a pirate.
.suffix = Pirate
ent-WeaponShotgunImprovised = improvised shotgun
- .desc = A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber.
+ .desc = A shitty, but legal, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber.
ent-WeaponShotgunImprovisedLoaded = improvised shotgun
.suffix = Loaded
.desc = { ent-WeaponShotgunImprovised.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl
index 1730ca59126..82174bf2722 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl
@@ -1,19 +1,13 @@
ent-BaseWeaponSubMachineGun = BaseSMG
.desc = A rooty tooty point and shooty.
ent-WeaponSubMachineGunAtreides = Atreides
- .desc = Pla-ket-ket-ket-ket! Uses .35 auto ammo.
+ .desc = Pla-ket-ket-ket-ket! Uses .35 auto ammo. An illegal firearm often used by Syndicate agents.
ent-WeaponSubMachineGunC20r = C-20r sub machine gun
- .desc = A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo.
+ .desc = An illegal firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo.
ent-WeaponSubMachineGunDrozd = Drozd
- .desc = An excellent fully automatic Heavy SMG.
+ .desc = An excellent fully automatic Heavy SMG. An illegal firearm often used by Syndicate agents.
ent-WeaponSubMachineGunVector = Vector
- .desc = An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
+ .desc = An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. An illegal firearm often used by Syndicate agents.
.suffix = Deprecated use Drozd
ent-WeaponSubMachineGunWt550 = WT550
- .desc = An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo.
-ent-WeaponSubMachineGunDrozdRubber = Drozd
- .suffix = Non-Lethal
- .desc = { ent-WeaponSubMachineGunDrozd.desc }
-ent-WeaponSubMachineGunVectorRubber = Vector
- .desc = An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
- .suffix = Non-Lethal
+ .desc = An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. On the receiver is a label that says 'for authorized use only.'
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/snipers/snipers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/snipers/snipers.ftl
index 3e46069f33b..f5085569382 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/snipers/snipers.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/snipers/snipers.ftl
@@ -1,10 +1,10 @@
ent-BaseWeaponSniper = BaseWeaponSniper
.desc = A rooty tooty point and shooty.
ent-WeaponSniperMosin = Kardashev-Mosin
- .desc = A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo.
+ .desc = A civilian grade weapon for hunting, or endless trench warfare. Uses .30 rifle ammo.
ent-WeaponSniperHristov = Hristov
- .desc = A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo.
+ .desc = A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo. On the receiver is a label that says 'for authorized use only.'
ent-Musket = musket
.desc = This should've been in a museum long before you were born. Uses .60 anti-materiel ammo.
ent-WeaponPistolFlintlock = flintlock pistol
- .desc = A pirate's companion. Yarrr! Uses .60 anti-materiel ammo.
+ .desc = A pirate's companion. Yarrr! Uses .60 anti-materiel ammo. An illegal weapon often used by pirates.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baseball_bat.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baseball_bat.ftl
index 8505dbee00d..8478dfb10d5 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baseball_bat.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baseball_bat.ftl
@@ -1,5 +1,7 @@
ent-BaseBallBat = baseball bat
.desc = A robust baseball bat.
+ent-IncompleteBaseBallBat = incomplete baseball bat
+ .desc = A few planks of wood stuck together.
ent-WeaponMeleeKnockbackStick = knockback stick
.desc = And then he spleefed all over.
.suffix = Do not map
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/cane.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/cane.ftl
new file mode 100644
index 00000000000..a239b29d322
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/cane.ftl
@@ -0,0 +1,10 @@
+ent-Cane = cane
+ .desc = A wooden cane.
+ent-CaneBlade = cane blade
+ .desc = A sharp blade with a cane shaped hilt.
+ent-CaneSheath = { ent-Cane }
+ .suffix = Empty
+ .desc = { ent-Cane.desc }
+ent-CaneSheathFilled = { ent-CaneSheath }
+ .suffix = Filled
+ .desc = { ent-CaneSheath.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/knife.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/knife.ftl
index bdfe742fc53..51999106b1c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/knife.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/knife.ftl
@@ -10,6 +10,11 @@ ent-SurvivalKnife = survival knife
.desc = Weapon of first and last resort for combatting space carp.
ent-KukriKnife = kukri knife
.desc = Professionals have standards. Be polite. Be efficient. Have a plan to kill everyone you meet.
+ent-BladedFlatcapGrey = grey flatcap
+ .desc = Fashionable for both the working class and old man Jenkins. It has glass shards hidden in the brim.
+ .suffix = Bladed
+ent-BladedFlatcapBrown = brown flatcap
+ .desc = Stupid clown! You made me look bad! It has glass shards hidden in the brim.
ent-Shiv = shiv
.desc = A crude weapon fashioned from a piece of cloth and a glass shard.
ent-ReinforcedShiv = reinforced shiv
@@ -18,3 +23,5 @@ ent-PlasmaShiv = plasma shiv
.desc = A crude weapon fashioned from a piece of cloth and a plasma glass shard.
ent-UraniumShiv = uranium shiv
.desc = A crude weapon fashioned from a piece of cloth and a uranium glass shard. Violates the geneva convention!
+ent-ThrowingKnife = throwing knife
+ .desc = This bloodred knife is very aerodynamic and easy to throw, but good luck trying to fight someone hand-to-hand.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl
index 5855dc3a7e2..114c5fa76bd 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl
@@ -1,3 +1,5 @@
+ent-BaseSword = Sword
+ .desc = A sharp sword.
ent-CaptainSabre = captain's sabre
.desc = A ceremonial weapon belonging to the captain of the station.
ent-Katana = katana
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/security.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/security.ftl
index dc924786cf2..0188378163b 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/security.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/security.ftl
@@ -1,7 +1,7 @@
ent-Stunbaton = stun baton
.desc = A stun baton for incapacitating people with. Actively harming with this is considered bad tone.
ent-Truncheon = truncheon
- .desc = A rigid, steel-studded baton, meant to harm.
+ .desc = A rigid, steel-studded baton, meant to harm. On the handle is a label that says 'for authorized use only.'
ent-Flash = flash
.desc = An ultrabright flashbulb with a trigger, which causes the victim to be dazed and lose their eyesight for a moment. Useless when burnt out.
ent-SciFlash = flash
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/grenades.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/grenades.ftl
index 19b93fd54eb..e049d4b5666 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/grenades.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/grenades.ftl
@@ -8,6 +8,8 @@ ent-GrenadeFlashEffect = { "" }
.desc = { "" }
ent-SyndieMiniBomb = syndicate minibomb
.desc = A syndicate-manufactured explosive used to stow destruction and cause chaos.
+ent-SelfDestructSeq = Self Destruct
+ .desc = Go out on your own terms!
ent-SupermatterGrenade = supermatter grenade
.desc = Grenade that simulates delamination of the supermatter engine, pulling things in a heap and exploding after some time.
ent-WhiteholeGrenade = whitehole grenade
@@ -22,5 +24,11 @@ ent-HolyHandGrenade = holy hand grenade
.desc = O Lord, bless this thy hand grenade, that with it thou mayst blow thine enemies to tiny bits, in thy mercy.
ent-SmokeGrenade = smoke grenade
.desc = A tactical grenade that releases a large, long-lasting cloud of smoke when used.
+ent-CleanerGrenade = cleanade
+ .desc = Special grenade for janitors, releasing large cloud of space cleaner foam
ent-TearGasGrenade = tear gas grenade
.desc = A riot control tear gas grenade. Causes irritation, pain and makes you cry your eyes out.
+ent-GrenadeDummy = trick grenade
+ .desc = All the grenade without any of the boom.
+ent-SyndieTrickyBomb = syndicate trickybomb
+ .desc = A syndicate-manufactured explosive used to make an excellent distraction.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/base.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/base.ftl
index 13ab4cf2924..e89548db24d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/base.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/base.ftl
@@ -1,5 +1,7 @@
ent-BaseStation = { "" }
.desc = { "" }
+ent-BaseRandomStation = { "" }
+ .desc = { "" }
ent-BaseStationCargo = { "" }
.desc = { "" }
ent-BaseStationJobsSpawning = { "" }
@@ -24,5 +26,7 @@ ent-BaseStationMagnet = { "" }
.desc = { "" }
ent-BaseStationSiliconLawCrewsimov = { "" }
.desc = { "" }
+ent-BaseStationNews = { "" }
+ .desc = { "" }
ent-BaseStationAllEventsEligible = { "" }
.desc = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/syndicate.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/syndicate.ftl
index c254efea33a..66bbb03279a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/syndicate.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/syndicate.ftl
@@ -1,4 +1,4 @@
ent-BaseStationSyndicate = { "" }
.desc = { "" }
-ent-StandardNukieOutpost = { ent-BaseStationSyndicate }
- .desc = { ent-BaseStationSyndicate.desc }
+ent-StandardNukieOutpost = { ent-BaseStation }
+ .desc = { ent-BaseStation.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/base_structure.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/base_structure.ftl
index 887761c9f3e..d38b843a347 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/base_structure.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/base_structure.ftl
@@ -2,3 +2,5 @@ ent-BaseStructure = { "" }
.desc = { "" }
ent-BaseStructureDynamic = { ent-BaseStructure }
.desc = { ent-BaseStructure.desc }
+ent-StructureWheeled = { "" }
+ .desc = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl
index 489e259ea51..11db93d1afb 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl
@@ -1,5 +1,62 @@
-ent-HospitalCurtains = curtains
+ent-BaseCurtains = curtains
+ .desc = Hides what others shouldn't see.
+ent-HospitalCurtains = { ent-BaseCurtains }
.desc = Contains less than 1% mercury.
+ .suffix = Hospital
ent-HospitalCurtainsOpen = { ent-HospitalCurtains }
- .suffix = Open
+ .suffix = Open, Hospital
.desc = { ent-HospitalCurtains.desc }
+ent-CurtainsBlack = { ent-BaseCurtains }
+ .suffix = Fancy black
+ .desc = { ent-BaseCurtains.desc }
+ent-CurtainsBlackOpen = { ent-CurtainsBlack }
+ .suffix = Open, Fancy black
+ .desc = { ent-CurtainsBlack.desc }
+ent-CurtainsBlue = { ent-BaseCurtains }
+ .suffix = Fancy blue
+ .desc = { ent-BaseCurtains.desc }
+ent-CurtainsBlueOpen = { ent-CurtainsBlue }
+ .suffix = Open, Fancy blue
+ .desc = { ent-CurtainsBlue.desc }
+ent-CurtainsCyan = { ent-BaseCurtains }
+ .suffix = Fancy cyan
+ .desc = { ent-BaseCurtains.desc }
+ent-CurtainsCyanOpen = { ent-CurtainsCyan }
+ .suffix = Open, Fancy cyan
+ .desc = { ent-CurtainsCyan.desc }
+ent-CurtainsGreen = { ent-BaseCurtains }
+ .suffix = Fancy green
+ .desc = { ent-BaseCurtains.desc }
+ent-CurtainsGreenOpen = { ent-CurtainsGreen }
+ .suffix = Open, Fancy green
+ .desc = { ent-CurtainsGreen.desc }
+ent-CurtainsOrange = { ent-BaseCurtains }
+ .suffix = Fancy orange
+ .desc = { ent-BaseCurtains.desc }
+ent-CurtainsOrangeOpen = { ent-CurtainsOrange }
+ .suffix = Open, Fancy orange
+ .desc = { ent-CurtainsOrange.desc }
+ent-CurtainsPink = { ent-BaseCurtains }
+ .suffix = Fancy pink
+ .desc = { ent-BaseCurtains.desc }
+ent-CurtainsPinkOpen = { ent-CurtainsPink }
+ .suffix = Open, Fancy pink
+ .desc = { ent-CurtainsPink.desc }
+ent-CurtainsPurple = { ent-BaseCurtains }
+ .suffix = Fancy purple
+ .desc = { ent-BaseCurtains.desc }
+ent-CurtainsPurpleOpen = { ent-CurtainsPurple }
+ .suffix = Open, Fancy purple
+ .desc = { ent-CurtainsPurple.desc }
+ent-CurtainsRed = { ent-BaseCurtains }
+ .suffix = Fancy red
+ .desc = { ent-BaseCurtains.desc }
+ent-CurtainsRedOpen = { ent-CurtainsRed }
+ .suffix = Open, Fancy red
+ .desc = { ent-CurtainsRed.desc }
+ent-CurtainsWhite = { ent-BaseCurtains }
+ .suffix = Fancy white
+ .desc = { ent-BaseCurtains.desc }
+ent-CurtainsWhiteOpen = { ent-CurtainsWhite }
+ .suffix = Open, Fancy white
+ .desc = { ent-CurtainsWhite.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl
index 12eccdd97c0..cbef0f0f54e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl
@@ -1,30 +1,30 @@
ent-AirlockServiceLocked = { ent-Airlock }
.suffix = Service, Locked
.desc = { ent-Airlock.desc }
-ent-AirlockLawyerLocked = { ent-Airlock }
+ent-AirlockLawyerLocked = { ent-AirlockServiceLocked }
.suffix = Lawyer, Locked
- .desc = { ent-Airlock.desc }
-ent-AirlockTheatreLocked = { ent-Airlock }
+ .desc = { ent-AirlockServiceLocked.desc }
+ent-AirlockTheatreLocked = { ent-AirlockServiceLocked }
.suffix = Theatre, Locked
- .desc = { ent-Airlock.desc }
-ent-AirlockChapelLocked = { ent-Airlock }
+ .desc = { ent-AirlockServiceLocked.desc }
+ent-AirlockChapelLocked = { ent-AirlockServiceLocked }
.suffix = Chapel, Locked
- .desc = { ent-Airlock.desc }
-ent-AirlockJanitorLocked = { ent-Airlock }
+ .desc = { ent-AirlockServiceLocked.desc }
+ent-AirlockJanitorLocked = { ent-AirlockServiceLocked }
.suffix = Janitor, Locked
- .desc = { ent-Airlock.desc }
-ent-AirlockKitchenLocked = { ent-Airlock }
+ .desc = { ent-AirlockServiceLocked.desc }
+ent-AirlockKitchenLocked = { ent-AirlockServiceLocked }
.suffix = Kitchen, Locked
- .desc = { ent-Airlock.desc }
-ent-AirlockBarLocked = { ent-Airlock }
+ .desc = { ent-AirlockServiceLocked.desc }
+ent-AirlockBarLocked = { ent-AirlockServiceLocked }
.suffix = Bar, Locked
- .desc = { ent-Airlock.desc }
-ent-AirlockHydroponicsLocked = { ent-Airlock }
+ .desc = { ent-AirlockServiceLocked.desc }
+ent-AirlockHydroponicsLocked = { ent-AirlockServiceLocked }
.suffix = Hydroponics, Locked
- .desc = { ent-Airlock.desc }
-ent-AirlockServiceCaptainLocked = { ent-Airlock }
+ .desc = { ent-AirlockServiceLocked.desc }
+ent-AirlockServiceCaptainLocked = { ent-AirlockCommandLocked }
.suffix = Captain, Locked
- .desc = { ent-Airlock.desc }
+ .desc = { ent-AirlockCommandLocked.desc }
ent-AirlockExternalLocked = { ent-AirlockExternal }
.suffix = External, Locked
.desc = { ent-AirlockExternal.desc }
@@ -76,6 +76,9 @@ ent-AirlockVirologyLocked = { ent-AirlockVirology }
ent-AirlockChemistryLocked = { ent-AirlockChemistry }
.suffix = Chemistry, Locked
.desc = { ent-AirlockChemistry.desc }
+ent-AirlockMedicalMorgueLocked = { ent-AirlockMedical }
+ .suffix = Morgue, Locked
+ .desc = { ent-AirlockMedical.desc }
ent-AirlockScienceLocked = { ent-AirlockScience }
.suffix = Science, Locked
.desc = { ent-AirlockScience.desc }
@@ -133,12 +136,12 @@ ent-AirlockEVALocked = { ent-AirlockCommand }
ent-AirlockServiceGlassLocked = { ent-AirlockGlass }
.suffix = Service, Locked
.desc = { ent-AirlockGlass.desc }
-ent-AirlockLawyerGlassLocked = { ent-AirlockGlass }
+ent-AirlockLawyerGlassLocked = { ent-AirlockServiceGlassLocked }
.suffix = Lawyer, Locked
- .desc = { ent-AirlockGlass.desc }
-ent-AirlockTheatreGlassLocked = { ent-AirlockGlass }
+ .desc = { ent-AirlockServiceGlassLocked.desc }
+ent-AirlockTheatreGlassLocked = { ent-AirlockServiceGlassLocked }
.suffix = Theatre, Locked
- .desc = { ent-AirlockGlass.desc }
+ .desc = { ent-AirlockServiceGlassLocked.desc }
ent-AirlockBarGlassLocked = { ent-AirlockGlass }
.suffix = Bar, Locked
.desc = { ent-AirlockGlass.desc }
@@ -160,18 +163,18 @@ ent-AirlockExternalGlassEngineeringLocked = { ent-AirlockExternalGlass }
ent-AirlockExternalGlassAtmosphericsLocked = { ent-AirlockExternalGlass }
.suffix = External, Glass, Atmospherics, Locked
.desc = { ent-AirlockExternalGlass.desc }
-ent-AirlockKitchenGlassLocked = { ent-AirlockGlass }
+ent-AirlockKitchenGlassLocked = { ent-AirlockServiceGlassLocked }
.suffix = Kitchen, Locked
- .desc = { ent-AirlockGlass.desc }
-ent-AirlockJanitorGlassLocked = { ent-AirlockGlass }
+ .desc = { ent-AirlockServiceGlassLocked.desc }
+ent-AirlockJanitorGlassLocked = { ent-AirlockServiceGlassLocked }
.suffix = Janitor, Locked
- .desc = { ent-AirlockGlass.desc }
-ent-AirlockHydroGlassLocked = { ent-AirlockGlass }
+ .desc = { ent-AirlockServiceGlassLocked.desc }
+ent-AirlockHydroGlassLocked = { ent-AirlockServiceGlassLocked }
.suffix = Hydroponics, Locked
- .desc = { ent-AirlockGlass.desc }
-ent-AirlockChapelGlassLocked = { ent-AirlockGlass }
+ .desc = { ent-AirlockServiceGlassLocked.desc }
+ent-AirlockChapelGlassLocked = { ent-AirlockServiceGlassLocked }
.suffix = Chapel, Locked
- .desc = { ent-AirlockGlass.desc }
+ .desc = { ent-AirlockServiceGlassLocked.desc }
ent-AirlockEngineeringGlassLocked = { ent-AirlockEngineeringGlass }
.suffix = Engineering, Locked
.desc = { ent-AirlockEngineeringGlass.desc }
@@ -277,69 +280,72 @@ ent-AirlockMaintEngiLocked = { ent-AirlockMaint }
ent-AirlockMaintAtmoLocked = { ent-AirlockMaint }
.suffix = Atmospherics, Locked
.desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintBarLocked = { ent-AirlockMaint }
+ent-AirlockMaintBarLocked = { ent-AirlockMaintServiceLocked }
.suffix = Bar, Locked
- .desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintChapelLocked = { ent-AirlockMaint }
+ .desc = { ent-AirlockMaintServiceLocked.desc }
+ent-AirlockMaintChapelLocked = { ent-AirlockMaintServiceLocked }
.suffix = Chapel, Locked
- .desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintHydroLocked = { ent-AirlockMaint }
+ .desc = { ent-AirlockMaintServiceLocked.desc }
+ent-AirlockMaintHydroLocked = { ent-AirlockMaintServiceLocked }
.suffix = Hydroponics, Locked
- .desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintJanitorLocked = { ent-AirlockMaint }
+ .desc = { ent-AirlockMaintServiceLocked.desc }
+ent-AirlockMaintJanitorLocked = { ent-AirlockMaintServiceLocked }
.suffix = Janitor, Locked
- .desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintLawyerLocked = { ent-AirlockMaint }
+ .desc = { ent-AirlockMaintServiceLocked.desc }
+ent-AirlockMaintLawyerLocked = { ent-AirlockMaintServiceLocked }
.suffix = Lawyer, Locked
- .desc = { ent-AirlockMaint.desc }
+ .desc = { ent-AirlockMaintServiceLocked.desc }
ent-AirlockMaintServiceLocked = { ent-AirlockMaint }
.suffix = Service, Locked
.desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintTheatreLocked = { ent-AirlockMaint }
+ent-AirlockMaintTheatreLocked = { ent-AirlockMaintServiceLocked }
.suffix = Theatre, Locked
- .desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintKitchenLocked = { ent-AirlockMaint }
+ .desc = { ent-AirlockMaintServiceLocked.desc }
+ent-AirlockMaintKitchenLocked = { ent-AirlockMaintServiceLocked }
.suffix = Kitchen, Locked
- .desc = { ent-AirlockMaint.desc }
+ .desc = { ent-AirlockMaintServiceLocked.desc }
ent-AirlockMaintIntLocked = { ent-AirlockMaint }
.suffix = Interior, Locked
.desc = { ent-AirlockMaint.desc }
ent-AirlockMaintMedLocked = { ent-AirlockMaint }
.suffix = Medical, Locked
.desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintChemLocked = { ent-AirlockMaint }
+ent-AirlockMaintChemLocked = { ent-AirlockMaintMedLocked }
.suffix = Chemistry, Locked
- .desc = { ent-AirlockMaint.desc }
+ .desc = { ent-AirlockMaintMedLocked.desc }
ent-AirlockMaintRnDLocked = { ent-AirlockMaint }
.suffix = Science, Locked
.desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintRnDMedLocked = { ent-AirlockMaint }
+ent-AirlockMaintRnDMedLocked = { ent-AirlockMaintRnDLocked }
.suffix = Medical/Science, Locked
- .desc = { ent-AirlockMaint.desc }
+ .desc = { ent-AirlockMaintRnDLocked.desc }
ent-AirlockMaintSecLocked = { ent-AirlockMaint }
.suffix = Security, Locked
.desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintDetectiveLocked = { ent-AirlockMaint }
+ent-AirlockMaintDetectiveLocked = { ent-AirlockMaintSecLocked }
.suffix = Detective, Locked
- .desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintHOPLocked = { ent-AirlockMaint }
+ .desc = { ent-AirlockMaintSecLocked.desc }
+ent-AirlockMaintHOPLocked = { ent-AirlockMaintCommandLocked }
.suffix = HeadOfPersonnel, Locked
- .desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintCaptainLocked = { ent-AirlockMaint }
+ .desc = { ent-AirlockMaintCommandLocked.desc }
+ent-AirlockMaintCaptainLocked = { ent-AirlockMaintCommandLocked }
.suffix = Captain, Locked
- .desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintChiefEngineerLocked = { ent-AirlockMaint }
+ .desc = { ent-AirlockMaintCommandLocked.desc }
+ent-AirlockMaintChiefEngineerLocked = { ent-AirlockMaintCommandLocked }
.suffix = ChiefEngineer, Locked
- .desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintChiefMedicalOfficerLocked = { ent-AirlockMaint }
+ .desc = { ent-AirlockMaintCommandLocked.desc }
+ent-AirlockMaintChiefMedicalOfficerLocked = { ent-AirlockMaintCommandLocked }
.suffix = ChiefMedicalOfficer, Locked
- .desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintHeadOfSecurityLocked = { ent-AirlockMaint }
+ .desc = { ent-AirlockMaintCommandLocked.desc }
+ent-AirlockMaintHeadOfSecurityLocked = { ent-AirlockMaintCommandLocked }
.suffix = HeadOfSecurity, Locked
- .desc = { ent-AirlockMaint.desc }
-ent-AirlockMaintResearchDirectorLocked = { ent-AirlockMaint }
+ .desc = { ent-AirlockMaintCommandLocked.desc }
+ent-AirlockMaintResearchDirectorLocked = { ent-AirlockMaintCommandLocked }
.suffix = ResearchDirector, Locked
- .desc = { ent-AirlockMaint.desc }
+ .desc = { ent-AirlockMaintCommandLocked.desc }
+ent-AirlockMaintQuartermasterLocked = { ent-AirlockMaintCommandLocked }
+ .suffix = Quartermaster, Locked
+ .desc = { ent-AirlockMaintCommandLocked.desc }
ent-AirlockMaintArmoryLocked = { ent-AirlockMaint }
.suffix = Armory, Locked
.desc = { ent-AirlockMaint.desc }
@@ -388,3 +394,6 @@ ent-HighSecCaptainLocked = { ent-HighSecDoor }
ent-HighSecArmoryLocked = { ent-HighSecDoor }
.suffix = Armory, Locked
.desc = { ent-HighSecDoor.desc }
+ent-AirlockHatchSyndicate = { ent-AirlockHatch }
+ .suffix = Syndicate, Locked
+ .desc = { ent-AirlockHatch.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl
index 23386679bb2..8a74f6731c0 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl
@@ -43,8 +43,6 @@ ent-AirlockHatch = airtight hatch
.desc = { ent-Airlock.desc }
ent-AirlockHatchMaintenance = maintenance hatch
.desc = { ent-Airlock.desc }
-ent-AirlockGlass = glass airlock
- .desc = { ent-Airlock.desc }
ent-AirlockEngineeringGlass = { ent-AirlockGlass }
.suffix = Engineering
.desc = { ent-AirlockGlass.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl
index 6f504d1ae74..79006936b3c 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl
@@ -10,6 +10,12 @@ ent-AirlockAssemblyCargo = { ent-AirlockAssembly }
ent-AirlockAssemblyCargoGlass = { ent-AirlockAssembly }
.suffix = Cargo, Glass
.desc = { ent-AirlockAssembly.desc }
+ent-PinionAirlockAssembly = airlock assembly
+ .suffix = Pinion, Clockwork
+ .desc = { ent-AirlockAssembly.desc }
+ent-PinionAirlockAssemblyGlass = { ent-PinionAirlockAssembly }
+ .suffix = Pinion, Clockwork, Glass
+ .desc = { ent-PinionAirlockAssembly.desc }
ent-AirlockAssemblyCommand = { ent-AirlockAssembly }
.suffix = Command
.desc = { ent-AirlockAssembly.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/base_structureairlocks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/base_structureairlocks.ftl
index 81876b6d6a1..75fe77ca9fa 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/base_structureairlocks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/base_structureairlocks.ftl
@@ -1,2 +1,6 @@
ent-Airlock = airlock
.desc = It opens, it closes, and maybe crushes you.
+ent-AirlockRCDResistant = { ent-Airlock }
+ .desc = { ent-Airlock.desc }
+ent-AirlockGlass = glass airlock
+ .desc = { ent-Airlock.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/external.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/external.ftl
index 290aedf2c55..8442c07603d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/external.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/external.ftl
@@ -1,4 +1,4 @@
-ent-AirlockExternal = { ent-Airlock }
+ent-AirlockExternal = { ent-AirlockRCDResistant }
.desc = It opens, it closes, it might crush you, and there might be only space behind it.
.suffix = External
ent-AirlockExternalGlass = { ent-AirlockExternal }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/firelocks/firelock.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/firelocks/firelock.ftl
index 13da64766c0..35edb82e4b0 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/firelocks/firelock.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/firelocks/firelock.ftl
@@ -5,4 +5,4 @@ ent-Firelock = { ent-BaseFirelock }
ent-FirelockGlass = glass firelock
.desc = { ent-Firelock.desc }
ent-FirelockEdge = firelock
- .desc = { ent-BaseFirelock.desc }
+ .desc = { ent-Firelock.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/shutter/blast_door_autolink.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/shutter/blast_door_autolink.ftl
index 1a01017f5e7..27bf0dfbc36 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/shutter/blast_door_autolink.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/shutter/blast_door_autolink.ftl
@@ -22,6 +22,18 @@ ent-BlastDoorBridge = { ent-BlastDoor }
ent-BlastDoorBridgeOpen = { ent-BlastDoorOpen }
.suffix = Open, Autolink, Bridge
.desc = { ent-BlastDoorOpen.desc }
+ent-BlastDoorEngineering = { ent-BlastDoor }
+ .suffix = Autolink, Engineering
+ .desc = { ent-BlastDoor.desc }
+ent-BlastDoorEngineeringOpen = { ent-BlastDoorOpen }
+ .suffix = Open, Autolink, Engineering
+ .desc = { ent-BlastDoorOpen.desc }
+ent-BlastDoorScience = { ent-BlastDoor }
+ .suffix = Autolink, Science
+ .desc = { ent-BlastDoor.desc }
+ent-BlastDoorScienceOpen = { ent-BlastDoorOpen }
+ .suffix = Open, Autolink, Science
+ .desc = { ent-BlastDoorOpen.desc }
ent-BlastDoorWindows = { ent-BlastDoor }
.suffix = Autolink, Windows
.desc = { ent-BlastDoor.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl
index dd66375a0a2..32688b7b8b0 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl
@@ -2,3 +2,13 @@ ent-WindoorAssembly = windoor assembly
.desc = It opens, it closes, and you can see through it!
ent-WindoorAssemblySecure = secure windoor assembly
.desc = It opens, it closes, and you can see through it! This one looks tough.
+ent-WindoorAssemblyClockwork = clockwork windoor assembly
+ .desc = It opens, it closes, and you can see through it! This one looks tough.
+ent-WindoorAssemblyPlasma = Plasma windoor assembly
+ .desc = It opens, it closes, and you can see through it! This one looks purp-, no, pink. Wait...
+ent-WindoorAssemblySecurePlasma = Secure Plasma windoor assembly
+ .desc = It opens, it closes, and you can see through it! This one looks strong and pin-, no, purple. Hold on...
+ent-WindoorAssemblyUranium = Uranium windoor assembly
+ .desc = It opens, it closes, and you can see through it! This one looks sickly green...
+ent-WindoorAssemblySecureUranium = Secure Uranium windoor assembly
+ .desc = It opens, it closes, and you can see through it! This one looks strong and radioactive-lime-green!
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/base_structurewindoors.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/base_structurewindoors.ftl
index 2f603687029..8ac8ffb04d7 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/base_structurewindoors.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/base_structurewindoors.ftl
@@ -2,3 +2,11 @@ ent-BaseWindoor = { ent-BaseStructure }
.desc = { ent-BaseStructure.desc }
ent-BaseSecureWindoor = { ent-BaseWindoor }
.desc = { ent-BaseWindoor.desc }
+ent-BasePlasmaWindoor = { ent-BaseWindoor }
+ .desc = { ent-BaseWindoor.desc }
+ent-BaseSecurePlasmaWindoor = { ent-BaseWindoor }
+ .desc = { ent-BaseWindoor.desc }
+ent-BaseUraniumWindoor = { ent-BaseWindoor }
+ .desc = { ent-BaseWindoor.desc }
+ent-BaseSecureUraniumWindoor = { ent-BaseWindoor }
+ .desc = { ent-BaseWindoor.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl
index 506f57542be..a16f26c8acb 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl
@@ -1,7 +1,17 @@
-ent-Windoor = windoor
+ent-Windoor = Windoor
.desc = It's a window and a sliding door. Wow!
-ent-WindoorSecure = secure windoor
+ent-WindoorSecure = Secure Windoor
.desc = It's a sturdy window and a sliding door. Wow!
+ent-WindoorClockwork = clockwork windoor
+ .desc = It's a sturdy window and a sliding door. Wow!
+ent-WindoorPlasma = Plasma Windoor
+ .desc = It's a pink window *and* a sliding door. Amazing!
+ent-WindoorSecurePlasma = Secure Plasma Windoor
+ .desc = It's a sturdy purple window *and* a sliding door. Spectacular!
+ent-WindoorUranium = Uranium Windoor
+ .desc = It's a window and a sliding door. Huh? Oh, and it's green!
+ent-WindoorSecureUranium = Secure Uranium Windoor
+ .desc = It's a sturdy window and a sliding door. It's so neon green, it might even taste like limes!
ent-WindoorBarLocked = { ent-Windoor }
.suffix = Bar, Locked
.desc = { ent-Windoor.desc }
@@ -20,6 +30,9 @@ ent-WindoorHydroponicsLocked = { ent-Windoor }
ent-WindoorJanitorLocked = { ent-Windoor }
.suffix = Janitor, Locked
.desc = { ent-Windoor.desc }
+ent-PlasmaWindoorJanitorLocked = { ent-WindoorPlasma }
+ .suffix = Janitor, Locked, Plasma
+ .desc = { ent-WindoorPlasma.desc }
ent-WindoorKitchenLocked = { ent-Windoor }
.suffix = Kitchen, Locked
.desc = { ent-Windoor.desc }
@@ -35,9 +48,15 @@ ent-WindoorTheatreLocked = { ent-Windoor }
ent-WindoorSecureArmoryLocked = { ent-WindoorSecureSecurityLocked }
.suffix = Armory, Locked
.desc = { ent-WindoorSecureSecurityLocked.desc }
+ent-PlasmaWindoorSecureArmoryLocked = { ent-WindoorSecurePlasma }
+ .suffix = Armory, Locked, Plasma
+ .desc = { ent-WindoorSecurePlasma.desc }
ent-WindoorSecureAtmosphericsLocked = { ent-WindoorSecure }
.suffix = Atmospherics, Locked
.desc = { ent-WindoorSecure.desc }
+ent-PlasmaWindoorSecureAtmosphericsLocked = { ent-WindoorSecurePlasma }
+ .suffix = Atmospherics, Locked, Plasma
+ .desc = { ent-WindoorSecurePlasma.desc }
ent-WindoorSecureBarLocked = { ent-WindoorSecure }
.suffix = Bar, Locked
.desc = { ent-WindoorSecure.desc }
@@ -53,24 +72,45 @@ ent-WindoorSecureChapelLocked = { ent-WindoorSecure }
ent-WindoorSecureChemistryLocked = { ent-WindoorSecure }
.suffix = Chemistry, Locked
.desc = { ent-WindoorSecure.desc }
+ent-PlasmaWindoorSecureChemistryLocked = { ent-WindoorSecurePlasma }
+ .suffix = Chemistry, Locked, Plasma
+ .desc = { ent-WindoorSecurePlasma.desc }
ent-WindoorSecureCentralCommandLocked = { ent-WindoorSecure }
.suffix = Central Command, Locked
.desc = { ent-WindoorSecure.desc }
+ent-PlasmaWindoorSecureCentralCommandLocked = { ent-WindoorSecurePlasma }
+ .suffix = Central Command, Locked, Plasma
+ .desc = { ent-WindoorSecurePlasma.desc }
+ent-UraniumWindoorSecureCentralCommandLocked = { ent-WindoorSecureUranium }
+ .suffix = Central Command, Locked, Uranium
+ .desc = { ent-WindoorSecureUranium.desc }
ent-WindoorSecureCommandLocked = { ent-WindoorSecure }
.suffix = Command, Locked
.desc = { ent-WindoorSecure.desc }
+ent-PlasmaWindoorSecureCommandLocked = { ent-WindoorSecurePlasma }
+ .suffix = Command, Locked, Plasma
+ .desc = { ent-WindoorSecurePlasma.desc }
ent-WindoorSecureDetectiveLocked = { ent-WindoorSecure }
.suffix = Detective, Locked
.desc = { ent-WindoorSecure.desc }
ent-WindoorSecureEngineeringLocked = { ent-WindoorSecure }
.suffix = Engineering, Locked
.desc = { ent-WindoorSecure.desc }
+ent-PlasmaWindoorSecureEngineeringLocked = { ent-WindoorSecurePlasma }
+ .suffix = Engineering, Locked, Plasma
+ .desc = { ent-WindoorSecurePlasma.desc }
+ent-UraniumWindoorSecureEngineeringLocked = { ent-WindoorSecureUranium }
+ .suffix = Engineering, Locked, Uranium
+ .desc = { ent-WindoorSecureUranium.desc }
ent-WindoorSecureExternalLocked = { ent-WindoorSecure }
.suffix = External, Locked
.desc = { ent-WindoorSecure.desc }
ent-WindoorSecureJanitorLocked = { ent-WindoorSecure }
.suffix = Janitor, Locked
.desc = { ent-WindoorSecure.desc }
+ent-PlasmaWindoorSecureJanitorLocked = { ent-WindoorSecurePlasma }
+ .suffix = Janitor, Locked, Plasma
+ .desc = { ent-WindoorSecurePlasma.desc }
ent-WindoorSecureKitchenLocked = { ent-WindoorSecure }
.suffix = Kitchen, Locked
.desc = { ent-WindoorSecure.desc }
@@ -86,9 +126,15 @@ ent-WindoorSecureSalvageLocked = { ent-WindoorSecure }
ent-WindoorSecureSecurityLocked = { ent-WindoorSecure }
.suffix = Security, Locked
.desc = { ent-WindoorSecure.desc }
+ent-PlasmaWindoorSecureSecurityLocked = { ent-WindoorSecurePlasma }
+ .suffix = Security, Locked, Plasma
+ .desc = { ent-WindoorSecurePlasma.desc }
ent-WindoorSecureScienceLocked = { ent-WindoorSecure }
.suffix = Science, Locked
.desc = { ent-WindoorSecure.desc }
+ent-PlasmaWindoorSecureScienceLocked = { ent-WindoorSecurePlasma }
+ .suffix = Science, Locked, Plasma
+ .desc = { ent-WindoorSecurePlasma.desc }
ent-WindoorSecureServiceLocked = { ent-WindoorSecure }
.suffix = Service, Locked
.desc = { ent-WindoorSecure.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/carpets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/carpets.ftl
index 4cc5f36a43c..071234044f7 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/carpets.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/carpets.ftl
@@ -1,20 +1,34 @@
-ent-CarpetBase = { ent-BaseStructure }
+ent-CarpetBase = carpet
.desc = Fancy walking surface.
-ent-Carpet = red carpet
+ent-Carpet = { ent-CarpetBase }
+ .suffix = Red
.desc = { ent-CarpetBase.desc }
-ent-CarpetBlack = black carpet
+ent-CarpetBlack = { ent-CarpetBase }
+ .suffix = Black
.desc = { ent-CarpetBase.desc }
-ent-CarpetPink = pink carpet
+ent-CarpetPink = { ent-CarpetBase }
+ .suffix = Pink
.desc = { ent-CarpetBase.desc }
-ent-CarpetBlue = blue carpet
+ent-CarpetBlue = { ent-CarpetBase }
+ .suffix = Blue
.desc = { ent-CarpetBase.desc }
-ent-CarpetGreen = green carpet
+ent-CarpetGreen = { ent-CarpetBase }
+ .suffix = Green
.desc = { ent-CarpetBase.desc }
-ent-CarpetOrange = orange carpet
+ent-CarpetOrange = { ent-CarpetBase }
+ .suffix = Orange
.desc = { ent-CarpetBase.desc }
-ent-CarpetSBlue = skyblue carpet
+ent-CarpetSBlue = { ent-CarpetBase }
+ .suffix = Sky Blue
.desc = { ent-CarpetBase.desc }
-ent-CarpetPurple = purple carpet
+ent-CarpetPurple = { ent-CarpetBase }
+ .suffix = Purple
+ .desc = { ent-CarpetBase.desc }
+ent-CarpetCyan = { ent-CarpetBase }
+ .suffix = Cyan
+ .desc = { ent-CarpetBase.desc }
+ent-CarpetWhite = { ent-CarpetBase }
+ .suffix = White
.desc = { ent-CarpetBase.desc }
ent-CarpetChapel = chapel's carpet
.desc = { ent-BaseStructure.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl
index 53a70b965c6..e301b8ea45a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl
@@ -1,16 +1,26 @@
ent-SeatBase = chair
.desc = You sit in this. Either by will or force.
-ent-Chair = chair
+ent-UnanchoredChairBase = chair
.desc = { ent-SeatBase.desc }
+ent-ChairBase = chair
+ .desc = { ent-UnanchoredChairBase.desc }
+ent-OfficeChairBase = chair
+ .desc = { ent-UnanchoredChairBase.desc }
+ent-StoolBase = stool
+ .desc = { ent-OfficeChairBase.desc }
+ent-Chair = chair
+ .desc = { ent-ChairBase.desc }
ent-ChairGreyscale = chair
.suffix = White
.desc = { ent-Chair.desc }
ent-Stool = stool
.desc = Apply butt.
ent-StoolBar = bar stool
- .desc = { ent-SeatBase.desc }
+ .desc = { ent-StoolBase.desc }
+ent-ChairBrass = brass chair
+ .desc = { ent-StoolBase.desc }
ent-ChairOfficeLight = white office chair
- .desc = { ent-SeatBase.desc }
+ .desc = { ent-OfficeChairBase.desc }
ent-ChairOfficeDark = dark office chair
.desc = { ent-ChairOfficeLight.desc }
ent-ComfyChair = comfy chair
@@ -18,7 +28,7 @@ ent-ComfyChair = comfy chair
ent-ChairPilotSeat = pilot seat
.desc = The pilot seat of a prestigious ship.
ent-ChairWood = wooden chair
- .desc = { ent-SeatBase.desc }
+ .desc = { ent-UnanchoredChairBase.desc }
ent-ChairRitual = ritual chair
.desc = Looks uncomfortable.
ent-ChairMeat = meat chair
@@ -34,3 +44,5 @@ ent-ChairFoldingSpawnFolded = { ent-ChairFolding }
.desc = { ent-ChairFolding.desc }
ent-SteelBench = steel bench
.desc = A long chair made for a metro. Really standard design.
+ent-WoodenBench = wooden bench
+ .desc = Did you get a splinter? Well, at least it’s eco friendly.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl
index 13493bad67b..62e1a17186a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl
@@ -14,6 +14,8 @@ ent-TableReinforcedGlass = reinforced glass table
.desc = A square piece of glass, standing on four metal legs. Extra robust.
ent-TablePlasmaGlass = plasma glass table
.desc = A square piece of plasma glass, standing on four metal legs. Pretty!
+ent-TableBrass = brass table
+ .desc = A shiny, corrosion resistant brass table. Steampunk!
ent-TableWood = wood table
.desc = Do not apply fire to this. Rumour says it burns easily.
ent-TableCarpet = gambling table
@@ -22,6 +24,35 @@ ent-TableStone = stone table
.desc = Literally the sturdiest thing you have ever seen.
ent-TableWeb = web table
.desc = Really smooth and surprisingly durable.
+ent-TableFancyBase = fancy table
+ .desc = Expensive and rich.
+ent-TableFancyBlue = { ent-TableFancyBase }
+ .suffix = Blue
+ .desc = { ent-TableFancyBase.desc }
+ent-TableFancyCyan = { ent-TableFancyBase }
+ .suffix = Cyan
+ .desc = { ent-TableFancyBase.desc }
+ent-TableFancyBlack = { ent-TableFancyBase }
+ .suffix = Black
+ .desc = { ent-TableFancyBase.desc }
+ent-TableFancyRed = { ent-TableFancyBase }
+ .suffix = Red
+ .desc = { ent-TableFancyBase.desc }
+ent-TableFancyPurple = { ent-TableFancyBase }
+ .suffix = Purple
+ .desc = { ent-TableFancyBase.desc }
+ent-TableFancyPink = { ent-TableFancyBase }
+ .suffix = Pink
+ .desc = { ent-TableFancyBase.desc }
+ent-TableFancyGreen = { ent-TableFancyBase }
+ .suffix = Green
+ .desc = { ent-TableFancyBase.desc }
+ent-TableFancyOrange = { ent-TableFancyBase }
+ .suffix = Orange
+ .desc = { ent-TableFancyBase.desc }
+ent-TableFancyWhite = { ent-TableFancyBase }
+ .suffix = White
+ .desc = { ent-TableFancyBase.desc }
ent-TableDebug = table
.desc = PUT ON THEM CODERSOCKS!!
.suffix = DEBUG
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/base_lighting.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/base_lighting.ftl
index 3573700e69a..71241f2630a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/base_lighting.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/base_lighting.ftl
@@ -30,6 +30,9 @@ ent-SmallLight = small light
ent-PoweredSmallLightEmpty = small light
.desc = A light fixture. Draws power and produces light when equipped with a light bulb.
.suffix = Empty
+ent-PoweredLEDSmallLight = { ent-PoweredSmallLightEmpty }
+ .suffix = LED
+ .desc = { ent-PoweredSmallLightEmpty.desc }
ent-PoweredSmallLight = { ent-PoweredSmallLightEmpty }
.desc = { ent-PoweredSmallLightEmpty.desc }
ent-EmergencyLight = emergency light
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl
index eadfe948e08..48d6fe24073 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl
@@ -1,5 +1,3 @@
-ent-BaseLightStructure = { ent-BaseStructure }
- .desc = { ent-BaseStructure.desc }
ent-LightPostSmall = post light
.desc = An always powered light.
.suffix = Always Powered
@@ -8,3 +6,6 @@ ent-PoweredLightPostSmallEmpty = post light
.suffix = Empty
ent-PoweredLightPostSmall = post light
.desc = A light fixture. Draws power and produces light when equipped with a light tube.
+ent-PoweredLEDLightPostSmall = post light
+ .desc = A light fixture. Draws power and produces light when equipped with a light tube.
+ .suffix = LED
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/strobe_lighting.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/strobe_lighting.ftl
new file mode 100644
index 00000000000..37287a2d03a
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/strobe_lighting.ftl
@@ -0,0 +1,15 @@
+ent-AlwaysPoweredStrobeLight = strobe
+ .desc = UH?! Sorry, all I can hear is WEE-OOO-WEE-OOO!
+ .suffix = Always powered
+ent-PoweredStrobeLightEmpty = strobe
+ .desc = UH?! Sorry, all I can hear is WEE-OOO-WEE-OOO!
+ .suffix = Empty
+ent-PoweredStrobeLightPolice = { ent-PoweredStrobeLightEmpty }
+ .suffix = Empty, police
+ .desc = { ent-PoweredStrobeLightEmpty.desc }
+ent-PoweredStrobeLightSiren = { ent-PoweredStrobeLightEmpty }
+ .suffix = Empty, siren
+ .desc = { ent-PoweredStrobeLightEmpty.desc }
+ent-PoweredStrobeLightEpsilon = { ent-PoweredStrobeLightEmpty }
+ .suffix = Empty, epsilon
+ .desc = { ent-PoweredStrobeLightEmpty.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl
index 1ebf2cf3cec..9e91ddba3d5 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl
@@ -1,6 +1,4 @@
ent-MachineArtifactAnalyzer = artifact analyzer
.desc = A platform capable of performing analysis on various types of artifacts.
-ent-MachineTraversalDistorter = traversal distorter
- .desc = A machine capable of distorting the traversal of artifact nodes.
ent-MachineArtifactCrusher = artifact crusher
.desc = Best not to let your fingers get stuck...
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/bombs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/bombs.ftl
index 4467506500d..d60f5b425b2 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/bombs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/bombs.ftl
@@ -4,6 +4,9 @@ ent-TrainingBomb = training bomb
.desc = A bomb for dummies, manual not included.
ent-SyndicateBomb = syndicate bomb
.desc = A bomb for Syndicate operatives and agents alike. The real deal, no more training, get to it!
+ent-SyndicateBombFake = { ent-SyndicateBomb }
+ .suffix = fake
+ .desc = { ent-SyndicateBomb.desc }
ent-DebugHardBomb = debug bomb
.desc = Holy shit this is gonna explode
.suffix = DEBUG
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 f124a1b87ba..58e8342c3d5 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
@@ -61,7 +61,7 @@ ent-ComputerSurveillanceWirelessCameraMonitor = wireless camera monitor
.desc = A wireless surveillance camera monitor. You're watching them. Maybe.
ent-ComputerPalletConsole = cargo sale computer
.desc = Used to sell goods loaded onto cargo pallets
-ent-ComputerMassMedia = mass-media console
+ent-ComputerMassMedia = news manager console
.desc = Write your message to the world!
ent-ComputerSensorMonitoring = sensor monitoring computer
.desc = A flexible console for monitoring all kinds of sensors.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/hotplate.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/hotplate.ftl
index 949a45f68d2..4b3ed1c878d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/hotplate.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/hotplate.ftl
@@ -1,4 +1,4 @@
-ent-BaseHeaterMachine = { ent-BaseMachinePowered }
- .desc = { ent-BaseMachinePowered.desc }
+ent-BaseHeaterMachine = { ent-ConstructibleMachine }
+ .desc = { ent-ConstructibleMachine.desc }
ent-ChemistryHotplate = hotplate
- .desc = The descendent of the microwaves, our newest invention in beaker heating technology: the hotplate!
\ No newline at end of file
+ .desc = The descendent of the microwaves, our newest invention in beaker heating technology: the hotplate!
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/jukebox.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/jukebox.ftl
new file mode 100644
index 00000000000..e3d907539f4
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/jukebox.ftl
@@ -0,0 +1,2 @@
+ent-Jukebox = jukebox
+ .desc = A machine capable of playing a wide variety of tunes. Enjoyment not guaranteed.
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 a50044a5b72..80ddb64fff9 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
@@ -1,7 +1,7 @@
ent-BaseLathe = lathe
.desc = { ent-ConstructibleMachine.desc }
ent-Autolathe = autolathe
- .desc = It produces items using metal and glass.
+ .desc = It produces basic items using metal and glass.
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
@@ -10,6 +10,8 @@ ent-ProtolatheHyperConvection = hyper convection protolathe
.desc = A highly-experimental protolathe that harnesses the power of extreme heat to slowly create objects more cost-effectively.
ent-CircuitImprinter = circuit imprinter
.desc = Prints circuit boards for machines.
+ent-CircuitImprinterHyperConvection = hyper convection circuit imprinter
+ .desc = A highly-experimental circuit imprinter that harnesses the power of extreme heat to slowly create objects more cost-effectively.
ent-ExosuitFabricator = exosuit fabricator
.desc = Creates parts for robotics and other mechanical needs
ent-Biofabricator = biofabricator
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/medical/chemistry_machines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/medical/chemistry_machines.ftl
index 468cab28e7e..961170bd75f 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/medical/chemistry_machines.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/medical/chemistry_machines.ftl
@@ -1,5 +1,5 @@
ent-BaseTabletopChemicalMachine = { ent-BaseMachinePowered }
- .desc = { ent-BaseMachinePowered.desc }
+ .desc = { ent-ConstructibleMachine.desc }
ent-MachineElectrolysisUnit = electrolysis unit
.desc = The latest in medicinal electrocution technology.
ent-MachineCentrifuge = tabletop centrifuge
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/nuke.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/nuke.ftl
new file mode 100644
index 00000000000..1968816c7bc
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/nuke.ftl
@@ -0,0 +1,8 @@
+ent-NuclearBomb = nuclear fission explosive
+ .desc = You probably shouldn't stick around to see if this is armed.
+ent-NuclearBombUnanchored = { ent-NuclearBomb }
+ .suffix = unanchored
+ .desc = { ent-NuclearBomb.desc }
+ent-NuclearBombKeg = nuclear fission explosive
+ .desc = You probably shouldn't stick around to see if this is armed. It has a tap on the side.
+ .suffix = keg
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/reagent_grinder.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/reagent_grinder.ftl
index 9cf50ed2aa0..999e504a735 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/reagent_grinder.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/reagent_grinder.ftl
@@ -1,3 +1,5 @@
ent-KitchenReagentGrinder = reagent grinder
.desc = From BlenderTech. Will It Blend? Let's find out!
.suffix = grinder/juicer
+ent-ReagentGrinderIndustrial = industrial reagent grinder
+ .desc = An industrial reagent grinder.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/telecomms.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/telecomms.ftl
index e3341b0b4db..33fee361dbf 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/telecomms.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/telecomms.ftl
@@ -3,3 +3,24 @@ ent-TelecomServer = telecommunication server
ent-TelecomServerFilled = { ent-TelecomServer }
.suffix = Filled, DO NOT MAP
.desc = { ent-TelecomServer.desc }
+ent-TelecomServerFilledCommon = { ent-TelecomServer }
+ .suffix = Common
+ .desc = { ent-TelecomServer.desc }
+ent-TelecomServerFilledCargo = { ent-TelecomServer }
+ .suffix = Cargo
+ .desc = { ent-TelecomServer.desc }
+ent-TelecomServerFilledEngineering = { ent-TelecomServer }
+ .suffix = Engineering
+ .desc = { ent-TelecomServer.desc }
+ent-TelecomServerFilledMedical = { ent-TelecomServer }
+ .suffix = Medical
+ .desc = { ent-TelecomServer.desc }
+ent-TelecomServerFilledScience = { ent-TelecomServer }
+ .suffix = Science
+ .desc = { ent-TelecomServer.desc }
+ent-TelecomServerFilledService = { ent-TelecomServer }
+ .suffix = Service
+ .desc = { ent-TelecomServer.desc }
+ent-TelecomServerFilledCommand = { ent-TelecomServer }
+ .suffix = Command
+ .desc = { ent-TelecomServer.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl
index 98711e23080..cd8a4a0d849 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl
@@ -89,7 +89,7 @@ ent-VendingMachineGames = Good Clean Fun
ent-VendingMachineChang = Mr. Chang
.desc = A self-serving Chinese food machine, for all your Chinese food needs.
ent-VendingMachineSalvage = Salvage Vendor
- .desc = A dwarves best friend!
+ .desc = A dwarf's best friend!
ent-VendingMachineDonut = Monkin' Donuts
.desc = A donut vendor provided by Robust Industries, LLC.
ent-VendingMachineWallmount = vending machine
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/portable.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/portable.ftl
index 55ee5629200..0c27158410e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/portable.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/portable.ftl
@@ -1,2 +1,11 @@
ent-PortableScrubber = portable scrubber
.desc = It scrubs, portably!
+ent-SpaceHeater = space heater
+ .desc = A bluespace technology device that alters local temperature. Commonly referred to as a "Space Heater".
+ .suffix = Unanchored
+ent-SpaceHeaterAnchored = { ent-SpaceHeater }
+ .suffix = Anchored
+ .desc = { ent-SpaceHeater.desc }
+ent-SpaceHeaterEnabled = { ent-SpaceHeaterAnchored }
+ .suffix = Anchored, Enabled
+ .desc = { ent-SpaceHeaterAnchored.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/unary.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/unary.ftl
index 4c903c42722..a7de31338ed 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/unary.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/unary.ftl
@@ -9,7 +9,7 @@ ent-GasVentScrubber = air scrubber
ent-GasOutletInjector = air injector
.desc = Has a valve and pump attached to it.
ent-BaseGasThermoMachine = thermomachine
- .desc = { ent-ConstructibleMachine.desc }
+ .desc = { ent-BaseMachinePowered.desc }
ent-GasThermoMachineFreezer = freezer
.desc = Cools gas in connected pipes.
ent-GasThermoMachineFreezerEnabled = { ent-GasThermoMachineFreezer }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/plastic_flaps.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/plastic_flaps.ftl
index 8bb210e36ec..74f79f883fe 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/plastic_flaps.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/plastic_flaps.ftl
@@ -1,3 +1,5 @@
+ent-PlasticFlapsBase = { ent-BaseStructureDynamic }
+ .desc = { ent-BaseStructureDynamic.desc }
ent-PlasticFlapsClear = plastic flaps
.desc = Heavy duty, plastic flaps. Definitely can't get past those. No way.
.suffix = Clear
@@ -6,7 +8,7 @@ ent-PlasticFlapsOpaque = plastic flaps
.suffix = Opaque
ent-PlasticFlapsAirtightClear = airtight plastic flaps
.desc = Heavy duty, slightly stronger, airtight plastic flaps. Definitely can't get past those. No way.
- .suffix = Airtight Clear
+ .suffix = Airtight, Clear
ent-PlasticFlapsAirtightOpaque = airtight plastic flaps
.desc = Heavy duty, slightly stronger, airtight plastic flaps. Definitely can't get past those. No way.
- .suffix = Airtight Opaque
+ .suffix = Airtight, Opaque
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/portable_generator.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/portable_generator.ftl
index 5c8106c64d2..8bc5f8bddd9 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/portable_generator.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/portable_generator.ftl
@@ -1,5 +1,5 @@
-ent-PortableGeneratorBase = { ent-BaseMachine }
- .desc = { ent-BaseMachine.desc }
+ent-PortableGeneratorBase = { ent-StructureWheeled }
+ .desc = { ent-StructureWheeled.desc }
ent-PortableGeneratorSwitchableBase = { ent-PortableGeneratorBase }
.desc = { ent-PortableGeneratorBase.desc }
ent-PortableGeneratorPacman = P.A.C.M.A.N.-type portable generator
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/shuttles/thrusters.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/shuttles/thrusters.ftl
index 79908bf787a..e74f60a082e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/shuttles/thrusters.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/shuttles/thrusters.ftl
@@ -15,4 +15,4 @@ ent-GyroscopeUnanchored = { ent-Gyroscope }
.desc = { ent-Gyroscope.desc }
ent-DebugGyroscope = { ent-BaseThruster }
.suffix = DEBUG
- .desc = { ent-BaseThruster.desc }
+ .desc = { ent-BaseThruster.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/janitor/drain.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/janitor/drain.ftl
new file mode 100644
index 00000000000..e775fbcd086
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/janitor/drain.ftl
@@ -0,0 +1,2 @@
+ent-FloorDrain = drain
+ .desc = Drains puddles around it. Useful for dumping mop buckets or keeping certain rooms clean.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/janitor/janicart.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/janitor/janicart.ftl
new file mode 100644
index 00000000000..785a94d510a
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/janitor/janicart.ftl
@@ -0,0 +1,7 @@
+ent-MopBucket = mop bucket
+ .desc = Holds water and the tears of the janitor.
+ent-MopBucketFull = mop bucket
+ .suffix = full
+ .desc = { ent-MopBucket.desc }
+ent-JanitorialTrolley = janitorial trolley
+ .desc = This is the alpha and omega of sanitation.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/stairs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/stairs.ftl
index 09c55f44f65..fd4b40a342a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/stairs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/stairs.ftl
@@ -1,18 +1,24 @@
ent-Stairs = stairs
.desc = The greatest invention since rocket-propelled grenades.
- .suffix = steel
+ .suffix = Steel
ent-StairStage = { ent-Stairs }
- .suffix = steel, stage
+ .suffix = Steel, stage
.desc = { ent-Stairs.desc }
ent-StairWhite = { ent-Stairs }
- .suffix = white
+ .suffix = White
.desc = { ent-Stairs.desc }
ent-StairStageWhite = { ent-Stairs }
- .suffix = white, stage
+ .suffix = White, stage
.desc = { ent-Stairs.desc }
ent-StairDark = { ent-Stairs }
- .suffix = dark
+ .suffix = Dark
.desc = { ent-Stairs.desc }
ent-StairStageDark = { ent-Stairs }
- .suffix = dark, stage
+ .suffix = Dark, stage
+ .desc = { ent-Stairs.desc }
+ent-StairWood = { ent-Stairs }
+ .suffix = Wood
+ .desc = { ent-Stairs.desc }
+ent-StairStageWood = { ent-Stairs }
+ .suffix = Wood, stage
.desc = { ent-Stairs.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/closets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/closets.ftl
index 8aec68e8b0e..d049fde98ff 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/closets.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/closets.ftl
@@ -4,6 +4,8 @@ ent-ClosetRadiationSuit = radiation suit closet
.desc = More comfortable than radiation poisioning.
ent-ClosetEmergency = emergency closet
.desc = It's a storage unit for emergency breath masks and O2 tanks.
+ent-ClosetEmergencyN2 = emergency nitrogen closet
+ .desc = It's full of life-saving equipment. Assuming, that is, that you breathe nitrogen.
ent-ClosetFire = fire-safety closet
.desc = It's a storage unit for fire-fighting supplies.
ent-ClosetBomb = EOD closet
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl
index 95fd210c246..199a9380428 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl
@@ -1,13 +1,15 @@
ent-LockerBooze = booze storage
.desc = This is where the bartender keeps the booze.
+ent-LockerSteel = secure closet
+ .desc = { ent-LockerBaseSecure.desc }
ent-LockerQuarterMaster = quartermaster's locker
.desc = { ent-LockerBaseSecure.desc }
ent-LockerSalvageSpecialist = salvage specialist's equipment
.desc = Nevermind the pickaxe.
ent-LockerCaptain = captain's locker
.desc = { ent-LockerBaseSecure.desc }
-ent-LockerHeadOfPersonnel = station representative's locker
- .desc = { ent-LockerBaseSecure.desc }
+ent-LockerHeadOfPersonnel = head of personnel's locker
+ .desc = { ent-LockerBaseSecure.desc }
ent-LockerChiefEngineer = chief engineer's locker
.desc = { ent-LockerBaseSecure.desc }
ent-LockerElectricalSupplies = electrical supplies locker
@@ -40,13 +42,13 @@ ent-LockerResearchDirector = research director's locker
.desc = { ent-LockerBase.desc }
ent-LockerScientist = scientist's locker
.desc = { ent-LockerBase.desc }
-ent-LockerHeadOfSecurity = sheriff's locker
+ent-LockerHeadOfSecurity = head of security's locker
.desc = { ent-LockerBaseSecure.desc }
-ent-LockerWarden = bailiff's locker
+ent-LockerWarden = warden's locker
.desc = { ent-LockerBaseSecure.desc }
ent-LockerBrigmedic = brigmedic's locker
.desc = { ent-LockerBaseSecure.desc }
-ent-LockerSecurity = deputy's locker
+ent-LockerSecurity = security officer's locker
.desc = { ent-LockerBaseSecure.desc }
ent-GunSafe = gun safe
.desc = { ent-LockerBaseSecure.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/base_structurecrates.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/base_structurecrates.ftl
index 91ee923629e..6d4007e51ce 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/base_structurecrates.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/base_structurecrates.ftl
@@ -3,4 +3,5 @@ ent-CrateGeneric = crate
ent-CrateBaseWeldable = { ent-CrateGeneric }
.desc = { ent-CrateGeneric.desc }
ent-CrateBaseSecure = { ent-CrateBaseWeldable }
+ .suffix = Secure
.desc = { ent-CrateBaseWeldable.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/crates.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/crates.ftl
index 3b94e1ff590..5a5e7285e1f 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/crates.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/crates.ftl
@@ -42,6 +42,9 @@ ent-CrateHydroSecure = secure hydroponics crate
.desc = { ent-CrateBaseSecure.desc }
ent-CrateWeaponSecure = secure weapon crate
.desc = { ent-CrateBaseSecure.desc }
+ent-CrateContrabandStorageSecure = contraband storage crate
+ .desc = An armory access locked crate for storing contraband confiscated from suspects or prisoners.
+ .suffix = Armory, Secure
ent-CrateCommandSecure = command crate
.desc = { ent-CrateBaseSecure.desc }
ent-CrateLivestock = livestock crate
@@ -64,7 +67,7 @@ ent-CrateStoneGrave = grave
ent-CrateSyndicate = Syndicate crate
.desc = A dark steel crate with red bands and a letter S embossed on the front.
ent-CrateTrashCart = trash cart
- .desc = { ent-CrateBaseWeldable.desc }
+ .desc = { ent-StructureWheeled.desc }
ent-CrateTrashCartJani = janitorial trash cart
.desc = { ent-CrateBaseSecure.desc }
ent-InvisibleCrate = { ent-CrateBaseWeldable }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/filing_cabinets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/filing_cabinets.ftl
index 3df6b95fde3..2d5a849c38b 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/filing_cabinets.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/filing_cabinets.ftl
@@ -9,12 +9,12 @@ ent-filingCabinetDrawer = chest drawer
.suffix = Empty
ent-BaseBureaucraticStorageFill = { "" }
.desc = { "" }
-ent-filingCabinetRandom = { ent-BaseBureaucraticStorageFill }
+ent-filingCabinetRandom = { ent-filingCabinet }
.suffix = Random
- .desc = { ent-BaseBureaucraticStorageFill.desc }
-ent-filingCabinetTallRandom = { ent-BaseBureaucraticStorageFill }
+ .desc = { ent-filingCabinet.desc }
+ent-filingCabinetTallRandom = { ent-filingCabinetTall }
.suffix = Random
- .desc = { ent-BaseBureaucraticStorageFill.desc }
-ent-filingCabinetDrawerRandom = { ent-BaseBureaucraticStorageFill }
+ .desc = { ent-filingCabinetTall.desc }
+ent-filingCabinetDrawerRandom = { ent-filingCabinetDrawer }
.suffix = Random
- .desc = { ent-BaseBureaucraticStorageFill.desc }
\ No newline at end of file
+ .desc = { ent-filingCabinetDrawer.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl
index 07bdcf53988..b9537b139ad 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl
@@ -1,14 +1,22 @@
-ent-GlassBoxLaser = glass box
+ent-BaseGlassBox = { ent-BaseStructureDynamic }
+ .desc = { ent-BaseStructureDynamic.desc }
+ent-GlassBox = glass box
.desc = A sturdy showcase for an expensive exhibit.
+ent-GlassBoxLaser = { ent-GlassBox }
+ .suffix = AntiqueLaser
+ .desc = { ent-GlassBox.desc }
ent-GlassBoxLaserOpen = { ent-GlassBoxLaser }
- .suffix = Open
+ .suffix = AntiqueLaser, Open
.desc = { ent-GlassBoxLaser.desc }
ent-GlassBoxLaserFilled = { ent-GlassBoxLaser }
- .suffix = Filled
+ .suffix = AntiqueLaser, Filled
.desc = { ent-GlassBoxLaser.desc }
ent-GlassBoxLaserFilledOpen = { ent-GlassBoxLaserFilled }
- .suffix = Filled, Open
+ .suffix = AntiqueLaser, Filled, Open
.desc = { ent-GlassBoxLaserFilled.desc }
-ent-GlassBoxLaserBroken = broken glass box
+ent-GlassBoxFrame = glass box frame
+ .desc = A glassless sturdy showcase for an expensive exhibit.
+ .suffix = Frame
+ent-GlassBoxBroken = broken glass box
.desc = A broken showcase for a stolen expensive exhibit.
.suffix = Broken
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/base_structuretanks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/base_structuretanks.ftl
index 03bc356a464..5e1d055c3a0 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/base_structuretanks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/base_structuretanks.ftl
@@ -1,2 +1,4 @@
ent-StorageTank = storage tank
.desc = A liquids storage tank.
+ent-StorageTankBig = { ent-StorageTank }
+ .desc = { ent-StorageTank.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl
index 078cd009485..68727882a97 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl
@@ -19,5 +19,5 @@ ent-WaterTankHighCapacity = high-capacity water tank
.desc = A highly pressurized water tank made to hold gargantuan amounts of water.
.suffix = Full
ent-GenericTank = { ent-StorageTank }
- .suffix = Empty
- .desc = { ent-StorageTank.desc }
+ .suffix = Empty
+ .desc = { ent-StorageTank.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl
index 06434131253..e394b28cc3e 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl
@@ -20,14 +20,18 @@ ent-SignDirectionalEng = engineering sign
.desc = A direction sign, pointing out which way the Engineering department is.
ent-SignDirectionalEvac = evac sign
.desc = A direction sign, pointing out which way evac is.
+ent-SignDirectionalExam = exam sign
+ .desc = A direction sign, pointing out which way the examination room(s) are.
ent-SignDirectionalFood = food sign
.desc = A direction sign, pointing out which way the kitchen is.
ent-SignDirectionalGravity = gravity sign
.desc = A direction sign, pointing out which way the gravity generator is.
ent-SignDirectionalHop = hop sign
- .desc = A direction sign, pointing out which way the station representative's office is.
+ .desc = A direction sign, pointing out which way the head of personnel's office is.
ent-SignDirectionalHydro = hydro sign
.desc = A direction sign, pointing out which way hydroponics is.
+ent-SignDirectionalIcu = icu sign
+ .desc = A direction sign, pointing out which way the ICU is.
ent-SignDirectionalJanitor = janitor sign
.desc = A direction sign, pointing out which way the janitor's closet is.
ent-SignDirectionalLibrary = library sign
@@ -48,6 +52,8 @@ ent-SignDirectionalWash = washroom sign
.desc = A direction sign, pointing to the way to a washroom.
ent-SignAi = ai sign
.desc = A sign, indicating an AI is present.
+ent-SignArcade = arcade sign
+ .desc = A sign indicating the arcade.
ent-SignArmory = armory sign
.desc = A sign indicating the armory.
ent-SignToolStorage = tool storage sign
@@ -62,6 +68,8 @@ ent-SignAtmosMinsky = atmospherics sign
.desc = A sign indicating the atmospherics area.
ent-SignBar = bar sign
.desc = A sign indicating the bar.
+ent-SignBarbershop = barbershop sign
+ .desc = A sign indicating the barbershop.
ent-SignBio = bio sign
.desc = A sign indicating the biology lab.
ent-SignBiohazard = biohazard sign
@@ -122,6 +130,8 @@ ent-SignInterrogation = interrogation sign
.desc = A sign indicating an interrogation room.
ent-SignJanitor = janitor sign
.desc = A sign labelling an area where the janitor works.
+ent-SignLaundromat = laundromat sign
+ .desc = A sign indicating the laundromat.
ent-SignLawyer = lawyer sign
.desc = A sign labelling an area where the Lawyers work.
ent-SignLibrary = library sign
@@ -134,16 +144,22 @@ ent-SignMinerDock = miner dock sign
.desc = A sign indicating the miner dock.
ent-SignMorgue = morgue sign
.desc = A sign indicating the morgue.
+ent-SignNews = news sign
+ .desc = A sign indicating where the Reporter works.
ent-SignNosmoking = nosmoking sign
.desc = A sign indicating that smoking is not allowed in the vicinity.
ent-SignPrison = prison sign
.desc = A sign indicating the prison.
ent-SignPsychology = psychology sign
.desc = A sign labelling an area where the Psychologist works.
+ent-SignReception = reception sign
+ .desc = A sign indicating the reception.
ent-SignRND = research and development sign
.desc = A sign indicating the research and development lab.
ent-SignRobo = robo sign
.desc = A sign indicating the robotics lab.
+ent-SignSalvage = salvage sign
+ .desc = A sign indicating the salvage area.
ent-SignScience = science sign
.desc = A sign indicating the science area.
ent-SignScience1 = science sign
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/switch.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/switch.ftl
index aa93a361569..4ebc623ea1b 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/switch.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/switch.ftl
@@ -15,3 +15,112 @@ ent-SignalButtonDirectional = signal button
ent-ApcNetSwitchDirectional = apc net switch
.suffix = directional
.desc = { ent-ApcNetSwitch.desc }
+ent-LockableButton = lockable button
+ .desc = { ent-SignalButtonDirectional.desc }
+ent-LockableButtonCaptain = { ent-LockableButton }
+ .suffix = Captain
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonHeadOfPersonnel = { ent-LockableButton }
+ .suffix = HeadOfPersonnel
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonChiefEngineer = { ent-LockableButton }
+ .suffix = ChiefEngineer
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonChiefMedicalOfficer = { ent-LockableButton }
+ .suffix = ChiefMedicalOfficer
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonHeadOfSecurity = { ent-LockableButton }
+ .suffix = HeadOfSecurity
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonResearchDirector = { ent-LockableButton }
+ .suffix = ResearchDirector
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonCommand = { ent-LockableButton }
+ .suffix = Command
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonCryogenics = { ent-LockableButton }
+ .suffix = Cryogenics
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonSecurity = { ent-LockableButton }
+ .suffix = Security
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonDetective = { ent-LockableButton }
+ .suffix = Detective
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonArmory = { ent-LockableButton }
+ .suffix = Armory
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonBrig = { ent-LockableButton }
+ .suffix = Brig
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonLawyer = { ent-LockableButton }
+ .suffix = Lawyer
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonEngineering = { ent-LockableButton }
+ .suffix = Engineering
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonMedical = { ent-LockableButton }
+ .suffix = Medical
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonQuartermaster = { ent-LockableButton }
+ .suffix = Quartermaster
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonSalvage = { ent-LockableButton }
+ .suffix = Salvage
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonCargo = { ent-LockableButton }
+ .suffix = Cargo
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonResearch = { ent-LockableButton }
+ .suffix = Research
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonService = { ent-LockableButton }
+ .suffix = Service
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonMaintenance = { ent-LockableButton }
+ .suffix = Maintenance
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonExternal = { ent-LockableButton }
+ .suffix = External
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonJanitor = { ent-LockableButton }
+ .suffix = Janitor
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonTheatre = { ent-LockableButton }
+ .suffix = Theatre
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonBar = { ent-LockableButton }
+ .suffix = Bar
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonChemistry = { ent-LockableButton }
+ .suffix = Chemistry
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonKitchen = { ent-LockableButton }
+ .suffix = Kitchen
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonChapel = { ent-LockableButton }
+ .suffix = Chapel
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonHydroponics = { ent-LockableButton }
+ .suffix = Hydroponics
+ .desc = { ent-LockableButton.desc }
+ent-LockableButtonAtmospherics = { ent-LockableButton }
+ .suffix = Atmospherics
+ .desc = { ent-LockableButton.desc }
+ent-ButtonFrame = button frame
+ .desc = It's a frame to help distinguish switches visually.
+ent-ButtonFrameGrey = { ent-ButtonFrame }
+ .suffix = grey
+ .desc = { ent-ButtonFrame.desc }
+ent-ButtonFrameCaution = { ent-ButtonFrame }
+ .suffix = caution
+ .desc = { ent-ButtonFrame.desc }
+ent-ButtonFrameCautionSecurity = { ent-ButtonFrame }
+ .suffix = caution
+ .desc = { ent-ButtonFrame.desc }
+ent-ButtonFrameExit = { ent-ButtonFrame }
+ .suffix = exit
+ .desc = { ent-ButtonFrame.desc }
+ent-ButtonFrameJanitor = { ent-ButtonFrame }
+ .suffix = janitor
+ .desc = { ent-ButtonFrame.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl
index 508de11c3bf..a6543f6de30 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl
@@ -1,6 +1,5 @@
ent-AsteroidRock = asteroid rock
.desc = A rocky asteroid.
- .suffix = Low Ore Yield
ent-AsteroidRockCoal = { ent-AsteroidRock }
.desc = An ore vein rich with coal.
.suffix = Coal
@@ -26,7 +25,7 @@ ent-AsteroidRockTin = { ent-AsteroidRock }
.desc = An ore vein rich with iron.
.suffix = Iron
ent-AsteroidRockTinCrab = { ent-AsteroidRockTin }
- .suffix = Iron
+ .suffix = Iron Crab
.desc = { ent-AsteroidRockTin.desc }
ent-AsteroidRockUranium = { ent-AsteroidRock }
.desc = An ore vein rich with uranium.
@@ -42,16 +41,19 @@ ent-AsteroidRockArtifactFragment = { ent-AsteroidRock }
.suffix = Artifact Fragment
ent-AsteroidRockMining = asteroid rock
.desc = An asteroid.
- .suffix = higher ore yield
+ .suffix = higher ore yield .33
ent-IronRock = ironrock
.desc = A rocky asteroid.
.suffix = Low Ore Yield
+ent-AsteroidRockSalt = { ent-AsteroidRock }
+ .desc = An ore vein rich with salt.
+ .suffix = Salt
ent-IronRockMining = ironrock
.desc = An asteroid.
.suffix = higher ore yield
ent-WallRock = rock
.suffix = planetmap
- .desc = { ent-BaseStructure.desc }
+ .desc = { ent-BaseWall.desc }
ent-WallRockCoal = { ent-WallRock }
.desc = An ore vein rich with coal.
.suffix = Coal
@@ -79,6 +81,9 @@ ent-WallRockBananium = { ent-WallRock }
ent-WallRockArtifactFragment = { ent-WallRock }
.desc = A rock wall. What's that sticking out of it?
.suffix = Artifact Fragment
+ent-WallRockSalt = { ent-WallRock }
+ .desc = An ore vein rich with salt.
+ .suffix = Salt
ent-WallRockBasalt = basalt
.desc = { ent-WallRock.desc }
ent-WallRockBasaltCoal = { ent-WallRockBasalt }
@@ -108,6 +113,9 @@ ent-WallRockBasaltBananium = { ent-WallRockBasalt }
ent-WallRockBasaltArtifactFragment = { ent-WallRockBasalt }
.desc = A rock wall. What's that sticking out of it?
.suffix = Artifact Fragment
+ent-WallRockBasaltSalt = { ent-WallRockBasalt }
+ .desc = An ore vein rich with salt.
+ .suffix = Salt
ent-WallRockSnow = snowdrift
.desc = { ent-WallRock.desc }
ent-WallRockSnowCoal = { ent-WallRockSnow }
@@ -137,6 +145,9 @@ ent-WallRockSnowBananium = { ent-WallRockSnow }
ent-WallRockSnowArtifactFragment = { ent-WallRockSnow }
.desc = A rock wall. What's that sticking out of it?
.suffix = Artifact Fragment
+ent-WallRockSnowSalt = { ent-WallRockSnow }
+ .desc = An ore vein rich with salt.
+ .suffix = Salt
ent-WallRockSand = sandstone
.desc = { ent-WallRock.desc }
ent-WallRockSandCoal = { ent-WallRockSand }
@@ -166,6 +177,9 @@ ent-WallRockSandBananium = { ent-WallRockSand }
ent-WallRockSandArtifactFragment = { ent-WallRockSand }
.desc = A rock wall. What's that sticking out of it?
.suffix = Artifact Fragment
+ent-WallRockSandSalt = { ent-WallRockSand }
+ .desc = An ore vein rich with salt.
+ .suffix = Salt
ent-WallRockChromite = chromite
.desc = { ent-WallRock.desc }
ent-WallRockChromiteCoal = { ent-WallRockChromite }
@@ -195,6 +209,9 @@ ent-WallRockChromiteBananium = { ent-WallRockChromite }
ent-WallRockChromiteArtifactFragment = { ent-WallRockChromite }
.desc = A rock wall. What's that sticking out of it?
.suffix = Artifact Fragment
+ent-WallRockChromiteSalt = { ent-WallRockChromite }
+ .desc = An ore vein rich with salt.
+ .suffix = Salt
ent-WallRockAndesite = andesite
.desc = { ent-WallRock.desc }
ent-WallRockAndesiteCoal = { ent-WallRockAndesite }
@@ -224,3 +241,6 @@ ent-WallRockAndesiteBananium = { ent-WallRockAndesite }
ent-WallRockAndesiteArtifactFragment = { ent-WallRockAndesite }
.desc = A rock wall. What's that sticking out of it?
.suffix = Artifact Fragment
+ent-WallRockAndesiteSalt = { ent-WallRockAndesite }
+ .desc = An ore vein rich with salt.
+ .suffix = Salt
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girders.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girders.ftl
index 01ac3bb600c..333d8950fdb 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girders.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girders.ftl
@@ -2,3 +2,5 @@ ent-Girder = girder
.desc = A large structural assembly made out of metal; It requires a layer of metal before it can be considered a wall.
ent-ReinforcedGirder = reinforced girder
.desc = A large structural assembly made out of metal and plasteel; It requires a layer of plasteel before it can be considered a reinforced wall.
+ent-ClockworkGirder = wall gear
+ .desc = A large gear with mounting brackets for additional plating; This could be made into a wall with more brass plating.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/grille.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/grille.ftl
index 3a515825e60..d39d7365b2a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/grille.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/grille.ftl
@@ -1,6 +1,12 @@
ent-Grille = grille
.desc = A flimsy framework of iron rods.
+ent-ClockworkGrille = clockwork grille
+ .desc = a flimsy framework of iron rods assembled in traditional Ratvarian fashion.
ent-GrilleBroken = grille
.desc = A flimsy framework of iron rods. It has seen better days.
+ent-ClockworkGrilleBroken = clockwork grille
+ .desc = A flimsy framework of iron rods assembled in traditional Ratvarian fashion. It has seen better days.
ent-GrilleDiagonal = diagonal grille
.desc = { ent-Grille.desc }
+ent-ClockworkGrilleDiagonal = diagonal clockwork grille
+ .desc = { ent-ClockworkGrille.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/mining.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/mining.ftl
index 067a50ec9c5..2ee7660beac 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/mining.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/mining.ftl
@@ -1,5 +1,5 @@
ent-MiningWindow = mining window
- .desc = { ent-Window.desc }
+ .desc = { ent-WindowRCDResistant.desc }
ent-MiningWindowDiagonal = { ent-ShuttleWindow }
.suffix = diagonal
.desc = { ent-ShuttleWindow.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plasma.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plasma.ftl
index 995d3a3ba1c..126d0a30268 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plasma.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plasma.ftl
@@ -1,5 +1,5 @@
ent-PlasmaWindow = plasma window
- .desc = { ent-Window.desc }
+ .desc = { ent-WindowRCDResistant.desc }
ent-PlasmaWindowDirectional = directional plasma window
.desc = Don't smudge up the glass down there.
ent-PlasmaWindowDiagonal = { ent-PlasmaWindow }
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 89c3894e806..57216514981 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,2 +1,5 @@
ent-PlastitaniumWindow = plastitanium window
- .desc = { ent-PlastitaniumWindowIndestructible.desc }
+ .desc = { ent-Window.desc }
+ent-PlastitaniumWindowDiagonal = { ent-ShuttleWindow }
+ .suffix = diagonal
+ .desc = { ent-ShuttleWindow.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/rplasma.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/rplasma.ftl
index b92158ed2b6..e047dc7a508 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/rplasma.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/rplasma.ftl
@@ -1,5 +1,5 @@
ent-ReinforcedPlasmaWindow = reinforced plasma window
- .desc = { ent-Window.desc }
+ .desc = { ent-WindowRCDResistant.desc }
ent-PlasmaReinforcedWindowDirectional = directional reinforced plasma window
.desc = Don't smudge up the glass down there.
ent-ReinforcedPlasmaWindowDiagonal = { ent-ReinforcedPlasmaWindow }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/ruranium.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/ruranium.ftl
index c566207703e..0ba3040f467 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/ruranium.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/ruranium.ftl
@@ -1,5 +1,7 @@
ent-ReinforcedUraniumWindow = reinforced uranium window
- .desc = { ent-Window.desc }
+ .desc = { ent-WindowRCDResistant.desc }
+ent-UraniumReinforcedWindowDirectional = directional reinforced uranium window
+ .desc = Don't smudge up the glass down there.
ent-ReinforcedUraniumWindowDiagonal = { ent-ReinforcedUraniumWindow }
.suffix = diagonal
.desc = { ent-ReinforcedUraniumWindow.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/shuttle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/shuttle.ftl
index 65ce1bc1c3a..6c5272cfdd0 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/shuttle.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/shuttle.ftl
@@ -1,5 +1,5 @@
ent-ShuttleWindow = shuttle window
- .desc = { ent-Window.desc }
+ .desc = { ent-WindowRCDResistant.desc }
ent-ShuttleWindowDiagonal = { ent-ShuttleWindow }
.suffix = diagonal
.desc = { ent-ShuttleWindow.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/uranium.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/uranium.ftl
index 74a28c90733..012b81a4745 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/uranium.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/uranium.ftl
@@ -1,5 +1,7 @@
ent-UraniumWindow = uranium window
- .desc = { ent-Window.desc }
+ .desc = { ent-WindowRCDResistant.desc }
+ent-UraniumWindowDirectional = directional uranium window
+ .desc = Don't smudge up the glass down there.
ent-UraniumWindowDiagonal = { ent-UraniumWindow }
.suffix = diagonal
.desc = { ent-UraniumWindow.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/window.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/window.ftl
index 7da6a090ed3..21dd2cc33a0 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/window.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/window.ftl
@@ -1,7 +1,11 @@
ent-Window = window
.desc = Don't smudge up the glass down there.
+ent-WindowRCDResistant = { ent-Window }
+ .desc = { ent-Window.desc }
ent-WindowDirectional = directional window
.desc = Don't smudge up the glass down there.
+ent-WindowDirectionalRCDResistant = { ent-WindowDirectional }
+ .desc = { ent-WindowDirectional.desc }
ent-WindowFrostedDirectional = directional frosted window
.desc = Don't smudge up the glass down there.
ent-WindowDiagonal = { ent-Window }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/asteroids.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/asteroids.ftl
index d6eecdbeb5b..1187ae2962a 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/asteroids.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/asteroids.ftl
@@ -18,3 +18,127 @@ ent-AsteroidSalvageLarge = Salvage Asteroid Large
.desc = { ent-BaseAsteroidDebris.desc }
ent-AsteroidSalvageHuge = Salvage Asteroid Huge
.desc = { ent-BaseAsteroidDebris.desc }
+ent-AsteroidSalvageFortress = Fortress Asteroid
+ .desc = { ent-BaseAsteroidDebris.desc }
+ent-AsteroidSalvageBehemoth = Behemoth Asteroid
+ .desc = { ent-BaseAsteroidDebris.desc }
+ent-BaseAsteroidDebrisIce = Salvage Iced Asteroid
+ .desc = { ent-BaseDebris.desc }
+ent-AsteroidDebrisIceSmall = Asteroid Ice Debris Small
+ .desc = { ent-BaseAsteroidDebrisIce.desc }
+ent-AsteroidDebrisIceMedium = Asteroid Ice Debris Medium
+ .desc = { ent-BaseAsteroidDebrisIce.desc }
+ent-AsteroidDebrisIceLarge = Asteroid Ice Debris Large
+ .desc = { ent-BaseAsteroidDebrisIce.desc }
+ent-AsteroidDebrisIceLarger = Asteroid Ice Debris Larger
+ .desc = { ent-BaseAsteroidDebrisIce.desc }
+ent-AsteroidDebrisIceHuge = Asteroid Ice Debris Huge
+ .desc = { ent-BaseAsteroidDebrisIce.desc }
+ent-AsteroidSalvageIceSmall = Salvage Ice Asteroid Small
+ .desc = { ent-BaseAsteroidDebrisIce.desc }
+ent-AsteroidSalvageIceMedium = Salvage Ice Asteroid Medium
+ .desc = { ent-BaseAsteroidDebrisIce.desc }
+ent-AsteroidSalvageIceLarge = Salvage Ice Asteroid Large
+ .desc = { ent-BaseAsteroidDebrisIce.desc }
+ent-AsteroidSalvageIceHuge = Salvage Ice Asteroid Huge
+ .desc = { ent-BaseAsteroidDebrisIce.desc }
+ent-BaseAsteroidDebrisAndesite = Salvage Andesite Asteroid
+ .desc = { ent-BaseDebris.desc }
+ent-AsteroidDebrisAndesiteSmall = Asteroid Andesite Debris Small
+ .desc = { ent-BaseAsteroidDebrisAndesite.desc }
+ent-AsteroidDebrisAndesiteMedium = Asteroid Andesite Debris Medium
+ .desc = { ent-BaseAsteroidDebrisAndesite.desc }
+ent-AsteroidDebrisAndesiteLarge = Asteroid Andesite Debris Large
+ .desc = { ent-BaseAsteroidDebrisAndesite.desc }
+ent-AsteroidDebrisAndesiteLarger = Asteroid Andesite Debris Larger
+ .desc = { ent-BaseAsteroidDebrisAndesite.desc }
+ent-AsteroidDebrisAndesiteHuge = Asteroid Andesite Debris Huge
+ .desc = { ent-BaseAsteroidDebrisAndesite.desc }
+ent-AsteroidSalvageAndesiteSmall = Salvage Andesite Asteroid Small
+ .desc = { ent-BaseAsteroidDebrisAndesite.desc }
+ent-AsteroidSalvageAndesiteMedium = Salvage Andesite Asteroid Medium
+ .desc = { ent-BaseAsteroidDebrisAndesite.desc }
+ent-AsteroidSalvageAndesiteLarge = Salvage Andesite Asteroid Large
+ .desc = { ent-BaseAsteroidDebrisAndesite.desc }
+ent-AsteroidSalvageAndesiteHuge = Salvage Andesite Asteroid Huge
+ .desc = { ent-BaseAsteroidDebrisAndesite.desc }
+ent-BaseAsteroidDebrisBasalt = Salvage Basalt Asteroid
+ .desc = { ent-BaseDebris.desc }
+ent-AsteroidDebrisBasaltSmall = Asteroid Basalt Debris Small
+ .desc = { ent-BaseAsteroidDebrisBasalt.desc }
+ent-AsteroidDebrisBasaltMedium = Asteroid Basalt Debris Medium
+ .desc = { ent-BaseAsteroidDebrisBasalt.desc }
+ent-AsteroidDebrisBasaltLarge = Asteroid Basalt Debris Large
+ .desc = { ent-BaseAsteroidDebrisBasalt.desc }
+ent-AsteroidDebrisBasaltLarger = Asteroid Basalt Debris Larger
+ .desc = { ent-BaseAsteroidDebrisBasalt.desc }
+ent-AsteroidDebrisBasaltHuge = Asteroid Basalt Debris Huge
+ .desc = { ent-BaseAsteroidDebrisBasalt.desc }
+ent-AsteroidSalvageBasaltSmall = Salvage Basalt Asteroid Small
+ .desc = { ent-BaseAsteroidDebrisBasalt.desc }
+ent-AsteroidSalvageBasaltMedium = Salvage Basalt Asteroid Medium
+ .desc = { ent-BaseAsteroidDebrisBasalt.desc }
+ent-AsteroidSalvageBasaltLarge = Salvage Basalt Asteroid Large
+ .desc = { ent-BaseAsteroidDebrisBasalt.desc }
+ent-AsteroidSalvageBasaltHuge = Salvage Basalt Asteroid Huge
+ .desc = { ent-BaseAsteroidDebrisBasalt.desc }
+ent-BaseAsteroidDebrisSand = Salvage Sand Asteroid
+ .desc = { ent-BaseDebris.desc }
+ent-AsteroidDebrisSandSmall = Asteroid Sand Debris Small
+ .desc = { ent-BaseAsteroidDebrisSand.desc }
+ent-AsteroidDebrisSandMedium = Asteroid Sand Debris Medium
+ .desc = { ent-BaseAsteroidDebrisSand.desc }
+ent-AsteroidDebrisSandLarge = Asteroid Sand Debris Large
+ .desc = { ent-BaseAsteroidDebrisSand.desc }
+ent-AsteroidDebrisSandLarger = Asteroid Sand Debris Larger
+ .desc = { ent-BaseAsteroidDebrisSand.desc }
+ent-AsteroidDebrisSandHuge = Asteroid Sand Debris Huge
+ .desc = { ent-BaseAsteroidDebrisSand.desc }
+ent-AsteroidSalvageSandSmall = Salvage Sand Asteroid Small
+ .desc = { ent-BaseAsteroidDebrisSand.desc }
+ent-AsteroidSalvageSandMedium = Salvage Sand Asteroid Medium
+ .desc = { ent-BaseAsteroidDebrisSand.desc }
+ent-AsteroidSalvageSandLarge = Salvage Sand Asteroid Large
+ .desc = { ent-BaseAsteroidDebrisSand.desc }
+ent-AsteroidSalvageSandHuge = Salvage Sand Asteroid Huge
+ .desc = { ent-BaseAsteroidDebrisSand.desc }
+ent-BaseAsteroidDebrisChromite = Salvage Chromite Asteroid
+ .desc = { ent-BaseDebris.desc }
+ent-AsteroidDebrisChromiteSmall = Asteroid Chromite Debris Small
+ .desc = { ent-BaseAsteroidDebrisChromite.desc }
+ent-AsteroidDebrisChromiteMedium = Asteroid Chromite Debris Medium
+ .desc = { ent-BaseAsteroidDebrisChromite.desc }
+ent-AsteroidDebrisChromiteLarge = Asteroid Chromite Debris Large
+ .desc = { ent-BaseAsteroidDebrisChromite.desc }
+ent-AsteroidDebrisChromiteLarger = Asteroid Chromite Debris Larger
+ .desc = { ent-BaseAsteroidDebrisChromite.desc }
+ent-AsteroidDebrisChromiteHuge = Asteroid Chromite Debris Huge
+ .desc = { ent-BaseAsteroidDebrisChromite.desc }
+ent-AsteroidSalvageChromiteSmall = Salvage Chromite Asteroid Small
+ .desc = { ent-BaseAsteroidDebrisChromite.desc }
+ent-AsteroidSalvageChromiteMedium = Salvage Chromite Asteroid Medium
+ .desc = { ent-BaseAsteroidDebrisChromite.desc }
+ent-AsteroidSalvageChromiteLarge = Salvage Chromite Asteroid Large
+ .desc = { ent-BaseAsteroidDebrisChromite.desc }
+ent-AsteroidSalvageChromiteHuge = Salvage Chromite Asteroid Huge
+ .desc = { ent-BaseAsteroidDebrisChromite.desc }
+ent-BaseAsteroidDebrisRed = Salvage Red Asteroid
+ .desc = { ent-BaseDebris.desc }
+ent-AsteroidDebrisRedSmall = Asteroid Red Debris Small
+ .desc = { ent-BaseAsteroidDebrisRed.desc }
+ent-AsteroidDebrisRedMedium = Asteroid Red Debris Medium
+ .desc = { ent-BaseAsteroidDebrisRed.desc }
+ent-AsteroidDebrisRedLarge = Asteroid Red Debris Large
+ .desc = { ent-BaseAsteroidDebrisRed.desc }
+ent-AsteroidDebrisRedLarger = Asteroid Red Debris Larger
+ .desc = { ent-BaseAsteroidDebrisRed.desc }
+ent-AsteroidDebrisRedHuge = Asteroid Red Debris Huge
+ .desc = { ent-BaseAsteroidDebrisRed.desc }
+ent-AsteroidSalvageRedSmall = Salvage Red Asteroid Small
+ .desc = { ent-BaseAsteroidDebrisRed.desc }
+ent-AsteroidSalvageRedMedium = Salvage Red Asteroid Medium
+ .desc = { ent-BaseAsteroidDebrisRed.desc }
+ent-AsteroidSalvageRedLarge = Salvage Red Asteroid Large
+ .desc = { ent-BaseAsteroidDebrisRed.desc }
+ent-AsteroidSalvageRedHuge = Salvage Red Asteroid Huge
+ .desc = { ent-BaseAsteroidDebrisRed.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/wrecks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/wrecks.ftl
index 54188162305..4b9f81f258d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/wrecks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/world/debris/wrecks.ftl
@@ -12,3 +12,7 @@ ent-ScrapDebrisExtraLargeScattered = Scrap Debris Extra Large Scattered
.desc = { ent-BaseScrapDebris.desc }
ent-ScrapDebrisHuge = Scrap Debris Huge
.desc = { ent-BaseScrapDebris.desc }
+ent-ScrapDebrisFortress = Fortress Scrap
+ .desc = { ent-BaseScrapDebris.desc }
+ent-ScrapDebrisBehemoth = Behemoth Scrap
+ .desc = { ent-BaseScrapDebris.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/floor_trap.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/floor_trap.ftl
new file mode 100644
index 00000000000..f49cd2a8672
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/floor_trap.ftl
@@ -0,0 +1,23 @@
+ent-CollideFloorTrap = { "" }
+ .desc = { "" }
+ent-CollideFloorTrapSpawn = floor trap spawn
+ .desc = { ent-CollideFloorTrap.desc }
+ent-FloorTrapExplosion = explosion floor trap
+ .desc = { ent-CollideFloorTrap.desc }
+ent-FloorTrapEMP = EMP floor trap
+ .desc = { ent-CollideFloorTrap.desc }
+ent-SpawnFloorTrapCarp = { ent-CollideFloorTrapSpawn }
+ .suffix = Carp
+ .desc = { ent-CollideFloorTrapSpawn.desc }
+ent-SpawnFloorTrapBear = { ent-CollideFloorTrapSpawn }
+ .suffix = Bear
+ .desc = { ent-CollideFloorTrapSpawn.desc }
+ent-SpawnFloorTrapKangaroo = { ent-CollideFloorTrapSpawn }
+ .suffix = Kangaroo
+ .desc = { ent-CollideFloorTrapSpawn.desc }
+ent-SpawnFloorTrapXenoDrone = { ent-CollideFloorTrapSpawn }
+ .suffix = Xeno. Drone
+ .desc = { ent-CollideFloorTrapSpawn.desc }
+ent-SpawnFloorTrapXenoBurrower = { ent-CollideFloorTrapSpawn }
+ .suffix = Xeno. Burrower
+ .desc = { ent-CollideFloorTrapSpawn.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/midround.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/midround.ftl
index 5c21f9da1cf..7416fb5c77f 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/midround.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/midround.ftl
@@ -1,4 +1,2 @@
ent-Thief = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
-ent-Exterminator = { ent-BaseGameRule }
- .desc = { ent-BaseGameRule.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/roundstart.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/roundstart.ftl
index 91b85f9dee7..87507f033f2 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/roundstart.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/roundstart.ftl
@@ -1,5 +1,7 @@
ent-BaseGameRule = { "" }
.desc = { "" }
+ent-SubGamemodesRule = { ent-BaseGameRule }
+ .desc = { ent-BaseGameRule.desc }
ent-DeathMatch31 = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
ent-InactivityTimeRestart = { ent-BaseGameRule }
@@ -8,8 +10,6 @@ ent-MaxTimeRestart = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
ent-Nukeops = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
-ent-Pirates = { ent-BaseGameRule }
- .desc = { ent-BaseGameRule.desc }
ent-Traitor = { ent-BaseGameRule }
.desc = { ent-BaseGameRule.desc }
ent-Revolutionary = { ent-BaseGameRule }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/variation.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/variation.ftl
index 545c4c52c52..8c3f23a6c37 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/variation.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/variation.ftl
@@ -12,3 +12,5 @@ ent-BasicPuddleMessVariationPass = { ent-BaseVariationPass }
.desc = { ent-BaseVariationPass.desc }
ent-BloodbathPuddleMessVariationPass = { ent-BaseVariationPass }
.desc = { ent-BaseVariationPass.desc }
+ent-CutWireVariationPass = { ent-BaseVariationPass }
+ .desc = { ent-BaseVariationPass.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/books/hyperlinks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/books/hyperlinks.ftl
index f7f4dd1bf24..2d858aa46b2 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/books/hyperlinks.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/books/hyperlinks.ftl
@@ -2,27 +2,5 @@ ent-BaseHyperlinkBook = { ent-BaseItem }
.desc = { ent-BaseItem.desc }
ent-HyperlinkBookSpaceLaw = space law
.desc = A big book of laws for space courts.
-ent-HyperlinkBookSupernanny = book of unsanctioned space punishments
- .desc = The ravings of a madman.
-ent-HyperlinkBookChemistry = chemical recipe book
- .desc = A list of chemical recipes.
-ent-HyperlinkBookBartending = bartender's guide
- .desc = A list of drink recipes.
-ent-HyperlinkBookCooking = cookbook
- .desc = A list of food recipes.
-ent-HyperlinkBookBotany = botanical field guide
- .desc = A guide to plants.
-ent-HyperlinkBookShuttle = guide to shuttle construction
- .desc = A guide to building shuttles.
-ent-HyperlinkBookAlerts = alert procedure
- .desc = Procedure for when and why each alert should be put in effect, and what to do.
-ent-HyperlinkBookProcedure = standard operating procedure
- .desc = A guide to normal station function.
-ent-HyperlinkBookPower = guide to power
- .desc = A guide to powering the station.
-ent-HyperlinkBookMedical = guide to medical
- .desc = A guide to the medical department.
-ent-HyperlinkBookHacking = guide to hacking
- .desc = For emergency use only.
-ent-HyperlinkBookAtmos = guide to atmospherics
- .desc = How to make sure everyone has air to breathe.
+ent-HyperlinkBookNfsdSop = nfsd sop's
+ .desc = A book defining nfsd standard operating procedures.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/moth.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/moth.ftl
index 10c5363673b..f07a5cdd351 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/moth.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/moth.ftl
@@ -3,7 +3,7 @@ ent-FoodMothHerbyCheese = herby cheese
ent-FoodMothSaladBase = mothic salad
.desc = A basic salad of cabbage, red onion and tomato.
ent-BaseFoodMothSauce = sauce bowl
- .desc = A small bowl for condiment. Not reusable.
+ .desc = A small bowl for condiment.
ent-FoodMothTomatoSauce = tomato sauce
.desc = Tomato with salt and herbs.
ent-FoodMothPesto = pesto sauce
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/misc/identification_cards.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/misc/identification_cards.ftl
index 6f010a7dbf5..b25ac182666 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/misc/identification_cards.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/misc/identification_cards.ftl
@@ -2,11 +2,7 @@ ent-MailCarrierIDCard = mail carrier ID card
.desc = { ent-IDCardStandard.desc }
ent-PrisonerIDCard = prisoner ID card
.desc = { ent-IDCardStandard.desc }
-ent-GladiatorIDCard = gladiator ID card
- .desc = { ent-IDCardStandard.desc }
ent-ValetIDCard = valet ID card
.desc = { ent-IDCardStandard.desc }
ent-GuardIDCard = guard ID card
.desc = { ent-IDCardStandard.desc }
-ent-MartialArtistIDCard = martial artist ID card
- .desc = { ent-IDCardStandard.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/pda.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/pda.ftl
index a4d58fc71f8..2e2d1f191e0 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/pda.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/pda.ftl
@@ -2,11 +2,7 @@ ent-MailCarrierPDA = mail carrier PDA
.desc = Hope this doesn't have any... JUNK MAIL.
ent-PrisonerPDA = prisoner PDA
.desc = Clear, so you can make sure there's nothing being smuggled inside.
-ent-GladiatorPDA = gladiator PDA
- .desc = { ent-PrisonerPDA.desc }
ent-ValetPDA = valet PDA
.desc = Why isn't it gray?
ent-GuardPDA = guard PDA
.desc = Red to hide the stains of prisoner blood.
-ent-MartialArtistPDA = martial artist PDA
- .desc = { ent-BoxerPDA.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_civilian.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_civilian.ftl
index d46a995e1ac..80a176ad579 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_civilian.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_civilian.ftl
@@ -34,3 +34,6 @@ ent-MailMusicianInstrumentSmall = { ent-BaseMail }
ent-MailPassengerMoney = { ent-BaseMail }
.suffix = passengermoney
.desc = { ent-BaseMail.desc }
+ent-MailBoomboxAsshole = { ent-BaseMail }
+ .suffix = Boombox
+ .desc = { ent-BaseMail.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/markers/spawners/jobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/markers/spawners/jobs.ftl
index 036f8796cf1..e974908e089 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/markers/spawners/jobs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/markers/spawners/jobs.ftl
@@ -1,5 +1,3 @@
-ent-SpawnPointGladiator = gladiator
- .desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointMailCarrier = mailcarrier
.desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointPrisoner = prisoner
@@ -8,5 +6,3 @@ ent-SpawnPointValet = valet
.desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointPrisonGuard = prison guard
.desc = { ent-SpawnPointJobBase.desc }
-ent-SpawnPointMartialArtist = martial artist
- .desc = { ent-SpawnPointJobBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/markers/spawners/random/randomitems.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/markers/spawners/random/randomitems.ftl
index b9e368fe3b2..1e208b7b819 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/markers/spawners/random/randomitems.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/markers/spawners/random/randomitems.ftl
@@ -1,2 +1,2 @@
ent-RandomItem = random item spawner
- .desc = { ent-MarkerBase.desc }
+ .desc = { ent-MarkerBasePlaceFree.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/markers/spawners/random/seeds.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/markers/spawners/random/seeds.ftl
index 698be61bada..82a11ca73f3 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/markers/spawners/random/seeds.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/markers/spawners/random/seeds.ftl
@@ -1,3 +1,3 @@
ent-SalvageSeedSpawnerLow = Salvage Seed Spawner
.suffix = Low
- .desc = { ent-MarkerBase.desc }
+ .desc = { ent-MarkerBasePlaceFree.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/thief.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/thief.ftl
index 18aabddd7b1..7e746710fcf 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/thief.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/thief.ftl
@@ -1,13 +1,13 @@
ent-BaseThiefObjective = { ent-BaseObjective }
.desc = { ent-BaseObjective.desc }
-ent-BaseThiefStealObjective = { ent-BaseThiefObjective }
- .desc = { ent-BaseThiefObjective.desc }
-ent-BaseThiefStealCollectionObjective = { ent-BaseThiefObjective }
+ent-BaseThiefStealObjective = { ent-BaseStealObjective }
+ .desc = { ent-BaseStealObjective.desc }
+ent-BaseThiefStealCollectionObjective = { ent-BaseStealObjective }
+ .desc = { ent-BaseStealObjective.desc }
+ent-BaseThiefStealStructureObjective = { ent-BaseStealObjective }
+ .desc = { ent-BaseStealObjective.desc }
+ent-BaseThiefStealAnimalObjective = { ent-BaseStealObjective }
.desc = { ent-BaseStealObjective.desc }
-ent-BaseThiefStealStructureObjective = { ent-BaseThiefObjective }
- .desc = { ent-BaseThiefObjective.desc }
-ent-BaseThiefStealAnimalObjective = { ent-BaseThiefObjective }
- .desc = { ent-BaseThiefObjective.desc }
ent-FigurineStealCollectionObjective = { ent-BaseThiefStealCollectionObjective }
.desc = { ent-BaseThiefStealCollectionObjective.desc }
ent-HeadCloakStealCollectionObjective = { ent-BaseThiefStealCollectionObjective }
@@ -22,8 +22,6 @@ ent-TechnologyDiskStealCollectionObjective = { ent-BaseThiefStealCollectionObjec
.desc = { ent-BaseThiefStealCollectionObjective.desc }
ent-IDCardsStealCollectionObjective = { ent-BaseThiefStealCollectionObjective }
.desc = { ent-BaseThiefStealCollectionObjective.desc }
-ent-CannabisStealCollectionObjective = { ent-BaseThiefStealCollectionObjective }
- .desc = { ent-BaseThiefStealCollectionObjective.desc }
ent-LAMPStealCollectionObjective = { ent-BaseThiefStealCollectionObjective }
.desc = { ent-BaseThiefStealCollectionObjective.desc }
ent-ForensicScannerStealObjective = { ent-BaseThiefStealObjective }
@@ -88,15 +86,9 @@ ent-MortyStealObjective = { ent-BaseThiefStealAnimalObjective }
.desc = { ent-BaseThiefStealAnimalObjective.desc }
ent-RenaultStealObjective = { ent-BaseThiefStealAnimalObjective }
.desc = { ent-BaseThiefStealAnimalObjective.desc }
-ent-HamletStealObjective = { ent-BaseThiefStealAnimalObjective }
- .desc = { ent-BaseThiefStealAnimalObjective.desc }
ent-ShivaStealObjective = { ent-BaseThiefStealAnimalObjective }
.desc = { ent-BaseThiefStealAnimalObjective.desc }
-ent-SmileStealObjective = { ent-BaseThiefStealAnimalObjective }
- .desc = { ent-BaseThiefStealAnimalObjective.desc }
-ent-PunPunStealObjective = { ent-BaseThiefStealAnimalObjective }
- .desc = { ent-BaseThiefStealAnimalObjective.desc }
ent-TropicoStealObjective = { ent-BaseThiefStealAnimalObjective }
.desc = { ent-BaseThiefStealAnimalObjective.desc }
ent-EscapeThiefShuttleObjective = Escape to centcom alive and unrestrained.
- .desc = You don't want your illegal activities to be discovered by anyone, do you?
\ No newline at end of file
+ .desc = You don't want your illegal activities to be discovered by anyone, do you?
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl
index 310d7a21e03..676094d0e52 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl
@@ -1,2 +1,2 @@
-ent-SalvageShuttleMarker = { ent-FTLPoint }
+ent-SalvageShuttleMarker = Salvage shuttle marker
.desc = { ent-FTLPoint.desc }
diff --git a/Resources/Locale/ru-RU/HUD/game-hud.ftl b/Resources/Locale/ru-RU/HUD/game-hud.ftl
index b92706fb1ad..bf081f53ca2 100644
--- a/Resources/Locale/ru-RU/HUD/game-hud.ftl
+++ b/Resources/Locale/ru-RU/HUD/game-hud.ftl
@@ -1,6 +1,7 @@
game-hud-open-escape-menu-button-tooltip = Открыть меню паузы.
game-hud-open-guide-menu-button-tooltip = Открыть меню руководства.
game-hud-open-character-menu-button-tooltip = Открыть меню персонажа.
+game-hud-open-emotes-menu-button-tooltip = Открыть меню эмоций.
game-hud-open-inventory-menu-button-tooltip = Открыть меню инвентаря.
game-hud-open-crafting-menu-button-tooltip = Открыть меню создания.
game-hud-open-actions-menu-button-tooltip = Открыть меню действий.
diff --git a/Resources/Locale/ru-RU/_NF/ArachnidChaos.ftl b/Resources/Locale/ru-RU/_NF/ArachnidChaos.ftl
index 80f722e6dd7..80389300d63 100644
--- a/Resources/Locale/ru-RU/_NF/ArachnidChaos.ftl
+++ b/Resources/Locale/ru-RU/_NF/ArachnidChaos.ftl
@@ -1,4 +1,4 @@
-action-name-spider-bite = Высасывать кровь
-no-blood-warning = Там нет крови!
-no-good-blood = Ты не можешь пить эту кровь!
-spider-biting = { CAPITALIZE($UsernameName) } начинает высасывать у { CAPITALIZE($targetName) } кровь!
+action-name-spider-bite = Укуси и высоси кровь!
+no-blood-warning = Нет крови!
+no-good-blood = Вы не можете выпить эту кровь!
+spider-biting = { THE($UsernameName) } начинает высасывать у { THE($targetName) } кровь!
diff --git a/Resources/Locale/ru-RU/_NF/accent/accents.ftl b/Resources/Locale/ru-RU/_NF/accent/accents.ftl
index 8b0a0636719..a2be4a6e5bf 100644
--- a/Resources/Locale/ru-RU/_NF/accent/accents.ftl
+++ b/Resources/Locale/ru-RU/_NF/accent/accents.ftl
@@ -13,4 +13,4 @@ accent-words-mistake-cat-3 = я лв'наф пф' а.
accent-words-mistake-cat-4 = Й' ахор х' мггока'ай.
accent-words-mistake-cat-5 = Й' кант а'эхйе баг.
accent-words-mistake-cat-6 = ли х' нильг'ри нгахна.
-accent-words-mistake-cat-7 = ымг' мгеп л' а'н'га я.
+accent-words-mistake-cat-7 = ымг' мгеп л' а'н'га я.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/accent/goblin_accent.ftl b/Resources/Locale/ru-RU/_NF/accent/goblin_accent.ftl
new file mode 100644
index 00000000000..5c30e62b098
--- /dev/null
+++ b/Resources/Locale/ru-RU/_NF/accent/goblin_accent.ftl
@@ -0,0 +1,736 @@
+# a mix of cockney and cant (rogue/vagabond slang)
+# cockney: https://www.eastlondonhistory.co.uk/history-east-end-cockney/ (th -> f/v, tt -> ', er -> ah, -ing -> -in')
+# cant: https://www.gutenberg.org/files/47018/47018-h/47018-h.htm
+
+accent-goblin-words-1 = много
+accent-goblin-words-replace-1 = преполнёхонько
+accent-goblin-words-2 = шлюз
+accent-goblin-words-replace-2 = калит'ка
+accent-goblin-words-3 = шлюзы
+accent-goblin-words-replace-3 = калит'ки
+accent-goblin-words-4 = шлюза
+accent-goblin-words-replace-4 = калит'ки
+accent-goblin-words-5 = шлюзов
+accent-goblin-words-replace-5 = калит'ок
+accent-goblin-words-6 = шлюзу
+accent-goblin-words-replace-6 = калит'ке
+accent-goblin-words-7 = шлюзам
+accent-goblin-words-replace-7 = калит'кам
+accent-goblin-words-8 = шлюзом
+accent-goblin-words-replace-8 = калит'кой
+accent-goblin-words-9 = шлюзами
+accent-goblin-words-replace-9 = калит'ками
+accent-goblin-words-10 = шлюзах
+accent-goblin-words-replace-10 = калит'ках
+accent-goblin-words-11 = шлюзе
+accent-goblin-words-replace-11 = калит'ке
+accent-goblin-words-12 = я
+accent-goblin-words-replace-12 = Моя
+accent-goblin-words-13 = мы
+accent-goblin-words-replace-13 = Мои
+accent-goblin-words-14 = меня
+accent-goblin-words-replace-14 = Мою
+accent-goblin-words-15 = нас
+accent-goblin-words-replace-15 = Моих
+accent-goblin-words-16 = мне
+accent-goblin-words-replace-16 = Моей
+accent-goblin-words-17 = нам
+accent-goblin-words-replace-17 = Моим
+accent-goblin-words-18 = нами
+accent-goblin-words-replace-18 = Моими
+accent-goblin-words-19 = мной
+accent-goblin-words-replace-19 = Моей
+accent-goblin-words-20 = обо мне
+accent-goblin-words-replace-20 = о Моей
+accent-goblin-words-21 = о нас
+accent-goblin-words-replace-21 = о Моих
+accent-goblin-words-22 = во мне
+accent-goblin-words-replace-22 = в Моей
+accent-goblin-words-23 = идея
+accent-goblin-words-replace-23 = звяк
+accent-goblin-words-24 = антаг
+accent-goblin-words-replace-24 = лих'ач
+accent-goblin-words-25 = антагонист
+accent-goblin-words-replace-25 = лих'ач
+accent-goblin-words-26 = что угодно
+accent-goblin-words-replace-26 = всячина
+accent-goblin-words-27 = да
+accent-goblin-words-replace-27 = т'ак
+accent-goblin-words-28 = сб
+accent-goblin-words-replace-28 = ч'ин крыша
+accent-goblin-words-29 = эсбэ
+accent-goblin-words-replace-29 = ч'ин крыша
+accent-goblin-words-30 = перма
+accent-goblin-words-replace-30 = застенки
+accent-goblin-words-31 = перму
+accent-goblin-words-replace-31 = застенки
+accent-goblin-words-32 = в перме
+accent-goblin-words-replace-32 = в застенках
+accent-goblin-words-33 = к перме
+accent-goblin-words-replace-33 = к застенкам
+accent-goblin-words-34 = пермы
+accent-goblin-words-replace-34 = застенков
+accent-goblin-words-35 = пермах
+accent-goblin-words-replace-35 = застенках
+accent-goblin-words-36 = пермабриг
+accent-goblin-words-replace-36 = застенки
+accent-goblin-words-37 = пермабригу
+accent-goblin-words-replace-37 = застенкам
+accent-goblin-words-38 = пермабрига
+accent-goblin-words-replace-38 = застенков
+accent-goblin-words-39 = пермабригов
+accent-goblin-words-replace-39 = застенков
+accent-goblin-words-40 = пермабригах
+accent-goblin-words-replace-40 = застенках
+accent-goblin-words-41 = пермабригу
+accent-goblin-words-replace-41 = застенкам
+accent-goblin-words-42 = бью
+accent-goblin-words-replace-42 = накердышу
+accent-goblin-words-43 = удар
+accent-goblin-words-replace-43 = накердыш
+accent-goblin-words-44 = бьет
+accent-goblin-words-replace-44 = накердышит
+accent-goblin-words-45 = бить
+accent-goblin-words-replace-45 = накердышить
+accent-goblin-words-46 = бил
+accent-goblin-words-replace-46 = накердышил
+accent-goblin-words-47 = била
+accent-goblin-words-replace-47 = накердышила
+accent-goblin-words-48 = бьют
+accent-goblin-words-replace-48 = накердышат
+accent-goblin-words-49 = били
+accent-goblin-words-replace-49 = накердышили
+accent-goblin-words-50 = бейте
+accent-goblin-words-replace-50 = накердыште
+accent-goblin-words-51 = бей
+accent-goblin-words-replace-51 = накердыш
+accent-goblin-words-52 = сумка
+accent-goblin-words-replace-52 = авоська
+accent-goblin-words-53 = сумки
+accent-goblin-words-replace-53 = авоськи
+accent-goblin-words-54 = сумку
+accent-goblin-words-replace-54 = авоську
+accent-goblin-words-55 = сумкам
+accent-goblin-words-replace-55 = авоськам
+accent-goblin-words-56 = сумкой
+accent-goblin-words-replace-56 = авоськой
+accent-goblin-words-57 = сумками
+accent-goblin-words-replace-57 = авоськами
+accent-goblin-words-58 = сумках
+accent-goblin-words-replace-58 = авоськах
+accent-goblin-words-59 = сумке
+accent-goblin-words-replace-59 = авоське
+accent-goblin-words-60 = офицер
+accent-goblin-words-replace-60 = ч'ин
+accent-goblin-words-61 = офицеры
+accent-goblin-words-replace-61 = ч'ины
+accent-goblin-words-62 = офицера
+accent-goblin-words-replace-62 = ч'ина
+accent-goblin-words-63 = офицеров
+accent-goblin-words-replace-63 = ч'инов
+accent-goblin-words-64 = офицером
+accent-goblin-words-replace-64 = ч'ином
+accent-goblin-words-65 = офицеру
+accent-goblin-words-replace-65 = ч'ину
+accent-goblin-words-66 = офицерами
+accent-goblin-words-replace-66 = ч'инами
+accent-goblin-words-67 = офицерам
+accent-goblin-words-replace-67 = ч'инам
+accent-goblin-words-68 = офицерах
+accent-goblin-words-replace-68 = ч'инах
+accent-goblin-words-69 = офицере
+accent-goblin-words-replace-69 = ч'ине
+accent-goblin-words-70 = пиво
+accent-goblin-words-replace-70 = зелье
+accent-goblin-words-71 = пива
+accent-goblin-words-replace-71 = зелья
+accent-goblin-words-72 = пиве
+accent-goblin-words-replace-72 = зелье
+accent-goblin-words-73 = болт
+accent-goblin-words-replace-73 = шпингалет
+accent-goblin-words-74 = болты
+accent-goblin-words-replace-74 = шпингалеты
+accent-goblin-words-75 = болтов
+accent-goblin-words-replace-75 = шпингалетов
+accent-goblin-words-76 = болтах
+accent-goblin-words-replace-76 = шпингалетах
+accent-goblin-words-77 = болтами
+accent-goblin-words-replace-77 = шпингалетами
+accent-goblin-words-78 = болтам
+accent-goblin-words-replace-78 = шпингалетам
+accent-goblin-words-79 = скучно
+accent-goblin-words-replace-79 = тухляво
+accent-goblin-words-80 = канистра
+accent-goblin-words-replace-80 = бочка
+accent-goblin-words-81 = канистру
+accent-goblin-words-replace-81 = бочку
+accent-goblin-words-82 = канистры
+accent-goblin-words-replace-82 = бочки
+accent-goblin-words-83 = канистр
+accent-goblin-words-replace-83 = бочек
+accent-goblin-words-84 = канистре
+accent-goblin-words-replace-84 = бочке
+accent-goblin-words-85 = канистрам
+accent-goblin-words-replace-85 = бочкам
+accent-goblin-words-86 = канистрой
+accent-goblin-words-replace-86 = бочкой
+accent-goblin-words-87 = канистрами
+accent-goblin-words-replace-87 = бочками
+accent-goblin-words-88 = брат
+accent-goblin-words-replace-88 = бразе'ч
+accent-goblin-words-89 = братья
+accent-goblin-words-replace-89 = бразе'чи
+accent-goblin-words-90 = братьев
+accent-goblin-words-replace-90 = бразе'чей
+accent-goblin-words-91 = братьям
+accent-goblin-words-replace-91 = бразе'чам
+accent-goblin-words-92 = братьями
+accent-goblin-words-replace-92 = бразе'чами
+accent-goblin-words-93 = брата
+accent-goblin-words-replace-93 = бразе'ча
+accent-goblin-words-94 = брате
+accent-goblin-words-replace-94 = бразе'че
+accent-goblin-words-95 = братом
+accent-goblin-words-replace-95 = бразе'чем
+accent-goblin-words-96 = брату
+accent-goblin-words-replace-96 = бразе'чу
+accent-goblin-words-97 = братьях
+accent-goblin-words-replace-97 = бразе'чах
+accent-goblin-words-98 = бля
+accent-goblin-words-replace-98 = мас'сарак
+accent-goblin-words-99 = блять
+accent-goblin-words-replace-99 = мас'саракша
+accent-goblin-words-100 = блин
+accent-goblin-words-replace-100 = ятидрёный хряп
+accent-goblin-words-101 = капитан
+accent-goblin-words-replace-101 = заглавник
+accent-goblin-words-102 = капитана
+accent-goblin-words-replace-102 = заглавника
+accent-goblin-words-103 = капитану
+accent-goblin-words-replace-103 = заглавнику
+accent-goblin-words-104 = капитанов
+accent-goblin-words-replace-104 = заглавников
+accent-goblin-words-105 = капитанам
+accent-goblin-words-replace-105 = заглавникам
+accent-goblin-words-106 = капитанами
+accent-goblin-words-replace-106 = заглавниками
+accent-goblin-words-107 = капитанах
+accent-goblin-words-replace-107 = заглавниках
+accent-goblin-words-108 = капитане
+accent-goblin-words-replace-108 = заглавнике
+accent-goblin-words-109 = капитаном
+accent-goblin-words-replace-109 = заглавником
+accent-goblin-words-110 = капитаны
+accent-goblin-words-replace-110 = заглавники
+accent-goblin-words-111 = деньги
+accent-goblin-words-replace-111 = шуршики
+accent-goblin-words-112 = денег
+accent-goblin-words-replace-112 = шуршиков
+accent-goblin-words-113 = деньгам
+accent-goblin-words-replace-113 = шуршикам
+accent-goblin-words-114 = деньгами
+accent-goblin-words-replace-114 = шуршиками
+accent-goblin-words-115 = деньгах
+accent-goblin-words-replace-115 = шуршиках
+accent-goblin-words-116 = читер
+accent-goblin-words-replace-116 = жулик
+accent-goblin-words-117 = одежда
+accent-goblin-words-replace-117 = тряп'ча
+accent-goblin-words-118 = одежды
+accent-goblin-words-replace-118 = тряп'чи
+accent-goblin-words-119 = одежд
+accent-goblin-words-replace-119 = тряп'чей
+accent-goblin-words-120 = одежде
+accent-goblin-words-replace-120 = тряп'че
+accent-goblin-words-121 = одеждам
+accent-goblin-words-replace-121 = тряп'чам
+accent-goblin-words-122 = одежду
+accent-goblin-words-replace-122 = тряп'чу
+accent-goblin-words-123 = одеждой
+accent-goblin-words-replace-123 = тряп'чой
+accent-goblin-words-124 = одеждами
+accent-goblin-words-replace-124 = тряп'чами
+accent-goblin-words-125 = одеждах
+accent-goblin-words-replace-125 = тряп'чах
+accent-goblin-words-126 = клоун
+accent-goblin-words-replace-126 = рыжекудрый
+accent-goblin-words-127 = клоуны
+accent-goblin-words-replace-127 = рыжекудрые
+accent-goblin-words-128 = клоуна
+accent-goblin-words-replace-128 = рыжекудрого
+accent-goblin-words-129 = клоунов
+accent-goblin-words-replace-129 = рыжекудрых
+accent-goblin-words-130 = клоуну
+accent-goblin-words-replace-130 = рыжекудрому
+accent-goblin-words-131 = клоунам
+accent-goblin-words-replace-131 = рыжекудрым
+accent-goblin-words-132 = клоуном
+accent-goblin-words-replace-132 = рыжекудрым
+accent-goblin-words-133 = клоунами
+accent-goblin-words-replace-133 = рыжекудрыми
+accent-goblin-words-134 = клоуне
+accent-goblin-words-replace-134 = ражекудром
+accent-goblin-words-135 = клоунах
+accent-goblin-words-replace-135 = рыжекудрых
+accent-goblin-words-136 = труп
+accent-goblin-words-replace-136 = дрян
+accent-goblin-words-137 = трупы
+accent-goblin-words-replace-137 = дряны
+accent-goblin-words-138 = трупа
+accent-goblin-words-replace-138 = дряна
+accent-goblin-words-139 = трупов
+accent-goblin-words-replace-139 = дрянов
+accent-goblin-words-140 = трупу
+accent-goblin-words-replace-140 = дряну
+accent-goblin-words-141 = трупам
+accent-goblin-words-replace-141 = дрянам
+accent-goblin-words-142 = трупом
+accent-goblin-words-replace-142 = дряном
+accent-goblin-words-143 = трупами
+accent-goblin-words-replace-143 = дрянами
+accent-goblin-words-144 = трупе
+accent-goblin-words-replace-144 = дряне
+accent-goblin-words-145= трупах
+accent-goblin-words-replace-145 = дрянах
+accent-goblin-words-146 = лом
+accent-goblin-words-replace-146 = ключ
+accent-goblin-words-147 = лома
+accent-goblin-words-replace-147 = ключа
+accent-goblin-words-148 = лому
+accent-goblin-words-replace-148 = ключу
+accent-goblin-words-149 = ломом
+accent-goblin-words-replace-149 = ключом
+accent-goblin-words-150 = ломе
+accent-goblin-words-replace-150 = ключе
+accent-goblin-words-151 = ломы
+accent-goblin-words-replace-151 = ключи
+accent-goblin-words-152 = ломам
+accent-goblin-words-replace-152 = ключам
+accent-goblin-words-153 = ломах
+accent-goblin-words-replace-153 = ключах
+accent-goblin-words-154 = ломами
+accent-goblin-words-replace-154 = ключами
+accent-goblin-words-155 = ломов
+accent-goblin-words-replace-155 = ключей
+accent-goblin-words-156 = наручники
+accent-goblin-words-replace-156 = браслетки
+accent-goblin-words-157 = наручников
+accent-goblin-words-replace-157 = браслеток
+accent-goblin-words-158 = наручникам
+accent-goblin-words-replace-158 = браслеткам
+accent-goblin-words-159 = наручниками
+accent-goblin-words-replace-159 = браслетками
+accent-goblin-words-160 = наручниках
+accent-goblin-words-replace-160 = браслетках
+accent-goblin-words-161 = дворф
+accent-goblin-words-replace-161 = борода
+accent-goblin-words-162 = дварф
+accent-goblin-words-replace-162 = борода
+accent-goblin-words-163 = еда
+accent-goblin-words-replace-163 = снедь
+accent-goblin-words-164 = еды
+accent-goblin-words-replace-164 = снеди
+accent-goblin-words-165 = еде
+accent-goblin-words-replace-165 = снеди
+accent-goblin-words-166 = еду
+accent-goblin-words-replace-166 = снедь
+accent-goblin-words-167 = едой
+accent-goblin-words-replace-167 = снедью
+accent-goblin-words-168 = лох
+accent-goblin-words-replace-168 = чиплан
+accent-goblin-words-169 = лошара
+accent-goblin-words-replace-169 = чиплан
+accent-goblin-words-170 = лохи
+accent-goblin-words-replace-170 = чипланы
+accent-goblin-words-171 = лохе
+accent-goblin-words-replace-171 = чиплане
+accent-goblin-words-172 = лоху
+accent-goblin-words-replace-172 = чиплану
+accent-goblin-words-173 = лохи
+accent-goblin-words-replace-173 = чипланы
+accent-goblin-words-174 = лохам
+accent-goblin-words-replace-174 = чипланам
+accent-goblin-words-175 = лохом
+accent-goblin-words-replace-175 = чипланом
+accent-goblin-words-176 = лохами
+accent-goblin-words-replace-176 = чипланами
+accent-goblin-words-177 = лохах
+accent-goblin-words-replace-177 = чипланах
+accent-goblin-words-178 = нога
+accent-goblin-words-replace-178 = лапа
+accent-goblin-words-179 = ноги
+accent-goblin-words-replace-179 = лапы
+accent-goblin-words-180 = ног
+accent-goblin-words-replace-180 = лап
+accent-goblin-words-181 = ноге
+accent-goblin-words-replace-181 = лапе
+accent-goblin-words-182 = ногам
+accent-goblin-words-replace-182 = лапам
+accent-goblin-words-183 = ногу
+accent-goblin-words-replace-183 = лапу
+accent-goblin-words-184 = ногой
+accent-goblin-words-replace-184 = лапой
+accent-goblin-words-185 = ногами
+accent-goblin-words-replace-185 = лапами
+accent-goblin-words-186 = ногах
+accent-goblin-words-replace-186 = лапах
+accent-goblin-words-187 = скаф
+accent-goblin-words-replace-187 = космопанцирь
+accent-goblin-words-188 = скафа
+accent-goblin-words-replace-188 = космопанциря
+accent-goblin-words-189 = скафы
+accent-goblin-words-replace-189 = космопанцири
+accent-goblin-words-190 = скафов
+accent-goblin-words-replace-190 = космопанцирей
+accent-goblin-words-191 = скафу
+accent-goblin-words-replace-191 = космопанцирю
+accent-goblin-words-192 = скафам
+accent-goblin-words-replace-192 = космопанцирям
+accent-goblin-words-193 = скафом
+accent-goblin-words-replace-193 = космопанцирем
+accent-goblin-words-194 = скафе
+accent-goblin-words-replace-194 = космопанцире
+accent-goblin-words-195 = скафах
+accent-goblin-words-replace-195 = космопанцирях
+accent-goblin-words-196 = противогаз
+accent-goblin-words-replace-196 = ноздря
+accent-goblin-words-197 = противогазы
+accent-goblin-words-replace-197 = ноздри
+accent-goblin-words-198 = противогаза
+accent-goblin-words-replace-198 = ноздри
+accent-goblin-words-199 = противогазов
+accent-goblin-words-replace-199 = ноздрей
+accent-goblin-words-200 = противогазу
+accent-goblin-words-replace-200 = ноздре
+accent-goblin-words-201 = противогазам
+accent-goblin-words-replace-201 = ноздрям
+accent-goblin-words-202 = противогазом
+accent-goblin-words-replace-202 = ноздрёй
+accent-goblin-words-203 = противогазами
+accent-goblin-words-replace-203 = ноздрями
+accent-goblin-words-204 = противогазе
+accent-goblin-words-replace-204 = ноздре
+accent-goblin-words-205 = противогазах
+accent-goblin-words-replace-205 = ноздрях
+accent-goblin-words-206 = оружка
+accent-goblin-words-replace-206 = рогат'ка
+accent-goblin-words-207 = оружие
+accent-goblin-words-replace-207 = рогат'ка
+accent-goblin-words-208 = оружия
+accent-goblin-words-replace-208 = рогат'ок
+accent-goblin-words-209 = оружию
+accent-goblin-words-replace-209 = рогат'ке
+accent-goblin-words-210 = оружием
+accent-goblin-words-replace-210 = рогат'кой
+accent-goblin-words-211 = оружии
+accent-goblin-words-replace-211 = рогат'ке
+accent-goblin-words-212 = оружиям
+accent-goblin-words-replace-212 = рогат'кам
+accent-goblin-words-213 = оружиями
+accent-goblin-words-replace-213 = рогат'ками
+accent-goblin-words-214 = шаттл
+accent-goblin-words-replace-214 = байдара
+accent-goblin-words-215 = шаттлы
+accent-goblin-words-replace-215 = байдары
+accent-goblin-words-216 = шаттла
+accent-goblin-words-replace-216 = байдары
+accent-goblin-words-217 = шаттлов
+accent-goblin-words-replace-217 = байдар
+accent-goblin-words-218 = шаттлу
+accent-goblin-words-replace-218 = байдаре
+accent-goblin-words-219 = шаттлам
+accent-goblin-words-replace-219 = байдарам
+accent-goblin-words-220 = шаттлом
+accent-goblin-words-replace-220 = байдарой
+accent-goblin-words-221 = шаттлами
+accent-goblin-words-replace-221 = байдарами
+accent-goblin-words-222 = шаттле
+accent-goblin-words-replace-222 = байдаре
+accent-goblin-words-223 = шаттлах
+accent-goblin-words-replace-223 = байдарах
+accent-goblin-words-224 = шахтёр
+accent-goblin-words-replace-224 = копуша
+accent-goblin-words-225 = шахтёры
+accent-goblin-words-replace-225 = копуши
+accent-goblin-words-226 = шахтёра
+accent-goblin-words-replace-226 = копуши
+accent-goblin-words-227 = шахтёров
+accent-goblin-words-replace-227 = копуш
+accent-goblin-words-228 = шахтёру
+accent-goblin-words-replace-228 = копуше
+accent-goblin-words-229 = шахтёрам
+accent-goblin-words-replace-229 = копушам
+accent-goblin-words-230 = шахтёром
+accent-goblin-words-replace-230 = копушей
+accent-goblin-words-231 = шахтёрами
+accent-goblin-words-replace-231 = копушами
+accent-goblin-words-232 = шахтёре
+accent-goblin-words-replace-232 = копуше
+accent-goblin-words-233 = шахтёрах
+accent-goblin-words-replace-233 = копушах
+accent-goblin-words-234 = ученый
+accent-goblin-words-replace-234 = мозголом
+accent-goblin-words-235 = ученое
+accent-goblin-words-replace-235 = мозголом
+accent-goblin-words-236 = ученая
+accent-goblin-words-replace-236 = мозголомка
+accent-goblin-words-237 = ученые
+accent-goblin-words-replace-237 = мозголомы
+accent-goblin-words-238 = ученого
+accent-goblin-words-replace-238 = мозголома
+accent-goblin-words-239 = ученой
+accent-goblin-words-replace-239 = мозголомки
+accent-goblin-words-240 = ученых
+accent-goblin-words-replace-240 = мозголомов
+accent-goblin-words-241 = ученому
+accent-goblin-words-replace-241 = мозголому
+accent-goblin-words-242 = ученой
+accent-goblin-words-replace-242 = мозголомке
+accent-goblin-words-243 = ученым
+accent-goblin-words-replace-243 = мозголомам
+accent-goblin-words-244 = ученую
+accent-goblin-words-replace-244 = мозголомную
+accent-goblin-words-245 = учеными
+accent-goblin-words-replace-245 = мозголомами
+accent-goblin-words-246 = ученом
+accent-goblin-words-replace-246 = мозголоме
+accent-goblin-words-247 = кадет
+accent-goblin-words-replace-247 = младшен'кий
+accent-goblin-words-248 = кадеты
+accent-goblin-words-replace-248 = младшен'кие
+accent-goblin-words-249 = кадета
+accent-goblin-words-replace-249 = младшен'кого
+accent-goblin-words-250 = кадету
+accent-goblin-words-replace-250 = младшен'кому
+accent-goblin-words-251 = кадетом
+accent-goblin-words-replace-251 = младшен'ким
+accent-goblin-words-252 = кадетами
+accent-goblin-words-replace-252 = младшен'кими
+accent-goblin-words-253 = кадете
+accent-goblin-words-replace-253 = младшен'ком
+accent-goblin-words-254 = кадетах
+accent-goblin-words-replace-254 = младшен'ких
+accent-goblin-words-255 = moving
+accent-goblin-words-256 = murder
+accent-goblin-words-257 = murdered
+accent-goblin-words-258 = murdering
+accent-goblin-words-259 = myself
+accent-goblin-words-260 = neat
+accent-goblin-words-261 = neato
+accent-goblin-words-262 = nfsd
+accent-goblin-words-263 = nice
+accent-goblin-words-264 = no sense
+accent-goblin-words-265 = nonsense
+accent-goblin-words-266 = nonsensical
+accent-goblin-words-267 = nsfd
+accent-goblin-words-268 = officer
+accent-goblin-words-269 = paper
+accent-goblin-words-270 = papers
+accent-goblin-words-271 = pay
+accent-goblin-words-272 = person
+accent-goblin-words-273 = pilot
+accent-goblin-words-274 = pirate
+accent-goblin-words-275 = pirates
+accent-goblin-words-276 = poor
+accent-goblin-words-277 = prison
+accent-goblin-words-278 = prowler
+accent-goblin-words-279 = quickly
+accent-goblin-words-280 = reporter
+accent-goblin-words-281 = reporters
+accent-goblin-words-282 = restaurant
+accent-goblin-words-283 = rich
+accent-goblin-words-284 = rob
+accent-goblin-words-285 = robbed
+accent-goblin-words-286 = run
+accent-goblin-words-287 = saw
+accent-goblin-words-288 = scientific
+accent-goblin-words-289 = scientist
+accent-goblin-words-290 = scientists
+accent-goblin-words-291 = sec
+accent-goblin-words-292 = seccie
+accent-goblin-words-293 = security
+accent-goblin-words-294 = see
+accent-goblin-words-295 = seeing
+accent-goblin-words-296 = seen
+accent-goblin-words-297 = shit
+accent-goblin-words-298 = shitter
+accent-goblin-words-299 = shoe
+accent-goblin-words-300 = shoes
+accent-goblin-words-301 = shut up
+accent-goblin-words-302 = shut your mouth
+accent-goblin-words-303 = shuttle
+accent-goblin-words-304 = shuttles
+accent-goblin-words-305 = sleep
+accent-goblin-words-306 = sleeping
+accent-goblin-words-307 = slime
+accent-goblin-words-308 = slimes
+accent-goblin-words-309 = smart
+accent-goblin-words-310 = smoke
+accent-goblin-words-311 = smoked
+accent-goblin-words-312 = smokes
+accent-goblin-words-313 = smoking
+accent-goblin-words-314 = soccer
+accent-goblin-words-315 = something
+accent-goblin-words-316 = speak
+accent-goblin-words-317 = speaking
+accent-goblin-words-318 = spesos
+accent-goblin-words-319 = spoke
+accent-goblin-words-320 = steal
+accent-goblin-words-321 = stealing
+accent-goblin-words-322 = stole
+accent-goblin-words-323 = stolen
+accent-goblin-words-324 = stop
+accent-goblin-words-325 = stupid
+accent-goblin-words-326 = syndi
+accent-goblin-words-327 = syndicate
+accent-goblin-words-328 = syndicates
+accent-goblin-words-329 = syndie
+accent-goblin-words-330 = syndies
+accent-goblin-words-331 = syndis
+accent-goblin-words-332 = take
+accent-goblin-words-333 = takes
+accent-goblin-words-334 = taking
+accent-goblin-words-335 = talk
+accent-goblin-words-336 = talking
+accent-goblin-words-337 = talks
+accent-goblin-words-338 = templar
+accent-goblin-words-339 = theft
+accent-goblin-words-340 = thief
+accent-goblin-words-341 = thieving
+accent-goblin-words-342 = thing
+accent-goblin-words-343 = think
+accent-goblin-words-344 = thinking
+accent-goblin-words-345 = thought
+accent-goblin-words-346 = thoughts
+accent-goblin-words-347 = tobacco
+accent-goblin-words-348 = took
+accent-goblin-words-349 = trick
+accent-goblin-words-350 = tricked
+accent-goblin-words-351 = tricky
+accent-goblin-words-352 = warden
+accent-goblin-words-353 = wardens
+accent-goblin-words-354 = watch
+accent-goblin-words-355 = watched
+accent-goblin-words-356 = watches
+accent-goblin-words-357 = watching
+accent-goblin-words-358 = water
+accent-goblin-words-359 = whether
+accent-goblin-words-360 = with
+accent-goblin-words-361 = without
+accent-goblin-words-362 = write
+accent-goblin-words-363 = writes
+accent-goblin-words-364 = writing
+accent-goblin-words-365 = written
+accent-goblin-words-366 = wrote
+accent-goblin-words-replace-255 = movin’
+accent-goblin-words-replace-256 = burke
+accent-goblin-words-replace-257 = burked
+accent-goblin-words-replace-258 = burkin’
+accent-goblin-words-replace-259 = meseuf
+accent-goblin-words-replace-260 = dimbah
+accent-goblin-words-replace-261 = dimbah
+accent-goblin-words-replace-262 = coppahs
+accent-goblin-words-replace-263 = rootah
+accent-goblin-words-replace-264 = fudge
+accent-goblin-words-replace-265 = fudge
+accent-goblin-words-replace-266 = fudge
+accent-goblin-words-replace-267 = coppahs
+accent-goblin-words-replace-268 = coppah
+accent-goblin-words-replace-269 = linendraper
+accent-goblin-words-replace-270 = linendrapers
+accent-goblin-words-replace-271 = bit
+accent-goblin-words-replace-272 = bloke
+accent-goblin-words-replace-273 = jarvey
+accent-goblin-words-replace-274 = rampsman
+accent-goblin-words-replace-275 = rampsmen
+accent-goblin-words-replace-276 = quisby
+accent-goblin-words-replace-277 = lock-up
+accent-goblin-words-replace-278 = prowlah
+accent-goblin-words-replace-279 = winkin’
+accent-goblin-words-replace-280 = penny-a-liner
+accent-goblin-words-replace-281 = penny-a-liners
+accent-goblin-words-replace-282 = grubbin’-ken
+accent-goblin-words-replace-283 = flush
+accent-goblin-words-replace-284 = fylche
+accent-goblin-words-replace-285 = fylched
+accent-goblin-words-replace-286 = pike
+accent-goblin-words-replace-287 = staged
+accent-goblin-words-replace-288 = rumgumptious
+accent-goblin-words-replace-289 = gnostic
+accent-goblin-words-replace-290 = gnostics
+accent-goblin-words-replace-291 = coppah
+accent-goblin-words-replace-292 = beak
+accent-goblin-words-replace-293 = coppah
+accent-goblin-words-replace-294 = stags
+accent-goblin-words-replace-295 = staggin’
+accent-goblin-words-replace-296 = staged
+accent-goblin-words-replace-297 = dung
+accent-goblin-words-replace-298 = dungah
+accent-goblin-words-replace-299 = stampah
+accent-goblin-words-replace-300 = stampahs
+accent-goblin-words-replace-301 = avast
+accent-goblin-words-replace-302 = avast ya gob
+accent-goblin-words-replace-303 = shu’le
+accent-goblin-words-replace-304 = shu’les
+accent-goblin-words-replace-305 = doss
+accent-goblin-words-replace-306 = dossin’
+accent-goblin-words-replace-307 = ooze
+accent-goblin-words-replace-308 = oozes
+accent-goblin-words-replace-309 = dimbah-dambah
+accent-goblin-words-replace-310 = blow a cloud
+accent-goblin-words-replace-311 = blew a clowd
+accent-goblin-words-replace-312 = blows a cloud
+accent-goblin-words-replace-313 = blowin’ a cloud
+accent-goblin-words-replace-314 = football
+accent-goblin-words-replace-315 = somefin'
+accent-goblin-words-replace-316 = pa'ah
+accent-goblin-words-replace-317 = pa'ahin’
+accent-goblin-words-replace-318 = dimmocks
+accent-goblin-words-replace-319 = pa'ed
+accent-goblin-words-replace-320 = fylche
+accent-goblin-words-replace-321 = fylchin’
+accent-goblin-words-replace-322 = fylched
+accent-goblin-words-replace-323 = fylched
+accent-goblin-words-replace-324 = avast
+accent-goblin-words-replace-325 = duffah
+accent-goblin-words-replace-326 = lobster
+accent-goblin-words-replace-327 = lobster
+accent-goblin-words-replace-328 = lobsters
+accent-goblin-words-replace-329 = lobster
+accent-goblin-words-replace-330 = lobsters
+accent-goblin-words-replace-331 = lobsters
+accent-goblin-words-replace-332 = knap
+accent-goblin-words-replace-333 = knaps
+accent-goblin-words-replace-334 = knappin'
+accent-goblin-words-replace-335 = gab
+accent-goblin-words-replace-336 = gabbin'
+accent-goblin-words-replace-337 = gabs
+accent-goblin-words-replace-338 = templah
+accent-goblin-words-replace-339 = fylchin’
+accent-goblin-words-replace-340 = fylchah
+accent-goblin-words-replace-341 = fylchin’
+accent-goblin-words-replace-342 = fin’
+accent-goblin-words-replace-343 = fink
+accent-goblin-words-replace-344 = finkin’
+accent-goblin-words-replace-345 = fought
+accent-goblin-words-replace-346 = foughts
+accent-goblin-words-replace-347 = fogus
+accent-goblin-words-replace-348 = knapped
+accent-goblin-words-replace-349 = rig
+accent-goblin-words-replace-350 = rigged
+accent-goblin-words-replace-351 = riggy
+accent-goblin-words-replace-352 = jiggah-dubbah
+accent-goblin-words-replace-353 = jiggah-dubbahs
+accent-goblin-words-replace-354 = tout
+accent-goblin-words-replace-355 = touted
+accent-goblin-words-replace-356 = touts
+accent-goblin-words-replace-357 = toutin’
+accent-goblin-words-replace-358 = wo’ah
+accent-goblin-words-replace-359 = wever
+accent-goblin-words-replace-360 = wiv
+accent-goblin-words-replace-361 = wivout
+accent-goblin-words-replace-362 = screeve
+accent-goblin-words-replace-363 = screeves
+accent-goblin-words-replace-364 = screevin’
+accent-goblin-words-replace-365 = screeved
+accent-goblin-words-replace-366 = screeved
diff --git a/Resources/Locale/ru-RU/_NF/actions/sleep.ftl b/Resources/Locale/ru-RU/_NF/actions/sleep.ftl
index 82390387fe8..4fa1dce9ece 100644
--- a/Resources/Locale/ru-RU/_NF/actions/sleep.ftl
+++ b/Resources/Locale/ru-RU/_NF/actions/sleep.ftl
@@ -1 +1 @@
-popup-sleep-in-bag = {CAPITALIZE($entity) } сворачивается клубочком и засыпает.
+popup-sleep-in-bag = { THE($entity) } сворачивается клубочком и засыпает.
diff --git a/Resources/Locale/ru-RU/_NF/adventure/adventure.ftl b/Resources/Locale/ru-RU/_NF/adventure/adventure.ftl
index 4447c58aea2..cf16b84c617 100644
--- a/Resources/Locale/ru-RU/_NF/adventure/adventure.ftl
+++ b/Resources/Locale/ru-RU/_NF/adventure/adventure.ftl
@@ -1,27 +1,22 @@
## UI
-
-playtime-deny-reason-not-whitelisted = Вы должны быть в белом списке.
+playtime-deny-reason-not-whitelisted = Вы должны быть в белом списке сервера.
adventure-list-start = Галактический Банк NT
-adventure-mode-profit-text = совокупная прибыль составила: { " " }
-adventure-mode-loss-text = всего потеряно: { " " }
+adventure-mode-profit-text = прибыль составила: { " " }
+adventure-mode-loss-text = убыток составил: { " " }
adventure-list-high = Больше всего заработали:
adventure-list-low = Больше всего потратили:
adventure-title = Приключения на Фронтире
-adventure-description = Купите собственный корабль или присоединитесь к любой команде, исследуйте, изучайте, занимайтесь спасением или перевозкой, чтобы разбогатеть!
-currency = Спесосы
-guide-entry-adventure = Программа Новый Фронтир
-guide-entry-bank = Галактический Банк NT
-guide-entry-shipyard = Верфи Фронтира
+adventure-description = Исследуйте неизведанные уголки космоса, проводите научные исследования, занимайтесь спасательными операциями или транспортировкой грузов и прокладывайте свой путь к богатству!
+currency = Кредиты
shipyard-rules-default1 =
- Благодарим за присоединение к Службе Безопасности сектора.
- Покупая Патрульный Шаттл вы соглашаетесь соблюдать Корпоративный Закон
- который можно найти на https://station14.ru/wiki/%D0%9A%D0%BE%D1%80%D0%BF%D0%BE%D1%80%D0%B0%D1%82%D0%B8%D0%B2%D0%BD%D1%8B%D0%B9_%D0%97%D0%B0%D0%BA%D0%BE%D0%BD
+ Благодарим Вас за присоединение к ДПСБФ.
+ Покупая шаттл вы соглашаетесь со всеми
+ положениями Космического Закона.
shipyard-rules-default2 =
Любые действия, совершаемые вами или вашим экипажем, нарушающие
- Корпоративный Закон приведут к административным мерам.
- Спасибо, что выбрали Службу Безопасности NT.
-shuttle-ftl-proximity = Близлежащие объекты слишком массивны для FTL прыжка!
-ftl-channel-blocked = FTL канал перегружен, попробуйте позже.
+ Космический Закон, приведут к административным мерам.
+ Благодарим за выбор Департамента Службы Безопасности Фронтира.
+shuttle-ftl-proximity = Массивный объект блокирует блюспейс прыжок!
changelog-tab-title-Upstream = Журнал изменений
-public-transit-departure = Направляемся в { $destination }. Ориентировочное время в пути: { $flytime } секунд.
-public-transit-arrival = Спасибо за выбор общественного транспорта NT. Следующий шаттл до { $destination } отправляется через { $waittime } секунд.
+public-transit-departure = Транспорт направляется в { $destination }. Ориентировочное время в пути: { $flytime } секунд.
+public-transit-arrival = Благодарим за выбор общественного транспорта NT. Следующий шаттл до { $destination } отправляется через { $waittime } секунд.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/bloodculthumanoidmob.ftl b/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/bloodculthumanoidmob.ftl
index 8e7e04fc40f..d9c8a9ae503 100644
--- a/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/bloodculthumanoidmob.ftl
+++ b/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/bloodculthumanoidmob.ftl
@@ -1,20 +1,20 @@
-advertisement-bloodcultisthumanoid-1 = Нар'Си воскреснет снова!
-advertisement-bloodcultisthumanoid-2 = Мы выпьем вашу кровь!
-advertisement-bloodcultisthumanoid-3 = Убейте неверующего!
+advertisement-bloodcultisthumanoid-1 = Нар'Си вернётся!
+advertisement-bloodcultisthumanoid-2 = Мы заберём твою кровь!
+advertisement-bloodcultisthumanoid-3 = Убить еретиков!
advertisement-bloodcultisthumanoid-4 = Что это было?
advertisement-bloodcultisthumanoid-5 = Ты. Будешь. Страдать.
-advertisement-bloodcultisthumanoid-6 = Больше крови для Нар'Си!
-advertisement-bloodcultisthumanoid-7 = Тебе не следовало приходить сюда, Кровавый Мешок!
-advertisement-bloodcultisthumanoid-8 = Я умру, если Нар'Си этого захочет!
-advertisement-bloodcultisthumanoid-9 = Я слышу Зов Пустоты.
-advertisement-bloodcultisthumanoid-10 = Сразись или сдайся — исход один: твоя кровь станет нашей.
-advertisement-bloodcultisthumanoid-11 = Кровь!
-advertisement-bloodcultisthumanoid-12 = Слава Скрытой Пустоте!
-advertisement-bloodcultisthumanoid-13 = Вы познаете настоящую боль!
-advertisement-bloodcultisthumanoid-14 = Никакой пощады не будет, неверующий.
-advertisement-bloodcultisthumanoid-15 = Эй, классная куртка!
-advertisement-bloodcultisthumanoid-16 = Смерть последователям ЛОЖНЫХ Богов!
-advertisement-bloodcultisthumanoid-17 = Да-да, кровь. Нужно больше крови. Больше, да.
-advertisement-bloodcultisthumanoid-18 = Пустота заберет тебя!
-advertisement-bloodcultisthumanoid-19 = *мычит*
-advertisement-bloodcultisthumanoid-20 = Я сделаю флейту из твоей ключицы!
+advertisement-bloodcultisthumanoid-6 = Нужно больше крови!
+advertisement-bloodcultisthumanoid-7 = Лучше бы ты сюда не приходил!
+advertisement-bloodcultisthumanoid-8 = Умру за Нар'Си!
+advertisement-bloodcultisthumanoid-9 = Я слышу зов из бездны...
+advertisement-bloodcultisthumanoid-10 = Не важно, сдашься ты или умрёшь, мы заберём твою кровь!
+advertisement-bloodcultisthumanoid-11 = Крови!
+advertisement-bloodcultisthumanoid-12 = О великая бездна!
+advertisement-bloodcultisthumanoid-13 = Ты познаешь настоящую боль!
+advertisement-bloodcultisthumanoid-14 = Никакой пощады еретикам!
+advertisement-bloodcultisthumanoid-15 = О, отличная курточка!
+advertisement-bloodcultisthumanoid-16 = Смерть всем последователям ложных богов!
+advertisement-bloodcultisthumanoid-17 = Да-да, нужно больше крови, БОЛЬШЕ!
+advertisement-bloodcultisthumanoid-18 = Бездна заберёт тебя!
+advertisement-bloodcultisthumanoid-19 = *хмыкнул*
+advertisement-bloodcultisthumanoid-20 = Я сделаю из тебя отбивную!
diff --git a/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/mimehostilehumanoidmob.ftl b/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/mimehostilehumanoidmob.ftl
index 3cdafb98591..aa3b2c1fddc 100644
--- a/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/mimehostilehumanoidmob.ftl
+++ b/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/mimehostilehumanoidmob.ftl
@@ -1,20 +1,20 @@
advertisement-mimehumanoid-1 = *притворился что свистит*
-advertisement-mimehumanoid-2 = *указывал на тебя и провёл пальцем по шее*
+advertisement-mimehumanoid-2 = *указал на тебя и провёл пальцем по шее*
advertisement-mimehumanoid-3 = *выступил в качестве свидетеля непредумышленного убийства*
advertisement-mimehumanoid-4 = *медленно переступил с пятки на носок*
-advertisement-mimehumanoid-5 = *притворился что окружен невидимыми стенами.*
+advertisement-mimehumanoid-5 = *притворился что окружен невидимыми стенами*
advertisement-mimehumanoid-6 = *стоит в полной неподвижности*
advertisement-mimehumanoid-7 = *передвигается неровными рывками*
advertisement-mimehumanoid-8 = *беззвучно чихнул несолько раз*
-advertisement-mimehumanoid-9 = *делает вид, что рисует карандашом на холсте, закрепленном на мольберте*
+advertisement-mimehumanoid-9 = *сделал вид, что рисует карандашом на холсте, закрепленном на мольберте*
advertisement-mimehumanoid-10 = *имитирует официанта, обслуживающего столик на двоих*
advertisement-mimehumanoid-11 = *делает колесо и встаёт на руки*
advertisement-mimehumanoid-12 = *имитирует игру на скрипке, вы узнаёте мелодию из фильма "День когда Клоун остановился"*
advertisement-mimehumanoid-13 = *притворяется что общается с семьей, которого у ниго никогда не было*
advertisement-mimehumanoid-14 = *притворяется что ведет интенсивные переговоры по телефону*
advertisement-mimehumanoid-15 = *притворяется, что поскользнулся, но вместо падения плавно переходит к исполнению чечетки*
-advertisement-mimehumanoid-16 = *притворяется джаззменом*
+advertisement-mimehumanoid-16 = *притворяется джазменом*
advertisement-mimehumanoid-17 = *притворяется что подкинул монетку и выглядит недовольным результатом*
advertisement-mimehumanoid-18 = *беззвучно плачет и причитает*
-advertisement-mimehumanoid-19 = *подсчитывает что-то на пальцаз*
-advertisement-mimehumanoid-20 = *танцует под воображаемую музыку*
+advertisement-mimehumanoid-19 = *подсчитывает что-то на пальцах*
+advertisement-mimehumanoid-20 = *танцует под воображаемую музыку*
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/syndicatehumanoidmob.ftl b/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/syndicatehumanoidmob.ftl
index 7d85a774503..c52e9cee1f1 100644
--- a/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/syndicatehumanoidmob.ftl
+++ b/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/syndicatehumanoidmob.ftl
@@ -1,20 +1,20 @@
-advertisement-syndicatehumanoid-1 = Чувак, я ненавижу NanoTrasen!
-advertisement-syndicatehumanoid-2 = Вчера я видел сотрудника NT. Жалкое существо.
-advertisement-syndicatehumanoid-3 = Должно быть, это был ветер.
-advertisement-syndicatehumanoid-4 = Что это было?
-advertisement-syndicatehumanoid-5 = Вы это видели?
-advertisement-syndicatehumanoid-6 = Эй, чувак, зацени-ка!
-advertisement-syndicatehumanoid-7 = Черт, мощный косячок, меня аж колбасит!
-advertisement-syndicatehumanoid-8 = Я с нетерпением жду надбавку за работу в опасных условиях.
-advertisement-syndicatehumanoid-9 = УМРИ, УМРИ, УМРИ!
+advertisement-syndicatehumanoid-1 = Ненавижу это место, чувак!!
+advertisement-syndicatehumanoid-2 = Я тут недавеча видел работника Нэнотрузен. Жалкий чмошник.
+advertisement-syndicatehumanoid-3 = Наверное это ветер.
+advertisement-syndicatehumanoid-4 = Чо щас было?
+advertisement-syndicatehumanoid-5 = Ты слышал?
+advertisement-syndicatehumanoid-6 = Хэй, чувак, зацени-ка это!
+advertisement-syndicatehumanoid-7 = Ебать меня вштырило!
+advertisement-syndicatehumanoid-8 = Я потребую прибавку к оплате за это дерьмо.
+advertisement-syndicatehumanoid-9 = УБИВАТЬ, УБИВАТЬ, УБИВАТЬ!
advertisement-syndicatehumanoid-10 = Иногда мне снится сыр...
-advertisement-syndicatehumanoid-11 = СТОЯТЬ!
+advertisement-syndicatehumanoid-11 = Стоять!
advertisement-syndicatehumanoid-12 = Слава Синдикату!
-advertisement-syndicatehumanoid-13 = Хватит сопротивляться!
-advertisement-syndicatehumanoid-14 = Бросай оружие!
-advertisement-syndicatehumanoid-15 = Ааа!
-advertisement-syndicatehumanoid-16 = Хах, забавно.
-advertisement-syndicatehumanoid-17 = В конце концов, этот день складывается хорошо!
-advertisement-syndicatehumanoid-18 = Ха! Получай!
+advertisement-syndicatehumanoid-13 = Не пытайся сопротивляться!
+advertisement-syndicatehumanoid-14 = Брось оружие, еблан!
+advertisement-syndicatehumanoid-15 = Ёп-т!
+advertisement-syndicatehumanoid-16 = Ха, смешно.
+advertisement-syndicatehumanoid-17 = Хех, несмотря ни на что этот день прекрасен!
+advertisement-syndicatehumanoid-18 = Получай!
advertisement-syndicatehumanoid-19 = *свистит*
-advertisement-syndicatehumanoid-20 = Чур мое!
+advertisement-syndicatehumanoid-20 = Ой да брось!
diff --git a/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/wizardhumanoidmob.ftl b/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/wizardhumanoidmob.ftl
index fa2bfe3c8fa..ca2ed1e8530 100644
--- a/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/wizardhumanoidmob.ftl
+++ b/Resources/Locale/ru-RU/_NF/advertisements/mobchatter/wizardhumanoidmob.ftl
@@ -17,4 +17,4 @@ advertisement-wizardhumanoid-16 = А̴̱̦͌̾н̷̧̰͓͔͑̋̄т̵͚̇̀̑̏̆
advertisement-wizardhumanoid-17 = В̸͎̌̍ѝ̷͎̇̚͝н̴̣͎̣̰̈́͘̕д̴̨̤͆и̵͈͓̰͝у̵̣̘̓͜с̸̻̘̟̾̍͝ ̷̻̐̆̊Р̸͖̄͌͛̑ё̵͉̕в̸̳͇̫͔̅͛и̵̡̝̘̑̓а̴̘̘̜̱̽̽к̵̡̫̪̊͆̇͠е̷͇̮̣́̀͋ ̸̲̼̝̗͆͋̂̃С̸̥̘͑̀͝ӥ̸͔̖̘́с̷̨̺͌̍͠е̷̟̍̏й̶̖͚́̓и̸̳͖̮́͝т̵̖̟͛͝у̸̟̓͒̀̚͜р̶̱̐̽̿и̸̯̩̍̿̿͜͝
advertisement-wizardhumanoid-18 = В̵̛̲̺͙͘и̷̠̜̦͌̀̓̓а̴͎̟̙̦̙̽͑́̓̽о̸̫͘г̶̗͚̮̤̑у̷͎̖̔͒и̸̯͓͙̗̎̀͒̿н̷̘̭͊̒ ̸͍̥̦̎̀З̴̱̼̰̃͝͠ͅо̸̢̱͙̦̆а̶̻͓̥̫̠̓̀̕ю̶͔̈̈́б̷̧̨̺̰̲̋̓̅а̴̮̘͔͇̖͝ ̶̛̠̙̯͉͋̓̂͝В̸̘͍͔̦̂̀͘͠е̷͖̦̏̎̾̉̏н̵͙̗̭̦̈́̌̏т̵̨͖̯̓͛͛ё̵̠̘̯͎́̿̒͊й̴̱̦̖̥̉̾̏͠ͅа̴̡̬͉͔̓̊̇͒̕л̶̡͈̫̯̞̽̏̾̔̓ќ̷̨̝͎͕͒͋̀ͅу̶̛̰̙̭͚̝̀͗̃͂с̵̨̘̓̌͒
advertisement-wizardhumanoid-19 = *смеётся*
-advertisement-wizardhumanoid-20 = *хихикает*
+advertisement-wizardhumanoid-20 = *хихикает*
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/advertisements/vending/astro.ftl b/Resources/Locale/ru-RU/_NF/advertisements/vending/astro.ftl
index e72b8b9bcd9..8a4de9487af 100644
--- a/Resources/Locale/ru-RU/_NF/advertisements/vending/astro.ftl
+++ b/Resources/Locale/ru-RU/_NF/advertisements/vending/astro.ftl
@@ -1,2 +1,2 @@
advertisement-astrovend-1 = Выбор Spessman's!
-advertisement-astrovend-2 = Не покидай верфи без скафандра!
+advertisement-astrovend-2 = Не покидай аванпост без скафандра!
diff --git a/Resources/Locale/ru-RU/_NF/advertisements/vending/cuddlycritter.ftl b/Resources/Locale/ru-RU/_NF/advertisements/vending/cuddlycritter.ftl
index 3ebf88ead4c..a3854a6e10d 100644
--- a/Resources/Locale/ru-RU/_NF/advertisements/vending/cuddlycritter.ftl
+++ b/Resources/Locale/ru-RU/_NF/advertisements/vending/cuddlycritter.ftl
@@ -1,8 +1,8 @@
-advertisement-cuddlycritter-1 = Озарите свой день пушистым другом!
+advertisement-cuddlycritter-1 = Озари свой день мягкой игрушкой!
advertisement-cuddlycritter-2 = Обнимашечная терапия начинается здесь!
advertisement-cuddlycritter-3 = Поддайтесь плюшевому искушению!
-advertisement-cuddlycritter-4 = Вам не устоять их очарованию!
-advertisement-cuddlycritter-5 = Внимание: грядет экстремальная милота!
-advertisement-cuddlycritter-6 = Помогите, я застрял на фабрике NanoTrasen, они заставляют меня шить плюшевые игрушки.
-advertisement-cuddlycritter-7 = Мягче, чем асбест!
-advertisement-cuddlycritter-8 = Ручшие разноцветные мелки во всем Фронтире, предложение 65.
+advertisement-cuddlycritter-4 = Вам не устоять перед их чарами!
+advertisement-cuddlycritter-5 = Перед вами зашкаливающий уровень милоты!
+advertisement-cuddlycritter-6 = Помогите, меня заточили на фабрике НаноТрейсен, вынуждают шить плюшки!
+advertisement-cuddlycritter-7 = Мягче асбестового пуха!
+advertisement-cuddlycritter-8 = Лучшие в космосе расцветки из безвредных красителей, положение 65.
diff --git a/Resources/Locale/ru-RU/_NF/advertisements/vending/lesslethalvend.ftl b/Resources/Locale/ru-RU/_NF/advertisements/vending/lesslethalvend.ftl
index f543d63a533..53560452754 100644
--- a/Resources/Locale/ru-RU/_NF/advertisements/vending/lesslethalvend.ftl
+++ b/Resources/Locale/ru-RU/_NF/advertisements/vending/lesslethalvend.ftl
@@ -1,20 +1,20 @@
-advertisement-lesslethalvend-1 = Резиновые пули поднимают настроение!
-advertisement-lesslethalvend-2 = ТравМаг(™). Выбор умных!
-advertisement-lesslethalvend-3 = Пистоны для всех и каждого!
-advertisement-lesslethalvend-4 = Шокируй своих друзей тазером ПРЯМО СЕЙЧАС!
-advertisement-lesslethalvend-5 = Внимание: Для покупок вам должно быть не менее 3 месяцев.
-advertisement-lesslethalvend-6 = Они лгут.
-advertisement-lesslethalvend-7 = Победи своих врагов мирным путем УЖЕ СЕГОДНЯ!
-advertisement-lesslethalvend-8 = ТравМаг(™) ЭТО ВЕСЕЛО
-advertisement-lesslethalvend-9 = КУПИ КУПИ КУПИ ПРЯМО СЕЙЧАС
-advertisement-lesslethalvend-10 = Только полный идиот покупает летальное оружие, переходи на ТравМаг(™) ПРЯМО ЗДЕСЬ!
-advertisement-lesslethalvend-11 = Накажи злодеев палкой. СЕЙЧАС!
-advertisement-lesslethalvend-12 = Гордимся партнерством с ДСБФ! За безопасное будущее!
-advertisement-lesslethalvend-13 = Не поддавайся на уловки конкурентов.
-advertisement-lesslethalvend-14 = Меньше смертей - больше экономии!
-advertisement-lesslethalvend-15 = С гордодстью представляем наше последнее изобредение - травматические лазеры!
-advertisement-lesslethalvend-16 = Напоминаем: резиновые пули - не жвачка, не кушать!
-advertisement-lesslethalvend-17 = Резиновые пули и многое другое - все для твоей защиты уже сегодня!
-advertisement-lesslethalvend-18 = Внимание: Пистоны не съедобны.
-advertisement-lesslethalvend-19 = Подумай о своей безопасности СЕГОДНЯ!
-advertisement-lesslethalvend-20 = Может, именно ты станешь нашим 1,000,000-м покупателем?
+advertisement-lesslethalvend-1 = Озари чей-то день резиновой пулей!
+advertisement-lesslethalvend-2 = ТравМаг (™)- единственно верный путь!
+advertisement-lesslethalvend-3 = Резина полезна для организма! Не является врачебной рекомендацией.
+advertisement-lesslethalvend-4 = Разрядите друзей шокером СЕГОДНЯ!
+advertisement-lesslethalvend-5 = Внимание: вам должно быть больше 3 месяцев для покупки.
+advertisement-lesslethalvend-6 = Не верьте их лжи
+advertisement-lesslethalvend-7 = Вымотайте врагов миролюбиво СЕГОДНЯ!
+advertisement-lesslethalvend-8 = ТравМаг(™) призывает веселиться!
+advertisement-lesslethalvend-9 = КУПИ КУПИ КУПИ КУПИ!
+advertisement-lesslethalvend-10 = Только идиот покупает настоящее оружие, бери ТравМаг (™) СЕГОДНЯ!
+advertisement-lesslethalvend-11 = Отлупи негодяев дубинкой. ПРЯМО СЕЙЧАС!
+advertisement-lesslethalvend-12 = Гордимся партнёроством с ДСБФ!
+advertisement-lesslethalvend-13 = Голосуй за Кеннеди XIV при поддержке ТравМаг (™)
+advertisement-lesslethalvend-14 = Меньше смертей - больше скидок ДЛЯ ВАС!
+advertisement-lesslethalvend-15 = ордимся быть №1 среди оружейных венд-машин на Фронтире!
+advertisement-lesslethalvend-16 = Предупреждение: есть резиновые пули опасно для вашего здоровья.
+advertisement-lesslethalvend-17 = Купите универсальные травматические патроны! Они биоразлагаемые!
+advertisement-lesslethalvend-18 = Предупреждение: есть гильзы опасно для вашего здоровья.
+advertisement-lesslethalvend-19 = Покупайте резинки ДЛЯ ВСЕГО здесь СЕГОДНЯ!
+advertisement-lesslethalvend-20 = Вы можете стать нашим 1,000,000-ым покупателем!
diff --git a/Resources/Locale/ru-RU/_NF/advertisements/vending/maildrobe.ftl b/Resources/Locale/ru-RU/_NF/advertisements/vending/maildrobe.ftl
index ef8aadbd9be..26749f87245 100644
--- a/Resources/Locale/ru-RU/_NF/advertisements/vending/maildrobe.ftl
+++ b/Resources/Locale/ru-RU/_NF/advertisements/vending/maildrobe.ftl
@@ -1,2 +1,2 @@
-advertisement-maildrobe-1 = Оставь любую собаку позади с нашими почтовыми шортами из псевдозамши и дюракарбона! Спешите, количество ограничено!
-advertisement-maildrobe-2 = Синий идет тебе как никому другому!
+advertisement-maildrobe-1 = Обгоните любую собаку в наших псевдо-замшевых дюракарбоновых почтальонских шортах! Ограниченная серия!
+advertisement-maildrobe-2 = Синий цвет вам к лицу!
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/bank/bank-ATM-component.ftl b/Resources/Locale/ru-RU/_NF/bank/bank-ATM-component.ftl
index 1aa84c77bf1..07d473f0855 100644
--- a/Resources/Locale/ru-RU/_NF/bank/bank-ATM-component.ftl
+++ b/Resources/Locale/ru-RU/_NF/bank/bank-ATM-component.ftl
@@ -1,26 +1,26 @@
## UI
bank-atm-menu-title = Галактический Банк NT
-bank-atm-menu-balance-label = Ваш Баланс:{ " " }
-bank-atm-menu-no-bank = Нет лицевого счёта!
+bank-atm-menu-balance-label = Баланс аккаунта:{ " " }
+bank-atm-menu-no-bank = Нет аккаунта!
bank-atm-menu-withdraw-button = Вывести
-bank-atm-menu-deposit-label = Внести Сумму:{ " " }
+bank-atm-menu-deposit-label = Внести сумму:{ " " }
bank-atm-menu-no-deposit = Пусто
bank-atm-menu-deposit-button = Внести
-bank-insufficient-funds = Недостаточно Средств
-bank-atm-menu-transaction-denied = Транзакция Отклонена
-bank-atm-menu-deposit-successful = Вклад Принят
-bank-atm-menu-withdraw-successful = Снятие Утверждено
-bank-atm-menu-wrong-cash = Неправильный Тип Валюты
+bank-insufficient-funds = Неправильная сумма!
+bank-atm-menu-transaction-denied = Транзакция отклонена
+bank-atm-menu-deposit-successful = Депозит принят
+bank-atm-menu-withdraw-successful = Перевод одобрен
+bank-atm-menu-wrong-cash = Неправильный тип валюты!
station-bank-atm-menu-title = Администрация Станции
bank-atm-menu-amount-label = Сумма:{ " " }
-bank-atm-reason-label = Назначение:{ " " }
+bank-atm-reason-label = Для:{ " " }
bank-atm-description-label = Описание:{ " " }
-station-bank-payroll = Заработная Плата
-station-bank-workorder = Рабочий Заказ
-station-bank-supplies = Снабжение Станции
-station-bank-bounty = Вознаграждение
+station-bank-payroll = Заработная плата
+station-bank-workorder = Рабочий заказ
+station-bank-supplies = Ресурсы станции
+station-bank-bounty = Контракт
station-bank-other = Другое
-station-bank-required = { "(" }Требуется{ ")" }
-station-bank-requires-reason = NT требует детали транзакции
-station-bank-unauthorized = Неавторизованно!
+station-bank-required = { "(" }выбрать из списка{ ")" }
+station-bank-requires-reason = Требуются детали транзакции!
+station-bank-unauthorized = Нет авторизации!
diff --git a/Resources/Locale/ru-RU/_NF/bluespace-events/events.ftl b/Resources/Locale/ru-RU/_NF/bluespace-events/events.ftl
index a3b6e71d5cf..cf974a3dfea 100644
--- a/Resources/Locale/ru-RU/_NF/bluespace-events/events.ftl
+++ b/Resources/Locale/ru-RU/_NF/bluespace-events/events.ftl
@@ -1,14 +1,14 @@
-station-event-bluespace-vault-start-announcement = Автономный бронированный транспорт хранилища NanoTrasen допустил ошибку при переходе в FTL и вскоре прибудет в вашем секторе. Вы будете вознаграждены за его безопасное возвращение.
-station-event-bluespace-vault-end-announcement = Мы успешно эвакуировали хранилище из вашего сектора и соответствующим образом возместили расходы ближайшему аванпосту Фронтира.
-station-event-bluespace-cache-start-announcement = Транспорт Синдиката был перехвачен в FTL и скоро прибудет поблизости. Охраняйте тайник с бронированным оружием, пока NanoTrasen не сможет забрать его за вознаграждение.
-station-event-bluespace-cache-end-announcement = Мы успешно извлекли тайник с оружием Синдиката из вашего сектора и соответствующим образом возместили стоимость вашего близлежащего аванпосту Фронтира.
-station-event-bluespace-asteroid-start-announcement = Сканирование с большого расстояния указывает на необычно крупный астероид, входящий в сектор. NanoTrasen советует старателям перенаправить операции для получения максимальной потенциальной прибыли.
-station-event-bluespace-asteroid-end-announcement = В соответствии со схемами FTL NanoTrasen астероид был рассеян, чтобы избежать столкновения.
-station-event-bluespace-ship-start-announcement = Мы обнаружили необычную FTL сигнатуру - сканирование на большом расстоянии указывает на неизвестный корабль. Имейте в виду, что NanoTrasen не может подтвердить безопасность для старателей в непосредственной близости от него.
-station-event-bluespace-ship-end-announcement = В соответствии со схемами FTL движения NanoTrasen неизвестный корабль был рассеян, чтобы избежать столкновения.
-station-event-bluespace-syndicate-ftl-interception-start-announcement = Внимание всему доступному персоналу NanoTrasen! Военно-морское командование NanoTrasen прервало FTL прыжок корабля Синдиката. Согласно нашим сканерам дальнего космоса, судно либо уже вошло в реальный космос в вашем секторе, либо вот-вот войдёт. Код: Перехватить, Удалить, Уничтожить, Прижечь. Ожидайте вооруженного сопротивления, применение смертоносной силы против вражеских агентов разрешено. Обратите внимание: любые потери жизни персонала, связанного с NT, не компенсируются.
-station-event-bluespace-syndicate-ftl-interception-end-announcement = В соответствии со схемами FTL NanoTrasen, судно Синдиката было рассеянно, чтобы избежать столкновений.
-station-event-bluespace-wizardfederation-scout-start-announcement = Внимание всем доступным сотрудникам NanoTrasen! Военно-морское командование NanoTrasen обнаружило в вашем секторе аномалию блюспейс сигнатуру, которой указывает на скорое прибытие микросудна Федерации Волшебников. Код: Перехватить, Задержать, Заключить в тюрьму. Арестуйте злоумышленников и подготовьте их к передаче в подразделение спецназа «NanoTrasen» для усиленного допроса.
-station-event-bluespace-wizardfederation-scout-end-announcement = В соответствии со схемами FTL NanoTrasen, Судно Федерации Волшебников было рассеянно, чтобы избежать столкновений.
-station-event-bluespace-bloodmoon-start-announcement = В̴͈͓̣̀̈̾͘ͅн̸͙̱́́̔̄ͅӥ̷̨̖́̀̕м̵̹̀͋̃͘а̴̦̽̓н̵̡̭̿̇ͅи̴̱̙͓͌̋̈́е̸̯̳̪̭͑̏̾̎ ̷̳̝̤̃в̵͕̎͋̕с̸̗̝̞̹̅̈́̒̌е̸͖͍̬̦̅͌͌м̴̧̒͗ ̷̪̋͗́̚с̶͍͂̏͘͝о̶͉́͋т̵͇̮̠͂͋̊̽͜р̶͍͒͑͝ӱ̵͈́̏͛д̴̢̤̾н̶̯͋̆и̴̛̠͈̂͝ͅк̸̟͓̘̃а̶͚̱̯̻͑м̶͔͇̆̃̊͊ ̷̙̽͌с̵̰͙̟̄̎̂л̷̞̈́̃ў̶̦̓̕̕ж̴͉̼̊͗̽̀б̴̡̤͑̐́ы̸̹͊̉̎ ̶̯͛͐̕͝б̸̦͍̱̉̍̓е̴͈̰̎̀͜з̷̩͖̰͒͆о̸̘̰̆͗̕п̷̟͛͗͜а̷͎͋̒с̵̝̏͌н̶͔̞͚̜̽о̴̮̬̊̅͊͜с̴̡̉̑͜т̴̧͈̰̰͋͂̕и̴̳̪̓!̶͎̥̌ ̵̪̈́ ̸̬̩̹̠̅̅̄̿К̵̗͋̓͗͘͜ӧ̴̟́̌͠м̶̠̘̤̃͊̋͝а̶̢͌̃н̷̲͈͎͂д̶̟͆͑̑͌ӧ̴̝́͗в̴̞̲̐̀а̸̡̖̤̀̋н̵͖̮̗͊и̷̜͎̍̄̎е̴̧̘̰̽ ̷̜͙̓ф̸̱̰̻̐л̶̜̙̾̉͠о̴͈̟̑͛̆т̷̢̖̔а̸͙̝̱̑͊ ̴̥̺͝ͅN̶̹͑́̐̍T̵̨͙͇̓ ̸̨͍̠̀о̶̥̫̣͍̐̍̅б̴̛̗̦͇̲̃н̸̰̞̱̿ӓ̴̢͔͔́̇̑̄р̷̮̬̆͂̏͆ӳ̸̗̟͚ͅж̷̡̨͕̏͝и̸̤͖̺͍̕л̵̰͇̪͒͐о̸̨̪̻̰͌̂ ̴̯̔͘в̷̩̊̐͝ ̶̙̓́͆в̸̘̞̟̽͗а̵̲̹͗ш̴̻̝͚̙͑͋̀е̶͚͕̪̾̉м̸̹̥̇͑̑̽ ̷̜͌̎с̷̢̲̝̅ё̶̡͕̔͘̕к̴̧͆̊͠т̵̧͔̟̒о̴̙̯̾р̴͇̲͎̪̀̓̅̑е̶̼̠͖̏͋͝ ̷̜͈́̆̏̈́а̷̩̙̥̚н̶̨̙̤͂о̷͓͋̈́͊͝м̶͇̀̊а̴̫̑͋́л̷̗̪̠͐͌̚͜и̷̡̝͓̐́ю̵̥̠̹͛̊ ̴̧̳͖̌͐͊̿б̶̮̆́̒л̸̟͕͐͝ю̶̹̬̹͐̓̇͠с̷̛̞̣̞̃͂͋п̵̺͙͛͘͜е̵̘͓͇̯͊̂й̴̦̀͌͐̔с̴̣̯͓̐͆̄ ̵͍̰̜̥̅̏̿п̵̘̤͘͘р̶̺͇̈́о̷̯̗̓̅̓̇с̶̠̂̃̌͒т̸̫̪̀͌̽р̴̗̣̻̫́а̸̡̹́̓̕͠н̷̢̨̙͊с̷͍̟͂̈́̅͝т̴͙̑̎̅̏в̷̟̱̃̆͒а̸͚͐,̸͖̿̆̽̒ ̶̘̼̝̉͛п̷̥̓͂͆͝р̸͈̣͛и̴̘͈͗з̷̰̺̀͊̈̄н̷̠̟̊̈́ͅа̶͇̞̳͠к̵̝͎̓̈и̷̛̙̺̘̓̅ͅ ̵̛͕̮͙͍́к̴̡̘̯̇͐͠ӧ̸̳͉̖́̀̐т̷̺͙̻̪͌̊͌̑о̸̨̹͔̻̋̿̀̿р̵̲̤̾͜о̷̪͉̩̟͗̒͆й̸̛̼͋̃ ̸̲̀͜у̴̖̯͕̌́̌к̴̥̞͎̍́͝͝а̷̙͊з̵͕͉̗̳̋̑̾̕ы̷̣̱̃̽͌̕в̶̞͓̮͚̎̑̕ӓ̸͍ю̷̫̻̔т̴̙̞͎̍ ̶͍̬̝̣̀͊̌̈́н̶̞̕а̷̝̭̄͋ ̶̛̱͓̔̆с̵͍͔̖̽͝к̸͎͌о̸̥̜̽̄р̸̝̩̳̳͝о̴̥͖̫̓͊е̴̧͍̫̍̈́͂͗͜ ̴̭̰͓̉̄п̵̼͈͖͠р̷̯̖͉̏̉͌и̶̨̯̬͐̀̀͝б̸͔͗͋ы̶̤͉͉̿̈́ͅт̷͍́̿̇̒и̷̝̩̱̗́͆͝е̵̞͑̀ ̷̰̱̲̰͘к̴̧̭̪̟̈͗о̴̺̮̏̆͘р̸̯̞̎͌̄а̷̩̰̞̉͛̕б̶̣͐͂̌͘л̷͙͙̐͜я̶̨̥̞̬̈́͊ ̸̢̣̬̐̆К̴̛̱̳͉͑͂у̵͇͍̉̚л̴̼͎̬̎̑͆̿ь̴̡̼̰̤̀̎т̷̧̡̺̤̽̔̃͝и̷̮̜̇̊́с̶͍͖͎̏̇̾̑т̸͍̄͝а̶̼̬̘̥̿̐ ̶̢̗̰͑͐̇͌К̴̰̳͝р̴̜̽̒̊о̸̻̮̚в̸̗̻͛͗̈и̴̺͎̊̿͗͊.̸̰̬̳̫̌͠ ̵̩̒͋̋̒З̴͕͎̼͒а̶̯̞̋͗̓щ̸̢̯̤̂и̴̺̣͓͆͋̔͐ͅт̶̨̨̢͂͊̀̔н̷͚̀͐̕ы̸̡̲̓̓͗͜й̶̹͇̋̂͠ ̴̹̽̇к̷̲̼̺̂̔̾̓о̸̼͇͒̕͘д̶̬̈́̀̔:̸͓̀͒͝ ̷͈̗̂̔̈̈́ͅп̵͙̺̜̔͝е̸̜̪̒р̸̛̘̠͉ё̴̬́͑х̶̞̠̻̳̽в̵̢̮̯̓͊а̴̙̮͇̗̽͛͆т̸͗͊̏̋ͅи̸̪͔̥̝͊͌͠т̶̃͆͜ь̵̥̗̗̳̉̄,̸̢͚̰͗ ̷̠͓̗̆͗у̷͙͋͒̓͆н̴̝̆̈́и̴͉͊̚ч̴̞̂т̷̡̭̐̀̄͝о̷͕̇̄̆̒ж̵̲̖́̈͝и̶̼̦̤͗т̵̛̣̩̗̳̌̀ь̵̦͑͂̍̇,̴̤͉́̕͠͠ ̴͙̍у̷̡̘̪͍̾͐̕н̴̡̣̍и̶̛͓̇́͛ӵ̶̪̼́̈́͘т̶̫̲͈̝̂̑о̵̠̃̐͆ж̵̺̳͈̋͌͋̚и̵̼̓͂̈͜т̵̥̮͐ь̵̭̦͗͜,̵̧̜̙̒̃̈͠ ̴͍̪̳̋̌̀͛п̷̢̘̅р̵̝͛͒̑и̷̤̐̍ͅж̵̫̱̔̈е̴̧̉̇ч̸̲̿ь̷̡̲͑̾̉.̶̜͖̩̀̚ ̴̛̹̻̱̫̀̆͝ ̸̣̓͝О̵̳̗̄͑̓ж̵̩̀̑́͛и̷̨͕͊̃д̵̹͎̐̎а̶̛̖̽͆̈́й̶̛͉̼̙̙̄̎́т̷̲̅̏͌͠ѐ̶̜͓̺ ̶̰̟̰̏́̓̍в̶̢͇̤͇͑͘о̶̧͒ӧ̵͙͍́̀̊р̷͇́͝у̴̱͖̯̅̈́̿ͅӝ̷͍̉̈́̕ѐ̵͍̳̦̮͒н̶̥̇͑̑н̸̳̅̿о̸͉̮̖̱̑̎͠г̴͕̙͛͆̀ͅо̶̧͆̿̆ ̷̡̞̘̄̊с̸̮͋о̴̞͉͉͊͋͌͝п̴̱̖͚̠̈͑р̸̝͇̽̐̀̕ͅо̴̪͚͂́̑͒т̷̟͂и̴͈̹͋̕в̶͍͐л̸̛̥͈̂е̵̭̐̈́͆̓н̶̛̜͗̆и̸̞͖̍̂я̵̪͈̼͐̓̏͜,̸̳͓̮̥̒͐̏ ̸̪̠̀̅͂п̵̧͆ͅр̸̼̊͂̋͊ͅӥ̴̡̮͂́̚м̸͓̝̘̀е̵̧̧̱̹̍н̶̨̀͠е̷̨̕ͅн̸̮̎̿ӥ̸̬͆е̵̢̛̲̥͘ ̴̞̦́̓̕͝ͅͅс̵̖͚̙͌̔м̵͉̉̎̓е̴̲̟͇͌р̴̤̓̂т̷̩̦̳̾о̶̩̆̐̐н̸̖̦͇͙̋͌о̶̛̬̺̳́͝с̶̢̈н̸̱̼͙̇̎̃о̸̥̦̬͚̏͂й̴̲͊̋ ̸̛̠͑с̶̯̳͈̻̇͌͝͝и̴͕̤̺̉̊̃л̶̥͆ы̵̙̐̔ ̶̫̲͛̽̏͜п̴̱̙̲̺͛̍̀р̸̛̰͆о̵̢͔̂т̴͈̫͐̿͜и̷͙́̂͘͠в̶̻̃́̓ ̴̧͆͗в̸̨͛͛̋р̴̡̮̟̺̂а̷̫̠͕̻̿̎̚ж̵̛̭̺̻̹͑̕е̸͕̜̼͂с̴̢̤͍͛̂к̷̢̭̘̫̆̌̎̈́й̷̳̙̇͒х̷̨̛̛̆̐ ̶̱̰͘а̴̦͕́͜г̵̳̓е̵̙̣̊͝н̵̡̖̮̟͒͝͝т̶̢̬̳̂̑̕о̸̲͈̖̎ͅв̸͔̐ ̸̰͈̙͝͠р̷̛̙̳̹͉̄̐̒а̵̝̊͗з̵̡̂͊͠р̶̭͙̍ͅѐ̷̲̈́́̕ш̷̜̊ё̴̗н̷̲͎̮̐о̵̛̺̙̀̉̓.̷͕͎͖́ ̴͍̤̻͝ ̷̠̭̤̂Н̷͈̳̳̇̉͊ͅе̴̡̖̰͗ ̶̢͚̄̐п̸̝̬͆̉̾̓о̵̯͊̋з̷̢̘͈̾̓̀̚в̵͇̦̅̉̚̚о̸̭̊̌͜л̵̞̘̫̗̐̌̈̎я̶͚͖͒й̶̛͕͔̏̈̂т̸̫́̑͘͜͝е̸͔̖̑͜ ̵̹̖̥̆к̶̢̩̽а̷̪͗п̷̃̍͠ͅи̴̠̣̲̑̏́͝т̷̬̩̱͆а̸͎͉̫̮̌̈́͝н̷̫̝͎͗͠а̵̺̀м̵̫̠͌,̵̰̣͔͇͛̂̄̀ ̶̥̟̼͌̓̑͋с̶̻͈͉̍в̷̢̛̲̮̄̍ͅя̷̖͙̙͈̒з̸̩͉͂̽̂͝а̴̜̫̼͑̃͜н̴̨̟̀͊н̵͇̒ы̴̢̟̆м̴͖̕̚ ̴̯̇с̶̖͊ ̷̡͙̘̟͊̚Ǹ̴̀͛ͅT̵͔̐̂,̷̧̯́́͂͛ͅͅ ̷͔̜̘͂н̶̠̣̼̏е̷̼̊̓̊͛ ̴̥͕̯́̉͝ѝ̷̢̦̘̫͆͗̾м̵͚͉̼̜̄̔е̶̮̙̓ю̸̖̞͚̳͘щ̷̼̜̋и̵̠͊̒м̶̫̓͌̍ ̶̫̗̐́̆͝д̸̡̢͚͈̌́͗о̸͖̀с̶̡͖̙̪̄͗̒̀т̸̰̹̎͒ͅу̷̨̂̓п̸̞͓̩͆̓͐͘а̶̺͖̩̅͊ ̷͔̲̹̯͛̕к̶̲̾ ̴̲̝̜̟͝с̴͈͚͔̻̃и̶̧͖͓͛̕с̶̫̈́̈́̌т̵̖̻͇̠͒̇̒е̷̛̜̱̦̇м̵̠̖̰̖͗͛̎͠е̶̡̜̊ ̷̭͇̤͖́̅̍б̶̻̅̿͂е̵͙̕з̸̝̥̦̾͘о̶̣̱͐п̷̮̘̖̤̅а̵͔͚̒̉̒̅с̶̻̯̞̣̅̅̆̀н̴̢͙́о̷̺͒с̶̮̐͑т̵͙͠и̸͎̠̦̔,̵̖̙̮͋͂͗̐ ̸̛͚͒п̷̻͖̩̒̀̋̕о̴̢͒̏̚͜л̸͓͈̪̘̔̅̀̈у̸̹̺̪͌͛́ч̶̙͖͔̦̇̐͑͝а̵̼̻̺̬̀̋͛̀т̸̩͓̙͙̐͋ь̶̛̙̖̈́̀͘ ̴̠̿̌͌̐д̶̧̖̓̓о̶̩̯̅̐с̴͎͔̯̈́́̚т̶̧̹͕̞̌͠у̴̝̥̝̦̑̇͒͝п̶̟̗̞̏̀ ̴͔̲̬͛к̵̳͂͊ ̵̖̯͑̌̊в̶͓̒̈́͂р̸̞̘̐а̵͉͗ж̶̲̪͈̐́е̴̠͑̈̓с̵̹͉̓̃к̶͍͐͘о̶̤̲͖̫͋м̸͕̤̼̳̿ӯ̵̜̫̥͔̇͗͆ ̴͕̫͗̍̕̚͜ͅс̴͚̖͎̅̒̕͠у̴̰͠д̷̈́ͅн̴̧͉͊̇̋̕у̴̫̞̱͙̔̓ ̷͇͉͋й̴̠̾́̔͜ ̷̖̣͌̐е̸̹͕̞̱̽г̶͉̻̈́͜ӧ̸̘̪́̕ ̴̫͑̋́͋с̵̤̑ӧ̴̭̦̟̀д̵̡̟̱̿̎̄е̶̹̖̊͛̕р̸͕̓ж̸̩̖̇͜и̵̲͎͓̠͒̔̈́̽м̸̭̬̩̰̔͐ӧ̴̰̫͓̼́̍̿м̵͔̬̦̋̚у̸̳̓̃̋̿.̶̺̜̳͋͗͑̏ ̷̼̲͕͓̔̋̒ ̷́͜И̶͕̮̥͎̐̚͝͝ ̸̩͍̐̓͑п̴͔̿̈́о̵̣͕̫́͜м̸̞̅н̵͇͕̥̲̽̚и̴̭̰͓͝т̷̯̋͑е̶͈̤́̒:̴̺͓͎̊̈̈́ ̵̝̣̃̈̕͠Н̸̬̝̤̂̀а̷̪̱̟͋̌̽р̵͇̈̀̕'̷̳̬̘̥͑̓̚͠С̴͙̤͇̾̈́̀͝и̸̝̜͛͐̈́͝ ̴̱͕͋̀н̸͖̘͑͝ё̴̛͇̰̠̘́͑ ̸̲̤̆͋̽р̶̑̐͜е̵̠̩͚̤̃̌а̴̨͙̺̽̂̉̚л̸̲͔̠̲̍е̴̡̯͍͇̓н̸̜̻̻͆͌̈ ̴̛̙͚̻̫͋̄и̴̳͗ ̴͇̳͉͊͒̂н̵̯̀е̷̹͈͇̩̄ ̶͖̥̭̐̉̿͠м̵͉̯̑͌͜о̷͎̓͐̒ж̸̼̾͛͝ё̷͎̣̬́͝ͅт̷͛̉̔͊ͅ ̸̼̑̾п̸̨̮̹̾̈̌͜р̵̡̩̼́́͋и̶͚́͑͑͜ͅч̴̥̯̀͗̊̚и̴̪̞̏̍ͅн̵̛̤̞̈́ӣ̸̣̥͔̠̀т̶̗̼̻̈́́ь̸̙̹̱̹̈́ ̴̪̩͉͍͒в̸͔̞͚͐͝а̷̫̇͂м̶̠̲͇̇̆̓͆ ̷̠͋в̷͎̇р̷̛̞͇̦͚̆͗е̶̥̫͉̟̋д̸̯̫͂а̵̖̺͔͠.̷̺̫̞̑̈
-station-event-bluespace-bloodmoon-end-announcement = В̵̖͍̖̣̈́ ̴̻̺̠̞͓͂̽̐с̷̭̜̇о̸̧̡̧̺̼͗̋̏͋̅о̵͉̓̔̎͂т̷̦̊̆̃͠в̷̻̟̜̥̈́̓е̸̟͙̬̠̏ͅт̷͇͚̟̳̑͌̊̍͘͜с̷̙̮͈͋̄т̵̢͓͇͋̽͑͠в̶̮̓и̶͕͆̊̄̕͜и̴̪̺̋̍̓͊͝ ̸̬̘͈͙̿с̵͓̺͉̬̈́о̶͉̹̥̘̊̓̅͌ ̶̖̞̹͐͘с̵̢͖̗̔̀́̕͜х̵̧́̆̉̇е̵̳̞̾͂͒м̷̱̦̂͑͆̄а̶̗̤̯̓̀̂̽̀м̴̧̖̣̯̭̀и̵̱̟̙͙͌̏̀͐ ̶̪͐̇̈́̐͘с̶̨̛̝̳͗̊в̷̭̯̉͛̊͜͜͜е̷̛͔͎͉̥͕̇͒̾͝р̸͔͇̦̩̌̈́̑̀х̷͈̟̭͗̔̒͆͜с̸̝̫̔̽̄ͅв̴̘̄͂̔̿͑е̶̹̹̒т̸͕̱̘͛͂̂о̵̧͔́̇̄͋͘в̵̬̂̑̃͗͠о̸̢̪͛͘г̷̖̤̬̈́̽о̷̯̄͝ ̶̢̻̗̪̱̉͒т̶̰͗͆͂̿͝р̵̯̗͍̯̀̎͒͒͘͜а̸̙͉̯̱̘̔ф̷̙̑͐͑́̒й̷̥̬̻͖͛к̶̲̔͛̕а̴̝̤͊ ̸̛̦̮̫̋̽Ň̷̙̣̪̦̥͝a̷̮̯̞̽ǹ̸̜̣͚o̴͓͉̙̾͐̃̀T̷̹̘̎̀̈́ŕ̸͍̘͉̼͂͊̕ͅà̴̭̦̟̖̑̊̐ͅș̵̄̽̔͒͝e̷̗͕̹͉͋̿̀̏ǹ̸̖̲̣͜,̷̢͍̮̹͒̂͊̄ ̸̞̀́̎̆͝С̵͓͇͆͛̈͝ӱ̸̧͍̦̳́д̵̧̪̗̃͠н̵͔͗̔̈́͠о̶̬̮͋ ̸̨͈̜͎̈̆̽̈̌Ф̷̧̟̲͍̲͋е̴̞̚д̵̡̛͇͝е̸̹̔р̵͓̭͋̿̆̚͝а̴͈̓ц̶̲͎͎͕̀и̴̧̎̾и̴̦̭̞̱̩̂͗͘ ̷̤̙́͠В̶̡̢͇͐̒̍͆о̸̠̺͓̉л̴̤̋ш̶̪̆̿̂е̵̩̜̼͔͚͑́б̶͉̙͌̐н̸̜͔͉̃̐͂͂̚и̵͍̓͂̒͝к̴̡̘̱̣̣̽̑͗̓̚о̴̡̧͕̝̜̀̆в̸̨̲̪̎͐̅ͅ ̷͖̥͇̈́͒б̴̨̬̱̮̤͆̃͌̔̏ы̴̭̤̣̌̋͑̓л̷̤̠̖̩͒̓̋͘о̸̢̛̩̩̩̍̏̚ ̴̰̯͂͛̃̊р̴̟̌̑а̷͍̣̦͙̬̀͐̑͘с̸̼̈͘с̴̧̤̺̖̂̍̾е̵̠̞̼̻̿я̶͕̘̰͕͊н̴̼͚̖̪̑̑̽̀̌н̸̜̤̞̾̀̃о̷͚̅̊̿͜,̷̰̏̄̐̋ ̴̜͚͖̝̀ч̶̰͎̺̪͐т̴̮͉́̇̏о̵̞͕̦̟̉̓б̵̯̊͠ы̸̰͕̐ ̴͓̗̩̰̓̆́̉͜͠и̵̗̗̤̤͒̆з̷̲͚̣̤̝̀б̷̤̦̝̘͉́̏е̶̠̟̩̤͚̽ж̴̡̱̪̻͛̋͑ͅа̴͚̯̥͇̰͐͠т̷̧̳̰̓̈́͊̏̄ь̵̜̽̓̓̃͛ͅ ̴͖̗͈̠͒̒̋̕͘с̷͚̆̇͐̃͝т̵̞̓о̷͎͖͉̎́͗л̵̺̹̹́̽̈к̵̜͌́̽͂͒н̸̧̩̥̂̂̀ͅо̴̨̣̻͉̊̉̋̂̆͜в̶̢͕̻̋̈̉͋е̵̘͖͎̟̯̿͌̓̑̕н̶̲͉̪͈̼̆͌и̴͚̯̺̬̅̔й̸̪̟̞̌.̷̤̮̓
+station-event-bluespace-vault-start-announcement = Автономный бронированный транспортный модуль корпорации NanoTrasen совершил ошибку при блюспейс-переходе и вскоре прибудет в ваш сектор. За его безопасное возвращение секторальный аванпост получит вознаграждение.
+station-event-bluespace-vault-end-announcement = Транспортный модуль успешно извлечён из вашего сектора. Ближайший секторальный аванпост получил соответствующую компенсацию. Слава NT!
+station-event-bluespace-cache-start-announcement = Неизвестный транспортный модуль сбился с курса во время блюспейс-прыжка и вскоре прибудет в ваш сектор. Приказываем силам ДСБФ провести расследование на предмет контрабандной деятельности.
+station-event-bluespace-cache-end-announcement = Контрабандный транспорт успешно извлечён из вашего сектора. Ближайший секторальный аванпост получил соответствующую компенсацию. Слава NT!
+station-event-bluespace-asteroid-start-announcement = Сканеры дальнего действия зафиксировали необычно крупный астероид, направляющийся в ваш сектор. NanoTrasen рекомендует перенаправить все добывающие операции для макимализации прибыли.
+station-event-bluespace-asteroid-end-announcement = В соответствии с протоколами блюспейс-передвижений NanoTrasen, астероид был уничтожен во избежание столкновения. Слава NT!
+station-event-bluespace-ship-start-announcement = Обнаружена необычная сигнатура блюспейс-прыжка. Сканеры дальнего действия указывают на неизвестный шаттл. NanoTrasen не гарантирует безопасность в его окрестностях. Будьте осторожны.
+station-event-bluespace-ship-end-announcement = В соответствии с протоколами блюспейс-передвижений NanoTrasen, неизвестный шаттл был уничтожен. Слава NT!
+station-event-bluespace-syndicate-ftl-interception-start-announcement = Внимание всему доступному персоналу NanoTrasen! Командование флота NanoTrasen сорвало блюспейс-прыжок шаттла враждебной организации. Согласно данным сканеров дальнего космоса, шаттл либо уже вошел в пространство вашего сектора, либо вот-вот войдёт. Код: Перехватить, Уничтожить, Истребить, Сжечь. Ожидается вооружённое сопротивление, применение смертельной силы против вражеских агентов разрешено. Напоминаем: любые потери персонала, связанного с NanoTrasen, не будут компенсированы. Не допускайте капитанов, аффилированных с NT, без допуска безопасности, от получения доступа к вражескому кораблю и его содержимому.
+station-event-bluespace-syndicate-ftl-interception-end-announcement = В соответствии с протоколами блюспейс-передвижений NanoTrasen, шаттл Синдиката был уничтожен. Слава NT!
+station-event-bluespace-wizardfederation-scout-start-announcement = Внимание всему доступному персоналу NanoTrasen! Командование флота NanoTrasen обнаружило блюспейс-аномалию в вашем секторе с сигнатурой, указывающей на скорое прибытие шаттла Федерации Волшебников. Код: Перехватить, Задержать, Заключить. Арестуйте нарушителей и подготовьте их к передаче подразделению ДСБФ NanoTrasen для проведения допроса.
+station-event-bluespace-wizardfederation-scout-end-announcement = В соответствии с протоколами блюспейс-передвижений NanoTrasen, шаттл Федерации Волшебников был уничтожен. Слава NT!
+station-event-bluespace-bloodmoon-start-announcement = Вн̵и̴м̴а̴н̴и̴е̴ ̴в̴с̴е̴м̴у̴ ̴п̴е̴р̴с̴о̴н̴а̴л̴у̴ ̴с̴л̴у̴ж̴б̴ы̴ ̴б̴е̴з̴о̴п̴а̴с̴н̴о̴с̴т̴и̴!̴ ̴К̴о̴м̴а̴н̴д̴о̴в̴а̴н̴и̴е̴ ̴ф̴л̴о̴т̴а̴ ̴N̴a̴n̴o̴T̴r̴a̴s̴e̴n̴ ̴о̴б̴н̴а̴р̴у̴ж̴и̴л̴о̴ ̴б̴л̴ю̴с̴п̴е̴й̴с̴-̴а̴н̴о̴м̴а̴л̴и̴ю̴ ̴в̴ ̴в̴а̴ш̴е̴м̴ ̴с̴е̴к̴т̴о̴р̴е̴ ̴с̴ ̴с̴и̴г̴н̴а̴т̴у̴р̴о̴й̴,̴ ̴у̴к̴а̴з̴ы̴в̴а̴ю̴щ̴е̴й̴ ̴н̴а̴ ̴с̴к̴о̴р̴о̴е̴ ̴п̴р̴и̴б̴ы̴т̴и̴е̴ ̴ш̴а̴т̴т̴л̴а̴ ̴к̴у̴л̴ь̴т̴и̴с̴т̴о̴в̴ ̴К̴р̴о̴в̴а̴в̴о̴й̴ ̴Л̴у̴н̴ы̴.̴ ̴К̴о̴д̴:̴ ̴П̴е̴р̴ех̴в̴а̴т̴,̴ ̴У̴н̴и̴ч̴т̴о̴ж̴е̴н̴и̴е̴,̴ ̴И̴с̴т̴р̴е̴б̴л̴е̴н̴и̴е̴,̴ ̴П̴р̴и̴ж̴и̴г̴а̴н̴и̴е̴.̴ ̴О̴ж̴и̴д̴а̴й̴т̴е̴ ̴в̴о̴о̴р̴у̴ж̴ё̴н̴н̴о̴г̴о̴ ̴с̴о̴п̴р̴о̴т̴и̴в̴л̴е̴н̴и̴я̴,̴ ̴п̴р̴и̴м̴е̴н̴е̴н̴и̴е̴ ̴с̴м̴е̴р̴т̴е̴л̴ь̴н̴о̴й̴ ̴с̴и̴л̴ы̴ ̴п̴р̴о̴т̴и̴в̴ ̴в̴р̴а̴ж̴е̴с̴к̴и̴х̴ ̴а̴г̴е̴н̴т̴о̴в̴ ̴р̴а̴з̴р̴е̴ш̴е̴н̴о̴.̴ ̴П̴р̴е̴д̴о̴т̴в̴р̴а̴т̴и̴т̴е̴ ̴д̴о̴с̴т̴у̴п̴ ̴к̴а̴п̴и̴т̴а̴н̴о̴в̴,̴ ̴а̴ф̴ф̴и̴л̴и̴р̴о̴в̴а̴н̴н̴ы̴х̴ ̴с̴ ̴N̴T̴,̴ ̴б̴е̴з̴ ̴д̴о̴п̴у̴с̴к̴а̴ ̴б̴е̴з̴о̴п̴а̴с̴н̴о̴с̴т̴и̴ ̴к̴ ̴в̴р̴а̴ж̴е̴с̴к̴о̴м̴у̴ ̴к̴о̴р̴а̴б̴л̴ю̴ ̴и̴ ̴е̴г̴о̴ ̴с̴о̴д̴е̴р̴ж̴и̴м̴о̴м̴у̴.̴ ̴И̴ ̴п̴о̴м̴н̴и̴т̴е̴:̴ ̴Н̴а̴р̴'̴С̴и̴ ̴н̴е̴р̴е̴а̴л̴е̴н̴ ̴и̴ ̴н̴е̴ ̴м̴о̴ж̴е̴т̴ ̴п̴р̴и̴ч̴и̴н̴и̴т̴ь̴ ̴в̴а̴м̴ ̴в̴р̴е̴д̴а̴.
+station-event-bluespace-bloodmoon-end-announcement = В̴ ̴с̴о̴о̴т̴в̴е̴т̴с̴т̴в̴и̴и̴ ̴с̴ ̴п̴р̴о̴т̴о̴к̴о̴л̴а̴м̴и̴ ̴б̴л̴ю̴с̴п̴е̴й̴с̴-̴п̴е̴р̴е̴д̴в̴и̴ж̴е̴н̴и̴й̴ ̴N̴a̴n̴o̴T̴r̴a̴s̴e̴n̴,̴ ̴к̴о̴р̴а̴б̴л̴ь̴ ̴Ф̴е̴д̴е̴р̴а̴ц̴и̴и̴ ̴В̴о̴л̴ш̴е̴б̴н̴и̴к̴о̴в̴ ̴б̴ы̴л̴ ̴у̴н̴и̴ч̴т̴о̴ж̴е̴н̴. ̴С̴л̴а̴в̴а̴ ̴N̴T̴!̴
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/bounty-contracts/bounty-contracts.ftl b/Resources/Locale/ru-RU/_NF/bounty-contracts/bounty-contracts.ftl
index fdd21904195..1dfa759ba08 100644
--- a/Resources/Locale/ru-RU/_NF/bounty-contracts/bounty-contracts.ftl
+++ b/Resources/Locale/ru-RU/_NF/bounty-contracts/bounty-contracts.ftl
@@ -3,27 +3,27 @@ bounty-contracts-author = { $name } ({ $job })
bounty-contracts-unknown-author-name = Неизвестно
bounty-contracts-unknown-author-job = Неизвестно
# Caregories
-bounty-contracts-category-criminal = Разыскиваемый Преступник
-bounty-contracts-category-vacancy = Вакансия на работу
-bounty-contracts-category-construction = Строительство
+bounty-contracts-category-criminal = Разыскивается
+bounty-contracts-category-vacancy = Вакансия
+bounty-contracts-category-construction = Постройка
bounty-contracts-category-service = Услуга
-bounty-contracts-category-other = Другие
+bounty-contracts-category-other = Другое
# Cartridge
-bounty-contracts-program-name = Контракты на вознаграждение
+bounty-contracts-program-name = Контракты
## Radio Announcements
-bounty-contracts-radio-name = Услуга контракта на вознаграждение
-bounty-contracts-radio-create = Новая награда назначенная за "{ $target }". Награда: { $reward }$.
+bounty-contracts-radio-name = Контракт!
+bounty-contracts-radio-create = Назначена награда за "{ $target }". Вознаграждение: { $reward }$.
## UI - List contracts
-bounty-contracts-ui-list-no-contracts = Награды пока не объявлены...
-bounty-contracts-ui-list-no-description = Никакого дополнительного описания не предоставлено...
-bounty-contracts-ui-list-create = Новая награда
+bounty-contracts-ui-list-no-contracts = Контракты пока не объявлены...
+bounty-contracts-ui-list-no-description = Дополнительного описания не предоставлено...
+bounty-contracts-ui-list-create = Новый Контракт
bounty-contracts-ui-list-refresh = Обновить
bounty-contracts-ui-list-category = Категория: { $category }
-bounty-contracts-ui-list-vessel = Судно: { $vessel }
+bounty-contracts-ui-list-vessel = Шаттл: { $vessel }
bounty-contracts-ui-list-author = Опубликовано: { $author }
bounty-contracts-ui-list-remove = Удалено
@@ -34,15 +34,15 @@ bounty-contracts-ui-create-name = Имя:{ " " }
bounty-contracts-ui-create-custom = Настроить
bounty-contracts-ui-create-name-placeholder = Название награды...
bounty-contracts-ui-create-dna = ДНК:{ " " }
-bounty-contracts-ui-create-vessel = Судно:{ " " }
+bounty-contracts-ui-create-vessel = Шаттл:{ " " }
bounty-contracts-ui-create-vessel-unknown = Неизвестно
-bounty-contracts-ui-create-vessel-placeholder = Название судна...
+bounty-contracts-ui-create-vessel-placeholder = Название шаттла...
bounty-contracts-ui-create-reward = Награда:{ " " }
bounty-contracts-ui-create-reward-currency = $
bounty-contracts-ui-create-description = Описание:
bounty-contracts-ui-create-description-placeholder = Дополнительные подробности...
bounty-contracts-ui-create-button-cancel = Отменить
bounty-contracts-ui-create-button-create = Создать
-bounty-contracts-ui-create-error-invalid-price = Ошибка: Неверная цена!
-bounty-contracts-ui-create-error-no-name = Ошибка: Неверное название награды!
-bounty-contracts-ui-create-ready = Ваш контракт готов к публикации!
+bounty-contracts-ui-create-error-invalid-price = Ошибка: Неправильная цена!
+bounty-contracts-ui-create-error-no-name = Ошибка: Неправильное название награды!
+bounty-contracts-ui-create-ready = Ваш контракт готов к публикации!
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/chat/managers/chat_manager.ftl b/Resources/Locale/ru-RU/_NF/chat/managers/chat_manager.ftl
index 21af8c4db08..02d0216556c 100644
--- a/Resources/Locale/ru-RU/_NF/chat/managers/chat_manager.ftl
+++ b/Resources/Locale/ru-RU/_NF/chat/managers/chat_manager.ftl
@@ -1,13 +1,22 @@
+chat-speech-verb-name-vulpkanin = Вульпканин
chat-speech-verb-vulpkanin-1 = рычит
chat-speech-verb-vulpkanin-2 = лает
chat-speech-verb-vulpkanin-3 = гавкает
chat-speech-verb-vulpkanin-4 = тявкает
chat-speech-verb-vulpkanin-5 = воет
+chat-speech-verb-name-felinid = Фелинид
chat-speech-verb-felinid-1 = мяукает
chat-speech-verb-felinid-2 = мяфает
chat-speech-verb-felinid-3 = мряфает
chat-speech-verb-felinid-4 = мурлычет
+chat-speech-verb-name-harpy = Гарпия
chat-speech-verb-harpy-1 = щебечет
chat-speech-verb-harpy-2 = чирикает
chat-speech-verb-harpy-3 = каркает
chat-speech-verb-harpy-4 = вибрирует
+chat-speech-verb-name-goblin = Гоблин
+chat-speech-verb-goblin-1 = бормочет
+chat-speech-verb-goblin-2 = ворчит
+chat-speech-verb-goblin-3 = выкрикивает
+chat-speech-verb-goblin-4 = лепечет
+chat-speech-verb-goblin-5 = отсекает
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/chemicals/chemicals.ftl b/Resources/Locale/ru-RU/_NF/chemicals/chemicals.ftl
index 66336fcf9ba..5d204e10f63 100644
--- a/Resources/Locale/ru-RU/_NF/chemicals/chemicals.ftl
+++ b/Resources/Locale/ru-RU/_NF/chemicals/chemicals.ftl
@@ -1,2 +1,2 @@
reagent-name-rawartifexium = необработанный артифексиум
-reagent-desc-rawartifexium = Сырая смесь микроскопических фрагментов артефактов и сильной кислоты. Обладает способностью активировать артефакты. Похоже, что его можно было бы доработать, чтобы сделать более мощным.
+reagent-desc-rawartifexium = Сырая смесь микроскопических фрагментов артефактов и сильной кислоты. Обладает способностью активировать артефакты. Похоже, что его можно было бы доработать, чтобы сделать более мощным.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/contraband/contraband-exchange-console.ftl b/Resources/Locale/ru-RU/_NF/contraband/contraband-exchange-console.ftl
index d94d60cda62..f814f58287a 100644
--- a/Resources/Locale/ru-RU/_NF/contraband/contraband-exchange-console.ftl
+++ b/Resources/Locale/ru-RU/_NF/contraband/contraband-exchange-console.ftl
@@ -1,9 +1,9 @@
#Contraband Exchange Console
-contraband-pallet-console-menu-title = Обмен контрабандой
+contraband-pallet-console-menu-title = Обмен контрабанды
contraband-console-menu-points-amount = { $amount } ТК
contraband-pallet-menu-no-goods-text = Контрабанда не обнаружена
-contraband-pallet-menu-appraisal-label = Оценочная стоимость:{ " " }
-contraband-pallet-menu-count-label = Количество предметов:{ " " }
-contraband-pallet-appraise-button = Оценивать
-contraband-pallet-sell-button = Продавать
-contraband-pallet-disclaimer = Пожалуйста, поместите все контрабандные предметы непосредственно на сканер. Предметы, находящиеся в других контейнерах, не могут быть отсканированы должным образом.
+contraband-pallet-menu-appraisal-label = Стоимость:{ " " }
+contraband-pallet-menu-count-label = Количество:{ " " }
+contraband-pallet-appraise-button = Оценить
+contraband-pallet-sell-button = Продать
+contraband-pallet-disclaimer = Пожалуйста, поместите все контрабандные предметы на платформу.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/cryosleep/cryosleep-component.ftl b/Resources/Locale/ru-RU/_NF/cryosleep/cryosleep-component.ftl
index c632adb9874..211d8e4a00b 100644
--- a/Resources/Locale/ru-RU/_NF/cryosleep/cryosleep-component.ftl
+++ b/Resources/Locale/ru-RU/_NF/cryosleep/cryosleep-component.ftl
@@ -2,19 +2,19 @@
cryopod-examine-empty = Пусто
cryopod-examine-occupied = Занято
-accept-cryo-window-accept-button = Подтвердить
+accept-cryo-window-accept-button = Принять
accept-cryo-window-deny-button = Отменить
-accept-cryo-window-prompt-text-part = Погрузиться в криосон и закончить свою смену?
-accept-cryo-window-title = Криокамера для сна
-cryo-wakeup-window-title = Просыпаться
-cryo-wakeup-window-accept-button = Подтвердить
+accept-cryo-window-prompt-text-part = Вы решили отдохнуть в капсуле криогенного сна?
+accept-cryo-window-title = Капсула криогенного сна
+cryo-wakeup-window-title = Проснуться
+cryo-wakeup-window-accept-button = Принять
cryo-wakeup-window-deny-button = Отменить
-cryo-wakeup-window-rules = Вы попытаетесь вернуться из своего криосна! Вы не знаете ничего, что произошло с того момента, как вы заснули. Подтвердите это и продолжите?
-cryo-wakeup-result-occupied = Криокамера занята! Попробуйте немного подождать.
-cryo-wakeup-result-no-cryopod = Криокамера пропала! Ой-ой.
-cryo-wakeup-result-no-body = У вас нет тела в криокамере!
-cryo-wakeup-result-disabled = Возврат из криосна отключен на этом сервере.
+cryo-wakeup-window-rules = Вы пытаетесь проснуться из криосна! Вы не знаете ничего, что произошло с того момента, как вы заснули. Подтверждаете это?
+cryo-wakeup-result-occupied = Капсула занята! Подождите немного.
+cryo-wakeup-result-no-cryopod = Капсула пропала! Ох, как-же так...
+cryo-wakeup-result-no-body = У вас нет тела в капсуле!
+cryo-wakeup-result-disabled = На этом сервере отключена возможность проснуться!
# Cryopod
-cryopod-refuse-dead = { $cryopod } отказывается принимать мертвых пациентов.
-cryopod-refuse-organic = { $cryopod } отказывается принимать более 1 разумного существа одновременно.
+cryopod-refuse-dead = { $cryopod } не принимает мёртвые тела.
+cryopod-refuse-organic = { $cryopod } не принимает более одного разумного существа одновременно!
cryopod-wake-up = { $entity } возвращается из криосна!
diff --git a/Resources/Locale/ru-RU/_NF/events/bluespace-cargo.ftl b/Resources/Locale/ru-RU/_NF/events/bluespace-cargo.ftl
index 3b440f2ca3b..e87da24dc26 100644
--- a/Resources/Locale/ru-RU/_NF/events/bluespace-cargo.ftl
+++ b/Resources/Locale/ru-RU/_NF/events/bluespace-cargo.ftl
@@ -1 +1 @@
-bluespace-cargo-event-announcement = Ошибка в телеметрии блюспейса привела к телепортации случайного ящика в неизвестное место.
+bluespace-cargo-event-announcement = Ошибка в телеметрии блюспейс-перехода привела к телепортации случайного контейнера в неизвестное место…
diff --git a/Resources/Locale/ru-RU/_NF/events/bluespace-syndicate-crate.ftl b/Resources/Locale/ru-RU/_NF/events/bluespace-syndicate-crate.ftl
index 2cd504fce95..5250980cf8d 100644
--- a/Resources/Locale/ru-RU/_NF/events/bluespace-syndicate-crate.ftl
+++ b/Resources/Locale/ru-RU/_NF/events/bluespace-syndicate-crate.ftl
@@ -1 +1 @@
-bluespace-syndicate-crate-event-announcement = Мы получили сообщение о том, что в каком-то районе обнаружен ящик с предметами синдиката, пожалуйста, сообщите службе безопасности, если вы нашли указанный ящик.
+bluespace-syndicate-crate-event-announcement = Мы получили сообщение о том, что вашем секторе происходит незаконный оборот контрабанды. Сообщите представителям ДСБФ при обнаружении подозрительных контейнеров.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/_NF/ghost/roles/ghost-role-component.ftl
index 6c45688cde8..e29417611b7 100644
--- a/Resources/Locale/ru-RU/_NF/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/ru-RU/_NF/ghost/roles/ghost-role-component.ftl
@@ -1,10 +1,10 @@
ghost-role-information-emotional-support-name = Ручная зверушка
-ghost-role-information-emotional-support-description = Вы - ручная зверушка! Преданная своему хозяину, обязательно подбадривай его!
-ghost-role-information-emotional-support-rules = Вы - ручная зверушка! Преданная своему хозяину, обязательно подбадривай его!
+ghost-role-information-emotional-support-description = Вы - ручная зверушка! Будьте преданы своему хозяину!
+ghost-role-information-emotional-support-rules = Подбадривай хозяина, будь ему лучшим другом!
ghost-role-information-clippy-name = Клиппи
ghost-role-information-clippy-description = Представитель станции, преданный работник, пахнет картоном и бумагой.
ghost-role-information-clarpy-name = Кларпи
-ghost-role-information-clarpy-description = Заблокируйте вашу почту! Разыскивается Nanotrasen за преступления против мышей.
+ghost-role-information-clarpy-description = Заблокируйте вашу почту! Разыскивается NanoTrasen за преступления против мышей.
ghost-role-information-crispy-name = Хрустик
ghost-role-information-crispy-description = Ты будешь гореть в аду.
ghost-role-information-mistake-name = ?????
@@ -12,4 +12,4 @@ ghost-role-information-mistake-description = Имг' пх'нглуи а ли.
ghost-role-information-ert-mailcarrier-name = Почтальон ОБР
ghost-role-information-ert-mailcarrier-description = Помогите в оформлении документов для решения проблем со станциями.
ghost-role-information-jerma-name = Джерма
-ghost-role-information-jerma-description = Пог момент
+ghost-role-information-jerma-description = Пог момент
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/guidebook/guides.ftl b/Resources/Locale/ru-RU/_NF/guidebook/guides.ftl
new file mode 100644
index 00000000000..5b5867bc8f6
--- /dev/null
+++ b/Resources/Locale/ru-RU/_NF/guidebook/guides.ftl
@@ -0,0 +1,12 @@
+guide-entry-nf14 = Фронтир
+guide-entry-bank = Галактический Банк NT
+guide-entry-shipyard = Верфь
+guide-entry-shipyard-brigand = Старожил
+guide-entry-shipyard-gasbender = Газовый Гигант
+guide-entry-shipyard-harbormaster = Квадрон
+guide-entry-shipyard-kilderkin = Бочка
+guide-entry-shipyard-lantern = Кадило
+guide-entry-shipyard-legman = Интервьюер
+guide-entry-shipyard-liquidator = Подметатор
+guide-entry-shipyard-pioneer = Пионер
+guide-entry-shipyard-searchlight = Прожектор
diff --git a/Resources/Locale/ru-RU/_NF/headset/headset-component.ftl b/Resources/Locale/ru-RU/_NF/headset/headset-component.ftl
index a3e907aca0a..925a0935b72 100644
--- a/Resources/Locale/ru-RU/_NF/headset/headset-component.ftl
+++ b/Resources/Locale/ru-RU/_NF/headset/headset-component.ftl
@@ -1,2 +1,2 @@
-chat-radio-traffic = Диспетчерская
+chat-radio-traffic = диспетчер
chat-radio-nfsd = ДСБФ
diff --git a/Resources/Locale/ru-RU/_NF/interaction/interaction-popup-component.ftl b/Resources/Locale/ru-RU/_NF/interaction/interaction-popup-component.ftl
index 1b62d48950e..47bb119ecf0 100644
--- a/Resources/Locale/ru-RU/_NF/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/ru-RU/_NF/interaction/interaction-popup-component.ftl
@@ -1,3 +1,3 @@
## Petting animals
-petting-failure-mistake = ”хм' достичь йогического питомца {$target}, мгнг ахллоинг вулгтмнахор в х'.
+petting-failure-mistake = ”хм' трогать йог ала питом { $target }, мгнг ахллоинг вулгтмнахор в х'.
diff --git a/Resources/Locale/ru-RU/_NF/job/department-desc.ftl b/Resources/Locale/ru-RU/_NF/job/department-desc.ftl
new file mode 100644
index 00000000000..d42bab8f6be
--- /dev/null
+++ b/Resources/Locale/ru-RU/_NF/job/department-desc.ftl
@@ -0,0 +1,2 @@
+department-Frontier-description = Работа на аванпосте.
+department-Antag-description = Гангстерская жизнь.
diff --git a/Resources/Locale/ru-RU/_NF/job/department.ftl b/Resources/Locale/ru-RU/_NF/job/department.ftl
new file mode 100644
index 00000000000..e558940c4b2
--- /dev/null
+++ b/Resources/Locale/ru-RU/_NF/job/department.ftl
@@ -0,0 +1,2 @@
+department-Frontier = Фронтир
+department-Antag = Криминал
diff --git a/Resources/Locale/ru-RU/_NF/job/job-description.ftl b/Resources/Locale/ru-RU/_NF/job/job-description.ftl
index 6fcf65130c1..aa818ce5c80 100644
--- a/Resources/Locale/ru-RU/_NF/job/job-description.ftl
+++ b/Resources/Locale/ru-RU/_NF/job/job-description.ftl
@@ -1,9 +1,17 @@
+job-description-bailiff = Патрулируйте ваш назначенный шаттл, следите за тем, чтобы никто не крал из арсенала, и обеспечивайте, чтобы все заключенные были освобождены по истечении срока.
+job-description-brigmedic = Сражайтесь в тылу службы безопасности фронтира за жизни ваших товарищей! Вы - первая и последняя надежда вашего отряда. Гиппократ благословляет вас.
+job-description-cadet-nf = Учитесь основам ареста преступников и управления бригом. Слушайте ваших наставников и не стесняйтесь обращаться к ним за помощью.
+job-description-contractor = Делайте что вам угодно, не нарушая закон!
+job-description-deputy = Ловите преступников и врагов корпорации, следите за соблюдением закона и не допускайте беспорядков в секторе.
+job-description-detective-nf = Расследуйте места преступлений с использованием криминалистических инструментов, обеспечьте нахождение виновного и покурите пару сигарет.
job-description-ertmailcarrier = Ничто не остановит почту.
-job-description-mercenary = Выполняйте заказы кого угодно - за разумную цену. Наслаждайтесь свободой от рамок закона.
-job-description-pilot = Пилотируйте космические корабли из пункта А в пункт Б, перехитряйте пиратов и уворачивайтесь от астероидов. Вы - лист на солнечном ветру, пусть другие восхищаются тем, как вы парите.
-job-description-pirate = Пейте грог, выполняйте приказы, подметайте палубу, подчиняйтесь своему капитану и кодексу.
-job-description-pirate-captain = Возглавьте команду непутёвых убийц по открытому пространству и грабьте, соблюдая кодекс.
-job-description-pirate-first-mate = Помогайте своему капитану в любых переделках, в которые вы попадете.
-job-description-security-guard = Патрулируйте пустые залы, насвистывайте простые мелодии, которые вы слышали по радио, звените брелком и убегайте при виде опасности.
-job-description-stc = Умело разруливайте пространство вокруг станции и помогайте ДСБФ выписывать штрафы за пристыкованные корабли.
-job-description-sr = Справляйтесь с переназначением доступа с помощью консоли ID, управляйте аванпостом Фронтира и обеспечивайте безопасность Клиппи.
+job-description-mercenary = Выполняйте поручения любого, кто хорошо заплатит. Наслаждайтесь свободой от ограничений закона.
+job-description-pilot = Пилотируйте космические корабли из точки А в точку Б, уклоняйтесь от пиратов и избегайте астероидов. Вы - лист на солнечном ветру, пусть другие восхищаются тем, как вы парите.
+job-description-pirate = Пейте грог, следуйте приказам, мойте палубу и подчиняйтесь вашему капитану и кодексу.
+job-description-pirate-captain = Ведите команду негодяев через открытый космос и грабьте с уважением, всегда следуя кодексу.
+job-description-pirate-first-mate = Помогайте вашему капитану во всех проделках, в которые вы ввязываетесь.
+job-description-security-guard = Патрулируйте пустые коридоры, насвистывайте простые мелодии, которые слышали по радио, звените своим ключом и убегайте при виде опасности.
+job-description-senior-officer = Обучайте новых кадетов основам обыска, ареста, сроков заключения и правильного обращения с огнестрельным оружием.
+job-description-sheriff = Управляйте своим департаментом и поддерживайте его эффективность, подавляйте недовольство и обеспечивайте безопасность в секторе.
+job-description-stc = Экспертно регулируйте космическое пространство вокруг станции и помогайте ДСБФ выписывать штрафы за длительную стыковку.
+job-description-sr = Справедливо управляйте переназначением доступа с помощью вашей консоли, управляйте аванпостом Фронтира и оберегайте Клиппи.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/job/job-names-old.ftl b/Resources/Locale/ru-RU/_NF/job/job-names-old.ftl
index 0ecacf4da51..5ce7d5f002b 100644
--- a/Resources/Locale/ru-RU/_NF/job/job-names-old.ftl
+++ b/Resources/Locale/ru-RU/_NF/job/job-names-old.ftl
@@ -1,7 +1,7 @@
# Role timers
JobSecurityCadetOld = кадет СБ
JobSecurityOfficerOld = офицер СБ
-JobHeadOfSecurityOld = глава службы безопасности
+JobHeadOfSecurityOld = ГСБ
JobWardenOld = смотритель
JobDetectiveOld = детектив
JobHeadOfPersonnelOld = глава персонала
diff --git a/Resources/Locale/ru-RU/_NF/job/job-names.ftl b/Resources/Locale/ru-RU/_NF/job/job-names.ftl
index c7c2167e34b..419cf776543 100644
--- a/Resources/Locale/ru-RU/_NF/job/job-names.ftl
+++ b/Resources/Locale/ru-RU/_NF/job/job-names.ftl
@@ -1,39 +1,36 @@
# Frontier
-job-name-bailiff = Инструктор
-job-name-brigmedic = Бригмедик
-job-name-cadet-nf = Кадет
-job-name-contractor = Авантюрист
-job-name-deputy = Помощник Шерифа
-job-name-detective-nf = Детектив
+job-name-bailiff = бейлиф
+job-name-brigmedic = коронер
+job-name-cadet-nf = кадет
+job-name-contractor = авантюрист
+job-name-deputy = рейнджер
+job-name-detective-nf = детектив
job-name-ertmailcarrier = ОБР почтальон
-job-name-mercenary = Наёмник
-job-name-pilot = Пилот
-job-name-pirate = Пират
-job-name-pirate-captain = Пиратский Капитан
-job-name-pirate-first-mate = Пиратский Боцман
-job-name-security-guard = Охранник
-job-name-senior-officer = Сержант
-job-name-sheriff = Шериф
-job-name-stc = Диспетчер Фронтира
-job-name-sr = Представитель Фронтира
-
+job-name-mercenary = наёмник
+job-name-pilot = пилот
+job-name-pirate = Pirate
+job-name-pirate-captain = пиратский капитан
+job-name-pirate-first-mate = пиратский боцман
+job-name-security-guard = охранник аванпоста
+job-name-senior-officer = сержант
+job-name-sheriff = шериф
+job-name-stc = диспетчер фронтира
+job-name-sr = представитель фрронтира
# Role timers - Make these alphabetical or I cut you
JobERTMailCarrier = ОБР почтальон
-JobMercenary = Наёмник
-JobPilot = Пилот
-JobPirate = Пират
-JobPirateCaptain = Пиратский Капитан
-JobPirateFirstMate = Пиратский Боцман
-JobSecurityGuard = Охранник
-JobSTC = Диспетчер Фронтира
-
+JobMercenary = наёмник
+JobPilot = пилот
+JobPirate = пират
+JobPirateCaptain = пиратский капитан
+JobPirateFirstMate = пиратский боцман
+JobSecurityGuard = охранник аванпоста
+JobSTC = Station Traffic Controller
# Upstream Removed
-job-name-senior-engineer = Старший Инженер
-job-name-senior-researcher = Научный Руководитель
-job-name-senior-physician = Ведущий Врач
-job-name-senior-officer = Сержант
-
-JobSeniorEngineer = Старший Инженер
-JobSeniorOfficer = Сержант
-JobSeniorPhysician = Ведущий Врач
-JobSeniorResearcher = Научный Руководитель
+job-name-senior-engineer = старший инженер
+job-name-senior-researcher = научный руководитель
+job-name-senior-physician = ведущий врач
+job-name-senior-officer = сержант
+JobSeniorEngineer = старший инженер
+JobSeniorOfficer = сержант
+JobSeniorPhysician = ведущий врач
+JobSeniorResearcher = научный руководитель
diff --git a/Resources/Locale/ru-RU/_NF/job/job-supervisors.ftl b/Resources/Locale/ru-RU/_NF/job/job-supervisors.ftl
index c81c607f47f..09a9a79ac71 100644
--- a/Resources/Locale/ru-RU/_NF/job/job-supervisors.ftl
+++ b/Resources/Locale/ru-RU/_NF/job/job-supervisors.ftl
@@ -1,7 +1,7 @@
-job-supervisors-sr = представителю станции
+job-supervisors-sr = представителю фронтира
job-supervisors-sheriff = шерифу
-job-supervisors-bailiff = судебному приставу
+job-supervisors-bailiff = помощнику шерифа
job-supervisors-sergeant = сержанту
job-supervisors-cadet = всему вышестоящему персоналу ДСБФ
job-supervisors-prisoner = всему персоналу ДСБФ
-job-supervisors-nfsd = помощникам, судебному приставу и шерифу
+job-supervisors-nfsd = шерифу, помощнику шерифа и капралам
diff --git a/Resources/Locale/ru-RU/_NF/loadouts/loadouts.ftl b/Resources/Locale/ru-RU/_NF/loadouts/loadouts.ftl
new file mode 100644
index 00000000000..927eef18710
--- /dev/null
+++ b/Resources/Locale/ru-RU/_NF/loadouts/loadouts.ftl
@@ -0,0 +1 @@
+frontier-loadout-cost = Стоимость пресета: ${ $cost }
diff --git a/Resources/Locale/ru-RU/_NF/m_emp/m_emp.ftl b/Resources/Locale/ru-RU/_NF/m_emp/m_emp.ftl
index 411338fb738..7cdac3487b6 100644
--- a/Resources/Locale/ru-RU/_NF/m_emp/m_emp.ftl
+++ b/Resources/Locale/ru-RU/_NF/m_emp/m_emp.ftl
@@ -1,15 +1,15 @@
-m_emp-system-announcement-source = Генераторная система БЭМИ
-m_emp-system-announcement-active = Включение в { $grid }. БЭМИ: { $timeLeft } секунд.
-m_emp-system-announcement-cooling-down = ЭМИ эффект больше не активен. Расчетное время перезарядки: { $timeLeft } секунд.
-m_emp-system-announcement-recharging = Перезарядка.
-m_emp-system-announcement-request = { $grid } запрашиваю разрешение на активацию БЭМИ.
-m_emp-system-report-already-active = Генератор БЭМИ уже активен.
-m_emp-system-report-cooling-down = Генератор БЭМИ остывает.
-m_emp-system-report-activate-success = Генератор БЭМИ включен!
-m_emp-system-generator-examined-inactive = Генератор БЭМИ неактивен.
-m_emp-system-generator-examined-starting = Запускается генератор БЭМИ.
+m_emp-system-announcement-source = Генератор Б_ЭМИ
+m_emp-system-announcement-active = Включение в { $grid }. Б_ЭМИ: { $timeLeft } секунд.
+m_emp-system-announcement-cooling-down = ЭМИ эффект больше не активен. Расчетное время перезагрузки: { $timeLeft } секунд.
+m_emp-system-announcement-recharging = Перезагрузка.
+m_emp-system-announcement-request = { $grid } запрашивает разрешение на активацию Б_ЭМИ.
+m_emp-system-report-already-active = Генератор Б_ЭМИ уже активен.
+m_emp-system-report-cooling-down = Генератор Б_ЭМИ остывает.
+m_emp-system-report-activate-success = Генератор Б_ЭМИ включен!
+m_emp-system-generator-examined-inactive = Генератор Б_ЭМИ неактивен.
+m_emp-system-generator-examined-starting = Генератор БЭМИ запускается!
m_emp-system-generator-examined-active =
- БЭМИ активен. ЭМИ будет длится { $timeLeft ->
+ Б_ЭМИ активен. ЭМИ будет длится { $timeLeft ->
[1] одну секунду.
*[other] { $timeLeft } секунд.
}
@@ -17,11 +17,11 @@ m_emp-system-generator-examined-cooling-down = Охлаждение.
m_emp-system-generator-examined-recharging = Перезарядка. Готовность через: { $timeLeft } секунд.
m_emp-system-generator-delay-upgrade = Скорость охлаждения / Подзарядки
# M_EMP Console
-m_emp-console-menu-title = БЭМИ
-m_emp-menu-note1 = Отправьте запрос на выписку.
+m_emp-console-menu-title = Б_ЭМИ
+m_emp-menu-note1 = Отправить запрос на использование.
m_emp-menu-note2 = ВНИМАНИЕ:
-m_emp-menu-note3 = Выстрел из этого оружия вызовет электромагнитный импульс, способный вывести из строя все корабли в большом радиусе. Разряжая это оружие, вы соглашаетесь нести ответственность.
-m_emp-menu-note3 = Разрядив это оружие,
+#m_emp-menu-note3 = Выстрел из этого оружия вызовет электромагнитный импульс, способный вывести из строя все корабли в большом радиусе. Используя это оружие, вы соглашаетесь нести ответственность.
+m_emp-menu-note3 = Используя это оружие
m_emp-menu-note4 = вы соглашаетесь нести ответственность.
m_emp-request-button = Запросить одобрение
-m_emp-activate-button = Активировать БЭМИ
+m_emp-activate-button = Активировать Б_ЭМИ
diff --git a/Resources/Locale/ru-RU/_NF/medical/suit-sensor.ftl b/Resources/Locale/ru-RU/_NF/medical/suit-sensor.ftl
index 398869bfe63..dfbe0856c84 100644
--- a/Resources/Locale/ru-RU/_NF/medical/suit-sensor.ftl
+++ b/Resources/Locale/ru-RU/_NF/medical/suit-sensor.ftl
@@ -1,5 +1,5 @@
## Components
-suit-sensor-location-unknown = Неопознанное местоположение
+suit-sensor-location-unknown = Местоположение неизвестно
suit-sensor-location-space = В космосе
suit-sensor-location-expedition = На экспедиции
diff --git a/Resources/Locale/ru-RU/_NF/metabolism/metabolizer-types.ftl b/Resources/Locale/ru-RU/_NF/metabolism/metabolizer-types.ftl
new file mode 100644
index 00000000000..abe907e4e33
--- /dev/null
+++ b/Resources/Locale/ru-RU/_NF/metabolism/metabolizer-types.ftl
@@ -0,0 +1 @@
+metabolizer-type-goblin = Гоблин
diff --git a/Resources/Locale/ru-RU/_NF/paper/book-authorbooks.ftl b/Resources/Locale/ru-RU/_NF/paper/book-authorbooks.ftl
new file mode 100644
index 00000000000..efae9fcde50
--- /dev/null
+++ b/Resources/Locale/ru-RU/_NF/paper/book-authorbooks.ftl
@@ -0,0 +1,150 @@
+book-text-academia-volumeone = Кратко о Науке, Том I
+
+ Заголовок: Кратко о Науке, Том I
+
+ Автор: Бертли "Букер" Бартбли
+
+ Введение
+
+ Поздравляю вас с получением знаменитого путеводителя по Науке. В этом трёхсотсорокасемистраничном трактате я объясню... (О, кажется, кто-то вырвал все остальные страницы.)
+book-text-science-philospher = Готовим с философским камнем
+
+ Раздел: Мистические Кулинарные Угощения
+
+ 1. Эликсир из космотаниума:
+
+ Ингредиенты:
+
+ 1 ч.л. измельченного космотаниума
+ 1 чашка горячей воды
+ 1 ст.л. мёда
+ 2 ломтика лимона
+ Инструкция:
+
+ В небольшой кастрюльке довести воду до легкого кипения.
+ Добавить измельченный космотаниум и томить 5 минут.
+ Снять с огня и процедить в чашку.
+ Добавить мёд и лимон по вкусу.
+ Наслаждайтесь тёплым эликсиром, идеально подходит для улучшения магической концентрации.
+
+ 2. Тушёнка из дракона
+
+ Ингредиенты:
+
+ 1 0,5 кг сырого мяса дракона
+ 2 ст.л. крови дракона
+ 1 луковица, нарезанная
+ 2 моркови, нарезанные
+ 2 картофелины, нарезанные
+ 1 литр мясного или овощного бульона
+ Соль и перец по вкусу
+ 1 ч.л. тимьяна
+ Инструкция:
+
+ В большой кастрюле потушить мясо на среднем огне.
+ Добавить лук и жарить до его готовности.
+ Добавить кровь дракона, морковь, картофель, бульон, соль, перец и тимьян.
+ Довести до кипения, затем уменьшить огонь и томить 1 час, или до тех пор, пока мясо не станет мягким.
+ Подавать горячим, идеальный вариант для сытного обеда после долгого квеста.
+
+ 3. Чай из космотаниума и крови дракона
+
+ Ингредиенты:
+
+ 1 ч.л. измельченного космотаниума
+ 1 ч.л. крови дракона
+ 1 чашка кипятка
+ Мёд или сахар по вкусу
+ Инструкция:
+
+ В чайнике или чашке соединить измельченный космотаниум и кровь дракона.
+ Залить кипятком и дать настояться 5 минут.
+ Процедить чай в чашку и добавить мёд или сахар по вкусу.
+ Наслаждайтесь этим мистическим напитком для магического заряда энергии.
+book-text-science-dwarven = Дварфийское руководство по свободному мышлению
+
+ Заголовок: Дварфийское руководство по свободному мышлению
+
+ Автор: Гримбальд Каменное Сердце
+
+ Введение
+
+ Добро пожаловать, уважаемый читатель, в путешествие не похожее ни на одно другое. Меня зовут Гримбальд Каменное Сердце, дварф, который спустился в глубины шахт знаний и выбрался с драгоценными самоцветами мудрости. В этом руководстве я поделюсь с вами секретами раскрытия ума с особым упором на мощное вещество под названием Назомвим. Готовьтесь к путешествию, которое расширит ваши горизонты и поставит под сомнение ваши взгляды.
+
+ Глава 1: Понимание Назомвима
+
+ Назомвим, редкое и мощное вещество, добывается из мистической рыбы Назом Татлош, обитающей в глубинах подземных озер. Почитаемое за его свойства расширения сознания, оно является ключом к открыванию дверей восприятия. Однако с ним следует обращаться с уважением и осторожностью, так как его мощь не следует недооценивать.
+
+ Глава 2: Подготовка ума
+
+ Прежде чем полностью принять эффекты Назомвима, необходимо подготовить ум. Это включает в себя практики медитации, глубокого дыхания и визуализации. Эти техники помогают очистить ум от мусора и создать восприимчивое состояние для предстоящего трансформирующего опыта.
+
+ Глава 3: Ритуал употребления
+
+ Употребление Назомвима — это священный ритуал. Его следует проводить в тихом, удобном месте, свободном от отвлечений. Малая доза достаточна для начала путешествия. После приема Назомвима можно ощутить эйфорию, за которой следует глубокое раскрытие ума.
+
+ Глава 4: Путешествие в расширенном уме
+
+ С открытым умом вы испытаете свободное течение мыслей и идей, не скованных ограничениями обыденного мышления. Это время для исследований, вопросов и открытий. Держите под рукой журнал, чтобы записывать свои прозрения и откровения, ведь они могут оказаться бесценными.
+
+ Глава 5: Интеграция и размышления
+
+ После того как эффекты Назомвима утихнут, крайне важно уделить время интеграции и размышлениям. Именно тогда осознается истинная ценность пережитого опыта. Размышляйте о том, что вы узнали, и как это можно применить в вашей жизни. Цель не только в свободном мышлении, но и в свободном жизнеустройстве.
+
+ Заключение
+
+ Путь к раскрытию ума — это пожизненный квест, и Назомвим — лишь один из инструментов в огромном арсенале знаний. Примите уроки, полученные в процессе, и продолжайте искать новые опыты и точки зрения. Помните, что ум подобен кузнице: его нужно постоянно ухаживать и подпитывать, чтобы он выдавал лучшие творения.
+
+ Пусть ваш ум будет открыт, как залы наших предков, и пусть ваши мысли текут свободно, как горные ручьи.
+
+ С мудростью и уважением,
+ Гримбальд Каменное Сердце
+book-text-science-clown = Шутки от Хонкера: Пять Минут Смеха
+
+ Заголовок: Шутки от Хонкера: Пять Минут Смеха
+
+ Сцена: Небольшая, тускло освещенная сцена на космическом корабле. Прожектор освещает стойку с микрофоном в центре. Аудитория, состоящая из различных инопланетян и людей, ждёт с нетерпением. Вдруг свет тускнеет, и прожектор освещает Хонкера, клоуна, который прыгает на сцену в ярком, несоответствующем наряде с огромными ботинками и красным пищащим носом.
+
+ Хонкер: (Машет рукой) Привет всем в этой галактике! Это я, Хонкер, ваш любимый клоун! (Пищит носом) Готовы взлететь на волнах смеха?
+
+ Аудитория: (Аплодисменты и одобрительные крики)
+
+ Хонкер: Так вот, я недавно парил вокруг Млечного Пути и врезался в астероид. Я говорю ему: "Эй, смотри куда летишь!" А астероид отвечает: "Я здесь миллионы лет, а ты где был?" Я говорю: "Застрял в пробке на Марсе, где ещё?" (Пищит носом)
+
+ Аудитория: (Смех)
+
+ Хонкер: А уж про марсиан, говоря, вы замечали, что они никогда не смеются? Я спросил одного, почему так, а он говорит: "У нас нет чувства юмора. Это не в нашей атмосфере." Так я ему шарикового зверька подарил, и что вы думаете? Он улетел! (Имитирует улетающий шарик) Видимо, не только их чувство юмора легкое! (Пищит носом)
+
+ Аудитория: (Ещё больше смеха)
+
+ Хонкер: И что за дела с космической едой? Я заказал пиццу на Луне, а она пришла через световые года! Когда она наконец прибыла, я говорю: "Она холодная!" А курьер отвечает: "Чего ты ожидал? Это сырная Луна!" (Пожимает плечами) Хотя, по крайней мере, кратеров не было! (Пищит носом)
+
+ Аудитория: (Смеются)
+
+ Хонкер: Знаете, я пытался создать группу с некоторыми пришельцами. Мы назвали себя "Космические Шутники". Но нам пришлось распасться. Оказывается, черная дыра не умеет играть на барабанах, а сверхновая всё время сбивается с такта. Единственное, что у нас получалось – это устраивать большой взрыв! (Пищит носом)
+
+ Аудитория: (Смех и аплодисменты)
+
+ Хонкер: (Кланяется) Спасибо, спасибо! Вы были звездной аудиторией! Помните, в космосе никто не услышит вашего крика, но каждый услышит ваш смех! Продолжайте улыбаться, и пусть ваши звезды всегда светят ярко! (Пищит носом в последний раз)
+
+ Аудитория: (Аплодисменты и одобрительные крики, когда Хонкер кланяется и уходит со сцены)
+
+ Хонкер: (Возвращается в свет прожектора) Ой, чуть не забыл рассказать вам о том разе, когда я пытался заразить астероид смехом! (Пауза для эффекта) Видите ли, я подумал, если бы я смог заставить эту космическую скалу засмеяться, возможно, мы бы лучше поладили.
+
+ Аудитория: (Заинтересованное мурлыканье)
+
+ Хонкер: Вот я, парящий к этой огромной скале с гигантским шприцем, наполненным чистым, концентрированным смехом. (Имитирует держание большого шприца) Я нажимаю на поршень, и знаете, что случилось?
+
+ Аудитория: (Наклоняется вперед) Что?
+
+ Хонкер: Он начал хихикать! Сначала тихий смешок, а затем громкий хохот! (Имитирует смех астероида) Оказывается, всё, что ему нужно было – это хорошая шутка! Так я и спросил: "Почему астронавт расстался с планетой?" "Потому что ему нужно было пространство!"
+
+ Аудитория: (Смех)
+
+ Хонкер: И вот так, мы закатились на рок 'н' ролл! Буквально, этот астероид так сильно засмеялся, что изменил свою орбиту! Теперь, когда он проходит мимо, он всегда хихикает. Напоминает нам всем, что даже самые каменные лица во вселенной могут улыбнуться!
+
+ Аудитория: (Смех и аплодисменты)
+
+ Хонкер: (Кланяется) Спасибо, спасибо! Помните, смех – лучшее лекарство, даже для астероидов! Продолжайте распространять улыбки и давайте делать вселенную счастливее, по одной скале за раз! (Пищит носом)
+
+ Аудитория: (Одобрительные крики и аплодисменты, когда Хонкер уходит со сцены)
diff --git a/Resources/Locale/ru-RU/_NF/paper/stamp-component.ftl b/Resources/Locale/ru-RU/_NF/paper/stamp-component.ftl
index 24c595e15ce..eab29facbab 100644
--- a/Resources/Locale/ru-RU/_NF/paper/stamp-component.ftl
+++ b/Resources/Locale/ru-RU/_NF/paper/stamp-component.ftl
@@ -3,4 +3,4 @@
stamp-component-signee-name = { $user }
stamp-component-stamped-name-psychologist = Психолог
stamp-component-stamped-name-stc = Диспетчер
-stamp-component-stamped-name-sr = Представитель станции
+stamp-component-stamped-name-sr = Представитель
diff --git a/Resources/Locale/ru-RU/_NF/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/_NF/preferences/loadout-groups.ftl
new file mode 100644
index 00000000000..1e926785b68
--- /dev/null
+++ b/Resources/Locale/ru-RU/_NF/preferences/loadout-groups.ftl
@@ -0,0 +1,26 @@
+# Contractor
+
+loadout-group-contractor-gloves = перчатки
+loadout-group-contractor-head = головные уборы
+loadout-group-contractor-jumpsuit = комбинезоны
+loadout-group-contractor-outerclothing = верхняя одежда
+loadout-group-contractor-belt = пояса
+loadout-group-contractor-shoes = обувь
+loadout-group-contractor-neck = плащи
+loadout-group-contractor-id = ID
+loadout-group-contractor-backpack = вещмешки
+loadout-group-contractor-glasses = очки
+loadout-group-contractor-face = маски
+loadout-group-contractor-utility = инструменты
+loadout-group-contractor-fun = игрушки
+loadout-group-contractor-trinkets = прочее
+
+# Security
+
+loadout-group-security-guard-jumpsuit = шлемы
+loadout-group-security-guard-jumpsuit = комбинезоны
+loadout-group-security-guard-gloves = перчатки
+loadout-group-security-guard-head = головные уборы
+loadout-group-security-guard-outerclothing = верхняя одежда
+loadout-group-security-guard-shoes = обувь
+loadout-group-security-guard-id = ID
diff --git a/Resources/Locale/ru-RU/_NF/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/ru-RU/_NF/preferences/ui/humanoid-profile-editor.ftl
index afc0f40dda3..0236725652f 100644
--- a/Resources/Locale/ru-RU/_NF/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/ru-RU/_NF/preferences/ui/humanoid-profile-editor.ftl
@@ -1 +1 @@
-humanoid-profile-editor-preference-messenger = Посыльный
+humanoid-profile-editor-preference-messenger = Мессенджер
diff --git a/Resources/Locale/ru-RU/_NF/prototypes/access/accesses.ftl b/Resources/Locale/ru-RU/_NF/prototypes/access/accesses.ftl
index 10aa37b7e40..01ab90a908f 100644
--- a/Resources/Locale/ru-RU/_NF/prototypes/access/accesses.ftl
+++ b/Resources/Locale/ru-RU/_NF/prototypes/access/accesses.ftl
@@ -1,5 +1,5 @@
id-card-access-level-frontier = Фронтир
id-card-access-level-pilot = Пилот
-id-card-access-level-mail = Почтальон
+id-card-access-level-mail = Почта
id-card-access-level-mercenary = Наёмник
id-card-access-level-stc = Диспетчер
diff --git a/Resources/Locale/ru-RU/_NF/prototypes/catalog/fills/crates/engines-crates.ftl b/Resources/Locale/ru-RU/_NF/prototypes/catalog/fills/crates/engines-crates.ftl
index 67b09ed92d4..a2240f742cf 100644
--- a/Resources/Locale/ru-RU/_NF/prototypes/catalog/fills/crates/engines-crates.ftl
+++ b/Resources/Locale/ru-RU/_NF/prototypes/catalog/fills/crates/engines-crates.ftl
@@ -1,11 +1,8 @@
ent-CrateThruster = ящик двигателя
.desc = Ящик с двигателем, которое позволяет шаттлу перемещаться.
-
ent-CrateGyroscope = ящик гироскопа
.desc = Ящик с гироскопом, который увеличивает потенциальный угол поворота шаттла.
-
ent-CrateSmallThruster = ящик с малым двигателем
.desc = Ящик с небольшим двигателем, который позволяет шаттлу перемещаться.
-
ent-CrateSmallGyroscope = ящик с малым гироскопом
.desc = Ящик с небольшим гироскопом, который увеличивает потенциальный угол поворота шаттла.
diff --git a/Resources/Locale/ru-RU/_NF/reagents/foods.ftl b/Resources/Locale/ru-RU/_NF/reagents/foods.ftl
index d323dd9b64b..c0e246538e0 100644
--- a/Resources/Locale/ru-RU/_NF/reagents/foods.ftl
+++ b/Resources/Locale/ru-RU/_NF/reagents/foods.ftl
@@ -1 +1 @@
-reagent-name-flaverol = флаверол
+reagent-name-flaverol = Витамикс
diff --git a/Resources/Locale/ru-RU/_NF/reagents/meta/consumable/food/food.ftl b/Resources/Locale/ru-RU/_NF/reagents/meta/consumable/food/food.ftl
index 82fc15ff919..77dd34eb0b7 100644
--- a/Resources/Locale/ru-RU/_NF/reagents/meta/consumable/food/food.ftl
+++ b/Resources/Locale/ru-RU/_NF/reagents/meta/consumable/food/food.ftl
@@ -1,2 +1,2 @@
-reagent-name-flavorol = флаверол
-reagent-desc-flavorol = Все витамины, минералы и углеводы, необходимые организму в чистом виде.
+reagent-name-flavorol = витамикс
+reagent-desc-flavorol = Все необходимые витамины, минералы и углеводы в чистом виде.
diff --git a/Resources/Locale/ru-RU/_NF/research/technologies.ftl b/Resources/Locale/ru-RU/_NF/research/technologies.ftl
index 227f8ee3d66..38d7a65dd29 100644
--- a/Resources/Locale/ru-RU/_NF/research/technologies.ftl
+++ b/Resources/Locale/ru-RU/_NF/research/technologies.ftl
@@ -3,7 +3,7 @@ research-technology-rapid-construction = Быстрое строительств
research-technology-hardsuits-basic = Базовые скафандры
research-technology-hardsuits-specialized = Специализированные скафандры
research-technology-hardsuits-advanced = Продвинутые скафандры
-research-technology-hardsuits-experimental-industrial = Экспериментальный скафандр утилизации
+research-technology-hardsuits-experimental-industrial = Экспериментальный экспедиционные скафандры
research-technology-hardsuits-armored = Бронированные скафандры
research-technology-hardsuits-armored-advanced = Продвинутый бронированные скафандры
research-technology-hardsuits-experimental-rd = Экспериментальные исследовательские скафандры
diff --git a/Resources/Locale/ru-RU/_NF/respawn/respawn-system.ftl b/Resources/Locale/ru-RU/_NF/respawn/respawn-system.ftl
index d6a61000368..9408b59815d 100644
--- a/Resources/Locale/ru-RU/_NF/respawn/respawn-system.ftl
+++ b/Resources/Locale/ru-RU/_NF/respawn/respawn-system.ftl
@@ -1,6 +1,6 @@
## UI
-ghost-respawn-rules-window-title = Правила возрождения призраков
+ghost-respawn-rules-window-title = Правила возрождения
ghost-respawn-rules-window-confirm-button = Я понимаю, возроди меня
ghost-gui-respawn-button-denied = Возрождение ({ $time }с)
ghost-gui-respawn-button-allowed = Возрождение
@@ -15,4 +15,4 @@ ghost-respawn-rules-window-rules =
ghost-respawn-command-desc = Возрождает вас, если вы подходящий призрак.
ghost-respawn-not-a-ghost = В данный момент вы не являетесь призраком.
-ghost-respawn-ineligible = В настоящее время вы не имеете на это права.
+ghost-respawn-ineligible = В настоящее время вы не имеете на это права.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/seeds/seeds.ftl b/Resources/Locale/ru-RU/_NF/seeds/seeds.ftl
index 20fdaee6f60..9af0bb35baf 100644
--- a/Resources/Locale/ru-RU/_NF/seeds/seeds.ftl
+++ b/Resources/Locale/ru-RU/_NF/seeds/seeds.ftl
@@ -1,5 +1,5 @@
# Seeds
-seeds-spesos-name = спесо
-seeds-spesos-display-name = спесо
+seeds-spesos-name = кредиты
+seeds-spesos-display-name = кредиты
seeds-pear-name = груша
seeds-pear-display-name = груша
diff --git a/Resources/Locale/ru-RU/_NF/shipyard/shipyard-console-component.ftl b/Resources/Locale/ru-RU/_NF/shipyard/shipyard-console-component.ftl
index 0eca02840de..2463d5fd7ca 100644
--- a/Resources/Locale/ru-RU/_NF/shipyard/shipyard-console-component.ftl
+++ b/Resources/Locale/ru-RU/_NF/shipyard/shipyard-console-component.ftl
@@ -1,17 +1,17 @@
## UI
-shipyard-console-invalid-vessel = Не удается приобрести судно:
-shipyard-console-menu-title = Меню верфи
+shipyard-console-invalid-vessel = Не удалось приобрести шаттл:
+shipyard-console-menu-title = Меню Верфи
shipyard-console-docking = Шаттл { $vessel } капитана { $owner } в пути, расчётное время прибытия 10 секунд.
-shipyard-console-leaving = Шаттл { $vessel } капитана { $owner } продано { $player }.
-shipyard-console-docking-secret = Обнаружено незарегистрированное судно, заходящее в ваш сектор.
-shipyard-console-leaving-secret = Обнаружено незарегистрированное судно, покидающее ваш сектор.
-shipyard-commands-purchase-desc = Запускает и закрепляет на FTL указанный шаттл из файла сетки.
+shipyard-console-leaving = Шаттл { $vessel } капитана { $owner } продан { $player }.
+shipyard-console-docking-secret = Обнаружен незарегистрированный шаттл, заходящий сектор.
+shipyard-console-leaving-secret = Обнаружен незарегистрированный шаттл, покидающий сектор.
+shipyard-commands-purchase-desc = Прикрепляет шаттл к стыковочным докам станции.
shipyard-console-no-idcard = Нет ID карты
-shipyard-console-already-deeded = ID карта уже есть
-shipyard-console-invalid-station = Недействительная станция
-shipyard-console-no-bank = Банковский счет не найден
-shipyard-console-no-deed = Судовой документ не найден
-shipyard-console-sale-reqs = Судно должно быть пришвартовано, а весь экипаж высажен на сушу
-shipyard-console-deed-label = Зарегистрированное судно:
-shipyard-console-appraisal-label = Предполагаемая стоимость шаттла:{ " " }
+shipyard-console-already-deeded = Уже имеется шаттл
+shipyard-console-invalid-station = Неправильная станция
+shipyard-console-no-bank = Отсутствует банковский аккаунт
+shipyard-console-no-deed = Отсутствует шаттл для продажи
+shipyard-console-sale-reqs = Весь экипаж должен покинуть пристыкованный шаттл
+shipyard-console-deed-label = Зарегистрированный шаттл:
+shipyard-console-appraisal-label = Примерная стоимость шаттла:{ " " }
diff --git a/Resources/Locale/ru-RU/_NF/shipyard/shipyard-rcd-component.ftl b/Resources/Locale/ru-RU/_NF/shipyard/shipyard-rcd-component.ftl
index 647ec5f02a0..ebad8950bdd 100644
--- a/Resources/Locale/ru-RU/_NF/shipyard/shipyard-rcd-component.ftl
+++ b/Resources/Locale/ru-RU/_NF/shipyard/shipyard-rcd-component.ftl
@@ -1,9 +1,9 @@
## UI
-rcd-component-missing-id-deed = По этой ID не зарегистрировано ни одного судна
-rcd-component-can-only-build-authorized-ship = Можно строить только на разрешенных кораблях!
+rcd-component-missing-id-deed = По этой ID не зарегистрировано ни одного шаттла
+rcd-component-can-only-build-authorized-ship = Можно строить только на зарегистрированном шаттле!
rcd-component-no-id-swiped = Проведите идентификационной картой по РСУ для авторизации.
rcd-component-use-blocked = РСУ жужжит, но ничего не происходит.
-rcd-component-id-card-accepted = Вы проводите пальцем по идентификационной карте, и РСУ издает принимающий сигнал.
+rcd-component-id-card-accepted = Вы проводите идентификационной картой, и РСУ издает принимающий сигнал.
rcd-component-id-card-removed = РСУ отключается, несанкционированный доступ.
-rcd-component-wrong-ammo-type = Неправильный тип боеприпасов для РСУ.
+rcd-component-wrong-ammo-type = Неправильный тип зарядов для РСУ.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/shuttles/console.ftl b/Resources/Locale/ru-RU/_NF/shuttles/console.ftl
index 61bbec01e95..74f70aee8d4 100644
--- a/Resources/Locale/ru-RU/_NF/shuttles/console.ftl
+++ b/Resources/Locale/ru-RU/_NF/shuttles/console.ftl
@@ -1 +1,2 @@
-shuttle-console-designation = Обозначение:
+shuttle-console-designation = Точка назначения:
+shuttle-console-designation-unknown = Неизвестно
diff --git a/Resources/Locale/ru-RU/_NF/smuggling/deaddrop.ftl b/Resources/Locale/ru-RU/_NF/smuggling/deaddrop.ftl
index fae27282cc7..cd72a9458b2 100644
--- a/Resources/Locale/ru-RU/_NF/smuggling/deaddrop.ftl
+++ b/Resources/Locale/ru-RU/_NF/smuggling/deaddrop.ftl
@@ -1,6 +1,6 @@
deaddrop-search-text = Осмотреть внимательнее
-deaddrop-security-report = В вашем секторе обнаружена контрабандная деятельность Синдиката
-deaddrop-hint-pretext = Десантный модуль Синдиката будет отправлен по следующим координатам:
+deaddrop-security-report = В вашем секторе обнаружена контрабандная деятельность
+deaddrop-hint-pretext = Контрабандный модуль будет отправлен по следующим координатам:
deaddrop-hint-posttext = Наши агенты внутри сектора заплатят любому, кто захочет провезти эти товары контрабандой на территорию NT.
deaddrop-hint-name = аккуратно сложенная бумага
-deaddrop-hint-desc = Лист бумаги, аккуратно сложенный, чтобы поместиться в небольшом тайнике
+deaddrop-hint-desc = Аккуратно сложенный лист бумаги, который может поместиться в небольшом тайнике.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_NF/species/species.ftl b/Resources/Locale/ru-RU/_NF/species/species.ftl
index 4b9ceaf10ad..42e9860724d 100644
--- a/Resources/Locale/ru-RU/_NF/species/species.ftl
+++ b/Resources/Locale/ru-RU/_NF/species/species.ftl
@@ -1,3 +1,4 @@
## Species Names
species-name-vulpkanin = Вульпканин
+species-name-goblin = Гоблин
diff --git a/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl
index b24d1ec0d2c..2abd66c5f0b 100644
--- a/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl
@@ -1,5 +1,5 @@
-uplink-emp-grenade-launcher-bundle-name = Набор ЭМИ China-Lake
-uplink-emp-grenade-launcher-bundle-desc = Старый гранатомет "China-Lake" в комплекте с 8 EMP боеприпасами.
+uplink-emp-grenade-launcher-bundle-name = Набор ЭМИ Chine-Lake
+uplink-emp-grenade-launcher-bundle-desc = Старый гранатомет "China-Lake" в комплекте с 8 ЭМИ зарядами.
store-category-sechardsuits = EVA костюмы
store-category-secweapons = Оружие
store-category-secutility = Утилиты
@@ -7,65 +7,69 @@ store-category-secammo = Боеприпасы
store-category-secexplosives = Взрывчатка
uplink-security-hardsuit-name = Защитный скафандр
uplink-security-hardsuit-desc = Стандартный бронированный костюм EVA. Громоздкая броня немного ограничивает скорость передвижения.
-uplink-security-hardsuit-patrol-name = Скафандр патруля безопасности
-uplink-security-hardsuit-patrol-desc = Облегченный вариант защитного костюма EVA. Большая скорость передвижения достигается за счет несколько меньшей защиты.
-uplink-security-hardsuit-brigmedic-name = Скафандр БригМедика
-uplink-security-hardsuit-brigmedic-desc = Легкобронированный костюм EVA. Разработанный для спасательных операций, он жертвует большей частью своей брони в пользу скорости передвижения.
-uplink-security-hardsuit-warden-name = Скафандр судебного пристава
-uplink-security-hardsuit-warden-desc = Умеренно усиленный вариант защитного костюма EVA. Современное покрытие увеличивает сопротивление без ущерба для диапазона движений.
-uplink-security-hardsuit-syndie-re-name = Боевой костюм обратной разработки
-uplink-security-hardsuit-syndie-re-desc = Усовершенствованный боевой костюм, восстановленный после войн Синдиката. Хорошо защищенный и чрезвычайно мобильный.
-uplink-security-hardsuit-sheriff-name = Скафандр шерифа
-uplink-security-hardsuit-sheriff-desc = Сильно усиленный защитный костюм EVA. Обеспечивает максимальную устойчивость при сохранении диапазона движений, ожидаемого от сил безопасности.
-uplink-security-hardsuit-combat-name = Патрульный боевой комбинезон
-uplink-security-hardsuit-combat-desc = Боевой патрульный бронекостюм, предназначенный для использования в условиях враждебного окружения.
-uplink-security-hardsuit-commmand-name = Командный боевой комбинезон
-uplink-security-hardsuit-commmand-desc = Усовершенствованный боевой костюм, разработанный для опытных супервайзеров ДСБФ и предназначенный для использования в условиях враждебного окружения.
+uplink-security-hardsuit-patrol-name = Патрульный скафандр ДСБФ
+uplink-security-hardsuit-patrol-desc = Облегченный вариант защитного скафандра EVA. Большая скорость передвижения достигается за счет ослабленной защиты.
+uplink-security-hardsuit-brigmedic-name = Скафандр коронера
+uplink-security-hardsuit-brigmedic-desc = Легкобронированный скафандр EVA. Разработанный для спасательных операций, жертвует большей частью своей брони в пользу скорости передвижения.
+uplink-security-hardsuit-warden-name = Скафандр рейнджера
+uplink-security-hardsuit-warden-desc = Слегка усиленный вариант защитного скафандра EVA. Современные материалы увеличивают защитные показатели без ущерба скорости передвижения.
+uplink-security-hardsuit-experimental-name = Экспериментальный боевой скафандр
+uplink-security-hardsuit-experimental-desc = Усовершенствованный боевой скафандр, разработанный величайшими умами Nanotrasen.
+uplink-security-hardsuit-sheriff-name = Скафандр Шерифа
+uplink-security-hardsuit-sheriff-desc = Бронированный вариант защитного костюма EVA. Совмещает в себе отличные защитные показатели и скоростные характеристики.
+uplink-security-hardsuit-combat-name = Боевой патрульный скафандр ДСБФ
+uplink-security-hardsuit-combat-desc = Бронированный патрульный скафандр ДСБФ, предназначенный для боевых стычек.
+uplink-security-hardsuit-commmand-name = Командный боевой скафандр ДСБФ
+uplink-security-hardsuit-commmand-desc = Улучшенный боевой скафандр. Обеспечит лучшую защиту, без изменений способности к маневренности.
+uplink-security-lethalarmory-name = Ящик летального вооружения
+uplink-security-lethalarmory-desc = Ящик содержит летальное оружие, которое может пополнить ваш арсенал.
+uplink-security-nonlethalarmory-name = Ящик нелетального вооружения
+uplink-security-nonlethalarmory-desc = Ящик содержит нелетальное оружие, которое может пополнить ваш арсенал.
uplink-security-mk58-name = MK 58
-uplink-security-mk58-desc = Дешёвое, стандартное личное оружие. Использует .35 Авто.
+uplink-security-mk58-desc = Дешёвый, стандартный пистолет. Использует боеприпасы калибра .35 авто.
uplink-security-kammerer-name = Каммерер
-uplink-security-kammerer-desc = Помповое ружье. Использует .50 патронов для дробовика. Вмещает 4.
+uplink-security-kammerer-desc = Каммерер - компактный и мощный дробовик, идеально подходящий для любых задач. Стабильность, точность и быстрая перезарядка делают его надежным союзником в борьбе с угрозами космоса. Использует патроны калибра .50. Вмещает в себя 4.
uplink-security-disabler-name = Станнер
-uplink-security-disabler-desc = Несмертельный электрошокер стандартного выпуска. Оснащен встроенным аккумулятором, но требует использования защитной зарядной станции.
-uplink-security-stunbaton-name = дубинка-шокер
-uplink-security-stunbaton-desc = Несмертельная электрошоковая дубинка стандартного выпуска. Имеет встроенный аккумулятор, но требует использования защитной зарядной станции.
+uplink-security-disabler-desc = Станнер - компактный электрошокер для самозащиты. Изнуряет органические цели, пока они не свалятся с ног.
+uplink-security-stunbaton-name = Дубинка-шокер
+uplink-security-stunbaton-desc = Стандартная дубинка-шокер. Шоковая дубинка - надежное средство самозащиты и контроля в ограниченных пространствах. Ее прочная конструкция и высокая эффективность делают ее идеальным выбором для ДСБФ. Имеет встроенную батарейку.
uplink-security-deckard-name = Декард
-uplink-security-deckard-desc = Очень мощный револьвер, привезенный с Тангейзерских ворот. Используется "магнум" .45 калибра.
-uplink-security-emitter-name = Электромагнитный излучатель
-uplink-security-emitter-desc = Импульсный излучатель высокой энергии, настроенный на разрушение электроники и энергосистем. Безвреден для живых существ. Снаряды проходят сквозь стекло. Имеет встроенный аккумулятор, но требует использования защитной зарядной станции.
+uplink-security-deckard-desc = Очень мощный револьвер. Символ стиля и надежности в борьбе за выживание. Его элегантный дизайн скрывает мощь и точность, готовые ответить на любую угрозу. Использует патроны .45 магнум.
+uplink-security-emitter-name = Излучатель ЭМИ
+uplink-security-emitter-desc = Технологическое чудо, способное быстро нейтрализовать любые системы, использующие энергию. Абсолютно безвредно для живых существ. Снаряды могут проходить сквозь стекло. Имеет встроенный аккумулятор, который способен самозаряжаться.
uplink-security-n1984-name = N1984
-uplink-security-n1984-desc = Стандартный офицерский пистолет. Использует магазины "Магнум" .45 калибра.
+uplink-security-n1984-desc = Запасное оружие любого уважающего себя офицера. Его вес и надежная конструкция обеспечивают эффективность и безопасность, делая его единственным в своем роде. Выпускается в калибре .45 магнум.
uplink-security-enforcer-name = Силовик
-uplink-security-enforcer-desc = Обновленная модель Каммерера может похвастаться магазином на 7 патронов. Использует патроны для дробовика .50 калибра.
+uplink-security-enforcer-desc = Боевой дробовик премиум-класса, созданный на основе Каммерера с увеличенным боезапасом. Использует патроны калибра .50 ружейный.
uplink-security-lecter-name = Лектер
-uplink-security-lecter-desc = Стандартная полностью автоматическая винтовка. Используется винтовка .20 калибра.
+uplink-security-lecter-desc = Лектер - высокопроизводительный автомат, разработанный специально для космических операций. С его помощью офицеры обеспечивают безопасность на борту космических станций, благодаря точности, скорострельности и надежности. Использует патроны калибра .20 винтовочный.
uplink-security-lasercarbine-name = Лазерная винтовка
-uplink-security-lasercarbine-desc = Лазерный карабин стандартного выпуска. Оснащен встроенным аккумулятором, но требует использования защитной зарядной станции. Стреляет сквозь стекло.
-uplink-security-disablersmg-name = Автоматический станнер
-uplink-security-disablersmg-desc = Полностью автоматический, скорострельность отключена. Настроен на ту же частоту, что и стандартные выключатели, что делает оружие менее смертоносным. Имеет встроенный аккумулятор, но требует использования защитной зарядной станции.
+uplink-security-lasercarbine-desc = Стандартный лазерный карабин. Предпочитается ДСБФ за свою дешевизну и простоту использования.
+uplink-security-disablersmg-name = Станнер-пулемет
+uplink-security-disablersmg-desc = Усовершенствованный станнер, позволяющий вести непрерывный огонь, изнуряя органические цели.
uplink-security-energysword-name = Энергетический меч
-uplink-security-energysword-desc = Юридически отличный энергетический меч. Возможность отражать снаряды.
-uplink-security-wt550-name = WT 550
-uplink-security-wt550-desc = Полностью автоматический пистолет-пулемет. В этой конструкции используются специальные магазины, устанавливаемые сверху, что упрощает и ускоряет работу в полевых условиях. Используется автоматический пистолет .35 калибра.
+uplink-security-energysword-desc = Энергетический меч - это грозное оружие, которое можно активировать и деактивировать по желанию. Он генерирует стабилизированный луч энергии, способный резать как и высокопрочные материалы, так и плоть. Отражает пули.
+uplink-security-wt550-name = WT550
+uplink-security-wt550-desc = Это полностью автоматический пистолет-пулемет. Его высокая скорострельность и точность делают незаменимым в использовании. Использует патроны калибра .35 авто.
uplink-security-energygun-name = Энергетическое оружие
uplink-security-energygun-desc = Полуавтоматический энергетический пистолет, способный стрелять как несмертельными электрошоковыми зарядами, так и перезаряженными смертоносными энергетическими зарядами. Имеет встроенный аккумулятор, но требует использования защитной зарядной станции.
uplink-security-emprpg-name = RPG-7
-uplink-security-emprpg-desc = Реактивный гранатомет. Поставляется с 1 электромагнитным патроном.
+uplink-security-emprpg-desc = Реактивный гранатомет. Поставляется с 1 электромагнитным снарядом.
uplink-security-empgrenade-name = ЭМИ граната
uplink-security-empgrenade-desc = Ручная граната, испускающая импульс высокой энергии, который выводит из строя электронику и энергосистемы в умеренно большом радиусе.
-uplink-security-holo-name = Голографический проекто
+uplink-security-holo-name = Голографический проектор
uplink-security-holo-desc = Голографический проектор на батарейках, который создает временные барьеры для передвижения в баре.
uplink-security-jetpack-name = Джетпак
-uplink-security-jetpack-desc = Предварительно заполненный реактивный ранец для EVA. Поставляется в модном красном цвете,
-uplink-security-magboots-name = Боевые магнитные ботинки
-uplink-security-magboots-desc = Легкие резиновые сапоги, предназначенные для того, чтобы удерживать владельца на земле в условиях низкой гравитации.
+uplink-security-jetpack-desc = Предварительно заполненный реактивный ранец для EVA. Поставляется в модном зелёном цвете,
+uplink-security-magboots-name = Боевые магнитные сапоги
+uplink-security-magboots-desc = Легкие магнитные сапоги, предназначенные для того, чтобы удерживать владельца на земле в условиях низкой гравитации.
uplink-security-techfab-name = СБ ТехФаб
uplink-security-techfab-desc = Печатная плата для технической лаборатории безопасности. Позволяет производить боеприпасы, магазины, оружие и множество других утилит. Использует исходные ресурсы. Может быть модернизирован.
-uplink-security-key-name = Ключи шифрования безопасности
+uplink-security-key-name = Ключи шифрования ДСБФ
uplink-security-key-desc = Коробка с 4 ключами шифрования, которые дают доступ к радиоканалу ДСБФ.
uplink-security-emprocket-name = ЭМИ ракета
uplink-security-emprocket-desc = ЭМИ ракета для РПГ-7
-uplink-security-thrusterkit-name = TКомплект для модернизации двигателя
+uplink-security-thrusterkit-name = Комплект для модернизации двигателей
uplink-security-thrusterkit-desc = Содержит 12 суперконденсаторов. Идеально подходит для модернизации корабельных двигателей.
uplink-security-magazinepistol-name = Магазины для автоматического пистолета калибра .35 Авто
uplink-security-magazinepistol-desc = Коробка с 4 магазинами для автоматического оружия .35 калибра.
@@ -80,56 +84,58 @@ uplink-security-ambuzol-desc = 15 единиц противовирусного
uplink-security-medkit-name = Боевая аптечка
uplink-security-medkit-desc = Набор, содержащий современные медицинские принадлежности, пригодные для использования в полевых условиях.
uplink-security-inspector-name = Инспектор
-uplink-security-inspector-desc = Револьвер стандартного выпуска. Дешевый, массового производства, его можно найти во всех уголках известной Вселенной. Используется "магнум" .45 калибра.
+uplink-security-inspector-desc = Лучший друг детектива. Использует патроны калибра .45 магнум.
uplink-security-mateba-name = Матеба
-uplink-security-mateba-desc = Уникальная центровка ствола с автоматическим возвратом Матеба и приводимый в действие отдачей цилиндр и ударник обеспечивают непревзойденную скорострельность и точность стрельбы.
+uplink-security-mateba-desc = Знаковое оружие ужасающих эскадронов смерти. Использует патроны калибра .45 магнум.
uplink-security-truncheon-name = Дубинка
-uplink-security-truncheon-desc = Стандартный тупой предмет. Отлично подходит как для разбивания окон, так и черепов.
-uplink-security-armingsword-name = Меч из пластальной стали
-uplink-security-armingsword-desc = Старинный дизайн сочетается с современными материалами.
+uplink-security-truncheon-desc = Жёсткая дубинка со стальным сердечником, предназначенная для причинения боли.
+uplink-security-armingsword-name = Пласталевый меч
+uplink-security-armingsword-desc = Древние технологии встречают современные материалы.
uplink-security-captainsword-name = Капитанская сабля
uplink-security-captainsword-desc = Меч, обычно предназначенный для капитанов, адмиралтейства и другого высшего командования. Имеет небольшой шанс отразить летящие снаряды.
uplink-security-pulsepistol-name = Импульсный пистолет
-uplink-security-pulsepistol-desc = Мощный лазерный пистолет, обычно предназначенный для элитных подразделений ERT. Оснащен встроенным аккумулятором, но требует использования защитной зарядной станции.
+uplink-security-pulsepistol-desc = Новейший энергетический пистолет, предпочитаемый оперативниками Nanotrasen в качестве запасного оружия.
uplink-security-pulsecarbine-name = Импульсный карабин
-uplink-security-pulsecarbine-desc = Мощный лазерный карабин, обычно предназначенный для элитных подразделений скорой помощи и боевых единиц. Имеет встроенный аккумулятор, но требует использования защитной зарядной станции.
-uplink-security-hammer-name = Отбойный молоток
-uplink-security-hammer-desc = Большой двуручный молоток, который идеально подходит для выламывания дверей или пробивания обшивки корпуса.
+uplink-security-pulsecarbine-desc = Высокотехнологичный энергетический карабин, который предпочитают оперативники ОБР Nanotrasen.
+uplink-security-hammer-name = Пробивной молот
+uplink-security-hammer-desc = Большой двуручный молот, который идеально подходит для выламывания дверей или пробивания обшивки корпуса.
uplink-security-teleshield-name = Телескопический щит
-uplink-security-teleshield-desc = Расширяемый ручной щит, обеспечивающий превосходную защиту.
+uplink-security-teleshield-desc = Продвинутый щит на случай беспорядков, изготовлен из облегчённых материалов, способен складываться для удобства хранения.
uplink-security-energyshield-name = Энергетический щит
-uplink-security-energyshield-desc = Экзотический энергетический щит, блокирующий большую часть входящего урона.
+uplink-security-energyshield-desc = Экзотический энергетический щит, способный блокировать все снарялы.
uplink-security-swat-name = Противогаз спецназа
uplink-security-swat-desc = Версия защитного противогаза стандартного выпуска, закрывающая все лицо.
uplink-security-speedloader-name = Спидлоадер .45 магнум
-uplink-security-speedloader-desc = Револьверный скорострельный заряжатель, который поставляется с предварительно заряженным патроном .45 калибра магнум
+uplink-security-speedloader-desc = Револьверный скорострельный заряжатель, который поставляется с предварительно заряженными патрономи .45 калибра
uplink-security-speedloaderrubber-name = Спидлоадер .45 магнум резиновый
-uplink-security-speedloaderrubber-desc = Револьверный скорострельный заряжатель, который поставляется с предварительной загрузкой резиной magnum .45 магнум резиновый.
+uplink-security-speedloaderrubber-desc = Револьверный скорострельный заряжатель, который поставляется с предварительной заряженными резиновыми патрономи .45 калибра
uplink-security-shotlethal-name = Летальные патроны для дробовика
uplink-security-shotlethal-desc = Коробка летальных патронов для дробовика .50 калибра.
uplink-security-shotbeanbag-name = Травматичекские патроны для дробовика
uplink-security-shotbeanbag-desc = Коробка травматических патронов для дробовика .50 калибра.
uplink-security-shotincend-name = Зажигательные патроны для дробовика
-uplink-security-shotincend-desc = Коробка зажигательные патронов для дробовика .50 калибра.
+uplink-security-shotincend-desc = Коробка зажигательных патронов для дробовика .50 калибра.
uplink-security-shotslug-name = Летальные патроны для дробовика(Пули)
uplink-security-shotslug-desc = Коробка летальных(Пули) патронов для дробовика .50 калибра.
uplink-security-cash1000-name = 1000 Спесо
-uplink-security-cash1000-desc = Холодные, звонкие деньги.
-uplink-security-empgrenade-box-name = коробка ЭМИ гранат
+uplink-security-cash1000-desc = Всем нужны деньги.
+uplink-security-empgrenade-box-name = Коробка ЭМИ гранат
uplink-security-empgrenade-box-desc = Коробка, содержащая 4 ЭМИ гранаты.
-uplink-security-explosivegrenade-box-name = коробка разрывных гранат
+uplink-security-explosivegrenade-box-name = Коробка разрывных гранат
uplink-security-explosivegrenade-box-desc = Коробка, содержащая 4 разрывные гранаты.
-uplink-security-incendiarygrenade-box-name = короба зажигательных гранат
+uplink-security-incendiarygrenade-box-name = Коробка зажигательных гранат
uplink-security-incendiarygrenade-box-desc = Коробка, содержащая 4 зажигательные гранаты.
-uplink-security-shrapnelgrenade-box-name = коробка осколочных гранат
+uplink-security-shrapnelgrenade-box-name = Коробка осколочных гранат
uplink-security-shrapnelgrenade-box-desc = Коробка, содержащая 4 осколочные гранаты.
-uplink-security-smokegrenade-box-name = коробка дымовых гранат
+uplink-security-smokegrenade-box-name = Коробка дымовых гранат
uplink-security-smokegrenade-box-desc = Коробка, содержащая 4 дымовые гранаты.
-uplink-security-teargasgrenade-box-name = коробка слезоточивых гранат
+uplink-security-teargasgrenade-box-name = Коробка слезоточивых гранат
uplink-security-teargasgrenade-box-desc = Коробка, содержащая 4 слезоточивые гранаты.
-uplink-security-flashbanggrenade-box-name = коробка светошумовых гранат
+uplink-security-flashbanggrenade-box-name = Коробка светошумовых гранат
uplink-security-flashbanggrenade-box-desc = Коробка, содержащая 4 светошумовые гранаты.
-uplink-security-stingergrenade-box-name = коробка травматических гранат
+uplink-security-stingergrenade-box-name = Коробка травматических гранат
uplink-security-stingergrenade-box-desc = Коробка, содержащая 4 травматические гранаты.
-uplink-security-breachingcharge-box-name = коробка пробивающих зарядов
+uplink-security-breachingcharge-box-name = Коробка пробивающих зарядов
uplink-security-breachingcharge-box-desc = Коробка, содержащая 4 пробивающих заряда.
+uplink-security-hoverbike-name = Комплект сборки Ховербайка ДСБФ
+uplink-security-hoverbike-desc = Упакованный ховербайк ДСБФ, с ключами в комплекте.
diff --git a/Resources/Locale/ru-RU/_NF/traits/traits.ftl b/Resources/Locale/ru-RU/_NF/traits/traits.ftl
index 51515d88653..2f9b31442f0 100644
--- a/Resources/Locale/ru-RU/_NF/traits/traits.ftl
+++ b/Resources/Locale/ru-RU/_NF/traits/traits.ftl
@@ -1,5 +1,7 @@
trait-stinky-name = Вонючий
-trait-stinky-desc = От тебя плохо пахнет, как от умирающего трупа.
-trait-stinky-examined = [color=lightblue]{ CAPITALIZE(SUBJECT($target)) } отвратительно пахнет.[/color]
-trait-stinky-in-range-others = { $target } отвратительно пахнет!
-trait-stinky-in-range-self = Кто-то отвратительно пахнет!
+trait-stinky-desc = От тебя воняет, как от трупа.
+trait-stinky-examined = [color=lightblue]{ CAPITALIZE(SUBJECT($target)) } ужасно пахнет.[/color]
+trait-stinky-in-range-others = { $target } ужасно пахнет!
+trait-stinky-in-range-self = Кто-то ужасно пахнет!
+trait-goblin-accent-name = Гоблинский акцент
+trait-goblin-accent-desc = Вы говорите на тайном языке, который многих раздражает. Да и не такой он уж и тайный.
diff --git a/Resources/Locale/ru-RU/_NF/vending-machines/vending-machine-component.ftl b/Resources/Locale/ru-RU/_NF/vending-machines/vending-machine-component.ftl
index 8e5b66f7180..979d97f5687 100644
--- a/Resources/Locale/ru-RU/_NF/vending-machines/vending-machine-component.ftl
+++ b/Resources/Locale/ru-RU/_NF/vending-machines/vending-machine-component.ftl
@@ -1,3 +1,3 @@
## VendingMachineComponent
-vending-machine-component-try-eject-access-abused = Активирована защита торгового автомата
+vending-machine-component-try-eject-access-abused = Защита торгомата активирована! Бип-буп!
diff --git a/Resources/Locale/ru-RU/_NF/ventriloquist/ventriloquist.ftl b/Resources/Locale/ru-RU/_NF/ventriloquist/ventriloquist.ftl
index 436d75de6e7..f812d13be18 100644
--- a/Resources/Locale/ru-RU/_NF/ventriloquist/ventriloquist.ftl
+++ b/Resources/Locale/ru-RU/_NF/ventriloquist/ventriloquist.ftl
@@ -1,6 +1,6 @@
-ventriloquist-rock-grasp-hand = Вы крепко сжимаете ручной камень.
-ventriloquist-rock-release-hand = Ты отпускаешь свой ручной камень.
+ventriloquist-rock-grasp-hand = Вы крепко сжимаете свой ручной камень.
+ventriloquist-rock-release-hand = Вы отпускаете ручной камень.
ventriloquist-rock-grasped-hand = Вас схватили.
-ventriloquist-rock-released-hand = Вас освободили.
+ventriloquist-rock-released-hand = Вас отпустили.
ventriloquist-rock-role-name = Ручной камень
-ventriloquist-rock-role-description = Вы - любимый минерал.
+ventriloquist-rock-role-description = Вы - любимый ручной камень.
diff --git a/Resources/Locale/ru-RU/_directions.ftl b/Resources/Locale/ru-RU/_directions.ftl
new file mode 100644
index 00000000000..a0a2b7de11d
--- /dev/null
+++ b/Resources/Locale/ru-RU/_directions.ftl
@@ -0,0 +1,8 @@
+zzzz-fmt-direction-North = Север
+zzzz-fmt-direction-South = Юг
+zzzz-fmt-direction-East = Восток
+zzzz-fmt-direction-West = Запад
+zzzz-fmt-direction-NorthEast = Северо-восток
+zzzz-fmt-direction-SouthEast = Юго-восток
+zzzz-fmt-direction-NorthWest = Северо-запад
+zzzz-fmt-direction-SouthWest = Юго-запад
diff --git a/Resources/Locale/ru-RU/accent/accents.ftl b/Resources/Locale/ru-RU/accent/accents.ftl
index 18bb8834a4d..793334f0d14 100644
--- a/Resources/Locale/ru-RU/accent/accents.ftl
+++ b/Resources/Locale/ru-RU/accent/accents.ftl
@@ -22,8 +22,8 @@ accent-words-mouse-6 = Уиип!
accent-words-mouse-7 = Иип!
# Mumble
accent-words-mumble-1 = Ммпмв!
-accent-words-mumble-2 = Мммв мррввв!
-accent-words-mumble-3 = Мммв мпвф!
+accent-words-mumble-2 = Мммв-мррввв!
+accent-words-mumble-3 = Мммв-мпвф!
# Silicon
accent-words-silicon-1 = Бип.
accent-words-silicon-2 = Буп.
@@ -46,12 +46,12 @@ accent-words-zombie-8 = Мазгххх...
accent-words-zombie-9 = Маазгг...
accent-words-zombie-10 = Граааааа...
# Moth Zombie
-accent-words-zombie-moth-1 = Clothessss...
-accent-words-zombie-moth-2 = Shooooesss...
-accent-words-zombie-moth-3 = Liiiiight...
-accent-words-zombie-moth-4 = Laaamps...
-accent-words-zombie-moth-5 = Haaaatsss... Hatttssss...
-accent-words-zombie-moth-6 = Scarffsss...
+accent-words-zombie-moth-1 = Одееежда...
+accent-words-zombie-moth-2 = Ооообувь...
+accent-words-zombie-moth-3 = Свеееет...
+accent-words-zombie-moth-4 = Лаааампы...
+accent-words-zombie-moth-5 = Шааапк... Шаааапки...
+accent-words-zombie-moth-6 = Шааарфы...
# Generic Aggressive
accent-words-generic-aggressive-1 = Грр!
accent-words-generic-aggressive-2 = Рррр!
@@ -61,7 +61,7 @@ accent-words-generic-aggressive-4 = Гррав!!
accent-words-duck-1 = Ква!
accent-words-duck-2 = Ква.
accent-words-duck-3 = Ква?
-accent-words-duck-4 = Ква ква!
+accent-words-duck-4 = Ква-ква!
# Chicken
accent-words-chicken-1 = Кудах!
accent-words-chicken-2 = Кудах.
@@ -71,7 +71,7 @@ accent-words-chicken-4 = Кудах тах-тах!
accent-words-pig-1 = Хрю.
accent-words-pig-2 = Хрю?
accent-words-pig-3 = Хрю!
-accent-words-pig-4 = Хрю Хрю!
+accent-words-pig-4 = Хрю-хрю!
# Kangaroo
accent-words-kangaroo-1 = Грр!
accent-words-kangaroo-2 = Ххссс!
@@ -82,7 +82,7 @@ accent-words-slimes-1 = Блюмп.
accent-words-slimes-2 = Блимпаф?
accent-words-slimes-3 = Бламп!
accent-words-slimes-4 = Блааамп...
-accent-words-slimes-5 = Блабл бламп!
+accent-words-slimes-5 = Блабл-бламп!
# Mothroach
accent-words-mothroach-1 = Чирик!
# Crab
diff --git a/Resources/Locale/ru-RU/accent/cowboy.ftl b/Resources/Locale/ru-RU/accent/cowboy.ftl
index 81a8e7b6a46..8f995fe8bdd 100644
--- a/Resources/Locale/ru-RU/accent/cowboy.ftl
+++ b/Resources/Locale/ru-RU/accent/cowboy.ftl
@@ -196,3 +196,122 @@ accent-cowboy-words-98 = yelled
accent-cowboy-replacement-98 = hollered
accent-cowboy-words-99 = yelling
accent-cowboy-replacement-99 = hollering
+corvax-accent-cowboy-words-1 = алкоголь
+corvax-accent-cowboy-replacement-1 = огненная вода
+corvax-accent-cowboy-words-2 = алкоголя
+corvax-accent-cowboy-replacement-2 = огненной воды
+corvax-accent-cowboy-words-301 = инопланетянин
+corvax-accent-cowboy-words-302 = пришелец
+corvax-accent-cowboy-replacement-3 = космическое существо
+corvax-accent-cowboy-words-4 = спасибо
+corvax-accent-cowboy-replacement-4 = благодарствую
+corvax-accent-cowboy-words-501 = привет
+corvax-accent-cowboy-words-502 = здравствуй
+corvax-accent-cowboy-replacement-5 = хауди
+corvax-accent-cowboy-words-601 = пока
+corvax-accent-cowboy-words-602 = прощай
+corvax-accent-cowboy-replacement-6 = бывай
+corvax-accent-cowboy-words-7 = до свидания
+corvax-accent-cowboy-replacement-7 = до скорого
+corvax-accent-cowboy-words-8 = животное
+corvax-accent-cowboy-replacement-8 = существо
+corvax-accent-cowboy-words-9 = животные
+corvax-accent-cowboy-replacement-9 = существа
+corvax-accent-cowboy-words-1001 = бомба
+corvax-accent-cowboy-words-1002 = взрывчатка
+corvax-accent-cowboy-replacement-10 = динамит
+corvax-accent-cowboy-words-1101 = борг
+corvax-accent-cowboy-words-1102 = киборг
+corvax-accent-cowboy-replacement-11 = оловянный человечек
+corvax-accent-cowboy-words-1201 = борга
+corvax-accent-cowboy-words-1202 = киборга
+corvax-accent-cowboy-replacement-12 = оловянного человечка
+corvax-accent-cowboy-words-13 = труп
+corvax-accent-cowboy-replacement-13 = мертвечина
+corvax-accent-cowboy-words-1401 = пьян
+corvax-accent-cowboy-words-1402 = пьяный
+corvax-accent-cowboy-replacement-14 = пропитан
+corvax-accent-cowboy-words-15 = друг
+corvax-accent-cowboy-replacement-15 = партнёр
+corvax-accent-cowboy-words-16 = друга
+corvax-accent-cowboy-replacement-16 = партнёру
+corvax-accent-cowboy-words-1701 = грейтайд
+corvax-accent-cowboy-words-1702 = грейтайдер
+corvax-accent-cowboy-replacement-17 = негодяй
+corvax-accent-cowboy-words-1801 = пистолет
+corvax-accent-cowboy-words-1802 = ружьё
+corvax-accent-cowboy-words-1803 = автомат
+corvax-accent-cowboy-replacement-18 = железяка
+corvax-accent-cowboy-words-1901 = идиот
+corvax-accent-cowboy-words-1902 = дурак
+corvax-accent-cowboy-replacement-19 = тупоголовый
+corvax-accent-cowboy-words-20 = тюрьма
+corvax-accent-cowboy-replacement-20 = кутузка
+corvax-accent-cowboy-words-21 = тюрьму
+corvax-accent-cowboy-replacement-21 = кутузку
+corvax-accent-cowboy-words-22 = тюрьме
+corvax-accent-cowboy-replacement-22 = кутузке
+corvax-accent-cowboy-words-23 = ниндзя
+corvax-accent-cowboy-replacement-23 = партизан
+corvax-accent-cowboy-words-24 = шум
+corvax-accent-cowboy-replacement-24 = переполох
+corvax-accent-cowboy-words-2401 = нюкеры
+corvax-accent-cowboy-words-2402 = оперы
+corvax-accent-cowboy-words-2403 = опера
+corvax-accent-cowboy-words-2404 = предатели
+corvax-accent-cowboy-replacement-24 = разбойники
+corvax-accent-cowboy-words-2501 = нюкер
+corvax-accent-cowboy-words-2502 = опер
+corvax-accent-cowboy-words-2503 = предатель
+corvax-accent-cowboy-replacement-25 = разбойник
+corvax-accent-cowboy-words-26 = пассажир
+corvax-accent-cowboy-replacement-26 = зелёный
+corvax-accent-cowboy-words-27 = пассажира
+corvax-accent-cowboy-replacement-27 = зелёного
+corvax-accent-cowboy-words-28 = пассажиры
+corvax-accent-cowboy-replacement-28 = зелёные
+corvax-accent-cowboy-words-29 = пассажиров
+corvax-accent-cowboy-replacement-29 = зелёных
+corvax-accent-cowboy-words-30 = сб
+corvax-accent-cowboy-replacement-30 = закон
+corvax-accent-cowboy-words-31 = офицер
+corvax-accent-cowboy-replacement-31 = законник
+corvax-accent-cowboy-words-32 = офицера
+corvax-accent-cowboy-replacement-32 = законника
+corvax-accent-cowboy-words-33 = офицеры
+corvax-accent-cowboy-replacement-33 = законники
+corvax-accent-cowboy-words-34 = офицеров
+corvax-accent-cowboy-replacement-34 = законников
+corvax-accent-cowboy-words-35 = смотритель
+corvax-accent-cowboy-replacement-35 = надзиратель
+corvax-accent-cowboy-words-36 = смотрителя
+corvax-accent-cowboy-replacement-36 = надзирателя
+corvax-accent-cowboy-words-3701 = гсб
+corvax-accent-cowboy-words-3702 = глава службы безопасности
+corvax-accent-cowboy-replacement-37 = шериф
+corvax-accent-cowboy-words-38 = главы службы безопасности
+corvax-accent-cowboy-replacement-38 = шерифа
+corvax-accent-cowboy-words-39 = туалет
+corvax-accent-cowboy-replacement-39 = флигель
+corvax-accent-cowboy-words-40 = кредиты
+corvax-accent-cowboy-replacement-40 = доллары
+corvax-accent-cowboy-words-41 = кредитов
+corvax-accent-cowboy-replacement-41 = долларов
+corvax-accent-cowboy-words-42 = еда
+corvax-accent-cowboy-replacement-42 = провизия
+corvax-accent-cowboy-words-43 = еду
+corvax-accent-cowboy-replacement-43 = провизию
+corvax-accent-cowboy-words-44 = мужчина
+corvax-accent-cowboy-replacement-44 = джентельмен
+corvax-accent-cowboy-words-45 = мужчины
+corvax-accent-cowboy-replacement-45 = джентельмены
+corvax-accent-cowboy-words-46 = спит
+corvax-accent-cowboy-replacement-46 = дрыхнет
+corvax-accent-cowboy-words-47 = спал
+corvax-accent-cowboy-replacement-47 = дрыхнул
+corvax-accent-cowboy-words-48 = спала
+corvax-accent-cowboy-replacement-48 = дрыхнула
+corvax-accent-cowboy-words-49 = одежда
+corvax-accent-cowboy-replacement-49 = прикид
+corvax-accent-cowboy-words-50 = обувь
+corvax-accent-cowboy-replacement-50 = ботинки
diff --git a/Resources/Locale/ru-RU/accent/dwarf.ftl b/Resources/Locale/ru-RU/accent/dwarf.ftl
index b87c199daa0..4303c4917e0 100644
--- a/Resources/Locale/ru-RU/accent/dwarf.ftl
+++ b/Resources/Locale/ru-RU/accent/dwarf.ftl
@@ -283,791 +283,3 @@ accent-dwarf-words-147 = СБ
accent-dwarf-words-replace-147 = стража
accent-dwarf-words-148 = a
accent-dwarf-words-replace-148 = ae
-accent-dwarf-words-149 = как
-accent-dwarf-words-replace-149 = кэк
-accent-dwarf-words-150 = какой
-accent-dwarf-words-replace-150 = кэкойе
-accent-dwarf-words-151 = какая
-accent-dwarf-words-replace-151 = кэкайа
-accent-dwarf-words-152 = какие
-accent-dwarf-words-replace-152 = кэкиэ
-accent-dwarf-words-153 = мы
-accent-dwarf-words-replace-153 = мыэ
-accent-dwarf-words-154 = мне
-accent-dwarf-words-replace-154 = мнэ
-accent-dwarf-words-155 = моя
-accent-dwarf-words-replace-155 = мойа
-accent-dwarf-words-156 = моё
-accent-dwarf-words-replace-156 = мойо
-accent-dwarf-words-157 = так
-accent-dwarf-words-replace-157 = такэ
-accent-dwarf-words-158 = его
-accent-dwarf-words-replace-158 = йегo
-accent-dwarf-words-159 = только
-accent-dwarf-words-replace-159 = толькэ
-accent-dwarf-words-160 = было
-accent-dwarf-words-replace-160 = быль
-accent-dwarf-words-161 = будет
-accent-dwarf-words-replace-161 = будэт
-accent-dwarf-words-162 = еще
-accent-dwarf-words-replace-162 = ещчшо
-accent-dwarf-words-163 = сказал
-accent-dwarf-words-replace-163 = скэзалше
-accent-dwarf-words-164 = сказала
-accent-dwarf-words-replace-164 = скэзалжа
-accent-dwarf-words-165 = сказали
-accent-dwarf-words-replace-165 = скэзануэли
-accent-dwarf-words-166 = этот
-accent-dwarf-words-replace-166 = этшот
-accent-dwarf-words-167 = эта
-accent-dwarf-words-replace-167 = этша
-accent-dwarf-words-168 = кто
-accent-dwarf-words-replace-168 = кшто
-accent-dwarf-words-169 = кто-то
-accent-dwarf-words-replace-169 = кшто-та
-accent-dwarf-words-170 = потому
-accent-dwarf-words-replace-170 = патамы
-accent-dwarf-words-171 = потому что
-accent-dwarf-words-replace-171 = патамы шта
-accent-dwarf-words-172 = все
-accent-dwarf-words-replace-172 = всэ
-accent-dwarf-words-173 = всё
-accent-dwarf-words-replace-173 = всйо
-accent-dwarf-words-174 = или
-accent-dwarf-words-replace-174 = ылы
-accent-dwarf-words-175 = когда
-accent-dwarf-words-replace-175 = когдэ
-accent-dwarf-words-176 = тогда
-accent-dwarf-words-replace-176 = тады
-accent-dwarf-words-177 = уже
-accent-dwarf-words-replace-177 = ужэ
-accent-dwarf-words-178 = до
-accent-dwarf-words-replace-178 = доэ
-accent-dwarf-words-179 = один
-accent-dwarf-words-replace-179 = одын
-accent-dwarf-words-180 = раз
-accent-dwarf-words-replace-180 = рэз
-accent-dwarf-words-181 = два
-accent-dwarf-words-replace-181 = двэ
-accent-dwarf-words-182 = можно
-accent-dwarf-words-replace-182 = можнэ
-accent-dwarf-words-183 = по
-accent-dwarf-words-replace-183 = пэ
-accent-dwarf-words-184 = там
-accent-dwarf-words-replace-184 = тэм
-accent-dwarf-words-185 = им
-accent-dwarf-words-replace-185 = ым
-accent-dwarf-words-186 = надо
-accent-dwarf-words-replace-186 = нэдо
-accent-dwarf-words-187 = вам
-accent-dwarf-words-replace-187 = вэм
-accent-dwarf-words-188 = ну
-accent-dwarf-words-replace-188 = нуэ
-accent-dwarf-words-189 = хочу
-accent-dwarf-words-replace-189 = хошу
-accent-dwarf-words-190 = себе
-accent-dwarf-words-replace-190 = сэбйя
-accent-dwarf-words-191 = чего
-accent-dwarf-words-replace-191 = чэго
-accent-dwarf-words-192 = вот
-accent-dwarf-words-replace-192 = вэт
-accent-dwarf-words-193 = куда
-accent-dwarf-words-replace-193 = кудэ
-accent-dwarf-words-194 = за
-accent-dwarf-words-replace-194 = зэ
-accent-dwarf-words-195 = них
-accent-dwarf-words-replace-195 = ных
-accent-dwarf-words-196 = вас
-accent-dwarf-words-replace-196 = вэс
-accent-dwarf-words-197 = него
-accent-dwarf-words-replace-197 = нэго
-accent-dwarf-words-198 = ничего
-accent-dwarf-words-replace-198 = нычэгo
-accent-dwarf-words-199 = она
-accent-dwarf-words-replace-199 = онэ
-accent-dwarf-words-200 = теперь
-accent-dwarf-words-replace-200 = тэпэр
-accent-dwarf-words-201 = хорошо
-accent-dwarf-words-replace-201 = хорошэ
-accent-dwarf-words-202 = три
-accent-dwarf-words-replace-202 = трэ
-accent-dwarf-words-203 = этого
-accent-dwarf-words-replace-203 = этшогo
-accent-dwarf-words-204 = работает
-accent-dwarf-words-replace-204 = робэт
-accent-dwarf-words-205 = такое
-accent-dwarf-words-replace-205 = токоэ
-accent-dwarf-words-206 = тэг
-accent-dwarf-words-replace-206 = тэплогрейка
-accent-dwarf-words-207 = хуйня
-accent-dwarf-words-replace-207 = кнурла
-accent-dwarf-words-208 = наставник
-accent-dwarf-words-replace-208 = мудрэц
-accent-dwarf-words-209 = уверен
-accent-dwarf-words-replace-209 = увэршен
-accent-dwarf-words-210 = нету
-accent-dwarf-words-replace-210 = нэтху
-accent-dwarf-words-211 = мультитул
-accent-dwarf-words-replace-211 = мультыгрыз
-accent-dwarf-words-212 = сигарета
-accent-dwarf-words-replace-212 = сигарэшка
-accent-dwarf-words-213 = замечательная
-accent-dwarf-words-replace-213 = замэчатльнйа
-accent-dwarf-words-214 = замечательный
-accent-dwarf-words-replace-214 = замэчатльнй
-accent-dwarf-words-215 = замечательное
-accent-dwarf-words-replace-215 = замэчатльнйе
-accent-dwarf-words-216 = батарейка
-accent-dwarf-words-replace-216 = энэргшка
-accent-dwarf-words-217 = голопаразит
-accent-dwarf-words-replace-217 = жопнэй глист
-accent-dwarf-words-218 = голо-паразит
-accent-dwarf-words-replace-218 = жопнэй глист
-accent-dwarf-words-219 = батарея
-accent-dwarf-words-replace-219 = энэргшка
-accent-dwarf-words-220 = батарейку
-accent-dwarf-words-replace-220 = энэргшку
-accent-dwarf-words-221 = батарейки
-accent-dwarf-words-replace-221 = энэргшки
-accent-dwarf-words-222 = батарейке
-accent-dwarf-words-replace-222 = энэргшке
-accent-dwarf-words-223 = батарею
-accent-dwarf-words-replace-223 = энэргшку
-accent-dwarf-words-224 = батареи
-accent-dwarf-words-replace-224 = энэргшки
-accent-dwarf-words-225 = батарее
-accent-dwarf-words-replace-225 = энэргшке
-accent-dwarf-words-226 = мгм
-accent-dwarf-words-replace-226 = пу-пу-пу
-accent-dwarf-words-227 = знаете
-accent-dwarf-words-replace-227 = смекаэте
-accent-dwarf-words-228 = пойдёмте
-accent-dwarf-words-replace-228 = пошэмтэ
-accent-dwarf-words-229 = пойдемте
-accent-dwarf-words-replace-229 = пошэмтэ
-accent-dwarf-words-230 = пойдём
-accent-dwarf-words-replace-230 = пошэм
-accent-dwarf-words-231 = пойдем
-accent-dwarf-words-replace-231 = пошэм
-accent-dwarf-words-232 = начнем
-accent-dwarf-words-replace-232 = начнёмшэ
-accent-dwarf-words-233 = начнём
-accent-dwarf-words-replace-233 = начнёмшэ
-accent-dwarf-words-234 = аномалия
-accent-dwarf-words-replace-234 = нэпонятка
-accent-dwarf-words-235 = аномалию
-accent-dwarf-words-replace-235 = нэпонятку
-accent-dwarf-words-236 = аномалий
-accent-dwarf-words-replace-236 = нэпонятокъ
-accent-dwarf-words-237 = аномалии
-accent-dwarf-words-replace-237 = нэпонятки
-accent-dwarf-words-238 = категорически
-accent-dwarf-words-replace-238 = катэгорычшки
-accent-dwarf-words-239 = запрещено
-accent-dwarf-words-replace-239 = запрэшено
-accent-dwarf-words-240 = аномалист
-accent-dwarf-words-replace-240 = нэпонятколог
-accent-dwarf-words-241 = пришёл
-accent-dwarf-words-replace-241 = явилсэ
-accent-dwarf-words-242 = пришел
-accent-dwarf-words-replace-242 = явилсэ
-accent-dwarf-words-243 = дело
-accent-dwarf-words-replace-243 = дэлэ
-accent-dwarf-words-244 = есть
-accent-dwarf-words-replace-244 = йэст
-accent-dwarf-words-245 = сам
-accent-dwarf-words-replace-245 = сэм
-accent-dwarf-words-246 = ваш
-accent-dwarf-words-replace-246 = вэш
-accent-dwarf-words-247 = наш
-accent-dwarf-words-replace-247 = нэш
-accent-dwarf-words-248 = потом
-accent-dwarf-words-replace-248 = потомэ
-accent-dwarf-words-249 = очень
-accent-dwarf-words-replace-249 = ошчэнь
-accent-dwarf-words-250 = сейчас
-accent-dwarf-words-replace-250 = сэйчшас
-accent-dwarf-words-251 = сканер
-accent-dwarf-words-replace-251 = стшитыватэл
-accent-dwarf-words-252 = понимаю
-accent-dwarf-words-replace-252 = понимайу
-accent-dwarf-words-253 = никак
-accent-dwarf-words-replace-253 = ныкэк
-accent-dwarf-words-254 = каждый
-accent-dwarf-words-replace-254 = каждэй
-accent-dwarf-words-255 = лет
-accent-dwarf-words-replace-255 = лэт
-accent-dwarf-words-256 = тута
-accent-dwarf-words-replace-256 = тутэ
-accent-dwarf-words-257 = говорю
-accent-dwarf-words-replace-257 = говорйу
-accent-dwarf-words-258 = пять
-accent-dwarf-words-replace-258 = пятэ
-accent-dwarf-words-259 = же
-accent-dwarf-words-replace-259 = жэ
-accent-dwarf-words-260 = совсем
-accent-dwarf-words-replace-260 = совсэм
-accent-dwarf-words-261 = иди
-accent-dwarf-words-replace-261 = ыды
-accent-dwarf-words-262 = первый
-accent-dwarf-words-replace-262 = пэрвэй
-accent-dwarf-words-263 = день
-accent-dwarf-words-replace-263 = дэнь
-accent-dwarf-words-264 = туда
-accent-dwarf-words-replace-264 = тудэ
-accent-dwarf-words-265 = ведь
-accent-dwarf-words-replace-265 = вэдь
-accent-dwarf-words-266 = хоть
-accent-dwarf-words-replace-266 = хотэ
-accent-dwarf-words-267 = после
-accent-dwarf-words-replace-267 = посльэ
-accent-dwarf-words-268 = жизнь
-accent-dwarf-words-replace-268 = жызнь
-accent-dwarf-words-269 = разве
-accent-dwarf-words-replace-269 = развэ
-accent-dwarf-words-270 = время
-accent-dwarf-words-replace-270 = врэмя
-accent-dwarf-words-271 = давай
-accent-dwarf-words-replace-271 = давэй
-accent-dwarf-words-272 = свою
-accent-dwarf-words-replace-272 = свошу
-accent-dwarf-words-273 = пусть
-accent-dwarf-words-replace-273 = пушть
-accent-dwarf-words-274 = глаза
-accent-dwarf-words-replace-274 = глэза
-accent-dwarf-words-275 = ничто
-accent-dwarf-words-replace-275 = нычто
-accent-dwarf-words-276 = папа
-accent-dwarf-words-replace-276 = уру
-accent-dwarf-words-277 = ребенок
-accent-dwarf-words-replace-277 = рэбэнэк
-accent-dwarf-words-278 = человек
-accent-dwarf-words-replace-278 = чэловэк
-accent-dwarf-words-279 = лишь
-accent-dwarf-words-replace-279 = лышь
-accent-dwarf-words-280 = уж
-accent-dwarf-words-replace-280 = ужэ
-accent-dwarf-words-281 = самый
-accent-dwarf-words-replace-281 = самэй
-accent-dwarf-words-282 = во
-accent-dwarf-words-replace-282 = воэ
-accent-dwarf-words-283 = мои
-accent-dwarf-words-replace-283 = мошы
-accent-dwarf-words-284 = перед
-accent-dwarf-words-replace-284 = пэрэд
-accent-dwarf-words-285 = стоит
-accent-dwarf-words-replace-285 = стоыт
-accent-dwarf-words-286 = вижу
-accent-dwarf-words-replace-286 = вижуэ
-accent-dwarf-words-287 = мама
-accent-dwarf-words-replace-287 = дельва
-accent-dwarf-words-288 = хотя
-accent-dwarf-words-replace-288 = хотэя
-accent-dwarf-words-289 = снова
-accent-dwarf-words-replace-289 = сновэ
-accent-dwarf-words-290 = себя
-accent-dwarf-words-replace-290 = сэбйя
-accent-dwarf-words-291 = работа
-accent-dwarf-words-replace-291 = рабэта
-accent-dwarf-words-292 = ходить
-accent-dwarf-words-replace-292 = ходыть
-accent-dwarf-words-293 = думаю
-accent-dwarf-words-replace-293 = думайу
-accent-dwarf-words-294 = ладно
-accent-dwarf-words-replace-294 = ладнэ
-accent-dwarf-words-295 = рука
-accent-dwarf-words-replace-295 = рушка
-accent-dwarf-words-296 = даже
-accent-dwarf-words-replace-296 = дажэ
-accent-dwarf-words-297 = слово
-accent-dwarf-words-replace-297 = слэво
-accent-dwarf-words-298 = командование
-accent-dwarf-words-replace-298 = управлярштво
-accent-dwarf-words-299 = командир
-accent-dwarf-words-replace-299 = управляршец
-accent-dwarf-words-300 = капитан
-accent-dwarf-words-replace-300 = главынь
-accent-dwarf-words-301 = кэп
-accent-dwarf-words-replace-301 = главынь
-accent-dwarf-words-302 = глава персонала
-accent-dwarf-words-replace-302 = капытанлюдэй
-accent-dwarf-words-303 = ГП
-accent-dwarf-words-replace-303 = капытанлюдэй
-accent-dwarf-words-304 = глава службы безопасности
-accent-dwarf-words-replace-304 = вождэй-стражнэк
-accent-dwarf-words-305 = ГСБ
-accent-dwarf-words-replace-305 = вождэй-стражнэк
-accent-dwarf-words-306 = старший инженер
-accent-dwarf-words-replace-306 = мэхмастэр
-accent-dwarf-words-307 = научный руководитель
-accent-dwarf-words-replace-307 = учёнэ-патрошн
-accent-dwarf-words-308 = НР
-accent-dwarf-words-replace-308 = учёнэ-патрошн
-accent-dwarf-words-309 = научрук
-accent-dwarf-words-replace-309 = учёнэ-патрошн
-accent-dwarf-words-310 = главврач
-accent-dwarf-words-replace-310 = вождэй-лэкарь
-accent-dwarf-words-311 = станция
-accent-dwarf-words-replace-311 = стэнцыград
-accent-dwarf-words-312 = факсами
-accent-dwarf-words-replace-312 = бумагэмарачеством
-accent-dwarf-words-313 = гарпия
-accent-dwarf-words-replace-313 = птычка
-accent-dwarf-words-314 = шарлатан
-accent-dwarf-words-replace-314 = цыган бэзконный
-accent-dwarf-words-315 = шарлотан
-accent-dwarf-words-replace-315 = цыган бэзконный
-accent-dwarf-words-316 = факсом
-accent-dwarf-words-replace-316 = бумагэмарачеством
-accent-dwarf-words-317 = факс
-accent-dwarf-words-replace-317 = бумагэмарачеством
-accent-dwarf-words-318 = ГВ
-accent-dwarf-words-replace-318 = вождэй-лэкарь
-accent-dwarf-words-319 = квартирмейстер
-accent-dwarf-words-replace-319 = снабжэвык
-accent-dwarf-words-320 = КМ
-accent-dwarf-words-replace-320 = снабжэвык
-accent-dwarf-words-321 = юридический департамент
-accent-dwarf-words-replace-321 = законорынэк
-accent-dwarf-words-322 = магистрат
-accent-dwarf-words-replace-322 = правосюдар
-accent-dwarf-words-323 = агент внутренних дел
-accent-dwarf-words-replace-323 = сплэтнослэд
-accent-dwarf-words-323 = АВД
-accent-dwarf-words-replace-323 = сплэтнослэд
-accent-dwarf-words-324 = отдел службы безопасности
-accent-dwarf-words-replace-324 = стражнэкинь
-accent-dwarf-words-325 = смотритель
-accent-dwarf-words-replace-325 = вахштэр
-accent-dwarf-words-326 = сматритель
-accent-dwarf-words-replace-326 = вахштэр
-accent-dwarf-words-327 = инструктор
-accent-dwarf-words-replace-327 = учёнэ-стражнэк
-accent-dwarf-words-328 = детектив
-accent-dwarf-words-replace-328 = слэдопыт
-accent-dwarf-words-329 = детективом
-accent-dwarf-words-replace-329 = слэдопытом
-accent-dwarf-words-330 = детектива
-accent-dwarf-words-replace-330 = слэдопыта
-accent-dwarf-words-331 = детективе
-accent-dwarf-words-replace-331 = слэдопыте
-accent-dwarf-words-332 = детективу
-accent-dwarf-words-replace-332 = слэдопыту
-accent-dwarf-words-333 = детективы
-accent-dwarf-words-replace-333 = слэдопыты
-accent-dwarf-words-334 = офицер
-accent-dwarf-words-replace-334 = стражнэк
-accent-dwarf-words-335 = кадет
-accent-dwarf-words-replace-335 = стражэнь
-accent-dwarf-words-336 = бригмедик
-accent-dwarf-words-replace-336 = лэкарь-страж
-accent-dwarf-words-337 = медицинский отдел
-accent-dwarf-words-replace-337 = лэчыльня
-accent-dwarf-words-338 = медотдел
-accent-dwarf-words-replace-338 = лэчыльня
-accent-dwarf-words-339 = химик
-accent-dwarf-words-replace-339 = зэльэвар
-accent-dwarf-words-340 = врач
-accent-dwarf-words-replace-340 = лэкарь
-accent-dwarf-words-341 = ведущий врач
-accent-dwarf-words-replace-341 = мудрый лэкарь
-accent-dwarf-words-342 = парамедик
-accent-dwarf-words-replace-342 = лэкарь-быстроног
-accent-dwarf-words-343 = психолог
-accent-dwarf-words-replace-343 = душэлэч
-accent-dwarf-words-344 = интерн
-accent-dwarf-words-replace-344 = лэкарь-свэжак
-accent-dwarf-words-345 = научный отдел
-accent-dwarf-words-replace-345 = учёнотавр
-accent-dwarf-words-346 = ведущий учёный
-accent-dwarf-words-replace-346 = ицеголовэй
-accent-dwarf-words-347 = ведущий ученый
-accent-dwarf-words-replace-347 = ицеголовэй
-accent-dwarf-words-348 = учёный
-accent-dwarf-words-replace-348 = учёнэ
-accent-dwarf-words-349 = ученый
-accent-dwarf-words-replace-349 = учёнэ
-accent-dwarf-words-350 = научный ассистент
-accent-dwarf-words-replace-350 = учёнэ-помошнэк
-accent-dwarf-words-351 = инженерный отдел
-accent-dwarf-words-replace-351 = мэхтавр
-accent-dwarf-words-352 = атмосферный техник
-accent-dwarf-words-replace-352 = воздухомэх
-accent-dwarf-words-353 = атмосферный техник
-accent-dwarf-words-replace-353 = воздухомэх
-accent-dwarf-words-354 = инженер
-accent-dwarf-words-replace-354 = мэханэк
-accent-dwarf-words-355 = технический ассистент
-accent-dwarf-words-replace-355 = мэх-помошнэк
-accent-dwarf-words-356 = отдел снабжения
-accent-dwarf-words-replace-356 = снабжэвник
-accent-dwarf-words-357 = утилизатор
-accent-dwarf-words-replace-357 = барахломэт
-accent-dwarf-words-358 = грузчик
-accent-dwarf-words-replace-358 = таскун
-accent-dwarf-words-359 = сервисный отдел
-accent-dwarf-words-replace-359 = пищэвары
-accent-dwarf-words-360 = бриг
-accent-dwarf-words-replace-360 = стрэжбункэр
-accent-dwarf-words-361 = телепорт
-accent-dwarf-words-replace-361 = тэлэпырт
-accent-dwarf-words-362 = телепортер
-accent-dwarf-words-replace-362 = тэлэпыртэр
-accent-dwarf-words-363 = телепортатор
-accent-dwarf-words-replace-363 = тэлэпыртак
-accent-dwarf-words-364 = портал
-accent-dwarf-words-replace-364 = портэль
-accent-dwarf-words-365 = диск
-accent-dwarf-words-replace-365 = круглэшка
-accent-dwarf-words-366 = ядерка
-accent-dwarf-words-replace-366 = ядрышнaя грохоталка
-accent-dwarf-words-367 = ядерная бомба
-accent-dwarf-words-replace-367 = ядрышнaя грохоталка
-accent-dwarf-words-368 = ядерная боеголовка
-accent-dwarf-words-replace-368 = ядрышнaя грохоталка
-accent-dwarf-words-369 = ядерку
-accent-dwarf-words-replace-369 = ядрышную грохоталку
-accent-dwarf-words-370 = ядерки
-accent-dwarf-words-replace-370 = ядрышной грохоталки
-accent-dwarf-words-371 = ядерной
-accent-dwarf-words-replace-371 = ядрышнога
-accent-dwarf-words-372 = ядерную бомбу
-accent-dwarf-words-replace-372 = ядрышную грохоталку
-accent-dwarf-words-373 = авторизации
-accent-dwarf-words-replace-373 = уполномошэнья
-accent-dwarf-words-374 = диск ядерной бомбы
-accent-dwarf-words-replace-374 = круглэшка ядрышнога уполномошэнья
-accent-dwarf-words-375 = диск от ядерной боеголовки
-accent-dwarf-words-replace-375 = круглэшка ядрышнога уполномошэнья
-accent-dwarf-words-376 = оружейка
-accent-dwarf-words-replace-376 = боекомната
-accent-dwarf-words-377 = оружейная
-accent-dwarf-words-replace-377 = боекомната
-accent-dwarf-words-378 = оружейку
-accent-dwarf-words-replace-378 = боекомнату
-accent-dwarf-words-379 = оружейную
-accent-dwarf-words-replace-379 = боекомнату
-accent-dwarf-words-380 = оружие
-accent-dwarf-words-replace-380 = оружыё
-accent-dwarf-words-381 = оружия
-accent-dwarf-words-replace-381 = оружыя
-accent-dwarf-words-382 = должен
-accent-dwarf-words-replace-382 = должшэн
-accent-dwarf-words-383 = будешь
-accent-dwarf-words-replace-383 = будыщ
-accent-dwarf-words-384 = ДАМ
-accent-dwarf-words-replace-384 = БЭМ
-accent-dwarf-words-385 = жизнью
-accent-dwarf-words-replace-385 = жызньюё
-accent-dwarf-words-386 = доступ
-accent-dwarf-words-replace-386 = достып
-accent-dwarf-words-387 = попроси
-accent-dwarf-words-replace-387 = попрошы
-accent-dwarf-words-388 = положил
-accent-dwarf-words-replace-388 = положыл
-accent-dwarf-words-389 = которые
-accent-dwarf-words-replace-389 = котошыэ
-accent-dwarf-words-390 = забрал
-accent-dwarf-words-replace-390 = забрыль
-accent-dwarf-words-391 = получил
-accent-dwarf-words-replace-391 = получшыл
-accent-dwarf-words-392 = запаски
-accent-dwarf-words-replace-392 = запашкы
-accent-dwarf-words-393 = запаска
-accent-dwarf-words-replace-393 = запашка
-accent-dwarf-words-394 = судьба
-accent-dwarf-words-replace-394 = сыдьбя
-accent-dwarf-words-395 = пупупу
-accent-dwarf-words-replace-395 = пы-пы-пы
-accent-dwarf-words-396 = автомат
-accent-dwarf-words-replace-396 = пулэмэт
-accent-dwarf-words-397 = пистолет
-accent-dwarf-words-replace-397 = коротыш
-accent-dwarf-words-398 = дробовик
-accent-dwarf-words-replace-398 = дробыш
-accent-dwarf-words-399 = лазерка
-accent-dwarf-words-replace-399 = светомёт
-accent-dwarf-words-400 = шеф-повар
-accent-dwarf-words-replace-400 = кухарь
-accent-dwarf-words-401 = ботаник
-accent-dwarf-words-replace-401 = растэвод
-accent-dwarf-words-402 = бармен
-accent-dwarf-words-replace-402 = пивовар
-accent-dwarf-words-403 = сервисный работник
-accent-dwarf-words-replace-403 = работулька
-accent-dwarf-words-404 = сервисник
-accent-dwarf-words-replace-404 = работулька
-accent-dwarf-words-405 = боксер
-accent-dwarf-words-replace-405 = кулачнэк
-accent-dwarf-words-406 = уборщик
-accent-dwarf-words-replace-406 = мэтельщэк
-accent-dwarf-words-407 = уборщек
-accent-dwarf-words-replace-407 = мэтельщэк
-accent-dwarf-words-408 = уборщика
-accent-dwarf-words-replace-408 = мэтельщэка
-accent-dwarf-words-409 = уборщику
-accent-dwarf-words-replace-409 = мэтельщэку
-accent-dwarf-words-410 = уборщики
-accent-dwarf-words-replace-410 = мэтельщэки
-accent-dwarf-words-411 = библиотекарь
-accent-dwarf-words-replace-411 = книголюб
-accent-dwarf-words-412 = библиотека
-accent-dwarf-words-replace-412 = книжарня
-accent-dwarf-words-413 = священник
-accent-dwarf-words-replace-413 = вэрховэн
-accent-dwarf-words-414 = зоотехник
-accent-dwarf-words-replace-414 = животовод
-accent-dwarf-words-415 = репортёр
-accent-dwarf-words-replace-415 = новостнэк
-accent-dwarf-words-416 = музыкант
-accent-dwarf-words-replace-416 = гармошник
-accent-dwarf-words-417 = пассажир
-accent-dwarf-words-replace-417 = путэшэствун
-accent-dwarf-words-418 = мим
-accent-dwarf-words-replace-418 = молчун
-accent-dwarf-words-419 = мима
-accent-dwarf-words-replace-419 = молчуна
-accent-dwarf-words-420 = миму
-accent-dwarf-words-replace-420 = молчуну
-accent-dwarf-words-421 = миме
-accent-dwarf-words-replace-421 = молчуне
-accent-dwarf-words-422 = клоун
-accent-dwarf-words-replace-422 = шутнэк
-accent-dwarf-words-423 = клоуна
-accent-dwarf-words-replace-423 = шутнэка
-accent-dwarf-words-424 = клоуну
-accent-dwarf-words-replace-424 = шутнэку
-accent-dwarf-words-425 = клоуны
-accent-dwarf-words-replace-425 = шутнярэ
-accent-dwarf-words-426 = пираты
-accent-dwarf-words-replace-426 = морэходы
-accent-dwarf-words-427 = крысиный король
-accent-dwarf-words-replace-427 = грызуновласт
-accent-dwarf-words-428 = космический дракон
-accent-dwarf-words-replace-428 = звёздолэтун
-accent-dwarf-words-429 = дракон
-accent-dwarf-words-replace-429 = огнэдыш
-accent-dwarf-words-430 = крыса
-accent-dwarf-words-replace-430 = грызун
-accent-dwarf-words-431 = ревенант
-accent-dwarf-words-replace-431 = душекрад
-accent-dwarf-words-432 = центральное командование
-accent-dwarf-words-replace-432 = управоцэнтр
-accent-dwarf-words-433 = центком
-accent-dwarf-words-replace-433 = управоцэнтр
-accent-dwarf-words-434 = представитель цк
-accent-dwarf-words-replace-434 = цэнтро-вэстнэк
-accent-dwarf-words-435 = рхбзз
-accent-dwarf-words-replace-435 = ядоотраж
-accent-dwarf-words-436 = обр
-accent-dwarf-words-replace-436 = быстростраж
-accent-dwarf-words-437 = эскадрон смерти
-accent-dwarf-words-replace-437 = смэртокрылы
-accent-dwarf-words-438 = синтетик
-accent-dwarf-words-replace-438 = мэхчэл
-accent-dwarf-words-439 = борг
-accent-dwarf-words-replace-439 = жэлезняк
-accent-dwarf-words-440 = борги
-accent-dwarf-words-replace-440 = жэлезняки
-accent-dwarf-words-441 = огузок
-accent-dwarf-words-replace-441 = отброс пивзаводный
-accent-dwarf-words-442 = агузок
-accent-dwarf-words-replace-442 = недоварок
-accent-dwarf-words-443 = идиот
-accent-dwarf-words-replace-443 = скисшэй хмель
-accent-dwarf-words-444 = долбоеб
-accent-dwarf-words-replace-444 = безбородый урод
-accent-dwarf-words-445 = пиздец
-accent-dwarf-words-replace-445 = кегкрах
-accent-dwarf-words-446 = блять
-accent-dwarf-words-replace-446 = вррон
-accent-dwarf-words-447 = охуеть
-accent-dwarf-words-replace-447 = обезбородиться
-accent-dwarf-words-448 = атмос
-accent-dwarf-words-replace-448 = воздухня
-accent-dwarf-words-449 = стимулятор
-accent-dwarf-words-replace-449 = вколотэл
-accent-dwarf-words-450 = стимуляторы
-accent-dwarf-words-replace-450 = вколотэлы
-accent-dwarf-words-451 = стимуляторов
-accent-dwarf-words-replace-451 = вколотэлшэв
-accent-dwarf-words-452 = стимулятора
-accent-dwarf-words-replace-452 = вколотэла
-accent-dwarf-words-453 = на
-accent-dwarf-words-replace-453 = нэ
-accent-dwarf-words-454 = он
-accent-dwarf-words-replace-454 = ом
-accent-dwarf-words-455 = но
-accent-dwarf-words-replace-455 = ноэ
-accent-dwarf-words-456 = то
-accent-dwarf-words-replace-456 = тоэ
-accent-dwarf-words-457 = который
-accent-dwarf-words-replace-457 = котошыэ
-accent-dwarf-words-458 = из
-accent-dwarf-words-replace-458 = ис
-accent-dwarf-words-459 = у
-accent-dwarf-words-replace-459 = у
-accent-dwarf-words-460 = свой
-accent-dwarf-words-replace-460 = своым
-accent-dwarf-words-461 = о
-accent-dwarf-words-replace-461 = оэ
-accent-dwarf-words-462 = год
-accent-dwarf-words-replace-462 = лэт
-accent-dwarf-words-463 = такой
-accent-dwarf-words-replace-463 = токоэ
-accent-dwarf-words-464 = тот
-accent-dwarf-words-replace-464 = тотэ
-accent-dwarf-words-465 = бы
-accent-dwarf-words-replace-465 = быль
-accent-dwarf-words-466 = другой
-accent-dwarf-words-replace-466 = дружэй
-accent-dwarf-words-467 = становиться
-accent-dwarf-words-replace-467 = становытсйа
-accent-dwarf-words-468 = при
-accent-dwarf-words-replace-468 = пры
-accent-dwarf-words-469 = новый
-accent-dwarf-words-replace-469 = свэжый
-accent-dwarf-words-470 = хотеть
-accent-dwarf-words-replace-470 = хоштэт
-accent-dwarf-words-471 = со
-accent-dwarf-words-replace-471 = сы
-accent-dwarf-words-472 = руки
-accent-dwarf-words-replace-472 = рушкы
-accent-dwarf-words-473 = город
-accent-dwarf-words-replace-473 = град
-accent-dwarf-words-474 = вопрос
-accent-dwarf-words-replace-474 = вопрош
-accent-dwarf-words-475 = под
-accent-dwarf-words-replace-475 = пот
-accent-dwarf-words-476 = давать
-accent-dwarf-words-replace-476 = давэйт
-accent-dwarf-words-477 = место
-accent-dwarf-words-replace-477 = мэста
-accent-dwarf-words-478 = более
-accent-dwarf-words-replace-478 = болээ
-accent-dwarf-words-479 = менее
-accent-dwarf-words-replace-479 = мэста
-accent-dwarf-words-480 = более
-accent-dwarf-words-replace-480 = болээ
-accent-dwarf-words-481 = менее
-accent-dwarf-words-replace-481 = мэние
-accent-dwarf-words-482 = идти
-accent-dwarf-words-replace-482 = дэрат ногы
-accent-dwarf-words-483 = просто
-accent-dwarf-words-replace-483 = простэ
-accent-dwarf-words-484 = начинать
-accent-dwarf-words-replace-484 = начнёмшэ
-accent-dwarf-words-485 = здесь
-accent-dwarf-words-replace-485 = тутэ
-accent-dwarf-words-486 = получать
-accent-dwarf-words-replace-486 = получшад
-accent-dwarf-words-487 = через
-accent-dwarf-words-replace-487 = чэрэш
-accent-dwarf-words-488 = много
-accent-dwarf-words-replace-488 = значшытельно
-accent-dwarf-words-489 = мир
-accent-dwarf-words-replace-489 = горнтракт
-accent-dwarf-words-490 = несколько
-accent-dwarf-words-replace-490 = чуткаэ
-accent-dwarf-words-491 = система
-accent-dwarf-words-replace-491 = мехсэть
-accent-dwarf-words-492 = проблемный
-accent-dwarf-words-replace-492 = закавычшный
-accent-dwarf-words-493 = проблемная
-accent-dwarf-words-replace-493 = закавычшнайа
-accent-dwarf-words-494 = проблемное
-accent-dwarf-words-replace-494 = закавычшноэ
-accent-dwarf-words-495 = образ
-accent-dwarf-words-replace-495 = вырезба
-accent-dwarf-words-496 = книга
-accent-dwarf-words-replace-496 = буквэсборник
-accent-dwarf-words-497 = книги
-accent-dwarf-words-replace-497 = буквэсборникы
-accent-dwarf-words-498 = книге
-accent-dwarf-words-replace-498 = буквэсборникуэ
-accent-dwarf-words-499 = кнги
-accent-dwarf-words-replace-499 = буквосборнэков
-accent-dwarf-words-500 = нашел
-accent-dwarf-words-replace-500 = откопынул
-accent-dwarf-words-501 = нашёл
-accent-dwarf-words-replace-501 = откопынул
-accent-dwarf-words-502 = нашла
-accent-dwarf-words-replace-502 = откопынулэ
-accent-dwarf-words-503 = авантюрист
-accent-dwarf-words-replace-503 = страннык
-accent-dwarf-words-504 = авантюристы
-accent-dwarf-words-replace-504 = странныкы
-accent-dwarf-words-505 = авантюриста
-accent-dwarf-words-replace-505 = странныкыа
-accent-dwarf-words-506 = авантюристом
-accent-dwarf-words-replace-506 = странныком
-accent-dwarf-words-507 = диспетчер
-accent-dwarf-words-replace-507 = зывало
-accent-dwarf-words-508 = диспетчера
-accent-dwarf-words-replace-508 = зывалы
-accent-dwarf-words-508 = фронтир
-accent-dwarf-words-replace-508 = днище
-accent-dwarf-words-509 = фронтира
-accent-dwarf-words-replace-509 = дныща
-accent-dwarf-words-510 = представитель
-accent-dwarf-words-replace-510 = вэстнэк
-accent-dwarf-words-511 = представителя
-accent-dwarf-words-replace-511 = вэстнэкыа
-accent-dwarf-words-512 = шериф
-accent-dwarf-words-replace-512 = главынь-стражнэк
-accent-dwarf-words-513 = шерифа
-accent-dwarf-words-replace-513 = главынь-стражнэка
-accent-dwarf-words-514 = шерифу
-accent-dwarf-words-replace-514 = главынь-стражнэку
-accent-dwarf-words-515 = ДСБФ
-accent-dwarf-words-replace-515 = департык стрыжы дныща
-accent-dwarf-words-516 = датамайнер
-accent-dwarf-words-replace-516 = копылка
-accent-dwarf-words-517 = датамайнера
-accent-dwarf-words-replace-517 = копылкы
-accent-dwarf-words-518 = датамайнеры
-accent-dwarf-words-replace-518 = копылкы
-accent-dwarf-words-519 = дотамайнер
-accent-dwarf-words-replace-519 = копылка
-accent-dwarf-words-520 = дотамайнера
-accent-dwarf-words-replace-520 = копылкы
-accent-dwarf-words-521 = дотамайнеры
-accent-dwarf-words-replace-521 = копылкы
-accent-dwarf-words-522 = тенеморф
-accent-dwarf-words-replace-522 = чорно дыч
-accent-dwarf-words-523 = культ
-accent-dwarf-words-replace-523 = краснотрэпые
-accent-dwarf-words-524 = культист
-accent-dwarf-words-replace-524 = краснотрэпый
-accent-dwarf-words-525 = культисты
-accent-dwarf-words-replace-525 = краснотрэпыэ
-accent-dwarf-words-526 = кровь
-accent-dwarf-words-replace-526 = красно водыца
-accent-dwarf-words-527 = крови
-accent-dwarf-words-replace-527 = красно водыцы
-accent-dwarf-words-528 = стыковка
-accent-dwarf-words-replace-528 = швыртувка
-accent-dwarf-words-529 = стыкуюсь
-accent-dwarf-words-replace-529 = швыртуйусь
-accent-dwarf-words-528 = стыковка
-accent-dwarf-words-replace-528 = швыртувка
-accent-dwarf-words-530 = стык
-accent-dwarf-words-replace-530 = швырт
-accent-dwarf-words-531 = отстыковка
-accent-dwarf-words-replace-531 = отшвыртувка
-accent-dwarf-words-532 = отстыкуюсь
-accent-dwarf-words-replace-532 = отшвыртуйусь
-accent-dwarf-words-533 = отстыковка
-accent-dwarf-words-replace-533 = отшвыртувка
-accent-dwarf-words-534 = пиявка
-accent-dwarf-words-replace-534 = красносос
-accent-dwarf-words-535 = пиявки
-accent-dwarf-words-replace-535 = краснососы
-accent-dwarf-words-536 = ящик
-accent-dwarf-words-replace-536 = храныло
-accent-dwarf-words-537 = ящики
-accent-dwarf-words-replace-537 = хранылы
-accent-dwarf-words-538 = канистра
-accent-dwarf-words-replace-538 = воздухохраныло
-accent-dwarf-words-539 = канистры
-accent-dwarf-words-replace-539 = воздухохранылы
diff --git a/Resources/Locale/ru-RU/accent/mobster.ftl b/Resources/Locale/ru-RU/accent/mobster.ftl
index 4c1415e29de..d67ef0297a3 100644
--- a/Resources/Locale/ru-RU/accent/mobster.ftl
+++ b/Resources/Locale/ru-RU/accent/mobster.ftl
@@ -4,37 +4,37 @@ accent-mobster-suffix-boss-2 = , дазабей.
accent-mobster-suffix-boss-3 = , андестенд?
accent-mobster-suffix-minion-1 = , йеах!
accent-mobster-suffix-minion-2 = , босс говорит!
-accent-mobster-words-1 = let me
-accent-mobster-words-replace-1 = lemme
-accent-mobster-words-2 = should
-accent-mobster-words-replace-2 = oughta
-accent-mobster-words-3 = the
-accent-mobster-words-replace-3 = da
-accent-mobster-words-4 = them
-accent-mobster-words-replace-4 = dem
-accent-mobster-words-5 = attack
-accent-mobster-words-replace-5 = whack
-accent-mobster-words-6 = kill
-accent-mobster-words-replace-6 = whack
-accent-mobster-words-7 = murder
-accent-mobster-words-replace-7 = whack
-accent-mobster-words-8 = dead
-accent-mobster-words-replace-8 = sleepin' with da fishies
-accent-mobster-words-9 = hey
-accent-mobster-words-replace-9 = ey'o
-accent-mobster-words-10 = hi
-accent-mobster-words-replace-10 = ey'o
-accent-mobster-words-11 = hello
-accent-mobster-words-replace-11 = ey'o
-accent-mobster-words-12 = rules
-accent-mobster-words-replace-12 = roolz
-accent-mobster-words-13 = you
-accent-mobster-words-replace-13 = yous
-accent-mobster-words-14 = have to
-accent-mobster-words-replace-14 = gotta
-accent-mobster-words-15 = going to
-accent-mobster-words-replace-15 = boutta
-accent-mobster-words-16 = about to
-accent-mobster-words-replace-16 = boutta
-accent-mobster-words-17 = here
-accent-mobster-words-replace-17 = 'ere
+accent-mobster-words-1 = давай я
+accent-mobster-words-replace-1 = дайя
+accent-mobster-words-2 = ищи
+accent-mobster-words-replace-2 = рыскай
+accent-mobster-words-3 = это
+accent-mobster-words-replace-3 = эт
+accent-mobster-words-4 = они
+accent-mobster-words-replace-4 = эти вот
+accent-mobster-words-5 = атаковать
+accent-mobster-words-replace-5 = в крысу
+accent-mobster-words-6 = убить
+accent-mobster-words-replace-6 = замочить
+accent-mobster-words-7 = напасть
+accent-mobster-words-replace-7 = втащить
+accent-mobster-words-8 = мёртв
+accent-mobster-words-replace-8 = дрыхнет с рыбками
+accent-mobster-words-9 = привет
+accent-mobster-words-replace-9 = ей'йо
+accent-mobster-words-10 = хай
+accent-mobster-words-replace-10 = ей'йо
+accent-mobster-words-11 = хей
+accent-mobster-words-replace-11 = ей'йо
+accent-mobster-words-12 = правило
+accent-mobster-words-replace-12 = мутка
+accent-mobster-words-13 = ты
+accent-mobster-words-replace-13 = ты нна
+accent-mobster-words-14 = нужно
+accent-mobster-words-replace-14 = нада
+accent-mobster-words-15 = идет
+accent-mobster-words-replace-15 = шкандыбает
+accent-mobster-words-16 = идёт
+accent-mobster-words-replace-16 = шкандыбает
+accent-mobster-words-17 = тут
+accent-mobster-words-replace-17 = тута
diff --git a/Resources/Locale/ru-RU/accent/pirate.ftl b/Resources/Locale/ru-RU/accent/pirate.ftl
index 2833acda7e1..daaadcf61c6 100644
--- a/Resources/Locale/ru-RU/accent/pirate.ftl
+++ b/Resources/Locale/ru-RU/accent/pirate.ftl
@@ -5,17 +5,17 @@ accent-pirate-replaced-1 = my
accent-pirate-replacement-1 = me
accent-pirate-replaced-2 = you
accent-pirate-replacement-2 = ya
-accent-pirate-replaced-3 = hello
-accent-pirate-replacement-3 = ahoy
+accent-pirate-replaced-3 = привет
+accent-pirate-replacement-3 = Э-хэй!
accent-pirate-replaced-4 = yes
accent-pirate-replacement-4 = aye
accent-pirate-replaced-5 = yea
-accent-pirate-replaced-6 = hi
-accent-pirate-replaced-7 = is
accent-pirate-replacement-5 = be
-accent-pirate-replaced-8 = there
+accent-pirate-replaced-6 = hi
accent-pirate-replacement-6 = thar
+accent-pirate-replaced-7 = is
accent-pirate-replacement-7 = heartie
+accent-pirate-replaced-8 = there
accent-pirate-replacement-8 = matey
accent-pirate-replaced-9 = buddy
accent-pirate-replacement-9 = heartie
@@ -23,45 +23,195 @@ accent-pirate-replaced-10 = hi
accent-pirate-replacement-10 = ahoy
accent-pirate-replaced-11 = hey
accent-pirate-replacement-11 = oye
-accent-pirate-replaced-12 = money
-accent-pirate-replacement-12 = dubloons
-accent-pirate-replaced-13 = cash
-accent-pirate-replacement-13 = doubloons
-accent-pirate-replaced-14 = crate
-accent-pirate-replacement-14 = coffer
-accent-pirate-replaced-15 = hello
-accent-pirate-replacement-15 = ahoy
-accent-pirate-replaced-16 = treasure
-accent-pirate-replacement-16 = booty
-accent-pirate-replaced-17 = attention
-accent-pirate-replacement-17 = avast
-accent-pirate-replaced-18 = stupid
-accent-pirate-replacement-18 = parrot-brained
-accent-pirate-replaced-19 = idiot
-accent-pirate-replacement-19 = seadog
-accent-pirate-replaced-20 = your
-accent-pirate-replacement-20 = yere
-accent-pirate-replaced-21 = song
-accent-pirate-replacement-21 = shanty
-accent-pirate-replaced-22 = music
-accent-pirate-replacement-22 = shanty
-accent-pirate-replaced-23 = no
-accent-pirate-replacement-23 = nay
-accent-pirate-replaced-24 = are
-accent-pirate-replacement-24 = arrr
-accent-pirate-replaced-25 = ow
-accent-pirate-replacement-25 = argh
-accent-pirate-replaced-26 = ouch
-accent-pirate-replacement-26 = argh
-accent-pirate-replaced-27 = passenger
-accent-pirate-replacement-27 = landlubber
-accent-pirate-replaced-28 = tider
-accent-pirate-replacement-28 = landlubber
-accent-pirate-replaced-29 = captain
-accent-pirate-replacement-29 = cap'n
-accent-pirate-replaced-30 = pistol
-accent-pirate-replacement-30 = flintlock
-accent-pirate-replaced-31 = rifle
-accent-pirate-replacement-31 = musket
-accent-pirate-replaced-32 = ammo
-accent-pirate-replacement-32 = gunpowder
+accent-pirate-replaced-12 = деньги
+accent-pirate-replacement-12 = дублоны
+accent-pirate-replaced-13 = денег
+accent-pirate-replacement-13 = дублонов
+accent-pirate-replaced-14 = деньгам
+accent-pirate-replacement-14 = дублонам
+accent-pirate-replaced-15 = деньгами
+accent-pirate-replacement-15 = дублонами
+accent-pirate-replaced-16 = деньгах
+accent-pirate-replacement-16 = дублонах
+accent-pirate-replaced-17 = cash
+accent-pirate-replacement-17 = doubloons
+accent-pirate-replaced-18 = ящик
+accent-pirate-replacement-18 = рундук
+accent-pirate-replaced-19 = ящики
+accent-pirate-replacement-19 = рундуки
+accent-pirate-replaced-20 = ящика
+accent-pirate-replacement-20 = рундука
+accent-pirate-replaced-21 = ящиков
+accent-pirate-replacement-21 = рундуков
+accent-pirate-replaced-22 = ящику
+accent-pirate-replacement-22 = рундуку
+accent-pirate-replaced-23 = ящикам
+accent-pirate-replacement-23 = рундукам
+accent-pirate-replaced-24 = ящиком
+accent-pirate-replacement-24 = рундуком
+accent-pirate-replaced-25 = ящиками
+accent-pirate-replacement-25 = рундуками
+accent-pirate-replaced-26 = ящике
+accent-pirate-replacement-26 = рундуке
+accent-pirate-replaced-27 = ящиках
+accent-pirate-replacement-27 = рундуках
+accent-pirate-replaced-28 = hello
+accent-pirate-replacement-28 = ahoy
+accent-pirate-replaced-29 = treasure
+accent-pirate-replacement-29 = booty
+accent-pirate-replaced-30 = attention
+accent-pirate-replacement-30 = avast
+accent-pirate-replaced-31 = stupid
+accent-pirate-replacement-31 = parrot-brained
+accent-pirate-replaced-32 = дурак
+accent-pirate-replacement-32 = портовая крыса
+accent-pirate-replaced-33 = дураки
+accent-pirate-replacement-33 = портовые крысы
+accent-pirate-replaced-34 = дурака
+accent-pirate-replacement-34 = портовую крысу
+accent-pirate-replaced-35 = дураков
+accent-pirate-replacement-35 = портовых крыс
+accent-pirate-replaced-36 = дураку
+accent-pirate-replacement-36 = портовой крысе
+accent-pirate-replaced-37 = дуракам
+accent-pirate-replacement-37 = портовым крысам
+accent-pirate-replaced-38 = дураком
+accent-pirate-replacement-38 = портовой крысой
+accent-pirate-replaced-39 = дураками
+accent-pirate-replacement-39 = портовыми крысами
+accent-pirate-replaced-40 = дураке
+accent-pirate-replacement-40 = портовой крысе
+accent-pirate-replaced-41 = дураках
+accent-pirate-replacement-41 = портовых крысах
+accent-pirate-replaced-42 = дура
+accent-pirate-replacement-42 = трюмная крыса
+accent-pirate-replaced-43 = дуры
+accent-pirate-replacement-43 = трюмные крысы
+accent-pirate-replaced-44 = дур
+accent-pirate-replacement-44 = трюмных крыс
+accent-pirate-replaced-45 = дурой
+accent-pirate-replacement-45 = трюмной крысой
+accent-pirate-replaced-46 = дурами
+accent-pirate-replacement-46 = трюмными крысами
+accent-pirate-replaced-47 = дуре
+accent-pirate-replacement-47 = трюмной крысе
+accent-pirate-replaced-48 = дурах
+accent-pirate-replacement-48 = трюмных крысах
+accent-pirate-replaced-49 = your
+accent-pirate-replacement-49 = yere
+accent-pirate-replaced-50 = песня
+accent-pirate-replacement-50 = шанти
+accent-pirate-replaced-51 = песни
+accent-pirate-replacement-51 = шанти
+accent-pirate-replaced-52 = песен
+accent-pirate-replacement-52 = шанти
+accent-pirate-replaced-53 = песне
+accent-pirate-replacement-53 = шанти
+accent-pirate-replaced-54 = песням
+accent-pirate-replacement-54 = шанти
+accent-pirate-replaced-55 = песню
+accent-pirate-replacement-55 = шанти
+accent-pirate-replaced-56 = песни
+accent-pirate-replacement-56 = шанти
+accent-pirate-replaced-57 = песней
+accent-pirate-replacement-57 = шанти
+accent-pirate-replaced-58 = песнями
+accent-pirate-replacement-58 = шанти
+accent-pirate-replaced-59 = песнях
+accent-pirate-replacement-59 = шанти
+accent-pirate-replaced-60 = музыка
+accent-pirate-replacement-60 = шанти
+accent-pirate-replaced-61 = no
+accent-pirate-replacement-61 = nay
+accent-pirate-replaced-62 = are
+accent-pirate-replacement-62 = arrr
+accent-pirate-replaced-63 = ой
+accent-pirate-replacement-63 = йа-а-рггх!
+accent-pirate-replaced-64 = упс
+accent-pirate-replacement-64 = лопни моя селезёнка!
+accent-pirate-replaced-65 = авантюрист
+accent-pirate-replacement-65 = пёс корпоратский
+accent-pirate-replaced-66 = авантюриста
+accent-pirate-replacement-66 = пса корпоратского
+accent-pirate-replaced-67 = авантюристу
+accent-pirate-replacement-67 = псу корпоратскому
+accent-pirate-replaced-68 = авантюристы
+accent-pirate-replacement-68 = псы корпоратские
+accent-pirate-replaced-69 = авантюристов
+accent-pirate-replacement-69 = псов корпоратских
+accent-pirate-replaced-70 = авантюристам
+accent-pirate-replacement-70 = псам корпоратским
+accent-pirate-replaced-71 = авантюристом
+accent-pirate-replacement-71 = псом корпоратским
+accent-pirate-replaced-72 = авантюристами
+accent-pirate-replacement-72 = псами корпоратскими
+accent-pirate-replaced-73 = авантюристах
+accent-pirate-replacement-73 = псах корпоратских
+accent-pirate-replaced-74 = авантюристе
+accent-pirate-replacement-74 = псе корпоратском
+accent-pirate-replaced-75 = tider
+accent-pirate-replacement-75 = landlubber
+accent-pirate-replaced-76 = капитан
+accent-pirate-replacement-76 = кэп
+accent-pirate-replaced-77 = пистолет
+accent-pirate-replacement-77 = пистоль
+accent-pirate-replaced-78 = ружье
+accent-pirate-replacement-78 = мушкет
+accent-pirate-replaced-79 = ружья
+accent-pirate-replacement-79 = мушкеты
+accent-pirate-replaced-80 = ружей
+accent-pirate-replacement-80 = мушкетов
+accent-pirate-replaced-81 = ружью
+accent-pirate-replacement-81 = мушкету
+accent-pirate-replaced-82 = ружьям
+accent-pirate-replacement-82 = мушкетам
+accent-pirate-replaced-83 = ружьями
+accent-pirate-replacement-83 = мушкетами
+accent-pirate-replaced-84 = ружьях
+accent-pirate-replacement-84 = мушкетов
+accent-pirate-replaced-85 = бля
+accent-pirate-replacement-85 = три тысячи карпоакул мне в глотку
+accent-pirate-replaced-86 = блять
+accent-pirate-replacement-86 = три тысячи карпоакул мне в глотку
+accent-pirate-replaced-87 = похуй
+accent-pirate-replacement-87 = старому космо-пирату это до черта
+accent-pirate-replaced-88 = плевать
+accent-pirate-replacement-88 = старому космо-пирату нет забот
+accent-pirate-replaced-89 = лол
+accent-pirate-replacement-89 = йо-ха-ха
+accent-pirate-replaced-90 = увы
+accent-pirate-replacement-90 = тысяча чертей и один акселератор
+accent-pirate-replaced-91 = стыкую
+accent-pirate-replacement-91 = швартую
+accent-pirate-replaced-92 = стыкуешь
+accent-pirate-replacement-92 = швартуешь
+accent-pirate-replaced-93 = стыкует
+accent-pirate-replacement-93 = швартует
+accent-pirate-replaced-94 = стыкуем
+accent-pirate-replacement-94 = швартуем
+accent-pirate-replaced-95 = стыкуете
+accent-pirate-replacement-95 = швартуете
+accent-pirate-replaced-96 = стыкуют
+accent-pirate-replacement-96 = швартуют
+accent-pirate-replaced-97 = стыковал
+accent-pirate-replacement-97 = швартовал
+accent-pirate-replaced-98 = стыковала
+accent-pirate-replacement-98 = швартовала
+accent-pirate-replaced-99 = стыковало
+accent-pirate-replacement-99 = швартовало
+accent-pirate-replaced-100 = стыковали
+accent-pirate-replacement-100 = швартовали
+accent-pirate-replaced-101 = стыкуй
+accent-pirate-replacement-101 = швартуй
+accent-pirate-replaced-102 = стыкуйте
+accent-pirate-replacement-102 = швартуйте
+accent-pirate-replaced-103 = стыкующий
+accent-pirate-replacement-103 = швартующий
+accent-pirate-replaced-104 = стыковавший
+accent-pirate-replacement-104 = швартовавший
+accent-pirate-replaced-105 = стыковав
+accent-pirate-replacement-105 = швартовав
+accent-pirate-replaced-106 = стыкуя
+accent-pirate-replacement-106 = швартуя
+accent-pirate-replaced-107 = стыковать
+accent-pirate-replacement-107 = швартовать
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/access/components/id-card-console-component.ftl b/Resources/Locale/ru-RU/access/components/id-card-console-component.ftl
index 972f112691a..ca45575e18b 100644
--- a/Resources/Locale/ru-RU/access/components/id-card-console-component.ftl
+++ b/Resources/Locale/ru-RU/access/components/id-card-console-component.ftl
@@ -3,11 +3,11 @@ id-card-console-window-target-id = Целевая ID:
id-card-console-window-full-name-label = Полное имя:
id-card-console-window-save-button = Сохранить
id-card-console-window-job-title-label = Должность:
-id-card-console-window-ship-name-label = Название шаттла:
+id-card-console-window-ship-name-label = Shuttle name:
id-card-console-window-eject-button = Извлечь
id-card-console-window-insert-button = Вставить
id-card-console-window-job-selection-label = Предустановки должностей (задаёт иконку отдела и должности):
-id-card-console-window-shuttle-placeholder = Не владеет шаттлом
+id-card-console-window-shuttle-placeholder = No owned shuttle
access-id-card-console-component-no-hands-error = У вас нет рук.
id-card-console-privileged-id = Основная ID
id-card-console-target-id = Целевая ID
diff --git a/Resources/Locale/ru-RU/accessories/human-hair.ftl b/Resources/Locale/ru-RU/accessories/human-hair.ftl
index 29e66e9fb0a..eae55f75619 100644
--- a/Resources/Locale/ru-RU/accessories/human-hair.ftl
+++ b/Resources/Locale/ru-RU/accessories/human-hair.ftl
@@ -55,6 +55,7 @@ marking-HumanHairCornrows2 = Корнроу 2
marking-HumanHairCornrowbun = Корнроу (Пучок)
marking-HumanHairCornrowbraid = Корнроу (Косичка)
marking-HumanHairCornrowtail = Корнроу (Хвостик)
+marking-HumanHairSpookyLong = Длинная (Зловещая)
marking-HumanHairCrewcut = Крю-кат
marking-HumanHairCrewcut2 = Крю-кат 2
marking-HumanHairCurls = Завитки
diff --git a/Resources/Locale/ru-RU/accessories/vox-facial-hair.ftl b/Resources/Locale/ru-RU/accessories/vox-facial-hair.ftl
index 78629e10387..4aee325323f 100644
--- a/Resources/Locale/ru-RU/accessories/vox-facial-hair.ftl
+++ b/Resources/Locale/ru-RU/accessories/vox-facial-hair.ftl
@@ -1,5 +1,5 @@
-marking-VoxFacialHairColonel = Вокс Полковник
-marking-VoxFacialHairFu = Перья Фу
-marking-VoxFacialHairNeck = Шейные перья
-marking-VoxFacialHairBeard = Перьевая борода
-marking-VoxFacialHairRuffBeard = Грубая борода
+marking-VoxFacialHairColonel = Вокс, Полковник
+marking-VoxFacialHairFu = Вокс, Перья Фу
+marking-VoxFacialHairNeck = Вокс, Шейные перья
+marking-VoxFacialHairBeard = Вокс, Перьевая борода
+marking-VoxFacialHairMane = Вокс, Борода (Грива)
diff --git a/Resources/Locale/ru-RU/accessories/vox-hair.ftl b/Resources/Locale/ru-RU/accessories/vox-hair.ftl
index 2cf71696921..bcc415b759c 100644
--- a/Resources/Locale/ru-RU/accessories/vox-hair.ftl
+++ b/Resources/Locale/ru-RU/accessories/vox-hair.ftl
@@ -1,13 +1,22 @@
-marking-VoxHairShortQuills = Вокс Короткие перья
-marking-VoxHairKingly = Вокс Королевская
-marking-VoxHairAfro = Вокс Афро
-marking-VoxHairMohawk = Вокс Могавк
-marking-VoxHairYasuhiro = Вокс Ясухиро
-marking-VoxHairHorns = Вокс Рога
-marking-VoxHairNights = Вокс Ночная
-marking-VoxHairSurf = Вокс Сёрфер
-marking-VoxHairCropped = Вокс Короткая
-marking-VoxHairRuffhawk = Вокс Руфхавк
-marking-VoxHairRows = Вокс Ряды
-marking-VoxHairMange = Вокс Лишай
-marking-VoxHairPony = Вокс Пони
+marking-VoxHairShortQuills = Вокс, Короткие перья
+marking-VoxHairBraids = Вокс, Косички
+marking-VoxHairCrestedQuills = Вокс, Гребнистые перья
+marking-VoxHairEmperorQuills = Вокс, Императорские перья
+marking-VoxHairFlowing = Вокс, Струящаяся
+marking-VoxHairHawk = Вокс, Ястреб
+marking-VoxHairKingly = Вокс, Королевская
+marking-VoxHairKeelQuills = Вокс, Килевые перья
+marking-VoxHairKeetQuills = Вокс, Перья цесарки
+marking-VoxHairAfro = Вокс, Афро
+marking-VoxHairLongBraid = Вокс, Длинная коса
+marking-VoxHairMohawk = Вокс, Могавк
+marking-VoxHairHorns = Вокс, Рога
+marking-VoxHairNights = Вокс, Ночная
+marking-VoxHairRazorClipped = Вокс, Бритва (Обрезанные)
+marking-VoxHairRazor = Вокс, Бритва
+marking-VoxHairSortBraid = Вокс, Короткая коса
+marking-VoxHairSurf = Вокс, Сёрфер
+marking-VoxHairTielQuills = Вокс, Тилские перья
+marking-VoxHairYasu = Вокс, Ясухиро
+marking-VoxHairMange = Вокс, Лишай
+marking-VoxHairPony = Вокс, Пони
diff --git a/Resources/Locale/ru-RU/actions/actions/diona.ftl b/Resources/Locale/ru-RU/actions/actions/diona.ftl
index 2b4845fcdb2..39eeb3f6d3a 100644
--- a/Resources/Locale/ru-RU/actions/actions/diona.ftl
+++ b/Resources/Locale/ru-RU/actions/actions/diona.ftl
@@ -1,2 +1,2 @@
-diona-gib-action-use = { $name } распадается на части!
-diona-reform-attempt = { $name } пытается развиться!
+diona-gib-action-use = { $name } splits apart in an instant!
+diona-reform-attempt = { $name } attempts to reform!
diff --git a/Resources/Locale/ru-RU/administration/admin-verbs.ftl b/Resources/Locale/ru-RU/administration/admin-verbs.ftl
index 261aa3665fc..6ecbbb4cc57 100644
--- a/Resources/Locale/ru-RU/administration/admin-verbs.ftl
+++ b/Resources/Locale/ru-RU/administration/admin-verbs.ftl
@@ -6,6 +6,7 @@ admin-verbs-admin-logs-entity = Логи сущности
admin-verbs-teleport-to = Телепортироваться к
admin-verbs-teleport-here = Телепортировать сюда
admin-verbs-freeze = Заморозить
+admin-verbs-freeze-and-mute = Заморозить и заглушить
admin-verbs-unfreeze = Разморозить
admin-verbs-erase = Стереть
admin-verbs-erase-description =
diff --git a/Resources/Locale/ru-RU/administration/antag.ftl b/Resources/Locale/ru-RU/administration/antag.ftl
index 2eeb9693d85..9c65f3219e6 100644
--- a/Resources/Locale/ru-RU/administration/antag.ftl
+++ b/Resources/Locale/ru-RU/administration/antag.ftl
@@ -3,11 +3,11 @@ admin-verb-make-traitor = Сделать цель предателем.
admin-verb-make-zombie = Сделать цель зомби.
admin-verb-make-nuclear-operative = Сделать цель одиноким Ядерным оперативником.
admin-verb-make-pirate = Сделать цель пиратом\капером. Учтите, что это не меняет игровой режим.
-admin-verb-make-head-rev = Сделать цель Главой революции.
-admin-verb-make-thief = Сделать цель Вором.
+admin-verb-make-head-rev = Сделать цель главой революции.
+admin-verb-make-thief = Сделать цель вором.
admin-verb-text-make-traitor = Сделать предателем
admin-verb-text-make-zombie = Сделать зомби
admin-verb-text-make-nuclear-operative = Сделать ядерным оперативником
admin-verb-text-make-pirate = Сделать пиратом
admin-verb-text-make-head-rev = Сделать Главой революции
-admin-verb-text-make-thief = Сделать Вором.
+admin-verb-text-make-thief = Сделать вором
diff --git a/Resources/Locale/ru-RU/administration/commands/add-uplink-command.ftl b/Resources/Locale/ru-RU/administration/commands/add-uplink-command.ftl
index d9bb9fb87c9..d2cbd89a7b4 100644
--- a/Resources/Locale/ru-RU/administration/commands/add-uplink-command.ftl
+++ b/Resources/Locale/ru-RU/administration/commands/add-uplink-command.ftl
@@ -1,4 +1,4 @@
-add-uplink-command-description = Создает аплинк в выбранном предмете и привязывает его к аккаунту игрока
+add-uplink-command-description = Создаёт аплинк в выбранном предмете и привязывает его к аккаунту игрока
add-uplink-command-help = Использование: adduplink [username] [item-id]
add-uplink-command-completion-1 = Username (по-умолчанию это вы сами)
add-uplink-command-completion-2 = Uplink uid (по-умолчанию это КПК)
diff --git a/Resources/Locale/ru-RU/administration/commands/stealthmin-command.ftl b/Resources/Locale/ru-RU/administration/commands/stealthmin-command.ftl
index e6a3a3b15b9..d69ff663fe2 100644
--- a/Resources/Locale/ru-RU/administration/commands/stealthmin-command.ftl
+++ b/Resources/Locale/ru-RU/administration/commands/stealthmin-command.ftl
@@ -1,4 +1,5 @@
cmd-stealthmin-desc = Переключение видимости вас через adminwho.
-cmd-stealthmin-help = Использование: stealthmin
+cmd-stealthmin-help =
+ Использование: stealthmin
Используйте stealthmin для переключения отображение вас в результате вывода команды adminwho.
cmd-stealthmin-no-console = Вы не можете использовать эту команду через консоль сервера
diff --git a/Resources/Locale/ru-RU/administration/smites.ftl b/Resources/Locale/ru-RU/administration/smites.ftl
index efd990ecd3e..ec767b89b79 100644
--- a/Resources/Locale/ru-RU/administration/smites.ftl
+++ b/Resources/Locale/ru-RU/administration/smites.ftl
@@ -13,14 +13,60 @@ admin-smite-stomach-removal-self = Вы ощущаете пустоту в же
admin-smite-run-walk-swap-prompt = Для бега вы должны нажать Shift!
admin-smite-super-speed-prompt = Вы двигаетесь почти со скоростью звука!
admin-smite-lung-removal-self = Вы не можете вдохнуть!
-admin-smite-terminate-prompt = I'll be back
-admin-smite-explode-description = Взорвите цель.
-admin-smite-chess-dimension-description = Изгнание в шахматное измерение.
-admin-smite-set-alight-description = Заставляет цель гореть.
+
+## Smite names
+
+admin-smite-explode-name = Взрыв
+admin-smite-chess-dimension-name = Шахматное измерение
+admin-smite-set-alight-name = Воспламенить
+admin-smite-monkeyify-name = Превратить в обезьяну
+admin-smite-lung-cancer-description = Stage IIIA Lung Cancer, for when they really like the hit show Breaking Bad.
+admin-smite-electrocute-name = Поразить током
+admin-smite-creampie-name = Кремовый пирог
+admin-smite-remove-blood-name = Обескровить
+admin-smite-vomit-organs-name = Рвота органами
+admin-smite-remove-hands-name = Удалить руки
+admin-smite-remove-hand-name = Удалить руку
+admin-smite-pinball-name = Пинбол
+admin-smite-yeet-name = Бросить сквозь станцию
+admin-smite-become-bread-name = Сделать хлебом
+admin-smite-ghostkick-name = Кик втихаря
+admin-smite-nyanify-name = НЯфикация
+admin-smite-kill-sign-name = Знак смерти
+admin-smite-cluwne-name = Сделать клувнем
+admin-smite-anger-pointing-arrows-name = Злые указатели
+admin-smite-dust-name = В прах
+admin-smite-buffering-name = Буферизация
+admin-smite-become-instrument-name = Сделать инструментом
+admin-smite-remove-gravity-name = Антиграв
+admin-smite-reptilian-species-swap-name = Сделать унатхом
+admin-smite-locker-stuff-name = Сунуть в шкаф
+admin-smite-plasma-internals-description = Replaces the contents of their internals with plasma.
+admin-smite-headstand-name = Стойка на голове
+admin-smite-become-mouse-name = Сделать мышью
+admin-smite-maid-name = Мейдочка
+admin-smite-zoom-in-name = Зум +
+admin-smite-flip-eye-name = Перевернуть глаза
+admin-smite-run-walk-swap-name = Шаг вместо бега
+admin-smite-super-speed-name = Сверхскорость
+admin-smite-stomach-removal-name = Удалить желудок
+admin-smite-speak-backwards-name = Речь наоборот
+admin-smite-lung-removal-name = Удалить лёгкие
+admin-smite-disarm-prone-name = Обезоруживание и арест
+admin-smite-garbage-can-name = Мусор
+admin-smite-super-bonk-name = СуперБонк
+admin-smite-super-bonk-lite-name = СуперБонк-Лайт
+admin-smite-terminate-name = Экстерминировать
+admin-smite-super-slip-name = Суперскольжение
+
+## Smite descriptions
+
+admin-smite-explode-description = Взрывает цель.
+admin-smite-chess-dimension-description = Изгоняет цель в шахматное измерение.
+admin-smite-set-alight-description = Поджигает цель.
admin-smite-monkeyify-description = Превращает цель в обезьяну.
-admin-smite-lung-cancer-description = Рак лёгких IIIA стадии, для настоящих любителей популярного шоу "Во все тяжкие".
-admin-smite-electrocute-description = Поражает цель электрическим током, делая бесполезным всё, что было на них надето.
-admin-smite-creampie-description = Кремовый пирог, всего одной кнопкой.
+admin-smite-electrocute-description = Поражает цель электрическим током, делая бесполезным всё, что было на неё надето.
+admin-smite-creampie-description = Кримпай всего одной кнопкой.
admin-smite-remove-blood-description = Обескровливает цель, кроваво.
admin-smite-vomit-organs-description = Вызывает у цели рвоту, в том числе и органами.
admin-smite-remove-hands-description = Лишает цель рук.
@@ -39,7 +85,6 @@ admin-smite-remove-gravity-description = Наделяет цель антигр
admin-smite-reptilian-species-swap-description = Меняет расу на Унатха. Пригодится для тех, кто ведёт себя как космический расист.
admin-smite-locker-stuff-description = Помещает цель в (заваренный) шкафчик.
admin-smite-headstand-description = Переворачивает спрайт по вертикали.
-admin-smite-plasma-internals-description = Заменяет содержимое лёгких плазмой.
admin-smite-become-mouse-description = Цель станет мышью. Скуик.
admin-smite-maid-description = Насильно превращает цель в кошко-служанку уборщицу. Это настоящая пытка для некоторых игроков, используйте её с умом.
admin-smite-zoom-in-description = Увеличивает зум так, что цель перестаёт видеть окружение.
@@ -54,8 +99,12 @@ admin-smite-disarm-prone-description = Шанс обезоружить цель
admin-smite-garbage-can-description = Превратите цель в мусорку, чтобы подчеркнуть, о чём она вам напоминает.
admin-trick-unbolt-description = Разболтирует целевой шлюз.
admin-smite-super-bonk-description = Заставляет цель удариться о каждый стол на станции и за её пределами.
+admin-smite-terminate-description = Создаёт экстерминатора с ролью призрака, с единственной задачей - убить выбранную цель.
+admin-smite-super-slip-description = Очень сильно поскальзывает цель.
admin-smite-super-bonk-lite-description = Заставляет цель удариться о каждый стол на станции и за её пределами. Прекращает действовать после смерти цели.
-admin-smite-terminate-description = Создаёт роль призрака Экстерминатора с единственной задачей - убить эту цель.
+
+## Tricks descriptions
+
admin-trick-bolt-description = Болтирует целевой шлюз.
admin-trick-emergency-access-on-description = Включает аварийный доступ к целевому шлюзу.
admin-trick-emergency-access-off-description = Выключает аварийный доступ к целевому шлюзу.
diff --git a/Resources/Locale/ru-RU/administration/ui/actions.ftl b/Resources/Locale/ru-RU/administration/ui/actions.ftl
index 58bcbd02cdf..6910099187e 100644
--- a/Resources/Locale/ru-RU/administration/ui/actions.ftl
+++ b/Resources/Locale/ru-RU/administration/ui/actions.ftl
@@ -4,9 +4,8 @@ admin-player-actions-kick = Кикнуть
admin-player-actions-ban = Забанить
admin-player-actions-ahelp = ПМ
admin-player-actions-respawn = Респаун
-admin-player-actions-spawn = Заспавнить здесь
-admin-player-spawn-failed = Не удалось обнаружить координаты
+admin-player-actions-spawn = Заспавнить тут
+admin-player-spawn-failed = Не удалось найти подходящие координаты
admin-player-actions-clone = Клонировать
admin-player-actions-follow = Следовать
-admin-player-actions-teleport = Телепортироваться к
admin-player-actions-confirm = Вы уверены?
diff --git a/Resources/Locale/ru-RU/administration/ui/admin-spawn-explosion-eui.ftl b/Resources/Locale/ru-RU/administration/ui/admin-spawn-explosion-eui.ftl
index 9485da4b27d..33ddbe67735 100644
--- a/Resources/Locale/ru-RU/administration/ui/admin-spawn-explosion-eui.ftl
+++ b/Resources/Locale/ru-RU/administration/ui/admin-spawn-explosion-eui.ftl
@@ -12,4 +12,4 @@ admin-explosion-eui-label-directional = Направленный
admin-explosion-eui-label-angle = Угол
admin-explosion-eui-label-spread = Радиус
admin-explosion-eui-label-distance = Дистанция
-admin-explosion-eui-label-spawn = Скидыщ!
+admin-explosion-eui-label-spawn = Бабах!
diff --git a/Resources/Locale/ru-RU/administration/ui/manage-solutions/manage-solutions.ftl b/Resources/Locale/ru-RU/administration/ui/manage-solutions/manage-solutions.ftl
index 5d0138bbfd9..0f48eeb8231 100644
--- a/Resources/Locale/ru-RU/administration/ui/manage-solutions/manage-solutions.ftl
+++ b/Resources/Locale/ru-RU/administration/ui/manage-solutions/manage-solutions.ftl
@@ -1,10 +1,10 @@
admin-solutions-window-title = Редактирование раствора - { $targetName }
admin-solutions-window-solution-label = Целевой раствор:
admin-solutions-window-add-new-button = Добавить новый реагент
-admin-solutions-window-volume-label = Объем { $currentVolume }/{ $maxVolume } ед.
+admin-solutions-window-volume-label = Объём { $currentVolume }/{ $maxVolume } ед.
admin-solutions-window-capacity-label = Вместимость (u):
admin-solutions-window-specific-heat-label = Удельная теплоёмкость: { $specificHeat } Дж/(К*u)
admin-solutions-window-heat-capacity-label = Теплоёмкость: { $heatCapacity } Дж/К
admin-solutions-window-temperature-label = Температура (К):
admin-solutions-window-thermal-energy-label = Тепловая энергия (Дж):
-admin-solutions-window-thermals = Тепловые параметры
+admin-solutions-window-thermals = Thermals
diff --git a/Resources/Locale/ru-RU/administration/ui/tabs/panicbunker-tab.ftl b/Resources/Locale/ru-RU/administration/ui/tabs/panicbunker-tab.ftl
index 1ec6273a4f7..3a90e14e4a7 100644
--- a/Resources/Locale/ru-RU/administration/ui/tabs/panicbunker-tab.ftl
+++ b/Resources/Locale/ru-RU/administration/ui/tabs/panicbunker-tab.ftl
@@ -1,17 +1,17 @@
-admin-ui-panic-bunker-window-title = Бункер
-admin-ui-panic-bunker-enabled = Бункер включен
-admin-ui-panic-bunker-disabled = Бункер отключен
-admin-ui-panic-bunker-tooltip = Бункер не дает присоединиться игрокам, чье время в игре или на сервере слишком мало.
-admin-ui-panic-bunker-disable-automatically = Отключать автоматически
-admin-ui-panic-bunker-disable-automatically-tooltip = Автоматически отключать Бункер при наличии админов на сервере.
-admin-ui-panic-bunker-enable-automatically = Включать автоматически
-admin-ui-panic-bunker-enable-automatically-tooltip = Автоматически включать Бункер при отсутствии админов на сервере.
-admin-ui-panic-bunker-count-deadminned-admins = Учитывать Deadmin
-admin-ui-panic-bunker-count-deadminned-admins-tooltip = Учитывать админов в deadmin статусе при автоматической смене статуса Бункера.
-admin-ui-panic-bunker-show-reason = Указывать причину
-admin-ui-panic-bunker-show-reason-tooltip = Указывать пользователям причину, по которой они не могут попасть на сервер.
-admin-ui-panic-bunker-min-account-age = Мин. возраст аккаунта
-admin-ui-panic-bunker-min-overall-hours = Мин. часов на сервере
-admin-ui-panic-bunker-is-enabled = Бункер активирован.
-admin-ui-panic-bunker-enabled-admin-alert = Бункер был активирован.
-admin-ui-panic-bunker-disabled-admin-alert = Бункер был отключен.
+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/administration/ui/tabs/player-tab.ftl b/Resources/Locale/ru-RU/administration/ui/tabs/player-tab.ftl
index fe17bedf322..ccc75001fab 100644
--- a/Resources/Locale/ru-RU/administration/ui/tabs/player-tab.ftl
+++ b/Resources/Locale/ru-RU/administration/ui/tabs/player-tab.ftl
@@ -3,7 +3,7 @@ player-tab-character = Персонаж
player-tab-job = Должность
player-tab-antagonist = Антагонист
player-tab-playtime = Игровое время
-player-tab-balance = Баланс
player-tab-show-disconnected = Показать отключившихся
player-tab-overlay = Оверлей
player-tab-entry-tooltip = Игровое время отображается как дни:часы:минуты.
+player-tab-balance = Balance
diff --git a/Resources/Locale/ru-RU/advertisements/vending/atmosdrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/atmosdrobe.ftl
index 83e69e234c8..afdd8cf85e2 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/atmosdrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/atmosdrobe.ftl
@@ -1,3 +1,3 @@
advertisement-atmosdrobe-1 = Получите свою огнестойкую одежду прямо здесь!!!
-advertisement-atmosdrobe-2 = Защитит даже от плазмы!
-advertisement-atmosdrobe-3 = Наслаждайтесь нашей фирменной инженерной одеждой!
+advertisement-atmosdrobe-2 = Защитит вас от плазменного пламени!
+advertisement-atmosdrobe-3 = Наслаждайтесь своей небрендовой инженерной одеждой!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/bardrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/bardrobe.ftl
index a6c27a7f30f..ee7bb1e5e99 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/bardrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/bardrobe.ftl
@@ -1,2 +1,2 @@
advertisement-bardrobe-1 = Гарантированно предотвращает появление пятен от пролитых напитков!
-advertisement-bardrobe-2 = Шик и Стиль!
+advertisement-bardrobe-2 = Стильно и элегантно!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/boozeomat.ftl b/Resources/Locale/ru-RU/advertisements/vending/boozeomat.ftl
index 6dc75c94e7b..310ce67a1f3 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/boozeomat.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/boozeomat.ftl
@@ -1,4 +1,4 @@
-advertisement-boozeomat-1 = Надеюсь, никто не попросит у меня чертову чашку чая...
+advertisement-boozeomat-1 = Надеюсь, никто не попросит у меня чёртову чашку чая...
advertisement-boozeomat-2 = Алкоголь - друг человечества. Вы бы отказались от друга?
advertisement-boozeomat-3 = Очень рад вас обслужить!
advertisement-boozeomat-4 = Никто на этой станции не хочет выпить?
@@ -17,6 +17,6 @@ advertisement-boozeomat-16 = Вино со множеством наград!
advertisement-boozeomat-17 = Максимум алкоголя!
advertisement-boozeomat-18 = Мужчины любят пиво.
advertisement-boozeomat-19 = Тост за прогресс!
-thankyou-boozeomat-1 = Пожалуйста, не напивайтесь!
-thankyou-boozeomat-2 = Пожалуйста, напивайтесь!
-thankyou-boozeomat-3 = Наслаждайтесь!
+thankyou-boozeomat-1 = Пожалуйста, пейте ответственно!
+thankyou-boozeomat-2 = Пожалуйста, пейте безответственно!
+thankyou-boozeomat-3 = Пожалуйста, наслаждайтесь вашим напитком!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/cargodrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/cargodrobe.ftl
index 824f70e0e77..e8ad076906f 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/cargodrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/cargodrobe.ftl
@@ -1,3 +1,3 @@
advertisement-cargodrobe-1 = Улучшенный стиль ассистента! Выбери свой сегодня!
advertisement-cargodrobe-2 = Эти шорты удобны и комфортны, получите свои прямо сейчас!
-advertisement-cargodrobe-3 = Дешево и удобно!
+advertisement-cargodrobe-3 = Сделано для комфорта, а стоит недорого!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/chang.ftl b/Resources/Locale/ru-RU/advertisements/vending/chang.ftl
index fdca8ebd9b7..58cca4f7dae 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/chang.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/chang.ftl
@@ -1,7 +1,7 @@
advertisement-chang-1 = Ощутите вкус 5000 лет культуры!
advertisement-chang-2 = Мистер Чанг, одобрен для безопасного употребления более чем в 10 секторах!
-advertisement-chang-3 = Китайская кухня отлично подойдет для вечернего свидания или одинокого вечера!
-advertisement-chang-4 = Вы не ошибетесь, если отведаете настоящей китайской кухни от мистера Чанга!
-advertisement-chang-5 = 100% натуральная Китайская еда!
-thankyou-chang-1 = Мистер Чанг благодарит тебя!
-thankyou-chang-2 = Наслаждайся своим перекусом!
+advertisement-chang-3 = Китайская кухня отлично подойдёт для вечернего свидания или одинокого вечера!
+advertisement-chang-4 = Вы не ошибётесь, если отведаете настоящей китайской кухни от мистера Чанга!
+advertisement-chang-5 = На 100% настоящая китайская еда!
+thankyou-chang-1 = Мистер Чанг благодарит вас!
+thankyou-chang-2 = Наслаждайтесь настоящей едой!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/chefdrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/chefdrobe.ftl
index 7b31ef7280b..3bf551015fb 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/chefdrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/chefdrobe.ftl
@@ -1,3 +1,3 @@
advertisement-chefdrobe-1 = Наша одежда гарантированно защитит вас от пятен от еды!
-advertisement-chefdrobe-2 = Абсолютно белая, так что все будут знать настоящего убийцу!
-advertisement-chefdrobe-3 = Легко заметить, сложно забыть!
+advertisement-chefdrobe-2 = Идеальная белизна, чтобы все догадались об убийстве на кухне!
+advertisement-chefdrobe-3 = Легко чистить, легко видеть!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/chefvend.ftl b/Resources/Locale/ru-RU/advertisements/vending/chefvend.ftl
index cbbf1f7869a..5993557d7fc 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/chefvend.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/chefvend.ftl
@@ -5,9 +5,9 @@ advertisement-chefvend-4 = Стоите ли вы своей соли? Мы да
advertisement-chefvend-5 = Ммм, мясо.
advertisement-chefvend-6 = Используйте силу муки.
advertisement-chefvend-7 = Покажите своим клиентам, кто здесь лучший повар, при помощи нашего знаменитого на всю галактику завоевавшего множество наград соуса барбекю.
-advertisement-chefvend-8 = Я люблю сырые яйца.
-advertisement-chefvend-9 = Отведайте старых добрых яиц!
-thankyou-chefvend-1 = Время готовки!
-thankyou-chefvend-2 = Спасибо за доверие нашим ингредиентам!
-thankyou-chefvend-3 = Это даст им то, чего они хотят!
-thankyou-chefvend-4 = Иди и сделай бургеры!
+advertisement-chefvend-8 = Я очень люблю сырые яйца.
+advertisement-chefvend-9 = Наслаждайтесь старыми добрыми сырыми яйцами!
+thankyou-chefvend-1 = Пришло время готовить!
+thankyou-chefvend-2 = Благодарим за доверие к нашим качественным ингредиентам!
+thankyou-chefvend-3 = Дайте же им то, чего они хотят!
+thankyou-chefvend-4 = Идите и сделайте эти бургеры!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/chemdrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/chemdrobe.ftl
index 20579aee7b5..186bdc4e2d2 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/chemdrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/chemdrobe.ftl
@@ -1,3 +1,3 @@
advertisement-chemdrobe-1 = Наша одежда на 0,5% более устойчива к разлитым кислотам! Получите свою прямо сейчас!
-advertisement-chemdrobe-2 = Профессиональная лабораторная форма, разработана NanoTrasen!
-advertisement-chemdrobe-3 = Мы абсолютно уверены, что наша одежда защитит вас от кислоты!
+advertisement-chemdrobe-2 = Профессиональная лабораторная одежда, разработанная компанией NanoTrasen!
+advertisement-chemdrobe-3 = Я почти уверен, что она защитит вас от пролитой кислоты!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/cigs.ftl b/Resources/Locale/ru-RU/advertisements/vending/cigs.ftl
index 8f563b199f4..3094874a7d4 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/cigs.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/cigs.ftl
@@ -9,7 +9,7 @@ advertisement-cigs-8 = Не бросайте курить, купите ещё!
advertisement-cigs-9 = Никотиновый рай.
advertisement-cigs-10 = Лучшие сигареты с 2150 года.
advertisement-cigs-11 = Сигареты с множеством наград.
-advertisement-cigs-12 = Отдохните от работы, закурите!
-thankyou-cigs-1 = Они у тебя есть, теперь кури их!
-thankyou-cigs-2 = Ты точно не пожалеешь!
-thankyou-cigs-3 = Зависимость по щелчку пальцев!
+advertisement-cigs-12 = Здесь вы сможете отвлечься от работы!
+thankyou-cigs-1 = Сделал дело - кури смело!
+thankyou-cigs-2 = Скорее всего, вы не пожалеете!
+thankyou-cigs-3 = И глазом моргнуть не успеете, как станете зависимым!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/clothesmate.ftl b/Resources/Locale/ru-RU/advertisements/vending/clothesmate.ftl
index accc0423aa2..46a1cd1b1e1 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/clothesmate.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/clothesmate.ftl
@@ -4,4 +4,4 @@ advertisement-clothes-3 = Взгляните на все эти крутости
advertisement-clothes-4 = Наряду ты не рад? Загляни в ОдеждоМат!
advertisement-clothes-5 = Теперь и с новыми шеегрейками!
advertisement-clothes-6 = Ты выглядишь стильно!
-advertisement-clothes-7 = Сделано с любовью - только у нас!
+advertisement-clothes-7 = У вас прекрасный наряд!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/coffee.ftl b/Resources/Locale/ru-RU/advertisements/vending/coffee.ftl
index d7405320673..4b28aeb15ff 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/coffee.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/coffee.ftl
@@ -6,13 +6,13 @@ advertisement-coffee-5 = Я бы убил за чашечку кофе!
advertisement-coffee-6 = Лучшие зёрна в галактике.
advertisement-coffee-7 = Только лучшие напитки для вас.
advertisement-coffee-8 = М-м-м-м… Ничто не сравнится с кофе.
-advertisement-coffee-9 = Я обожаю кофе, а Вы?
+advertisement-coffee-9 = Я обожаю кофе, а вы?
advertisement-coffee-10 = Кофе помогает работать!
advertisement-coffee-11 = Попробуйте чайку.
advertisement-coffee-12 = Надеемся, вы предпочитаете лучшее!
advertisement-coffee-13 = Отведайте наш новый шоколад!
-advertisement-coffee-14 = Горячие напитки! Возьмите прямо здесь!
-thankyou-coffee-1 = Наслаждайтесь напитком!
-thankyou-coffee-2 = Пейте, пока горячий!
-thankyou-coffee-3 = Напиток готов.
-thankyou-coffee-4 = Пейте.
+advertisement-coffee-14 = Горячие напитки! Заберите свой прямо сейчас!
+thankyou-coffee-1 = Наслаждайтесь!
+thankyou-coffee-2 = Пейте пока горячее!
+thankyou-coffee-3 = Приготовление завершено.
+thankyou-coffee-4 = Напиток подан.
diff --git a/Resources/Locale/ru-RU/advertisements/vending/cola.ftl b/Resources/Locale/ru-RU/advertisements/vending/cola.ftl
index af88e720816..a56c3c1ba36 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/cola.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/cola.ftl
@@ -5,8 +5,8 @@ advertisement-cola-4 = Хочется пить? Почему бы не выпи
advertisement-cola-5 = Пожалуйста, пейте!
advertisement-cola-6 = Выпьем!
advertisement-cola-7 = Лучшие напитки в галактике!
-advertisement-cola-8 = Гораздо лучше чем Dr. Gibb!
-thankyou-cola-1 = Открой банку и наслаждайся!
-thankyou-cola-2 = Бах! Так этой жажде!
-thankyou-cola-3 = Надеюсь тебе понравится вкус!
-thankyou-cola-4 = Наслаждайся своим сахаром!
+advertisement-cola-8 = Гораздо лучше, чем доктор Гибб!
+thankyou-cola-1 = Раскупорьте баночку и наслаждайтесь!
+thankyou-cola-2 = Пау! Жажда, получай!
+thankyou-cola-3 = Надеемся, вам понравится вкус!
+thankyou-cola-4 = Наслаждайтесь своим сахаросодержащим напитком!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/condiments.ftl b/Resources/Locale/ru-RU/advertisements/vending/condiments.ftl
index f7c6efde21e..415517a4b27 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/condiments.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/condiments.ftl
@@ -3,4 +3,4 @@ advertisement-condiment-2 = Безопасная для детей посуда.
advertisement-condiment-3 = Кукурузное масло!
advertisement-condiment-4 = Подсластите свой день при помощи Астротем! Восемь из десяти врачей считают, что он скорее всего не вызовет у вас рак.
advertisement-condiment-5 = Острый соус! Соус барбекю! Холодный соус! Кетчуп! Соевый соус! Хрен! Соусы на любой вкус!
-advertisement-condiment-6 = Обязательно поливайте бургеры кетчупом и горчицей! Повара часто забывают.
+advertisement-condiment-6 = Не забудьте добавить кетчуп и горчицу в свой бургер! Повара часто забывают об этом...
diff --git a/Resources/Locale/ru-RU/advertisements/vending/curadrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/curadrobe.ftl
index a206f5758d7..2a4025e0522 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/curadrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/curadrobe.ftl
@@ -1,3 +1,3 @@
-advertisement-curadrobe-1 = Очки - для глаз, книги - для души, в Библиодробе есть все!
+advertisement-curadrobe-1 = Очки - для глаз, книги - для души, в Библиодробе есть всё!
advertisement-curadrobe-2 = Впечатлите и поразите посетителей вашей библиотеки расширенной линейкой ручек Библиодроба!
-advertisement-curadrobe-3 = Станьте официальным владельцем библиотеки с этим великолепным выбором нарядов!
+advertisement-curadrobe-3 = Станьте официальным владельцем библиотеки благодаря этой великолепной коллекции нарядов!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/detdrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/detdrobe.ftl
index 65fe750191c..e3205b1b958 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/detdrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/detdrobe.ftl
@@ -1,3 +1,3 @@
advertisement-detdrobe-1 = Применяйте свои блестящие дедуктивные методы со стилем!
-advertisement-detdrobe-2 = Одевайтесь как Шерлок Холмс!
-advertisement-detdrobe-3 = Наша одежда консервативна!
+advertisement-detdrobe-2 = Подходите и нарядитесь Шерлоком Холмсом!
+advertisement-detdrobe-3 = Наши наряды очень консервативны!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/dinnerware.ftl b/Resources/Locale/ru-RU/advertisements/vending/dinnerware.ftl
index 133c5066f04..59d861a32e0 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/dinnerware.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/dinnerware.ftl
@@ -5,6 +5,6 @@ advertisement-dinnerware-4 = Вам нравятся вилки?
advertisement-dinnerware-5 = Мне нравятся вилки.
advertisement-dinnerware-6 = Ууу, посуда.
advertisement-dinnerware-7 = На самом деле они вам не нужны...
-advertisement-dinnerware-8 = Бери то, что тебе нужно!
-advertisement-dinnerware-9 = Я почти уверен, что эти тарелка тебе просто необходимы.
-advertisement-dinnerware-10 = ПОЧЕМУ СУЩЕСТВУЕТ ТАК МНОГО ВИДОВ КРУЖЕК?
+advertisement-dinnerware-8 = Возьмите если хотите!
+advertisement-dinnerware-9 = Мы абсолютно уверены, мензурки - маст-хев.
+advertisement-dinnerware-10 = ПОЧЕМУ ТУТ ТАК МНОГО РАЗНЫХ КРУЖЕК?
diff --git a/Resources/Locale/ru-RU/advertisements/vending/discount.ftl b/Resources/Locale/ru-RU/advertisements/vending/discount.ftl
index 61bf525626e..73ba2a493d8 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/discount.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/discount.ftl
@@ -5,13 +5,13 @@ advertisement-discount-4 = Количество превыше Качества!
advertisement-discount-5 = Не слушайте этих яйцеголовых из санэпидемстанции, покупайте сейчас!
advertisement-discount-6 = Discount Dan's: Мы полезны вам! Не-а, не могу произнести это без смеха.
advertisement-discount-7 = Discount Dan's: Только высококачественная проду-*БЗзз
-advertisement-discount-8 = Discount Dan(tm) не несет ответственности за любой ущерб, вызванный неправильным использованием его продукции.
-advertisement-discount-9 = Очень много, очень дешево!
-thankyou-discount-1 = Спасибо за исполь-**БЗзз
-thankyou-discount-2 = И помните: Никаких возвратов!
-thankyou-discount-3 = Теперь это твои проблемы!
-thankyou-discount-4 = По закону мы обязаны сообщить вам, что это нельзя есть.
+advertisement-discount-8 = Discount Dan(tm) не несёт ответственности за любой ущерб, вызванный неправильным использованием его продукции.
+advertisement-discount-9 = Мы предлагаем широкий ассортимент недорогих снеков!
+thankyou-discount-1 = Благодарим за исп-*БЗЗЗ
+thankyou-discount-2 = И помните: деньги не возвращаем!
+thankyou-discount-3 = Теперь это ваша проблема!
+thankyou-discount-4 = По закону мы обязаны напомнить вам, чтобы вы не ели это.
thankyou-discount-5 = Пожалуйста, не подавайте на нас в суд!
-thankyou-discount-6 = Клянемся, так оно всегда и выглядело!
+thankyou-discount-6 = При загрузке оно так и выглядело, клянёмся!
thankyou-discount-7 = Ага, удачи с этим.
-thankyou-discount-8 = Наслаждайся своим, э-э-э-... "перекусом".
+thankyou-discount-8 = Наслаждайтесь своими, ээ... "снеками".
diff --git a/Resources/Locale/ru-RU/advertisements/vending/donut.ftl b/Resources/Locale/ru-RU/advertisements/vending/donut.ftl
index b58d6bf219d..4ccd62987bc 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/donut.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/donut.ftl
@@ -1,9 +1,9 @@
advertisement-donut-1 = Каждый из нас немножко коп!
advertisement-donut-2 = Надеемся, что вы голодны!
advertisement-donut-3 = Продано более одного миллиона пончиков!
-advertisement-donut-4 = Мы гордимся качеством наших пончиков!
-advertisement-donut-5 = Сладкий, сочный и очень вкусный!
-thankyou-donut-1 = Наслаждайся своим пончиком!
-thankyou-donut-2 = Продан еще один пончик!
+advertisement-donut-4 = Мы гордимся постоянством нашей продукции!
+advertisement-donut-5 = Сладкие, приторные и восхитительные!
+thankyou-donut-1 = Наслаждайтесь пончиком!
+thankyou-donut-2 = Ещё один проданный пончик!
thankyou-donut-3 = Хорошего дня, офицер!
-thankyou-donut-4 = Надеюсь вам понравится!
+thankyou-donut-4 = Надеюсь, вы станете зависимыми!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/engidrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/engidrobe.ftl
index 95b8b69e560..1ece7958c8d 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/engidrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/engidrobe.ftl
@@ -1,5 +1,5 @@
advertisement-engidrobe-1 = Гарантированная защита ваших ног от несчастных случаев на производстве!
-advertisement-engidrobe-2 = Боитесь радиации? Носите желтое!
-advertisement-engidrobe-3 = Лучшая защита для ваших голов!
-advertisement-engidrobe-4 = Соблюдайте Требования Безопасности при работе на производстве!
-advertisement-engidrobe-5 = Получите свою рабочую форму прямо сейчас!
+advertisement-engidrobe-2 = Боитесь радиации? Носите жёлтое!
+advertisement-engidrobe-3 = У нас есть шапки, которые защитят вашу башку!
+advertisement-engidrobe-4 = В наше время мало кто пользуется средствами защиты!
+advertisement-engidrobe-5 = Получите свою защитную экипировку сегодня!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/games.ftl b/Resources/Locale/ru-RU/advertisements/vending/games.ftl
index db7c7e9bdd3..49fcad6849b 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/games.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/games.ftl
@@ -2,13 +2,13 @@ advertisement-goodcleanfun-1 = Сбегите в фантастический м
advertisement-goodcleanfun-2 = Утолите свою зависимость от азартных игр!
advertisement-goodcleanfun-3 = Разрушьте вашу дружбу!
advertisement-goodcleanfun-4 = Проявите инициативу!
-advertisement-goodcleanfun-5 = Эльфы и гномы!
+advertisement-goodcleanfun-5 = Эльфы и дворфы!
advertisement-goodcleanfun-6 = Параноидальные компьютеры!
-advertisement-goodcleanfun-7 = Совершенно не дьявольское!
-advertisement-goodcleanfun-8 = Веселые времена навсегда!
-advertisement-goodcleanfun-9 = Подземелья и Карпы!
-advertisement-goodcleanfun-10 = Играй с друзьями!
-thankyou-goodcleanfun-1 = Веселись!
-thankyou-goodcleanfun-2 = Теперь то ты поиграешь по настоящему!
-thankyou-goodcleanfun-3 = Сыграй в игру!
-thankyou-goodcleanfun-4 = Начинай продумывать персонажа!
+advertisement-goodcleanfun-7 = Совершенно не игрушки дьявола!
+advertisement-goodcleanfun-8 = Весёлые времена навсегда!
+advertisement-goodcleanfun-9 = Карпы и Крипты!
+advertisement-goodcleanfun-10 = Играйте с друзьями!
+thankyou-goodcleanfun-1 = Развлекайтесь!
+thankyou-goodcleanfun-2 = Теперь вы играете с силой!
+thankyou-goodcleanfun-3 = Приступайте к игре!
+thankyou-goodcleanfun-4 = Начинайте оформлять листы персонажей!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/genedrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/genedrobe.ftl
index 2c06dcd24e2..a794ab85b31 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/genedrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/genedrobe.ftl
@@ -1,2 +1,2 @@
advertisement-genedrobe-1 = Идеально для безумного учёного внутри тебя!
-advertisement-genedrobe-2 = Эксперименты над обезьянами гораздо веселее, чем кажется!
+advertisement-genedrobe-2 = Экспериментировать с обезьянами гораздо веселее, чем вы думаете!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/happyhonk.ftl b/Resources/Locale/ru-RU/advertisements/vending/happyhonk.ftl
index 5b6f7ad244a..9d0b3a25633 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/happyhonk.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/happyhonk.ftl
@@ -7,8 +7,8 @@ advertisement-happyhonk-6 = Сколько офицеров службы без
advertisement-happyhonk-7 = Хэппи Хонк не несёт ответственности за качество продуктов, помещённых в наши коробки для обедов Хэппи Хонк.
advertisement-happyhonk-8 = Почему бы не заказать нашу лимитированную серию обеда Мим Хэппи Хонк?
advertisement-happyhonk-9 = Хэппи Хонк является зарегистрированной торговой маркой «Honk! co.», и мы гораздо круче чем «Robust Nukie Food corp.».
-advertisement-happyhonk-10 = В каждом комплекте Хэппи Хонк есть настоящий сюрприз!
+advertisement-happyhonk-10 = Наши обеды Хэппи Хонк непременно преподнесут вам отличный сюрприз!
thankyou-happyhonk-1 = Хонк!
-thankyou-happyhonk-2 = Хонк!Хонк!
-thankyou-happyhonk-3 = Иди веселись! Хонк!
-thankyou-happyhonk-4 = Устрой им покатушки по полу! Хонк!
+thankyou-happyhonk-2 = Хонк хонк!
+thankyou-happyhonk-3 = Поделитесь весельем! Хонк!
+thankyou-happyhonk-4 = Идите и подскользните кого-нибудь! Хонк!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/hydrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/hydrobe.ftl
index 053d6e94530..b956d49ec21 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/hydrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/hydrobe.ftl
@@ -1,4 +1,4 @@
advertisement-hydrobe-1 = Вы любите землю? Тогда покупайте нашу одежду!
advertisement-hydrobe-2 = Подберите наряд под свои золотые руки здесь!
-advertisement-hydrobe-3 = Лучшее снаряжение для ухаживания за растениями!
-advertisement-hydrobe-4 = Лучшие наряды для обнимания деревьев... Или для самих деревьев!
+advertisement-hydrobe-3 = Здесь вы найдёте одежду, идеально подходящую для работы с растениями!
+advertisement-hydrobe-4 = Идеальные наряды для любителей обнимать деревья... или натуральных деревьев!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/janidrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/janidrobe.ftl
index d239a56b5f5..46f1e67f347 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/janidrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/janidrobe.ftl
@@ -1,3 +1,3 @@
-advertisement-janidrobe-1 = Подходите и получите свою форму уборщика, одобренную уборщиками-ящерами всей корпорации!
-advertisement-janidrobe-2 = Оставайтесь чистым, когда все вокрукг в грязи!
-advertisement-janidrobe-3 = Желтый это стильно!
+advertisement-janidrobe-1 = Подходите и получите свою форму уборщика, одобренную унатхами-уборщиками всей корпорации!
+advertisement-janidrobe-2 = Мы поможем сохранить вашу чистоту, пока вы наводите чистоту в нечистотах!
+advertisement-janidrobe-3 = Стильный жёлтый!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/lawdrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/lawdrobe.ftl
index a61a45a525b..bdfad576fc8 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/lawdrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/lawdrobe.ftl
@@ -1,3 +1,13 @@
advertisement-lawdrobe-1 = ПРОТЕСТ! Добейтесь верховенства закона для себя!
-advertisement-lawdrobe-2 = Докажите Службе Безопасности, что знаете корпоративные законы лучше!
-advertisement-lawdrobe-3 = Кто-то нарушает СРП? Накажите их со стилем!
+advertisement-lawdrobe-2 = Донимайте охрану до тех пор, пока они не начнут соблюдать ваши собственные правила!
+advertisement-lawdrobe-3 = Только что поступило новое дело? Идите и вытащите их из тюрьмы!
+advertisement-lawdrobe-4 = Кушай пончик на ужин – и отдел СБ не нужен!
+advertisement-lawdrobe-5 = Никто не превыше закона!
+advertisement-lawdrobe-6 = Нет, офицер, я не даю согласия на обыск!
+advertisement-lawdrobe-7 = Укол космическими наркотиками не оставляет улик!
+advertisement-lawdrobe-8 = Вы или ваш близкий пострадали от Nanotrasen? Как жаль!
+thankyou-lawdrobe-1 = В таком костюме можно выиграть любое дело!
+thankyou-lawdrobe-2 = Приобретите один и для своего клиента!
+thankyou-lawdrobe-3 = Победа или поражение, вам заплатят в любом случае!
+thankyou-lawdrobe-4 = Помните: это незаконно только если вас поймали!
+thankyou-lawdrobe-5 = ПРОТЕСТ! Этот костюм слишком крут для суда!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/magivend.ftl b/Resources/Locale/ru-RU/advertisements/vending/magivend.ftl
index b4cf82523c5..4cf08b4295c 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/magivend.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/magivend.ftl
@@ -8,4 +8,4 @@ advertisement-magivend-7 = EI NATH
advertisement-magivend-8 = Уничтожить станцию!
advertisement-magivend-9 = Оборудование для сгибания пространства и времени!
advertisement-magivend-10 = 1234 LOONIES ЛОЛ!
-advertisement-magivend-11 = НАР'СИ, ВОССТАНЬ!!!
+advertisement-magivend-11 = НАР'СИ, ПРОБУДИСЬ!!!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/medidrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/medidrobe.ftl
index 24bc46d589e..0ebd9e0cc0a 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/medidrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/medidrobe.ftl
@@ -1,3 +1,3 @@
advertisement-medidrobe-1 = Заставьте эти кровавые пятна выглядеть модно!!
-advertisement-medidrobe-2 = Чисто и гигиенично!
-advertisement-medidrobe-3 = Ты будешь выглядеть почти как настоящий доктор!
+advertisement-medidrobe-2 = Чистота и гигиена! Не оставляйте на себе слишком много кровавых пятен!
+advertisement-medidrobe-3 = В таком наряде вы будете выглядеть как профессиональный врач!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/megaseed.ftl b/Resources/Locale/ru-RU/advertisements/vending/megaseed.ftl
index 04c590f459e..c91d04c1da1 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/megaseed.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/megaseed.ftl
@@ -2,5 +2,5 @@ advertisement-megaseed-1 = Мы любим растения!
advertisement-megaseed-2 = Вырасти урожай
advertisement-megaseed-3 = Расти, малыш, расти-и-и-и!
advertisement-megaseed-4 = Ды-а, сына!
-advertisement-megaseed-5 = Мутировать растения весело!
-advertisement-megaseed-6 = За ГМО будущее!
+advertisement-megaseed-5 = Мутировать растения - это весело!
+advertisement-megaseed-6 = Ставим всё на ГМО!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/nanomed.ftl b/Resources/Locale/ru-RU/advertisements/vending/nanomed.ftl
index b38e0146208..f78d53dfbfa 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/nanomed.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/nanomed.ftl
@@ -5,5 +5,5 @@ advertisement-nanomed-4 = Натуральные химикаты!
advertisement-nanomed-5 = Эти штуки спасают жизни.
advertisement-nanomed-6 = Может сами примете?
advertisement-nanomed-7 = Пинг!
-advertisement-nanomed-8 = Смотри не передознись!
-advertisement-nanomed-9 = Передознись!
+advertisement-nanomed-8 = Не допускайте передозировки!
+advertisement-nanomed-9 = Пора допускать передозировку!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/nutrimax.ftl b/Resources/Locale/ru-RU/advertisements/vending/nutrimax.ftl
index f2ec7cf83d8..969290422ef 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/nutrimax.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/nutrimax.ftl
@@ -5,5 +5,5 @@ advertisement-nutrimax-4 = Мы любим большие растения.
advertisement-nutrimax-5 = Мягкая почва...
advertisement-nutrimax-6 = Теперь и с вёдрами!
advertisement-nutrimax-7 = Чем больше растение, тем лучше!
-thankyou-nutrimax-1 = Время рассады!
-thankyou-nutrimax-2 = Замеси эту почву!
+thankyou-nutrimax-1 = Пора сажать!
+thankyou-nutrimax-2 = Заройтесь в земле!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/robodrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/robodrobe.ftl
index 7c1137400e0..e6972c517c4 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/robodrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/robodrobe.ftl
@@ -1,4 +1,4 @@
-advertisement-robodrobe-1 = Никаких FALSE, только TRUE!
+advertisement-robodrobe-1 = You turn me TRUE, use defines!
advertisement-robodrobe-2 = 110100001011111011010000101101001101000010110101110100001011011011010000101101001101000010110000
-advertisement-robodrobe-3 = Преврати кого-нибудь в робота!
-advertisement-robodrobe-4 = Роботы это весело!
+advertisement-robodrobe-3 = Похитьте кого-нибудь из техтуннелей и превратите его в киборга!
+advertisement-robodrobe-4 = Робототехника - это весело!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/scidrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/scidrobe.ftl
index 16abbc1778d..55fe7aca6ea 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/scidrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/scidrobe.ftl
@@ -1,3 +1,3 @@
-advertisement-scidrobe-1 = Скучаете по запаху обожженной плазмой плоти? Купите научную одежду прямо сейчас!
+advertisement-scidrobe-1 = Скучаете по запаху обожжённой плазмой плоти? Купите научную одежду прямо сейчас!
advertisement-scidrobe-2 = Изготовлено на 10% из ауксетики, поэтому можете не беспокоиться о потере руки!
-advertisement-scidrobe-3 = Наша одежда ТОЧНО защитит тебя от случайных взрывов артефактов.
+advertisement-scidrobe-3 = Это ТОЧНО защитит вас, когда артефакт неизбежно взорвётся.
diff --git a/Resources/Locale/ru-RU/advertisements/vending/secdrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/secdrobe.ftl
index 049dbe0a41f..16193fa5112 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/secdrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/secdrobe.ftl
@@ -2,4 +2,4 @@ advertisement-secdrobe-1 = Побеждайте преступников сти
advertisement-secdrobe-2 = Она красная, поэтому крови не видно!
advertisement-secdrobe-3 = Вы имеете право быть модным!
advertisement-secdrobe-4 = Теперь вы можете стать полицией моды, которой всегда хотели быть!
-advertisement-secdrobe-5 = Лучшие оттенки красного, АБСОЛЮТНО не похожие на те, что использует Синдикат!
+advertisement-secdrobe-5 = Лучший оттенок красного, совершенно непохожий на тот, который использует Синдикат!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/sectech.ftl b/Resources/Locale/ru-RU/advertisements/vending/sectech.ftl
index 6117e5e22ac..79e0a810de1 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/sectech.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/sectech.ftl
@@ -1,8 +1,8 @@
-advertisement-sectech-1 = Расколоть коммунистические черепа!
+advertisement-sectech-1 = Крушите черепа агентов Синдиката!
advertisement-sectech-2 = Пробейте несколько голов!
advertisement-sectech-3 = Не забывайте: вред — это хорошо!
advertisement-sectech-4 = Ваше оружие прямо здесь.
-advertisement-sectech-5 = Докажите свое превосходство!
-thankyou-sectech-1 = Прогоните их всех!
-thankyou-sectech-2 = Иди нарушай закон!
-thankyou-sectech-3 = Иди арестуй простого пассажира!
+advertisement-sectech-5 = Все мы любим ощущать власть!
+thankyou-sectech-1 = Устройте им там ад!
+thankyou-sectech-2 = Обеспечьте соблюдение закона!
+thankyou-sectech-3 = Идите и арестуйте невиновных!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/smartfridge.ftl b/Resources/Locale/ru-RU/advertisements/vending/smartfridge.ftl
index 21fa076aeee..e4da8e34b5f 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/smartfridge.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/smartfridge.ftl
@@ -4,5 +4,5 @@ advertisement-smartfridge-3 = Я могу производить квинтил
advertisement-smartfridge-4 = Доступно новое обновление прошивки.
advertisement-smartfridge-5 = Я полностью работоспособен, и все мои схемы функционируют идеально.
advertisement-smartfridge-6 = Система сканирования на наличие вредоносных программ...
-advertisement-smartfridge-7 = Запускаю диагностику...
-advertisement-smartfridge-8 = Я слишком продвинут для своего функционала.
+advertisement-smartfridge-7 = Выполнение диагностики системы...
+advertisement-smartfridge-8 = Мои платы слишком совершенны для тех функций, которыми мне разрешено управлять.
diff --git a/Resources/Locale/ru-RU/advertisements/vending/snack.ftl b/Resources/Locale/ru-RU/advertisements/vending/snack.ftl
index d8c6b30c342..359c5365685 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/snack.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/snack.ftl
@@ -6,16 +6,16 @@ advertisement-snack-5 = Ммм! Так вкусно!
advertisement-snack-6 = Боже мой, какой он сочный!
advertisement-snack-7 = Перекусите.
advertisement-snack-8 = Перекусы полезны для вас!
-advertisement-snack-9 = Выпейте еще немного Getmore!
+advertisement-snack-9 = Выпейте ещё немного Getmore!
advertisement-snack-10 = Закуски лучшего качества прямо с Марса.
advertisement-snack-11 = Мы любим шоколад!
advertisement-snack-12 = Попробуйте наше новое вяленое мясо!
-advertisement-snack-13 = Абсолютно ничего подозрительного в нашем мясе!
-advertisement-snack-14 = Доступно любой расе!
-advertisement-snack-15 = Идеально при голодании!
-thankyou-snack-1 = Ешьте!
-thankyou-snack-2 = Наслаждайтесь продуктов!
+advertisement-snack-13 = Наши подозрительные джерки совершенно точно не приведут к тому, что вас выбросят в космос!
+advertisement-snack-14 = Пригодно для употребления большинства рас!
+advertisement-snack-15 = Идеально для случаев, когда вы на грани голода!
+thankyou-snack-1 = Налетайте!
+thankyou-snack-2 = Наслаждайтесь своей покупкой!
thankyou-snack-3 = Приятного аппетита.
-thankyou-snack-4 = Вкуснотища!
-thankyou-snack-5 = Нямка!
-thankyou-snack-6 = Спасибо за покупку!
+thankyou-snack-4 = Вкуснятина!
+thankyou-snack-5 = Объедение!
+thankyou-snack-6 = Спасибо, что покупаете наши снеки!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/sovietsoda.ftl b/Resources/Locale/ru-RU/advertisements/vending/sovietsoda.ftl
index 6f599e74cee..abb5d20aa94 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/sovietsoda.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/sovietsoda.ftl
@@ -1,9 +1,9 @@
advertisement-sovietsoda-1 = За товарища и страну.
advertisement-sovietsoda-2 = Выполнили ли вы сегодня свою норму питания?
advertisement-sovietsoda-3 = Очень хорошо!
-advertisement-sovietsoda-4 = Мы простые люди, потому что это все, что мы едим.
+advertisement-sovietsoda-4 = Мы простые люди, потому что это всё, что мы едим.
advertisement-sovietsoda-5 = Если есть человек, значит, есть проблема. Если нет человека, то нет и проблемы.
-advertisement-sovietsoda-6 = Если этого достаточно для существования, значит этого достаточно для нас!
-thankyou-sovietsoda-1 = Наслаждайся, товарищ!
-thankyou-sovietsoda-2 = А теперь возвращайся к работе.
-thankyou-sovietsoda-3 = Это всё что ты получишь.
+advertisement-sovietsoda-6 = Если оно достаточно хорошо для повседневной жизни, то оно достаточно хорошо и для нас!
+thankyou-sovietsoda-1 = Приятного аппетита, товарищ!
+thankyou-sovietsoda-2 = А теперь возвращайтесь к работе.
+thankyou-sovietsoda-3 = Вы получили всё, что положено.
diff --git a/Resources/Locale/ru-RU/advertisements/vending/syndiedrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/syndiedrobe.ftl
index 9ab57c6482a..51943a83759 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/syndiedrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/syndiedrobe.ftl
@@ -29,8 +29,8 @@ advertisement-syndiedrobe-28 = Наши костюмы влагостойкие,
advertisement-syndiedrobe-29 = Лучшие в галактике!
advertisement-syndiedrobe-30 = Что может быть лучше, чем запах нашей формы по утрам?
advertisement-syndiedrobe-31 = Вы можете оставить отзыв о нашей форме по горячей линии Тайпана, главное не ошибитесь номером!
-thankyou-syndiedrobe-1 = Используй с пользой!
+thankyou-syndiedrobe-1 = Найдите этому достойное применение!
thankyou-syndiedrobe-2 = Смерть NT!
-thankyou-syndiedrobe-3 = Покажи им силу стиля.
-thankyou-syndiedrobe-4 = Веселых убийств!
-thankyou-syndiedrobe-5 = Наслаждайся насилием!
+thankyou-syndiedrobe-3 = Продемонстрируйте им силу стиля.
+thankyou-syndiedrobe-4 = Счастливых убийств!
+thankyou-syndiedrobe-5 = Наслаждайтесь резнёй!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/theater.ftl b/Resources/Locale/ru-RU/advertisements/vending/theater.ftl
index e992bb3f6cf..a9127a74c8f 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/theater.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/theater.ftl
@@ -2,5 +2,5 @@ advertisement-theater-1 = Одевайтесь для успеха!
advertisement-theater-2 = Одетый и обутый!
advertisement-theater-3 = Время шоу!
advertisement-theater-4 = Зачем оставлять стиль на волю судьбы? Используйте ТеатроШкаф!
-advertisement-theater-5 = От гладиаторских боёв до косплей сессии - всё для этого есть у нас!
-advertisement-theater-6 = Клоун оценит твой внешний вид!
+advertisement-theater-5 = Любые причудливые наряды, от одеяний гладиаторов до чёрт знает чего!
+advertisement-theater-6 = Клоун оценит ваш наряд!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/vendomat.ftl b/Resources/Locale/ru-RU/advertisements/vending/vendomat.ftl
index 76c2f0d583f..ef8cbf5f015 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/vendomat.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/vendomat.ftl
@@ -1,7 +1,7 @@
advertisement-vendomat-1 = Только самое лучшее!
advertisement-vendomat-2 = Возьмите инструментов.
-advertisement-vendomat-3 = Самое надежное оборудование.
+advertisement-vendomat-3 = Самое надёжное оборудование.
advertisement-vendomat-4 = Лучшее снаряжение в космосе!
-advertisement-vendomat-5 = Это точно лучше стандартного снаряжения!
-advertisement-vendomat-6 = Старый добрый ломик, на все случаи жизни!
-advertisement-vendomat-7 = Тебе точно нужен полный набор инструментов!
+advertisement-vendomat-5 = Это, безусловно, лучше, чем стандартное снаряжение!
+advertisement-vendomat-6 = Получите вашу старую добрую монтировку!
+advertisement-vendomat-7 = Здесь на случай, когда понадобится полный набор инструментов!
diff --git a/Resources/Locale/ru-RU/advertisements/vending/virodrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/virodrobe.ftl
index 097eca36114..869f4d71d4b 100644
--- a/Resources/Locale/ru-RU/advertisements/vending/virodrobe.ftl
+++ b/Resources/Locale/ru-RU/advertisements/vending/virodrobe.ftl
@@ -1,3 +1,3 @@
advertisement-virodrobe-1 = Вирусы не дают вам покоя? Переходите на стерильную одежду уже сегодня!
-advertisement-virodrobe-2 = Чувствуете себя больным? Наша одежда вас вылечит!... наверное
-advertisement-virodrobe-3 = Защитите себя от любого заболевания!
+advertisement-virodrobe-2 = Чувствуете недомогание? Наши костюмы помогут ограничить распространение этой неприятной болезни... Наверное.
+advertisement-virodrobe-3 = Защищает от всех неприятных болезней!
diff --git a/Resources/Locale/ru-RU/alerts/alerts.ftl b/Resources/Locale/ru-RU/alerts/alerts.ftl
index 3138d915f02..d4a39af089d 100644
--- a/Resources/Locale/ru-RU/alerts/alerts.ftl
+++ b/Resources/Locale/ru-RU/alerts/alerts.ftl
@@ -72,3 +72,5 @@ alerts-revenant-essence-name = Эссенция
alerts-revenant-essence-desc = Сила душ. Поддерживает вас и используется при использовании способностей. Медленно восстанавливается с течением времени.
alerts-revenant-corporeal-name = Материальность
alerts-revenant-corporeal-desc = Вы физически воплотились. Окружающие могут видеть и наносить вам вред.
+alerts-deflecting-name = Отражение
+alerts-deflecting-desc = У вас есть шанс отразить летящие снаряды. Стоя на месте или при медленном движении этот шанс увеличивается.
diff --git a/Resources/Locale/ru-RU/anomaly/anomaly.ftl b/Resources/Locale/ru-RU/anomaly/anomaly.ftl
index 378f080e3f2..eebf34a7c09 100644
--- a/Resources/Locale/ru-RU/anomaly/anomaly.ftl
+++ b/Resources/Locale/ru-RU/anomaly/anomaly.ftl
@@ -2,6 +2,7 @@ anomaly-component-contact-damage = Аномалия сдирает с вас к
anomaly-vessel-component-anomaly-assigned = Аномалия присвоена сосуду.
anomaly-vessel-component-not-assigned = Этому сосуду не присвоена ни одна аномалия. Попробуйте использовать на нём сканер.
anomaly-vessel-component-assigned = Этому сосуду уже присвоена аномалия.
+anomaly-vessel-component-upgrade-output = point output
anomaly-particles-delta = Дельта-частицы
anomaly-particles-epsilon = Эпсилон-частицы
anomaly-particles-zeta = Зета-частицы
diff --git a/Resources/Locale/ru-RU/arcade/components/space-villain-game-component.ftl b/Resources/Locale/ru-RU/arcade/components/space-villain-game-component.ftl
index b8213e3cb78..b53fe39ab64 100644
--- a/Resources/Locale/ru-RU/arcade/components/space-villain-game-component.ftl
+++ b/Resources/Locale/ru-RU/arcade/components/space-villain-game-component.ftl
@@ -9,6 +9,6 @@ space-villain-game-player-loses-message = Вы проиграли!
space-villain-game-enemy-cheers-message = { $enemyName } ликует.
space-villain-game-enemy-dies-with-player-message = { $enemyName } умирает, но забирает вас с собой.
space-villain-game-enemy-throws-bomb-message = { $enemyName } бросает бомбу, взрывая вас на { $damageReceived } урона!
-space-villain-game-enemy-steals-player-power-message = { $enemyName } крадет { $stolenAmount } вашей силы!
+space-villain-game-enemy-steals-player-power-message = { $enemyName } крадёт { $stolenAmount } вашей силы!
space-villain-game-enemy-heals-message = { $enemyName } исцеляет { $healedAmount } здоровья!
space-villain-game-enemy-attacks-message = { $enemyName } атакует вас, нанося { $damageDealt } урона!
diff --git a/Resources/Locale/ru-RU/atmos/firelock-component.ftl b/Resources/Locale/ru-RU/atmos/firelock-component.ftl
index 63b466b2bff..1f27ec121ca 100644
--- a/Resources/Locale/ru-RU/atmos/firelock-component.ftl
+++ b/Resources/Locale/ru-RU/atmos/firelock-component.ftl
@@ -1,2 +1,2 @@
firelock-component-is-holding-pressure-message = Порыв воздуха дует вам в лицо... Возможно, вам стоит передумать.
-firelock-component-is-holding-fire-message = Порыв теплого воздуха дует вам в лицо... Возможно, вам стоит передумать.
+firelock-component-is-holding-fire-message = Порыв тёплого воздуха дует вам в лицо... Возможно, вам стоит передумать.
diff --git a/Resources/Locale/ru-RU/atmos/gas-analyzer-component.ftl b/Resources/Locale/ru-RU/atmos/gas-analyzer-component.ftl
index cbb87c64986..56b89b9c110 100644
--- a/Resources/Locale/ru-RU/atmos/gas-analyzer-component.ftl
+++ b/Resources/Locale/ru-RU/atmos/gas-analyzer-component.ftl
@@ -12,6 +12,8 @@ gas-analyzer-window-refresh-button = Обновить
gas-analyzer-window-no-data = Нет данных
gas-analyzer-window-no-gas-text = Нет газов
gas-analyzer-window-error-text = Ошибка: { $errorText }
+gas-analyzer-window-volume-text = Объём:
+gas-analyzer-window-volume-val-text = { $volume } л
gas-analyzer-window-pressure-text = Давление:
gas-analyzer-window-pressure-val-text = { $pressure } кПа
gas-analyzer-window-temperature-text = Температура:
diff --git a/Resources/Locale/ru-RU/atmos/gas-recycler-system.ftl b/Resources/Locale/ru-RU/atmos/gas-recycler-system.ftl
index 68b5b73b6a7..1bfee83207c 100644
--- a/Resources/Locale/ru-RU/atmos/gas-recycler-system.ftl
+++ b/Resources/Locale/ru-RU/atmos/gas-recycler-system.ftl
@@ -1,5 +1,5 @@
gas-recycler-reacting = Он [color=green]преобразовывает[/color] газы-отходы.
gas-recycler-low-pressure = Входное давление [color=darkred]слишком низкое[/color].
gas-recycler-low-temperature = Входная температура [color=darkred]слишком низкая[/color].
-gas-recycler-upgrade-min-temp = минимальная температура
-gas-recycler-upgrade-min-pressure = минимальное давление
+gas-recycler-upgrade-min-temp = Minimum temperature
+gas-recycler-upgrade-min-pressure = Minimum pressure
diff --git a/Resources/Locale/ru-RU/atmos/gas-tank-component.ftl b/Resources/Locale/ru-RU/atmos/gas-tank-component.ftl
index e5578ee3221..654459c9a5b 100644
--- a/Resources/Locale/ru-RU/atmos/gas-tank-component.ftl
+++ b/Resources/Locale/ru-RU/atmos/gas-tank-component.ftl
@@ -3,7 +3,7 @@
# Examine text showing pressure in tank.
comp-gas-tank-examine = Давление: [color=orange]{ PRESSURE($pressure) }[/color].
# Examine text when internals are active.
-comp-gas-tank-connected = Он подключен к внешнему компоненту.
+comp-gas-tank-connected = Он подключён к внешнему компоненту.
# Examine text when valve is open or closed.
comp-gas-tank-examine-open-valve = Клапан выпуска газа [color=red]открыт[/color].
comp-gas-tank-examine-closed-valve = Клапан выпуска газа [color=green]закрыт[/color].
diff --git a/Resources/Locale/ru-RU/atmos/portable-scrubber.ftl b/Resources/Locale/ru-RU/atmos/portable-scrubber.ftl
index 0e8713bb1c4..a3e79d2d8bc 100644
--- a/Resources/Locale/ru-RU/atmos/portable-scrubber.ftl
+++ b/Resources/Locale/ru-RU/atmos/portable-scrubber.ftl
@@ -1,3 +1,3 @@
portable-scrubber-fill-level = Примерно [color=yellow]{ $percent }%[/color] от максимального внутреннего давления.
-portable-scrubber-component-upgrade-max-pressure = максимальное давление
-portable-scrubber-component-upgrade-transfer-rate = скорость перекачки
+portable-scrubber-component-upgrade-max-pressure = max pressure
+portable-scrubber-component-upgrade-transfer-rate = transfer rate
diff --git a/Resources/Locale/ru-RU/barsign/barsign-component.ftl b/Resources/Locale/ru-RU/barsign/barsign-component.ftl
index 64b158bc4da..d291ae62314 100644
--- a/Resources/Locale/ru-RU/barsign/barsign-component.ftl
+++ b/Resources/Locale/ru-RU/barsign/barsign-component.ftl
@@ -15,7 +15,7 @@ barsign-prototype-description-singulo = Куда приходят люди, ко
## The Drunk Carp
-barsign-prototype-name-drunk-carp = Пьяный карп
+barsign-prototype-name-drunk-carp = Бухой карп
barsign-prototype-description-drunk-carp = Не пейте плавая.
## Officer Beersky
@@ -106,7 +106,7 @@ barsign-prototype-description-goose = Пей до рвоты и/или нару
## The Engine Change
barsign-prototype-name-enginechange = Замена двигателя
-barsign-prototype-description-enginechange = Все еще ожидаем.
+barsign-prototype-description-enginechange = Всё ещё ожидаем.
## 4 The Emprah
@@ -121,4 +121,4 @@ barsign-prototype-description-empbarsign = Что-то пошло совсем
## SignOff
-barsign-prototype-description-sign-off = Этот знак, похоже, не включен.
+barsign-prototype-description-sign-off = Этот знак, похоже, не включён.
diff --git a/Resources/Locale/ru-RU/bed/cryostorage/cryogenic-storage.ftl b/Resources/Locale/ru-RU/bed/cryostorage/cryogenic-storage.ftl
index a34d9fd3709..1cc15c89d81 100644
--- a/Resources/Locale/ru-RU/bed/cryostorage/cryogenic-storage.ftl
+++ b/Resources/Locale/ru-RU/bed/cryostorage/cryogenic-storage.ftl
@@ -1,6 +1,8 @@
### Announcement
-earlyleave-cryo-announcement = { $character } ({ $job }) { $gender ->
+earlyleave-cryo-job-unknown = Должность неизвестна
+earlyleave-cryo-announcement =
+ { $character } ({ $job }) { $gender ->
[male] был перемещён
[female] была перемещена
[epicene] были перемещены
diff --git a/Resources/Locale/ru-RU/boombox/boombox.ftl b/Resources/Locale/ru-RU/boombox/boombox.ftl
index 34767e85af4..f76bc9d9f1c 100644
--- a/Resources/Locale/ru-RU/boombox/boombox.ftl
+++ b/Resources/Locale/ru-RU/boombox/boombox.ftl
@@ -8,4 +8,4 @@ boombox-ui-window = Бумбокс
boombox-ui-minusvol-button = - vol
boombox-ui-plusvol-button = + vol
boombox-ui-start-button = ▶
-boombox-ui-stop-button = ⏹
\ No newline at end of file
+boombox-ui-stop-button = ⏹
diff --git a/Resources/Locale/ru-RU/borg/borg.ftl b/Resources/Locale/ru-RU/borg/borg.ftl
index 23e3d644404..571195f6df1 100644
--- a/Resources/Locale/ru-RU/borg/borg.ftl
+++ b/Resources/Locale/ru-RU/borg/borg.ftl
@@ -1,5 +1,5 @@
borg-player-not-allowed = Мозг не помещается!
-borg-player-not-allowed-eject = Мозг был извлечен из корпуса!
+borg-player-not-allowed-eject = Мозг был извлечён из корпуса!
borg-panel-not-open = Панель киборга не открыта...
borg-mind-added = { CAPITALIZE($name) } включается!
borg-mind-removed = { CAPITALIZE($name) } выключается!
@@ -12,3 +12,7 @@ borg-ui-no-brain = Мозг отсутствует
borg-ui-remove-battery = Извлечь
borg-ui-modules-label = Модули:
borg-ui-module-counter = { $actual }/{ $max }
+# Transponder
+borg-transponder-disabled-popup = Мозг вылетает из верхушки { $name }!
+borg-transponder-emagged-disabled-popup = Огни вашего транспондера погасли!
+borg-transponder-emagged-destroyed-popup = Предохранитель вашего транспондера перегорел!
diff --git a/Resources/Locale/ru-RU/botany/components/plant-holder-component.ftl b/Resources/Locale/ru-RU/botany/components/plant-holder-component.ftl
index 7ce653739e1..54778cac2fc 100644
--- a/Resources/Locale/ru-RU/botany/components/plant-holder-component.ftl
+++ b/Resources/Locale/ru-RU/botany/components/plant-holder-component.ftl
@@ -32,4 +32,4 @@ plant-holder-component-light-improper-warning = Мигает [color=yellow]пр
plant-holder-component-heat-improper-warning = Мигает [color=orange]предупреждение о неподходящем уровне температуры[/color].
plant-holder-component-pressure-improper-warning = Мигает [color=lightblue]предупреждение о неподходящем атмосферном давлении[/color].
plant-holder-component-gas-missing-warning = Мигает [color=cyan]предупреждение о неподходящем атмосферном составе[/color].
-plant-holder-component-early-sample-message = Это растение недостаточно крепко для получения образца.
+plant-holder-component-early-sample-message = Растение ещё не выросло настолько, чтобы извлечь семена.
diff --git a/Resources/Locale/ru-RU/botany/components/seed-extractor-component.ftl b/Resources/Locale/ru-RU/botany/components/seed-extractor-component.ftl
index b11c97c94a9..553cd79d4fe 100644
--- a/Resources/Locale/ru-RU/botany/components/seed-extractor-component.ftl
+++ b/Resources/Locale/ru-RU/botany/components/seed-extractor-component.ftl
@@ -2,4 +2,4 @@
seed-extractor-component-interact-message = Вы извлекаете немного семян из { $name }.
seed-extractor-component-no-seeds = { CAPITALIZE($name) } не имеет семян!
-seed-extractor-component-upgrade-seed-yield = извлечение семян
+seed-extractor-component-upgrade-seed-yield = seed yield
diff --git a/Resources/Locale/ru-RU/buckle/components/buckle-component.ftl b/Resources/Locale/ru-RU/buckle/components/buckle-component.ftl
index e2130f99ed9..29d8cb48989 100644
--- a/Resources/Locale/ru-RU/buckle/components/buckle-component.ftl
+++ b/Resources/Locale/ru-RU/buckle/components/buckle-component.ftl
@@ -1,6 +1,6 @@
buckle-component-no-hands-message = У вас нет рук.
-buckle-component-already-buckled-message = Вы уже пристегнуты!
-buckle-component-other-already-buckled-message = { $owner } уже пристегнут!
+buckle-component-already-buckled-message = Вы уже пристёгнуты!
+buckle-component-other-already-buckled-message = { $owner } уже пристёгнут!
buckle-component-cannot-buckle-message = Вы не можете пристегнуть себя туда.
buckle-component-other-cannot-buckle-message = Вы не можете пристегнуть { $owner } туда!
buckle-component-cannot-fit-message = Вы туда не помещаетесь!
diff --git a/Resources/Locale/ru-RU/burning/bodyburn.ftl b/Resources/Locale/ru-RU/burning/bodyburn.ftl
index 7b8c249ea4b..14056b7cb95 100644
--- a/Resources/Locale/ru-RU/burning/bodyburn.ftl
+++ b/Resources/Locale/ru-RU/burning/bodyburn.ftl
@@ -1 +1 @@
-bodyburn-text-others = { $name }'s body burns to ash!
+bodyburn-text-others = { $name } сгорает дотла!
diff --git a/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl b/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl
index 15adc89a124..f6df729957f 100644
--- a/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl
+++ b/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl
@@ -28,8 +28,9 @@ cargo-console-invalid-product = Неверный ID продукта
cargo-console-too-many = Слишком много одобренных заказов
cargo-console-snip-snip = Заказ урезан до вместимости
cargo-console-insufficient-funds = Недостаточно средств (требуется { $cost })
-cargo-console-unfulfilled = Недостаточно места для выполнения доставки.
-cargo-console-trade-station = Отправить { $destination }
+cargo-console-unfulfilled = Нет места для выполнения заказа
+cargo-console-trade-station = Отправить на { $destination }
+cargo-console-unlock-approved-order-broadcast = [bold]Заказ на { $productName } x{ $orderAmount }[/bold], стоимостью [bold]{ $cost }[/bold], был одобрен [bold]{ $approverName }, { $approverJob }[/bold]
cargo-console-paper-print-name = Заказ #{ $orderNumber }
cargo-console-paper-print-text =
Заказ #{ $orderNumber }
@@ -43,4 +44,4 @@ cargo-shuttle-console-station-unknown = Неизвестно
cargo-shuttle-console-shuttle-not-found = Не найден
cargo-no-shuttle = Грузовой шаттл не найден!
cargo-shuttle-console-organics = На шаттле обнаружены органические формы жизни
-cargo-telepad-delay-upgrade = Задержка телепортации
+cargo-telepad-delay-upgrade = Teleport delay
diff --git a/Resources/Locale/ru-RU/chameleon-projector/chameleon-projector.ftl b/Resources/Locale/ru-RU/chameleon-projector/chameleon-projector.ftl
new file mode 100644
index 00000000000..5c86fd85853
--- /dev/null
+++ b/Resources/Locale/ru-RU/chameleon-projector/chameleon-projector.ftl
@@ -0,0 +1,2 @@
+chameleon-projector-invalid = Вы не можете так замаскироваться!
+chameleon-projector-success = Новая маскировка спроецирована.
diff --git a/Resources/Locale/ru-RU/chat/chat-repo.ftl b/Resources/Locale/ru-RU/chat/chat-repo.ftl
new file mode 100644
index 00000000000..4d8eb72e11f
--- /dev/null
+++ b/Resources/Locale/ru-RU/chat/chat-repo.ftl
@@ -0,0 +1,6 @@
+command-description-deletechatmessage-id = Delete a specific chat message by message ID
+command-description-nukechatmessages-usernames = Delete all of the supplied usernames' chat messages posted during this round
+command-description-nukechatmessages-userids = Delete all of the supplied userIds' chat messages posted during this round
+command-error-deletechatmessage-id-notexist = The message with the supplied ID does not exist
+command-error-nukechatmessages-usernames-usernamenotexist = Username { $username } does not exist
+command-error-nukechatmessages-usernames-usernamenomessages = UserID { $userId } has no messages to nuke
diff --git a/Resources/Locale/ru-RU/chat/commands/ghost-command.ftl b/Resources/Locale/ru-RU/chat/commands/ghost-command.ftl
new file mode 100644
index 00000000000..7010c395e5b
--- /dev/null
+++ b/Resources/Locale/ru-RU/chat/commands/ghost-command.ftl
@@ -0,0 +1,6 @@
+ghost-command-description = Завязать с жизнью и стать призраком.
+ghost-command-help-text =
+ Команда ghost превращает вас в призрака, а персонаж, которым вы играли, навсегда становится кататоником.
+ Обратите внимание, что это действие необратимо, и вы не сможете вернуться в тело своего персонажа.
+ghost-command-no-session = Вы не в сеансе, вы не можете использовать ghost.
+ghost-command-denied = Вы не можете стать призраком в данный момент.
diff --git a/Resources/Locale/ru-RU/chat/commands/suicide-command.ftl b/Resources/Locale/ru-RU/chat/commands/suicide-command.ftl
index da99a31c923..a5aee74cfbb 100644
--- a/Resources/Locale/ru-RU/chat/commands/suicide-command.ftl
+++ b/Resources/Locale/ru-RU/chat/commands/suicide-command.ftl
@@ -1,9 +1,11 @@
suicide-command-description = Совершает самоубийство
suicide-command-help-text =
- Команда самоубийства дает вам возможность быстро выйти из раунда, оставаясь в образе персонажа.
+ Команда самоубийства даёт вам возможность быстро выйти из раунда, оставаясь в образе персонажа.
Способы бывают разные, сначала вы попытаетесь использовать предмет, находящийся у вас в активной руке.
Если это не удастся, то будет сделана попытка использовать предмет рядом с вами.
- Наконец, если ни один из вышеперечисленных способов не сработал, вы умрете, прикусив язык.
+ Наконец, если ни один из вышеперечисленных способов не сработал, вы умрёте, прикусив язык.
suicide-command-default-text-others = { $name } пытается прикусить свой собственный язык!
suicide-command-default-text-self = Вы пытаетесь прикусить свой собственный язык!
suicide-command-already-dead = Вы не можете совершить самоубийство. Вы мертвы.
+suicide-command-no-mind = У вас нет разума!
+suicide-command-denied = Вы не можете совершить самоубийство в данный момент.
diff --git a/Resources/Locale/ru-RU/chat/emotes.ftl b/Resources/Locale/ru-RU/chat/emotes.ftl
new file mode 100644
index 00000000000..19c3eb1ec38
--- /dev/null
+++ b/Resources/Locale/ru-RU/chat/emotes.ftl
@@ -0,0 +1,59 @@
+# Имена
+chat-emote-name-scream = Кричать
+chat-emote-name-laugh = Смеяться
+chat-emote-name-honk = Хонк
+chat-emote-name-sigh = Вздыхать
+chat-emote-name-whistle = Свистеть
+chat-emote-name-crying = Плакать
+chat-emote-name-squish = Хлюпать
+chat-emote-name-chitter = Стрекотать
+chat-emote-name-squeak = Пищать
+chat-emote-name-click = Клацать
+chat-emote-name-clap = Хлопать
+chat-emote-name-snap = Щёлкать пальцами
+chat-emote-name-salute = Салютовать
+chat-emote-name-deathgasp = Предсмертный хрип
+chat-emote-name-buzz = Жужжать
+chat-emote-name-weh = Вехать
+chat-emote-name-chirp = Чирикать
+chat-emote-name-beep = Бип
+chat-emote-name-chime = Дзынь
+chat-emote-name-buzztwo = Бип буп
+chat-emote-name-ping = Пинг
+chat-emote-name-sneeze = Чихать
+chat-emote-name-cough = Кашлять
+chat-emote-name-catmeow = Кошачье мяуканье
+chat-emote-name-cathisses = Кошачье шипение
+chat-emote-name-monkeyscreeches = Обезьяньи крики
+chat-emote-name-robotbeep = Робот
+chat-emote-name-yawn = Зевать
+chat-emote-name-snore = Храпеть
+# Сообщение
+chat-emote-msg-scream = кричит!
+chat-emote-msg-laugh = смеётся
+chat-emote-msg-honk = хонкает
+chat-emote-msg-sigh = вздыхает
+chat-emote-msg-whistle = свистит
+chat-emote-msg-crying = плачет
+chat-emote-msg-squish = хлюпает
+chat-emote-msg-chitter = щебечет
+chat-emote-msg-squeak = пищит
+chat-emote-msg-click = клацает
+chat-emote-msg-clap = хлопает!
+chat-emote-msg-snap = щёлкает пальцами
+chat-emote-msg-salute = салютует
+chat-emote-msg-deathgasp = замирает и бездыханно оседает, { POSS-ADJ($entity) } глаза мертвы и безжизненны...
+chat-emote-msg-deathgasp-monkey = издаёт слабый взвизг, оседает и замирает...
+chat-emote-msg-buzz = жужжит!
+chat-emote-msg-chirp = щебечет!
+chat-emote-msg-beep = пищит.
+chat-emote-msg-chime = издаёт звон.
+chat-emote-msg-buzzestwo = издаёт бип-буп.
+chat-emote-msg-ping = издаёт пинг.
+chat-emote-msg-sneeze = чихает
+chat-emote-msg-cough = кашляет
+chat-emote-msg-catmeow = мяукает
+chat-emote-msg-cathisses = шипит
+chat-emote-msg-monkeyscreeches = кричит
+chat-emote-msg-yawn = зевает
+chat-emote-msg-snore = храпит
diff --git a/Resources/Locale/ru-RU/chat/sanitizer-replacements.ftl b/Resources/Locale/ru-RU/chat/sanitizer-replacements.ftl
index 6668661c4eb..e36940afc65 100644
--- a/Resources/Locale/ru-RU/chat/sanitizer-replacements.ftl
+++ b/Resources/Locale/ru-RU/chat/sanitizer-replacements.ftl
@@ -9,7 +9,7 @@ chatsan-pouts = дуется
chatsan-laughs = смеётся
chatsan-cries = плачет
chatsan-smiles-smugly = самодовольно улыбается
-chatsan-annoyed = выглядит раздраженным
+chatsan-annoyed = выглядит раздражённым
chatsan-sighs = вздыхает
chatsan-stick-out-tongue = показывает язык
chatsan-wide-eyed = выглядит шокированным
@@ -22,5 +22,3 @@ chatsan-tearfully-salutes = отдаёт честь со слезами на г
chatsan-tearfully-smiles = улыбается со слезами на глазах
chatsan-winks = подмигивает
chatsan-shrugs = пожимает плечами
-chatsan-claps = хлопает
-chatsan-snaps = щёлкает
diff --git a/Resources/Locale/ru-RU/chat/ui/emote-menu.ftl b/Resources/Locale/ru-RU/chat/ui/emote-menu.ftl
new file mode 100644
index 00000000000..be4daf7631e
--- /dev/null
+++ b/Resources/Locale/ru-RU/chat/ui/emote-menu.ftl
@@ -0,0 +1,3 @@
+emote-menu-category-general = Общие
+emote-menu-category-vocal = Голос
+emote-menu-category-hands = Жесты
diff --git a/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl b/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl
index 13050db2d98..e28f25c4e8f 100644
--- a/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl
+++ b/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl
@@ -3,7 +3,8 @@
hypospray-all-mode-text = Только ввод
hypospray-mobs-only-mode-text = Забор и ввод
hypospray-invalid-text = Ошибка
-hypospray-volume-label = Объём: [color=white]{ $currentVolume }/{ $totalVolume } ед.[/color]
+hypospray-volume-label =
+ Объём: [color=white]{ $currentVolume }/{ $totalVolume } ед.[/color]
Режим: [color=white]{ $modeString }[/color]
## Entity
diff --git a/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl b/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl
index 3526b47059a..ebc585fa240 100644
--- a/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl
+++ b/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl
@@ -3,7 +3,8 @@
injector-draw-text = Забор
injector-inject-text = Введение
injector-invalid-injector-toggle-mode = Неверный режим
-injector-volume-label = Объём: [color=white]{ $currentVolume }/{ $totalVolume }[/color]
+injector-volume-label =
+ Объём: [color=white]{ $currentVolume }/{ $totalVolume }[/color]
Режим: [color=white]{ $modeString }[/color] ([color=white]{ $transferVolume } ед.[/color])
## Entity
diff --git a/Resources/Locale/ru-RU/chemistry/components/reagent-dispenser-component.ftl b/Resources/Locale/ru-RU/chemistry/components/reagent-dispenser-component.ftl
index 2ced0659e99..d4c5ccd1e61 100644
--- a/Resources/Locale/ru-RU/chemistry/components/reagent-dispenser-component.ftl
+++ b/Resources/Locale/ru-RU/chemistry/components/reagent-dispenser-component.ftl
@@ -10,9 +10,10 @@ reagent-dispenser-bound-user-interface-title = Раздатчик химикат
## UI
reagent-dispenser-window-amount-to-dispense-label = Кол-во
-reagent-dispenser-window-container-label = Контейнер:
+reagent-dispenser-window-container-label = Container:
reagent-dispenser-window-clear-button = Очистить
reagent-dispenser-window-eject-button = Извлечь
+reagent-dispenser-window-eject-container-button = ⏏
reagent-dispenser-window-no-container-loaded-text = Контейнер не загружен.
reagent-dispenser-window-reagent-name-not-found-text = Имя реагента не найдено
reagent-dispenser-window-unknown-reagent-text = Неизвестный реагент
diff --git a/Resources/Locale/ru-RU/chemistry/components/solution-scanner-component.ftl b/Resources/Locale/ru-RU/chemistry/components/solution-scanner-component.ftl
index e58b5bf43cf..93db995513e 100644
--- a/Resources/Locale/ru-RU/chemistry/components/solution-scanner-component.ftl
+++ b/Resources/Locale/ru-RU/chemistry/components/solution-scanner-component.ftl
@@ -3,3 +3,4 @@ scannable-solution-verb-message = Изучить химический соста
scannable-solution-main-text = Содержит следующие химические вещества:
scannable-solution-empty-container = Не содержит химических веществ.
scannable-solution-chemical = - { $amount }ед. [color={ $color }]{ $type }[/color]
+scannable-solution-temperature = Температура раствора: { $temperature }K
diff --git a/Resources/Locale/ru-RU/chemistry/components/solution-status.ftl b/Resources/Locale/ru-RU/chemistry/components/solution-status.ftl
new file mode 100644
index 00000000000..8e6af147d29
--- /dev/null
+++ b/Resources/Locale/ru-RU/chemistry/components/solution-status.ftl
@@ -0,0 +1,2 @@
+solution-status-volume = Объём: [color=white]{ $currentVolume }/{ $maxVolume }ед.[/color]
+solution-status-transfer = Перемещение: [color=white]{ $volume }ед.[/color]
diff --git a/Resources/Locale/ru-RU/clothing/boots.ftl b/Resources/Locale/ru-RU/clothing/boots.ftl
index 97951ac3b29..982ea0ca928 100644
--- a/Resources/Locale/ru-RU/clothing/boots.ftl
+++ b/Resources/Locale/ru-RU/clothing/boots.ftl
@@ -1 +1 @@
-clothing-military-boots-sidearm = Личное оружие
+clothing-boots-sidearm = Личное оружие
diff --git a/Resources/Locale/ru-RU/commands/stat-values-command.ftl b/Resources/Locale/ru-RU/commands/stat-values-command.ftl
index 18b748899c5..5510717a1ab 100644
--- a/Resources/Locale/ru-RU/commands/stat-values-command.ftl
+++ b/Resources/Locale/ru-RU/commands/stat-values-command.ftl
@@ -1,4 +1,4 @@
-stat-values-desc = Выгружает всю статистику для определенной категории в таблицу.
+stat-values-desc = Выгружает всю статистику для определённой категории в таблицу.
stat-values-server = Не может быть запущено на сервере!
stat-values-args = Неверное число аргументов, нужен 1
stat-values-invalid = { $arg } не является действительной характеристикой!
diff --git a/Resources/Locale/ru-RU/commands/tippy-command.ftl b/Resources/Locale/ru-RU/commands/tippy-command.ftl
new file mode 100644
index 00000000000..3fa510cf128
--- /dev/null
+++ b/Resources/Locale/ru-RU/commands/tippy-command.ftl
@@ -0,0 +1,11 @@
+cmd-tippy-desc = Передать сообщение от имени клоуна Типпи.
+cmd-tippy-help = tippy [entity prototype] [speak time] [slide time] [waddle interval]
+cmd-tippy-auto-1 =
+cmd-tippy-auto-2 = текст
+cmd-tippy-auto-3 = прототип сущности
+cmd-tippy-auto-4 = время сообщения, в секундах
+cmd-tippy-auto-5 = время анимации, в секундах
+cmd-tippy-auto-6 = интервал прыжков, в секундах
+cmd-tippy-error-no-user = Пользователь не найден.
+cmd-tippy-error-no-prototype = Прототип не найден: { $proto }
+cmd-tip-desc = Спавн случайного игрового совета.
diff --git a/Resources/Locale/ru-RU/commands/toolshed-commands.ftl b/Resources/Locale/ru-RU/commands/toolshed-commands.ftl
index 6ccb81c506c..ef971d86131 100644
--- a/Resources/Locale/ru-RU/commands/toolshed-commands.ftl
+++ b/Resources/Locale/ru-RU/commands/toolshed-commands.ftl
@@ -39,3 +39,4 @@ command-description-solution-adjreagent = Adjusts the given reagent on the given
command-description-mind-get = Grabs the mind from the entity, if any.
command-description-mind-control = Assumes control of an entity with the given player.
command-description-addaccesslog = Adds an access log to this entity. Do note that this bypasses the log's default limit and pause check.
+command-description-stationevent-simulate = Simulates N number of rounds in which events will occur and prints the occurrences of every event after.
diff --git a/Resources/Locale/ru-RU/commands/zoom-command.ftl b/Resources/Locale/ru-RU/commands/zoom-command.ftl
index 0d3db3e6836..0132f222405 100644
--- a/Resources/Locale/ru-RU/commands/zoom-command.ftl
+++ b/Resources/Locale/ru-RU/commands/zoom-command.ftl
@@ -1,6 +1,3 @@
cmd-zoom-desc = Sets the zoom of the main eye.
cmd-zoom-help = zoom ( | )
cmd-zoom-error = scale has to be greater than 0
-zoom-command-description = Устанавливает зум основного глаза.
-zoom-command-help = zoom ( | )
-zoom-command-error = масштаб должен быть больше 0
diff --git a/Resources/Locale/ru-RU/communications/communications-console-component.ftl b/Resources/Locale/ru-RU/communications/communications-console-component.ftl
index 3c45bc30363..058212a097f 100644
--- a/Resources/Locale/ru-RU/communications/communications-console-component.ftl
+++ b/Resources/Locale/ru-RU/communications/communications-console-component.ftl
@@ -8,6 +8,7 @@ comms-console-menu-recall-shuttle = Отозвать
# Popup
comms-console-permission-denied = В доступе отказано
comms-console-shuttle-unavailable = В настоящее время шаттл недоступен
+comms-console-message-too-long = Сообщение слишком длинное
# Placeholder values
comms-console-announcement-sent-by = Отправитель
comms-console-announcement-unknown-sender = Неизвестный
diff --git a/Resources/Locale/ru-RU/components/storage-component.ftl b/Resources/Locale/ru-RU/components/storage-component.ftl
index 265688f9355..ab6b4e78a70 100644
--- a/Resources/Locale/ru-RU/components/storage-component.ftl
+++ b/Resources/Locale/ru-RU/components/storage-component.ftl
@@ -3,8 +3,10 @@ comp-storage-cant-insert = Невозможно поместить.
comp-storage-too-big = Слишком большое!
comp-storage-insufficient-capacity = Недостаточная вместимость.
comp-storage-invalid-container = Это сюда не лезет!
-comp-storage-anchored-failure = Невозможно поместить закрепленный предмет.
+comp-storage-anchored-failure = Невозможно поместить закреплённый предмет.
comp-storage-cant-drop = Вы не можете отпустить { $entity }!
comp-storage-window-title = Предмет хранилище
comp-storage-window-weight = { $weight }/{ $maxWeight }, Макс. размер: { $size }
comp-storage-window-slots = Слоты: { $itemCount }/{ $maxCount }, Макс. размер: { $size }
+comp-storage-verb-open-storage = Открыть хранилище
+comp-storage-verb-close-storage = Закрыть хранилище
diff --git a/Resources/Locale/ru-RU/connection-messages.ftl b/Resources/Locale/ru-RU/connection-messages.ftl
index 5a3e72bdf8e..957236bb778 100644
--- a/Resources/Locale/ru-RU/connection-messages.ftl
+++ b/Resources/Locale/ru-RU/connection-messages.ftl
@@ -9,7 +9,7 @@ whitelist-playercount-invalid =
*[other] -> и ниже { $max } игроков, так что, возможно, вы сможете присоединиться позже.
}
}
-whitelist-not-whitelisted-rp = Вас нет в вайтлисте. Чтобы попасть в вайтлист, посетите наш Discord (присоединиться можно по ссылке https://discord.gg/hV7msmUKGJ).
+whitelist-not-whitelisted-rp = Вас нет в вайтлисте. Чтобы попасть в вайтлист, посетите наш Discord (ссылку можно найти по адресу https://discord.station14.ru).
cmd-whitelistadd-desc = Добавить игрока в вайтлист сервера.
cmd-whitelistadd-help = Использование: whitelistadd
cmd-whitelistadd-existing = { $username } уже находится в вайтлисте!
@@ -22,15 +22,15 @@ cmd-whitelistremove-existing = { $username } не находится в вайт
cmd-whitelistremove-removed = { $username } удалён с вайтлиста
cmd-whitelistremove-not-found = Не удалось найти игрока '{ $username }'
cmd-whitelistremove-arg-player = [player]
-cmd-kicknonwhitelisted-desc = Кикнуть всех игроков не в белом списке с сервера.
+cmd-kicknonwhitelisted-desc = Кикнуть всег игроков не в белом списке с сервера.
cmd-kicknonwhitelisted-help = Использование: kicknonwhitelisted
ban-banned-permanent = Этот бан можно только обжаловать. Для этого посетите { $link }.
ban-banned-permanent-appeal = Этот бан можно только обжаловать. Для этого посетите { $link }.
ban-expires = Вы получили бан на { $duration } минут, и он истечёт { $time } по UTC (для московского времени добавьте 3 часа).
ban-banned-1 = Вам, или другому пользователю этого компьютера или соединения, запрещено здесь играть.
ban-banned-2 = Причина бана: "{ $reason }"
-ban-banned-3 = Если этот бан был выдан ошибочно или без обоснования, не стесняйтесь подавать обжалование в discord, следуя рекомендациям.
-ban-banned-4 = Попытки обойти этот бан, например, путём создания нового аккаунта, будут фиксироваться.
+ban-banned-3 = Попытки обойти этот бан, например, путём создания нового аккаунта, будут фиксироваться.
+ban-banned-4 = Attempts to circumvent this ban such as creating a new account will result on escalation up to a community ban.
soft-player-cap-full = Сервер заполнен!
panic-bunker-account-denied = Этот сервер находится в режиме "Бункер", часто используемом в качестве меры предосторожности против рейдов. Новые подключения от аккаунтов, не соответствующих определённым требованиям, временно не принимаются. Повторите попытку позже
panic-bunker-account-denied-reason = Этот сервер находится в режиме "Бункер", часто используемом в качестве меры предосторожности против рейдов. Новые подключения от аккаунтов, не соответствующих определённым требованиям, временно не принимаются. Повторите попытку позже Причина: "{ $reason }"
diff --git a/Resources/Locale/ru-RU/construction/conditions/machine-frame-complete.ftl b/Resources/Locale/ru-RU/construction/conditions/machine-frame-complete.ftl
index 590d46d6a80..efd5a8ead5a 100644
--- a/Resources/Locale/ru-RU/construction/conditions/machine-frame-complete.ftl
+++ b/Resources/Locale/ru-RU/construction/conditions/machine-frame-complete.ftl
@@ -1,4 +1,4 @@
-construction-condition-machine-container-empty = Извлеките компоненты из каркаса, используя [color=cyan]Лом[/color].
+construction-condition-machine-container-empty = Извлеките компоненты из каркаса, используя [color=cyan]монтировку[/color].
# MachineFrameComplete
construction-condition-machine-frame-requirement-label = Требования:
construction-condition-machine-frame-insert-circuit-board-message = Вставьте [color=cyan]любую плату для машины[/color].
diff --git a/Resources/Locale/ru-RU/construction/conditions/toilet-lid-closed.ftl b/Resources/Locale/ru-RU/construction/conditions/toilet-lid-closed.ftl
index 7975bd43b54..93b119549e1 100644
--- a/Resources/Locale/ru-RU/construction/conditions/toilet-lid-closed.ftl
+++ b/Resources/Locale/ru-RU/construction/conditions/toilet-lid-closed.ftl
@@ -1,3 +1,3 @@
# ToiletLidClosed
-construction-examine-condition-toilet-lid-closed = Используйте [color=yellow]лом[/color] чтобы закрыть крышку.
+construction-examine-condition-toilet-lid-closed = Используйте [color=yellow]монтировку[/color] чтобы закрыть крышку.
construction-step-condition-toilet-lid-closed = Убедитесь, что крышка унитаза закрыта.
diff --git a/Resources/Locale/ru-RU/construction/ui/construction-menu.ftl b/Resources/Locale/ru-RU/construction/ui/construction-menu.ftl
index ca5fce2286e..6c821936693 100644
--- a/Resources/Locale/ru-RU/construction/ui/construction-menu.ftl
+++ b/Resources/Locale/ru-RU/construction/ui/construction-menu.ftl
@@ -2,7 +2,6 @@
construction-menu-title = Строительство
construction-menu-place-ghost = Разместить призрак конструкции
-construction-menu-clear-all = Очистить все
+construction-menu-clear-all = Очистить всё
construction-menu-eraser-mode = Режим ластика
-construction-menu-title = Строительство
construction-menu-craft = Создание
diff --git a/Resources/Locale/ru-RU/containers/containers.ftl b/Resources/Locale/ru-RU/containers/containers.ftl
index 074631cbf55..037801cfaf9 100644
--- a/Resources/Locale/ru-RU/containers/containers.ftl
+++ b/Resources/Locale/ru-RU/containers/containers.ftl
@@ -1,2 +1,3 @@
-container-verb-text-enter = Войти
-container-verb-text-empty = Пусто
+container-verb-text-enter = Забраться
+container-verb-text-empty = Покинуть
+container-thrown-missed = Промах!
diff --git a/Resources/Locale/ru-RU/corvax/accessories/human-hair.ftl b/Resources/Locale/ru-RU/corvax/accessories/human-hair.ftl
index faed5bad80a..a7dd01e8e90 100644
--- a/Resources/Locale/ru-RU/corvax/accessories/human-hair.ftl
+++ b/Resources/Locale/ru-RU/corvax/accessories/human-hair.ftl
@@ -1,13 +1,13 @@
marking-HumanHairAfricanPigtails = Хвостики (Африканские)
-marking-HumanHairAfropuffdouble = Aфро-пуф, Двойной
-marking-HumanHairAfropuffleft = Aфро-пуф, Левый
-marking-HumanHairAfropuffright = Aфро-пуф, Правый
+marking-HumanHairAfropuffdouble = Афро-пуф, Двойной
+marking-HumanHairAfropuffleft = Афро-пуф, Левый
+marking-HumanHairAfropuffright = Афро-пуф, Правый
marking-HumanHairAmazon = Амазонка
marking-HumanHairAstolfo = Астольфо
marking-HumanHairBaum = Баум
marking-HumanHairBeachwave = Бич-вейв
-marking-HumanHairBluntbangs = Прямая челка
-marking-HumanHairBluntbangsAlt = Прямая челка (Альт.)
+marking-HumanHairBluntbangs = Прямая чёлка
+marking-HumanHairBluntbangsAlt = Прямая чёлка (Альт.)
marking-HumanHairBobcutAlt = Каре (Альт.)
marking-HumanHairBunhead4 = Пучок 4
marking-HumanHairCombed = Зачёс
@@ -24,7 +24,7 @@ marking-HumanHairFortuneteller = Гадалка
marking-HumanHairFortunetellerAlt = Гадалка (Альт.)
marking-HumanHairFroofylong = Фруфи (Длинная)
marking-HumanHairGeisha = Гейша
-marking-HumanHairGentle21 = Аккуратно расчесанная
+marking-HumanHairGentle21 = Аккуратно расчёсанная
marking-HumanHairGlammetal = Глэм-металл
marking-HumanHairGloomyLong = Длинная мрачная чёлка
marking-HumanHairGloomyMedium = Средняя мрачная чёлка
diff --git a/Resources/Locale/ru-RU/corvax/administration/commands/panicbunker.ftl b/Resources/Locale/ru-RU/corvax/administration/commands/panicbunker.ftl
new file mode 100644
index 00000000000..bd25c9d5512
--- /dev/null
+++ b/Resources/Locale/ru-RU/corvax/administration/commands/panicbunker.ftl
@@ -0,0 +1,4 @@
+cmd-panicbunker_deny_vpn-desc = Включает или отключает запрет доступа через VPN-соединения.
+cmd-panicbunker_deny_vpn-help = Использование: panicbunker_min_overall_hours
+panicbunker-command-deny-vpn-enabled = Бункер теперь будет блокировать подключения через VPN.
+panicbunker-command-deny-vpn-disabled = Бункер больше не будет блокировать подключения через VPN.
diff --git a/Resources/Locale/ru-RU/corvax/administration/ui/tabs/panicbunker-tab.ftl b/Resources/Locale/ru-RU/corvax/administration/ui/tabs/panicbunker-tab.ftl
new file mode 100644
index 00000000000..6387e924f79
--- /dev/null
+++ b/Resources/Locale/ru-RU/corvax/administration/ui/tabs/panicbunker-tab.ftl
@@ -0,0 +1 @@
+admin-ui-panic-bunker-deny-vpn = Запретить доступ через VPN
diff --git a/Resources/Locale/ru-RU/corvax/barsign/barsign-component.ftl b/Resources/Locale/ru-RU/corvax/barsign/barsign-component.ftl
index 4a7f5380593..a6b60773543 100644
--- a/Resources/Locale/ru-RU/corvax/barsign/barsign-component.ftl
+++ b/Resources/Locale/ru-RU/corvax/barsign/barsign-component.ftl
@@ -1,4 +1,4 @@
## Alcoholic
barsign-prototype-name-alcoholic = Нальют и точка
-barsign-prototype-description-alcoholic = Наливай и все. Наступили тяжелые времена...
+barsign-prototype-description-alcoholic = Наливай и всё. Наступили тяжёлые времена...
diff --git a/Resources/Locale/ru-RU/corvax/chat/sanitizer-replacements.ftl b/Resources/Locale/ru-RU/corvax/chat/sanitizer-replacements.ftl
new file mode 100644
index 00000000000..0f951cc3493
--- /dev/null
+++ b/Resources/Locale/ru-RU/corvax/chat/sanitizer-replacements.ftl
@@ -0,0 +1,2 @@
+chatsan-claps = хлопает
+chatsan-snaps = щёлкает
diff --git a/Resources/Locale/ru-RU/corvax/connection-messages.ftl b/Resources/Locale/ru-RU/corvax/connection-messages.ftl
new file mode 100644
index 00000000000..738a51491c5
--- /dev/null
+++ b/Resources/Locale/ru-RU/corvax/connection-messages.ftl
@@ -0,0 +1 @@
+panic-bunker-account-reason-vpn = Сервер запретил доступ через VPN соединения
diff --git a/Resources/Locale/ru-RU/corvax/interaction/interaction-popup-component.ftl b/Resources/Locale/ru-RU/corvax/interaction/interaction-popup-component.ftl
index 3634d1ed681..9c8fa19371d 100644
--- a/Resources/Locale/ru-RU/corvax/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/ru-RU/corvax/interaction/interaction-popup-component.ftl
@@ -1,2 +1,2 @@
petting-success-gorilla = Вы гладите { $target } по { POSS-ADJ($target) } массивной голове.
-petting-failure-gorilla = Вы тянетесь погладить { $target }, но { $target } встает в полный рост, затрудняя такую возможность.
+petting-failure-gorilla = Вы тянетесь погладить { $target }, но { $target } встаёт в полный рост, затрудняя такую возможность.
diff --git a/Resources/Locale/ru-RU/corvax/job/job-names.ftl b/Resources/Locale/ru-RU/corvax/job/job-names.ftl
new file mode 100644
index 00000000000..e0fba081bfb
--- /dev/null
+++ b/Resources/Locale/ru-RU/corvax/job/job-names.ftl
@@ -0,0 +1,4 @@
+job-name-iaa = агент внутренних дел
+JobIAA = агент внутренних дел
+job-name-pilot = пилот
+JobPilot = пилот
diff --git a/Resources/Locale/ru-RU/corvax/lathe/lathe-categories.ftl b/Resources/Locale/ru-RU/corvax/lathe/lathe-categories.ftl
new file mode 100644
index 00000000000..dc551fde78f
--- /dev/null
+++ b/Resources/Locale/ru-RU/corvax/lathe/lathe-categories.ftl
@@ -0,0 +1,10 @@
+lathe-category-reports = Отчёты
+lathe-category-statements = Заключения
+lathe-category-inquiries-and-appeals = Запросы и обращения
+lathe-category-complaints = Жалобы
+lathe-category-permissions = Разрешения
+lathe-category-orders-and-instructions = Приказы и распоряжения
+lathe-category-orders = Заказы
+lathe-category-evidence = Свидетельства
+lathe-category-conclusions-and-decisions = Заключения и решения
+lathe-category-error = Ошибка
diff --git a/Resources/Locale/ru-RU/corvax/markings/elzuosa.ftl b/Resources/Locale/ru-RU/corvax/markings/elzuosa.ftl
index 02a49c97f64..236653914f1 100644
--- a/Resources/Locale/ru-RU/corvax/markings/elzuosa.ftl
+++ b/Resources/Locale/ru-RU/corvax/markings/elzuosa.ftl
@@ -1,9 +1,9 @@
-marking-EtherealPartsMElzuHornsClipped = рога (вросшие)
+marking-EtherealPartsMElzuHornsClipped = рога (вросшие)
marking-EtherealPartsMElzuHornsClipped-ethereal_parts_m_elzu_horns_clipped_ADJ = рога
-marking-EtherealPartsMElzuHornsClipped-ethereal_parts_m_elzu_horns_clipped_FRONT = рога (вросшие, передние)
+marking-EtherealPartsMElzuHornsClipped-ethereal_parts_m_elzu_horns_clipped_FRONT = рога (вросшие, передние)
marking-EtherealPartsMElzuHornsHelm = рога (шлем)
-marking-EtherealPartsMElzuHornsHelm-ethereal_parts_m_elzu_horns_helm_ADJ = рога (шлем)
-marking-EtherealPartsMElzuHornsHelm-ethereal_parts_m_elzu_horns_helm_FRONT = рога (шлем, передние)
+marking-EtherealPartsMElzuHornsHelm-ethereal_parts_m_elzu_horns_helm_ADJ = рога (шлем)
+marking-EtherealPartsMElzuHornsHelm-ethereal_parts_m_elzu_horns_helm_FRONT = рога (шлем, передние)
marking-EtherealPartsMElzuHornsInward = рога (загнутые назад)
marking-EtherealPartsMElzuHornsInward-ethereal_parts_m_elzu_horns_inward_ADJ = рога (загнутые назад)
marking-EtherealPartsMElzuHornsInward-ethereal_parts_m_elzu_horns_inward_FRONT = рога (загнутые назад, передние)
@@ -32,8 +32,8 @@ marking-EtherealPartsMAnimatedtailBifurcated = хвост (разделённы
marking-EtherealPartsMAnimatedtailBifurcated-ethereal_parts_m_waggingtail_bifurcated_BEHIND = хвост (разделённый, анимированный)
marking-EtherealPartsMAnimatedtailBifurcated-ethereal_parts_m_waggingtail_bifurcated_FRONT = хвост (разделённый, анимированный, кончик)
marking-EtherealPartsMAnimatedtailLong = хвост (длинный, анимированный)
-marking-EtherealPartsMAnimatedtailLong-ethereal_parts_m_waggingtail_long_BEHIND = хвост (длинный, анимированный)
-marking-EtherealPartsMAnimatedtailLong-ethereal_parts_m_waggingtail_long_FRONT = хвост (длинный, анимированный, кончик)
+marking-EtherealPartsMAnimatedtailLong-ethereal_parts_m_waggingtail_long_BEHIND = хвост (длинный, анимированный)
+marking-EtherealPartsMAnimatedtailLong-ethereal_parts_m_waggingtail_long_FRONT = хвост (длинный, анимированный, кончик)
marking-EtherealPartsMAnimatedtailStubby = хвост (коренастый, анимированный)
marking-EtherealPartsMAnimatedtailStubby-ethereal_parts_m_waggingtail_stubby_BEHIND = хвост (коренастый, анимированный)
marking-EtherealPartsMAnimatedtailStubby-ethereal_parts_m_waggingtail_stubby_FRONT = хвост (коренастый, анимированный, кончик)
diff --git a/Resources/Locale/ru-RU/corvax/metabolism/metabolizer-types.ftl b/Resources/Locale/ru-RU/corvax/metabolism/metabolizer-types.ftl
new file mode 100644
index 00000000000..cc216aa6916
--- /dev/null
+++ b/Resources/Locale/ru-RU/corvax/metabolism/metabolizer-types.ftl
@@ -0,0 +1 @@
+metabolizer-type-elzuosa = Elzuosa
diff --git a/Resources/Locale/ru-RU/corvax/paper/book-busido.ftl b/Resources/Locale/ru-RU/corvax/paper/book-busido.ftl
index 820485d3bcb..62b5f1e655d 100644
--- a/Resources/Locale/ru-RU/corvax/paper/book-busido.ftl
+++ b/Resources/Locale/ru-RU/corvax/paper/book-busido.ftl
@@ -46,7 +46,7 @@ book-text-busido =
Если же он тяжело ранен, так, что ни один лекарь уже не может помочь ему, то, как и положено самураю, он должен, будучи ещё в сознании, ответить на вопросы командиров и товарищей и сообщить им, как он получил ранение, после чего спокойно, без всяких церемоний, встретить смерть.
Хотя самурай должен прежде всего чтить Путь Самурая, не вызывает сомнений, что все мы небрежительны. Поэтому, если в наши дни спросить: "В чём подлинный смысл Пути Самурая?", лишь немногие ответят без промедления.
- А все потому, что никто заранее не готовит себя к ответу на такие вопросы. Это свидетельствует о том, что люди забывают о Пути. Небрежение опасно.
+ А всё потому, что никто заранее не готовит себя к ответу на такие вопросы. Это свидетельствует о том, что люди забывают о Пути. Небрежение опасно.
Я постиг, что Путь Самурая — это смерть.
diff --git a/Resources/Locale/ru-RU/corvax/paper/doc-printer.ftl b/Resources/Locale/ru-RU/corvax/paper/doc-printer.ftl
new file mode 100644
index 00000000000..f02fb484967
--- /dev/null
+++ b/Resources/Locale/ru-RU/corvax/paper/doc-printer.ftl
@@ -0,0 +1,1253 @@
+doc-text-printer-report-station =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ-ЦК[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ОТЧЁТ О СИТУАЦИИ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Цель:
+ Статус выполнения цели:
+ Код уровня угрозы:
+ Причина установления кода:
+ Активные угрозы:
+ Потери среди экипажа:
+ Текущая ситуация:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-report-on-elimination-of-violations =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ОТЧЁТ ОБ УСТРАНЕНИИ НАРУШЕНИЙ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), отчитываюсь об устранении нарушений в работе, выявленных (ФИО), в должности (полное наименование должности).
+ Предъявленные нарушения:
+
+ Причина нарушений:
+
+ Проведённые мероприятия по устранению нарушений:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-report-department =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ОТЧЁТ О РАБОТЕ ОТДЕЛА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Количество сотрудников в отделе:
+ Количество стажёров:
+ Неактивные сотрудники отдела:
+ ФИО, должность, причина
+ Степень готовности цели:
+ Общее состояние отдела:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-report-employee-performance =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ПД-КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ОТЧЁТ О РАБОТЕ СОТРУДНИКА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименования должности), в ходе исполнения своих обязанностей выполнил положенный объём работ. Прошу принять результат работ Главой отдела (наименование отдела).
+ Произведённые работы:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-report-on-the-chapters-meeting =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ОТЧЁТ О СОБРАНИИ ГЛАВ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Причина созыва Собрания Глав:
+ Формулировка поставленного перед Главами вопроса:
+ Количество голосов «За»:
+ Проголосовавшие «За»:
+
+ Количество голосов «Против»:
+ Проголосовавшие «Против»:
+
+ Количество воздержавшихся от голосования:
+ Воздержавшиеся от голосования:
+
+ Решение Собрания Глав:
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-internal-affairs-agents-report =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ЮР-КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ОТЧЁТ О ВНУТРЕННЕМ РАСЛЕДОВАНИИ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности Агента Внутренних Дел, в ходе внутренней проверки, запрошенной (ФИО), в должности (полное наименование должности) по причине (причина проверки) выявил следующие нарушения:
+
+ Также хочу сообщить о следующем:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-condition-report =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ИНЖ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ОТЧЁТ О ТЕХНИЧЕСКОМ СОСТОЯНИИ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Была произведена проверка (название системы или объекта), результаты проверки были проанализированы, был проведён анализ причин возникновения нестабильной работы объекта.
+ Причина поломки объекта:
+
+ Выявленные повреждения объекта:
+
+ Произведённый ремонт объекта:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-Report-study-object =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОД[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ОТЧЁТ ОБ ИЗУЧЕНИИ ОБЪЕКТА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Для проведения экспертизы было представлено (кто или какой отдел передал объект) приспособление с неизученными свойствами. В ходе экспертизы объект был изучен, были установлены свойства объекта и его видовая принадлежность.
+ Внешнее описание объекта:
+
+ Выявленные свойства объекта:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-experiment-report =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 НИО[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ОТЧЁТ ОБ ЭКСПЕРИМЕНТЕ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Внешнее описание объекта эксперимента:
+
+ Экспериментатор(-ы):
+
+ Эксперимент №...
+ Описание эксперимента:
+
+ Ожидаемый результат:
+
+ Используемое оборудование:
+
+ Фактический результат:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-disposal-report =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 СНБ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ОТЧЁТ ОБ УТИЛИЗАЦИИ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Отделом Снабжения была произведена утилизация объектов при (метод утилизации). В ходе утилизации были обнаружены ценные предметы и вещи, ценные предметы были переданы в соответствующие отделы для их использования.
+ Перечень найденных вещей:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-application-appointment-interim =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАЯВЛЕНИЕ О НАЗНАЧЕНИИ НА ВРИО
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), прошу согласовать моё назначение на должность временно исполняющего обязанности Главы (полное наименование отдела)/Капитана.
+ При вступлении в должность обязуюсь следовать Стандартным Рабочим Процедурам и до появления Главы (полное наименование отдела)/Капитана с Центрального Командования обеспечивать порядок и управление отделом, обеспечивать сохранность вверяемых мне особо ценных предметов и снаряжения.
+
+ По прибытии Главы отдела/Капитана с Центрального Командования обязуюсь сдать повышенный доступ, особо ценные предметы и снаряжение.
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-application-employment =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ПД-КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАЯВЛЕНИЕ О ТРУДОУСТРОЙСТВЕ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в текущей должности (полное наименование должности), прошу назначить меня сотрудником (название отдела трудоустройства) в должности (полное наименование должности).
+ Обязуюсь следовать Стандартным Рабочим Процедурам отдела. Обязуюсь сдать рабочее снаряжение и экипировку отдела при переводе.
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-letter-resignation =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ПД-КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАЯВЛЕНИЕ ОБ УВОЛЬНЕНИИ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в текущей должности (полное наименование должности), хочу уволится с отдела (название отдела) по причине (причина).
+ Обязуюсь заплатить штраф, установленный условиями расторжения срочного/бессрочного контракта, на станции Центрального Командования.
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-application-access =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ПД-КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАЯВЛЕНИЕ НА ПОЛУЧЕНИЕ ДОСТУПА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), прошу предоставить мне следующие доступы:
+
+ Причина получения повышенного доступа:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-application-equipment =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ПД-КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАЯВЛЕНИЕ НА ПОЛУЧЕНИЕ СНАРЯЖЕНИЯ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное название должности), прошу выдать мне следующее снаряжение отдела (наименование отдела)/личное снаряжение:
+
+ Причина получения снаряжения:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-appeal =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ПД-КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ОБРАЩЕНИЕ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), прошу рассмотреть (ФИО), в должности (полное наименование должности) моё обращение.
+ Содержание обращения:
+
+ Причины его написания:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-evacuation-shuttle-request =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ-ЦК[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАПРОС ЭВАКУАЦИОННОГО ШАТТЛА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Уважаемое Центральное Командование! Я, (ФИО), в должности (полное наименование должности), прошу запустить протоколы эвакуации и прислать эвакуационный шаттл, приняв решение об окончании смены.
+ Причина окончания смены:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-shuttle-registration-request =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ-ЦК[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАПРОС РЕГИСТРАЦИИ ШАТТЛА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), прошу провести регистрацию шаттла в системе NanoTrasen для идентификации.
+ Размеры шаттла:
+
+ Класс шаттла:
+
+ Ответственный за постройку:
+
+ Запрашиваемое наименование:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-request-call-members-central-committee-dso =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ-ЦК[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАПРОС НА ВЫЗОВ ЧЛЕНОВ ЦК, ДСО
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), прошу рассмотреть возможность вызова на станцию:
+
+ Причина вызова:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-request-to-establish-threat-level =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ-ЦК[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАПРОС УСТАНОВЛЕНИЯ УРОВНЯ УГРОЗЫ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), прошу рассмотреть возможность установления на станции уровня угрозы:
+
+ Причина установления кода:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-request-change-salary =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ-ЦК[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАПРОС НА ИЗМЕНЕНИЕ ЗАРАБОТНОЙ ПЛАТЫ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), прошу рассмотреть возможность повышения/понижения заработной платы на (сумма или количество процентов) сотруднику (ФИО) в должности (полное название должности)/отделу (наименование отдела)/текущей смене.
+ Причина повышения/понижения заработной платы:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-request-for-non-listed-employment =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ-ЦК[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАПРОС ВНЕПЕРЕЧНЕВОГО ТРУДОУСТРОЙСТВА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), прошу рассмотреть возможность принятия в рабочий штат текущей смены (ФИО) на внеперечневую должность.
+ Полное наименование должности:
+
+ Ответственный за работника глава или сотрудник:
+
+ Выполняемые работы в должности (СРП):
+
+ Предоставляемые доступы работнику:
+
+ Причина трудоустройства:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-request-for-promotion =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ-ЦК[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАПРОС ПОВЫШЕНИЯ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), прошу рассмотреть возможность повышения (ФИО), в должности (полное наименование должности), согласно иерархии командования. Сотрудник получил необходимую для данной работы квалификацию.
+ Запрашиваемая должность:
+
+ Ответственный за работника глава или сотрудник:
+
+ Причина повышения:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-request-documents =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ЮР-КОД[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАПРОС ПРЕДОСТАВЛЕНИЯ ДОКУМЕНТОВ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности Агента Внутренних Дел, прошу предоставить для проверки соответствия Корпоративному Закону копию/оригинал документов:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-request-euthanasia =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ПД-МЕД[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАПРОС НА ПРОВЕДЕНИЕ ЭВТАНАЗИИ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), прошу содействие медицинского отдела в проведении эвтаназии в качестве врачебного лечения по причине (указать причину запроса). С последствиями данного решения ознакомлен, медицинским персоналом была установлена рациональность и гуманность данного решения. Претензий к к медицинскому отделу при соблюдении ими протоколов эвтаназии не имею.
+ По окончании процедуры прошу утилизировать тело путём (способ утилизации) при наличии на это возможности.
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-request-construction-work =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОД-ИНЖ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАПРОС НА ПРОВЕДЕНИЕ СТРОИТЕЛЬНЫХ РАБОТ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), прошу провести строительные работы в (название отдела или объекта) по причине (причина запроса).
+ Перечень строительных работ:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-request-modernization =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОД-НИО[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАПРОС НА ПРОВЕДЕНИЕ МОДЕРНИЗАЦИИ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), прошу модернизировать приборы в (название отдела или объекта) по причине (причина запроса).
+ Перечень модернизации:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-complaint-violation-labor-rules =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ПД-ЮР[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЖАЛОБА НА НАРУШЕНИЕ ТРУДОВОГО ПОРЯДКА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), считаю, что в ходе работы отдела (наименование отдела) были допущены следующие нарушения:
+
+ Прошу провести внутреннюю проверку по данным фактам нарушений.
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-complaint-offense =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ПД-СБ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЖАЛОБА НА ПРАВОНАРУШЕНИЕ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), считаю, что (ФИО), в должности (полное наименование должности), нарушил Корпоративный Закон, потому что (причина).
+ Произошедшее с моей точки зрения:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-permission-equipment =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ РАЗРЕШЕНИЕ НА ИСПОЛЬЗОВАНИЕ СНАРЯЖЕНИЯ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности главы отдела (полное наименование отдела), разрешаю использовать (ФИО) в должности (полное наименование должности) следующее рабочее снаряжение отдела:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-permission-to-travel-in-case-of-threat =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ РАЗРЕШЕНИЕ НА ПЕРЕДВИЖЕНИЕ ПРИ УГРОЗЕ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), разрешаю сотруднику (ФИО) в должности (полное наименование должности) передвижение по станции с целью выполнения им рабочих обязанностей.
+ Уровни кодов угроз, при которых даётся данное разрешение:
+
+ Разрешённые части станции для местонахождения сотрудника (можно указать всю станцию):
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-search-permission =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 СБ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ РАЗРЕШЕНИЕ НА ОБЫСК
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), разрешаю произвести обыск (ФИО)/(полное наименование отдела), в должности (полное наименование должности).
+ Причина обыска:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-permission-to-carry-weapons =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 СБ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ РАЗРЕШЕНИЕ НА НОШЕНИЕ ОРУЖИЯ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), разрешаю ношение оружия (ФИО), в должности (полное наименование должности), до тех пор, пока оно используется по назначению. В случае нарушения разрешение аннулируется, оружие изымается Службой Безопасности.
+ Оружие и тип патронов к нему:
+
+ Способ получения оружия и патронов к нему:
+
+ Причина выдачи разрешения:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-prescription-drug-authorization =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 МЕД-ПД[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ РАЗРЕШЕНИЕ НА РЕЦЕПТУРНЫЙ ПРЕПАРАТ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), разрешаю хранение и использование рецептурного препарата или наркотического препарата "(полное наименование вещества)" пациенту (ФИО), в должности (полное наименование должности).
+ Поставленный диагноз:
+
+ Причина выдачи препарата:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-permission-dispose-body =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 МЕД[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ РАЗРЕШЕНИЕ НА УТИЛИЗАЦИЮ ТЕЛА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), разрешаю утилизировать тело (ФИО), в должности (полное наименование должности) в связи с невозможностью его реанимации и клонирования.
+ Способ утилизации:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-construction-permit =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ИНЖ-КОД[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ РАЗРЕШЕНИЕ НА СТРОИТЕЛЬСТВО
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), разрешаю произвести (ФИО), в должности (полное наименование должности), перепланировку части станции (указание места перепланировки) по причине (причина перепланировки).
+ Согласованный объём перепланировки:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-permission-to-extend-marriage =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ПД-СРВ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ РАЗРЕШЕНИЕ НА РАСШИРЕНИЕ БРАКА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), даю своё разрешение на расширение брака, заключённого между:
+ (ФИО), в должности (полное наименование должности)
+ ⠀...
+ (ФИО), в должности (полное наименование должности)
+ ⠀Для вступления в данный брак новых супругов:
+ (ФИО), в должности (полное наименование должности)
+ ⠀...
+ (ФИО), в должности (полное наименование должности)
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-order-dismissal =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ПРИКАЗ ОБ УВОЛЬНЕНИИ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), приказываю уволить сотрудника (ФИО) отдела (наименование отдела) в должности (полное наименование должности увольняемого) по причине:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-order-deprivation-access =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ПРИКАЗ О ЛИШЕНИИ ДОСТУПА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), приказываю лишить сотрудника (ФИО) в должности (полное наименование должности) следующего доступа(-ов):
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-order-encouragement =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ПРИКАЗ О ПООЩРЕНИИ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности) награждаю (ФИО) в должности (полное наименование должности награждаемого) медалью/грамотой/памятной вещью/премией в размере (размер премии) за следующие заслуги:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-order-parole-prisoner =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 СБ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ПРИКАЗ ОБ УДО ЗАКЛЮЧЕННОГО
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), разрешаю освободить заключённого под стражу (ФИО) в бриг/пермабриг. После выдачи условно-досрочного заключения заключённому под стражу будет выдана гражданская профессия с обязательной работой до конца смены.
+ Выдаваемая профессия:
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-order-recognizing-rentience-creature =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 НИО[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ПРИКАЗ О ПРИЗНАНИИ РАЗУМНОСТИ СУЩЕСТВА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ В ходе тестирования существа были выявлены признаки высшей мозговой деятельности и разумности данного существа, его способность мыслить, обучаться, понимание морали, наличие здравого смысла в поступках. Таким образом я, (ФИО), в должности (полное наименование должности), исходя из принципов равенства прав всех разумных существ, установленного ОПРС, признаю данное существо разумным.
+ Внешний вид существа:
+
+ Устанавливаемое полное имя существа:
+
+ Существо принято/не принято в качестве пассажира станции до окончания смены.
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-order-medical-intervention =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОД-МЕД[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ РАСПОРЯЖЕНИЕ О МЕДИЦИНСКОМ ВМЕШАТЕЛЬСТВЕ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), распоряжаюсь провести медицинское вмешательство с целью (описание цели медицинского вмешательства), в отношении (ФИО) в должности (полное наименование должности).
+ Основание для проведения операции:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-product-manufacturing-order =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОД-КОД[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАКАЗ НА ПРОИЗВОДСТВО ПРОДУКТА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), прошу произвести продукцию отделом (наименование отдела).
+ Перечень необходимых продуктов:
+
+ Причина заказа:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-order-purchase-resources-equipment =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОД-СНБ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАКАЗ НА ЗАКУПКУ РЕСУРСОВ, СНАРЯЖЕНИЯ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Перечень товаров для заказа:
+
+ Место доставки товара:
+
+ Причина:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-ordering-special-equipment =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ-ЦК[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАКАЗ СПЕЦИАЛЬНОГО СНАРЯЖЕНИЯ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), прошу предоставить специальное снаряжение станции от Центрального Командования.
+ Перечень запрашиваемого снаряжения:
+
+ Причина запроса:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-order-purchase-weapons =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 СБ-СНБ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАКАЗ НА ЗАКУПКУ ВООРУЖЕНИЯ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), произвожу заказ боевого оружия и (или) боевых приспособлений через отдел Снабжения.
+ Причина заказа:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-certificate =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ-ПД[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ГРАМОТА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ (ФИО), в должности (полное наименование должности) награждается грамотой за следующие заслуги:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-certificate-advanced-training =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ СВИДЕТЕЛЬСТВО О ПОВЫШЕНИИ КВАЛИФИКАЦИИ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности главы отдела (полное наименование отдела), свидетельствую, что сотрудник (ФИО) в должности (должность сотрудника), успешно завершил образовательный курс "(название курса)" и был аттестован.
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-certificate-offense =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ПД-СБ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ СВИДЕТЕЛЬСТВО О ПРАВОНАРУШЕНИИ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), свидетельствую о правонарушениях/самолично признаюсь в совершении правонарушений, предусмотренных статьями:
+ (перечисление статей)
+ По данному инциденту могу пояснить следующее.
+ Место преступления:
+ Мотивы совершения преступления:
+ Против кого было совершено преступление:
+ Характер и размер вреда, причинённого преступлением:
+ Пособники в преступлении:
+ Полная хронология событий:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-death-certificate =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 МЕД[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ СВИДЕТЕЛЬСТВО О СМЕРТИ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ ФИО умершего:
+ Должность умершего:
+ Раса:
+ Пол:
+ Причина смерти:
+ Возможность проведения реанимации или клонирования:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-marriage-certificate =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 СРВ-ПД[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ СВИДЕТЕЛЬСТВО О ЗАКЛЮЧЕНИИ БРАКА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), заключаю брак между:
+ ⠀(ФИО), в должности (полное наименование должности)
+ ⠀...
+ ⠀(ФИО), в должности (полное наименование должности)
+ После заключения брака брачующимся были присвоены следующие полные имена:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-divorce-certificate =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 СРВ-ПД[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ СВИДЕТЕЛЬСТВО О РАСТОРЖЕНИИ БРАКА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), расторгаю брак между:
+ (ФИО), в должности (полное наименование должности)
+ ⠀...
+ (ФИО), в должности (полное наименование должности)
+ После расторжения брака бывшим супругам были присвоены следующие полные имена:
+
+ Разделение имущества было произведено следующим образом:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-closing-indictment =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 СБ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ОБВИНИТЕЛЬНОЕ ЗАКЛЮЧЕНИЕ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), разрешаю произвести арест (ФИО), в должности (полное наименование должности) в связи с подозрением в совершении данным лицом следующих правонарушений:
+
+ В ходе предварительного следствия были обнаружены доказательства, указывающие на совершение правонарушения данным лицом.
+ Прямые доказательства:
+
+ Косвенные доказательства:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-sentence =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 СБ[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ПРИГОВОР
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное название должности), выношу приговор согласно данным мне полномочиям в отношении (ФИО), в должности (полное название должности).
+ Данное лицо нарушило следующие статьи Корпоративного Закона:
+ (перечисление статей)
+ С учётом всех смягчающих и отягчающих обстоятельств, правовое наказание данного лица представлено в виде:
+ (суммарный срок, пожизненно заключение, либо приговор к казни)
+ Административное наказание:
+ (понижение в должности, увольнение)
+ Срок заключения под стражу отсчитывается с: (время начала заключения)
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-judgment =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ЮР[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ СУДЕБНОЕ РЕШЕНИЕ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), выношу решение по судебному разбирательству в отношении (ФИО), в должности (полное наименование должности).
+ Предъявляемые правонарушения:
+
+ Решение приговора Службы Безопасности:
+
+ Проведённое до судебного разбирательства время ареста:
+
+ Данное лицо нарушило следующие статьи Корпоративного Закона:
+ (перечисление статей)
+ С учётом всех смягчающих и отягчающих обстоятельств, правовое наказание данного лица представлено в виде:
+ (суммарный срок, пожизненно заключение, либо приговор к казни)
+ Административное наказание:
+ (понижение в должности, увольнение)
+ Срок заключения под стражу отсчитывается с:
+ (время начала заключения)
+ Моё решение обосновано (тем, что):
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-statement-health =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 МЕД-ПД[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ ЗАКЛЮЧЕНИЕ О СОСТОЯНИИ ЗДОРОВЬЯ
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Пациент (ФИО), в должности (полное наименование должности), был направлен на медицинское обследование в связи с (причина прохождения обследования). Был произведён полный осмотр пациента, проведены необходимые исследования и анализы.
+ Состав врачебной комиссии:
+ (ФИО врача, полное наименование должности или специализации)
+ Состояние пациента при поступлении:
+
+ Поставленный диагноз:
+
+ Психологическое состояние пациента:
+
+ Оказанное лечение в ходе госпитализации:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-decision-to-start-trial =
+ ⠀[color=#1b487e]███░███░░░░██░░░░[/color]
+ ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]
+ ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ЮР[/bold]
+ ⠀[color=#1b487e]░░░░██░░░████░███[/color]
+ =============================================
+ РЕШЕНИЕ О НАЧАЛЕ СУДЕБНОГО ПРОЦЕССА
+ =============================================
+ Время от начала смены и дата:
+ Составитель документа:
+ Должность составителя:
+
+ Я, (ФИО), в должности (полное наименование должности), сообщаю о начале судебного разбирательства по делу (ФИО) в связи со сложностью и неоднозначностью дела.
+ Предъявляемые правонарушения:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-error-loading-form-header =
+ ⠀[color=#B50F1D] ███░██████░███[/color]
+ ⠀[color=#B50F1D] █░░░██░░░░░░░█[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#B50F1D] █░░░░████░░░░█[/color] [head=3]Syndicate[/head]
+ ⠀[color=#B50F1D] █░░░░░░░██░░░█[/color] [bold]Station XX-000 СИН[/bold]
+ ⠀[color=#B50F1D] ███░██████░███[/color]
+ =============================================
+ НАИМЕНОВАНИЕ ДОКУМЕНТА
+ =============================================
+ Время от начала смены и дата:
+ Позывной Агента:
+
+ Полное содержание документа со всей необходимой информацией и описанием
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-notice-of-liquidation =
+ ⠀[color=#B50F1D] ███░██████░███[/color]
+ ⠀[color=#B50F1D] █░░░██░░░░░░░█[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#B50F1D] █░░░░████░░░░█[/color] [head=3]Syndicate[/head]
+ ⠀[color=#B50F1D] █░░░░░░░██░░░█[/color] [bold]Station XX-000 СИН-ПД[/bold]
+ ⠀[color=#B50F1D] ███░██████░███[/color]
+ =============================================
+ УВЕДОМЛЕНИЕ О ЛИКВИДАЦИИ
+ =============================================
+ Время от начала смены и дата:
+ Позывной агента:
+
+ Уважаемый (ФИО), в должности (полное наименование должности)! Руководством Синдиката принято решение о вашей немедленной ликвидации в ходе данной смены. Просим заранее подготовить завещание и направить его Медицинскому отделу станции. Уничтожение вашего тела будет произведено силами Синдиката.
+ Причина ликвидации:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-business-deal =
+ ⠀[color=#B50F1D] ███░██████░███[/color]
+ ⠀[color=#B50F1D] █░░░██░░░░░░░█[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#B50F1D] █░░░░████░░░░█[/color] [head=3]Syndicate[/head]
+ ⠀[color=#B50F1D] █░░░░░░░██░░░█[/color] [bold]Station XX-000 СИН-КОМ[/bold]
+ ⠀[color=#B50F1D] ███░██████░███[/color]
+ =============================================
+ ДЕЛОВАЯ СДЕЛКА
+ =============================================
+ Время от начала смены и дата:
+ Позывной агента:
+
+ Синдикат любезно предлагает заключить сделку между станцией и агентом (позывной агента). Со стороны станции необходимо:
+
+ Причина выполнения условий сделки:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-note-beginning-military-actions =
+ ⠀[color=#B50F1D] ███░██████░███[/color]
+ ⠀[color=#B50F1D] █░░░██░░░░░░░█[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#B50F1D] █░░░░████░░░░█[/color] [head=3]Syndicate[/head]
+ ⠀[color=#B50F1D] █░░░░░░░██░░░█[/color] [bold]Station XX-000 СИН[/bold]
+ ⠀[color=#B50F1D] ███░██████░███[/color]
+ =============================================
+ НОТА О НАЧАЛЕ ВОЕННЫХ ДЕЙСТВИЙ
+ =============================================
+ Время от начала смены и дата:
+ Позывной агента:
+
+ Неуважаемые корпоративные крысы NanoTrasen! Синдикат официально объявляет о начале военных действий с вами, а также о начале операции по вашему истреблению.
+ Причина предъявления ноты:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
+doc-text-printer-report-accomplishment-goals =
+ ⠀[color=#B50F1D] ███░██████░███[/color]
+ ⠀[color=#B50F1D] █░░░██░░░░░░░█[/color] [head=3]Бланк документа[/head]
+ ⠀[color=#B50F1D] █░░░░████░░░░█[/color] [head=3]Syndicate[/head]
+ ⠀[color=#B50F1D] █░░░░░░░██░░░█[/color] [bold]Station XX-000 ПД-СИН[/bold]
+ ⠀[color=#B50F1D] ███░██████░███[/color]
+ =============================================
+ ОТЧЁТ О ВЫПОЛНЕНИИ ЦЕЛЕЙ
+ =============================================
+ Время от начала смены и дата:
+ Позывной агента:
+
+ Я, (позывной агента), успешно выполнил поставленные передо мной руководством Синдиката цели. Прошу принять отчёт о выполнении.
+ Отчёт:
+
+ =============================================
+ ⠀[italic]Место для печатей[/italic]
diff --git a/Resources/Locale/ru-RU/corvax/paper/stamp-component.ftl b/Resources/Locale/ru-RU/corvax/paper/stamp-component.ftl
new file mode 100644
index 00000000000..77bb04bc9e1
--- /dev/null
+++ b/Resources/Locale/ru-RU/corvax/paper/stamp-component.ftl
@@ -0,0 +1,2 @@
+stamp-component-stamped-name-iaa = Агент внутренних дел
+stamp-component-stamped-name-psychologist = Психолог
diff --git a/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl
new file mode 100644
index 00000000000..01314fe0cbc
--- /dev/null
+++ b/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl
@@ -0,0 +1,2 @@
+loadout-group-inventory = Мой инвентарь
+loadout-group-psychologist-backpack = Рюкзак психолога
diff --git a/Resources/Locale/ru-RU/corvax/preferences/loadouts.ftl b/Resources/Locale/ru-RU/corvax/preferences/loadouts.ftl
new file mode 100644
index 00000000000..d79788a2b43
--- /dev/null
+++ b/Resources/Locale/ru-RU/corvax/preferences/loadouts.ftl
@@ -0,0 +1 @@
+loadout-sponsor-only = [color=yellow]Доступно только спонсорам.[/color]
diff --git a/Resources/Locale/ru-RU/corvax/reagents/bilogical.ftl b/Resources/Locale/ru-RU/corvax/reagents/bilogical.ftl
index 069e136ee24..0e864fd876e 100644
--- a/Resources/Locale/ru-RU/corvax/reagents/bilogical.ftl
+++ b/Resources/Locale/ru-RU/corvax/reagents/bilogical.ftl
@@ -1,2 +1,2 @@
reagent-name-electroblood = электрокровь
-reagent-desc-electroblood = На вид искрится.
\ No newline at end of file
+reagent-desc-electroblood = На вид искрится.
diff --git a/Resources/Locale/ru-RU/corvax/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/ru-RU/corvax/reagents/meta/consumable/drink/alcohol.ftl
new file mode 100644
index 00000000000..1d70846d263
--- /dev/null
+++ b/Resources/Locale/ru-RU/corvax/reagents/meta/consumable/drink/alcohol.ftl
@@ -0,0 +1,28 @@
+reagent-name-yorsh = ёрш
+reagent-desc-yorsh = Вкус беззаботного детства.
+reagent-name-alexander = Александр
+reagent-desc-alexander = В ходе производства ни один Александр не пострадал. Наверное...
+reagent-name-daiquiri = дайкири
+reagent-desc-daiquiri = Хотите почувствовать себя шахтёром из 19-го века? Шахтёр не хотел, поэтому предпочёл забыться в алкоголе.
+reagent-name-campari = кампари
+reagent-desc-campari = Настойка на основе ароматических трав и цитрусовых. Без ГМО!
+reagent-name-negroni = негрони
+reagent-desc-negroni = Американо для алкоголиков.
+reagent-name-espressoMartini = эспрессо мартини
+reagent-desc-espressoMartini = Разбуди меня и тра... Э-э-э... Ладно, просто разбуди.
+reagent-name-oldFashioned = олд фэшен
+reagent-desc-oldFashioned = Как сказал величайший классик: "Это классика".
+reagent-name-badTouch = проникновение
+reagent-desc-badTouch = Входит... И выходит... И входит... Замечательно выходит!
+reagent-name-darkAndStormy = тьма и буря
+reagent-desc-darkAndStormy = Прямиком с Бермудских Островов! Пират слева говорит, что именно поэтому напиток и пропадает с барной стойки.
+reagent-name-bramble = брамбл
+reagent-desc-bramble = Ягодки, джин, и довольно стрёмный вид.
+reagent-name-maiTai = май тай
+reagent-desc-maiTai = Первый человек, попробовавший этот коктейль, воскликнул: ”Mai tai — roa ae!”. Что в переводе с тайского означает... Да откуда мне знать? Звучит круто!
+reagent-name-moscowMule = московский мул
+reagent-desc-moscowMule = Коктейль из США. Почему Московский? Потому что водка. Водка Московская? Нет. Так почему Московский? ВОДКА!
+reagent-name-paloma = палома
+reagent-desc-paloma = Сверху ковбои. Снизу маракасы. Что же выбрать?
+reagent-name-boyarsky = Боярский
+reagent-desc-boyarsky = Что делать, если ты устал от жизни? СМЕШИВАТЬ ВОДКУ!
diff --git a/Resources/Locale/ru-RU/corvax/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/ru-RU/corvax/reagents/meta/consumable/drink/drinks.ftl
new file mode 100644
index 00000000000..adbd8cc7468
--- /dev/null
+++ b/Resources/Locale/ru-RU/corvax/reagents/meta/consumable/drink/drinks.ftl
@@ -0,0 +1,2 @@
+reagent-name-kvass = квас
+reagent-desc-kvass = Прохладный освежающий напиток со вкусом социализма.
diff --git a/Resources/Locale/ru-RU/corvax/species/species.ftl b/Resources/Locale/ru-RU/corvax/species/species.ftl
index 7b0f845b10d..5ec7d16784e 100644
--- a/Resources/Locale/ru-RU/corvax/species/species.ftl
+++ b/Resources/Locale/ru-RU/corvax/species/species.ftl
@@ -1,3 +1 @@
-species-name-xenoslime = Ксенослайм
-species-name-elzuosa = Эльзуос
-species-name-resomi = Резоми
\ No newline at end of file
+species-name-vulpkanin = Вульпканин
diff --git a/Resources/Locale/ru-RU/corvax/station-goal/station-goal-component.ftl b/Resources/Locale/ru-RU/corvax/station-goal/station-goal-component.ftl
index 19b67f33951..3fd07abf2ac 100644
--- a/Resources/Locale/ru-RU/corvax/station-goal/station-goal-component.ftl
+++ b/Resources/Locale/ru-RU/corvax/station-goal/station-goal-component.ftl
@@ -1,4 +1,4 @@
-station-goal-fax-paper-name = Цель станции
+station-goal-fax-paper-name = бумага
station-goal-shuttle =
Цель вашей смены построить пилотируемый шаттл в космосе и обеспечить его всем необходимым для выживания.
Чтобы её выполнить отделу снабжения нужно заказать все необходимые ресурсы для инженерного и научного отделов.
@@ -10,7 +10,7 @@ station-goal-singularity =
station-goal-solar-panels =
Цель вашей смены организовать систему запасного питания для станции на основе солнечных панелей.
Для этого вам понадобится заказать все необходимые материалы в отделе снабжения и после построить 2 новые ветки солнечных панелей инженерным отделом.
- А так же обеспечить изолированность производимой ими энергии в новые 3 СМЭСа не подключенные к общей сети станции.
+ А так же обеспечить изолированность производимой ими энергии в новые 3 СМЭСа не подключённые к общей сети станции.
station-goal-artifacts =
Цель вашей смены обнаружить, исследовать и доставить космические артефакты.
Для её выполнения будет необходима работа утилизаторов для поиска и доставки артефактов с обломков вокруг станции.
@@ -29,10 +29,28 @@ station-goal-bank =
В хранилище необходимо разместить 4 ящика:
- ящик с продвинутыми медикаментами
- ящик с запасами лучших семян
- - ящик-холодильник еды с высокой питательной ценностью
+ - ящик-холодильник еды с высокой питательной ценностью
- ящик с ценными, но не уникальными платами
Проследите за сохранностью содержимого в хранилище до окончания смены.
station-goal-zoo =
Цель вашей смены улучшить рекреацию персонала на станции.
- Инженерному отделу необходимо построить зоопарк в недалекой доступности от дорматориев с как минимум тремя вольерами разных видов животных заказанных в отделе снабжения.
+ Инженерному отделу необходимо построить зоопарк в недалёкой доступности от дорматориев с как минимум тремя вольерами разных видов животных заказанных в отделе снабжения.
Обеспечьте животных пищей, как минимум одним роботом уборщиком в каждый вольер и всем необходимым для жизни в зависимости от вида животного.
+station-goal-mining-outpost =
+ Цель вашей смены постройка орбитального шахтёрского аванпоста для добычи руды и ресурсов с астероидов.
+ Аванпост должен быть размещён в космосе отдельно от основной станции.
+ Проследите за прочностью его конструкции, случайный метеорит не должен повредить его.
+ Аванпост должен иметь следующее:
+ - автономный, бесперебойный источник электроэнергии
+ - генератор гравитации
+ - оборудование для проведения работ, в частности кирки, сумки для руды и 2 шахтёрских скафандра
+ - комнаты для проживания 2 человек, с атмосферой, освещением и окнами
+ - склад для добытых ресурсов и необходимых для жизни продуктов
+ - Минимум 500 единиц пива и ящик-холодильник закусок
+ - 4 набора медикаментов от механического урона
+ - 4 набора медикаментов от физического урона
+ Проследите за сохранностью аванпоста до окончания смены.
+station-goal-tesla =
+ Цель вашей смены построить генератор основанный на высоковольтной Тесле.
+ Чтобы её выполнить инженерному отделу понадобится построить сдерживающую клетку, отделу снабжения потребуется заказать все необходимые материалы.
+ Сдерживающая клетка должна быть способна сдерживать теслу без риска разрушения эмиттеров.
diff --git a/Resources/Locale/ru-RU/corvax/tts/tts-voices.ftl b/Resources/Locale/ru-RU/corvax/tts/tts-voices.ftl
index 0189988d766..b9dc9ce4b96 100644
--- a/Resources/Locale/ru-RU/corvax/tts/tts-voices.ftl
+++ b/Resources/Locale/ru-RU/corvax/tts/tts-voices.ftl
@@ -593,3 +593,92 @@ tts-voice-name-ember = Ember (Dota 2)
tts-voice-name-ycf = Йцф (Проклятые земли)
tts-voice-name-nick = Ник (Left 4 Dead)
tts-voice-name-hjalmar = Хьялмар (Ведьмак)
+tts-voice-name-portal_cave_johnson = Кейв Джонсон (Portal)
+tts-voice-name-Ninja_Turtles_shredder = Шреддер (Черепашки-ниндзя)
+tts-voice-name-Star_Wars_Han_Solo = Хан Соло (Звёздные войны)
+tts-voice-name-Star_Wars_Darth_Sidious = Дарт Сидиус (Звёздные войны)
+tts-voice-name-Star_Wars_Luke_Skywalker = Люк Скайуокер (Звёздные войны)
+tts-voice-name-Star_Wars_Yoda = Йода (Звёздные войны)
+tts-voice-name-Star_Wars_Darth_Vader = Дарт Вейдер (Звёздные войны)
+tts-voice-name-Star_Wars_Obi-Wan_Kenobi = Оби-Ван Кеноби (Звёздные войны)
+tts-voice-name-Star_Wars_Anakin_Skywalker = Энакин Скайуокер (Звёздные войны)
+tts-voice-name-Transformers_War_of_Cybertron_optimusprime = Оптимус Прайм (Трансформеры)
+tts-voice-name-Transformers_War_of_Cybertron_megatron = Мегатрон (Трансформеры)
+tts-voice-name-Transformers_War_of_Cybertron_soundwave = Саундвейв (Трансформеры)
+tts-voice-name-The_Lord_of_the_Rings_Aragorn = Арагорн (Властелин Колец)
+tts-voice-name-The_Lord_of_the_Rings_Elrond = Элронд (Властелин Колец)
+tts-voice-name-The_Lord_of_the_Rings_Gandalf = Гэндальф (Властелин Колец)
+tts-voice-name-The_Lord_of_the_Rings_Gimli = Гимли (Властелин Колец)
+tts-voice-name-The_Lord_of_the_Rings_Gollum = Голлум (Властелин Колец)
+tts-voice-name-The_Lord_of_the_Rings_Legolas = Леголас (Властелин Колец)
+tts-voice-name-Srek_Gingerbread_Man = Пряня (Шрэк)
+tts-voice-name-Srek_Fiona = Фиона (Шрэк)
+tts-voice-name-Srek_Donkey = Осёл (Шрэк)
+tts-voice-name-Srek_Fairy_Godmother = Фея-Крёстная (Шрэк)
+tts-voice-name-Srek_King = Король (Шрэк)
+tts-voice-name-Srek_Narrator = Рассказчик (Шрэк)
+tts-voice-name-Srek_Puss_in_Boots = Кот в сапогах (Шрэк)
+tts-voice-name-Srek_Shrek = Шрэк (Шрэк)
+tts-voice-name-Pirats_of_the_caribbean_Jack_Sparrow = Джек Воробей (Пираты Карибского моря)
+tts-voice-name-Pirats_of_the_caribbean_Barbossa = Барбосса (Пираты Карибского моря)
+tts-voice-name-Pirats_of_the_caribbean_Tiadalma = Тиа Дальма (Пираты Карибского моря)
+tts-voice-name-Pirats_of_the_caribbean_Davy_Jones = Дейви Джонс (Пираты Карибского моря)
+tts-voice-name-Harry_Potter_Sirius_Black = Сириус Блэк (Гарри Поттер)
+tts-voice-name-Harry_Potter_Dobby = Добби (Гарри Поттер)
+tts-voice-name-Harry_Potter_Severus_Snape_film = Северус Снейп (фильм) (Гарри Поттер)
+tts-voice-name-Harry_Potter_Harry_Potter = Гарри Поттер (Гарри Поттер)
+tts-voice-name-Harry_Potter_Albus_Dumbledore = Альбус Дамблдор (Гарри Поттер)
+tts-voice-name-Harry_Potter_Lord_Voldemort = Волан Де Морт (Гарри Поттер)
+tts-voice-name-Harry_Potter_Severus_Snape = Северус Снейп (Гарри Поттер)
+tts-voice-name-Harry_Potter_Filius_Flitwick = Филиус Флитвик (Гарри Поттер)
+tts-voice-name-Harry_Potter_Minerva_McGonagall = Минерва МакГонагалл (Гарри Поттер)
+tts-voice-name-Harry_Potter_Horace_Slughorn = Гораций Слизнорт (Гарри Поттер)
+tts-voice-name-Harry_Potter_Cedric = Седрик Диггори (Гарри Поттер)
+tts-voice-name-Harry_Potter_Alastor_Mad-Eye_Moody = Аластор Грюм (Гарри Поттер)
+tts-voice-name-X3_reunion_Betty = Бетти (X3)
+tts-voice-name-Overlord_2_Gnarl = Гнарл (The Overlord 2)
+tts-voice-name-Marvel_Tony_Stark = Тони Старк (Marvel)
+tts-voice-name-Dragons_Sabellian = Сабеллиан (World of Warcraft)
+tts-voice-name-Dragons_Ysera = Йсера (World of Warcraft)
+tts-voice-name-Dragons_MalygosWrath_of_the_Lich_King = Малигос (WOTLK) (World of Warcraft)
+tts-voice-name-Dragons_Ebyssian = Эбиссиан (World of Warcraft)
+tts-voice-name-Dragons_Deathwing = Смертокрыл (World of Warcraft)
+tts-voice-name-Dragons_Nozdormu = Ноздорму (World of Warcraft)
+tts-voice-name-Dragons_Malygos = Малигос (World of Warcraft)
+tts-voice-name-Draconids_Calderax = Кальдеракс (World of Warcraft)
+tts-voice-name-Draconids_Bazentus = Базентус (World of Warcraft)
+tts-voice-name-Draconids_Kazra = Казра (World of Warcraft)
+tts-voice-name-Draconids_Seltherex = Селтерекс (World of Warcraft)
+tts-voice-name-Draconids_Sendrax = Сендракс (World of Warcraft)
+tts-voice-name-Draconids_Evantkis = Эванткис (World of Warcraft)
+tts-voice-name-Draconids_Drine = Дрина (World of Warcraft)
+tts-voice-name-Draconids_Lethanak = Летанак (World of Warcraft)
+tts-voice-name-Dragons2_Wrathion_echo = Вратион (echo) (World of Warcraft)
+tts-voice-name-Dragons2_Alexstraza = Алекстраза (World of Warcraft)
+tts-voice-name-Dragons2_Kalecgos = Калесгос (World of Warcraft)
+tts-voice-name-Dragons2_Wrathion = Вратион (World of Warcraft)
+tts-voice-name-Dragons2_Kalecgos_echo = Калесгос (echo) (World of Warcraft)
+tts-voice-name-Dragons2_Alextraza_echo = Алекстраза (echo) (World of Warcraft)
+tts-voice-name-Dragons2_Neltharion_echo = Нелтарион (echo) (World of Warcraft)
+tts-voice-name-Dragons2_Wrathion_Deathwing = Вратион Смертокрыл (World of Warcraft)
+tts-voice-name-Dragons2_Neltharion = Нелтарион (World of Warcraft)
+tts-voice-name-Treasure_Island_Livsy = Ливси (Остров сокровищ)
+tts-voice-name-en_Gale = Гейл (Baldur's gate 3)
+tts-voice-name-en_Jaheira = Джахейра (Baldur's gate 3)
+tts-voice-name-en_Laezel = Лаэзель (Baldur's gate 3)
+tts-voice-name-en_Karlach = Карлах (Baldur's gate 3)
+tts-voice-name-en_Shadowheart = Шэдоухарт (Baldur's gate 3)
+tts-voice-name-en_Wyll = Уилл (Baldur's gate 3)
+tts-voice-name-en_Minthara = Минтара (Baldur's gate 3)
+tts-voice-name-en_Minsc = Минск (Baldur's gate 3)
+tts-voice-name-en_Astarion = Астарион (Baldur's gate 3)
+tts-voice-name-en_Halsin = Хальсин (Baldur's gate 3)
+tts-voice-name-en_Emperor = Император (Baldur's gate 3)
+tts-voice-name-en_Ketheric = Кетерик (Baldur's gate 3)
+tts-voice-name-en_Gortash = Горташ (Baldur's gate 3)
+tts-voice-name-slovo_patsana_brother = Адидас (Слово пацана)
+tts-voice-name-slovo_patsana_koschei = Кащей (Слово пацана)
+tts-voice-name-slovo_patsana_marat = Маратик (Слово пацана)
+tts-voice-name-slovo_patsana_angry_cop = Майор (Слово пацана)
+tts-voice-name-slovo_patsana_cop = Инспектор (Слово пацана)
+tts-voice-name-slovo_patsana_main = Пальто (Слово пацана)
diff --git a/Resources/Locale/ru-RU/damage/damage-groups.ftl b/Resources/Locale/ru-RU/damage/damage-groups.ftl
new file mode 100644
index 00000000000..b1e58ae9834
--- /dev/null
+++ b/Resources/Locale/ru-RU/damage/damage-groups.ftl
@@ -0,0 +1,5 @@
+damage-group-brute = Механические
+damage-group-burn = Физические
+damage-group-airloss = Нехватка воздуха
+damage-group-toxin = Токсины
+damage-group-genetic = Генетические
diff --git a/Resources/Locale/ru-RU/damage/damage-types.ftl b/Resources/Locale/ru-RU/damage/damage-types.ftl
new file mode 100644
index 00000000000..f1984a7d7d8
--- /dev/null
+++ b/Resources/Locale/ru-RU/damage/damage-types.ftl
@@ -0,0 +1,13 @@
+damage-type-asphyxiation = Удушение
+damage-type-bloodloss = Кровопотеря
+damage-type-blunt = Ушибы
+damage-type-cellular = Клеточные
+damage-type-caustic = Кислотные
+damage-type-cold = Обморожение
+damage-type-heat = Термические
+damage-type-piercing = Уколы
+damage-type-poison = Яды
+damage-type-radiation = Радиация
+damage-type-shock = Электрические
+damage-type-slash = Порезы
+damage-type-structural = Структурные
diff --git a/Resources/Locale/ru-RU/defusable/examine.ftl b/Resources/Locale/ru-RU/defusable/examine.ftl
index 111eff2c148..7d898136735 100644
--- a/Resources/Locale/ru-RU/defusable/examine.ftl
+++ b/Resources/Locale/ru-RU/defusable/examine.ftl
@@ -6,7 +6,7 @@ defusable-examine-live =
*[other] секунд
}.
defusable-examine-live-display-off = { CAPITALIZE($name) } [color=red]тикает[/color] и таймер, похоже, выключен.
-defusable-examine-inactive = { CAPITALIZE($name) } [color=lime]неактивна[/color], но всё еще может взорваться.
+defusable-examine-inactive = { CAPITALIZE($name) } [color=lime]неактивна[/color], но всё ещё может взорваться.
defusable-examine-bolts =
Болты { $down ->
[true] [color=red]опущены[/color]
diff --git a/Resources/Locale/ru-RU/defusable/popup.ftl b/Resources/Locale/ru-RU/defusable/popup.ftl
index 0a9750e5f16..4ffff0b50e6 100644
--- a/Resources/Locale/ru-RU/defusable/popup.ftl
+++ b/Resources/Locale/ru-RU/defusable/popup.ftl
@@ -1,7 +1,7 @@
defusable-popup-begun = { CAPITALIZE($name) } подаёт звуковой сигнал, индикатор горит!
defusable-popup-defuse = { CAPITALIZE($name) } подаёт последний сигнал, и индикатор навсегда гаснет.
defusable-popup-boom = { CAPITALIZE($name) } ревёт при взрыве внутренней бомбы!
-defusable-popup-fried = { CAPITALIZE($name) } искрит, но не начинает обратный отсчет.
+defusable-popup-fried = { CAPITALIZE($name) } искрит, но не начинает обратный отсчёт.
defusable-popup-cant-anchor = { CAPITALIZE($name) }, похоже, прикручена болтами к полу!
defusable-popup-wire-bolt-pulse = Болты на мгновение проворачиваются на месте.
defusable-popup-wire-proceed-pulse = { CAPITALIZE($name) } зловеще пищит!
diff --git a/Resources/Locale/ru-RU/defusable/verb.ftl b/Resources/Locale/ru-RU/defusable/verb.ftl
index 8aec5caf543..ce35671ee3a 100644
--- a/Resources/Locale/ru-RU/defusable/verb.ftl
+++ b/Resources/Locale/ru-RU/defusable/verb.ftl
@@ -1 +1 @@
-defusable-verb-begin = Начать обратный отсчет
+defusable-verb-begin = Начать обратный отсчёт
diff --git a/Resources/Locale/ru-RU/deltav/accent/scottish.ftl b/Resources/Locale/ru-RU/deltav/accent/scottish.ftl
index 28255800f29..4e34b9a1ab9 100644
--- a/Resources/Locale/ru-RU/deltav/accent/scottish.ftl
+++ b/Resources/Locale/ru-RU/deltav/accent/scottish.ftl
@@ -3,284 +3,284 @@
# https://en.wikipedia.org/wiki/Scottish_English
# https://www.cs.stir.ac.uk/~kjt/general/scots.html
-accent-scottish-words-1 = девочка
-accent-scottish-words-replace-1 = дэвочшка
-accent-scottish-words-2 = мальчик
-accent-scottish-words-replace-2 = малчшык
-accent-scottish-words-3 = мужчина
-accent-scottish-words-replace-3 = мужчшына
-accent-scottish-words-4 = женщина
-accent-scottish-words-replace-4 = женчшына
-accent-scottish-words-5 = делать
-accent-scottish-words-replace-5 = дэлат
-accent-scottish-words-6 = не
-accent-scottish-words-replace-6 = нэ
-accent-scottish-words-7 = нее
-accent-scottish-words-replace-7 = нээ
-accent-scottish-words-8 = я
-accent-scottish-words-replace-8 = Йа
-accent-scottish-words-9 = есть
-accent-scottish-words-replace-9 = йэст
-accent-scottish-words-10 = перейти
-accent-scottish-words-replace-10 = пэрэйты
-accent-scottish-words-11 = знать
-accent-scottish-words-replace-11 = знат
-accent-scottish-words-12 = и
-accent-scottish-words-replace-12 = ыэ
-accent-scottish-words-13 = вы
-accent-scottish-words-replace-13 = вы
-accent-scottish-words-14 = ты
-accent-scottish-words-replace-14 = ты
-accent-scottish-words-15 = приветствую
-accent-scottish-words-replace-15 = прывэтству
-accent-scottish-words-16 = привет
-accent-scottish-words-replace-16 = прывэт
-accent-scottish-words-17 = все
-accent-scottish-words-replace-17 = всэ
-accent-scottish-words-18 = от
-accent-scottish-words-replace-18 = од
-accent-scottish-words-19 = здравия
-accent-scottish-words-replace-19 = здравыйа
-accent-scottish-words-20 = меня
-accent-scottish-words-replace-20 = мэнйа
-accent-scottish-words-21 = тебя
-accent-scottish-words-replace-21 = тэбйа
-accent-scottish-words-22 = себя
-accent-scottish-words-replace-22 = сэбйа
-accent-scottish-words-23 = где
-accent-scottish-words-replace-23 = гдэ
-accent-scottish-words-24 = ой
-accent-scottish-words-replace-24 = ойё
-accent-scottish-words-25 = маленький
-accent-scottish-words-replace-25 = мэлкый
-accent-scottish-words-26 = большой
-accent-scottish-words-replace-26 = громадный
-accent-scottish-words-27 = сука
-accent-scottish-words-replace-27 = кнурла
-accent-scottish-words-28 = даа
-accent-scottish-words-replace-28 = Ойии
-accent-scottish-words-29 = конечно
-accent-scottish-words-replace-29 = конэчшно
-accent-scottish-words-30 = да
-accent-scottish-words-replace-30 = Ойи
-accent-scottish-words-31 = тоже
-accent-scottish-words-replace-31 = тожэ
-accent-scottish-words-32 = мой
-accent-scottish-words-replace-32 = мойё
-accent-scottish-words-33 = нет
-accent-scottish-words-replace-33 = нэт
-accent-scottish-words-34 = папа
-accent-scottish-words-replace-34 = уру
-accent-scottish-words-35 = мама
-accent-scottish-words-replace-35 = дельва
-accent-scottish-words-36 = срочник
-accent-scottish-words-replace-36 = свэжак
-accent-scottish-words-37 = новичок
-accent-scottish-words-replace-37 = свэжак
-accent-scottish-words-38 = стажёр
-accent-scottish-words-replace-38 = свэжак
-accent-scottish-words-39 = профессионал
-accent-scottish-words-replace-39 = бывалый
-accent-scottish-words-40 = ветеран
-accent-scottish-words-replace-40 = бывалый
-accent-scottish-words-41 = блять
-accent-scottish-words-replace-41 = вррон
-accent-scottish-words-42 = если
-accent-scottish-words-replace-42 = эслы
-accent-scottish-words-43 = следует
-accent-scottish-words-replace-43 = слэдуэт
-accent-scottish-words-44 = сделал
-accent-scottish-words-replace-44 = сдэлал
-accent-scottish-words-45 = пизда
-accent-scottish-words-replace-45 = награ
-accent-scottish-words-46 = никто
-accent-scottish-words-replace-46 = ныкто
-accent-scottish-words-47 = делайте
-accent-scottish-words-replace-47 = дэлать
-accent-scottish-words-48 = здравствуй
-accent-scottish-words-replace-48 = здарова
-accent-scottish-words-49 = очко
-accent-scottish-words-replace-49 = дыра
-accent-scottish-words-50 = синдикатовцы
-accent-scottish-words-replace-50 = злодеи
-accent-scottish-words-51 = капитан
-accent-scottish-words-replace-51 = кэпытан
-accent-scottish-words-52 = беги
-accent-scottish-words-replace-52 = дэри ноги
-accent-scottish-words-53 = волосы
-accent-scottish-words-replace-53 = борода
-accent-scottish-words-54 = вода
-accent-scottish-words-replace-54 = пиво
-accent-scottish-words-55 = выпить
-accent-scottish-words-replace-55 = выпыт пиво
-accent-scottish-words-56 = пить
-accent-scottish-words-replace-56 = пить пиво
-accent-scottish-words-57 = имею
-accent-scottish-words-replace-57 = ымэу
-accent-scottish-words-58 = напиток
-accent-scottish-words-replace-58 = пиво
-accent-scottish-words-59 = водка
-accent-scottish-words-replace-59 = пиво
-accent-scottish-words-60 = блин
-accent-scottish-words-replace-60 = рыбьы головэжкы
-accent-scottish-words-61 = в принципе
-accent-scottish-words-replace-61 = в прынцыпэ
-accent-scottish-words-62 = короче
-accent-scottish-words-replace-62 = корочэ
-accent-scottish-words-63 = вообще
-accent-scottish-words-replace-63 = вообчшэ
-accent-scottish-words-64 = ну
-accent-scottish-words-replace-64 = нуэ
-accent-scottish-words-66 = еда
-accent-scottish-words-replace-66 = жратва
-accent-scottish-words-67 = еды
-accent-scottish-words-replace-67 = жратвы
-accent-scottish-words-68 = эй
-accent-scottish-words-replace-68 = эйэ
-accent-scottish-words-69 = что
-accent-scottish-words-replace-69 = чшто
-accent-scottish-words-70 = зачем
-accent-scottish-words-replace-70 = зачэм
-accent-scottish-words-71 = почему
-accent-scottish-words-replace-71 = почэму
-accent-scottish-words-72 = сказать
-accent-scottish-words-replace-72 = сказанут
-accent-scottish-words-73 = своим
-accent-scottish-words-replace-73 = своым
-accent-scottish-words-74 = её
-accent-scottish-words-replace-74 = йейё
-accent-scottish-words-75 = двигай
-accent-scottish-words-replace-75 = двыгай
-accent-scottish-words-76 = двигаться
-accent-scottish-words-replace-76 = двыгатсйа
-accent-scottish-words-77 = не был
-accent-scottish-words-replace-77 = нэ был
-accent-scottish-words-78 = сейчас
-accent-scottish-words-replace-78 = сэйчшас
-accent-scottish-words-79 = волшебник
-accent-scottish-words-replace-79 = вельдуност
-accent-scottish-words-80 = маг
-accent-scottish-words-replace-80 = вельнудост
-accent-scottish-words-81 = чтобы
-accent-scottish-words-replace-81 = чштобы
-accent-scottish-words-82 = для
-accent-scottish-words-replace-82 = длйа
-accent-scottish-words-83 = даже
-accent-scottish-words-replace-83 = дажэ
-accent-scottish-words-84 = ай
-accent-scottish-words-replace-84 = айэ
-accent-scottish-words-85 = мышь
-accent-scottish-words-replace-85 = мыш
-accent-scottish-words-86 = клоун
-accent-scottish-words-replace-86 = шут
-accent-scottish-words-87 = друг
-accent-scottish-words-replace-87 = брат
-accent-scottish-words-88 = проблема
-accent-scottish-words-replace-88 = закавыка
-accent-scottish-words-90 = разрешите
-accent-scottish-words-replace-90 = разрэшытэ
-accent-scottish-words-91 = брифинг
-accent-scottish-words-replace-91 = совет
-accent-scottish-words-92 = врач
-accent-scottish-words-replace-92 = лекарь
-accent-scottish-words-93 = говорить
-accent-scottish-words-replace-93 = говорит
-accent-scottish-words-94 = разговаривать
-accent-scottish-words-replace-94 = разговарыват
-accent-scottish-words-95 = спиртное
-accent-scottish-words-replace-95 = пиво
-accent-scottish-words-96 = звоните
-accent-scottish-words-replace-96 = звонытэ
-accent-scottish-words-97 = подарить
-accent-scottish-words-replace-97 = подарытэ
-accent-scottish-words-98 = дайте
-accent-scottish-words-replace-98 = дайтэ
-accent-scottish-words-99 = выдайте
-accent-scottish-words-replace-99 = выдайтэ
-accent-scottish-words-100 = отвечайте
-accent-scottish-words-replace-100 = отвэчшайтэ
-accent-scottish-words-101 = без
-accent-scottish-words-replace-101 = бэз
-accent-scottish-words-102 = синдикат
-accent-scottish-words-replace-102 = злодей
-accent-scottish-words-103 = ли
-accent-scottish-words-replace-103 = лы
-accent-scottish-words-104 = никогда
-accent-scottish-words-replace-104 = ныкогда
-accent-scottish-words-105 = точно
-accent-scottish-words-replace-105 = точшно
-accent-scottish-words-106 = неважно
-accent-scottish-words-replace-106 = нэважно
-accent-scottish-words-107 = хуй
-accent-scottish-words-replace-107 = елдак
-accent-scottish-words-108 = однако
-accent-scottish-words-replace-108 = однако
-accent-scottish-words-109 = думать
-accent-scottish-words-replace-109 = думат
-accent-scottish-words-111 = гамлет
-accent-scottish-words-replace-111 = грызун
-accent-scottish-words-112 = хомяк
-accent-scottish-words-replace-112 = грызун
-accent-scottish-words-113 = нюкер
-accent-scottish-words-replace-113 = красношлемый
-accent-scottish-words-114 = нюкеры
-accent-scottish-words-replace-114 = карсношлемые
-accent-scottish-words-115 = ядерный оперативник
-accent-scottish-words-replace-115 = красношлемый
-accent-scottish-words-116 = ядерные оперативники
-accent-scottish-words-replace-116 = красношлемые
-accent-scottish-words-121 = ещё
-accent-scottish-words-replace-121 = ещчшо
-accent-scottish-words-122 = более того
-accent-scottish-words-replace-122 = болээ того
-accent-scottish-words-123 = пассажир
-accent-scottish-words-replace-123 = пассажыр
-accent-scottish-words-125 = человек
-accent-scottish-words-replace-125 = чэловэк
-accent-scottish-words-126 = гномы
-accent-scottish-words-replace-126 = дворфы
-accent-scottish-words-127 = слайм
-accent-scottish-words-replace-127 = желе
-accent-scottish-words-128 = слаймы
-accent-scottish-words-replace-128 = желе
-accent-scottish-words-129 = унатх
-accent-scottish-words-replace-129 = ящер
-accent-scottish-words-130 = паук
-accent-scottish-words-replace-130 = хиссшер
-accent-scottish-words-131 = унатхи
-accent-scottish-words-replace-131 = ящеры
-accent-scottish-words-132 = люди
-accent-scottish-words-replace-132 = кнурлан
-accent-scottish-words-133 = эвак
-accent-scottish-words-replace-133 = вывоз
-accent-scottish-words-134 = предатель
-accent-scottish-words-replace-134 = злодей
-accent-scottish-words-135 = корпорация
-accent-scottish-words-replace-135 = корпорацыйа
-accent-scottish-words-136 = мне
-accent-scottish-words-replace-136 = мнэ
-accent-scottish-words-137 = зомби
-accent-scottish-words-replace-137 = гнилые
-accent-scottish-words-138 = заражённый
-accent-scottish-words-replace-138 = гнилой
-accent-scottish-words-139 = мим
-accent-scottish-words-replace-139 = молчун
-accent-scottish-words-140 = считать
-accent-scottish-words-replace-140 = счшытат
-accent-scottish-words-141 = карп
-accent-scottish-words-replace-141 = рыбёха
-accent-scottish-words-142 = ксено
-accent-scottish-words-replace-142 = монстры
-accent-scottish-words-143 = шаттл
-accent-scottish-words-replace-143 = судно
-accent-scottish-words-144 = думаю
-accent-scottish-words-replace-144 = думайу
-accent-scottish-words-145 = крысы
-accent-scottish-words-replace-145 = грызуны
-accent-scottish-words-146 = даун
-accent-scottish-words-replace-146 = обалдуй
-accent-scottish-words-147 = СБ
-accent-scottish-words-replace-147 = стража
+accent-scottish-words-1 = girl
+accent-scottish-words-replace-1 = lassie
+accent-scottish-words-2 = boy
+accent-scottish-words-replace-2 = laddie
+accent-scottish-words-3 = man
+accent-scottish-words-replace-3 = lad
+accent-scottish-words-4 = woman
+accent-scottish-words-replace-4 = lass
+accent-scottish-words-5 = do
+accent-scottish-words-replace-5 = dae
+accent-scottish-words-6 = don't
+accent-scottish-words-replace-6 = dinnae
+accent-scottish-words-7 = dont
+accent-scottish-words-replace-7 = dinnae
+accent-scottish-words-8 = i'm
+accent-scottish-words-replace-8 = A'm
+accent-scottish-words-9 = im
+accent-scottish-words-replace-9 = am
+accent-scottish-words-10 = going
+accent-scottish-words-replace-10 = gaun
+accent-scottish-words-11 = know
+accent-scottish-words-replace-11 = ken
+accent-scottish-words-12 = i
+accent-scottish-words-replace-12 = Ah
+accent-scottish-words-13 = you're
+accent-scottish-words-replace-13 = ye're
+accent-scottish-words-14 = youre
+accent-scottish-words-replace-14 = yere
+accent-scottish-words-15 = you
+accent-scottish-words-replace-15 = ya
+accent-scottish-words-16 = i'll
+accent-scottish-words-replace-16 = A'll
+accent-scottish-words-17 = ill
+accent-scottish-words-replace-17 = all
+accent-scottish-words-18 = of
+accent-scottish-words-replace-18 = ae
+accent-scottish-words-19 = was
+accent-scottish-words-replace-19 = wis
+accent-scottish-words-20 = can't
+accent-scottish-words-replace-20 = cannae
+accent-scottish-words-21 = cant
+accent-scottish-words-replace-21 = cannae
+accent-scottish-words-22 = yourself
+accent-scottish-words-replace-22 = yarsel
+accent-scottish-words-23 = where
+accent-scottish-words-replace-23 = whaur
+accent-scottish-words-24 = oh
+accent-scottish-words-replace-24 = ach
+accent-scottish-words-25 = little
+accent-scottish-words-replace-25 = wee
+accent-scottish-words-26 = small
+accent-scottish-words-replace-26 = wee
+accent-scottish-words-27 = shit
+accent-scottish-words-replace-27 = shite
+accent-scottish-words-28 = yeah
+accent-scottish-words-replace-28 = aye
+accent-scottish-words-29 = yea
+accent-scottish-words-replace-29 = aye
+accent-scottish-words-30 = yes
+accent-scottish-words-replace-30 = aye
+accent-scottish-words-31 = too
+accent-scottish-words-replace-31 = tae
+accent-scottish-words-32 = my
+accent-scottish-words-replace-32 = me
+accent-scottish-words-33 = not
+accent-scottish-words-replace-33 = nae
+accent-scottish-words-34 = dad
+accent-scottish-words-replace-34 = da
+accent-scottish-words-35 = mom
+accent-scottish-words-replace-35 = maw
+accent-scottish-words-36 = newbie
+accent-scottish-words-replace-36 = greenbeard
+accent-scottish-words-37 = noob
+accent-scottish-words-replace-37 = greenbeard
+accent-scottish-words-38 = noobie
+accent-scottish-words-replace-38 = greenbeard
+accent-scottish-words-39 = professional
+accent-scottish-words-replace-39 = greybeard
+accent-scottish-words-40 = veteran
+accent-scottish-words-replace-40 = greybeard
+accent-scottish-words-41 = fuck
+accent-scottish-words-replace-41 = feck
+accent-scottish-words-42 = would
+accent-scottish-words-replace-42 = wou
+accent-scottish-words-43 = should
+accent-scottish-words-replace-43 = shou
+accent-scottish-words-44 = could
+accent-scottish-words-replace-44 = cou
+accent-scottish-words-45 = would've
+accent-scottish-words-replace-45 = wou'hae
+accent-scottish-words-46 = should've
+accent-scottish-words-replace-46 = shou'hae
+accent-scottish-words-47 = could've
+accent-scottish-words-replace-47 = cou'hae
+accent-scottish-words-48 = wouldve
+accent-scottish-words-replace-48 = wouhae
+accent-scottish-words-49 = shouldve
+accent-scottish-words-replace-49 = shouhae
+accent-scottish-words-50 = couldve
+accent-scottish-words-replace-50 = couhae
+accent-scottish-words-51 = would'nt
+accent-scottish-words-replace-51 = wou'nae
+accent-scottish-words-52 = should'nt
+accent-scottish-words-replace-52 = shou'nae
+accent-scottish-words-53 = could'nt
+accent-scottish-words-replace-53 = cou'nae
+accent-scottish-words-54 = wouldnt
+accent-scottish-words-replace-54 = wounae
+accent-scottish-words-55 = shouldnt
+accent-scottish-words-replace-55 = shounae
+accent-scottish-words-56 = couldnt
+accent-scottish-words-replace-56 = counae
+accent-scottish-words-57 = have
+accent-scottish-words-replace-57 = hae
+accent-scottish-words-58 = no
+accent-scottish-words-replace-58 = nae
+accent-scottish-words-59 = to
+accent-scottish-words-replace-59 = tae
+accent-scottish-words-60 = the
+accent-scottish-words-replace-60 = tha
+accent-scottish-words-61 = have
+accent-scottish-words-replace-61 = hae
+accent-scottish-words-62 = are
+accent-scottish-words-replace-62 = be
+accent-scottish-words-63 = is
+accent-scottish-words-replace-63 = be
+accent-scottish-words-64 = am
+accent-scottish-words-replace-64 = be
+accent-scottish-words-66 = food
+accent-scottish-words-replace-66 = grub
+accent-scottish-words-67 = have
+accent-scottish-words-replace-67 = hae
+accent-scottish-words-68 = hey
+accent-scottish-words-replace-68 = oi
+accent-scottish-words-69 = what
+accent-scottish-words-replace-69 = wot
+accent-scottish-words-70 = where
+accent-scottish-words-replace-70 = whaur
+accent-scottish-words-71 = when
+accent-scottish-words-replace-71 = wen
+accent-scottish-words-72 = myself
+accent-scottish-words-replace-72 = mesel
+accent-scottish-words-73 = himself
+accent-scottish-words-replace-73 = hesel
+accent-scottish-words-74 = herself
+accent-scottish-words-replace-74 = shesel
+accent-scottish-words-75 = move
+accent-scottish-words-replace-75 = moev
+accent-scottish-words-76 = moving
+accent-scottish-words-replace-76 = moeven
+accent-scottish-words-77 = wasn't
+accent-scottish-words-replace-77 = wis'nae
+accent-scottish-words-78 = wasnt
+accent-scottish-words-replace-78 = wisnae
+accent-scottish-words-79 = wizard
+accent-scottish-words-replace-79 = wizer
+accent-scottish-words-80 = fool
+accent-scottish-words-replace-80 = wazzok
+accent-scottish-words-81 = have
+accent-scottish-words-replace-81 = hae
+accent-scottish-words-82 = for
+accent-scottish-words-replace-82 = fer
+accent-scottish-words-83 = about
+accent-scottish-words-replace-83 = aboot
+accent-scottish-words-84 = ow
+accent-scottish-words-replace-84 = och
+accent-scottish-words-85 = small
+accent-scottish-words-replace-85 = wee
+accent-scottish-words-86 = tiny
+accent-scottish-words-replace-86 = tinnae
+accent-scottish-words-87 = baby
+accent-scottish-words-replace-87 = babee
+accent-scottish-words-88 = after
+accent-scottish-words-replace-88 = efter
+accent-scottish-words-90 = gonna
+accent-scottish-words-replace-90 = gaun'ae
+accent-scottish-words-91 = going to
+accent-scottish-words-replace-91 = gaun'ae
+accent-scottish-words-92 = gone
+accent-scottish-words-replace-92 = gaun
+accent-scottish-words-93 = talk
+accent-scottish-words-replace-93 = blather
+accent-scottish-words-94 = talking
+accent-scottish-words-replace-94 = blatherin'
+accent-scottish-words-95 = now
+accent-scottish-words-replace-95 = nou
+accent-scottish-words-96 = talked
+accent-scottish-words-replace-96 = blathered
+accent-scottish-words-97 = give
+accent-scottish-words-replace-97 = gie
+accent-scottish-words-98 = gimme
+accent-scottish-words-replace-98 = gie's
+accent-scottish-words-99 = give me
+accent-scottish-words-replace-99 = gie's
+accent-scottish-words-100 = do you
+accent-scottish-words-replace-100 = d'ya
+accent-scottish-words-101 = with
+accent-scottish-words-replace-101 = wi
+accent-scottish-words-102 = without
+accent-scottish-words-replace-102 = wi'ou
+accent-scottish-words-103 = whether
+accent-scottish-words-replace-103 = we'er
+accent-scottish-words-104 = ever
+accent-scottish-words-replace-104 = e'er
+accent-scottish-words-105 = whenever
+accent-scottish-words-replace-105 = wen'er
+accent-scottish-words-106 = whatever
+accent-scottish-words-replace-106 = wot'er
+accent-scottish-words-107 = how
+accent-scottish-words-replace-107 = hou
+accent-scottish-words-108 = however
+accent-scottish-words-replace-108 = hou'er
+accent-scottish-words-109 = think
+accent-scottish-words-replace-109 = reckon
+accent-scottish-words-111 = hamlet
+accent-scottish-words-replace-111 = hammy
+accent-scottish-words-112 = hampster
+accent-scottish-words-replace-112 = hammy
+accent-scottish-words-113 = nukie
+accent-scottish-words-replace-113 = reddie
+accent-scottish-words-114 = nuclear op
+accent-scottish-words-replace-114 = reddie
+accent-scottish-words-115 = nuclear operative
+accent-scottish-words-replace-115 = reddie
+accent-scottish-words-116 = nuclear agent
+accent-scottish-words-replace-116 = reddie
+accent-scottish-words-121 = more
+accent-scottish-words-replace-121 = maer
+accent-scottish-words-122 = moreover
+accent-scottish-words-replace-122 = maero'er
+accent-scottish-words-123 = over
+accent-scottish-words-replace-123 = o'er
+accent-scottish-words-125 = human
+accent-scottish-words-replace-125 = hyooman
+accent-scottish-words-126 = dwarf
+accent-scottish-words-replace-126 = dorf
+accent-scottish-words-127 = slime
+accent-scottish-words-replace-127 = oozi
+accent-scottish-words-128 = rat
+accent-scottish-words-replace-128 = raki
+accent-scottish-words-129 = arachnid
+accent-scottish-words-replace-129 = aranaki
+accent-scottish-words-130 = spider
+accent-scottish-words-replace-130 = hisser
+accent-scottish-words-131 = isn't
+accent-scottish-words-replace-131 = be'nae
+accent-scottish-words-132 = aren't
+accent-scottish-words-replace-132 = be'nae
+accent-scottish-words-133 = ain't
+accent-scottish-words-replace-133 = be'nae
+accent-scottish-words-134 = isnt
+accent-scottish-words-replace-134 = benae
+accent-scottish-words-135 = arent
+accent-scottish-words-replace-135 = benae
+accent-scottish-words-136 = aint
+accent-scottish-words-replace-136 = benae
+accent-scottish-words-137 = zombie
+accent-scottish-words-replace-137 = rotter
+accent-scottish-words-138 = zomb
+accent-scottish-words-replace-138 = rotter
+accent-scottish-words-139 = clown
+accent-scottish-words-replace-139 = honki
+accent-scottish-words-140 = cluwn
+accent-scottish-words-replace-140 = hunki
+accent-scottish-words-141 = carp
+accent-scottish-words-replace-141 = fin
+accent-scottish-words-142 = crusher
+accent-scottish-words-replace-142 = axe
+accent-scottish-words-143 = coward
+accent-scottish-words-replace-143 = leaflover
+accent-scottish-words-144 = idiot
+accent-scottish-words-replace-144 = eejit
+accent-scottish-words-145 = stupid
+accent-scottish-words-replace-145 = diteit
+accent-scottish-words-146 = officer
+accent-scottish-words-replace-146 = bobby
+accent-scottish-words-147 = seccie
+accent-scottish-words-replace-147 = bobby
accent-scottish-words-148 = a
accent-scottish-words-replace-148 = ae
accent-scottish-words-149 = certain
diff --git a/Resources/Locale/ru-RU/deltav/advertisements/vending/pride.ftl b/Resources/Locale/ru-RU/deltav/advertisements/vending/pride.ftl
index 3437c11d535..374a81e5d05 100644
--- a/Resources/Locale/ru-RU/deltav/advertisements/vending/pride.ftl
+++ b/Resources/Locale/ru-RU/deltav/advertisements/vending/pride.ftl
@@ -1,3 +1,3 @@
-advertisement-pride-1 = Не стесняйся себя!
-advertisement-pride-2 = Радуга прекрасна!
-advertisement-pride-3 = Ты обычный!
+advertisement-pride-1 = Быть собой не преступление!
+advertisement-pride-2 = Радуга в каждый дом!
+advertisement-pride-3 = Будь особенным!
diff --git a/Resources/Locale/ru-RU/deltav/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/ru-RU/deltav/catalog/fills/crates/vending-crates.ftl
index a1acfc46d6f..9d092f815f1 100644
--- a/Resources/Locale/ru-RU/deltav/catalog/fills/crates/vending-crates.ftl
+++ b/Resources/Locale/ru-RU/deltav/catalog/fills/crates/vending-crates.ftl
@@ -1,2 +1,2 @@
-ent-CrateVendingMachineRestockPrideFilled = Набор пополнения Радуж-О-Мата
- .desc = Содержит два набора пополнения Радуж-О-Мата.
+ent-CrateVendingMachineRestockPrideFilled = комплект пополнения Радуг-О-Мата
+ .desc = Содержит два ящика пополнения Радуг-О-Мата.
diff --git a/Resources/Locale/ru-RU/deltav/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/deltav/flavors/flavor-profiles.ftl
index 6b2c2eb0374..03e51a0b596 100644
--- a/Resources/Locale/ru-RU/deltav/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/ru-RU/deltav/flavors/flavor-profiles.ftl
@@ -1,29 +1,29 @@
## Nyano
-flavor-base-acidic = кислый
-flavor-complex-nuggie = как курица
-flavor-complex-enthralling = увлекательный
-flavor-complex-sublime = возвышенный
-flavor-complex-holy = райский
+flavor-base-acidic = кисло
+flavor-complex-nuggie = как курочка
+flavor-complex-enthralling = увлекательно
+flavor-complex-sublime = возвышенно
+flavor-complex-holy = райско
flavor-base-seeds = семянно
flavor-complex-cotton = как хлопок
-flavor-complex-vanilla = как ванилин
+flavor-complex-vanilla = как ваниль
flavor-complex-soju = как крепкая рисовая водка
flavor-complex-orangecreamcicle = как мягкая апельсиновая настойка
-flavor-complex-silverjack = как сны рокзвёзд
+flavor-complex-silverjack = как сон рокзвезды
flavor-complex-brainbomb = как повреждение печени
flavor-complex-atomicpunch = как приторная радиация
flavor-complex-circusjuice = экстремально смешно
flavor-complex-pinkdrink = подавляюще розово
-flavor-complex-sapopicante = как острые томаты
-flavor-complex-graveyard = как крепкий холодный алкоголь
+flavor-complex-sapopicante = как перчёные томаты
+flavor-complex-graveyard = как терпкое пиво
flavor-complex-bubbletea = как кремовая сладость
flavor-complex-corncob = как грязная шутка
## Delta
flavor-complex-gunmetal = приторно и кремово
-flavor-complex-lemondrop = освежающий тарт
+flavor-complex-lemondrop = как освежающий тарт
flavor-complex-greengrass = как праздник в солнечный день
flavor-complex-daiquiri = модно
flavor-complex-arsonistsbrew = как пламя и пепел
diff --git a/Resources/Locale/ru-RU/deltav/harpy/singer_system.ftl b/Resources/Locale/ru-RU/deltav/harpy/singer_system.ftl
index 494cd505a29..9d87374b650 100644
--- a/Resources/Locale/ru-RU/deltav/harpy/singer_system.ftl
+++ b/Resources/Locale/ru-RU/deltav/harpy/singer_system.ftl
@@ -1 +1 @@
-no-sing-while-no-speak = Вы не можете спеть прямо сейчас.
+no-sing-while-no-speak = Вы не можете петь прямо сейчас.
diff --git a/Resources/Locale/ru-RU/deltav/markings/felinid.ftl b/Resources/Locale/ru-RU/deltav/markings/felinid.ftl
index 51fa00c4fbc..02258ec4ca3 100644
--- a/Resources/Locale/ru-RU/deltav/markings/felinid.ftl
+++ b/Resources/Locale/ru-RU/deltav/markings/felinid.ftl
@@ -1,5 +1,5 @@
marking-FelinidFluffyTail-Felinid_fluffy_tail_full = Пушистый хвост
marking-FelinidFluffyTailRings-Felinid_fluffy_tail_full = Пушистый хвост
-marking-FelinidFluffyTailRings-felinid_fluffy_tail_rings = Пушистый полосатый хвост
+marking-FelinidFluffyTailRings-felinid_fluffy_tail_rings = Пушистый хвост с кольцами
marking-FelinidFluffyTail = Пушистый хвост
-marking-FelinidFluffyTailRings = Пушистый полосатый хвост
+marking-FelinidFluffyTailRings = Пушистый хвост с кольцами
diff --git a/Resources/Locale/ru-RU/deltav/markings/harpy.ftl b/Resources/Locale/ru-RU/deltav/markings/harpy.ftl
index 09adaa1c1b5..93d90754414 100644
--- a/Resources/Locale/ru-RU/deltav/markings/harpy.ftl
+++ b/Resources/Locale/ru-RU/deltav/markings/harpy.ftl
@@ -1,38 +1,38 @@
-marking-HarpyWingDefault = Базовые крылья
+marking-HarpyWingDefault = Обычные крылья
marking-HarpyWingDefault-harpy = Крылья
-marking-HarpyWingFolded = Сложенные крылья
-marking-HarpyWingFolded-harpyfolded = Кпылья
+marking-HarpyWingFolded = Сложенные Крылья
+marking-HarpyWingFolded-harpyfolded = Крылья
marking-HarpyWingClassic = Классические крылья
marking-HarpyWingClassic-classicharpy = Крылья
-marking-HarpyWing2ToneClassic = Классические биколорные крылья
-marking-HarpyWing2ToneClassic-harpy2tone1 = Верхняя половина
-marking-HarpyWing2ToneClassic-harpy2tone2 = Нижняя половина
-marking-HarpyWing3ToneClassic = Классические триколорные крылья
-marking-HarpyWing3ToneClassic-harpy3tone1 = Верхняя треть
-marking-HarpyWing3ToneClassic-harpy3tone2 = Средняя треть
-marking-HarpyWing3ToneClassic-harpy3tone3 = Нижняя треть
-marking-HarpyWingSpeckledClassic = Классические пятнистые крылья
+marking-HarpyWing2ToneClassic = Двухцветные крылья
+marking-HarpyWing2ToneClassic-harpy2tone1 = Верхняя часть
+marking-HarpyWing2ToneClassic-harpy2tone2 = Нижняя часть
+marking-HarpyWing3ToneClassic = Трёхцветные крылья
+marking-HarpyWing3ToneClassic-harpy3tone1 = Верхняя часть
+marking-HarpyWing3ToneClassic-harpy3tone2 = Средняя часть
+marking-HarpyWing3ToneClassic-harpy3tone3 = Нижняя часть
+marking-HarpyWingSpeckledClassic = Крылья в крапинку
marking-HarpyWingSpeckledClassic-harpyspeckled1 = Основа
-marking-HarpyWingSpeckledClassic-harpyspeckled2 = Пятна
-marking-HarpyWingUndertoneClassic = Классические биколорные крылья
-marking-HarpyWingUndertoneClassic-harpyundertone1 = Спереди
-marking-HarpyWingUndertoneClassic-harpyundertone2 = Сзади
-marking-HarpyWingTipsClassic = Классические пернатые крылья
+marking-HarpyWingSpeckledClassic-harpyspeckled2 = Крапинки
+marking-HarpyWingUndertoneClassic = Оттенчатые крылья
+marking-HarpyWingUndertoneClassic-harpyundertone1 = Перед
+marking-HarpyWingUndertoneClassic-harpyundertone2 = Зад
+marking-HarpyWingTipsClassic = Пернатые крылья
marking-HarpyWingTipsClassic-harpywingtip1 = Основа
-marking-HarpyWingTipsClassic-harpywingtip2 = Кончики перьев
-marking-HarpyEarsDefault = Перья
-marking-HarpyEarsDefault-harpy_ears_default = Основание перьев
-marking-HarpyTailPhoenix = Базовый хвост
+marking-HarpyWingTipsClassic-harpywingtip2 = Перья
+marking-HarpyEarsDefault = Пучки перьев
+marking-HarpyEarsDefault-harpy_ears_default = Перья
+marking-HarpyTailPhoenix = Обычный хвост
marking-HarpyTailPhoenix-phoenix_tail = Хвост
marking-HarpyTailRooster = Петушиный хвост
marking-HarpyTailRooster-rooster_tail = Хвост
-marking-HarpyTailFinch = Хвост зяблика
+marking-HarpyTailFinch = Хвост вьюрка
marking-HarpyTailFinch-finch_tail = Хвост
-marking-HarpyChestDefault = Нижнее оперение
-marking-HarpyChestDefault-upper = Нижнее оперение
-marking-HarpyChestDefault-lower = Нижнее оперение
-marking-HarpyLegsDefault = Птичьи ноги
-marking-HarpyLegsDefault-thighs = Бедра
+marking-HarpyChestDefault = Покрытие для перьев и паха
+marking-HarpyChestDefault-upper = Покрытие крыльев
+marking-HarpyChestDefault-lower = Покрытие паха
+marking-HarpyLegsDefault = Птичьи лапы
+marking-HarpyLegsDefault-thighs = Бёдра
marking-HarpyFeetDefault = Птичьи лапы
marking-HarpyFeetDefault-feet = Лапы
-marking-HarpyFeetDefault-talons = Талоны
+marking-HarpyFeetDefault-talons = Когти
diff --git a/Resources/Locale/ru-RU/deltav/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/ru-RU/deltav/reagents/meta/consumable/food/condiments.ftl
index 240dc946a21..212f81410c1 100644
--- a/Resources/Locale/ru-RU/deltav/reagents/meta/consumable/food/condiments.ftl
+++ b/Resources/Locale/ru-RU/deltav/reagents/meta/consumable/food/condiments.ftl
@@ -3,4 +3,4 @@ reagent-desc-pesto = Комбинация соли, трав, чеснока, м
reagent-name-tomatosauce = томатный соус
reagent-desc-tomatosauce = Измельченные томаты с солью и травами.
reagent-name-bechamel = бешамель
-reagent-desc-bechamel = Классический белый соус
+reagent-desc-bechamel = Классический белый соус, больше всего известный как ингредиент лазаньи.
diff --git a/Resources/Locale/ru-RU/deltav/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/deltav/store/uplink-catalog.ftl
index 3f4f8c58831..c5602e75f64 100644
--- a/Resources/Locale/ru-RU/deltav/store/uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/deltav/store/uplink-catalog.ftl
@@ -1,3 +1,3 @@
# Implants
uplink-bionic-syrinx-implanter-name = бионический голосовой имплант
-uplink-bionic-syrinx-implanter-desc = Имплантат, который усиливает природный талант гарпий к мимикрии и позволяет вам подстраивать свой голос под любого, о ком вы только можете подумать.
+uplink-bionic-syrinx-implanter-desc = Имплантат, усиливающий природный талант гарпий к мимикрии и позволяющий им подстраивать свой голос под любое другое разумное существо.
diff --git a/Resources/Locale/ru-RU/deltav/traits/traits.ftl b/Resources/Locale/ru-RU/deltav/traits/traits.ftl
index c6b87d2648c..ca055a48317 100644
--- a/Resources/Locale/ru-RU/deltav/traits/traits.ftl
+++ b/Resources/Locale/ru-RU/deltav/traits/traits.ftl
@@ -1,5 +1,5 @@
-trait-scottish-accent-name = Дварфийский акцент
-trait-scottish-accent-desc = Вы слишком долго находились в окружении дворфов.
+trait-scottish-accent-name = Британский акцент
+trait-scottish-accent-desc = Fer tha folk who come frae Hielan clan.
trait-ultravision-name = Ультрафиолетовое зрение
trait-ultravision-desc =
Будь то с помощью специальных бионических глаз, случайной мутации,
diff --git a/Resources/Locale/ru-RU/deltav/weapons/ranged/energygun.ftl b/Resources/Locale/ru-RU/deltav/weapons/ranged/energygun.ftl
index f7069dfc940..105805c5fc6 100644
--- a/Resources/Locale/ru-RU/deltav/weapons/ranged/energygun.ftl
+++ b/Resources/Locale/ru-RU/deltav/weapons/ranged/energygun.ftl
@@ -1 +1 @@
-energygun-examine-fire-mode = Активирован { $mode } режим огня
+energygun-examine-fire-mode = Установлен тип снаряда: { $mode }
diff --git a/Resources/Locale/ru-RU/devices/device-network.ftl b/Resources/Locale/ru-RU/devices/device-network.ftl
index 82e5e37e255..06acc56c07c 100644
--- a/Resources/Locale/ru-RU/devices/device-network.ftl
+++ b/Resources/Locale/ru-RU/devices/device-network.ftl
@@ -7,17 +7,19 @@ device-frequency-prototype-name-mailing-units = Почтовый блок
device-frequency-prototype-name-pdas = КПК
device-frequency-prototype-name-fax = Факс
device-frequency-prototype-name-basic-device = Базовые устройства
+device-frequency-prototype-name-cyborg-control = Управление киборгами
+device-frequency-prototype-name-robotics-console = Консоль управления робототехникой
# prefixes for randomly generated device addresses
device-address-prefix-vent = Вент-
device-address-prefix-scrubber = Скр-
device-frequency-prototype-name-surveillance-camera-test = Тест подсети
-device-frequency-prototype-name-surveillance-camera-engineering = Камеры (Инж)
-device-frequency-prototype-name-surveillance-camera-security = Камеры (СБ)
-device-frequency-prototype-name-surveillance-camera-science = Камеры (РнД)
-device-frequency-prototype-name-surveillance-camera-supply = Камеры (Снаб)
-device-frequency-prototype-name-surveillance-camera-command = Камеры (Кмнд)
-device-frequency-prototype-name-surveillance-camera-service = Камеры (Сервис)
-device-frequency-prototype-name-surveillance-camera-medical = Камеры (Мед)
+device-frequency-prototype-name-surveillance-camera-engineering = Камеры (Инженерный)
+device-frequency-prototype-name-surveillance-camera-security = Камеры (Охрана)
+device-frequency-prototype-name-surveillance-camera-science = Камеры (Научный)
+device-frequency-prototype-name-surveillance-camera-supply = Камеры (Снабжение)
+device-frequency-prototype-name-surveillance-camera-command = Камеры (Командование)
+device-frequency-prototype-name-surveillance-camera-service = Камеры (Сервисный)
+device-frequency-prototype-name-surveillance-camera-medical = Камеры (Медицинский)
device-frequency-prototype-name-surveillance-camera-general = Камеры (Общие)
device-frequency-prototype-name-surveillance-camera-entertainment = Камеры (Развлечения)
device-address-prefix-sensor = Сенс-
diff --git a/Resources/Locale/ru-RU/devices/network-configurator.ftl b/Resources/Locale/ru-RU/devices/network-configurator.ftl
index 9b5562ed358..771de123b52 100644
--- a/Resources/Locale/ru-RU/devices/network-configurator.ftl
+++ b/Resources/Locale/ru-RU/devices/network-configurator.ftl
@@ -43,5 +43,5 @@ network-configurator-examine-current-mode = Текущий режим: { $mode }
network-configurator-examine-switch-modes = Нажмите { $key } чтобы переключить режим
# item status
network-configurator-item-status-label =
- Текущий режим: { $mode }
- { $keybinding } чтобы переключить
+ Режим: { $mode }
+ Переключить: { $keybinding }
diff --git a/Resources/Locale/ru-RU/disposal/tube/components/disposal-router-component.ftl b/Resources/Locale/ru-RU/disposal/tube/components/disposal-router-component.ftl
index f2020032251..a4555895995 100644
--- a/Resources/Locale/ru-RU/disposal/tube/components/disposal-router-component.ftl
+++ b/Resources/Locale/ru-RU/disposal/tube/components/disposal-router-component.ftl
@@ -4,7 +4,3 @@ disposal-router-window-title = Маршрутизатор утилизации
disposal-router-window-tags-label = Метки:
disposal-router-window-tag-input-tooltip = Список меток, разделённых запятыми
disposal-router-window-tag-input-confirm-button = Подтвердить
-
-## ConfigureVerb
-
-configure-verb-get-data-text = Открыть настройки
diff --git a/Resources/Locale/ru-RU/disposal/tube/components/disposal-tagger-window.ftl b/Resources/Locale/ru-RU/disposal/tube/components/disposal-tagger-window.ftl
index 03fc1c67255..da1353ed4db 100644
--- a/Resources/Locale/ru-RU/disposal/tube/components/disposal-tagger-window.ftl
+++ b/Resources/Locale/ru-RU/disposal/tube/components/disposal-tagger-window.ftl
@@ -1,7 +1,3 @@
disposal-tagger-window-title = Разметка утилизации
disposal-tagger-window-tag-input-label = Метка:
disposal-tagger-window-tag-confirm-button = Подтвердить
-
-## ConfigureVerb
-
-configure-verb-get-data-text = Открыть настройки
diff --git a/Resources/Locale/ru-RU/disposal/unit/components/disposal-unit-component.ftl b/Resources/Locale/ru-RU/disposal/unit/components/disposal-unit-component.ftl
index 122e6192c05..261508e2865 100644
--- a/Resources/Locale/ru-RU/disposal/unit/components/disposal-unit-component.ftl
+++ b/Resources/Locale/ru-RU/disposal/unit/components/disposal-unit-component.ftl
@@ -20,7 +20,6 @@ disposal-self-insert-verb-get-data-text = Залезть внутрь
disposal-unit-no-hands = У вас нет рук!
disposal-flush-verb-get-data-text = Смыть
-disposal-unit-thrown-missed = Промах!
# state
disposal-unit-state-Ready = Готов
# Yes I want it to always say Pressurizing
diff --git a/Resources/Locale/ru-RU/dragon/rifts.ftl b/Resources/Locale/ru-RU/dragon/rifts.ftl
index 368c8e3a134..b27d81ab7ea 100644
--- a/Resources/Locale/ru-RU/dragon/rifts.ftl
+++ b/Resources/Locale/ru-RU/dragon/rifts.ftl
@@ -1,4 +1,4 @@
-carp-rift-warning = Разлом в { $location } порождает неестественно большой поток энергии. Остановите это любой ценой!
+carp-rift-warning = Разлом { $location } порождает неестественно большой поток энергии. Остановите это любой ценой!
carp-rift-duplicate = Невозможно иметь 2 заряжающихся разлома одновременно!
carp-rift-examine = Он заряжен на [color=yellow]{ $percentage }%[/color]!
carp-rift-max = Вы достигли максимального количества разломов
diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
index 87ec398c58d..99ac405344c 100644
--- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
@@ -83,11 +83,11 @@ ui-options-vp-integer-scaling-tooltip =
используя целочисленное значение при определённых разрешениях. Хотя это и
приводит к чётким текстурам, это часто означает, что сверху/снизу экрана будут
чёрные полосы или что часть окна не будет видна.
-ui-options-vp-vertical-fit = Вертикальное масштабирование экрана
+ui-options-vp-vertical-fit = Подгон окна просмотра по вертикали
ui-options-vp-vertical-fit-tooltip =
- Если эта функция включена, основной экран просмотра будет полностью игнорировать горизонтальную ось при
- настройке на ваш экран. Если ваш экран меньше, чем экран просмотра, это
- приведет к тому, что экран просмотра будет обрезан по горизонтальной оси.
+ Когда функция включена, основное окно просмотра не будет учитывать горизонтальную ось
+ при подгонке под ваш экран. Если ваш экран меньше, чем окно просмотра,
+ то это приведёт к его обрезанию по горизонтальной оси.
ui-options-vp-low-res = Изображение низкого разрешения
ui-options-parallax-low-quality = Низкокачественный параллакс (фон)
ui-options-fps-counter = Показать счётчик FPS
@@ -167,6 +167,7 @@ ui-options-function-open-crafting-menu = Открыть меню строите
ui-options-function-open-inventory-menu = Открыть снаряжение
ui-options-function-open-a-help = Открыть админ помощь
ui-options-function-open-abilities-menu = Открыть меню действий
+ui-options-function-toggle-round-end-summary-window = Переключить окно итогов раунда
ui-options-function-open-entity-spawn-window = Открыть меню спавна сущностей
ui-options-function-open-sandbox-window = Открыть меню песочницы
ui-options-function-open-tile-spawn-window = Открыть меню спавна тайлов
diff --git a/Resources/Locale/ru-RU/execution/execution.ftl b/Resources/Locale/ru-RU/execution/execution.ftl
index 37eff6cc195..87ea9f7971e 100644
--- a/Resources/Locale/ru-RU/execution/execution.ftl
+++ b/Resources/Locale/ru-RU/execution/execution.ftl
@@ -1,18 +1,19 @@
execution-verb-name = Казнить
execution-verb-message = Использовать своё оружие, чтобы казнить кого-то.
+
# All the below localisation strings have access to the following variables
# attacker (the person committing the execution)
# victim (the person being executed)
# weapon (the weapon used for the execution)
-execution-popup-gun-initial-internal = Вы приставляете ствол {THE($weapon)}к голове {$victim}.
-execution-popup-gun-initial-external = {$attacker} приставляет ствол {THE($weapon)} к голове {$victim}.
-execution-popup-gun-complete-internal = Вы стреляете {$victim} в голову!
-execution-popup-gun-complete-external = {$attacker} стреляет {$victim} в голову!
-execution-popup-gun-clumsy-internal = Вы промахиваетесь мимо головы {$victim} и стреляете себе в ногу!
-execution-popup-gun-clumsy-external = {$attacker} промахивается по {$victim} и стреляет себе в ногу!
-execution-popup-gun-empty = {CAPITALIZE(THE($weapon))} издаёт щелчок.
-execution-popup-melee-initial-internal = Вы вставляете {THE($weapon)} в рот {$victim}.
-execution-popup-melee-initial-external = {$attacker} вставляет {$weapon} в рот {$victim}.
-execution-popup-melee-complete-internal = Вы перерезали горло {$victim}!
-execution-popup-melee-complete-external = {$attacker} перерзает горло {$victim}!
+execution-popup-gun-initial-internal = Вы приставляете ствол { THE($weapon) }к голове { $victim }.
+execution-popup-gun-initial-external = { $attacker } приставляет ствол { THE($weapon) } к голове { $victim }.
+execution-popup-gun-complete-internal = Вы стреляете { $victim } в голову!
+execution-popup-gun-complete-external = { $attacker } стреляет { $victim } в голову!
+execution-popup-gun-clumsy-internal = Вы промахиваетесь мимо головы { $victim } и стреляете себе в ногу!
+execution-popup-gun-clumsy-external = { $attacker } промахивается по { $victim } и стреляет себе в ногу!
+execution-popup-gun-empty = { CAPITALIZE(THE($weapon)) } издаёт щелчок.
+execution-popup-melee-initial-internal = Вы вставляете { THE($weapon) } в рот { $victim }.
+execution-popup-melee-initial-external = { $attacker } вставляет { $weapon } в рот { $victim }.
+execution-popup-melee-complete-internal = Вы перерезали горло { $victim }!
+execution-popup-melee-complete-external = { $attacker } перерзает горло { $victim }!
diff --git a/Resources/Locale/ru-RU/explosions/explosion-resistance.ftl b/Resources/Locale/ru-RU/explosions/explosion-resistance.ftl
index 33257e85475..31379b4cb8c 100644
--- a/Resources/Locale/ru-RU/explosions/explosion-resistance.ftl
+++ b/Resources/Locale/ru-RU/explosions/explosion-resistance.ftl
@@ -1,2 +1,2 @@
explosion-resistance-coefficient-value = - [color=orange]Взрывной[/color] урон снижается на [color=lightblue]{ $value }%[/color].
-explosion-resistance-contents-coefficient-value = - [color=orange]Взрывной[/color] урон снижен на [color=lightblue]{ $value }%[/color].
+explosion-resistance-contents-coefficient-value = - [color=orange]Взрывной[/color] урон [color=white]к содержимому[/color] снижается на [color=lightblue]{ $value }%[/color].
diff --git a/Resources/Locale/ru-RU/fax/fax.ftl b/Resources/Locale/ru-RU/fax/fax.ftl
index 8c34687565d..47a3d3c41fa 100644
--- a/Resources/Locale/ru-RU/fax/fax.ftl
+++ b/Resources/Locale/ru-RU/fax/fax.ftl
@@ -3,6 +3,8 @@ fax-machine-popup-received = Получена передача от { $from }.
fax-machine-popup-name-long = Слишком длинное имя факса
fax-machine-popup-name-exist = Факс с таким же именем уже существует в сети
fax-machine-popup-name-set = Имя факса было обновлено
+fax-machine-popup-error = ОШИБКА - неисправность подачи бумаги
+fax-machine-popup-copy-error = ОШИБКА - не удалось скопировать!
fax-machine-dialog-rename = Переименовать
fax-machine-dialog-field-name = Имя
fax-machine-ui-window = Факс
diff --git a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl
index a2947b5575f..50ed96a54ee 100644
--- a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl
@@ -96,8 +96,8 @@ flavor-complex-dough = как тесто
flavor-complex-sweet-dough = как сладкое тесто
flavor-complex-tofu = как тофу
flavor-complex-miso = как мисо
+flavor-complex-lemoon = как лавр
flavor-complex-muffin = как маффин
-flavor-complex-lemoon = как лавровый лист
flavor-complex-peas = как горох
flavor-complex-pineapple = как ананас
flavor-complex-onion = как лук
@@ -112,7 +112,6 @@ flavor-complex-corn = как кукуруза
flavor-complex-banana = как бананы
flavor-complex-apple = как яблоки
flavor-complex-cotton = как хлопок
-flavor-complex-pear = как груша
flavor-complex-bungo = как бунго
flavor-complex-raisins = как сушёный виноград
flavor-complex-orange = как апельсины
@@ -173,8 +172,10 @@ flavor-complex-light = как угасший свет
flavor-complex-profits = как прибыль
flavor-complex-fishops = как страшная рыбья операция
-flavor-complex-fishops = как крабовые палочки
flavor-complex-violets = как фиалки
+flavor-complex-pyrotton = как горящий рот
+flavor-complex-mothballs = как нафталиновые шарики
+flavor-complex-paint-thinner = как растворитель для краски
flavor-complex-alcohol = как алкоголь
flavor-complex-soda = как газировка
flavor-complex-juice = как сок
@@ -194,6 +195,7 @@ flavor-complex-tonic-water = как озлобленная вода
flavor-complex-tequila = как забродившая смерть
flavor-complex-energy-drink = как аккумуляторная кислота
flavor-complex-dr-gibb = как халатность
+flavor-complex-ginger-soda = как имбирь
flavor-complex-grape-soda = как виноградная газировка
flavor-complex-lemon-lime-soda = как лимонно-лаймовая газировка
flavor-complex-pwr-game-soda = как гейминг
@@ -206,6 +208,7 @@ flavor-complex-sake = как сладкий, алкогольный рис
flavor-complex-rum = как забродивший сахар
flavor-complex-coffee-liquor = как крепкий, горький кофе
flavor-complex-whiskey = как патока
+flavor-complex-coconut-rum = как ореховый ферментированный сахар
flavor-complex-shitty-wine = как виноградная кожура
flavor-complex-iced-tea = как холодный чай
flavor-complex-champagne = как свежеиспечённый хлеб
@@ -219,6 +222,11 @@ flavor-complex-ice = как лёд
flavor-complex-mopwata = как застоявшаяся грязная вода
flavor-complex-long-island = подозрительно похож на холодный чай
flavor-complex-three-mile-island = как чай, заваренный в ядерных отходах
+flavor-complex-arnold-palmer = как попадание в лунку с первого удара
+flavor-complex-blue-hawaiian = как тропики
+flavor-complex-cosmopolitan = сладко и терпко
+flavor-complex-painkiller = как шипучий ананасовый сок
+flavor-complex-pina-colada = как тропическое солнце
flavor-complex-whiskey-cola = как газированная патока
flavor-complex-singulo = как бездонная дыра
flavor-complex-syndie-bomb = как горький виски
@@ -240,6 +248,12 @@ flavor-complex-gin-tonic = как крепкая газировка с лимо
flavor-complex-screwdriver = как крепкий апельсиновый сок
flavor-complex-cogchamp = как латунь
flavor-complex-themartinez = как фиалки и лимонная водка
+flavor-complex-vodka-red-bool = как инфаркт
+flavor-complex-irish-bool = как кофеин и Ирландия
+flavor-complex-xeno-basher = как уничтожение жуков
+flavor-complex-budget-insuls-drink = как взлом шлюза
+flavor-complex-watermelon-wakeup = как сладкое пробуждение
+flavor-complex-rubberneck = как синтетика
flavor-complex-irish-car-bomb = как шипучая пенка колы
### This is exactly what pilk tastes like. I'm not even joking. I might've been a little drunk though
diff --git a/Resources/Locale/ru-RU/fluids/components/absorbent-component.ftl b/Resources/Locale/ru-RU/fluids/components/absorbent-component.ftl
index dddeb5a103d..94a937c09b6 100644
--- a/Resources/Locale/ru-RU/fluids/components/absorbent-component.ftl
+++ b/Resources/Locale/ru-RU/fluids/components/absorbent-component.ftl
@@ -1,7 +1,7 @@
-mopping-system-target-container-empty = В { CAPITALIZE($target) } пусто!
-mopping-system-target-container-empty-water = В { CAPITALIZE($target) } нет воды!
+mopping-system-target-container-empty = В { $target } пусто!
+mopping-system-target-container-empty-water = В { $target } нет воды!
mopping-system-puddle-space = В { $used } полно воды
-mopping-system-puddle-evaporate = { $target } испаряется
+mopping-system-puddle-evaporate = { CAPITALIZE($target) } испаряется
mopping-system-no-water = В { $used } нет воды!
-mopping-system-full = { $used } заполнена!
-mopping-system-empty = { $used } пуста!
+mopping-system-full = { CAPITALIZE($used) } заполнена!
+mopping-system-empty = { CAPITALIZE($used) } пуста!
diff --git a/Resources/Locale/ru-RU/game-ticking/forcemap-command.ftl b/Resources/Locale/ru-RU/game-ticking/forcemap-command.ftl
index 224d2bf1b72..9c1a65bef94 100644
--- a/Resources/Locale/ru-RU/game-ticking/forcemap-command.ftl
+++ b/Resources/Locale/ru-RU/game-ticking/forcemap-command.ftl
@@ -3,5 +3,5 @@
forcemap-command-description = Заставляет игру начать с заданной карты в следующем раунде.
forcemap-command-help = forcemap