diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/xenoarchaelogy/xenoartifacts.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/xenoarchaelogy/xenoartifacts.ftl new file mode 100644 index 0000000000..38a459db51 --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/xenoarchaelogy/xenoartifacts.ftl @@ -0,0 +1,2 @@ +ent-BaseRandomItemXenoArtifactComponents = { "" } + .desc = { "" } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/stations/base.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/stations/base.ftl index 500b105c3e..d256c3229c 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/stations/base.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/stations/base.ftl @@ -20,3 +20,5 @@ ent-BaseStationCryoTeleport = { "" } .desc = { "" } ent-BaseStationMeteorSwarmTarget = { "" } .desc = { "" } +ent-BaseStationRandomXenoArtifact = { "" } + .desc = { "" } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/stations/nanotrasen.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/stations/nanotrasen.ftl index fd253c59c6..0d5a1ed231 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/stations/nanotrasen.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/stations/nanotrasen.ftl @@ -1,2 +1,4 @@ ent-NanotrasenPrison = { ent-BaseStation } .desc = { ent-BaseStation.desc } +ent-DevStation = { ent-BaseStation } + .desc = { ent-BaseStation.desc } diff --git a/Resources/Locale/en-US/_prototypes/actions/types.ftl b/Resources/Locale/en-US/_prototypes/actions/types.ftl index 4c95bc5f16..28f29987b0 100644 --- a/Resources/Locale/en-US/_prototypes/actions/types.ftl +++ b/Resources/Locale/en-US/_prototypes/actions/types.ftl @@ -66,3 +66,7 @@ ent-FakeMindShieldToggleAction = [color=green]Toggle Fake Mindshield[/color] .desc = Turn the Fake Mindshield implant's transmission on/off ent-ActionToggleParamedicSiren = Toggle Paramedic Siren .desc = Toggles the paramedic siren on and off. +ent-ActionToggleRootable = action-name-toggle-rootable + .desc = action-description-toggle-rootable +ent-ActionChameleonController = Control clothing + .desc = Change your entire outfit fast! diff --git a/Resources/Locale/en-US/_prototypes/catalog/fills/crates/engineering.ftl b/Resources/Locale/en-US/_prototypes/catalog/fills/crates/engineering.ftl index 56b981b9c8..f5d4065548 100644 --- a/Resources/Locale/en-US/_prototypes/catalog/fills/crates/engineering.ftl +++ b/Resources/Locale/en-US/_prototypes/catalog/fills/crates/engineering.ftl @@ -34,3 +34,5 @@ ent-CrateEngineeringSpaceHeater = space heater crate .desc = Contains a space heater for climate control. ent-CrateTechBoardRandom = surplus boards .desc = Surplus boards from somewhere. +ent-CrateAirGrenade = air grenade crate + .desc = A crate containing 3 air grenades. diff --git a/Resources/Locale/en-US/_prototypes/catalog/fills/crates/food.ftl b/Resources/Locale/en-US/_prototypes/catalog/fills/crates/food.ftl index 9be420bdd7..cd6a02994e 100644 --- a/Resources/Locale/en-US/_prototypes/catalog/fills/crates/food.ftl +++ b/Resources/Locale/en-US/_prototypes/catalog/fills/crates/food.ftl @@ -1,7 +1,5 @@ ent-CrateFoodPizza = emergency pizza delivery .desc = Help do your part to end station hunger by distributing pizza to underfunded departments! Includes 4 pizzas. -ent-CrateFoodPizzaLarge = disaster pizza delivery - .desc = In the ultimate event that all else has failed, Find comfort in that more pizza solves everything. Includes 16 pizzas. ent-CrateFoodMRE = MRE crate .desc = A military style meal fit to feed a whole department. ent-CrateFoodCooking = kitchen supplies crate @@ -12,8 +10,6 @@ ent-CrateFoodBarSupply = bartending supplies crate .desc = Extra Bar supplies, in case the clown was allowed in the bar unsupervised. ent-CrateFoodSoftdrinks = softdrinks crate .desc = A variety of sodas to complement a small party, without having to empty the soda machines. Includes 14 sodas. -ent-CrateFoodSoftdrinksLarge = softdrinks bulk crate - .desc = Lots of sodas taken straight out of Centcomm's own vending machines, because you just can't leave your department. Includes 32 sodas. ent-CrateFoodGetMore = Getmore Bakemore crate .desc = Getmore branded snacks and baking supplies for the creative chef, all without the need of emptying your station's Getmore machines! ent-CrateFoodIceCream = ice cream delivery @@ -22,3 +18,7 @@ ent-CrateFoodSnowcone = snowcone delivery .desc = A freezer packed with refreshing snowcones for a hard working crew, or even a lazy one! Includes 16 snowcones. ent-CrateFoodHappyHonkBigBite = Happy Honk meal delivery .desc = Two fully loaded Happy Honk Big Bite burger meals, complete with cheesy fries, a bottle of Space Cola, a slice of apple pie and a toy! +ent-CrateFoodPizzaLarge = disaster pizza delivery + .desc = In the ultimate event that all else has failed, Find comfort in that more pizza solves everything. Includes 16 pizzas. +ent-CrateFoodSoftdrinksLarge = softdrinks bulk crate + .desc = Lots of sodas taken straight out of Centcomm's own vending machines, because you just can't leave your department. Includes 32 sodas. diff --git a/Resources/Locale/en-US/_prototypes/catalog/fills/crates/service.ftl b/Resources/Locale/en-US/_prototypes/catalog/fills/crates/service.ftl index 7d7df8de7a..e6c7308946 100644 --- a/Resources/Locale/en-US/_prototypes/catalog/fills/crates/service.ftl +++ b/Resources/Locale/en-US/_prototypes/catalog/fills/crates/service.ftl @@ -1,5 +1,7 @@ ent-CrateServiceJanitorialSupplies = janitorial supplies crate .desc = Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, broom, spray cleaner, rag, and trash bag. +ent-CrateServiceCleanerGrenades = bulk cleanades crate + .desc = Contains two boxes of cleaner grenades, for those deeply-entrenched stains. ent-CrateServiceReplacementLights = replacement lights crate .desc = May the light of Aether shine upon this station! Or at least, the light of forty two light tubes and twenty one light bulbs. ent-CrateServiceHolidayLights = holiday lights crate diff --git a/Resources/Locale/en-US/_prototypes/entities/effects/mobspawn.ftl b/Resources/Locale/en-US/_prototypes/entities/effects/mobspawn.ftl index 37474dff9f..3ef5247916 100644 --- a/Resources/Locale/en-US/_prototypes/entities/effects/mobspawn.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/effects/mobspawn.ftl @@ -10,5 +10,7 @@ ent-MobSpawnCrabGold = mobspawner goldcrab .desc = { ent-MobSpawnCrabQuartz.desc } ent-MobSpawnCrabUranium = mobspawner uraniumcrab .desc = { ent-MobSpawnCrabQuartz.desc } +ent-MobSpawnCrabBananium = mobspawner bananiumcrab + .desc = { ent-MobSpawnCrabQuartz.desc } ent-EffectAnomalyFloraBulb = { "" } .desc = { "" } diff --git a/Resources/Locale/en-US/_prototypes/entities/effects/wallspawn.ftl b/Resources/Locale/en-US/_prototypes/entities/effects/wallspawn.ftl index 6bd745c6b5..b7c87d4111 100644 --- a/Resources/Locale/en-US/_prototypes/entities/effects/wallspawn.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/effects/wallspawn.ftl @@ -2,6 +2,10 @@ ent-WallSpawnAsteroid = { "" } .desc = { "" } ent-WallSpawnAsteroidUraniumCrab = { ent-WallSpawnAsteroid } .desc = { ent-WallSpawnAsteroid.desc } +ent-WallSpawnAsteroidBananium = { ent-WallSpawnAsteroid } + .desc = { ent-WallSpawnAsteroid.desc } +ent-WallSpawnAsteroidBananiumCrab = { ent-WallSpawnAsteroid } + .desc = { ent-WallSpawnAsteroid.desc } ent-WallSpawnAsteroidUranium = { ent-WallSpawnAsteroid } .desc = { ent-WallSpawnAsteroid.desc } ent-WallSpawnAsteroidQuartzCrab = { ent-WallSpawnAsteroid } diff --git a/Resources/Locale/en-US/_prototypes/entities/markers/spawners/bots.ftl b/Resources/Locale/en-US/_prototypes/entities/markers/spawners/bots.ftl index e19a153223..790121c012 100644 --- a/Resources/Locale/en-US/_prototypes/entities/markers/spawners/bots.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/markers/spawners/bots.ftl @@ -2,3 +2,9 @@ ent-SpawnMobMedibot = medibot spawner .desc = { ent-MarkerBase.desc } ent-SpawnMobCleanBot = cleanbot spawner .desc = { ent-MarkerBase.desc } +ent-SpawnMobFireBot = firebot spawner + .desc = { ent-MarkerBase.desc } +ent-SpawnMobSupplyBot = supplybot spawner + .desc = { ent-MarkerBase.desc } +ent-SpawnMobHonkBot = honkbot spawner + .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/en-US/_prototypes/entities/mobs/npcs/elemental.ftl b/Resources/Locale/en-US/_prototypes/entities/mobs/npcs/elemental.ftl index ec001ab99a..8bf86b3cfc 100644 --- a/Resources/Locale/en-US/_prototypes/entities/mobs/npcs/elemental.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/mobs/npcs/elemental.ftl @@ -14,6 +14,9 @@ ent-MobCoalCrab = { ent-MobOreCrab } ent-MobUraniumCrab = { ent-MobOreCrab } .desc = An ore crab made from uranium. .suffix = Uranium +ent-MobBananiumCrab = { ent-MobOreCrab } + .desc = An ore crab made from bananium. + .suffix = Bananium ent-MobSilverCrab = { ent-MobOreCrab } .desc = An ore crab made from silver. .suffix = Silver diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl index ae11dd33a1..1ab63ad7cc 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl @@ -31,6 +31,9 @@ ent-ScramImplanter = scram implanter .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } ent-DnaScramblerImplanter = DNA scrambler implanter .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } +ent-ChameleonControllerImplanter = { ent-BaseImplantOnlyImplanterSyndi } + .suffix = chameleon controller + .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } ent-MicroBombImplanter = micro-bomb implanter .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } ent-MacroBombImplanter = macro-bomb implanter diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/misc/subdermal_implants.ftl index 9b2cffcd01..b0382a1874 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/misc/subdermal_implants.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/misc/subdermal_implants.ftl @@ -26,6 +26,8 @@ ent-ScramImplant = scram implant .desc = This implant randomly teleports the user within a large radius when activated. ent-DnaScramblerImplant = DNA scrambler implant .desc = This implant lets the user randomly change their appearance and name once. +ent-ChameleonControllerImplant = chameleon controller implant + .desc = This implant allows you to instantly change the appearance of all worn chameleon clothing. ent-MicroBombImplant = micro-bomb implant .desc = This implant detonates the user upon activation or upon death. ent-MacroBombImplant = macro-bomb implant diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/specific/syndicate.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/specific/syndicate.ftl index bd2e6c990e..c1aa8ac4e4 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/specific/syndicate.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/specific/syndicate.ftl @@ -1,3 +1,5 @@ +ent-TelecrystalBase = { ent-BaseItem } + .desc = It seems to be pulsing with suspiciously enticing energies. ent-Telecrystal = telecrystal .desc = It seems to be pulsing with suspiciously enticing energies. .suffix = 100 TC diff --git a/Resources/Locale/en-US/_prototypes/entities/structures/machines/multipart.ftl b/Resources/Locale/en-US/_prototypes/entities/structures/machines/multipart.ftl new file mode 100644 index 0000000000..b3f45041b1 --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/entities/structures/machines/multipart.ftl @@ -0,0 +1,2 @@ +ent-MultipartMachineGhost = { "" } + .desc = { "" } diff --git a/Resources/Locale/en-US/_prototypes/entities/structures/piping/atmospherics/alt_layers.ftl b/Resources/Locale/en-US/_prototypes/entities/structures/piping/atmospherics/alt_layers.ftl new file mode 100644 index 0000000000..5b21c7abef --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/entities/structures/piping/atmospherics/alt_layers.ftl @@ -0,0 +1,24 @@ +ent-GasPipeLayerAlt1 = { "" } + .desc = { "" } +ent-GasPipeLayerAlt2 = { "" } + .desc = { "" } +ent-GasPipeStraightAlt1 = { ent-GasPipeLayerAlt1 } + .desc = { ent-GasPipeLayerAlt1.desc } +ent-GasPipeStraightAlt2 = { ent-GasPipeLayerAlt2 } + .desc = { ent-GasPipeLayerAlt2.desc } +ent-GasPipeHalfAlt1 = { ent-GasPipeLayerAlt1 } + .desc = { ent-GasPipeLayerAlt1.desc } +ent-GasPipeHalfAlt2 = { ent-GasPipeLayerAlt2 } + .desc = { ent-GasPipeLayerAlt2.desc } +ent-GasPipeBendAlt1 = { ent-GasPipeLayerAlt1 } + .desc = { ent-GasPipeLayerAlt1.desc } +ent-GasPipeBendAlt2 = { ent-GasPipeLayerAlt2 } + .desc = { ent-GasPipeLayerAlt2.desc } +ent-GasPipeTJunctionAlt1 = { ent-GasPipeLayerAlt1 } + .desc = { ent-GasPipeLayerAlt1.desc } +ent-GasPipeTJunctionAlt2 = { ent-GasPipeLayerAlt2 } + .desc = { ent-GasPipeLayerAlt2.desc } +ent-GasPipeFourwayAlt1 = { ent-GasPipeLayerAlt1 } + .desc = { ent-GasPipeLayerAlt1.desc } +ent-GasPipeFourwayAlt2 = { ent-GasPipeLayerAlt2 } + .desc = { ent-GasPipeLayerAlt2.desc } diff --git a/Resources/Locale/en-US/_prototypes/entities/structures/piping/atmospherics/pipes.ftl b/Resources/Locale/en-US/_prototypes/entities/structures/piping/atmospherics/pipes.ftl index 6f13224ead..e7cf387e64 100644 --- a/Resources/Locale/en-US/_prototypes/entities/structures/piping/atmospherics/pipes.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/structures/piping/atmospherics/pipes.ftl @@ -1,7 +1,9 @@ -ent-GasPipeBase = pipe +ent-GasPipeSansLayers = gas pipe .desc = Holds gas. ent-VentCrawHolder = vent claw holder .desc = { "" } +ent-GasPipeBase = pipe + .desc = Holds gas. ent-GasPipeHalf = { ent-GasPipeBase } .suffix = Half .desc = { ent-GasPipeBase.desc } @@ -19,3 +21,5 @@ ent-GasPipeFourway = { ent-GasPipeBase } .desc = { ent-GasPipeBase.desc } ent-GasPipeBroken = broken pipe .desc = It used to hold gas. +ent-GasPipeManifold = gas pipe manifold + .desc = Allows gas pipes of different configurations to be connected together. diff --git a/Resources/Locale/en-US/_prototypes/entities/structures/specific/anomaly/anomalies.ftl b/Resources/Locale/en-US/_prototypes/entities/structures/specific/anomaly/anomalies.ftl index 01cf613589..3fa900ec78 100644 --- a/Resources/Locale/en-US/_prototypes/entities/structures/specific/anomaly/anomalies.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/structures/specific/anomaly/anomalies.ftl @@ -24,6 +24,9 @@ ent-AnomalyRockBase = { ent-BaseAnomaly } ent-AnomalyRockUranium = { ent-AnomalyRockBase } .suffix = Rock, Uranium .desc = { ent-AnomalyRockBase.desc } +ent-AnomalyRockBananium = { ent-AnomalyRockBase } + .suffix = Rock, Bananium + .desc = { ent-AnomalyRockBase.desc } ent-AnomalyRockQuartz = { ent-AnomalyRockBase } .suffix = Rock, Quartz .desc = { ent-AnomalyRockBase.desc } diff --git a/Resources/Locale/en-US/_prototypes/entities/structures/wallmounts/mirror.ftl b/Resources/Locale/en-US/_prototypes/entities/structures/wallmounts/mirror.ftl index 99897de077..6d18d343d1 100644 --- a/Resources/Locale/en-US/_prototypes/entities/structures/wallmounts/mirror.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/structures/wallmounts/mirror.ftl @@ -1,2 +1,5 @@ ent-Mirror = mirror .desc = Mirror mirror on the wall , who's the most robust of them all? +ent-MirrorModern = mirror + .suffix = rectangle + .desc = { ent-Mirror.desc } diff --git a/Resources/Locale/en-US/_prototypes/entities/structures/walls/asteroid.ftl b/Resources/Locale/en-US/_prototypes/entities/structures/walls/asteroid.ftl index 84b945ee3f..392c42bd42 100644 --- a/Resources/Locale/en-US/_prototypes/entities/structures/walls/asteroid.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/structures/walls/asteroid.ftl @@ -48,6 +48,9 @@ ent-AsteroidRockUraniumCrab = { ent-AsteroidRockUranium } ent-AsteroidRockBananium = { ent-AsteroidRock } .desc = An ore vein rich with bananium. .suffix = Bananium +ent-AsteroidRockBananiumCrab = { ent-AsteroidRockBananium } + .suffix = Bananium Crab + .desc = { ent-AsteroidRockBananium.desc } ent-AsteroidRockSalt = { ent-AsteroidRock } .desc = An ore vein rich with salt. .suffix = Salt diff --git a/Resources/Locale/en-US/_prototypes/floor_trap.ftl b/Resources/Locale/en-US/_prototypes/floor_trap.ftl index e69de29bb2..f49cd2a867 100644 --- a/Resources/Locale/en-US/_prototypes/floor_trap.ftl +++ b/Resources/Locale/en-US/_prototypes/floor_trap.ftl @@ -0,0 +1,23 @@ +ent-CollideFloorTrap = { "" } + .desc = { "" } +ent-CollideFloorTrapSpawn = floor trap spawn + .desc = { ent-CollideFloorTrap.desc } +ent-FloorTrapExplosion = explosion floor trap + .desc = { ent-CollideFloorTrap.desc } +ent-FloorTrapEMP = EMP floor trap + .desc = { ent-CollideFloorTrap.desc } +ent-SpawnFloorTrapCarp = { ent-CollideFloorTrapSpawn } + .suffix = Carp + .desc = { ent-CollideFloorTrapSpawn.desc } +ent-SpawnFloorTrapBear = { ent-CollideFloorTrapSpawn } + .suffix = Bear + .desc = { ent-CollideFloorTrapSpawn.desc } +ent-SpawnFloorTrapKangaroo = { ent-CollideFloorTrapSpawn } + .suffix = Kangaroo + .desc = { ent-CollideFloorTrapSpawn.desc } +ent-SpawnFloorTrapXenoDrone = { ent-CollideFloorTrapSpawn } + .suffix = Xeno. Drone + .desc = { ent-CollideFloorTrapSpawn.desc } +ent-SpawnFloorTrapXenoBurrower = { ent-CollideFloorTrapSpawn } + .suffix = Xeno. Burrower + .desc = { ent-CollideFloorTrapSpawn.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/xenoarchaelogy/xenoartifacts.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/xenoarchaelogy/xenoartifacts.ftl new file mode 100644 index 0000000000..38a459db51 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/xenoarchaelogy/xenoartifacts.ftl @@ -0,0 +1,2 @@ +ent-BaseRandomItemXenoArtifactComponents = { "" } + .desc = { "" } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/stations/base.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/stations/base.ftl index 500b105c3e..d256c3229c 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/stations/base.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/stations/base.ftl @@ -20,3 +20,5 @@ ent-BaseStationCryoTeleport = { "" } .desc = { "" } ent-BaseStationMeteorSwarmTarget = { "" } .desc = { "" } +ent-BaseStationRandomXenoArtifact = { "" } + .desc = { "" } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/stations/nanotrasen.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/stations/nanotrasen.ftl index fd253c59c6..0d5a1ed231 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/stations/nanotrasen.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/stations/nanotrasen.ftl @@ -1,2 +1,4 @@ ent-NanotrasenPrison = { ent-BaseStation } .desc = { ent-BaseStation.desc } +ent-DevStation = { ent-BaseStation } + .desc = { ent-BaseStation.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/doors/airlocks/Glass/access.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/doors/airlocks/Glass/access.ftl index fcb65d4cf9..e69de29bb2 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/doors/airlocks/Glass/access.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/doors/airlocks/Glass/access.ftl @@ -1,72 +0,0 @@ -ent-DoubleGlassAirlockAtmosphericsLocked = { ent-DoubleGlassAirlockAtmospherics } - .suffix = Atmospherics, Locked - .desc = { ent-DoubleGlassAirlockAtmospherics.desc } -ent-DoubleGlassAirlockCargoLocked = { ent-DoubleGlassAirlockCargo } - .suffix = Cargo, Locked - .desc = { ent-DoubleGlassAirlockCargo.desc } -ent-DoubleGlassAirlockSalvageLocked = { ent-DoubleGlassAirlockSalvage } - .suffix = Salvage, Locked - .desc = { ent-DoubleGlassAirlockSalvage.desc } -ent-DoubleGlassAirlockChemistryLocked = { ent-DoubleGlassAirlockChemistry } - .suffix = Chemistry, Locked - .desc = { ent-DoubleGlassAirlockChemistry.desc } -ent-DoubleGlassAirlockCommandLocked = { ent-DoubleGlassAirlockCommand } - .suffix = Command, Locked - .desc = { ent-DoubleGlassAirlockCommand.desc } -ent-DoubleGlassAirlockCentralCommandLocked = { ent-DoubleGlassAirlockCentralCommand } - .suffix = Central Command, Locked - .desc = { ent-DoubleGlassAirlockCentralCommand.desc } -ent-DoubleGlassAirlockEngineeringLocked = { ent-DoubleGlassAirlockEngineering } - .suffix = Engineering, Locked - .desc = { ent-DoubleGlassAirlockEngineering.desc } -ent-DoubleGlassAirlockMaintLocked = { ent-DoubleGlassAirlockMaint } - .suffix = Maintenance, Locked - .desc = { ent-DoubleGlassAirlockMaint.desc } -ent-DoubleGlassAirlockMedicalLocked = { ent-DoubleGlassAirlockMedical } - .suffix = Medical, Locked - .desc = { ent-DoubleGlassAirlockMedical.desc } -ent-DoubleGlassAirlockScienceLocked = { ent-DoubleGlassAirlockScience } - .suffix = Science, Locked - .desc = { ent-DoubleGlassAirlockScience.desc } -ent-DoubleGlassAirlockSecurityLocked = { ent-DoubleGlassAirlockSecurity } - .suffix = Security, Locked - .desc = { ent-DoubleGlassAirlockSecurity.desc } -ent-DoubleGlassAirlockVirologyLocked = { ent-DoubleGlassAirlockVirology } - .suffix = Virology, Locked - .desc = { ent-DoubleGlassAirlockVirology.desc } -ent-TripleGlassAirlockAtmosphericsLocked = { ent-TripleGlassAirlockAtmospherics } - .suffix = Atmospherics, Locked - .desc = { ent-TripleGlassAirlockAtmospherics.desc } -ent-TripleGlassAirlockCargoLocked = { ent-TripleGlassAirlockCargo } - .suffix = Cargo, Locked - .desc = { ent-TripleGlassAirlockCargo.desc } -ent-TripleGlassAirlockSalvageLocked = { ent-TripleGlassAirlockSalvage } - .suffix = Salvage, Locked - .desc = { ent-TripleGlassAirlockSalvage.desc } -ent-TripleGlassAirlockCentralCommandLocked = { ent-TripleGlassAirlockCentralCommand } - .suffix = Central Command, Locked - .desc = { ent-TripleGlassAirlockCentralCommand.desc } -ent-TripleGlassAirlockChemistryLocked = { ent-TripleGlassAirlockChemistry } - .suffix = Chemistry, Locked - .desc = { ent-TripleGlassAirlockChemistry.desc } -ent-TripleGlassAirlockCommandLocked = { ent-TripleGlassAirlockCommand } - .suffix = Command, Locked - .desc = { ent-TripleGlassAirlockCommand.desc } -ent-TripleGlassAirlockEngineeringLocked = { ent-TripleGlassAirlockEngineering } - .suffix = Engineering, Locked - .desc = { ent-TripleGlassAirlockEngineering.desc } -ent-TripleGlassAirlockMaintLocked = { ent-TripleGlassAirlockMaint } - .suffix = Maintenance, Locked - .desc = { ent-TripleGlassAirlockMaint.desc } -ent-TripleGlassAirlockMedicalLocked = { ent-TripleGlassAirlockMedical } - .suffix = Medical, Locked - .desc = { ent-TripleGlassAirlockMedical.desc } -ent-TripleGlassAirlockScienceLocked = { ent-TripleGlassAirlockScience } - .suffix = Science, Locked - .desc = { ent-TripleGlassAirlockScience.desc } -ent-TripleGlassAirlockSecurityLocked = { ent-TripleGlassAirlockSecurity } - .suffix = Security, Locked - .desc = { ent-TripleGlassAirlockSecurity.desc } -ent-TripleGlassAirlockVirologyLocked = { ent-TripleGlassAirlockVirology } - .suffix = Virology, Locked - .desc = { ent-TripleGlassAirlockVirology.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/doors/airlocks/Glass/airlocks.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/doors/airlocks/Glass/airlocks.ftl index 544a9d0b4b..e69de29bb2 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/doors/airlocks/Glass/airlocks.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/doors/airlocks/Glass/airlocks.ftl @@ -1,89 +0,0 @@ -ent-DoubleGlassAirlock = двойной стеклянный шлюз - .desc = { ent-AirlockGlass.desc } -ent-TripleGlassAirlock = тройной стеклянный шлюз - .desc = Он открывается, он закрывается и, возможно, раздавит вас, но он больше, чем обычная дверь. -ent-AirlockStandardGlass = { ent-AirlockGlass } - .suffix = Сервис - .desc = { ent-AirlockGlass.desc } -ent-AirlockXeno = { ent-Airlock } - .suffix = Ксено - .desc = { ent-Airlock.desc } -ent-AirlockGlassXeno = { ent-AirlockGlass } - .suffix = Xeno - .desc = { ent-AirlockGlass.desc } -ent-DoubleGlassAirlockBasic = double basic glass airlock - .desc = { ent-DoubleGlassAirlock.desc } -ent-DoubleGlassAirlockAtmospherics = { ent-DoubleGlassAirlockEngineering } - .suffix = Атмосферика - .desc = { ent-DoubleGlassAirlockEngineering.desc } -ent-DoubleGlassAirlockCargo = { ent-DoubleGlassAirlock } - .suffix = Снабжение - .desc = { ent-DoubleGlassAirlock.desc } -ent-DoubleGlassAirlockChemistry = { ent-DoubleGlassAirlock } - .suffix = Химия - .desc = { ent-DoubleGlassAirlock.desc } -ent-DoubleGlassAirlockCommand = { ent-DoubleGlassAirlock } - .suffix = Командование - .desc = { ent-DoubleGlassAirlock.desc } -ent-DoubleGlassAirlockCentralCommand = { ent-DoubleGlassAirlock } - .suffix = Центральное командование - .desc = { ent-DoubleGlassAirlock.desc } -ent-DoubleGlassAirlockEngineering = { ent-DoubleGlassAirlock } - .suffix = Инженерный - .desc = { ent-DoubleGlassAirlock.desc } -ent-DoubleGlassAirlockMaint = { ent-DoubleGlassAirlock } - .suffix = Сервисный - .desc = { ent-DoubleGlassAirlock.desc } -ent-DoubleGlassAirlockMedical = { ent-DoubleGlassAirlock } - .suffix = Медицинский - .desc = { ent-DoubleGlassAirlock.desc } -ent-DoubleGlassAirlockScience = { ent-DoubleGlassAirlock } - .suffix = Научный - .desc = { ent-DoubleGlassAirlock.desc } -ent-DoubleGlassAirlockSecurity = { ent-DoubleGlassAirlock } - .suffix = Служба безопасности - .desc = { ent-DoubleGlassAirlock.desc } -ent-DoubleGlassAirlockVirology = { ent-DoubleGlassAirlock } - .suffix = Вирусология - .desc = { ent-DoubleGlassAirlock.desc } -ent-DoubleGlassAirlockSalvage = { ent-DoubleGlassAirlock } - .suffix = Шахта(Утилизаторы) - .desc = { ent-DoubleGlassAirlock.desc } -ent-TripleGlassAirlockBasic = тройной базовый стеклянный шлюз - .desc = { ent-TripleGlassAirlock.desc } -ent-TripleGlassAirlockAtmospherics = { ent-TripleGlassAirlock } - .suffix = Атмосферика - .desc = { ent-TripleGlassAirlock.desc } -ent-TripleGlassAirlockCargo = { ent-TripleGlassAirlock } - .suffix = Снабжение - .desc = { ent-TripleGlassAirlock.desc } -ent-TripleGlassAirlockCentralCommand = { ent-TripleGlassAirlock } - .suffix = Центральное командование - .desc = { ent-TripleGlassAirlock.desc } -ent-TripleGlassAirlockChemistry = { ent-TripleGlassAirlock } - .suffix = Химия - .desc = { ent-TripleGlassAirlock.desc } -ent-TripleGlassAirlockCommand = { ent-TripleGlassAirlock } - .suffix = Командование - .desc = { ent-TripleGlassAirlock.desc } -ent-TripleGlassAirlockEngineering = { ent-TripleGlassAirlock } - .suffix = Инженерный - .desc = { ent-TripleGlassAirlock.desc } -ent-TripleGlassAirlockMaint = { ent-TripleGlassAirlock } - .suffix = Техническое обслуживание - .desc = { ent-TripleGlassAirlock.desc } -ent-TripleGlassAirlockMedical = { ent-TripleGlassAirlock } - .suffix = Медицинский - .desc = { ent-TripleGlassAirlock.desc } -ent-TripleGlassAirlockSalvage = { ent-TripleGlassAirlock } - .suffix = Шахта(Утилизаторы) - .desc = { ent-TripleGlassAirlock.desc } -ent-TripleGlassAirlockScience = { ent-TripleGlassAirlock } - .suffix = Научный - .desc = { ent-TripleGlassAirlock.desc } -ent-TripleGlassAirlockSecurity = { ent-TripleGlassAirlock } - .suffix = Служба безопасности - .desc = { ent-TripleGlassAirlock.desc } -ent-TripleGlassAirlockVirology = { ent-TripleGlassAirlockMedical } - .suffix = Вирусология - .desc = { ent-TripleGlassAirlockMedical.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/actions/types.ftl b/Resources/Locale/ru-RU/_prototypes/actions/types.ftl index 4f14a89b35..58b4e011a1 100644 --- a/Resources/Locale/ru-RU/_prototypes/actions/types.ftl +++ b/Resources/Locale/ru-RU/_prototypes/actions/types.ftl @@ -66,3 +66,7 @@ ent-FakeMindShieldToggleAction = [color=green]Переключить фейко .desc = Включить/выключить передачу фейкового импланта щита разума ent-ActionToggleParamedicSiren = Переключить сирену парамедика .desc = Включает или выключает сирену парамедика. +ent-ActionToggleRootable = action-name-toggle-rootable + .desc = action-description-toggle-rootable +ent-ActionChameleonController = Измените свою одежду + .desc = Быстро измените свою одежду diff --git a/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/engineering.ftl b/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/engineering.ftl index 7710595122..246b64b8a9 100644 --- a/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/engineering.ftl +++ b/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/engineering.ftl @@ -34,3 +34,5 @@ ent-CrateEngineeringSpaceHeater = ящик с космическим обогр .desc = Содержит космический обогреватель для климат-контроля. ent-CrateTechBoardRandom = ящик с избыточными платами .desc = Избыточные платы откуда-то. +ent-CrateAirGrenade = ящик с воздушными гранатами + .desc = Ящик, содержащий воздушные гранаты. diff --git a/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/food.ftl b/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/food.ftl index 999ecd7875..17bfd761a5 100644 --- a/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/food.ftl +++ b/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/food.ftl @@ -1,7 +1,5 @@ ent-CrateFoodPizza = экстренная доставка пиццы .desc = Внесите свой вклад в борьбу с голодом на станции, доставляя пиццу в отделы с недостаточным финансированием! В комплект входят 4 пиццы. -ent-CrateFoodPizzaLarge = катастрофическая доставка пиццы - .desc = Даже когда всё вокруг рушится, найдите утешение в том, что много пиццы решит все проблемы. В комплект входят 16 пицц. ent-CrateFoodMRE = ящик ИРП .desc = Армейские обеды, которыми можно накормить целый отдел. ent-CrateFoodCooking = ящик кухонных припасов @@ -12,8 +10,6 @@ ent-CrateFoodBarSupply = ящик барных принадлежностей .desc = Дополнительные барные припасы на случай, если клоуна оставили за барной стойкой без надзора. ent-CrateFoodSoftdrinks = ящик газировки .desc = Разнообразная газировка для небольшой вечеринки, без необходимости опустошать соответствующие торгоматы. В комплект входят 14 банок газировки. -ent-CrateFoodSoftdrinksLarge = оптовый ящик газировки - .desc = Большое количество банок газировки, извлечённых прямо из торгоматов Центкома, ведь вы просто не можете покинуть свой отдел. Включает 28 банок газировки. ent-CrateFoodGetMore = Ящик Getmore Bakemore .desc = Фирменные закуски Getmore и товары для выпечки для творческого шеф-повара, и все это без необходимости опустошать автоматы Getmore на вашей станции! ent-CrateFoodIceCream = доставка мороженого @@ -22,3 +18,7 @@ ent-CrateFoodSnowcone = доставка сноуконусов .desc = Морозильник, наполненный освежающими сноуконусами для трудолюбивой команды или даже для ленивой! Включает 16 сноуконусов. ent-CrateFoodHappyHonkBigBite = Доставка еды Happy Honk Big Bite .desc = Два полностью загруженных бургера Happy Honk Big Bite, в комплекте с сырным картофелем фри, бутылкой Space Cola, ломтиком яблочного пирога и игрушкой! +ent-CrateFoodPizzaLarge = катастрофическая доставка пиццы + .desc = Даже когда всё вокруг рушится, найдите утешение в том, что много пиццы решит все проблемы. В комплект входят 16 пицц. +ent-CrateFoodSoftdrinksLarge = оптовый ящик газировки + .desc = Большое количество банок газировки, извлечённых прямо из торгоматов Центкома, ведь вы просто не можете покинуть свой отдел. Включает 28 банок газировки. diff --git a/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/service.ftl b/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/service.ftl index 15cf8e48f5..6b47eaa19c 100644 --- a/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/service.ftl +++ b/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/service.ftl @@ -1,5 +1,7 @@ ent-CrateServiceJanitorialSupplies = ящик с уборочным инвентарём .desc = Победите копоть и грязь с Незаменимыми Припасами для Уборки от Nanotrasen! Содержит три ведра, таблички мокрого пола, и очищающие гранаты. Также содержит одну швабру, тряпку, щётку, чистящий спрей, и мусорный пакет. +ent-CrateServiceCleanerGrenades = оптовый ящик с чистящими гранатами + .desc = Содержит 2 коробки с чистящими гранатами для особенно запущенных случаев. ent-CrateServiceReplacementLights = ящик запасных лампочек .desc = Да воссияет над станцией Свет Эфира! Или хотя бы свет сорока двух лампочек-труб и двадцати одной обычной лампочки. ent-CrateServiceHolidayLights = ящик с праздничными огнями diff --git a/Resources/Locale/ru-RU/_prototypes/entities/effects/mobspawn.ftl b/Resources/Locale/ru-RU/_prototypes/entities/effects/mobspawn.ftl index 7f9954d8ce..f82ca6298c 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/effects/mobspawn.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/effects/mobspawn.ftl @@ -10,5 +10,7 @@ ent-MobSpawnCrabGold = спавнер моб рудокраб золото .desc = { ent-MobSpawnCrabQuartz.desc } ent-MobSpawnCrabUranium = спавнер моб рудокраб уран .desc = { ent-MobSpawnCrabQuartz.desc } +ent-MobSpawnCrabBananium = спавнер моб бананиумовый краб + .desc = { ent-MobSpawnCrabQuartz.desc } ent-EffectAnomalyFloraBulb = { "" } .desc = { "" } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/effects/wallspawn.ftl b/Resources/Locale/ru-RU/_prototypes/entities/effects/wallspawn.ftl index 6bd745c6b5..b7c87d4111 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/effects/wallspawn.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/effects/wallspawn.ftl @@ -2,6 +2,10 @@ ent-WallSpawnAsteroid = { "" } .desc = { "" } ent-WallSpawnAsteroidUraniumCrab = { ent-WallSpawnAsteroid } .desc = { ent-WallSpawnAsteroid.desc } +ent-WallSpawnAsteroidBananium = { ent-WallSpawnAsteroid } + .desc = { ent-WallSpawnAsteroid.desc } +ent-WallSpawnAsteroidBananiumCrab = { ent-WallSpawnAsteroid } + .desc = { ent-WallSpawnAsteroid.desc } ent-WallSpawnAsteroidUranium = { ent-WallSpawnAsteroid } .desc = { ent-WallSpawnAsteroid.desc } ent-WallSpawnAsteroidQuartzCrab = { ent-WallSpawnAsteroid } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/markers/spawners/bots.ftl b/Resources/Locale/ru-RU/_prototypes/entities/markers/spawners/bots.ftl index 59265d215b..ed4a62c606 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/markers/spawners/bots.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/markers/spawners/bots.ftl @@ -2,3 +2,9 @@ ent-SpawnMobMedibot = спавнер медибот .desc = { ent-MarkerBase.desc } ent-SpawnMobCleanBot = спавнер чистобот .desc = { ent-MarkerBase.desc } +ent-SpawnMobFireBot = спавнер пожарбот + .desc = { ent-MarkerBase.desc } +ent-SpawnMobSupplyBot = спавнер каргобот + .desc = { ent-MarkerBase.desc } +ent-SpawnMobHonkBot = спавнер хонкбот + .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/mobs/npcs/elemental.ftl b/Resources/Locale/ru-RU/_prototypes/entities/mobs/npcs/elemental.ftl index cc225276d1..6509fc1b82 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/mobs/npcs/elemental.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/mobs/npcs/elemental.ftl @@ -14,6 +14,9 @@ ent-MobCoalCrab = { ent-MobOreCrab } ent-MobUraniumCrab = { ent-MobOreCrab } .desc = Рудный краб, состоящий из урана. .suffix = Уран +ent-MobBananiumCrab = { ent-MobOreCrab } + .desc = Рудный краб, состоящий из бананиума. + .suffix = Бананиум ent-MobSilverCrab = { ent-MobOreCrab } .desc = Рудный краб, состоящий из серебра. .suffix = Серебро diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl index 9a81729551..19fb88241c 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl @@ -42,6 +42,9 @@ ent-ScramImplanter = { ent-Implanter } ent-DnaScramblerImplanter = { ent-Implanter } .desc = { ent-BaseImplantOnlyImplanter.desc } .suffix = Миксер ДНК +ent-ChameleonControllerImplanter = { ent-BaseImplantOnlyImplanterSyndi } + .suffix = контроллер хамелеона + .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } ent-MicroBombImplanter = { ent-Implanter } .desc = { ent-BaseImplantOnlyImplanter.desc } .suffix = Микробомба diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/subdermal_implants.ftl index e66b8014fe..894b6ab92c 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/subdermal_implants.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/subdermal_implants.ftl @@ -26,6 +26,8 @@ ent-ScramImplant = имплант Побег .desc = Этот имплант случайным образом телепортирует пользователя на большое расстояние при активации. ent-DnaScramblerImplant = имплант Миксер ДНК .desc = Этот имплант позволяет пользователю один раз произвольно изменить свою внешность и имя. +ent-ChameleonControllerImplant = имплант контроллера хамелеона + .desc = Этот имплант позволяет мгновенно изменить внешность всей одежды хамелеона на вас. ent-MicroBombImplant = имплант Микробомба .desc = Этот имплант детонирует при активации или после смерти пользователя. ent-MacroBombImplant = имплант Макробомба diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/specific/syndicate.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/specific/syndicate.ftl index fe8cdf1fc5..440f5e5865 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/specific/syndicate.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/specific/syndicate.ftl @@ -1,3 +1,5 @@ +ent-TelecrystalBase = { ent-BaseItem } + .desc = Оно, кажется, пульсирует подозрительно манящей энергией. ent-Telecrystal = телекристалл .desc = Похоже, он переливается подозрительно манящей энергией. .suffix = 100 ТК diff --git a/Resources/Locale/ru-RU/_prototypes/entities/structures/machines/multipart.ftl b/Resources/Locale/ru-RU/_prototypes/entities/structures/machines/multipart.ftl new file mode 100644 index 0000000000..b3f45041b1 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/entities/structures/machines/multipart.ftl @@ -0,0 +1,2 @@ +ent-MultipartMachineGhost = { "" } + .desc = { "" } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/structures/piping/atmospherics/alt_layers.ftl b/Resources/Locale/ru-RU/_prototypes/entities/structures/piping/atmospherics/alt_layers.ftl new file mode 100644 index 0000000000..5b21c7abef --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/entities/structures/piping/atmospherics/alt_layers.ftl @@ -0,0 +1,24 @@ +ent-GasPipeLayerAlt1 = { "" } + .desc = { "" } +ent-GasPipeLayerAlt2 = { "" } + .desc = { "" } +ent-GasPipeStraightAlt1 = { ent-GasPipeLayerAlt1 } + .desc = { ent-GasPipeLayerAlt1.desc } +ent-GasPipeStraightAlt2 = { ent-GasPipeLayerAlt2 } + .desc = { ent-GasPipeLayerAlt2.desc } +ent-GasPipeHalfAlt1 = { ent-GasPipeLayerAlt1 } + .desc = { ent-GasPipeLayerAlt1.desc } +ent-GasPipeHalfAlt2 = { ent-GasPipeLayerAlt2 } + .desc = { ent-GasPipeLayerAlt2.desc } +ent-GasPipeBendAlt1 = { ent-GasPipeLayerAlt1 } + .desc = { ent-GasPipeLayerAlt1.desc } +ent-GasPipeBendAlt2 = { ent-GasPipeLayerAlt2 } + .desc = { ent-GasPipeLayerAlt2.desc } +ent-GasPipeTJunctionAlt1 = { ent-GasPipeLayerAlt1 } + .desc = { ent-GasPipeLayerAlt1.desc } +ent-GasPipeTJunctionAlt2 = { ent-GasPipeLayerAlt2 } + .desc = { ent-GasPipeLayerAlt2.desc } +ent-GasPipeFourwayAlt1 = { ent-GasPipeLayerAlt1 } + .desc = { ent-GasPipeLayerAlt1.desc } +ent-GasPipeFourwayAlt2 = { ent-GasPipeLayerAlt2 } + .desc = { ent-GasPipeLayerAlt2.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/structures/piping/atmospherics/pipes.ftl b/Resources/Locale/ru-RU/_prototypes/entities/structures/piping/atmospherics/pipes.ftl index faa57d7f09..e31bf81e23 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/structures/piping/atmospherics/pipes.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/structures/piping/atmospherics/pipes.ftl @@ -1,7 +1,9 @@ -ent-GasPipeBase = труба - .desc = Содержит газ. +ent-GasPipeSansLayers = труба + .desc = содержит газ ent-VentCrawHolder = держатель вентиляционного когтя .desc = { "" } +ent-GasPipeBase = труба + .desc = Содержит газ. ent-GasPipeHalf = { ent-GasPipeBase } .suffix = Половинная .desc = { ent-GasPipeBase.desc } @@ -19,3 +21,5 @@ ent-GasPipeFourway = { ent-GasPipeBase } .desc = { ent-GasPipeBase.desc } ent-GasPipeBroken = сломанная труба .desc = Раньше в ней содержался газ. +ent-GasPipeManifold = коллектор газовых труб + .desc = Позволяет газовым трубам из разных конфигураций соединяться вместе. diff --git a/Resources/Locale/ru-RU/_prototypes/entities/structures/specific/anomaly/anomalies.ftl b/Resources/Locale/ru-RU/_prototypes/entities/structures/specific/anomaly/anomalies.ftl index a8408cb959..0a89cfff2b 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/structures/specific/anomaly/anomalies.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/structures/specific/anomaly/anomalies.ftl @@ -24,6 +24,9 @@ ent-AnomalyRockBase = { ent-BaseAnomaly } ent-AnomalyRockUranium = { ent-AnomalyRockBase } .suffix = Камень, Уран .desc = { ent-AnomalyRockBase.desc } +ent-AnomalyRockBananium = { ent-AnomalyRockBase } + .suffix = Камень, Бананиум + .desc = { ent-AnomalyRockBase.desc } ent-AnomalyRockQuartz = { ent-AnomalyRockBase } .suffix = Камень, Кварц .desc = { ent-AnomalyRockBase.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/structures/wallmounts/mirror.ftl b/Resources/Locale/ru-RU/_prototypes/entities/structures/wallmounts/mirror.ftl index 43f88f9fba..4b7ea0f328 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/structures/wallmounts/mirror.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/structures/wallmounts/mirror.ftl @@ -1,2 +1,5 @@ ent-Mirror = зеркало .desc = Свет мой, зеркальце, скажи, да всю правду доложи, я ль робастней всех на свете? +ent-MirrorModern = зеркало + .suffix = Квадратное + .desc = { ent-Mirror.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/structures/walls/asteroid.ftl b/Resources/Locale/ru-RU/_prototypes/entities/structures/walls/asteroid.ftl index 417587be3d..918a9853a6 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/structures/walls/asteroid.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/structures/walls/asteroid.ftl @@ -48,6 +48,9 @@ ent-AsteroidRockUraniumCrab = { ent-AsteroidRockUranium } ent-AsteroidRockBananium = { ent-AsteroidRock } .desc = Рудная жила, богатая бананиумом. .suffix = Бананиум +ent-AsteroidRockBananiumCrab = { ent-AsteroidRockBananium } + .suffix = Бананиумовый краб + .desc = { ent-AsteroidRockBananium.desc } ent-AsteroidRockSalt = { ent-AsteroidRock } .desc = Рудная жила, богатая солью. .suffix = Соль diff --git a/Resources/Locale/ru-RU/_prototypes/floor_trap.ftl b/Resources/Locale/ru-RU/_prototypes/floor_trap.ftl index f49cd2a867..e69de29bb2 100644 --- a/Resources/Locale/ru-RU/_prototypes/floor_trap.ftl +++ b/Resources/Locale/ru-RU/_prototypes/floor_trap.ftl @@ -1,23 +0,0 @@ -ent-CollideFloorTrap = { "" } - .desc = { "" } -ent-CollideFloorTrapSpawn = floor trap spawn - .desc = { ent-CollideFloorTrap.desc } -ent-FloorTrapExplosion = explosion floor trap - .desc = { ent-CollideFloorTrap.desc } -ent-FloorTrapEMP = EMP floor trap - .desc = { ent-CollideFloorTrap.desc } -ent-SpawnFloorTrapCarp = { ent-CollideFloorTrapSpawn } - .suffix = Carp - .desc = { ent-CollideFloorTrapSpawn.desc } -ent-SpawnFloorTrapBear = { ent-CollideFloorTrapSpawn } - .suffix = Bear - .desc = { ent-CollideFloorTrapSpawn.desc } -ent-SpawnFloorTrapKangaroo = { ent-CollideFloorTrapSpawn } - .suffix = Kangaroo - .desc = { ent-CollideFloorTrapSpawn.desc } -ent-SpawnFloorTrapXenoDrone = { ent-CollideFloorTrapSpawn } - .suffix = Xeno. Drone - .desc = { ent-CollideFloorTrapSpawn.desc } -ent-SpawnFloorTrapXenoBurrower = { ent-CollideFloorTrapSpawn } - .suffix = Xeno. Burrower - .desc = { ent-CollideFloorTrapSpawn.desc } diff --git a/Resources/Locale/ru-RU/_strings/_lib.ftl b/Resources/Locale/ru-RU/_strings/_lib.ftl index cc2204c811..0954f2041d 100644 --- a/Resources/Locale/ru-RU/_strings/_lib.ftl +++ b/Resources/Locale/ru-RU/_strings/_lib.ftl @@ -25,23 +25,22 @@ zzzz-fmt-power-watts = # Therefore 1 kilowatt-hour is equal to 3,600,000 joules (3.6MJ) zzzz-fmt-power-joules = { TOSTRING($divided, "F1") } { $places -> - [0] Дж - [1] кДж - [2] МДж - [3] ГДж - [4] ТДж - *[5] ??? - } - + [0] Дж + [1] кДж + [2] МДж + [3] ГДж + [4] ТДж + *[5] ??? + } # Used internally by the ENERGYWATTHOURS() function. -zzzz-fmt-energy-watt-hours = { TOSTRING($divided, "F1") } { $places -> - [0] Wh - [1] kWh - [2] MWh - [3] GWh - [4] TWh - *[5] ??? -} - +zzzz-fmt-energy-watt-hours = + { TOSTRING($divided, "F1") } { $places -> + [0] Вт + [1] кВт + [2] МВт + [3] ГВт + [4] ТВт + *[5] ??? + } # Used internally by the PLAYTIME() function. zzzz-fmt-playtime = { $hours }Ч { $minutes }М diff --git a/Resources/Locale/ru-RU/_strings/power/battery.ftl b/Resources/Locale/ru-RU/_strings/power/battery.ftl index 21ba96c226..e6175e6385 100644 --- a/Resources/Locale/ru-RU/_strings/power/battery.ftl +++ b/Resources/Locale/ru-RU/_strings/power/battery.ftl @@ -1,4 +1,4 @@ -## Strings for the battery (SMES/substation) menu +## Strings for the battery (SMES/substation) menu battery-menu-footer-left = Danger: high voltage battery-menu-footer-right = 7.2 REV 6