From 7a8e3e1e24e3fa8edf1a0387c00e502e80d22cb9 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Sat, 9 Mar 2024 01:49:45 +0300 Subject: [PATCH] Update locale --- .../ss14-ru/prototypes/actions/types.ftl | 2 + .../catalog/fills/boxes/emergency.ftl | 1 + .../catalog/fills/boxes/general.ftl | 5 +- .../catalog/fills/crates/materials.ftl | 2 + .../catalog/fills/crates/shuttle.ftl | 2 +- .../catalog/fills/lockers/space_ruin.ftl | 6 ++ .../entities/clothing/shoes/specific.ftl | 4 ++ .../entities/clothing/uniforms/jumpskirts.ftl | 2 + .../entities/structures/furniture/chairs.ftl | 4 -- .../entities/clothing/outerclothing/coats.ftl | 2 + .../prototypes/entities/markers/shuttle.ftl | 2 + .../entities/markers/spawners/human.ftl | 4 ++ .../markers/spawners/random/curtains.ftl | 2 + .../markers/spawners/random/mineshaft.ftl | 10 +++ .../prototypes/entities/mobs/npcs/human.ftl | 4 ++ .../entities/objects/devices/station_map.ftl | 3 + .../entities/objects/materials/shards.ftl | 2 + .../objects/materials/sheets/glass.ftl | 6 ++ .../objects/materials/sheets/metal.ftl | 9 +++ .../entities/objects/misc/carpets.ftl | 36 +++++------ .../entities/objects/misc/rubber_stamp.ftl | 3 + .../entities/objects/misc/tiles.ftl | 4 ++ .../entities/objects/weapons/melee/knife.ftl | 5 ++ .../structures/decoration/curtains.ftl | 61 ++++++++++++++++++- .../structures/doors/airlocks/access.ftl | 3 + .../structures/doors/airlocks/assembly.ftl | 6 ++ .../structures/doors/airlocks/clockwork.ftl | 6 ++ .../structures/doors/windoors/assembly.ftl | 2 + .../structures/doors/windoors/clockwork.ftl | 2 + .../structures/doors/windoors/windoor.ftl | 2 + .../entities/structures/furniture/chairs.ftl | 18 ++++-- .../structures/furniture/tables/tables.ftl | 2 + .../structures/lighting/ground_lighting.ftl | 5 +- .../structures/wallmounts/signs/signs.ftl | 16 +++++ .../entities/structures/wallmounts/switch.ftl | 60 +++++++++--------- .../entities/structures/walls/asteroid.ftl | 2 +- .../entities/structures/walls/girders.ftl | 2 + .../entities/structures/walls/grille.ftl | 6 ++ .../entities/structures/windows/clockwork.ftl | 7 +++ .../structures/windows/plastitanium.ftl | 5 ++ .../prototypes/gamerules/roundstart.ftl | 2 + .../prototypes/procedural/salvage_mods.ftl | 2 +- .../Locale/ru-RU/accessories/human-hair.ftl | 2 + .../Locale/ru-RU/actions/actions/suicide.ftl | 1 + .../ru-RU/advertisements/vending/lawdrobe.ftl | 10 +++ .../components/ame-controller-component.ftl | 8 +-- .../components/injector-component.ftl | 4 ++ .../fluids/components/puddle-component.ftl | 2 +- Resources/Locale/ru-RU/markings/reptilian.ftl | 3 +- Resources/Locale/ru-RU/mass-media/news-ui.ftl | 3 +- .../components/cream-pied-component.ftl | 26 ++++---- .../Locale/ru-RU/paper/paper-component.ftl | 1 + .../Locale/ru-RU/paper/stamp-component.ftl | 1 + .../Locale/ru-RU/salvage/salvage-magnet.ftl | 1 + Resources/Locale/ru-RU/shuttles/console.ftl | 35 ++++++----- .../ss14-ru/prototypes/actions/types.ftl | 2 + .../catalog/fills/boxes/emergency.ftl | 1 + .../catalog/fills/boxes/general.ftl | 1 + .../catalog/fills/crates/materials.ftl | 2 + .../catalog/fills/lockers/space_ruin.ftl | 6 ++ .../entities/clothing/shoes/specific.ftl | 4 ++ .../entities/clothing/uniforms/jumpskirts.ftl | 2 + .../entities/clothing/outerclothing/coats.ftl | 2 + .../prototypes/entities/markers/shuttle.ftl | 2 + .../entities/markers/spawners/human.ftl | 4 ++ .../markers/spawners/random/curtains.ftl | 2 + .../markers/spawners/random/mineshaft.ftl | 10 +++ .../prototypes/entities/mobs/npcs/human.ftl | 4 ++ .../entities/objects/devices/station_map.ftl | 3 + .../entities/objects/materials/shards.ftl | 2 + .../objects/materials/sheets/glass.ftl | 6 ++ .../objects/materials/sheets/metal.ftl | 9 +++ .../entities/objects/misc/rubber_stamp.ftl | 3 + .../entities/objects/misc/tiles.ftl | 4 ++ .../entities/objects/weapons/melee/knife.ftl | 5 ++ .../structures/decoration/curtains.ftl | 57 +++++++++++++++++ .../structures/doors/airlocks/access.ftl | 3 + .../structures/doors/airlocks/assembly.ftl | 6 ++ .../structures/doors/airlocks/clockwork.ftl | 6 ++ .../structures/doors/windoors/assembly.ftl | 2 + .../structures/doors/windoors/clockwork.ftl | 2 + .../structures/doors/windoors/windoor.ftl | 2 + .../entities/structures/furniture/chairs.ftl | 10 +++ .../structures/furniture/tables/tables.ftl | 2 + .../structures/lighting/ground_lighting.ftl | 5 +- .../structures/wallmounts/signs/signs.ftl | 16 +++++ .../entities/structures/walls/girders.ftl | 2 + .../entities/structures/walls/grille.ftl | 6 ++ .../entities/structures/windows/clockwork.ftl | 7 +++ .../structures/windows/plastitanium.ftl | 5 ++ .../prototypes/gamerules/roundstart.ftl | 2 + .../ss14-ru/prototypes/objectives/thief.ftl | 6 -- .../Locale/ru-RU/store/uplink-catalog.ftl | 2 + Resources/Locale/ru-RU/tiles/tiles.ftl | 3 + 94 files changed, 535 insertions(+), 109 deletions(-) delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/structures/furniture/chairs.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/human.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/curtains.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/mineshaft.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/clockwork.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/clockwork.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/clockwork.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl create mode 100644 Resources/Locale/ru-RU/actions/actions/suicide.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/human.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/random/curtains.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/random/mineshaft.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/clockwork.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/clockwork.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/clockwork.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl index 70d8858d267..806b05ff349 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl @@ -1,3 +1,5 @@ +ent-BaseSuicideAction = { "" } + .desc = { "" } ent-ActionScream = Scream .desc = AAAAAAAAAAAAAAAAAAAAAAAAA ent-ActionTurnUndead = Turn Undead diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl index 828c2d8bde9..927a69525ce 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl @@ -10,5 +10,6 @@ ent-BoxSurvivalMedical = survival box .suffix = Medical ent-BoxHug = box of hugs .desc = A special box for sensitive people. + .suffix = Emergency ent-BoxSurvivalSyndicate = extended-capacity survival box .desc = It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/general.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/general.ftl index 49a3c805e3e..f4f82b3652f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/general.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/general.ftl @@ -18,8 +18,9 @@ ent-BoxMesonScanners = meson box .desc = A box of spare meson goggles. ent-BoxMRE = M.R.E. .desc = A box of decades old military surplus rations. It is surprisingly not rotten. -ent-BoxHugHealing = box of hugs - .desc = A special box for sensitive people. +ent-BoxHugHealing = { ent-BoxHug } + .suffix = Medical + .desc = { ent-BoxHug.desc } ent-BoxInflatable = inflatable wall box .desc = Inflatable walls are not to be used as floatation devices. ent-BoxPerformer = hatsune miku day bag diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/materials.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/materials.ftl index 37f76ea29e1..f5a2280ff0a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/materials.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/materials.ftl @@ -8,6 +8,8 @@ ent-CrateMaterialPlastic = plastic sheet crate .desc = 90 sheets of plastic. ent-CrateMaterialWood = wood crate .desc = Bunch of wood planks. +ent-CrateMaterialBrass = brass crate + .desc = 90 sheets of brass. ent-CrateMaterialPlasteel = plasteel crate .desc = 90 sheets of plasteel. ent-CrateMaterialPlasma = solid plasma crate diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/shuttle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/shuttle.ftl index b62f57f3c23..555d1d06472 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/shuttle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/shuttle.ftl @@ -1,4 +1,4 @@ ent-CrateEngineeringThruster = thruster crate .desc = Contains a thruster flatpack. -ent-CrateEngineeringGyroscope = thruster crate +ent-CrateEngineeringGyroscope = gyroscope crate .desc = Contains a gyroscope flatpack. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/space_ruin.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/space_ruin.ftl index d472c43299d..fde48669cbc 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/space_ruin.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/space_ruin.ftl @@ -1,3 +1,9 @@ ent-LockerOldAISat = closet .suffix = NTSRA voidsuit locker .desc = { ent-LockerSyndicate.desc } +ent-LockerSyndicateShipGearBasic = { ent-LockerSyndicate } + .suffix = Basic ship gear, Random + .desc = { ent-LockerSyndicate.desc } +ent-LockerSyndicateShipGearBasicChameleonKit = { ent-LockerSyndicateShipGearBasic } + .suffix = Basic ship gear, Random, Chameleon Kit + .desc = { ent-LockerSyndicateShipGearBasic.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/shoes/specific.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/shoes/specific.ftl index ef91b3f09a8..22b6a98dba5 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/shoes/specific.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/shoes/specific.ftl @@ -4,3 +4,7 @@ ent-ClothingShoesAerostatic = aerostatic boots .desc = A crisp, clean set of boots for working long hours on the beat. ent-ClothingShoesCentcomBlack = special operations officer shoes .desc = Leather, black, high-quality shoes, you can hardly find similar ones on the black market... +ent-ClothingShoesSchoolBlack = school black shoes + .desc = Stylish and comfortable school shoes in dark color with stockings. +ent-ClothingShoesSchoolWhite = school white shoes + .desc = Stylish and comfortable school shoes in light color with stockings. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl index 41363b9fa38..e538f112b25 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl @@ -6,3 +6,5 @@ ent-ClothingUniformColorJumpskirtRainbow = rainbow jumpskirt .desc = A multi-colored jumpskirt! ent-ClothingUniformJumpskirtPsychologist = psychologist suitskirt .desc = I don't lose things. I place things in locations which later elude me. +ent-ClothingUniformJumpskirtSchool = school skirt + .desc = Stylish and comfortable school skirt. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/structures/furniture/chairs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/structures/furniture/chairs.ftl deleted file mode 100644 index b029bbf4c76..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/structures/furniture/chairs.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-ChairCarp = carp chair - .desc = A luxurious chair, the many purple scales reflect the light in a most pleasing manner. -ent-ChairBrass = brass chair - .desc = A spinny chair made of bronze. It has little cogs for wheels! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl index 870cc6e4016..72dafedfc0d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl @@ -52,3 +52,5 @@ ent-ClothingOuterCoatLabSeniorPhysician = senior physician lab coat .desc = A suit that protects against minor chemical spills. Has light blue sleeves and an orange waist trim. ent-ClothingOuterCoatSpaceAsshole = the coat of space asshole .desc = And there he was... +ent-ClothingOuterCoatExpensive = expensive coat + .desc = Very fluffy pink coat, made out of very expensive fur (clearly). diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/shuttle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/shuttle.ftl index 20afb6ac4f1..580e5467a65 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/shuttle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/shuttle.ftl @@ -1,2 +1,4 @@ ent-FTLPoint = FTL point .desc = { ent-MarkerBase.desc } +ent-FTLExclusion = FTL exclusion point + .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/human.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/human.ftl new file mode 100644 index 00000000000..d61635a4507 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/human.ftl @@ -0,0 +1,4 @@ +ent-SpawnMobSyndicateFootSoldier = syndicate footsoldier spawner + .desc = { ent-MarkerBase.desc } +ent-SpawnMobSyndicateFootsoldierPilot = syndicate shuttle pilot spawner + .desc = { ent-SpawnMobSyndicateFootSoldier.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/curtains.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/curtains.ftl new file mode 100644 index 00000000000..95298904d28 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/curtains.ftl @@ -0,0 +1,2 @@ +ent-CurtainSpawner = random curtain spawner + .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/mineshaft.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/mineshaft.ftl new file mode 100644 index 00000000000..6baf9f9ae6c --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/mineshaft.ftl @@ -0,0 +1,10 @@ +ent-RandomWoodenSupport = wooden support spawner + .desc = { ent-MarkerBase.desc } +ent-RandomWoodenWall = wooden wall spawner + .desc = { ent-MarkerBase.desc } +ent-RandomStalagmiteOrCrystal = stalagmite or crystal spawner + .desc = { ent-MarkerBase.desc } +ent-RandomBrownStalagmite = brown stalagmite spawner + .desc = { ent-MarkerBase.desc } +ent-RandomGreyStalagmite = grey stalagmite spawner + .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/human.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/human.ftl index 682d2d6b289..e0b087ab89f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/human.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/human.ftl @@ -4,6 +4,10 @@ ent-MobSalvager = salvager .desc = { ent-BaseMobHuman.desc } ent-MobSpirate = spirate .desc = Yarr! +ent-MobSyndicateFootsoldier = syndicate footsoldier + .desc = { ent-BaseMobHuman.desc } +ent-MobSyndicateFootsoldierPilot = syndicate shuttle pilot + .desc = { ent-MobSyndicateFootsoldier.desc } ent-SalvageHumanCorpse = unidentified corpse .desc = I think he's dead. .suffix = Dead diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_map.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_map.ftl index 4610941c965..a7094dfdf3d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_map.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_map.ftl @@ -3,6 +3,9 @@ ent-BaseHandheldStationMap = station map ent-HandheldStationMap = { ent-BaseHandheldStationMap } .suffix = Handheld, Powered .desc = { ent-BaseHandheldStationMap.desc } +ent-HandheldStationMapEmpty = { ent-HandheldStationMap } + .suffix = Handheld, Empty + .desc = { ent-HandheldStationMap.desc } ent-HandheldStationMapUnpowered = { ent-BaseHandheldStationMap } .suffix = Handheld, Unpowered .desc = { ent-BaseHandheldStationMap.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/shards.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/shards.ftl index 8d63c2b848a..787b76f1f78 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/shards.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/shards.ftl @@ -8,3 +8,5 @@ ent-ShardGlassPlasma = plasma glass shard .desc = A small piece of plasma glass. ent-ShardGlassUranium = uranium glass shard .desc = A small piece of uranium glass. +ent-ShardGlassClockwork = clockwork glass shard + .desc = A small piece of brass-infused glass. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl index 2010737e248..82ec64f8e36 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl @@ -41,3 +41,9 @@ ent-SheetRUGlass = reinforced uranium glass ent-SheetRUGlass1 = reinforced uranium glass .suffix = Single .desc = { ent-SheetRUGlass.desc } +ent-SheetClockworkGlass = clockwork glass + .desc = A sheet of brass-hardened glass, primarily used by clockwork enthusiasts and remnants of Ratvarian cults. + .suffix = Full +ent-SheetClockworkGlass1 = clockwork glass + .suffix = Single + .desc = { ent-SheetClockworkGlass.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl index d244db0dc62..bfa6da7551b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl @@ -12,6 +12,15 @@ ent-SheetSteel1 = steel ent-SheetSteelLingering0 = { ent-SheetSteel } .suffix = Lingering, 0 .desc = { ent-SheetSteel.desc } +ent-SheetBrass = brass + .desc = A sheet of brass, primarily used by clockwork enthusiasts and the remnants of Ratvarian cults. + .suffix = Full +ent-SheetBrass10 = brass + .suffix = 10 + .desc = { ent-SheetBrass.desc } +ent-SheetBrass1 = brass + .suffix = Single + .desc = { ent-SheetBrass.desc } ent-SheetPlasteel = plasteel .suffix = Full .desc = { ent-SheetMetalBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/carpets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/carpets.ftl index 9ee9ee91367..edf947a2ab4 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/carpets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/carpets.ftl @@ -1,30 +1,30 @@ ent-FloorCarpetItemRed = carpet .suffix = Red .desc = { ent-FloorTileItemBase.desc } -ent-FloorCarpetItemBlack = carpet +ent-FloorCarpetItemBlack = { ent-FloorCarpetItemRed } .suffix = Black - .desc = { ent-FloorTileItemBase.desc } -ent-FloorCarpetItemBlue = carpet + .desc = { ent-FloorCarpetItemRed.desc } +ent-FloorCarpetItemBlue = { ent-FloorCarpetItemRed } .suffix = Blue - .desc = { ent-FloorTileItemBase.desc } -ent-FloorCarpetItemGreen = carpet + .desc = { ent-FloorCarpetItemRed.desc } +ent-FloorCarpetItemGreen = { ent-FloorCarpetItemRed } .suffix = Green - .desc = { ent-FloorTileItemBase.desc } -ent-FloorCarpetItemOrange = carpet + .desc = { ent-FloorCarpetItemRed.desc } +ent-FloorCarpetItemOrange = { ent-FloorCarpetItemRed } .suffix = Orange - .desc = { ent-FloorTileItemBase.desc } -ent-FloorCarpetItemSkyBlue = carpet + .desc = { ent-FloorCarpetItemRed.desc } +ent-FloorCarpetItemSkyBlue = { ent-FloorCarpetItemRed } .suffix = Sky Blue - .desc = { ent-FloorTileItemBase.desc } -ent-FloorCarpetItemPurple = carpet + .desc = { ent-FloorCarpetItemRed.desc } +ent-FloorCarpetItemPurple = { ent-FloorCarpetItemRed } .suffix = Purple - .desc = { ent-FloorTileItemBase.desc } -ent-FloorCarpetItemPink = carpet + .desc = { ent-FloorCarpetItemRed.desc } +ent-FloorCarpetItemPink = { ent-FloorCarpetItemRed } .suffix = Pink - .desc = { ent-FloorTileItemBase.desc } -ent-FloorCarpetItemCyan = carpet + .desc = { ent-FloorCarpetItemRed.desc } +ent-FloorCarpetItemCyan = { ent-FloorCarpetItemRed } .suffix = Cyan - .desc = { ent-FloorTileItemBase.desc } -ent-FloorCarpetItemWhite = carpet + .desc = { ent-FloorCarpetItemRed.desc } +ent-FloorCarpetItemWhite = { ent-FloorCarpetItemRed } .suffix = White - .desc = { ent-FloorTileItemBase.desc } + .desc = { ent-FloorCarpetItemRed.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl index 42dd00fa8a4..7785ca17cec 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl @@ -47,3 +47,6 @@ ent-RubberStampApproved = APPROVED rubber stamp .desc = { ent-RubberStampBaseAlt.desc } ent-RubberStampDenied = DENIED rubber stamp .desc = { ent-RubberStampBaseAlt.desc } +ent-RubberStampDetective = detective's rubber stamp + .suffix = DO NOT MAP + .desc = { ent-RubberStampBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl index c242ecd3520..f1a6c90e153 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl @@ -22,6 +22,10 @@ ent-FloorTileItemMono = mono tile .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemLino = linoleum floor .desc = { ent-FloorTileItemBase.desc } +ent-FloorTileItemBrassFilled = filled brass plate + .desc = { ent-FloorTileItemBase.desc } +ent-FloorTileItemBrassReebe = smooth brass plate + .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemDirty = dirty tile .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemElevatorShaft = elevator shaft tile diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/knife.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/knife.ftl index bdfe742fc53..3b7c2a1f780 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/knife.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/knife.ftl @@ -10,6 +10,11 @@ ent-SurvivalKnife = survival knife .desc = Weapon of first and last resort for combatting space carp. ent-KukriKnife = kukri knife .desc = Professionals have standards. Be polite. Be efficient. Have a plan to kill everyone you meet. +ent-BladedFlatcapGrey = grey flatcap + .desc = Fashionable for both the working class and old man Jenkins. It has glass shards hidden in the brim. + .suffix = Bladed +ent-BladedFlatcapBrown = brown flatcap + .desc = Stupid clown! You made me look bad! It has glass shards hidden in the brim. ent-Shiv = shiv .desc = A crude weapon fashioned from a piece of cloth and a glass shard. ent-ReinforcedShiv = reinforced shiv diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl index 489e259ea51..11db93d1afb 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl @@ -1,5 +1,62 @@ -ent-HospitalCurtains = curtains +ent-BaseCurtains = curtains + .desc = Hides what others shouldn't see. +ent-HospitalCurtains = { ent-BaseCurtains } .desc = Contains less than 1% mercury. + .suffix = Hospital ent-HospitalCurtainsOpen = { ent-HospitalCurtains } - .suffix = Open + .suffix = Open, Hospital .desc = { ent-HospitalCurtains.desc } +ent-CurtainsBlack = { ent-BaseCurtains } + .suffix = Fancy black + .desc = { ent-BaseCurtains.desc } +ent-CurtainsBlackOpen = { ent-CurtainsBlack } + .suffix = Open, Fancy black + .desc = { ent-CurtainsBlack.desc } +ent-CurtainsBlue = { ent-BaseCurtains } + .suffix = Fancy blue + .desc = { ent-BaseCurtains.desc } +ent-CurtainsBlueOpen = { ent-CurtainsBlue } + .suffix = Open, Fancy blue + .desc = { ent-CurtainsBlue.desc } +ent-CurtainsCyan = { ent-BaseCurtains } + .suffix = Fancy cyan + .desc = { ent-BaseCurtains.desc } +ent-CurtainsCyanOpen = { ent-CurtainsCyan } + .suffix = Open, Fancy cyan + .desc = { ent-CurtainsCyan.desc } +ent-CurtainsGreen = { ent-BaseCurtains } + .suffix = Fancy green + .desc = { ent-BaseCurtains.desc } +ent-CurtainsGreenOpen = { ent-CurtainsGreen } + .suffix = Open, Fancy green + .desc = { ent-CurtainsGreen.desc } +ent-CurtainsOrange = { ent-BaseCurtains } + .suffix = Fancy orange + .desc = { ent-BaseCurtains.desc } +ent-CurtainsOrangeOpen = { ent-CurtainsOrange } + .suffix = Open, Fancy orange + .desc = { ent-CurtainsOrange.desc } +ent-CurtainsPink = { ent-BaseCurtains } + .suffix = Fancy pink + .desc = { ent-BaseCurtains.desc } +ent-CurtainsPinkOpen = { ent-CurtainsPink } + .suffix = Open, Fancy pink + .desc = { ent-CurtainsPink.desc } +ent-CurtainsPurple = { ent-BaseCurtains } + .suffix = Fancy purple + .desc = { ent-BaseCurtains.desc } +ent-CurtainsPurpleOpen = { ent-CurtainsPurple } + .suffix = Open, Fancy purple + .desc = { ent-CurtainsPurple.desc } +ent-CurtainsRed = { ent-BaseCurtains } + .suffix = Fancy red + .desc = { ent-BaseCurtains.desc } +ent-CurtainsRedOpen = { ent-CurtainsRed } + .suffix = Open, Fancy red + .desc = { ent-CurtainsRed.desc } +ent-CurtainsWhite = { ent-BaseCurtains } + .suffix = Fancy white + .desc = { ent-BaseCurtains.desc } +ent-CurtainsWhiteOpen = { ent-CurtainsWhite } + .suffix = Open, Fancy white + .desc = { ent-CurtainsWhite.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl index 12eccdd97c0..6fd9eb61ae9 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl @@ -388,3 +388,6 @@ ent-HighSecCaptainLocked = { ent-HighSecDoor } ent-HighSecArmoryLocked = { ent-HighSecDoor } .suffix = Armory, Locked .desc = { ent-HighSecDoor.desc } +ent-AirlockHatchSyndicate = { ent-AirlockHatch } + .suffix = Syndicate, Locked + .desc = { ent-AirlockHatch.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl index 6f504d1ae74..79006936b3c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl @@ -10,6 +10,12 @@ ent-AirlockAssemblyCargo = { ent-AirlockAssembly } ent-AirlockAssemblyCargoGlass = { ent-AirlockAssembly } .suffix = Cargo, Glass .desc = { ent-AirlockAssembly.desc } +ent-PinionAirlockAssembly = airlock assembly + .suffix = Pinion, Clockwork + .desc = { ent-AirlockAssembly.desc } +ent-PinionAirlockAssemblyGlass = { ent-PinionAirlockAssembly } + .suffix = Pinion, Clockwork, Glass + .desc = { ent-PinionAirlockAssembly.desc } ent-AirlockAssemblyCommand = { ent-AirlockAssembly } .suffix = Command .desc = { ent-AirlockAssembly.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/clockwork.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/clockwork.ftl new file mode 100644 index 00000000000..3fa04bcf000 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/clockwork.ftl @@ -0,0 +1,6 @@ +ent-PinionAirlock = { ent-Airlock } + .suffix = Pinion, Clockwork + .desc = { ent-Airlock.desc } +ent-PinionAirlockGlass = { ent-AirlockGlass } + .suffix = Pinion, Clockwork + .desc = { ent-AirlockGlass.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl index b0757fef54c..32688b7b8b0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl @@ -2,6 +2,8 @@ ent-WindoorAssembly = windoor assembly .desc = It opens, it closes, and you can see through it! ent-WindoorAssemblySecure = secure windoor assembly .desc = It opens, it closes, and you can see through it! This one looks tough. +ent-WindoorAssemblyClockwork = clockwork windoor assembly + .desc = It opens, it closes, and you can see through it! This one looks tough. ent-WindoorAssemblyPlasma = Plasma windoor assembly .desc = It opens, it closes, and you can see through it! This one looks purp-, no, pink. Wait... ent-WindoorAssemblySecurePlasma = Secure Plasma windoor assembly diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/clockwork.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/clockwork.ftl new file mode 100644 index 00000000000..8102579fd2b --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/clockwork.ftl @@ -0,0 +1,2 @@ +ent-BaseClockworkWindoor = clockwork windoor + .desc = { ent-BaseWindoor.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl index 5b54e3bf551..80dbc08e11f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl @@ -2,6 +2,8 @@ ent-Windoor = Windoor .desc = It's a window and a sliding door. Wow! ent-WindoorSecure = Secure Windoor .desc = It's a sturdy window and a sliding door. Wow! +ent-WindoorClockwork = clockwork windoor + .desc = It's a sturdy window and a sliding door. Wow! ent-WindoorPlasma = Plasma Windoor .desc = It's a pink window *and* a sliding door. Amazing! ent-WindoorSecurePlasma = Secure Plasma Windoor diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl index 53a70b965c6..ccb34e65017 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl @@ -1,16 +1,26 @@ ent-SeatBase = chair .desc = You sit in this. Either by will or force. -ent-Chair = chair +ent-UnanchoredChairBase = chair .desc = { ent-SeatBase.desc } +ent-ChairBase = chair + .desc = { ent-UnanchoredChairBase.desc } +ent-OfficeChairBase = chair + .desc = { ent-UnanchoredChairBase.desc } +ent-StoolBase = stool + .desc = { ent-OfficeChairBase.desc } +ent-Chair = chair + .desc = { ent-ChairBase.desc } ent-ChairGreyscale = chair .suffix = White .desc = { ent-Chair.desc } ent-Stool = stool .desc = Apply butt. ent-StoolBar = bar stool - .desc = { ent-SeatBase.desc } + .desc = { ent-StoolBase.desc } +ent-ChairBrass = brass chair + .desc = { ent-StoolBase.desc } ent-ChairOfficeLight = white office chair - .desc = { ent-SeatBase.desc } + .desc = { ent-OfficeChairBase.desc } ent-ChairOfficeDark = dark office chair .desc = { ent-ChairOfficeLight.desc } ent-ComfyChair = comfy chair @@ -18,7 +28,7 @@ ent-ComfyChair = comfy chair ent-ChairPilotSeat = pilot seat .desc = The pilot seat of a prestigious ship. ent-ChairWood = wooden chair - .desc = { ent-SeatBase.desc } + .desc = { ent-UnanchoredChairBase.desc } ent-ChairRitual = ritual chair .desc = Looks uncomfortable. ent-ChairMeat = meat chair diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl index f5564c3a097..62e1a17186a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl @@ -14,6 +14,8 @@ ent-TableReinforcedGlass = reinforced glass table .desc = A square piece of glass, standing on four metal legs. Extra robust. ent-TablePlasmaGlass = plasma glass table .desc = A square piece of plasma glass, standing on four metal legs. Pretty! +ent-TableBrass = brass table + .desc = A shiny, corrosion resistant brass table. Steampunk! ent-TableWood = wood table .desc = Do not apply fire to this. Rumour says it burns easily. ent-TableCarpet = gambling table diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl index eadfe948e08..48d6fe24073 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl @@ -1,5 +1,3 @@ -ent-BaseLightStructure = { ent-BaseStructure } - .desc = { ent-BaseStructure.desc } ent-LightPostSmall = post light .desc = An always powered light. .suffix = Always Powered @@ -8,3 +6,6 @@ ent-PoweredLightPostSmallEmpty = post light .suffix = Empty ent-PoweredLightPostSmall = post light .desc = A light fixture. Draws power and produces light when equipped with a light tube. +ent-PoweredLEDLightPostSmall = post light + .desc = A light fixture. Draws power and produces light when equipped with a light tube. + .suffix = LED diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl index f55316932ce..0f95786a6f0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl @@ -20,6 +20,8 @@ ent-SignDirectionalEng = engineering sign .desc = A direction sign, pointing out which way the Engineering department is. ent-SignDirectionalEvac = evac sign .desc = A direction sign, pointing out which way evac is. +ent-SignDirectionalExam = exam sign + .desc = A direction sign, pointing out which way the examination room(s) are. ent-SignDirectionalFood = food sign .desc = A direction sign, pointing out which way the kitchen is. ent-SignDirectionalGravity = gravity sign @@ -28,6 +30,8 @@ ent-SignDirectionalHop = hop sign .desc = A direction sign, pointing out which way Head of Personnel's office is. ent-SignDirectionalHydro = hydro sign .desc = A direction sign, pointing out which way hydroponics is. +ent-SignDirectionalIcu = icu sign + .desc = A direction sign, pointing out which way the ICU is. ent-SignDirectionalJanitor = janitor sign .desc = A direction sign, pointing out which way the janitor's closet is. ent-SignDirectionalLibrary = library sign @@ -48,6 +52,8 @@ ent-SignDirectionalWash = washroom sign .desc = A direction sign, pointing to the way to a washroom. ent-SignAi = ai sign .desc = A sign, indicating an AI is present. +ent-SignArcade = arcade sign + .desc = A sign indicating the arcade. ent-SignArmory = armory sign .desc = A sign indicating the armory. ent-SignToolStorage = tool storage sign @@ -62,6 +68,8 @@ ent-SignAtmosMinsky = atmospherics sign .desc = A sign indicating the atmospherics area. ent-SignBar = bar sign .desc = A sign indicating the bar. +ent-SignBarbershop = barbershop sign + .desc = A sign indicating the barbershop. ent-SignBio = bio sign .desc = A sign indicating the biology lab. ent-SignBiohazard = biohazard sign @@ -122,6 +130,8 @@ ent-SignInterrogation = interrogation sign .desc = A sign indicating an interrogation room. ent-SignJanitor = janitor sign .desc = A sign labelling an area where the janitor works. +ent-SignLaundromat = laundromat sign + .desc = A sign indicating the laundromat. ent-SignLawyer = lawyer sign .desc = A sign labelling an area where the Lawyers work. ent-SignLibrary = library sign @@ -134,16 +144,22 @@ ent-SignMinerDock = miner dock sign .desc = A sign indicating the miner dock. ent-SignMorgue = morgue sign .desc = A sign indicating the morgue. +ent-SignNews = news sign + .desc = A sign indicating where the Reporter works. ent-SignNosmoking = nosmoking sign .desc = A sign indicating that smoking is not allowed in the vicinity. ent-SignPrison = prison sign .desc = A sign indicating the prison. ent-SignPsychology = psychology sign .desc = A sign labelling an area where the Psychologist works. +ent-SignReception = reception sign + .desc = A sign indicating the reception. ent-SignRND = research and development sign .desc = A sign indicating the research and development lab. ent-SignRobo = robo sign .desc = A sign indicating the robotics lab. +ent-SignSalvage = salvage sign + .desc = A sign indicating the salvage area. ent-SignScience = science sign .desc = A sign indicating the science area. ent-SignScience1 = science sign diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/switch.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/switch.ftl index ecf28d183c8..4ebc623ea1b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/switch.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/switch.ftl @@ -17,94 +17,94 @@ ent-ApcNetSwitchDirectional = apc net switch .desc = { ent-ApcNetSwitch.desc } ent-LockableButton = lockable button .desc = { ent-SignalButtonDirectional.desc } -ent-LockableButtonCaptain = lockable button +ent-LockableButtonCaptain = { ent-LockableButton } .suffix = Captain .desc = { ent-LockableButton.desc } -ent-LockableButtonHeadOfPersonnel = lockable button +ent-LockableButtonHeadOfPersonnel = { ent-LockableButton } .suffix = HeadOfPersonnel .desc = { ent-LockableButton.desc } -ent-LockableButtonChiefEngineer = lockable button +ent-LockableButtonChiefEngineer = { ent-LockableButton } .suffix = ChiefEngineer .desc = { ent-LockableButton.desc } -ent-LockableButtonChiefMedicalOfficer = lockable button +ent-LockableButtonChiefMedicalOfficer = { ent-LockableButton } .suffix = ChiefMedicalOfficer .desc = { ent-LockableButton.desc } -ent-LockableButtonHeadOfSecurity = lockable button +ent-LockableButtonHeadOfSecurity = { ent-LockableButton } .suffix = HeadOfSecurity .desc = { ent-LockableButton.desc } -ent-LockableButtonResearchDirector = lockable button +ent-LockableButtonResearchDirector = { ent-LockableButton } .suffix = ResearchDirector .desc = { ent-LockableButton.desc } -ent-LockableButtonCommand = lockable button +ent-LockableButtonCommand = { ent-LockableButton } .suffix = Command .desc = { ent-LockableButton.desc } -ent-LockableButtonCryogenics = lockable button +ent-LockableButtonCryogenics = { ent-LockableButton } .suffix = Cryogenics .desc = { ent-LockableButton.desc } -ent-LockableButtonSecurity = lockable button +ent-LockableButtonSecurity = { ent-LockableButton } .suffix = Security .desc = { ent-LockableButton.desc } -ent-LockableButtonDetective = lockable button +ent-LockableButtonDetective = { ent-LockableButton } .suffix = Detective .desc = { ent-LockableButton.desc } -ent-LockableButtonArmory = lockable button +ent-LockableButtonArmory = { ent-LockableButton } .suffix = Armory .desc = { ent-LockableButton.desc } -ent-LockableButtonBrig = lockable button +ent-LockableButtonBrig = { ent-LockableButton } .suffix = Brig .desc = { ent-LockableButton.desc } -ent-LockableButtonLawyer = lockable button +ent-LockableButtonLawyer = { ent-LockableButton } .suffix = Lawyer .desc = { ent-LockableButton.desc } -ent-LockableButtonEngineering = lockable button +ent-LockableButtonEngineering = { ent-LockableButton } .suffix = Engineering .desc = { ent-LockableButton.desc } -ent-LockableButtonMedical = lockable button +ent-LockableButtonMedical = { ent-LockableButton } .suffix = Medical .desc = { ent-LockableButton.desc } -ent-LockableButtonQuartermaster = lockable button +ent-LockableButtonQuartermaster = { ent-LockableButton } .suffix = Quartermaster .desc = { ent-LockableButton.desc } -ent-LockableButtonSalvage = lockable button +ent-LockableButtonSalvage = { ent-LockableButton } .suffix = Salvage .desc = { ent-LockableButton.desc } -ent-LockableButtonCargo = lockable button +ent-LockableButtonCargo = { ent-LockableButton } .suffix = Cargo .desc = { ent-LockableButton.desc } -ent-LockableButtonResearch = lockable button +ent-LockableButtonResearch = { ent-LockableButton } .suffix = Research .desc = { ent-LockableButton.desc } -ent-LockableButtonService = lockable button +ent-LockableButtonService = { ent-LockableButton } .suffix = Service .desc = { ent-LockableButton.desc } -ent-LockableButtonMaintenance = lockable button +ent-LockableButtonMaintenance = { ent-LockableButton } .suffix = Maintenance .desc = { ent-LockableButton.desc } -ent-LockableButtonExternal = lockable button +ent-LockableButtonExternal = { ent-LockableButton } .suffix = External .desc = { ent-LockableButton.desc } -ent-LockableButtonJanitor = lockable button +ent-LockableButtonJanitor = { ent-LockableButton } .suffix = Janitor .desc = { ent-LockableButton.desc } -ent-LockableButtonTheatre = lockable button +ent-LockableButtonTheatre = { ent-LockableButton } .suffix = Theatre .desc = { ent-LockableButton.desc } -ent-LockableButtonBar = lockable button +ent-LockableButtonBar = { ent-LockableButton } .suffix = Bar .desc = { ent-LockableButton.desc } -ent-LockableButtonChemistry = lockable button +ent-LockableButtonChemistry = { ent-LockableButton } .suffix = Chemistry .desc = { ent-LockableButton.desc } -ent-LockableButtonKitchen = lockable button +ent-LockableButtonKitchen = { ent-LockableButton } .suffix = Kitchen .desc = { ent-LockableButton.desc } -ent-LockableButtonChapel = lockable button +ent-LockableButtonChapel = { ent-LockableButton } .suffix = Chapel .desc = { ent-LockableButton.desc } -ent-LockableButtonHydroponics = lockable button +ent-LockableButtonHydroponics = { ent-LockableButton } .suffix = Hydroponics .desc = { ent-LockableButton.desc } -ent-LockableButtonAtmospherics = lockable button +ent-LockableButtonAtmospherics = { ent-LockableButton } .suffix = Atmospherics .desc = { ent-LockableButton.desc } ent-ButtonFrame = button frame diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl index c4b7e0bbb2a..40029cc6cbf 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl @@ -53,7 +53,7 @@ ent-IronRockMining = ironrock .suffix = higher ore yield ent-WallRock = rock .suffix = planetmap - .desc = { ent-BaseStructure.desc } + .desc = { ent-BaseWall.desc } ent-WallRockCoal = { ent-WallRock } .desc = An ore vein rich with coal. .suffix = Coal diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girders.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girders.ftl index 01ac3bb600c..333d8950fdb 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girders.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girders.ftl @@ -2,3 +2,5 @@ ent-Girder = girder .desc = A large structural assembly made out of metal; It requires a layer of metal before it can be considered a wall. ent-ReinforcedGirder = reinforced girder .desc = A large structural assembly made out of metal and plasteel; It requires a layer of plasteel before it can be considered a reinforced wall. +ent-ClockworkGirder = wall gear + .desc = A large gear with mounting brackets for additional plating; This could be made into a wall with more brass plating. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/grille.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/grille.ftl index 3a515825e60..d39d7365b2a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/grille.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/grille.ftl @@ -1,6 +1,12 @@ ent-Grille = grille .desc = A flimsy framework of iron rods. +ent-ClockworkGrille = clockwork grille + .desc = a flimsy framework of iron rods assembled in traditional Ratvarian fashion. ent-GrilleBroken = grille .desc = A flimsy framework of iron rods. It has seen better days. +ent-ClockworkGrilleBroken = clockwork grille + .desc = A flimsy framework of iron rods assembled in traditional Ratvarian fashion. It has seen better days. ent-GrilleDiagonal = diagonal grille .desc = { ent-Grille.desc } +ent-ClockworkGrilleDiagonal = diagonal clockwork grille + .desc = { ent-ClockworkGrille.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/clockwork.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/clockwork.ftl new file mode 100644 index 00000000000..584999bd7e4 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/clockwork.ftl @@ -0,0 +1,7 @@ +ent-ClockworkWindow = clockwork window + .desc = Don't smudge up the brass down there. +ent-WindowClockworkDirectional = directional clockwork window + .desc = Don't smudge up the brass down there. +ent-ClockworkWindowDiagonal = { ent-ClockworkWindow } + .suffix = diagonal + .desc = { ent-ClockworkWindow.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl new file mode 100644 index 00000000000..57216514981 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl @@ -0,0 +1,5 @@ +ent-PlastitaniumWindow = plastitanium window + .desc = { ent-Window.desc } +ent-PlastitaniumWindowDiagonal = { ent-ShuttleWindow } + .suffix = diagonal + .desc = { ent-ShuttleWindow.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/roundstart.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/roundstart.ftl index 161bb159969..dfa17bada5f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/roundstart.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/roundstart.ftl @@ -1,5 +1,7 @@ ent-BaseGameRule = { "" } .desc = { "" } +ent-SubGamemodesRule = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } ent-DeathMatch31 = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-InactivityTimeRestart = { ent-BaseGameRule } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl index 310d7a21e03..676094d0e52 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl @@ -1,2 +1,2 @@ -ent-SalvageShuttleMarker = { ent-FTLPoint } +ent-SalvageShuttleMarker = Salvage shuttle marker .desc = { ent-FTLPoint.desc } diff --git a/Resources/Locale/ru-RU/accessories/human-hair.ftl b/Resources/Locale/ru-RU/accessories/human-hair.ftl index df494daff35..616cef6c3cf 100644 --- a/Resources/Locale/ru-RU/accessories/human-hair.ftl +++ b/Resources/Locale/ru-RU/accessories/human-hair.ftl @@ -14,6 +14,7 @@ marking-HumanHairBob = Каре marking-HumanHairBob2 = Каре 2 marking-HumanHairBobcut = Каре 3 marking-HumanHairBob4 = Каре 4 +marking-HumanHairBob5 = Bob Hair 5 marking-HumanHairBobcurl = Каре (Завитки) marking-HumanHairBoddicker = Боддикер marking-HumanHairBowlcut = Горшок @@ -95,6 +96,7 @@ marking-HumanHairKusanagi = Кусанаги marking-HumanHairLong = Длинная 1 marking-HumanHairLong2 = Длинная 2 marking-HumanHairLong3 = Длинная 3 +marking-HumanHairLongWithBundles = Long With Bundles marking-HumanHairLongovereye = Длинная (Через глаз) marking-HumanHairLbangs = Длинная (Чёлка) marking-HumanHairLongemo = Длинная (Эмо) diff --git a/Resources/Locale/ru-RU/actions/actions/suicide.ftl b/Resources/Locale/ru-RU/actions/actions/suicide.ftl new file mode 100644 index 00000000000..a271790d072 --- /dev/null +++ b/Resources/Locale/ru-RU/actions/actions/suicide.ftl @@ -0,0 +1 @@ +suicide-action-popup = THIS ACTION WILL KILL YOU! Use it again to confirm. diff --git a/Resources/Locale/ru-RU/advertisements/vending/lawdrobe.ftl b/Resources/Locale/ru-RU/advertisements/vending/lawdrobe.ftl index 702399cad5a..0519c7e0ed2 100644 --- a/Resources/Locale/ru-RU/advertisements/vending/lawdrobe.ftl +++ b/Resources/Locale/ru-RU/advertisements/vending/lawdrobe.ftl @@ -1,3 +1,13 @@ advertisement-lawdrobe-1 = ПРОТЕСТ! Добейтесь верховенства закона для себя! advertisement-lawdrobe-2 = Донимайте охрану до тех пор, пока они не начнут соблюдать ваши собственные правила! advertisement-lawdrobe-3 = Только что поступило новое дело? Идите и вытащите их из тюрьмы! +advertisement-lawdrobe-4 = A dougnut a day keeps security away! +advertisement-lawdrobe-5 = No one is above the law! +advertisement-lawdrobe-6 = No officer, I do not consent to a search! +advertisement-lawdrobe-7 = Injecting space drugs leaves no evidence! +advertisement-lawdrobe-8 = You or a loved one hurt by Nanotrasen? Too bad! +thankyou-lawdrobe-1 = You can win any case in that outfit! +thankyou-lawdrobe-2 = Get one for your client as well! +thankyou-lawdrobe-3 = Win or lose, you get paid either way! +thankyou-lawdrobe-4 = Remember: Its only illegal if you get caught! +thankyou-lawdrobe-5 = OBJECTION! That outfit is too cool for court! diff --git a/Resources/Locale/ru-RU/ame/components/ame-controller-component.ftl b/Resources/Locale/ru-RU/ame/components/ame-controller-component.ftl index acb93911251..1e76330e1fc 100644 --- a/Resources/Locale/ru-RU/ame/components/ame-controller-component.ftl +++ b/Resources/Locale/ru-RU/ame/components/ame-controller-component.ftl @@ -1,8 +1,6 @@ -ame-controller-component-interact-no-hands-text = У вас нет рук. -ame-controller-component-interact-using-no-hands-text = У вас нет рук. -ame-controller-component-interact-using-already-has-jar = В контроллер уже установлен бак. -ame-controller-component-interact-using-success = Вы вставляете бак в отверстие для топлива. -ame-controller-component-interact-using-fail = Вы не можете поместить это в контроллер... +ame-controller-component-fuel-slot-fail-whitelist = You can't put that in the controller... +ame-controller-component-fuel-slot-fail-locked = Power down the AME before manipulating its fuel. +ame-controller-component-fuel-slot-success-insert = You insert the jar into the fuel slot. ## UI diff --git a/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl b/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl index 4870fbee032..1214e7e4028 100644 --- a/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl +++ b/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl @@ -18,8 +18,12 @@ injector-component-transfer-success-message = Вы перемещаете { $amo injector-component-draw-success-message = Вы набираете { $amount }ед. из { $target }. injector-component-target-already-full-message = { $target } полон! injector-component-target-is-empty-message = { $target } пуст! +injector-component-cannot-toggle-draw-message = Too full to draw! +injector-component-cannot-toggle-inject-message = Nothing to inject! ## mob-inject doafter messages +injector-component-drawing-user = You start drawing the needle. injector-component-injecting-user = Вы начинаете вводить иглу. +injector-component-drawing-target = { CAPITALIZE(THE($user)) } is trying to use a needle to draw from you! injector-component-injecting-target = { CAPITALIZE($user) } пытается ввести вам иглу! diff --git a/Resources/Locale/ru-RU/fluids/components/puddle-component.ftl b/Resources/Locale/ru-RU/fluids/components/puddle-component.ftl index e9165d4c0d1..8c0fbfad1a5 100644 --- a/Resources/Locale/ru-RU/fluids/components/puddle-component.ftl +++ b/Resources/Locale/ru-RU/fluids/components/puddle-component.ftl @@ -1,4 +1,4 @@ -puddle-component-examine-is-slipper-text = Выглядит [color=#169C9C]скользко[/color]. +puddle-component-examine-is-slippery-text = It looks [color=#169C9C]slippery[/color]. puddle-component-examine-evaporating = [color=#5E7C16]Испаряется[/color]. puddle-component-examine-evaporating-partial = [color=#FED83D]Частично испаряется[/color]. puddle-component-examine-evaporating-no = [color=#B02E26]Не испаряется[/color]. diff --git a/Resources/Locale/ru-RU/markings/reptilian.ftl b/Resources/Locale/ru-RU/markings/reptilian.ftl index d865aca371b..be5abfd00a2 100644 --- a/Resources/Locale/ru-RU/markings/reptilian.ftl +++ b/Resources/Locale/ru-RU/markings/reptilian.ftl @@ -14,7 +14,8 @@ marking-LizardHornsShort-horns_short = Унатх, рожки (Короткие) marking-LizardHornsShort = Унатх, рожки (Короткие) marking-LizardHornsSimple-horns_simple = Унатх, рожки marking-LizardHornsSimple = Унатх, рожки -marking-LizardTailSmooth-tail_smooth = Унатх, хвост (Гладкий) +marking-LizardTailSmooth-tail_smooth_primary = Lizard Tail +marking-LizardTailSmooth-tail_smooth_secondary = Under Tone marking-LizardTailSmooth = Унатх, хвост (Гладкий) marking-LizardTailLarge-tail_large = Унатх, хвост (Большой) marking-LizardTailLarge = Унатх, хвост (Большой) diff --git a/Resources/Locale/ru-RU/mass-media/news-ui.ftl b/Resources/Locale/ru-RU/mass-media/news-ui.ftl index b444dc314a5..c1e99ddf75b 100644 --- a/Resources/Locale/ru-RU/mass-media/news-ui.ftl +++ b/Resources/Locale/ru-RU/mass-media/news-ui.ftl @@ -24,10 +24,9 @@ news-write-ui-article-count-text = [few] статьи *[other] статей } -news-write-ui-footer-text = Система управления новостями Менеджер#Новостей™ +news-write-ui-footer-text = Система управления новостями Менеджер#Новостей™ news-write-ui-new-article = Новая статья news-write-ui-article-name-label = Заголовок: -news-write-ui-article-content-label = Содержание: news-write-no-access-popup = Нет доступа news-writer-text-length-exceeded = Текст превышает максимальный объём news-write-ui-richtext-tooltip = diff --git a/Resources/Locale/ru-RU/nutrition/components/cream-pied-component.ftl b/Resources/Locale/ru-RU/nutrition/components/cream-pied-component.ftl index 1fe5ff7d6ef..b7b08f5a1eb 100644 --- a/Resources/Locale/ru-RU/nutrition/components/cream-pied-component.ftl +++ b/Resources/Locale/ru-RU/nutrition/components/cream-pied-component.ftl @@ -1,12 +1,14 @@ -cream-pied-component-on-hit-by-message = { GENDER($thrower) -> - [male] КРЕМировал - [female] КРЕМировала - [epicene] КРЕМировали - *[neuter] КРЕМировало -} вас! -cream-pied-component-on-hit-by-message-others = { GENDER($thrower) -> - [male] КРЕМировал - [female] КРЕМировала - [epicene] КРЕМировали - *[neuter] КРЕМировало -} { $owner }! +cream-pied-component-on-hit-by-message = + { GENDER($thrower) -> + [male] КРЕМировал + [female] КРЕМировала + [epicene] КРЕМировали + *[neuter] КРЕМировало + } вас! +cream-pied-component-on-hit-by-message-others = + { GENDER($thrower) -> + [male] КРЕМировал + [female] КРЕМировала + [epicene] КРЕМировали + *[neuter] КРЕМировало + } { $owner }! diff --git a/Resources/Locale/ru-RU/paper/paper-component.ftl b/Resources/Locale/ru-RU/paper/paper-component.ftl index a67d4410f93..92b6ee1299d 100644 --- a/Resources/Locale/ru-RU/paper/paper-component.ftl +++ b/Resources/Locale/ru-RU/paper/paper-component.ftl @@ -7,3 +7,4 @@ paper-component-examine-detail-has-words = На листе что-то напи paper-component-examine-detail-stamped-by = На { CAPITALIZE($paper) } имеются следующие печати: { $stamps }. paper-component-action-stamp-paper-other = { CAPITALIZE($user) } ставит печать на { $target } с помощью { $stamp }. paper-component-action-stamp-paper-self = Вы ставите печать на { $target } с помощью { $stamp }. +paper-ui-save-button = Save ({ $keybind }) diff --git a/Resources/Locale/ru-RU/paper/stamp-component.ftl b/Resources/Locale/ru-RU/paper/stamp-component.ftl index bf167d6f280..9d9dcd980a0 100644 --- a/Resources/Locale/ru-RU/paper/stamp-component.ftl +++ b/Resources/Locale/ru-RU/paper/stamp-component.ftl @@ -1,4 +1,5 @@ stamp-component-stamped-name-default = Очень важная персона +stamp-component-stamped-name-detective = Detective stamp-component-stamped-name-mime = Мим stamp-component-stamped-name-captain = Капитан stamp-component-stamped-name-centcom = Центком diff --git a/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl b/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl index 4c465fe4a36..7eae023245c 100644 --- a/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl +++ b/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl @@ -58,6 +58,7 @@ salvage-map-proto-MediumShuttleWreck = Разбившийся эвакуацио salvage-map-proto-MediumPetHospital = Медвежий госпиталь salvage-map-proto-MediumCrashedShuttle = Разбившийся шаттл salvage-map-proto-Meatball = Фрикаделька +salvage-map-proto-VeganMeatball = Vegan Meatball salvage-map-proto-StationStation = Станция станция salvage-map-proto-AsteroidBase = База на астероиде salvage-map-proto-RuinCargoBase = Разрушенный склад снабжения diff --git a/Resources/Locale/ru-RU/shuttles/console.ftl b/Resources/Locale/ru-RU/shuttles/console.ftl index 161c28902f2..81399cf4243 100644 --- a/Resources/Locale/ru-RU/shuttles/console.ftl +++ b/Resources/Locale/ru-RU/shuttles/console.ftl @@ -1,33 +1,38 @@ shuttle-pilot-start = Пилотирование начато shuttle-pilot-end = Пилотирование прекращено shuttle-console-in-ftl = Невозможно войти в БСС когда уже в БСС! -shuttle-console-proximity = Слишком близко к соседним объектам +shuttle-console-mass = Too large to FTL shuttle-console-prevent = Вы не можете управлять этим кораблем. # Display shuttle-console-display-label = Дисплей -shuttle-console-ftl-state = Состояние БСС -shuttle-console-ftl-available = Доступно -shuttle-console-ftl-starting = Запускается -shuttle-console-ftl-travelling = В пути -shuttle-console-ftl-arriving = Прибытие -shuttle-console-ftl-cooldown = Охлаждение -shuttle-console-ftl-timer = Время БСС +shuttle-console-exclusion = Exclusion area +shuttle-console-nav-settings = Settings # Display -shuttle-console-max-radar = Макс. дальн. радара: -shuttle-console-radar = Дальн. радара: +shuttle-console-ftl-label = FTL Status +shuttle-console-ftl-state-Available = Available +shuttle-console-ftl-state-Starting = Starting +shuttle-console-ftl-state-Travelling = Travelling +shuttle-console-ftl-state-Arriving = Arriving +shuttle-console-ftl-state-Cooldown = Cooldown +shuttle-console-map-settings = Settings +shuttle-console-ftl-button = FTL +shuttle-console-map-rebuild = Scan for objects +shuttle-console-map-beacons = Show beacons +shuttle-console-no-signal = No signal +shuttle-console-map-objects = Sector objects shuttle-console-position = Местопол: +shuttle-console-view = View shuttle-console-orientation = Ориент: +shuttle-console-dock = Dock +shuttle-console-docks-label = Docks +shuttle-console-undock-fail = Undocking failed +shuttle-console-dock-fail = Docking failed shuttle-console-linear-velocity = Линейн. скр: shuttle-console-angular-velocity = Угл. скр: -shuttle-console-dock-label = Стык. порты shuttle-console-docked = { $index } (Пристыкован) -shuttle-console-dock-button = Пристыковать { $suffix } -shuttle-console-hyperspace-label = Пункты назначения БСС -shuttle-console-hyperspace-none = Пункты назначения не найдены shuttle-console-unknown = Неизвестно shuttle-console-iff-label = { $name } ({ $distance }м) # Buttons -shuttle-console-strafing = Режим стрейфа shuttle-console-iff-toggle = Показать "свой-чужой" shuttle-console-dock-toggle = Показать стыковку shuttle-console-undock = Отстыковать diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl index 07546da98e6..e884aa3704a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl @@ -1,3 +1,5 @@ +ent-BaseSuicideAction = { "" } + .desc = { "" } ent-ActionScream = Крикнуть .desc = ААААААААААААААААААААААААА ent-ActionTurnUndead = Обратиться в зомби diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl index 48364d670f6..146528cbddb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl @@ -10,5 +10,6 @@ ent-BoxSurvivalMedical = аварийный запас .suffix = Медицинский ent-BoxHug = коробка обнимашек .desc = Специальная коробка для чутких людей. + .suffix = Emergency ent-BoxSurvivalSyndicate = расширенный аварийный запас .desc = Коробка с базовым набором для выживания. Согласно этикетке, содержит более ёмкий баллон. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl index 42f729e55dd..66e90b93022 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl @@ -20,6 +20,7 @@ ent-BoxMRE = И.Р.П. .desc = Коробка старых военных пайков. Они, на удивление, не испортились. ent-BoxHugHealing = коробка обнимашек .desc = Специальная коробка для чутких людей. + .suffix = Medical ent-BoxInflatable = коробка надувных стен .desc = Надувные стены не должны использоваться в качестве плавучих средств. ent-BoxPerformer = коробка в честь дня Хацунэ Мику diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/materials.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/materials.ftl index 280fb69425b..445dca71658 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/materials.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/materials.ftl @@ -8,6 +8,8 @@ ent-CrateMaterialPlastic = ящик пластика .desc = 90 единиц пластика. ent-CrateMaterialWood = ящик дерева .desc = Куча деревянных досок. +ent-CrateMaterialBrass = brass crate + .desc = 90 sheets of brass. ent-CrateMaterialPlasteel = ящик пластали .desc = 90 единиц пластали. ent-CrateMaterialPlasma = ящик твёрдой плазмы diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/space_ruin.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/space_ruin.ftl index 837710c4695..a0fc45125d2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/space_ruin.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/space_ruin.ftl @@ -1,3 +1,9 @@ ent-LockerOldAISat = шкаф .suffix = шкаф пустотный скафандр NTSRA .desc = { ent-LockerSyndicate.desc } +ent-LockerSyndicateShipGearBasic = { ent-LockerSyndicate } + .suffix = Basic ship gear, Random + .desc = { ent-LockerSyndicate.desc } +ent-LockerSyndicateShipGearBasicChameleonKit = { ent-LockerSyndicateShipGearBasic } + .suffix = Basic ship gear, Random, Chameleon Kit + .desc = { ent-LockerSyndicateShipGearBasic.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/shoes/specific.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/shoes/specific.ftl index bbbd874bc5d..c42f61ce904 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/shoes/specific.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/shoes/specific.ftl @@ -4,3 +4,7 @@ ent-ClothingShoesAerostatic = аэростатические ботинки .desc = Удобные, чистые ботинки для длительной работы в напряженном ритме. ent-ClothingShoesCentcomBlack = обувь офицера специальных операций .desc = Кожаная, чёрная, высококачественная обувь, вряд-ли найти подобные на чёрном рынке... +ent-ClothingShoesSchoolBlack = school black shoes + .desc = Stylish and comfortable school shoes in dark color with stockings. +ent-ClothingShoesSchoolWhite = school white shoes + .desc = Stylish and comfortable school shoes in light color with stockings. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl index 1abb585701b..a81e935a374 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl @@ -6,3 +6,5 @@ ent-ClothingUniformColorJumpskirtRainbow = радужная юбка-комби .desc = Разноцветная юбка-комбинезон! ent-ClothingUniformJumpskirtPsychologist = юбка-костюм психолога .desc = Я не теряю вещи. Я кладу вещи в места, которые потом ускользают от меня. +ent-ClothingUniformJumpskirtSchool = school skirt + .desc = Stylish and comfortable school skirt. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl index 92998b2f8ce..739c0a80edd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl @@ -52,3 +52,5 @@ ent-ClothingOuterCoatLabSeniorPhysician = лабораторный халат в .desc = Халат, защищающий от небольших разливов химикатов. Имеет светло-голубые рукава и оранжевую отделку на талии. ent-ClothingOuterCoatSpaceAsshole = куртка космического мудака .desc = And there he was... +ent-ClothingOuterCoatExpensive = expensive coat + .desc = Very fluffy pink coat, made out of very expensive fur (clearly). diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/shuttle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/shuttle.ftl index 0dec7540cc7..3598e3d25a9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/shuttle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/shuttle.ftl @@ -1,2 +1,4 @@ ent-FTLPoint = точка БСС .desc = { ent-MarkerBase.desc } +ent-FTLExclusion = FTL exclusion point + .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/human.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/human.ftl new file mode 100644 index 00000000000..d61635a4507 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/human.ftl @@ -0,0 +1,4 @@ +ent-SpawnMobSyndicateFootSoldier = syndicate footsoldier spawner + .desc = { ent-MarkerBase.desc } +ent-SpawnMobSyndicateFootsoldierPilot = syndicate shuttle pilot spawner + .desc = { ent-SpawnMobSyndicateFootSoldier.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/random/curtains.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/random/curtains.ftl new file mode 100644 index 00000000000..95298904d28 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/random/curtains.ftl @@ -0,0 +1,2 @@ +ent-CurtainSpawner = random curtain spawner + .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/random/mineshaft.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/random/mineshaft.ftl new file mode 100644 index 00000000000..6baf9f9ae6c --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/random/mineshaft.ftl @@ -0,0 +1,10 @@ +ent-RandomWoodenSupport = wooden support spawner + .desc = { ent-MarkerBase.desc } +ent-RandomWoodenWall = wooden wall spawner + .desc = { ent-MarkerBase.desc } +ent-RandomStalagmiteOrCrystal = stalagmite or crystal spawner + .desc = { ent-MarkerBase.desc } +ent-RandomBrownStalagmite = brown stalagmite spawner + .desc = { ent-MarkerBase.desc } +ent-RandomGreyStalagmite = grey stalagmite spawner + .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/human.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/human.ftl index 5d348f37d27..f722003221b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/human.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/human.ftl @@ -4,6 +4,10 @@ ent-MobSalvager = утилизатор .desc = { ent-BaseMobHuman.desc } ent-MobSpirate = космопират .desc = Яррр! +ent-MobSyndicateFootsoldier = syndicate footsoldier + .desc = { ent-BaseMobHuman.desc } +ent-MobSyndicateFootsoldierPilot = syndicate shuttle pilot + .desc = { ent-MobSyndicateFootsoldier.desc } ent-SalvageHumanCorpse = неопознанный труп .desc = Я думаю, он мёртв. .suffix = Мертвый diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/station_map.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/station_map.ftl index 27205befa12..f14df3f30ea 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/station_map.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/station_map.ftl @@ -3,6 +3,9 @@ ent-BaseHandheldStationMap = карта станции ent-HandheldStationMap = { ent-BaseHandheldStationMap } .desc = { ent-BaseHandheldStationMap.desc } .suffix = Ручной, Заряжен +ent-HandheldStationMapEmpty = { ent-HandheldStationMap } + .suffix = Handheld, Empty + .desc = { ent-HandheldStationMap.desc } ent-HandheldStationMapUnpowered = { ent-BaseHandheldStationMap } .desc = { ent-BaseHandheldStationMap.desc } .suffix = Ручной, Разряжен diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/shards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/shards.ftl index e10022bdc15..72319faacc8 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/shards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/shards.ftl @@ -8,3 +8,5 @@ ent-ShardGlassPlasma = осколок плазменного стекла .desc = Небольшой кусок плазменного стекла. ent-ShardGlassUranium = осколок уранового стекла .desc = Небольшой кусок уранового стекла. +ent-ShardGlassClockwork = clockwork glass shard + .desc = A small piece of brass-infused glass. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl index 80e94cc790c..b47d78ebbfe 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl @@ -42,3 +42,9 @@ ent-SheetRUGlass = урановое бронестекло ent-SheetRUGlass1 = урановое бронестекло .suffix = Один .desc = { ent-SheetRUGlass.desc } +ent-SheetClockworkGlass = clockwork glass + .desc = A sheet of brass-hardened glass, primarily used by clockwork enthusiasts and remnants of Ratvarian cults. + .suffix = Full +ent-SheetClockworkGlass1 = clockwork glass + .suffix = Single + .desc = { ent-SheetClockworkGlass.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl index c079190a9d2..4d7ee1b7059 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl @@ -12,6 +12,15 @@ ent-SheetSteel1 = сталь ent-SheetSteelLingering0 = { ent-SheetSteel } .suffix = Не исчезают закончившись, 0 .desc = { ent-SheetSteel.desc } +ent-SheetBrass = brass + .desc = A sheet of brass, primarily used by clockwork enthusiasts and the remnants of Ratvarian cults. + .suffix = Full +ent-SheetBrass10 = brass + .suffix = 10 + .desc = { ent-SheetBrass.desc } +ent-SheetBrass1 = brass + .suffix = Single + .desc = { ent-SheetBrass.desc } ent-SheetPlasteel = пласталь .suffix = Полный .desc = { ent-SheetMetalBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl index da79465344f..3c87b167ccd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl @@ -47,3 +47,6 @@ ent-RubberStampApproved = печать ОДОБРЕНО .desc = { ent-RubberStampBaseAlt.desc } ent-RubberStampDenied = печать ОТКАЗАНО .desc = { ent-RubberStampBaseAlt.desc } +ent-RubberStampDetective = detective's rubber stamp + .suffix = DO NOT MAP + .desc = { ent-RubberStampBase.desc } 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 003b004ff07..f0ee512b68f 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 @@ -22,6 +22,10 @@ ent-FloorTileItemMono = моно плитка .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemLino = линолеум .desc = { ent-FloorTileItemBase.desc } +ent-FloorTileItemBrassFilled = filled brass plate + .desc = { ent-FloorTileItemBase.desc } +ent-FloorTileItemBrassReebe = smooth brass plate + .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemDirty = грязная плитка .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemElevatorShaft = плитка шахты лифта diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/knife.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/knife.ftl index 40a4d9621db..09cc3768a05 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/knife.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/knife.ftl @@ -10,6 +10,11 @@ ent-UraniumShiv = урановая заточка .desc = Грубое оружие, сделанное из куска ткани и осколка уранового стекла. Нарушает Женевскую конвенцию! ent-KitchenKnife = кухонный нож .desc = Универсальный поварской нож изготовленный Asters Merchant Guild. Гарантированно будет оставаться острым долгие годы. +ent-BladedFlatcapGrey = grey flatcap + .desc = Fashionable for both the working class and old man Jenkins. It has glass shards hidden in the brim. + .suffix = Bladed +ent-BladedFlatcapBrown = brown flatcap + .desc = Stupid clown! You made me look bad! It has glass shards hidden in the brim. ent-ButchCleaver = мясницкий секач .desc = Большой нож, используемый для рубки и разделки мяса. В том числе клоунов и их побочных продуктов. ent-CombatKnife = боевой нож diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl index d94f43ce30e..3e69d060a1c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl @@ -1,5 +1,62 @@ +ent-BaseCurtains = curtains + .desc = Hides what others shouldn't see. ent-HospitalCurtains = шторы .desc = Содержат менее 1% ртути. + .suffix = Hospital ent-HospitalCurtainsOpen = { ent-HospitalCurtains } .suffix = Открытый .desc = { ent-HospitalCurtains.desc } +ent-CurtainsBlack = { ent-BaseCurtains } + .suffix = Fancy black + .desc = { ent-BaseCurtains.desc } +ent-CurtainsBlackOpen = { ent-CurtainsBlack } + .suffix = Open, Fancy black + .desc = { ent-CurtainsBlack.desc } +ent-CurtainsBlue = { ent-BaseCurtains } + .suffix = Fancy blue + .desc = { ent-BaseCurtains.desc } +ent-CurtainsBlueOpen = { ent-CurtainsBlue } + .suffix = Open, Fancy blue + .desc = { ent-CurtainsBlue.desc } +ent-CurtainsCyan = { ent-BaseCurtains } + .suffix = Fancy cyan + .desc = { ent-BaseCurtains.desc } +ent-CurtainsCyanOpen = { ent-CurtainsCyan } + .suffix = Open, Fancy cyan + .desc = { ent-CurtainsCyan.desc } +ent-CurtainsGreen = { ent-BaseCurtains } + .suffix = Fancy green + .desc = { ent-BaseCurtains.desc } +ent-CurtainsGreenOpen = { ent-CurtainsGreen } + .suffix = Open, Fancy green + .desc = { ent-CurtainsGreen.desc } +ent-CurtainsOrange = { ent-BaseCurtains } + .suffix = Fancy orange + .desc = { ent-BaseCurtains.desc } +ent-CurtainsOrangeOpen = { ent-CurtainsOrange } + .suffix = Open, Fancy orange + .desc = { ent-CurtainsOrange.desc } +ent-CurtainsPink = { ent-BaseCurtains } + .suffix = Fancy pink + .desc = { ent-BaseCurtains.desc } +ent-CurtainsPinkOpen = { ent-CurtainsPink } + .suffix = Open, Fancy pink + .desc = { ent-CurtainsPink.desc } +ent-CurtainsPurple = { ent-BaseCurtains } + .suffix = Fancy purple + .desc = { ent-BaseCurtains.desc } +ent-CurtainsPurpleOpen = { ent-CurtainsPurple } + .suffix = Open, Fancy purple + .desc = { ent-CurtainsPurple.desc } +ent-CurtainsRed = { ent-BaseCurtains } + .suffix = Fancy red + .desc = { ent-BaseCurtains.desc } +ent-CurtainsRedOpen = { ent-CurtainsRed } + .suffix = Open, Fancy red + .desc = { ent-CurtainsRed.desc } +ent-CurtainsWhite = { ent-BaseCurtains } + .suffix = Fancy white + .desc = { ent-BaseCurtains.desc } +ent-CurtainsWhiteOpen = { ent-CurtainsWhite } + .suffix = Open, Fancy white + .desc = { ent-CurtainsWhite.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl index 96df12f7a31..2c1e5ebcb96 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl @@ -388,3 +388,6 @@ ent-HighSecCaptainLocked = { ent-HighSecDoor } ent-HighSecArmoryLocked = { ent-HighSecDoor } .suffix = Оружейная, Закрыт .desc = { ent-HighSecDoor.desc } +ent-AirlockHatchSyndicate = { ent-AirlockHatch } + .suffix = Syndicate, Locked + .desc = { ent-AirlockHatch.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl index 68f6c2cae75..1ed1b6762c4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl @@ -10,6 +10,12 @@ ent-AirlockAssemblyCargo = { ent-AirlockAssembly } ent-AirlockAssemblyCargoGlass = { ent-AirlockAssembly } .suffix = Снабжение, Стеклянный .desc = { ent-AirlockAssembly.desc } +ent-PinionAirlockAssembly = airlock assembly + .suffix = Pinion, Clockwork + .desc = { ent-AirlockAssembly.desc } +ent-PinionAirlockAssemblyGlass = { ent-PinionAirlockAssembly } + .suffix = Pinion, Clockwork, Glass + .desc = { ent-PinionAirlockAssembly.desc } ent-AirlockAssemblyCommand = { ent-AirlockAssembly } .suffix = Командный .desc = { ent-AirlockAssembly.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/clockwork.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/clockwork.ftl new file mode 100644 index 00000000000..3fa04bcf000 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/clockwork.ftl @@ -0,0 +1,6 @@ +ent-PinionAirlock = { ent-Airlock } + .suffix = Pinion, Clockwork + .desc = { ent-Airlock.desc } +ent-PinionAirlockGlass = { ent-AirlockGlass } + .suffix = Pinion, Clockwork + .desc = { ent-AirlockGlass.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl index 4cf5a101656..c445d3c41d0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl @@ -2,6 +2,8 @@ ent-WindoorAssembly = каркас раздвижного окна .desc = Оно открывается, оно закрывается, и вы можете смотреть сквозь него! ent-WindoorAssemblySecure = каркас раздвижного бронеокна .desc = Оно открывается, оно закрывается, и вы можете смотреть сквозь него! Оно выглядит крепким. +ent-WindoorAssemblyClockwork = clockwork windoor assembly + .desc = It opens, it closes, and you can see through it! This one looks tough. ent-WindoorAssemblyPlasma = каркас плазменного раздвижного окна .desc = Оно открывается, оно закрывается, и вы можете смотреть сквозь него! Оно выглядит фиоле-, нет, розовым. Подождите... ent-WindoorAssemblySecurePlasma = каркас плазменного раздвижного бронеокна diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/clockwork.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/clockwork.ftl new file mode 100644 index 00000000000..8102579fd2b --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/clockwork.ftl @@ -0,0 +1,2 @@ +ent-BaseClockworkWindoor = clockwork windoor + .desc = { ent-BaseWindoor.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl index 70dbfaddb6c..d50e8895f23 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl @@ -2,6 +2,8 @@ ent-Windoor = раздвижное окно .desc = Это и окно, и раздвижная дверь. Вот это да! ent-WindoorSecure = раздвижное бронеокно .desc = Это и прочное окно, и раздвижная дверь. Вот это да! +ent-WindoorClockwork = clockwork windoor + .desc = It's a sturdy window and a sliding door. Wow! ent-WindoorPlasma = плазменное раздвижное окно .desc = Это и розовое окно *и* раздвижная дверь. Невероятно! ent-WindoorSecurePlasma = плазменное раздвижное бронеокно diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl index 7206971e464..79c9cc19901 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl @@ -1,5 +1,13 @@ ent-SeatBase = стул .desc = Вы сидите в нём. Либо по вашей воле, либо по принуждению. +ent-UnanchoredChairBase = chair + .desc = { ent-SeatBase.desc } +ent-ChairBase = chair + .desc = { ent-UnanchoredChairBase.desc } +ent-OfficeChairBase = chair + .desc = { ent-UnanchoredChairBase.desc } +ent-StoolBase = stool + .desc = { ent-OfficeChairBase.desc } ent-Chair = стул .desc = { ent-SeatBase.desc } ent-ChairGreyscale = стул @@ -9,6 +17,8 @@ ent-Stool = табурет .desc = Приложите ягодицы. ent-StoolBar = барный стул .desc = { ent-SeatBase.desc } +ent-ChairBrass = brass chair + .desc = { ent-StoolBase.desc } ent-ChairOfficeLight = белое офисное кресло .desc = { ent-SeatBase.desc } ent-ChairOfficeDark = тёмное офисное кресло diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl index 2a6c3efc80a..9d996ae8bbe 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl @@ -14,6 +14,8 @@ ent-TableReinforcedGlass = стол из бронестекла .desc = Квадратный лист стекла, стоящий на четырех металлических ножках. Очень прочный. ent-TablePlasmaGlass = стол из плазменного стекла .desc = Квадратный лист плазмы, стоящий на четырех металлических ножках. Красивый! +ent-TableBrass = brass table + .desc = A shiny, corrosion resistant brass table. Steampunk! ent-TableWood = деревянный стол .desc = Беречь от огня. По слухам, он легко горит. ent-TableCarpet = игорный стол diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl index e6cd655e9c7..5bad716f833 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl @@ -1,10 +1,11 @@ -ent-BaseLightStructure = { ent-BaseStructure } - .desc = { ent-BaseStructure.desc } ent-LightPostSmall = фонарный столб .desc = Всегда работающий светильник. .suffix = Всегда запитанный ent-PoweredLightPostSmallEmpty = фонарный столб .desc = Осветительный прибор. .suffix = Пустой +ent-PoweredLEDLightPostSmall = post light + .desc = A light fixture. Draws power and produces light when equipped with a light tube. + .suffix = LED ent-PoweredLightPostSmall = фонарный столб .desc = Осветительный прибор. Потребляет энергию и излучает свет, если оснащен лампой-трубкой. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl index d8807a8a96b..d48924af9af 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl @@ -20,6 +20,8 @@ ent-SignDirectionalEvac = знак "эвакуация" .desc = Указатель в сторону эвакуации. ent-SignDirectionalBridge = знак "мостик" .desc = Указатель в сторону капитанского мостика. +ent-SignDirectionalExam = exam sign + .desc = A direction sign, pointing out which way the examination room(s) are. ent-SignDirectionalFood = знак "еда" .desc = Указатель в сторону кухни. ent-SignDirectionalGravity = знак "гравитация" @@ -28,6 +30,8 @@ ent-SignDirectionalHydro = знак "гидро" .desc = Указатель в сторону отдела гидропоники. ent-SignDirectionalHop = знак "ГП" .desc = Указатель в сторону офиса Главы персонала. +ent-SignDirectionalIcu = icu sign + .desc = A direction sign, pointing out which way the ICU is. ent-SignDirectionalMed = знак "медицинский отдел" .desc = Указатель в сторону медицинского отдела. ent-SignDirectionalSalvage = знак "утилизация" @@ -48,6 +52,8 @@ ent-SignDirectionalWash = знак "уборная" .desc = Указатель в сторону уборной. ent-SignAi = знак "ИИ" .desc = { ent-BaseSign.desc } +ent-SignArcade = arcade sign + .desc = A sign indicating the arcade. ent-SignArmory = знак "оружейная" .desc = Знак, указывающий на оружейную. ent-SignToolStorage = знак "склад инструментов" @@ -62,6 +68,8 @@ ent-SignAtmosMinsky = знак "атмос" .desc = Знак, указывающий на атмосферный отсек. ent-SignBar = знак "бар" .desc = Знак, указывающий на бар. +ent-SignBarbershop = barbershop sign + .desc = A sign indicating the barbershop. ent-SignHydro1 = знак "гидропоника" .desc = Знак, указывающий на гидропонику. ent-SignHydro2 = знак "гидропоника" @@ -122,6 +130,8 @@ ent-SignScience = знак "наука" .desc = Знак, указывающий на научный отсек. ent-SignJanitor = знак "уборщик" .desc = Знак, указывающий на каморку уборщика. +ent-SignLaundromat = laundromat sign + .desc = A sign indicating the laundromat. ent-SignLawyer = знак "АВД" .desc = Знак, указывающий на офис АВД. ent-SignScience1 = знак "наука" @@ -134,16 +144,22 @@ ent-SignToxins2 = знак "токсины" .desc = Знак, указывающий на лабораторию токсинов. ent-SignBridge = знак "мостик" .desc = Знак, указывающий на мостик. +ent-SignNews = news sign + .desc = A sign indicating where the Reporter works. ent-SignBio = знак "био лаб" .desc = Знак, указывающий на биологическую лабораторию. ent-SignBiohazard = знак "биологическая угроза" .desc = Знак, предупреждающий о биологической опасности. ent-SignPsychology = знак "психолог" .desc = Знак, указывающий на офис психолога. +ent-SignReception = reception sign + .desc = A sign indicating the reception. ent-SignCanisters = знак "газовые баллоны" .desc = Знак, предупреждающий о канистрах под давлением. ent-SignCorrosives = предупреждающий знак "едкие вещества" .desc = Знак, предупреждающий об опасности едких веществ. +ent-SignSalvage = salvage sign + .desc = A sign indicating the salvage area. ent-SignCryogenics = предупреждающий знак "криогеника" .desc = Знак, предупреждающий об опасности криогенных материалов. Захватите с собой куртку! ent-SignDanger = предупреждающий знак "опасно" diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/girders.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/girders.ftl index e7b07a32627..704d2571cb8 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/girders.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/girders.ftl @@ -2,3 +2,5 @@ ent-Girder = каркас .desc = Большой металлический каркас; Его необходимо покрыть листами металла, чтобы он считался стеной. ent-ReinforcedGirder = укреплённый каркас .desc = Большой каркас из металла и пластали; Его необходимо покрыть листами пластали, чтобы он считался укреплённой стеной. +ent-ClockworkGirder = wall gear + .desc = A large gear with mounting brackets for additional plating; This could be made into a wall with more brass plating. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/grille.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/grille.ftl index 56d4a95a0be..3c038367bda 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/grille.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/grille.ftl @@ -1,6 +1,12 @@ ent-Grille = решётка .desc = Хлипкий каркас из железных прутьев. +ent-ClockworkGrille = clockwork grille + .desc = a flimsy framework of iron rods assembled in traditional Ratvarian fashion. ent-GrilleBroken = решётка .desc = Хлипкий каркас из железных прутьев. Он видел и лучшие дни. +ent-ClockworkGrilleBroken = clockwork grille + .desc = A flimsy framework of iron rods assembled in traditional Ratvarian fashion. It has seen better days. ent-GrilleDiagonal = диагональная решётка .desc = { ent-Grille.desc } +ent-ClockworkGrilleDiagonal = diagonal clockwork grille + .desc = { ent-ClockworkGrille.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/clockwork.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/clockwork.ftl new file mode 100644 index 00000000000..584999bd7e4 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/clockwork.ftl @@ -0,0 +1,7 @@ +ent-ClockworkWindow = clockwork window + .desc = Don't smudge up the brass down there. +ent-WindowClockworkDirectional = directional clockwork window + .desc = Don't smudge up the brass down there. +ent-ClockworkWindowDiagonal = { ent-ClockworkWindow } + .suffix = diagonal + .desc = { ent-ClockworkWindow.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl new file mode 100644 index 00000000000..57216514981 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl @@ -0,0 +1,5 @@ +ent-PlastitaniumWindow = plastitanium window + .desc = { ent-Window.desc } +ent-PlastitaniumWindowDiagonal = { ent-ShuttleWindow } + .suffix = diagonal + .desc = { ent-ShuttleWindow.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/gamerules/roundstart.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/gamerules/roundstart.ftl index 161bb159969..dfa17bada5f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/gamerules/roundstart.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/gamerules/roundstart.ftl @@ -1,5 +1,7 @@ ent-BaseGameRule = { "" } .desc = { "" } +ent-SubGamemodesRule = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } ent-DeathMatch31 = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-InactivityTimeRestart = { ent-BaseGameRule } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/thief.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/thief.ftl index 40275ea7c7c..aa3c62d5012 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/thief.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/thief.ftl @@ -86,14 +86,8 @@ ent-MortyStealObjective = { ent-BaseThiefStealAnimalObjective } .desc = { ent-BaseThiefStealAnimalObjective.desc } ent-RenaultStealObjective = { ent-BaseThiefStealAnimalObjective } .desc = { ent-BaseThiefStealAnimalObjective.desc } -ent-HamletStealObjective = { ent-BaseThiefStealAnimalObjective } - .desc = { ent-BaseThiefStealAnimalObjective.desc } ent-ShivaStealObjective = { ent-BaseThiefStealAnimalObjective } .desc = { ent-BaseThiefStealAnimalObjective.desc } -ent-SmileStealObjective = { ent-BaseThiefStealAnimalObjective } - .desc = { ent-BaseThiefStealAnimalObjective.desc } -ent-PunPunStealObjective = { ent-BaseThiefStealAnimalObjective } - .desc = { ent-BaseThiefStealAnimalObjective.desc } ent-TropicoStealObjective = { ent-BaseThiefStealAnimalObjective } .desc = { ent-BaseThiefStealAnimalObjective.desc } ent-EscapeThiefShuttleObjective = Улететь на Центком живым и свободным. diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index c1c6f755888..344cf0e9a16 100644 --- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl @@ -279,3 +279,5 @@ uplink-bribe-name = Набор лоббиста uplink-bribe-desc = Сердечный подарок, который может помочь вам изменить чьё-то мнение. Настоящие или фальшивые? Да. uplink-hypodart-name = Гиподротик uplink-hypodart-desc = Неприметный на первый взгляд дротик с увеличенным резервуаром для химических веществ. Он вмещает в себя до 7 ед. реагентов и мгновенно впрыскивает их при попадании в цель. Изначально пуст. +uplink-barber-scissors-name = Barber Scissors +uplink-barber-scissors-desc = A good tool to give your fellow agent a nice haircut, unless you want to give it to yourself. diff --git a/Resources/Locale/ru-RU/tiles/tiles.ftl b/Resources/Locale/ru-RU/tiles/tiles.ftl index 75664d2d5c6..2e4d77a4a8d 100644 --- a/Resources/Locale/ru-RU/tiles/tiles.ftl +++ b/Resources/Locale/ru-RU/tiles/tiles.ftl @@ -54,6 +54,9 @@ tiles-lime-floor = лаймовый пол tiles-hydro-floor = гидро пол tiles-bar-floor = барный пол tiles-clown-floor = клоунский пол +tiles-brass-plating = brass plating +tiles-brass-floor-filled = filled brass plating +tiles-brass-floor-reebe = smooth brass plating tiles-mime-floor = мимский пол tiles-kitchen-floor = кухонный пол tiles-laundry-floor = пол прачечной