Update locale

Resources/Locale/en-US/ss14-ru/prototypes/body/organs/animal/animal.ftl

@@ -1,5 +1,7 @@
-ent-BaseAnimalOrgan = { ent-BaseItem }
+ent-BaseAnimalOrganUnGibbable = { ent-BaseItem }
     .desc = { ent-BaseItem.desc }
+ent-BaseAnimalOrgan = { ent-BaseAnimalOrganUnGibbable }
+    .desc = { ent-BaseAnimalOrganUnGibbable.desc }
 ent-OrganAnimalLungs = lungs
     .desc = { ent-BaseAnimalOrgan.desc }
 ent-OrganAnimalStomach = stomach

Resources/Locale/en-US/ss14-ru/prototypes/body/organs/human.ftl

@@ -1,5 +1,7 @@
-ent-BaseHumanOrgan = { ent-BaseItem }
+ent-BaseHumanOrganUnGibbable = { ent-BaseItem }
     .desc = { ent-BaseItem.desc }
+ent-BaseHumanOrgan = { ent-BaseHumanOrganUnGibbable }
+    .desc = { ent-BaseHumanOrganUnGibbable.desc }
 ent-OrganHumanBrain = brain
     .desc = The source of incredible, unending intelligence. Honk.
 ent-OrganHumanEyes = eyes

Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/belt.ftl

@@ -16,9 +16,9 @@ ent-ClothingBeltJanitorFilled = { ent-ClothingBeltJanitor }
 ent-ClothingBeltMedicalFilled = { ent-ClothingBeltMedical }
     .suffix = Filled
     .desc = { ent-ClothingBeltMedical.desc }
-ent-ClothingBeltParamedicFilled = EMT belt
+ent-ClothingBeltMedicalEMTFilled = { ent-ClothingBeltMedicalEMT }
     .suffix = Paramedic,Filled
-    .desc = { ent-ClothingBeltMedical.desc }
+    .desc = { ent-ClothingBeltMedicalEMT.desc }
 ent-ClothingBeltPlantFilled = { ent-ClothingBeltPlant }
     .suffix = Filled
     .desc = { ent-ClothingBeltPlant.desc }

Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/heads.ftl

@@ -5,6 +5,9 @@ ent-LockerCaptainFilledHardsuit = { ent-LockerCaptain }
     .suffix = Filled, Hardsuit
     .desc = { ent-LockerCaptain.desc }
 ent-LockerCaptainFilled = { ent-LockerCaptain }
+    .suffix = Filled, AntiqueLaser
+    .desc = { ent-LockerCaptain.desc }
+ent-LockerCaptainFilledNoLaser = { ent-LockerCaptain }
     .suffix = Filled
     .desc = { ent-LockerCaptain.desc }
 ent-LockerHeadOfPersonnelFilled = { ent-LockerHeadOfPersonnel }

Resources/Locale/en-US/ss14-ru/prototypes/corvax/catalog/fills/paper/document.ftl

@@ -57,8 +57,7 @@ ent-PrintedDocumentRequestModernization = Request for modernization
 ent-PrintedDocumentComplaintViolationLaborRules = Complaint for violation of labor order
     .desc = { ent-PrintedDocument.desc }
 ent-PrintedDocumentComplaintOffense = Complaint about an offense
-
-  .desc = { ent-PrintedDocument.desc }
+    .desc = { ent-PrintedDocument.desc }
 ent-PrintedDocumentPermissionEquipment = Authorization to use equipment
     .desc = { ent-PrintedDocument.desc }
 ent-PrintedDocumentPermissionToTravelInCaseOfThreat = Permission to travel in case of threat

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl

@@ -8,6 +8,8 @@ ent-ClothingBeltJanitor = janibelt
     .desc = A belt used to hold most janitorial supplies.
 ent-ClothingBeltMedical = medical belt
     .desc = Can hold various medical equipment.
+ent-ClothingBeltMedicalEMT = EMT belt
+    .desc = Perfect for holding various equipment for medical emergencies.
 ent-ClothingBeltPlant = botanical belt
     .desc = A belt used to hold most hydroponics supplies. Suprisingly, not green.
 ent-ClothingBeltChef = chef belt

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/bandanas.ftl

@@ -1,3 +1,5 @@
+ent-ClothingHeadBandBase = { ent-ClothingHeadBaseButcherable }
+  .desc = { ent-ClothingHeadBaseButcherable.desc }
 ent-ClothingHeadBandBlack = black bandana
     .desc = A black bandana to make you look cool.
 ent-ClothingHeadBandBlue = blue bandana

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl

@@ -10,6 +10,8 @@ ent-ClothingHeadHatBeretRND = scientific beret
     .desc = A beret for real scientists.
 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 = 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
@@ -150,3 +152,5 @@ ent-ClothingHeadHatCowboyWhite = white cowboy hat
     .desc = { ent-ClothingHeadHatCowboyBrown.desc }
 ent-ClothingHeadHatCowboyBountyHunter = bounty hunter cowboy hat
     .desc = { ent-ClothingHeadHatCowboyBrown.desc }
+ent-ClothingHeadHatStrawHat = straw hat
+    .desc = A fancy hat for hot days! Not recommended to wear near fires.

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/soft.ftl

@@ -1,60 +1,65 @@
+ent-ClothingHeadHeadHatBaseFlippable = { ent-ClothingHeadBaseButcherable }
+  .desc = { ent-ClothingHeadBaseButcherable.desc }
+ent-ClothingHeadHeadHatBaseFlipped = { ent-ClothingHeadHeadHatBaseFlippable }
+    .suffix = flipped
+    .desc = { ent-ClothingHeadHeadHatBaseFlippable.desc }
 ent-ClothingHeadHatBluesoft = blue cap
     .desc = It's a baseball hat in a tasteless blue colour.
-ent-ClothingHeadHatBluesoftFlipped = blue cap flipped
-    .desc = It's a baseball hat in a tasteless blue colour. Flipped.
+ent-ClothingHeadHatBluesoftFlipped = blue cap
+  .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
 ent-ClothingHeadHatCargosoft = cargo cap
     .desc = It's a baseball hat painted in Cargo colours.
-ent-ClothingHeadHatCargosoftFlipped = cargo cap flipped
-    .desc = It's a baseball hat painted in Cargo colours. Flipped.
+ent-ClothingHeadHatCargosoftFlipped = cargo cap
+  .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
 ent-ClothingHeadHatQMsoft = quartermaster's cap
     .desc = It's a baseball hat painted in the Quartermaster's colors.
-ent-ClothingHeadHatQMsoftFlipped = quartermaster's cap flipped
-    .desc = It's a baseball hat painted in the Quartermaster's colors. Flipped.
+ent-ClothingHeadHatQMsoftFlipped = quartermaster's cap
+  .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
 ent-ClothingHeadHatCorpsoft = corporate cap
     .desc = A baseball bat in corporation colors.
-ent-ClothingHeadHatCorpsoftFlipped = corporate cap flipped
-    .desc = A baseball bat in corporation colors. Flipped.
+ent-ClothingHeadHatCorpsoftFlipped = corporate cap
+  .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
 ent-ClothingHeadHatGreensoft = green cap
     .desc = It's a baseball hat in a tasteless green colour.
-ent-ClothingHeadHatGreensoftFlipped = green cap flipped
-    .desc = It's a baseball hat in a tasteless green colour. Flipped.
+ent-ClothingHeadHatGreensoftFlipped = green cap
+  .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
 ent-ClothingHeadHatBlacksoft = black cap
     .desc = It's a baseball hat in a tasteless black colour.
-ent-ClothingHeadHatBlacksoftFlipped = black cap flipped
-    .desc = It's a baseball hat in a tasteless black colour. Flipped.
+ent-ClothingHeadHatBlacksoftFlipped = black cap
+  .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
 ent-ClothingHeadHatGreysoft = grey cap
     .desc = It's a baseball hat in a tasteless grey colour.
-ent-ClothingHeadHatGreysoftFlipped = grey cap flipped
-    .desc = It's a baseball hat in a tasteless grey colour. Flipped.
+ent-ClothingHeadHatGreysoftFlipped = grey cap
+  .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
 ent-ClothingHeadHatMimesoft = mime cap
     .desc = It's a baseball hat in a tasteless white colour.
-ent-ClothingHeadHatMimesoftFlipped = mime cap flipped
-    .desc = It's a baseball hat in a tasteless white colour. Flipped.
+ent-ClothingHeadHatMimesoftFlipped = mime cap
+  .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
 ent-ClothingHeadHatOrangesoft = orange cap
     .desc = It's a baseball hat in a good-looking orange colour.
-ent-ClothingHeadHatOrangesoftFlipped = orange cap flipped
-    .desc = It's a baseball hat in a good-looking orange colour. Flipped.
+ent-ClothingHeadHatOrangesoftFlipped = orange cap
+  .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
 ent-ClothingHeadHatPurplesoft = purple cap
     .desc = It's a baseball hat in a tasteless purple colour.
-ent-ClothingHeadHatPurplesoftFlipped = purple cap flipped
-    .desc = It's a baseball hat in a tasteless purple colour. Flipped.
+ent-ClothingHeadHatPurplesoftFlipped = purple cap
+  .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
 ent-ClothingHeadHatRedsoft = red cap
     .desc = It's a baseball hat in a tasteless red colour.
-ent-ClothingHeadHatRedsoftFlipped = red cap flipped
-    .desc = It's a baseball hat in a tasteless purple colour. Flipped.
+ent-ClothingHeadHatRedsoftFlipped = red cap
+  .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
 ent-ClothingHeadHatSecsoft = security cap
     .desc = It's a robust baseball hat in tasteful red colour.
-ent-ClothingHeadHatSecsoftFlipped = security cap flipped
-    .desc = It's a robust baseball hat in tasteful red colour. Flipped.
+ent-ClothingHeadHatSecsoftFlipped = security cap
+  .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
 ent-ClothingHeadHatYellowsoft = yellow cap
     .desc = A yellow baseball hat.
-ent-ClothingHeadHatYellowsoftFlipped = yellow cap flipped
-    .desc = A yellow flipped baseball hat.
-ent-ClothingHeadHatBizarreSoft = troublemaker's soft
+ent-ClothingHeadHatYellowsoftFlipped = yellow cap
+  .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
+ent-ClothingHeadHatBizarreSoft = troublemaker's cap
     .desc = A truly.. bizarre accessory.
-ent-ClothingHeadHatBizarreSoftFlipped = troublemaker's soft flipped
-    .desc = A truly.. bizarre accessory, flipped.
+ent-ClothingHeadHatBizarreSoftFlipped = troublemaker's cap
+  .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
 ent-ClothingHeadHatParamedicsoft = paramedic cap
     .desc = It's a paramedic's baseball hat with a medical logo.
-ent-ClothingHeadHatParamedicsoftFlipped = paramedic cap flipped
-    .desc = It's a paramedic's baseball hat with a medical logo. Flipped.
+ent-ClothingHeadHatParamedicsoftFlipped = paramedic cap
+  .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/bandanas.ftl

@@ -0,0 +1,22 @@
+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
+    .desc = A blue bandana to make you look cool.
+ent-ClothingMaskBandBotany = botany bandana
+    .desc = A botany bandana to make you look cool, made from natural fibers.
+ent-ClothingMaskBandGold = gold bandana
+    .desc = A gold bandana to make you look cool.
+ent-ClothingMaskBandGreen = green bandana
+    .desc = A green bandana to make you look cool.
+ent-ClothingMaskBandGrey = grey bandana
+    .desc = A grey bandana to make you look cool.
+ent-ClothingMaskBandRed = red bandana
+    .desc = A red bandana to make you look cool.
+ent-ClothingMaskBandSkull = skull bandana
+    .desc = A bandana with a skull to make you look even cooler.
+ent-ClothingMaskBandMerc = mercenary bandana
+    .desc = To protect the head from the sun, insects and other dangers of the higher path.
+ent-ClothingMaskBandBrown = brown bandana
+    .desc = A brown bandana to make you look cool.

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/base_clothingmask.ftl

@@ -4,3 +4,5 @@ ent-ClothingMaskPullableBase = { ent-ClothingMaskBase }
     .desc = { ent-ClothingMaskBase.desc }
 ent-ActionToggleMask = Toggle Mask
     .desc = Handy, but prevents insertion of pie into your pie hole.
+ent-ClothingMaskBaseButcherable = { ent-ClothingMaskBase }
+    .desc = { ent-ClothingMaskBase.desc }

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl

@@ -84,6 +84,8 @@ ent-ClothingUniformJumpsuitQM = quartermaster's jumpsuit
     .desc = What can brown do for you?
 ent-ClothingUniformJumpsuitQMTurtleneck = quartermasters's turtleneck
     .desc = A sharp turtleneck made for the hardy work environment of supply.
+ent-ClothingUniformJumpsuitQMFormal = quartermasters's formal suit
+    .desc = Inspired by the quartermasters of military's past, the perfect outfit for supplying a formal occasion.
 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

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl

@@ -1,5 +1,7 @@
 ent-DrinkCartonBaseFull = { ent-DrinkBase }
     .desc = { ent-DrinkBase.desc }
+ent-DrinkCartonVisualsOpenable = { "" }
+    .desc = { "" }
 ent-DrinkJuiceLimeCarton = lime juice
     .desc = Sweet-sour goodness.
 ent-DrinkJuiceOrangeCarton = orange juice