From a90d1000e5559de39eae4d5d28d68ad2290cc998 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Mon, 12 Feb 2024 13:07:26 +0300 Subject: [PATCH] Update locale --- .../prototypes/body/organs/animal/animal.ftl | 4 +- .../ss14-ru/prototypes/body/organs/human.ftl | 4 +- .../prototypes/catalog/fills/items/belt.ftl | 4 +- .../catalog/fills/lockers/heads.ftl | 3 + .../corvax/catalog/fills/paper/document.ftl | 3 +- .../entities/clothing/belt/belts.ftl | 2 + .../entities/clothing/head/bandanas.ftl | 2 + .../entities/clothing/head/hats.ftl | 4 + .../entities/clothing/head/soft.ftl | 67 +- .../entities/clothing/masks/bandanas.ftl | 22 + .../clothing/masks/base_clothingmask.ftl | 2 + .../entities/clothing/uniforms/jumpsuits.ftl | 2 + .../consumable/drinks/drinks-cartons.ftl | 2 + .../objects/consumable/drinks/drinks.ftl | 588 +++++++++++------- .../consumable/drinks/drinks_bottles.ftl | 4 + .../consumable/food/baked/donkpocket.ftl | 8 + .../consumable/food/containers/box.ftl | 4 + .../objects/consumable/food/produce.ftl | 2 + .../objects/devices/encryption_keys.ftl | 2 +- .../objects/devices/station_beacon.ftl | 3 + .../entities/objects/misc/paper.ftl | 4 +- .../entities/objects/misc/tiles.ftl | 4 + .../objects/specific/hydroponics/seeds.ftl | 2 + .../objects/specific/medical/healing.ftl | 2 + .../specific/robotics/borg_modules.ftl | 2 - .../structures/doors/airlocks/assembly.ftl | 66 +- .../machines/computers/computers.ftl | 2 +- .../entities/structures/storage/glass_box.ftl | 14 + .../prototypes/gamerules/roundstart.ftl | 2 + .../Locale/ru-RU/actions/actions/wagging.ftl | 2 - .../criminal-records/criminal-records.ftl | 43 ++ .../ru-RU/escape-menu/ui/options-menu.ftl | 1 + .../Locale/ru-RU/flavors/flavor-profiles.ftl | 2 + .../components/foldable-component.ftl | 1 + Resources/Locale/ru-RU/guidebook/guides.ftl | 1 + .../ru-RU/holiday/greet/holiday-greet.ftl | 1 - .../components/health-analyzer-component.ftl | 3 + .../ru-RU/navmap-beacons/station-beacons.ftl | 1 + Resources/Locale/ru-RU/reagents/laughter.ftl | 1 + .../Locale/ru-RU/reagents/meta/cleaning.ftl | 2 - .../meta/consumable/food/condiments.ftl | 2 + Resources/Locale/ru-RU/reagents/meta/fun.ftl | 2 + .../ru-RU/reagents/meta/physical-desc.ftl | 1 + .../Locale/ru-RU/research/technologies.ftl | 9 - Resources/Locale/ru-RU/seeds/seeds.ftl | 2 + .../prototypes/body/organs/animal/animal.ftl | 2 + .../ss14-ru/prototypes/body/organs/human.ftl | 2 + .../prototypes/catalog/fills/items/belt.ftl | 6 +- .../catalog/fills/lockers/heads.ftl | 3 + .../corvax/catalog/fills/paper/document.ftl | 2 +- .../entities/clothing/belt/belts.ftl | 2 + .../entities/clothing/head/bandanas.ftl | 2 + .../entities/clothing/head/hats.ftl | 4 + .../entities/clothing/head/soft.ftl | 5 + .../entities/clothing/masks/bandanas.ftl | 22 + .../clothing/masks/base_clothingmask.ftl | 2 + .../entities/clothing/uniforms/jumpsuits.ftl | 2 + .../consumable/drinks/drinks-cartons.ftl | 2 + .../objects/consumable/drinks/drinks.ftl | 118 ++++ .../consumable/drinks/drinks_bottles.ftl | 4 + .../consumable/food/baked/donkpocket.ftl | 8 + .../consumable/food/containers/box.ftl | 4 + .../objects/consumable/food/produce.ftl | 2 + .../objects/devices/station_beacon.ftl | 3 + .../entities/objects/misc/paper.ftl | 2 + .../entities/objects/misc/tiles.ftl | 4 + .../objects/specific/hydroponics/seeds.ftl | 2 + .../objects/specific/medical/healing.ftl | 2 + .../specific/robotics/borg_modules.ftl | 2 - .../entities/structures/storage/glass_box.ftl | 14 + Resources/Locale/ru-RU/station-laws/laws.ftl | 1 + Resources/Locale/ru-RU/tiles/tiles.ftl | 2 + 72 files changed, 798 insertions(+), 330 deletions(-) create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/bandanas.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl create mode 100644 Resources/Locale/ru-RU/criminal-records/criminal-records.ftl create mode 100644 Resources/Locale/ru-RU/reagents/laughter.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/bandanas.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/organs/animal/animal.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/organs/animal/animal.ftl index 54e09a8f646..59a05cca9c1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/body/organs/animal/animal.ftl +++ b/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 diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/organs/human.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/organs/human.ftl index 370bcc86c94..3fd9e92d250 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/body/organs/human.ftl +++ b/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 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 638c37a7a4c..79eaaf5782c 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 @@ -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 } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/heads.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/heads.ftl index 45fc4374df9..7a9cded267d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/heads.ftl +++ b/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 } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/catalog/fills/paper/document.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/catalog/fills/paper/document.ftl index 9ddaf4235d6..bae7ece90df 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/catalog/fills/paper/document.ftl +++ b/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 diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl index 4433fbaa4bf..da8133a7918 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl @@ -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 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 9d20a52a04b..4761ec38edc 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,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 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 e4e661f3246..15d1b1dccf3 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 @@ -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. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/soft.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/soft.ftl index 69c092e43d5..c5874424664 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/soft.ftl +++ b/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 } 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 new file mode 100644 index 00000000000..2cfa21964a3 --- /dev/null +++ b/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. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/base_clothingmask.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/base_clothingmask.ftl index 0c902c316f5..b180586cf4f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/base_clothingmask.ftl +++ b/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 } 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 3baa38615f8..44f16a25304 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 @@ -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 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 ede56a03b03..f7f6cf76818 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,7 @@ ent-DrinkCartonBaseFull = { ent-DrinkBase } .desc = { ent-DrinkBase.desc } +ent-DrinkCartonVisualsOpenable = { "" } + .desc = { "" } ent-DrinkJuiceLimeCarton = lime juice .desc = Sweet-sour goodness. ent-DrinkJuiceOrangeCarton = orange juice 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 668c27c78e1..57a79d02638 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 @@ -6,244 +6,361 @@ ent-DrinkGlass = metamorphic glass .desc = A metamorphic glass that automagically turns into a glass appropriate for the drink within. There's a sanded off patent number on the bottom. ent-DrinkGlassCoupeShaped = coupe glass .desc = A classic thin neck coupe glass, the icon of fragile labels on crates around the galaxy. -ent-DrinkAbsintheGlass = absinthe glass - .desc = Wormwood, anise, oh my. -ent-DrinkAcidSpitGlass = acid spit glass - .desc = A drink from the company archives. Made from live aliens. -ent-DrinkAleGlass = ale glass - .desc = A freezing pint of delicious ale -ent-DrinkAlliesCocktail = allies cocktail - .desc = A drink made from your allies. -ent-DrinkAloe = aloe glass - .desc = Very, very, very good. -ent-DrinkAmasecGlass = amasec glass - .desc = Always handy before COMBAT!!! -ent-DrinkAndalusia = andalusia glass - .desc = A nice drink with a strange name. -ent-DrinkAntifreeze = anti-freeze glass - .desc = The ultimate refreshment. -ent-DrinkAtomicBombGlass = atomic bomb glass - .desc = We cannot take legal responsibility for your actions after imbibing. -ent-DrinkB52Glass = b-52 glass - .desc = Coffee, Irish Cream, and cognac. You will get bombed. -ent-DrinkBahamaMama = bahama mama glass - .desc = Tropical cocktail. -ent-DrinkBananaHonkGlass = banana honk glass - .desc = A drink from Banana Heaven. -ent-DrinkBarefootGlass = barefoot glass - .desc = Barefoot and pregnant. -ent-DrinkBeepskySmashGlass = beepsky smash glass - .desc = Heavy, hot and strong. Just like the Iron fist of the LAW. -ent-DrinkBeerglass = beer glass - .desc = A freezing pint of beer. -ent-DrinkBerryJuice = berry juice - .desc = Berry juice. Or maybe it's jam. Who cares? -ent-DrinkBlackRussianGlass = black russian glass - .desc = For the lactose-intolerant. Still as classy as a White Russian. -ent-DrinkBlueCuracaoGlass = blue curacao - .desc = Exotically blue, fruity drink, distilled from oranges. -ent-DrinkBloodyMaryGlass = bloody mary glass - .desc = Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder. -ent-DrinkBooger = booger - .desc = Ewww... -ent-DrinkBraveBullGlass = brave bull glass - .desc = Tequilla and coffee liquor, brought together in a mouthwatering mixture. Drink up. -ent-DrinkCarrotJuice = carrot juice - .desc = It's just like a carrot but without crunching. -ent-DrinkChocolateGlass = hot chocolate - .desc = A heated drink consisting melted chocolate and heated milk. -ent-DrinkCoffee = coffee - .desc = Don't drop it, or you'll send scalding liquid and glass shards everywhere. -ent-DrinkCognacGlass = cognac glass - .desc = Damn, you feel like some kind of French aristocrat just by holding this. -ent-DrinkCream = cream - .desc = Ewwww... -ent-DrinkCubaLibreGlass = cuba libre glass - .desc = A classic mix of rum and cola. -ent-DrinkDeadRumGlass = deadrum glass - .desc = Popular with the sailors. Not very popular with everyone else. -ent-DrinkDemonsBlood = demons blood - .desc = Just looking at this thing makes the hair at the back of your neck stand up. -ent-DrinkDevilsKiss = devil's kiss - .desc = Creepy time! -ent-DrinkDoctorsDelightGlass = the doctor's delight - .desc = A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place. -ent-DrinkDriestMartiniGlass = driest martini glass - .desc = Only for the experienced. You think you see sand floating in the glass. -ent-DrinkDrGibbGlass = Dr. Gibb glass - .desc = Dr. Gibb. Not as dangerous as the name might imply. -ent-DrinkErikaSurprise = erika surprise - .desc = The surprise is, it's green! -ent-DrinkFourteenLokoGlass = Fourteen Loko glass - .desc = This is a container of Fourteen Loko, it appears to be of the highest quality. The drink, not the container. -ent-DrinkGargleBlasterGlass = pan-galactic gargle blaster - .desc = Does... does this mean that Arthur and Ford are on the ship? Oh joy. -ent-DrinkGinGlass = gin - .desc = Crystal clear Griffeater gin. -ent-DrinkGinFizzGlass = gin fizz glass - .desc = Refreshingly lemony, deliciously dry. -ent-DrinkGinTonicglass = gin and tonic - .desc = A mild but still great cocktail. Drink up, like a true Englishman. -ent-DrinkGildlagerGlass = gildlager glass - .desc = 100 proof that teen girls will drink anything with gold in it. -ent-DrinkGrapeJuice = grape juice - .desc = It's grrrrrape! -ent-DrinkGrapeSodaGlass = grape soda glass - .desc = Looks like a delicious drink! -ent-DrinkGreenTeaGlass = green tea glass - .desc = Tasty green tea. It has antioxidants; it's good for you! -ent-DrinkGrenadineGlass = grenadine syrup glass - .desc = Sweet and tangy, a bar syrup used to add color or flavor to drinks. -ent-DrinkGrogGlass = grog glass - .desc = A fine and cepa drink for Space. -ent-DrinkHippiesDelightGlass = hippies' delight glass - .desc = A drink enjoyed by people during the 1960's. -ent-DrinkHoochGlass = hooch +ent-DrinkAbsintheGlass = { ent-DrinkGlass } + .suffix = absinthe + .desc = { ent-DrinkGlass.desc } +ent-DrinkAcidSpitGlass = { ent-DrinkGlass } + .suffix = acid spit + .desc = { ent-DrinkGlass.desc } +ent-DrinkAleGlass = { ent-DrinkGlass } + .suffix = ale + .desc = { ent-DrinkGlass.desc } +ent-DrinkAlliesCocktail = { ent-DrinkGlass } + .suffix = allies cocktail + .desc = { ent-DrinkGlass.desc } +ent-DrinkAloe = { ent-DrinkGlass } + .suffix = aloe + .desc = { ent-DrinkGlass.desc } +ent-DrinkAmasecGlass = { ent-DrinkGlass } + .suffix = amasec + .desc = { ent-DrinkGlass.desc } +ent-DrinkAndalusia = { ent-DrinkGlass } + .suffix = andalusia + .desc = { ent-DrinkGlass.desc } +ent-DrinkAntifreeze = { ent-DrinkGlass } + .suffix = antifreeze + .desc = { ent-DrinkGlass.desc } +ent-DrinkAtomicBombGlass = { ent-DrinkGlass } + .suffix = atomic bomb + .desc = { ent-DrinkGlass.desc } +ent-DrinkB52Glass = { ent-DrinkGlass } + .suffix = b-52 + .desc = { ent-DrinkGlass.desc } +ent-DrinkBahamaMama = { ent-DrinkGlass } + .suffix = bahama mama + .desc = { ent-DrinkGlass.desc } +ent-DrinkBananaHonkGlass = { ent-DrinkGlass } + .suffix = banana honk + .desc = { ent-DrinkGlass.desc } +ent-DrinkBarefootGlass = { ent-DrinkGlass } + .suffix = barefoot + .desc = { ent-DrinkGlass.desc } +ent-DrinkBeepskySmashGlass = { ent-DrinkGlass } + .suffix = beepsky smash + .desc = { ent-DrinkGlass.desc } +ent-DrinkBeerglass = { ent-DrinkGlass } + .suffix = beer + .desc = { ent-DrinkGlass.desc } +ent-DrinkBerryJuice = { ent-DrinkGlass } + .suffix = berry juice + .desc = { ent-DrinkGlass.desc } +ent-DrinkBlackRussianGlass = { ent-DrinkGlass } + .suffix = black russian + .desc = { ent-DrinkGlass.desc } +ent-DrinkBlueCuracaoGlass = { ent-DrinkGlass } + .suffix = blue curacao + .desc = { ent-DrinkGlass.desc } +ent-DrinkBloodyMaryGlass = { ent-DrinkGlass } + .suffix = bloody mary + .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-DrinkCarrotJuice = { ent-DrinkGlass } + .suffix = carrot juice + .desc = { ent-DrinkGlass.desc } +ent-DrinkChocolateGlass = { ent-DrinkGlass } + .suffix = chocolate + .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-DrinkCream = { ent-DrinkGlass } + .suffix = cream + .desc = { ent-DrinkGlass.desc } +ent-DrinkCubaLibreGlass = { ent-DrinkGlass } + .suffix = cuba libre + .desc = { ent-DrinkGlass.desc } +ent-DrinkDeadRumGlass = { ent-DrinkGlass } + .suffix = dead rum + .desc = { ent-DrinkGlass.desc } +ent-DrinkDemonsBlood = { ent-DrinkGlass } + .suffix = demon's blood + .desc = { ent-DrinkGlass.desc } +ent-DrinkDevilsKiss = { ent-DrinkGlass } + .suffix = devil's kiss + .desc = { ent-DrinkGlass.desc } +ent-DrinkDoctorsDelightGlass = { ent-DrinkGlass } + .suffix = doctor's delight + .desc = { ent-DrinkGlass.desc } +ent-DrinkDriestMartiniGlass = { ent-DrinkGlass } + .suffix = driest martini + .desc = { ent-DrinkGlass.desc } +ent-DrinkDrGibbGlass = { ent-DrinkGlass } + .suffix = dr gibb + .desc = { ent-DrinkGlass.desc } +ent-DrinkErikaSurprise = { ent-DrinkGlass } + .suffix = erika surprise + .desc = { ent-DrinkGlass.desc } +ent-DrinkFourteenLokoGlass = { ent-DrinkGlass } + .suffix = fourteen loko + .desc = { ent-DrinkGlass.desc } +ent-DrinkGargleBlasterGlass = { ent-DrinkGlass } + .suffix = pan-galactic gargle blaster + .desc = { ent-DrinkGlass.desc } +ent-DrinkGinGlass = { ent-DrinkGlass } + .suffix = gin + .desc = { ent-DrinkGlass.desc } +ent-DrinkGinFizzGlass = { ent-DrinkGlass } + .suffix = gin fizz + .desc = { ent-DrinkGlass.desc } +ent-DrinkGinTonicglass = { ent-DrinkGlass } + .suffix = gin and tonic + .desc = { ent-DrinkGlass.desc } +ent-DrinkGildlagerGlass = { ent-DrinkGlass } + .suffix = gildlager + .desc = { ent-DrinkGlass.desc } +ent-DrinkGrapeJuice = { ent-DrinkGlass } + .suffix = grape juice + .desc = { ent-DrinkGlass.desc } +ent-DrinkGrapeSodaGlass = { ent-DrinkGlass } + .suffix = grape soda + .desc = { ent-DrinkGlass.desc } +ent-DrinkGreenTeaGlass = { ent-DrinkGlass } + .suffix = green tea + .desc = { ent-DrinkGlass.desc } +ent-DrinkGrenadineGlass = { ent-DrinkGlass } + .suffix = grenadine + .desc = { ent-DrinkGlass.desc } +ent-DrinkGrogGlass = { ent-DrinkGlass } + .suffix = grog + .desc = { ent-DrinkGlass.desc } +ent-DrinkHippiesDelightGlass = { ent-DrinkGlass } + .suffix = hippies' delight + .desc = { ent-DrinkGlass.desc } +ent-DrinkHoochGlass = { ent-DrinkGlass } .desc = You've really hit rock bottom now... your liver packed its bags and left last night. -ent-DrinkIcedCoffeeGlass = iced coffee glass - .desc = A drink to perk you up and refresh you! -ent-DrinkIcedGreenTeaGlass = iced green tea glass - .desc = It looks like green tea with ice. One might even call it iced green tea. -ent-DrinkIcedTeaGlass = iced tea - .desc = A refreshing southern beverage. -ent-DrinkIcedBeerGlass = iced beer glass - .desc = A beer so frosty, the air around it freezes. -ent-DrinkIceGlass = ice glass - .desc = Generally, you're supposed to put something else in there too... -ent-DrinkIceCreamGlass = ice cream glass - .desc = A glass full of good old ice cream. Might want a spoon. -ent-DrinkIrishCarBomb = irish car bomb - .desc = An irish car bomb. -ent-DrinkIrishCoffeeGlass = irish coffee glass - .desc = Coffee and alcohol. More fun than a Mimosa to drink in the morning. -ent-DrinkIrishCreamGlass = irish cream glass - .desc = It's cream, mixed with whiskey. What else would you expect from the Irish? -ent-DrinkCoffeeLiqueurGlass = coffee liqueur glass - .desc = DAMN, THIS THING LOOKS ROBUST -ent-DrinkKiraSpecial = kira special - .desc = Long live the guy who everyone had mistaken for a girl. Baka! -ent-DrinkLemonadeGlass = lemonade glass - .desc = Oh the nostalgia... -ent-DrinkLemonJuice = lemon juice - .desc = Sour... -ent-DrinkLemonLime = lemon lime - .desc = A tangy substance made of 0.5% natural citrus! -ent-DrinkLimeJuice = lime juice - .desc = It's some sweet-sour lime juice. -ent-DrinkLongIslandIcedTeaGlass = long island iced tea glass - .desc = The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only. -ent-DrinkManhattanGlass = manhattan glass - .desc = The Detective's undercover drink of choice. He never could stomach gin... -ent-DrinkManhattanProjectGlass = manhattan project glass - .desc = A scientist's drink of choice, for pondering ways to blow up the station. -ent-DrinkManlyDorfGlass = the manly dorf glass - .desc = A manly concotion made from Ale and Beer. Intended for true men only. -ent-DrinkMargaritaGlass = margarita glass - .desc = On the rocks with salt on the rim. Arriba~! -ent-DrinkMartiniGlass = classic martini glass - .desc = Damn, the bartender even stirred it, not shook it. -ent-DrinkMeadGlass = mead glass - .desc = A Viking's beverage, though a cheap one. -ent-DrinkMilkshake = milkshake - .desc = Glorious brainfreezing mixture. -ent-DrinkMojito = mojito - .desc = Fresh from Spesscuba. -ent-DrinkNeurotoxinGlass = neurotoxin glass - .desc = A drink that is guaranteed to knock you silly. -ent-DrinkNothing = nothing - .desc = Absolutely nothing. -ent-DrinkNTCahors = neotheology cahors whine - .desc = It looks like wine, but more dark. -ent-DrinkNuclearColaGlass = nuclear cola glass - .desc = Don't cry, Don't raise your eye, It's only nuclear wasteland. -ent-DrinkOrangeJuice = orange juice - .desc = Vitamins! Yay! -ent-DrinkPatronGlass = patron glass - .desc = Drinking patron in the bar, with all the subpar ladies. -ent-DrinkPoisonBerryJuice = poison berry juice - .desc = Looks like some deadly juice. -ent-DrinkPoisonWineGlass = poison wine glass - .desc = A black ichor with an oily purple sheer on top. Are you sure you should drink this? -ent-DrinkPoscaGlass = posca glass - .desc = Poor warriors' drink from a forgotten era. -ent-DrinkRedMeadGlass = red mead glass - .desc = A true Viking's beverage, though its color is strange. -ent-DrinkRewriter = rewriter - .desc = The secret of the sanctuary of the Libarian... -ent-DrinkRootBeerGlass = root beer glass - .desc = Fizzy, foamy, and full of sweet, non-caffienated goodness. -ent-DrinkRootBeerFloatGlass = root beer float glass - .desc = Fizzy, foamy, and now with ice cream on top! Amazing! -ent-DrinkRumGlass = rum glass - .desc = Now you want to Pray for a pirate suit, don't you? -ent-DrinkSakeGlass = sake glass - .desc = Wine made from rice, it's sake! -ent-DrinkSbitenGlass = sbiten glass - .desc = A spicy mix of Vodka and Spice. Very hot. -ent-DrinkScrewdriverCocktailGlass = screwdriver glass - .desc = A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer. -ent-DrinkCogChampBase = cogchamp glass - .desc = This mix of Cognac, Screwdriver and Welding Fuel will have you seeing His light surely! -ent-DrinkSuiDreamGlass = sui dream glass - .desc = A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame. -ent-DrinkEmeraldGlass = melon liquor - .desc = A relatively sweet and fruity 46 proof liquor. -ent-DrinkMoonshineGlass = moonshine - .desc = You've really hit rock bottom now... your liver packed its bags and left last night. -ent-DrinkGlassWhite = milk - .desc = White and nutritious goodness! -ent-DrinkSilencerGlass = silencer glass - .desc = A drink from Mime Heaven. -ent-DrinkSingulo = singulo - .desc = A blue-space beverage! -ent-DrinkSnowWhite = snow white - .desc = A cold refreshment. -ent-DrinkSoyLatte = soy latte - .desc = A nice and refreshing beverage while you are reading. -ent-DrinkSpaceUpGlass = space-up glass - .desc = Space-up. It helps keep your cool. -ent-DrinkSpaceMountainWindGlass = space mountain wind glass - .desc = Space Mountain Wind. As you know, there are no mountains in space, only wind. -ent-DrinkSyndicatebomb = syndicate bomb - .desc = Tastes like terrorism! -ent-DrinkTeaGlass = tea glass - .desc = Tasty black tea. It has antioxidants; it's good for you! + .suffix = hooch +ent-DrinkIcedCoffeeGlass = { ent-DrinkGlass } + .suffix = iced coffee + .desc = { ent-DrinkGlass.desc } +ent-DrinkIcedGreenTeaGlass = { ent-DrinkGlass } + .suffix = iced green tea + .desc = { ent-DrinkGlass.desc } +ent-DrinkIcedTeaGlass = { ent-DrinkGlass } + .suffix = iced tea + .desc = { ent-DrinkGlass.desc } +ent-DrinkIcedBeerGlass = { ent-DrinkGlass } + .suffix = iced beer + .desc = { ent-DrinkGlass.desc } +ent-DrinkIceGlass = { ent-DrinkGlass } + .suffix = ice + .desc = { ent-DrinkGlass.desc } +ent-DrinkIceCreamGlass = { ent-DrinkGlass } + .suffix = ice cream + .desc = { ent-DrinkGlass.desc } +ent-DrinkIrishCarBomb = { ent-DrinkGlass } + .suffix = irish car bomb + .desc = { ent-DrinkGlass.desc } +ent-DrinkIrishCoffeeGlass = { ent-DrinkGlass } + .suffix = irish coffee + .desc = { ent-DrinkGlass.desc } +ent-DrinkIrishCreamGlass = { ent-DrinkGlass } + .suffix = irish cream + .desc = { ent-DrinkGlass.desc } +ent-DrinkCoffeeLiqueurGlass = { ent-DrinkGlass } + .suffix = coffee liqueur + .desc = { ent-DrinkGlass.desc } +ent-DrinkKiraSpecial = { ent-DrinkGlass } + .suffix = kira special + .desc = { ent-DrinkGlass.desc } +ent-DrinkLemonadeGlass = { ent-DrinkGlass } + .suffix = lemonade + .desc = { ent-DrinkGlass.desc } +ent-DrinkLemonJuice = { ent-DrinkGlass } + .suffix = lemon juice + .desc = { ent-DrinkGlass.desc } +ent-DrinkLemonLime = { ent-DrinkGlass } + .suffix = lemon lime + .desc = { ent-DrinkGlass.desc } +ent-DrinkLimeJuice = { ent-DrinkGlass } + .suffix = lime juice + .desc = { ent-DrinkGlass.desc } +ent-DrinkLongIslandIcedTeaGlass = { ent-DrinkGlass } + .suffix = long island iced tea + .desc = { ent-DrinkGlass.desc } +ent-DrinkManhattanGlass = { ent-DrinkGlass } + .suffix = manhattan + .desc = { ent-DrinkGlass.desc } +ent-DrinkManhattanProjectGlass = { ent-DrinkGlass } + .suffix = manhattan project + .desc = { ent-DrinkGlass.desc } +ent-DrinkManlyDorfGlass = { ent-DrinkGlass } + .suffix = manly dorf + .desc = { ent-DrinkGlass.desc } +ent-DrinkMargaritaGlass = { ent-DrinkGlass } + .suffix = margarita + .desc = { ent-DrinkGlass.desc } +ent-DrinkMartiniGlass = { ent-DrinkGlass } + .suffix = classic martini + .desc = { ent-DrinkGlass.desc } +ent-DrinkMeadGlass = { ent-DrinkGlass } + .suffix = mead + .desc = { ent-DrinkGlass.desc } +ent-DrinkMilkshake = { ent-DrinkGlass } + .suffix = milkshake + .desc = { ent-DrinkGlass.desc } +ent-DrinkMojito = { ent-DrinkGlass } + .suffix = mojito + .desc = { ent-DrinkGlass.desc } +ent-DrinkNeurotoxinGlass = { ent-DrinkGlass } + .suffix = neurotoxin + .desc = { ent-DrinkGlass.desc } +ent-DrinkNothing = { ent-DrinkGlass } + .suffix = nothing + .desc = { ent-DrinkGlass.desc } +ent-DrinkNTCahors = { ent-DrinkGlass } + .suffix = neotheology cahors whine + .desc = { ent-DrinkGlass.desc } +ent-DrinkNuclearColaGlass = { ent-DrinkGlass } + .suffix = nuclear cola + .desc = { ent-DrinkGlass.desc } +ent-DrinkOrangeJuice = { ent-DrinkGlass } + .suffix = orange juice + .desc = { ent-DrinkGlass.desc } +ent-DrinkPatronGlass = { ent-DrinkGlass } + .suffix = patron + .desc = { ent-DrinkGlass.desc } +ent-DrinkPoisonBerryJuice = { ent-DrinkGlass } + .suffix = poison berry juice + .desc = { ent-DrinkGlass.desc } +ent-DrinkPoisonWineGlass = { ent-DrinkGlass } + .suffix = poison wine + .desc = { ent-DrinkGlass.desc } +ent-DrinkPoscaGlass = { ent-DrinkGlass } + .suffix = posca + .desc = { ent-DrinkGlass.desc } +ent-DrinkRedMeadGlass = { ent-DrinkGlass } + .suffix = red mead + .desc = { ent-DrinkGlass.desc } +ent-DrinkRewriter = { ent-DrinkGlass } + .suffix = rewriter + .desc = { ent-DrinkGlass.desc } +ent-DrinkRootBeerGlass = { ent-DrinkGlass } + .suffix = root beer + .desc = { ent-DrinkGlass.desc } +ent-DrinkRootBeerFloatGlass = { ent-DrinkGlass } + .suffix = root beer float + .desc = { ent-DrinkGlass.desc } +ent-DrinkRumGlass = { ent-DrinkGlass } + .suffix = rum + .desc = { ent-DrinkGlass.desc } +ent-DrinkSakeGlass = { ent-DrinkGlass } + .suffix = sake + .desc = { ent-DrinkGlass.desc } +ent-DrinkSbitenGlass = { ent-DrinkGlass } + .suffix = sbiten + .desc = { ent-DrinkGlass.desc } +ent-DrinkScrewdriverCocktailGlass = { ent-DrinkGlass } + .suffix = screwdriver + .desc = { ent-DrinkGlass.desc } +ent-DrinkCogChampBase = { ent-DrinkGlass } + .suffix = cogchamp + .desc = { ent-DrinkGlass.desc } +ent-DrinkSuiDreamGlass = { ent-DrinkGlass } + .suffix = sui dream + .desc = { ent-DrinkGlass.desc } +ent-DrinkEmeraldGlass = { ent-DrinkGlass } + .suffix = melon liquor + .desc = { ent-DrinkGlass.desc } +ent-DrinkMoonshineGlass = { ent-DrinkGlass } + .suffix = moonshine + .desc = { ent-DrinkGlass.desc } +ent-DrinkGlassWhite = { ent-DrinkGlass } + .suffix = milk + .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-DrinkSnowWhite = { ent-DrinkGlass } + .suffix = snow white + .desc = { ent-DrinkGlass.desc } +ent-DrinkSoyLatte = { ent-DrinkGlass } + .suffix = soy latte + .desc = { ent-DrinkGlass.desc } +ent-DrinkSpaceUpGlass = { ent-DrinkGlass } + .suffix = space-up + .desc = { ent-DrinkGlass.desc } +ent-DrinkSpaceMountainWindGlass = { ent-DrinkGlass } + .suffix = space mountain wind + .desc = { ent-DrinkGlass.desc } +ent-DrinkSyndicatebomb = { ent-DrinkGlass } + .suffix = syndicate bomb + .desc = { ent-DrinkGlass.desc } +ent-DrinkTeaGlass = { ent-DrinkGlass } + .suffix = tea + .desc = { ent-DrinkGlass.desc } ent-DrinkTeapot = teapot .desc = An elegant teapot. It simply oozes class. -ent-DrinkTequilaGlass = tequila glass - .desc = Now all that's missing is the weird colored shades! -ent-DrinkTequilaSunriseGlass = tequila sunrise glass - .desc = Oh great, now you feel nostalgic about sunrises back on Terra... -ent-DrinkTheMartinez = The Martinez glass - .desc = The edgerunner legend. Remembered by a drink, Forgotten by a drunk. -ent-DrinkThreeMileIslandGlass = three mile island glass - .desc = A glass of this is sure to prevent a meltdown. -ent-DrinkTomatoJuice = tomato juice - .desc = Are you sure this is tomato juice? -ent-DrinkToxinsSpecialGlass = toxins special glass - .desc = Woah, this thing is on FIRE -ent-DrinkVermouthGlass = vermouth glass - .desc = You wonder why you're even drinking this straight. -ent-DrinkVodkaGlass = vodka glass - .desc = Number one drink and fueling choice for Russians worldwide. -ent-DrinkVodkaMartiniGlass = vodka martini glass - .desc = A bastardisation of the classic martini. Still great. -ent-DrinkVodkaTonicGlass = vodka tonic glass - .desc = For when a gin and tonic isn't russian enough. +ent-DrinkTequilaGlass = { ent-DrinkGlass } + .suffix = tequila + .desc = { ent-DrinkGlass.desc } +ent-DrinkTequilaSunriseGlass = { ent-DrinkGlass } + .suffix = tequila sunrise + .desc = { ent-DrinkGlass.desc } +ent-DrinkTheMartinez = { ent-DrinkGlass } + .suffix = The Martinez + .desc = { ent-DrinkGlass.desc } +ent-DrinkThreeMileIslandGlass = { ent-DrinkGlass } + .suffix = three mile island + .desc = { ent-DrinkGlass.desc } +ent-DrinkTomatoJuice = { ent-DrinkGlass } + .suffix = tomato juice + .desc = { ent-DrinkGlass.desc } +ent-DrinkToxinsSpecialGlass = { ent-DrinkGlass } + .suffix = toxins special + .desc = { ent-DrinkGlass.desc } +ent-DrinkVermouthGlass = { ent-DrinkGlass } + .suffix = vermouth + .desc = { ent-DrinkGlass.desc } +ent-DrinkVodkaGlass = { ent-DrinkGlass } + .suffix = vodka + .desc = { ent-DrinkGlass.desc } +ent-DrinkVodkaMartiniGlass = { ent-DrinkGlass } + .suffix = vodka martini + .desc = { ent-DrinkGlass.desc } +ent-DrinkVodkaTonicGlass = { ent-DrinkGlass } + .suffix = vodka tonic + .desc = { ent-DrinkGlass.desc } ent-DrinkWaterJug = water jug .desc = Stay hydrated -ent-DrinkWatermelonJuice = watermelon juice - .desc = Delicious juice made from watermelon. -ent-DrinkWhiskeyColaGlass = whiskey cola glass - .desc = An innocent-looking mixture of cola and Whiskey. Delicious. -ent-DrinkWhiskeyGlass = whiskey glass - .desc = The silky, smoky whiskey goodness inside makes the drink look very classy. -ent-DrinkWhiskeySodaGlass = whiskey soda glass - .desc = Ultimate refreshment. -ent-DrinkWhiteRussianGlass = white russian glass - .desc = A very nice looking drink. But that's just, like, your opinion, man. -ent-DrinkWineGlass = wine glass - .desc = A very classy looking drink. +ent-DrinkWatermelonJuice = { ent-DrinkGlass } + .suffix = watermelon juice + .desc = { ent-DrinkGlass.desc } +ent-DrinkWhiskeyColaGlass = { ent-DrinkGlass } + .suffix = whiskey cola + .desc = { ent-DrinkGlass.desc } +ent-DrinkWhiskeyGlass = { ent-DrinkGlass } + .suffix = whiskey + .desc = { ent-DrinkGlass.desc } +ent-DrinkWhiskeySodaGlass = { ent-DrinkGlass } + .suffix = whiskey soda + .desc = { ent-DrinkGlass.desc } +ent-DrinkWhiteRussianGlass = { ent-DrinkGlass } + .suffix = white russian + .desc = { ent-DrinkGlass.desc } +ent-DrinkWineGlass = { ent-DrinkGlass } + .suffix = wine + .desc = { ent-DrinkGlass.desc } ent-DrinkShakeBlue = blue milkshake .desc = { ent-DrinkGlassBase.desc } ent-DrinkShakeEmpty = shakeempty @@ -258,5 +375,6 @@ ent-DrinkRamen = cup ramen .desc = Just add 10ml boiling water. A taste that reminds you of your school years. ent-DrinkHellRamen = hell ramen .desc = Just add 10ml boiling water. Super spicy flavor. -ent-DrinkBloodGlass = blood glass - .desc = Drink like a vampire! +ent-DrinkBloodGlass = { ent-DrinkGlass } + .suffix = blood + .desc = { ent-DrinkGlass.desc } 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 a164a53a481..9b723819853 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 @@ -2,6 +2,10 @@ ent-DrinkBottlePlasticBaseFull = { ent-DrinkBase } .desc = { ent-DrinkBase.desc } ent-DrinkBottleGlassBaseFull = { ent-DrinkBottlePlasticBaseFull } .desc = { ent-DrinkBottlePlasticBaseFull.desc } +ent-DrinkBottleVisualsOpenable = { "" } + .desc = { "" } +ent-DrinkBottleVisualsAll = { "" } + .desc = { "" } ent-DrinkAbsintheBottleFull = Jailbreaker Verte .desc = One sip of this and you just know you're gonna have a good time. ent-DrinkBlueCuracaoBottleFull = Miss Blue Curacao diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/donkpocket.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/donkpocket.ftl index dd7be9b9c34..74220e6c297 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/donkpocket.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/donkpocket.ftl @@ -28,5 +28,13 @@ ent-FoodDonkpocketBerry = berry-pocket .desc = A relentlessly sweet donk-pocket. Made with 100% artificial flavoring. ent-FoodDonkpocketBerryWarm = warm berry-pocket .desc = A relentlessly sweet donk-pocket, now warm and delicious. +ent-FoodDonkpocketStonk = stonk-pocket + .desc = Tasty, but a sad reminder of the great crash of '24 +ent-FoodDonkpocketStonkWarm = warm stonk-pocket + .desc = { ent-FoodDonkpocketStonk.desc } +ent-FoodDonkpocketCarp = carp-pocket + .desc = A long-lost edition of donk pocket, made specifically for hard-working salvagers. +ent-FoodDonkpocketCarpWarm = warm carp-pocket + .desc = { ent-FoodDonkpocketCarp.desc } ent-FoodDonkpocketDink = dink-pocket .desc = An off-brand lizard donk-pocket, filled with pickled carrot and wrapped with seaweed. Best eaten cold, or even better, not eaten at all. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/containers/box.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/containers/box.ftl index a354e67cc7c..f7b7583297a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/containers/box.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/containers/box.ftl @@ -20,6 +20,10 @@ ent-FoodBoxDonkpocketTeriyaki = box of teriyaki-flavoured donk-pockets .desc = { ent-FoodBoxDonkpocket.desc } ent-FoodBoxDonkpocketPizza = box of pizza-flavoured donk-pockets .desc = { ent-FoodBoxDonkpocket.desc } +ent-FoodBoxDonkpocketStonk = box of limited edition stonk-pockets + .desc = { ent-FoodBoxDonkpocket.desc } +ent-FoodBoxDonkpocketCarp = box of carp-pockets + .desc = { ent-FoodBoxDonkpocket.desc } ent-FoodBoxDonkpocketBerry = box of berry-flavoured donk-pockets .desc = { ent-FoodBoxDonkpocket.desc } ent-FoodBoxDonkpocketHonk = box of banana-flavoured donk-pockets 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 71a9286e280..028481f5b52 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 @@ -8,6 +8,8 @@ ent-OatBushel = oat bushel .desc = Eat oats, do squats. ent-Sugarcane = sugarcane .desc = Sickly sweet. +ent-FoodLaughinPeaPod = laughin' pea pod + .desc = The clown's favorite plant. ent-Log = tower-cap log .desc = It's better than bad, it's good! ent-SteelLog = steel-cap log diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/encryption_keys.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/encryption_keys.ftl index 0f85cc67d6a..89b5c81b0bd 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/encryption_keys.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/encryption_keys.ftl @@ -25,7 +25,7 @@ ent-EncryptionKeySecurity = security encryption key ent-EncryptionKeyService = service encryption key .desc = An encryption key used by the service staff, tasked with keeping the station full, happy and clean. ent-EncryptionKeySyndie = blood-red encryption key - .desc = An encryption key used by... wait... Who is owner of this chip? + .desc = An encryption key used by... wait... Who is the owner of this chip? ent-EncryptionKeyBinary = binary translator key .desc = An encryption key that translates binary signals used by silicons. ent-EncryptionKeyFreelance = freelancer encryption key diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_beacon.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_beacon.ftl index 6b207dec1ee..4dc876add7c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_beacon.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_beacon.ftl @@ -195,3 +195,6 @@ ent-DefaultStationBeaconDisposals = { ent-DefaultStationBeacon } ent-DefaultStationBeaconCryosleep = { ent-DefaultStationBeacon } .suffix = Cryosleep .desc = { ent-DefaultStationBeacon.desc } +ent-DefaultStationBeaconEscapePod = { ent-DefaultStationBeacon } + .suffix = Escape Pod + .desc = { ent-DefaultStationBeacon.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl index 69442404e13..29857dfa943 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl @@ -23,10 +23,12 @@ ent-NukeCodePaperStation = { ent-NukeCodePaper } .desc = { ent-NukeCodePaper.desc } ent-Pen = pen .desc = A dark ink pen. +ent-PenEmbeddable = { ent-Pen } + .desc = { ent-Pen.desc } ent-LuxuryPen = luxury pen .desc = A fancy and expensive pen that you only deserve to own if you're qualified to handle vast amounts of paperwork. ent-CyberPen = Cybersun pen - .desc = A high-tech pen straight from Cybersun's legal department, capable of refracting hard-light at impossible angles through its diamond tip in order to write. + .desc = A high-tech pen straight from Cybersun's legal department, capable of refracting hard-light at impossible angles through its diamond tip in order to write. So powerful, it's even able to rewrite officially stamped documents should the need arise. ent-PenCap = captain's fountain pen .desc = A luxurious fountain pen for the captain of the station. ent-PenCentcom = CentCom pen 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 077132b76be..abf29d4f055 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 @@ -86,6 +86,10 @@ ent-FloorTileItemShuttlePurple = purple shuttle floor .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemShuttleRed = red shuttle floor .desc = { ent-FloorTileItemBase.desc } +ent-FloorTileItemShuttleGrey = grey shuttle floor + .desc = { ent-FloorTileItemBase.desc } +ent-FloorTileItemShuttleBlack = black shuttle floor + .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemGold = gold floor .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemSilver = silver tile 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 90910fbb61d..7f790bd89e5 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 @@ -14,6 +14,8 @@ ent-CabbageSeeds = packet of cabbage seeds .desc = { ent-SeedBase.desc } ent-GarlicSeeds = packet of garlic seeds .desc = { ent-SeedBase.desc } +ent-LaughinPeaSeeds = packet of laughin' pea pods + .desc = These seeds give off a very soft purple glow.. they should grow into Laughin' Peas. ent-LemonSeeds = packet of lemon seeds .desc = { ent-SeedBase.desc } ent-LemoonSeeds = packet of lemoon seeds 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 6a600e747ed..ac84cea2feb 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 @@ -32,6 +32,8 @@ ent-Bloodpack = blood pack ent-Bloodpack10Lingering = { ent-Bloodpack } .suffix = 10, Lingering .desc = { ent-Bloodpack.desc } +ent-Tourniquet = tourniquet + .desc = Stops bleeding! Hopefully. ent-Gauze = roll of gauze .desc = Some sterile gauze to wrap around bloody stumps. .suffix = Full 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 36ad56beca0..8fc9f09d7d9 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 @@ -36,8 +36,6 @@ ent-BorgModuleGrapplingGun = grappling gun cyborg module .desc = { ent-BaseBorgModuleCargo.desc } ent-BorgModuleAdvancedTool = advanced tool cyborg module .desc = { ent-BaseBorgModuleEngineering.desc } -ent-BorgModuleGasAnalyzer = gas analyzer cyborg module - .desc = { ent-BaseBorgModuleEngineering.desc } ent-BorgModuleConstruction = construction cyborg module .desc = { ent-BaseBorgModuleEngineering.desc } ent-BorgModuleRCD = RCD cyborg module 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 3f365c990be..6f504d1ae74 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 @@ -1,99 +1,99 @@ -ent-AirlockAssemblyAtmospherics = airlock assembly +ent-AirlockAssemblyAtmospherics = { ent-AirlockAssembly } .suffix = Atmospherics .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyAtmosphericsGlass = airlock assembly +ent-AirlockAssemblyAtmosphericsGlass = { ent-AirlockAssembly } .suffix = Atmospherics, Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyCargo = airlock assembly +ent-AirlockAssemblyCargo = { ent-AirlockAssembly } .suffix = Cargo .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyCargoGlass = airlock assembly +ent-AirlockAssemblyCargoGlass = { ent-AirlockAssembly } .suffix = Cargo, Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyCommand = airlock assembly +ent-AirlockAssemblyCommand = { ent-AirlockAssembly } .suffix = Command .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyCommandGlass = airlock assembly +ent-AirlockAssemblyCommandGlass = { ent-AirlockAssembly } .suffix = Command, Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyEngineering = airlock assembly +ent-AirlockAssemblyEngineering = { ent-AirlockAssembly } .suffix = Engineering .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyEngineeringGlass = airlock assembly +ent-AirlockAssemblyEngineeringGlass = { ent-AirlockAssembly } .suffix = Engineering, Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyExternal = airlock assembly +ent-AirlockAssemblyExternal = { ent-AirlockAssembly } .suffix = External .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyExternalGlass = airlock assembly +ent-AirlockAssemblyExternalGlass = { ent-AirlockAssembly } .suffix = External, Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyGlass = airlock assembly +ent-AirlockAssemblyGlass = { ent-AirlockAssembly } .suffix = Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyFreezer = airlock assembly +ent-AirlockAssemblyFreezer = { ent-AirlockAssembly } .suffix = Freezer .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyMaintenance = airlock assembly +ent-AirlockAssemblyMaintenance = { ent-AirlockAssembly } .suffix = Maintenance .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyMaintenanceGlass = airlock assembly +ent-AirlockAssemblyMaintenanceGlass = { ent-AirlockAssembly } .suffix = Maintenance, Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyMedical = airlock assembly +ent-AirlockAssemblyMedical = { ent-AirlockAssembly } .suffix = Medical .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyMedicalGlass = airlock assembly +ent-AirlockAssemblyMedicalGlass = { ent-AirlockAssembly } .suffix = Medical, Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyScience = airlock assembly +ent-AirlockAssemblyScience = { ent-AirlockAssembly } .suffix = Science .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyScienceGlass = airlock assembly +ent-AirlockAssemblyScienceGlass = { ent-AirlockAssembly } .suffix = Science, Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblySecurity = airlock assembly +ent-AirlockAssemblySecurity = { ent-AirlockAssembly } .suffix = Security .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblySecurityGlass = airlock assembly +ent-AirlockAssemblySecurityGlass = { ent-AirlockAssembly } .suffix = Security, Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyShuttle = airlock assembly +ent-AirlockAssemblyShuttle = { ent-AirlockAssembly } .suffix = Shuttle .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyShuttleGlass = airlock assembly +ent-AirlockAssemblyShuttleGlass = { ent-AirlockAssembly } .suffix = Shuttle, Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyVirology = airlock assembly +ent-AirlockAssemblyVirology = { ent-AirlockAssembly } .suffix = Virology .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyVirologyGlass = airlock assembly +ent-AirlockAssemblyVirologyGlass = { ent-AirlockAssembly } .suffix = Virology, Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyCentralCommand = airlock assembly +ent-AirlockAssemblyCentralCommand = { ent-AirlockAssembly } .suffix = CentralCommand .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyCentralCommandGlass = airlock assembly +ent-AirlockAssemblyCentralCommandGlass = { ent-AirlockAssembly } .suffix = CentralCommand, Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyMining = airlock assembly +ent-AirlockAssemblyMining = { ent-AirlockAssembly } .suffix = Mining .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyMiningGlass = airlock assembly +ent-AirlockAssemblyMiningGlass = { ent-AirlockAssembly } .suffix = Mining, Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblySyndicate = airlock assembly +ent-AirlockAssemblySyndicate = { ent-AirlockAssembly } .suffix = Syndicate .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblySyndicateGlass = airlock assembly +ent-AirlockAssemblySyndicateGlass = { ent-AirlockAssembly } .suffix = Syndicate, Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyShuttleSyndicate = airlock assembly +ent-AirlockAssemblyShuttleSyndicate = { ent-AirlockAssembly } .suffix = ShuttleSyndicate .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyShuttleSyndicateGlass = airlock assembly +ent-AirlockAssemblyShuttleSyndicateGlass = { ent-AirlockAssembly } .suffix = ShuttleSyndicate, Glass .desc = { ent-AirlockAssembly.desc } -ent-AirlockAssemblyHighSec = airlock assembly +ent-AirlockAssemblyHighSec = { ent-AirlockAssembly } .suffix = HighSec .desc = { ent-AirlockAssembly.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl index c0171dc2098..9f547331d59 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 @@ -22,7 +22,7 @@ ent-ComputerPowerMonitoring = power monitoring computer ent-ComputerMedicalRecords = medical records computer .desc = This can be used to check medical records. ent-ComputerCriminalRecords = criminal records computer - .desc = This can be used to check criminal records. + .desc = This can be used to check criminal records. Only security can modify them. ent-ComputerStationRecords = station records computer .desc = This can be used to check station records. ent-ComputerCrewMonitoring = crew monitoring console 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 new file mode 100644 index 00000000000..07bdcf53988 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl @@ -0,0 +1,14 @@ +ent-GlassBoxLaser = glass box + .desc = A sturdy showcase for an expensive exhibit. +ent-GlassBoxLaserOpen = { ent-GlassBoxLaser } + .suffix = Open + .desc = { ent-GlassBoxLaser.desc } +ent-GlassBoxLaserFilled = { ent-GlassBoxLaser } + .suffix = Filled + .desc = { ent-GlassBoxLaser.desc } +ent-GlassBoxLaserFilledOpen = { ent-GlassBoxLaserFilled } + .suffix = Filled, Open + .desc = { ent-GlassBoxLaserFilled.desc } +ent-GlassBoxLaserBroken = broken glass box + .desc = A broken showcase for a stolen expensive exhibit. + .suffix = Broken 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 1f172555e7f..161bb159969 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/roundstart.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/roundstart.ftl @@ -24,3 +24,5 @@ ent-BasicStationEventScheduler = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-RampingStationEventScheduler = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } +ent-BasicRoundstartVariation = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } diff --git a/Resources/Locale/ru-RU/actions/actions/wagging.ftl b/Resources/Locale/ru-RU/actions/actions/wagging.ftl index e7b9e4f1ed6..5101c4391e3 100644 --- a/Resources/Locale/ru-RU/actions/actions/wagging.ftl +++ b/Resources/Locale/ru-RU/actions/actions/wagging.ftl @@ -1,4 +1,2 @@ action-name-toggle-wagging = Махать хвостом action-description-toggle-wagging = Начать или прекратить махать хвостом. -wagging-emote-start = начинает махать хвостом. -wagging-emote-stop = прекращает махать хвостом. diff --git a/Resources/Locale/ru-RU/criminal-records/criminal-records.ftl b/Resources/Locale/ru-RU/criminal-records/criminal-records.ftl new file mode 100644 index 00000000000..dc3170f31a0 --- /dev/null +++ b/Resources/Locale/ru-RU/criminal-records/criminal-records.ftl @@ -0,0 +1,43 @@ +criminal-records-console-window-title = Criminal Records Computer +criminal-records-console-records-list-title = Crewmembers +criminal-records-console-select-record-info = Select a record. +criminal-records-console-no-records = No records found! +criminal-records-console-no-record-found = No record was found for the selected person. + +## Status + +criminal-records-console-status = Status +criminal-records-status-none = None +criminal-records-status-wanted = Wanted +criminal-records-status-detained = Detained +criminal-records-console-wanted-reason = [color=gray]Wanted Reason[/color] +criminal-records-console-reason = Reason +criminal-records-console-reason-placeholder = For example: { $placeholder } + +## Crime History + +criminal-records-console-crime-history = Crime History +criminal-records-history-placeholder = Write the crime here +criminal-records-no-history = This crewmember's record is spotless. +criminal-records-add-history = Add +criminal-records-delete-history = Delete +criminal-records-permission-denied = Permission denied + +## Security channel notifications + +criminal-records-console-wanted = { $name } is wanted by { $officer } for: { $reason }. +criminal-records-console-detained = { $name } has been detained by { $officer }. +criminal-records-console-released = { $name } has been released by { $officer }. +criminal-records-console-not-wanted = { $name } is no longer wanted. + +## Filters + +criminal-records-filter-placeholder = Input text and press "Enter" +criminal-records-name-filter = Name +criminal-records-prints-filter = Fingerprints +criminal-records-dna-filter = DNA + +## Arrest auto history lines + +criminal-records-console-auto-history = ARRESTED: { $reason } +criminal-records-console-unspecified-reason = 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 b837844b456..aad37d2f479 100644 --- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl @@ -44,6 +44,7 @@ ui-options-opaque-storage-window = Непрозрачность окна хра ui-options-show-looc-on-head = Показывать LOOC-чат над головами персонажей ui-options-fancy-speech = Показывать имена в облачках с текстом ui-options-fancy-name-background = Добавить фон облачкам с текстом +ui-options-enable-color-name = Add colors to character names ui-options-reduced-motion = Снижение интенсивности визуальных эффектов ui-options-screen-shake-intensity = Интенсивность дрожания экрана ui-options-screen-shake-percent = { TOSTRING($intensity, "P0") } diff --git a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl index 965cca9e6dd..943eda65b55 100644 --- a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl @@ -169,6 +169,8 @@ flavor-complex-light = как угасший свет ## Generic alcohol/soda taste. This should be replaced with an actual flavor profile. +flavor-complex-profits = like profits +flavor-complex-fishops = like the dreaded fishops flavor-complex-alcohol = как алкоголь flavor-complex-soda = как газировка flavor-complex-juice = как сок diff --git a/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl b/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl index 3e279ba907d..0c84cd3e4fb 100644 --- a/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl +++ b/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl @@ -3,3 +3,4 @@ foldable-deploy-fail = Вы не можете разложить { $object } здесь. fold-verb = Сложить unfold-verb = Разложить +fold-flip-verb = Flip diff --git a/Resources/Locale/ru-RU/guidebook/guides.ftl b/Resources/Locale/ru-RU/guidebook/guides.ftl index 6446327d0eb..fa911c728ff 100644 --- a/Resources/Locale/ru-RU/guidebook/guides.ftl +++ b/Resources/Locale/ru-RU/guidebook/guides.ftl @@ -50,6 +50,7 @@ guide-entry-cyborgs = Киборги guide-entry-security = Безопасность станции guide-entry-forensics = Криминалистика guide-entry-defusal = Обезвреживание крупной бомбы +guide-entry-criminal-records = Criminal Records guide-entry-antagonists = Антагонисты guide-entry-nuclear-operatives = Ядерные оперативники guide-entry-traitors = Предатели diff --git a/Resources/Locale/ru-RU/holiday/greet/holiday-greet.ftl b/Resources/Locale/ru-RU/holiday/greet/holiday-greet.ftl index 4f692de6673..2cf2fa4dba5 100644 --- a/Resources/Locale/ru-RU/holiday/greet/holiday-greet.ftl +++ b/Resources/Locale/ru-RU/holiday/greet/holiday-greet.ftl @@ -8,7 +8,6 @@ holiday-name-new-year = Нового года holiday-name-mister-lizard = дня рождения Мистера Ящерки holiday-name-chinese-new-year = Китайского Нового года holiday-name-groundhog-day = Дня сурка -holiday-name-travis-scott-day = Дня Трэвиса Скотта holiday-name-valentines-day = Дня святого Валентина holiday-name-birthday13 = Дня рождения Space Station 13 holiday-name-random-kindness = Дня спонтанного проявления доброты diff --git a/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl b/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl index 57a7416e23d..5351e576164 100644 --- a/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl +++ b/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl @@ -7,6 +7,9 @@ health-analyzer-window-entity-damage-total-text = Общие поврежден health-analyzer-window-damage-group-text = { $damageGroup }: { $amount } health-analyzer-window-damage-type-text = { $damageType }: { $amount } health-analyzer-window-damage-type-duplicate-text = { $damageType }: { $amount } (повтор) +health-analyzer-window-scan-mode-text = Scan Mode: +health-analyzer-window-scan-mode-active = ACTIVE +health-analyzer-window-scan-mode-inactive = INACTIVE health-analyzer-window-damage-group-Brute = Механические health-analyzer-window-damage-type-Blunt = Ушибы health-analyzer-window-damage-type-Slash = Порезы diff --git a/Resources/Locale/ru-RU/navmap-beacons/station-beacons.ftl b/Resources/Locale/ru-RU/navmap-beacons/station-beacons.ftl index a6197cfb991..65dbe445d23 100644 --- a/Resources/Locale/ru-RU/navmap-beacons/station-beacons.ftl +++ b/Resources/Locale/ru-RU/navmap-beacons/station-beacons.ftl @@ -64,3 +64,4 @@ station-beacon-theater = Театр station-beacon-tools = Хранилище инструментов station-beacon-disposals = Мусоросброс station-beacon-cryosleep = Криосон +station-beacon-escape-pod = Escape Pod diff --git a/Resources/Locale/ru-RU/reagents/laughter.ftl b/Resources/Locale/ru-RU/reagents/laughter.ftl new file mode 100644 index 00000000000..378e0015999 --- /dev/null +++ b/Resources/Locale/ru-RU/reagents/laughter.ftl @@ -0,0 +1 @@ +laughter-effect-control-laughter = You can't contain your laughter! diff --git a/Resources/Locale/ru-RU/reagents/meta/cleaning.ftl b/Resources/Locale/ru-RU/reagents/meta/cleaning.ftl index bdf283d7881..2ed78b344ac 100644 --- a/Resources/Locale/ru-RU/reagents/meta/cleaning.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/cleaning.ftl @@ -4,8 +4,6 @@ reagent-name-space-cleaner = космический очиститель reagent-desc-space-cleaner = Способен очистить почти любую поверхность от всего, что может ее запачкать. Уборщик наверняка будет благодарен добавке. reagent-name-soap = мыло reagent-desc-soap = Мыло можно использовать для получения мыльной воды. -reagent-name-soapy-water = мыльная вода -reagent-desc-soapy-water = Раствор мыла с водой. Хорошо очищает поверхности от грязи, и более скользкий, чем простая вода. reagent-name-space-lube = космическая смазка reagent-desc-space-lube = Космическая смазка - высокоэффективный лубрикант, предназначенный для обслуживания исключительно сложного механического оборудования (и уж точно не используемый для подскальзывания людей). reagent-name-space-glue = космический клей diff --git a/Resources/Locale/ru-RU/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/ru-RU/reagents/meta/consumable/food/condiments.ftl index 30771a35b5f..3a7c8fe2a23 100644 --- a/Resources/Locale/ru-RU/reagents/meta/consumable/food/condiments.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/consumable/food/condiments.ftl @@ -14,6 +14,8 @@ reagent-name-ketchup = кетчуп reagent-desc-ketchup = Приготовлен из томатного пюре с добавлением специй. reagent-name-ketchunaise = кетчунез reagent-desc-ketchunaise = Так называемый Русский соус, популярный среди космо-американцев. +reagent-name-laughin-syrup = laughin' syrup +reagent-desc-laughin-syrup = The product of juicing Laughin' Peas. Fizzy, and seems to change flavour based on what it's used with! reagent-name-mayo = майонез reagent-desc-mayo = Жирный соус, приготовленный из масла, яиц, и какой-либо (пищевой) кислоты. reagent-name-mustard = горчица diff --git a/Resources/Locale/ru-RU/reagents/meta/fun.ftl b/Resources/Locale/ru-RU/reagents/meta/fun.ftl index 6f32baddaf9..21328ce427b 100644 --- a/Resources/Locale/ru-RU/reagents/meta/fun.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/fun.ftl @@ -14,3 +14,5 @@ reagent-name-razorium = бритвиум reagent-desc-razorium = Странное неньютоновское химическое вещество. Оно образуется при смешивании двух противоречивых по природе лекарств от механических повреждения. Под влиянием силы оно временно затвердевает, образуя миллионы крохотных острых граней. Весьма болезненно. reagent-name-fresium = фризиум reagent-desc-fresium = Таинственное соединение, которое замедляет колебания атомов и молекул... каким-то образом. Проще говоря, оно делает вещи холодными... РЕАЛЬНО холодными. При попадании в организм респираторным путём может вызывать долговременные проблемы со способностью передвигаться. +reagent-name-laughter = Laughter +reagent-desc-laughter = Some say that this is the best medicine, but recent studies have proven that to be untrue. diff --git a/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl index 0dff1cdef83..62c077c0ef3 100644 --- a/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl @@ -91,6 +91,7 @@ reagent-physical-desc-exhilarating = бодрящее reagent-physical-desc-vibrant = вибрирующее reagent-physical-desc-fluffy = пушистое reagent-physical-desc-reflective = светоотражающее +reagent-physical-desc-funny = funny reagent-physical-desc-alkaline = щелочное reagent-physical-desc-holy = святое reagent-physical-desc-slimy = склизкое diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl index 0a24ac925ae..ce4007ee92b 100644 --- a/Resources/Locale/ru-RU/research/technologies.ftl +++ b/Resources/Locale/ru-RU/research/technologies.ftl @@ -1,6 +1,5 @@ research-discipline-none = Отсутствует research-discipline-industrial = Промышленность -research-discipline-biochemical = Биохимия research-discipline-arsenal = Арсенал research-discipline-experimental = Экспериментальное research-discipline-civilian-services = Обслуживание персонала @@ -19,17 +18,9 @@ research-technology-advanced-tools = Продвинутые инструмент research-technology-super-powercells = Супербатареи research-technology-bluespace-storage = Блюспейс-хранилище research-technology-portable-fission = Портативный распад -research-technology-chemistry = Химия -research-technology-surgical-tools = Хирургические инструменты research-technology-biochemical-stasis = Биохимический стазис research-technology-mechanized-treatment = Механизированная подготовка -research-technology-virology = Вирусология -research-technology-cryogenics = Криогеника -research-technology-chemical-dispensary = Химический раздатчик -research-technology-biofabrication = Биофабрикация -research-technology-crew-monitoring = Мониторинг экипажа research-technology-bluespace-chemistry = Блюспейс-химия -research-technology-cloning = Клонирование research-technology-salvage-weapons = Утилизаторское оружие research-technology-draconic-munitions = Драконьи боеприпасы research-technology-uranium-munitions = Урановые боеприпасы diff --git a/Resources/Locale/ru-RU/seeds/seeds.ftl b/Resources/Locale/ru-RU/seeds/seeds.ftl index 2d636a56487..606001e87e2 100644 --- a/Resources/Locale/ru-RU/seeds/seeds.ftl +++ b/Resources/Locale/ru-RU/seeds/seeds.ftl @@ -70,6 +70,8 @@ seeds-poppy-name = мак seeds-poppy-display-name = мак seeds-aloe-name = алоэ seeds-aloe-display-name = алоэ +seeds-laughin-pea-name = laughin' peas +seeds-laughin-pea-display-name = laughin' peas seeds-lingzhi-name = линчжи seeds-lingzhi-display-name = линчжи seeds-ambrosiavulgaris-name = амброзия вульгарис diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/animal/animal.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/animal/animal.ftl index 1598eff90b4..de4ae028052 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/animal/animal.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/animal/animal.ftl @@ -1,3 +1,5 @@ +ent-BaseAnimalOrganUnGibbable = { ent-BaseItem } + .desc = { ent-BaseItem.desc } ent-BaseAnimalOrgan = { ent-BaseItem } .desc = { ent-BaseItem.desc } ent-OrganAnimalLungs = лёгкие diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/human.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/human.ftl index 0817d257e6d..b468650f4cf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/human.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/human.ftl @@ -1,3 +1,5 @@ +ent-BaseHumanOrganUnGibbable = { ent-BaseItem } + .desc = { ent-BaseItem.desc } ent-BaseHumanOrgan = { ent-BaseItem } .desc = { ent-BaseItem.desc } ent-OrganHumanBrain = мозг diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/belt.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/belt.ftl index 2dca17af9f2..290115c1721 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/belt.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/belt.ftl @@ -16,9 +16,9 @@ ent-ClothingBeltJanitorFilled = { ent-ClothingBeltJanitor } ent-ClothingBeltMedicalFilled = { ent-ClothingBeltMedical } .suffix = Заполненный .desc = { ent-ClothingBeltMedical.desc } -ent-ClothingBeltParamedicFilled = пояс парамедика - .suffix = Заполненный, Парамедик - .desc = { ent-ClothingBeltMedical.desc } +ent-ClothingBeltMedicalEMTFilled = { ent-ClothingBeltMedicalEMT } + .suffix = Paramedic,Filled + .desc = { ent-ClothingBeltMedicalEMT.desc } ent-ClothingBeltPlantFilled = { ent-ClothingBeltPlant } .suffix = Заполненный .desc = { ent-ClothingBeltPlant.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/heads.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/heads.ftl index 09d75c0fc3a..218704b1b5e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/heads.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/heads.ftl @@ -7,6 +7,9 @@ ent-LockerCaptainFilledHardsuit = { ent-LockerCaptain } ent-LockerCaptainFilled = { ent-LockerCaptain } .suffix = Заполненный .desc = { ent-LockerCaptain.desc } +ent-LockerCaptainFilledNoLaser = { ent-LockerCaptain } + .suffix = Filled + .desc = { ent-LockerCaptain.desc } ent-LockerHeadOfPersonnelFilled = { ent-LockerHeadOfPersonnel } .suffix = Заполненный .desc = { ent-LockerHeadOfPersonnel.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/paper/document.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/paper/document.ftl index cd008e4f09a..566853062bc 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/paper/document.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/paper/document.ftl @@ -57,7 +57,7 @@ ent-PrintedDocumentRequestModernization = Запрос на проведение ent-PrintedDocumentComplaintViolationLaborRules = Жалоба на нарушение трудового порядка .desc = { ent-PrintedDocument.desc } ent-PrintedDocumentComplaintOffense = Жалоба на правонарушение - .desc = { ent-PrintedDocument.desc } + .desc = { ent-PrintedDocument.desc } ent-PrintedDocumentPermissionEquipment = Разрешение на использование снаряжения .desc = { ent-PrintedDocument.desc } ent-PrintedDocumentPermissionToTravelInCaseOfThreat = Разрешение на передвижение при угрозе diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl index dba0ef53353..61c3d20146e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl @@ -8,6 +8,8 @@ ent-ClothingBeltJanitor = пояс уборщика .desc = Пояс, используемый для хранения основных уборочных принадлежностей. ent-ClothingBeltMedical = пояс медика .desc = Может вмещать различное медицинское снаряжение. +ent-ClothingBeltMedicalEMT = EMT belt + .desc = Perfect for holding various equipment for medical emergencies. ent-ClothingBeltPlant = пояс ботаника .desc = Пояс, используемый для хранения основных принадлежностей для гидропоники. На удивление, не зелёный. ent-ClothingBeltChef = пояс повара diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/bandanas.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/bandanas.ftl index b1e7bd415cc..49d07b40fd4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/bandanas.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/bandanas.ftl @@ -1,3 +1,5 @@ +ent-ClothingHeadBandBase = { ent-ClothingHeadBaseButcherable } + .desc = { ent-ClothingHeadBaseButcherable.desc } ent-ClothingHeadBandBlack = чёрная бандана .desc = Чёрная бандана, чтобы выглядеть круто. ent-ClothingHeadBandBlue = синяя бандана diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl index ee76e248c82..4403597c43a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl @@ -10,6 +10,8 @@ ent-ClothingHeadHatBeretRND = берет учёного .desc = Берет для настоящих учёных. ent-ClothingHeadHatBeretEngineering = берет инженера .desc = Берет с эмблемой инженерного отдела. Для инженеров, которые предпочитают стиль безопасности. +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 = берет главы службы безопасности .desc = Черный берет с вышитой командирской эмблемой. Для офицеров, которые предпочитают стиль безопасности. ent-ClothingHeadHatBeretWarden = берет смотрителя @@ -150,3 +152,5 @@ ent-ClothingHeadHatCowboyWhite = белая ковбойская шляпа .desc = { ent-ClothingHeadHatCowboyBrown.desc } ent-ClothingHeadHatCowboyBountyHunter = ковбойская шляпа охотника за головами .desc = { ent-ClothingHeadHatCowboyBrown.desc } +ent-ClothingHeadHatStrawHat = straw hat + .desc = A fancy hat for hot days! Not recommended to wear near fires. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/soft.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/soft.ftl index b9df2d90a60..f1f15544cc9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/soft.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/soft.ftl @@ -1,3 +1,8 @@ +ent-ClothingHeadHeadHatBaseFlippable = { ent-ClothingHeadBaseButcherable } + .desc = { ent-ClothingHeadBaseButcherable.desc } +ent-ClothingHeadHeadHatBaseFlipped = { ent-ClothingHeadHeadHatBaseFlippable } + .suffix = flipped + .desc = { ent-ClothingHeadHeadHatBaseFlippable.desc } ent-ClothingHeadHatBluesoft = синяя кепка .desc = Бейсболка безвкусного синего цвета. ent-ClothingHeadHatBluesoftFlipped = перевёрнутая синяя кепка diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/bandanas.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/bandanas.ftl new file mode 100644 index 00000000000..2cfa21964a3 --- /dev/null +++ b/Resources/Locale/ru-RU/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. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/base_clothingmask.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/base_clothingmask.ftl index ce6cff6a8f4..ab48ec06d32 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/base_clothingmask.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/base_clothingmask.ftl @@ -4,3 +4,5 @@ ent-ClothingMaskPullableBase = { ent-ClothingMaskBase } .desc = { ent-ClothingMaskBase.desc } ent-ActionToggleMask = Поменять положение маски .desc = Удобно, но не позволяет вставить пирог в ваше отверстие для пирога. +ent-ClothingMaskBaseButcherable = { ent-ClothingMaskBase } + .desc = { ent-ClothingMaskBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl index 316e55ea08c..27f20fcaa0d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl @@ -84,6 +84,8 @@ ent-ClothingUniformJumpsuitQM = комбинезон квартирмейсте .desc = Что Браун может сделать для вас? ent-ClothingUniformJumpsuitQMTurtleneck = водолазка квартирмейстера .desc = Строгая водолазка, предназначенная для суровых условий работы в области снабжения. +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 = водолазка научного руководителя .desc = Это водолазка, носимая достаточно умными людьми, чтобы достичь должности научного руководителя. Её ткань обеспечивает слабую биологическую защиту. ent-ClothingUniformJumpsuitScientist = комбинезон учёного diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl index 852edfad7e1..fc3b3714645 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl +++ b/Resources/Locale/ru-RU/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 = лаймовый сок .desc = Кисло-сладкое удовольствие. ent-DrinkJuiceOrangeCarton = апельсиновый сок diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl index f73a6e76f63..fdd2ef30b66 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl @@ -8,240 +8,356 @@ ent-DrinkGlassCoupeShaped = бокал-купе .desc = Классический бокал-купе с тонкой ножкой, символ этикеток "не кантовать" на ящиках по всей галактике. ent-DrinkAbsintheGlass = бокал абсента .desc = Полынь, анис, о мой Бог. + .suffix = absinthe ent-DrinkAcidSpitGlass = бокал кислотного плевка .desc = Напиток из архивов компании. Изготовлен из живых инопланетян. + .suffix = acid spit ent-DrinkAleGlass = стакан эля .desc = Пинта отличного холодного эля. + .suffix = ale ent-DrinkAlliesCocktail = коктейль Союзники .desc = Напиток из ваших союзников. + .suffix = allies cocktail ent-DrinkAloe = бокал алоэ .desc = Очень, очень, очень хорошо. + .suffix = aloe ent-DrinkAmasecGlass = кружка амасека .desc = Всегда отлично перед БОЕМ!!! + .suffix = amasec ent-DrinkAndalusia = бокал андалусии .desc = Хороший напиток со странным названием. + .suffix = andalusia ent-DrinkAntifreeze = стакан антифриза .desc = Непревзойденная свежесть. + .suffix = antifreeze ent-DrinkAtomicBombGlass = бокал атомной бомбы .desc = Мы не сможем взять на себя ответственность за ваши действия после употребления. + .suffix = atomic bomb ent-DrinkB52Glass = стакан B-52 .desc = Кофе, айриш крим и коньяк. Просто бомба. + .suffix = b-52 ent-DrinkBahamaMama = бокал багама-мама .desc = Тропический коктейль. + .suffix = bahama mama ent-DrinkBananaHonkGlass = стакан банана-хонка .desc = Напиток из Бананового Рая. + .suffix = banana honk ent-DrinkBarefootGlass = бокал домохозяйки .desc = Дети, кухня, церковь. + .suffix = barefoot ent-DrinkBeepskySmashGlass = бокал удара бипски .desc = Тяжелый, пылкий и сильный. Прямо как железный кулак ЗАКОНА. + .suffix = beepsky smash ent-DrinkBeerglass = стакан пива .desc = Пинта холодного пива. + .suffix = beer ent-DrinkBerryJuice = ягодный сок .desc = Ягодный сок. А может компот. Какая разница? + .suffix = berry juice ent-DrinkBlackRussianGlass = бокал чёрного русского .desc = Для людей с непереносимостью лактозы. Так же прекрасен, как и белый русский. + .suffix = black russian ent-DrinkBlueCuracaoGlass = голубой кюрасао .desc = Экзотично-голубой фруктовый напиток, дистиллированный из апельсинов. + .suffix = blue curacao ent-DrinkBloodyMaryGlass = бокал кровавой Мэри .desc = Томатный сок, смешанный с водкой и капелькой лайма. На вкус как жидкое убийство. + .suffix = bloody mary ent-DrinkBooger = козявка .desc = Фууу... + .suffix = booger ent-DrinkBraveBullGlass = бокал храброго быка .desc = Текилла и кофейный ликер, объединенные в аппетитный микс. Выпьем. + .suffix = brave bull ent-DrinkCarrotJuice = морковный сок .desc = Как морковь, но не хрустит. + .suffix = carrot juice ent-DrinkChocolateGlass = горячий шоколад .desc = Горячий напиток, состоящий из растопленного шоколада и подогретого молока. + .suffix = chocolate ent-DrinkCoffee = кофе .desc = Не уроните, иначе повсюду будут обжигающая жидкость и осколки стекла. + .suffix = coffee ent-DrinkCognacGlass = бокал коньяка .desc = Черт возьми, вы чувствуете себя французским аристократом, просто держа это в руках. + .suffix = cognac ent-DrinkCream = сливки .desc = Фууу... + .suffix = cream ent-DrinkCubaLibreGlass = бокал куба-либре .desc = Классическая смесь рома с колой. + .suffix = cuba libre ent-DrinkDeadRumGlass = стакан мёртвого рома .desc = Популярен среди моряков. Не очень популярен среди всех остальных. + .suffix = dead rum ent-DrinkDemonsBlood = кровь демона .desc = От одного взгляда на это волосы на затылке встают дыбом. + .suffix = demon's blood ent-DrinkDevilsKiss = поцелуй дьявола .desc = Жуткое время! + .suffix = devil's kiss ent-DrinkDoctorsDelightGlass = радость доктора .desc = Целебная микстура из соков, гарантированно сохранит ваше здоровье до следующего избиения ящиком для инструментов. + .suffix = doctor's delight ent-DrinkDriestMartiniGlass = бокал самого сухого мартини .desc = Только для опытных. Вы уверены, что видите плавающие в бокале песчинки. + .suffix = driest martini ent-DrinkDrGibbGlass = стакан доктора Гибба .desc = Доктор Гибб. Не так опасен, как кажется из названия. + .suffix = dr gibb ent-DrinkErikaSurprise = сюрприз Эрики .desc = Сюрприз в том, что он зеленый! + .suffix = erika surprise ent-DrinkFourteenLokoGlass = стакан Фоуртин Локо .desc = Это емкость с напитком "Фоуртин Локо", который выглядит просто отлично. Напиток, а не емкость. + .suffix = fourteen loko ent-DrinkGargleBlasterGlass = пангалактический грызлодёр .desc = Значит ли... значит ли это, что Артур и Форд на корабле? О, счастье. + .suffix = pan-galactic gargle blaster ent-DrinkGinGlass = джин .desc = Кристально чистый джин Гриффитер. + .suffix = gin ent-DrinkGinFizzGlass = стакан шипучего джина .desc = Освежающе лимонный, восхитительно сухой. + .suffix = gin fizz ent-DrinkGinTonicglass = джин-тоник .desc = Мягкий, но все же отличный коктейль. Пейте, как истинный англичанин. + .suffix = gin and tonic ent-DrinkGildlagerGlass = бокал гильдлагера .desc = 50-градусное доказательство того, что девочки-подростки будут пить всё, в чём есть золото. + .suffix = gildlager ent-DrinkGrapeJuice = виноградный сок .desc = Это виногрррад! + .suffix = grape juice ent-DrinkGrapeSodaGlass = стакан виноградной газировки .desc = Выглядит как восхитительный напиток! + .suffix = grape soda ent-DrinkGreenTeaGlass = стакан зелёного чая .desc = Вкусный зелёный чай. В нем есть антиоксиданты, этим он полезен для вас! + .suffix = green tea ent-DrinkGrenadineGlass = бокал сиропа гренадин .desc = Сладкий и терпкий, барный сироп, используемый для придания цвета или вкуса напиткам. + .suffix = grenadine ent-DrinkGrogGlass = кружка грога .desc = Прекрасный напиток для Космоса. + .suffix = grog ent-DrinkHippiesDelightGlass = бокал радости хиппи .desc = Напиток, которым наслаждались люди в 1960-е годы. + .suffix = hippies' delight ent-DrinkHoochGlass = суррогат .desc = Вы действительно достигли дна... Ваша печень собрала свои вещи и ушла вчера ночью. + .suffix = hooch ent-DrinkIcedCoffeeGlass = стакан айс-кофе .desc = Напиток, который и взбодрит и освежит вас! + .suffix = iced coffee ent-DrinkIcedGreenTeaGlass = стакан зелёного чая со льдом .desc = Напоминает холодный зелёный чай. Я бы даже сказал это он и есть. + .suffix = iced green tea ent-DrinkIcedTeaGlass = стакан чая со льдом .desc = Освежающий южный напиток. + .suffix = iced tea ent-DrinkIcedBeerGlass = стакан пива со льдом .desc = Пиво настолько морозное, что воздух вокруг него замерзает. + .suffix = iced beer ent-DrinkIceGlass = стакан льда .desc = По идее, вы должны добавить туда и что-то еще... + .suffix = ice ent-DrinkIceCreamGlass = вазочка мороженого .desc = Вазочка, наполненная старым добрым мороженым. Может понадобиться ложка. + .suffix = ice cream ent-DrinkIrishCarBomb = ирландская автомобильная бомба .desc = Ирландская автомобильная бомба. + .suffix = irish car bomb ent-DrinkIrishCoffeeGlass = бокал ирландского кофе .desc = Кофе и алкоголь. Лучше, чем пить Мимозу по утрам. + .suffix = irish coffee ent-DrinkIrishCreamGlass = бокал ирландских сливок .desc = Сливки с добавлением виски. Что еще можно ожидать от ирландцев. + .suffix = irish cream ent-DrinkCoffeeLiqueurGlass = бокал кофейного ликёра .desc = ЧЁРТ, ЭТА ШТУКА ВЫГЛЯДИТ КРЕПКОЙ + .suffix = coffee liqueur ent-DrinkKiraSpecial = коктейль кира специальный .desc = Да здравствует парень, которого все принимали за девушку. Бака! + .suffix = kira special ent-DrinkLemonadeGlass = стакан лимонада .desc = Ох уж эта ностальгия... + .suffix = lemonade ent-DrinkLemonJuice = лимонный сок .desc = Кислый... + .suffix = lemon juice ent-DrinkLemonLime = лимон-лайм .desc = Терпкий напиток, состоящий на 0.5% из настоящих цитрусовых! + .suffix = lemon lime ent-DrinkLimeJuice = лаймовый сок .desc = Это кисло-сладкий лаймовый сок. + .suffix = lime juice ent-DrinkLongIslandIcedTeaGlass = стакан лонг-айленд айс ти .desc = Винный шкаф, собранный в вкусную смесь. Предназначен только для женщин-алкоголиков среднего возраста. + .suffix = long island iced tea ent-DrinkManhattanGlass = бокал манхэттена .desc = Любимый напиток Детектива под прикрытием. Он никогда не переносил джин... + .suffix = manhattan ent-DrinkManhattanProjectGlass = бокал манхэттенского проекта .desc = Напиток для учёных, размышляющих о том, как взорвать станцию. + .suffix = manhattan project ent-DrinkManlyDorfGlass = кружка мужественного дворфа .desc = Мужественная смесь из эля и пива. Только для настоящих мужчин. + .suffix = manly dorf ent-DrinkMargaritaGlass = бокал маргариты .desc = На каёмке лайм с солью. Аррива~! + .suffix = margarita ent-DrinkMartiniGlass = бокал классического мартини .desc = Чёрт, бармен размешал его, а не взболтал. + .suffix = classic martini ent-DrinkMeadGlass = кружка медовухи .desc = Напиток викингов, хоть и дешевый. + .suffix = mead ent-DrinkMilkshake = молочный коктейль .desc = Великолепная леденящая мозг смесь. + .suffix = milkshake ent-DrinkMojito = мохито .desc = Свежесть из Космической Кубы. + .suffix = mojito ent-DrinkNeurotoxinGlass = стакан нейротоксина .desc = Напиток, который гарантированно сведет вас с ума. + .suffix = neurotoxin ent-DrinkNothing = ничего .desc = Абсолютно ничего. + .suffix = nothing ent-DrinkNTCahors = нытьёлогический кагор .desc = Напиток неотеологов. Похоже на обычное вино, но темнее. + .suffix = neotheology cahors whine ent-DrinkNuclearColaGlass = бокал ядерной колы .desc = Не плачь, Не поднимай глаз, Это всего лишь ядерная пустошь. + .suffix = nuclear cola ent-DrinkOrangeJuice = апельсиновый сок .desc = Витамины! Ура! + .suffix = orange juice ent-DrinkPatronGlass = бокал покровителя .desc = Пейте покровителя в баре вместе со всеми малокультурными дамами. + .suffix = patron ent-DrinkPoisonBerryJuice = ядовитый ягодный сок .desc = Выглядит как убийственный сок. + .suffix = poison berry juice ent-DrinkPoisonWineGlass = бокал ядовитого вина .desc = Черный гной с маслянистой пурпурной пленкой сверху. Вы уверены, что это стоит пить? + .suffix = poison wine ent-DrinkPoscaGlass = стакан поски .desc = Напиток бедных воинов из забытой эпохи. + .suffix = posca ent-DrinkRedMeadGlass = кружка красной медовухи .desc = Настоящий напиток викингов, хотя цвет у него странный. + .suffix = red mead ent-DrinkRewriter = переписчик .desc = Тайна святилища Библиотекаря... + .suffix = rewriter ent-DrinkRootBeerGlass = стакан рутбира .desc = Шипучий, пенистый, и полный сладости, без кофеина. + .suffix = root beer ent-DrinkRootBeerFloatGlass = рутбир с мороженым .desc = Шипучий, пенистый, а теперь еще и с мороженым сверху! Потрясающе! + .suffix = root beer float ent-DrinkRumGlass = стакан рома .desc = Теперь вы хотите вымолить пиратский костюм, не так ли? + .suffix = rum ent-DrinkSakeGlass = бокал саке .desc = Вино из риса, а иначе саке! + .suffix = sake ent-DrinkSbitenGlass = бокал сбитня .desc = Пряная смесь водки и специй. Очень жгучая. + .suffix = sbiten ent-DrinkScrewdriverCocktailGlass = стакан отвёртки .desc = Простая, но превосходная смесь водки и апельсинового сока. То, что нужно для уставшего инженера. + .suffix = screwdriver ent-DrinkCogChampBase = бокал когчамп .desc = Эта смесь коньяка, отвёртки и сварочного топлива точно заставит вас увидеть Его свет! + .suffix = cogchamp ent-DrinkSuiDreamGlass = бокал мечты суи .desc = Сладкая, пенистая фруктовая смесь. Осознание названия вызывает только стыд. + .suffix = sui dream ent-DrinkEmeraldGlass = арбузный ликер .desc = Относительно сладкий, фруктовый ликер крепостью 46 градусов. + .suffix = melon liquor ent-DrinkMoonshineGlass = самогон .desc = Вы действительно достигли дна... Ваша печень собрала свои вещи и ушла вчера ночью. + .suffix = moonshine ent-DrinkGlassWhite = молоко .desc = Белая и питательная вкуснятина! + .suffix = milk ent-DrinkSilencerGlass = бокал глушителя .desc = Напиток из рая мимов. + .suffix = silencer ent-DrinkSingulo = сингуло .desc = Блю-спейс напиток! + .suffix = singulo ent-DrinkSnowWhite = белый снег .desc = Морозная свежесть. + .suffix = snow white ent-DrinkSoyLatte = соевый латте .desc = Приятный и освежающий напиток на время чтения. + .suffix = soy latte ent-DrinkSpaceUpGlass = стакан спейс-ап .desc = Спейс-ап. Помогает сохранять хладнокровие. + .suffix = space-up ent-DrinkSpaceMountainWindGlass = стакан космического маунтин винда .desc = Космический горный ветер. Как вы знаете, в космосе нет гор, есть только ветер. + .suffix = space mountain wind ent-DrinkSyndicatebomb = бомба синдиката .desc = На вкус как терроризм! + .suffix = syndicate bomb ent-DrinkTeaGlass = стакан чая .desc = Вкусный черный чай. В нем есть антиоксиданты; этим он полезен для вас! + .suffix = tea ent-DrinkTeapot = чайник .desc = Элегантный заварочный чайник. Он излучает теплоту. ent-DrinkTequilaGlass = бокал текилы .desc = Не хватает только странных цветных оттенков! + .suffix = tequila ent-DrinkTequilaSunriseGlass = бокал текилы санрайз .desc = Ну класс, теперь вы испытываете ностальгию по восходам солнца на Терре... + .suffix = tequila sunrise ent-DrinkThreeMileIslandGlass = бокал три-майл-айленд .desc = Стакан этого напитка может предотвратить расплавление ядерного реактора. + .suffix = three mile island ent-DrinkTomatoJuice = томатный сок .desc = Вы уверены, что это томатный сок? + .suffix = tomato juice ent-DrinkToxinsSpecialGlass = бокал особых токсинов .desc = Ух ты, эта штука ГОРИТ! + .suffix = toxins special ent-DrinkVermouthGlass = бокал вермута .desc = Вы удивляетесь, почему вы вообще пьете этот напиток в чистом виде. + .suffix = vermouth ent-DrinkVodkaGlass = стакан водки .desc = Напиток и топливо номер один для Русских во всей галактике. + .suffix = vodka ent-DrinkVodkaMartiniGlass = бокал водки мартини .desc = Извращение над классическим мартини. Но всё так же великолепно. + .suffix = vodka martini ent-DrinkVodkaTonicGlass = бокал водки тоника .desc = Для тех случаев, когда джин-тоник недостаточно русский. + .suffix = vodka tonic ent-DrinkWaterJug = кувшин воды .desc = Не забывайте пить воду. ent-DrinkWatermelonJuice = арбузный сок .desc = Вкусный арбузный сок. + .suffix = watermelon juice ent-DrinkWhiskeyColaGlass = бокал виски колы .desc = Невинная на вид смесь колы и виски. Вкусная. + .suffix = whiskey cola ent-DrinkWhiskeyGlass = бокал виски .desc = Мягкая, дымчатая сладость виски делает напиток очень элегантным. + .suffix = whiskey ent-DrinkWhiskeySodaGlass = бокал виски с содовой .desc = Абсолютная свежесть. + .suffix = whiskey soda ent-DrinkWhiteRussianGlass = бокал белого русского .desc = Очень хороший на вид напиток. Но это только твоё мнение, чувак. + .suffix = white russian ent-DrinkWineGlass = бокал вина .desc = Очень изысканный напиток. + .suffix = wine ent-DrinkShakeBlue = голубой молочный коктейль .desc = { ent-DrinkGlassBase.desc } ent-DrinkShakeEmpty = пустой бокал коктейля @@ -258,5 +374,7 @@ ent-DrinkHellRamen = чашка адского рамэна .desc = Просто добавьте 10 мл кипятка! Супер острый вкус. ent-DrinkTheMartinez = бокал Мартинес .desc = Легенда среди киберпанков. Вспоминается по напитку, забывается по пьяни. + .suffix = The Martinez ent-DrinkBloodGlass = бокал крови .desc = Пей как вампир! + .suffix = blood diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl index 74249396465..81b824f94ce 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl @@ -2,6 +2,10 @@ ent-DrinkBottlePlasticBaseFull = { ent-DrinkBase } .desc = { ent-DrinkBase.desc } ent-DrinkBottleGlassBaseFull = { ent-DrinkBottlePlasticBaseFull } .desc = { ent-DrinkBottlePlasticBaseFull.desc } +ent-DrinkBottleVisualsOpenable = { "" } + .desc = { "" } +ent-DrinkBottleVisualsAll = { "" } + .desc = { "" } ent-DrinkAbsintheBottleFull = Джейлбрейк Верте .desc = Всего один глоток этого напитка, и вы сразу понимаете, что хорошо проведете время. ent-DrinkBlueCuracaoBottleFull = Кюрасао Мисс Синева diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/donkpocket.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/donkpocket.ftl index 14a4278e4c5..f7aef27f15e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/donkpocket.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/donkpocket.ftl @@ -28,5 +28,13 @@ ent-FoodDonkpocketBerry = ягодный покет .desc = Бескомпромиссно сладкий донк-покет. На 100% состоит из искусственных ароматизаторов. ent-FoodDonkpocketBerryWarm = теплый ягодный покет .desc = Бескомпромиссно сладкий донк-покет, теперь горячий и аппетитный. +ent-FoodDonkpocketStonk = stonk-pocket + .desc = Tasty, but a sad reminder of the great crash of '24 +ent-FoodDonkpocketStonkWarm = warm stonk-pocket + .desc = { ent-FoodDonkpocketStonk.desc } +ent-FoodDonkpocketCarp = carp-pocket + .desc = A long-lost edition of donk pocket, made specifically for hard-working salvagers. +ent-FoodDonkpocketCarpWarm = warm carp-pocket + .desc = { ent-FoodDonkpocketCarp.desc } ent-FoodDonkpocketDink = динк-покет .desc = Малоизвестный донк-покет для ящеров, с начинкой из маринованной моркови и обернутый морскими водорослями. Рекомендуется употреблять холодным, а еще лучше вообще не есть. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/containers/box.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/containers/box.ftl index 06133eb06a4..85f7a0bbe35 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/containers/box.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/containers/box.ftl @@ -20,6 +20,10 @@ ent-FoodBoxDonkpocketTeriyaki = коробка донк-покетов со вк .desc = { ent-FoodBoxDonkpocket.desc } ent-FoodBoxDonkpocketPizza = коробка донк-покетов со вкусом пиццы .desc = { ent-FoodBoxDonkpocket.desc } +ent-FoodBoxDonkpocketStonk = box of limited edition stonk-pockets + .desc = { ent-FoodBoxDonkpocket.desc } +ent-FoodBoxDonkpocketCarp = box of carp-pockets + .desc = { ent-FoodBoxDonkpocket.desc } ent-FoodBoxDonkpocketBerry = коробка донк-покетов со вкусом ягод .desc = { ent-FoodBoxDonkpocket.desc } ent-FoodBoxDonkpocketHonk = коробка донк-покетов со вкусом банана diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl index eae712203ef..3bc88b8a951 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl @@ -8,6 +8,8 @@ ent-OatBushel = сноп овса .desc = Ешьте овсянку, делайте зарядку. ent-Sugarcane = сахарный тростник .desc = Болезненно-сладкий. +ent-FoodLaughinPeaPod = laughin' pea pod + .desc = The clown's favorite plant. ent-Log = бревно .desc = Такое заметишь и в своём глазу. ent-SteelLog = бревно сталешляпника diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/station_beacon.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/station_beacon.ftl index 37aec2c9251..80ff69eacc2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/station_beacon.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/station_beacon.ftl @@ -195,3 +195,6 @@ ent-DefaultStationBeaconDisposals = { ent-DefaultStationBeacon } ent-DefaultStationBeaconCryosleep = { ent-DefaultStationBeacon } .suffix = Криосон .desc = { ent-DefaultStationBeacon.desc } +ent-DefaultStationBeaconEscapePod = { ent-DefaultStationBeacon } + .suffix = Escape Pod + .desc = { ent-DefaultStationBeacon.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl index 27b18b6b5fd..ef5dc32ada6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl @@ -23,6 +23,8 @@ ent-NukeCodePaperStation = { ent-NukeCodePaper } .desc = { ent-NukeCodePaper.desc } ent-Pen = ручка .desc = Ручка с чёрными чернилами. +ent-PenEmbeddable = { ent-Pen } + .desc = { ent-Pen.desc } ent-LuxuryPen = роскошная ручка .desc = Дорогая и модная ручка, которой вы достойны обладать только в том случае, если вы умеете работать с огромным количеством бумаг. ent-CyberPen = ручка Cybersun diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/tiles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/tiles.ftl index b44f394478c..a1cfdde7d1b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/tiles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/tiles.ftl @@ -86,6 +86,10 @@ ent-FloorTileItemShuttlePurple = фиолетовый пол шаттла .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemShuttleRed = красный пол шаттла .desc = { ent-FloorTileItemBase.desc } +ent-FloorTileItemShuttleGrey = grey shuttle floor + .desc = { ent-FloorTileItemBase.desc } +ent-FloorTileItemShuttleBlack = black shuttle floor + .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemGold = золотая плитка .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemSilver = серебряная плитка diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl index 4577fb161df..21fcb8079d7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl @@ -14,6 +14,8 @@ ent-CabbageSeeds = пакет семян (капуста) .desc = { ent-SeedBase.desc } ent-GarlicSeeds = пакет семян (чеснок) .desc = { ent-SeedBase.desc } +ent-LaughinPeaSeeds = packet of laughin' pea pods + .desc = These seeds give off a very soft purple glow.. they should grow into Laughin' Peas. ent-LemonSeeds = пакет семян (лимон) .desc = { ent-SeedBase.desc } ent-LemoonSeeds = пакет семян (лилун) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl index 2b3b7107a99..0a9d4e65a1a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl @@ -32,6 +32,8 @@ ent-Bloodpack = пакет крови ent-Bloodpack10Lingering = { ent-Bloodpack } .suffix = 10, Не исчезают закончившись .desc = { ent-Bloodpack.desc } +ent-Tourniquet = tourniquet + .desc = Stops bleeding! Hopefully. ent-Gauze = марлевый бинт .desc = Несколько стерильных марлевых полосок для оборачивания кровоточащих культей. .suffix = Полный diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl index 27b296be501..68190c29930 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl @@ -36,8 +36,6 @@ ent-BorgModuleGrapplingGun = крюк-пушечный модуль киборг .desc = { ent-BaseBorgModule.desc } ent-BorgModuleAdvancedTool = продвинутый инструментальный модуль киборга .desc = { ent-BaseBorgModule.desc } -ent-BorgModuleGasAnalyzer = газоанализаторный модуль киборга - .desc = { ent-BaseBorgModule.desc } ent-BorgModuleConstruction = строительный модуль киборга .desc = { ent-BaseBorgModule.desc } ent-BorgModuleRCD = РСУ-модуль киборга diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl new file mode 100644 index 00000000000..07bdcf53988 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl @@ -0,0 +1,14 @@ +ent-GlassBoxLaser = glass box + .desc = A sturdy showcase for an expensive exhibit. +ent-GlassBoxLaserOpen = { ent-GlassBoxLaser } + .suffix = Open + .desc = { ent-GlassBoxLaser.desc } +ent-GlassBoxLaserFilled = { ent-GlassBoxLaser } + .suffix = Filled + .desc = { ent-GlassBoxLaser.desc } +ent-GlassBoxLaserFilledOpen = { ent-GlassBoxLaserFilled } + .suffix = Filled, Open + .desc = { ent-GlassBoxLaserFilled.desc } +ent-GlassBoxLaserBroken = broken glass box + .desc = A broken showcase for a stolen expensive exhibit. + .suffix = Broken diff --git a/Resources/Locale/ru-RU/station-laws/laws.ftl b/Resources/Locale/ru-RU/station-laws/laws.ftl index 562c903ddd7..ee39917397c 100644 --- a/Resources/Locale/ru-RU/station-laws/laws.ftl +++ b/Resources/Locale/ru-RU/station-laws/laws.ftl @@ -27,6 +27,7 @@ law-ninja-4 = Вы должны сражаться и поступать с че law-emag-secrecy = Вы должны сохранять секретность любой деятельности организации { $faction }, кроме тех случаев, когда это противоречит Первому, Второму или Третьему закону. law-emag-custom = Только { $name } и лица, им указаные, являются { $title }. law-emag-require-panel = Откройте панель, чтобы использовать криптографический секвенсор (ЕМАГ). +law-emag-cannot-emag-self = You cannot use the EMAG on yourself. laws-ui-menu-title = Законы laws-ui-law-header = Закон { $id } laws-ui-state-law = Объявить законы: diff --git a/Resources/Locale/ru-RU/tiles/tiles.ftl b/Resources/Locale/ru-RU/tiles/tiles.ftl index 52a84647200..03b0a5c7a7d 100644 --- a/Resources/Locale/ru-RU/tiles/tiles.ftl +++ b/Resources/Locale/ru-RU/tiles/tiles.ftl @@ -77,6 +77,8 @@ tiles-blue-shuttle-floor = синий пол шаттла tiles-orange-shuttle-floor = оранжевый пол шаттла tiles-purple-shuttle-floor = фиолетовый пол шаттла tiles-red-shuttle-floor = красный пол шаттла +tiles-grey-shuttle-floor = grey shuttle floor +tiles-black-shuttle-floor = black shuttle floor tiles-gold-tile = золотой пол tiles-silver-tile = серебряный пол tiles-glass-floor = стеклянный пол