From 5d51a7c95a3f5b026660d58425832e5f40da2a37 Mon Sep 17 00:00:00 2001 From: Vonsant Date: Sun, 30 Jun 2024 02:35:24 +0300 Subject: [PATCH 01/34] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE?= =?UTF-8?q?=D0=B4=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ss14-ru/prototypes/actions/polymorph.ftl | 4 - .../ss14-ru/prototypes/actions/types.ftl | 2 - .../ss14-ru/prototypes/body/organs/moth.ftl | 2 +- .../prototypes/body/parts/arachnid.ftl | 20 +- .../ss14-ru/prototypes/body/parts/diona.ftl | 20 +- .../prototypes/body/parts/gingerbread.ftl | 22 +- .../ss14-ru/prototypes/body/parts/human.ftl | 20 +- .../ss14-ru/prototypes/body/parts/moth.ftl | 31 +- .../prototypes/body/parts/reptilian.ftl | 20 +- .../ss14-ru/prototypes/body/parts/slime.ftl | 22 +- .../catalog/fills/backpacks/duffelbag.ftl | 7 + .../catalog/fills/boxes/ammunition.ftl | 14 + .../catalog/fills/boxes/emergency.ftl | 5 +- .../catalog/fills/boxes/general.ftl | 16 +- .../catalog/fills/boxes/medical.ftl | 2 + .../catalog/fills/boxes/syndicate.ftl | 7 +- .../prototypes/catalog/fills/crates/cargo.ftl | 2 +- .../catalog/fills/crates/engineering.ftl | 8 +- .../prototypes/catalog/fills/crates/fun.ftl | 3 + .../catalog/fills/crates/service.ftl | 4 +- .../catalog/fills/crates/vending.ftl | 8 +- .../prototypes/catalog/fills/items/belt.ftl | 3 - .../catalog/fills/items/briefcases.ftl | 10 +- .../prototypes/catalog/fills/items/misc.ftl | 11 +- .../catalog/fills/lockers/biohazard.ftl | 2 +- .../catalog/fills/lockers/medical.ftl | 3 + .../prototypes/catalog/fills/lockers/misc.ftl | 3 - .../catalog/fills/lockers/security.ftl | 5 +- .../catalog/fills/lockers/service.ftl | 2 +- .../catalog/fills/lockers/suit_storage.ftl | 8 +- .../objects/specific/command/safe.ftl | 5 +- .../entities/clothing/back/backpacks.ftl | 12 +- .../entities/clothing/back/duffel.ftl | 8 +- .../entities/clothing/back/satchel.ftl | 8 +- .../entities/clothing/base_clothing.ftl | 2 - .../entities/clothing/belt/belts.ftl | 2 +- .../entities/clothing/ears/headsets.ftl | 12 +- .../entities/clothing/ears/headsets_alt.ftl | 4 +- .../clothing/eyes/base_clothingeyes.ftl | 5 - .../prototypes/entities/clothing/eyes/hud.ftl | 18 +- .../entities/clothing/eyes/misc.ftl | 7 +- .../clothing/hands/base_clothinghands.ftl | 2 - .../entities/clothing/hands/colored.ftl | 8 +- .../entities/clothing/head/bandanas.ftl | 24 +- .../clothing/head/hardsuit-helmets.ftl | 6 +- .../entities/clothing/head/hats.ftl | 10 +- .../entities/clothing/head/helmets.ftl | 2 + .../entities/clothing/head/hoods.ftl | 10 +- .../entities/clothing/head/misc.ftl | 8 +- .../entities/clothing/head/soft.ftl | 44 +- .../entities/clothing/masks/bandanas.ftl | 4 +- .../entities/clothing/masks/specific.ftl | 2 - .../entities/clothing/neck/cloaks.ftl | 6 +- .../entities/clothing/neck/mantles.ftl | 16 +- .../entities/clothing/neck/medals.ftl | 20 +- .../entities/clothing/neck/misc.ftl | 2 + .../entities/clothing/neck/pins.ftl | 4 - .../entities/clothing/outerclothing/armor.ftl | 2 + .../outerclothing/base_clothingouter.ftl | 5 - .../entities/clothing/outerclothing/bio.ftl | 2 +- .../entities/clothing/outerclothing/coats.ftl | 24 +- .../clothing/outerclothing/hardsuits.ftl | 8 +- .../entities/clothing/outerclothing/misc.ftl | 2 - .../clothing/outerclothing/softsuits.ftl | 2 +- .../entities/clothing/outerclothing/suits.ftl | 5 - .../clothing/outerclothing/wintercoats.ftl | 36 +- .../clothing/shoes/base_clothingshoes.ftl | 3 - .../entities/clothing/shoes/boots.ftl | 2 +- .../entities/clothing/shoes/color.ftl | 8 +- .../entities/clothing/shoes/misc.ftl | 2 - .../entities/clothing/uniforms/jumpskirts.ftl | 68 +- .../entities/clothing/uniforms/jumpsuits.ftl | 96 ++- .../clothing/uniforms/random_suit.ftl | 2 +- .../prototypes/entities/effects/rcd.ftl | 22 +- .../entities/markers/spawners/corpses.ftl | 4 +- .../entities/markers/spawners/ghost_roles.ftl | 20 +- .../entities/markers/spawners/jobs.ftl | 16 +- .../entities/markers/spawners/mobs.ftl | 4 +- .../markers/spawners/random/crates.ftl | 4 - .../entities/mobs/corpses/corpses.ftl | 4 +- .../mobs/cyborgs/base_borg_chassis.ftl | 2 - .../prototypes/entities/mobs/npcs/animals.ftl | 16 - .../entities/mobs/npcs/argocyte.ftl | 2 +- .../entities/mobs/npcs/elemental.ftl | 2 +- .../prototypes/entities/mobs/npcs/human.ftl | 2 +- .../entities/mobs/npcs/miscellaneous.ftl | 2 - .../prototypes/entities/mobs/npcs/silicon.ftl | 2 - .../entities/mobs/npcs/simplemob.ftl | 14 +- .../prototypes/entities/mobs/npcs/slimes.ftl | 4 - .../entities/mobs/npcs/spacetick.ftl | 2 +- .../prototypes/entities/mobs/npcs/xeno.ftl | 16 +- .../entities/mobs/player/dragon.ftl | 5 - .../entities/mobs/player/humanoid.ftl | 32 - .../entities/mobs/player/narsie.ftl | 2 +- .../entities/mobs/player/ratvar.ftl | 2 +- .../entities/mobs/player/reptilian.ftl | 3 +- .../entities/mobs/player/terminator.ftl | 2 +- .../prototypes/entities/mobs/player/vox.ftl | 2 +- .../entities/mobs/species/skeleton.ftl | 2 +- .../consumable/drinks/drinks-cartons.ftl | 5 - .../objects/consumable/drinks/drinks.ftl | 51 -- .../consumable/drinks/drinks_bottles.ftl | 7 +- .../objects/consumable/drinks/drinks_cans.ftl | 2 - .../objects/consumable/drinks/drinks_cups.ftl | 4 +- .../consumable/drinks/drinks_special.ftl | 6 - .../consumable/drinks/trash_drinks.ftl | 18 +- .../objects/consumable/food/baked/bread.ftl | 2 +- .../objects/consumable/food/baked/pizza.ftl | 2 +- .../entities/objects/consumable/food/egg.ftl | 4 +- .../objects/consumable/food/meals.ftl | 2 +- .../objects/consumable/food/produce.ftl | 6 +- .../smokeables/cigarettes/joints.ftl | 6 - .../consumable/smokeables/pipes/pipe.ftl | 3 - .../entities/objects/decoration/present.ftl | 5 - .../devices/circuitboards/computer.ftl | 4 - .../circuitboards/machine/production.ftl | 20 +- .../entities/objects/devices/door_remote.ftl | 4 +- .../objects/devices/encryption_keys.ftl | 6 +- .../entities/objects/devices/flatpack.ftl | 6 - .../entities/objects/devices/pda.ftl | 11 +- .../entities/objects/devices/radio.ftl | 2 - .../objects/devices/station_beacon.ftl | 18 +- .../reinforcement_teleporter.ftl | 10 +- .../entities/objects/fun/figurines.ftl | 10 +- .../entities/objects/fun/immovable_rod.ftl | 26 +- .../fun/instruments/instruments_wind.ftl | 2 +- .../entities/objects/fun/snap_pops.ftl | 2 +- .../entities/objects/fun/whistles.ftl | 2 - .../entities/objects/magic/books.ftl | 6 - .../objects/materials/crystal_shard.ftl | 2 - .../entities/objects/materials/materials.ftl | 8 - .../entities/objects/misc/bedsheets.ftl | 6 +- .../entities/objects/misc/books.ftl | 11 +- .../entities/objects/misc/briefcases.ftl | 8 +- .../objects/misc/identification_cards.ftl | 19 +- .../entities/objects/misc/implanters.ftl | 2 +- .../entities/objects/misc/kudzu.ftl | 2 +- .../entities/objects/misc/paper.ftl | 14 + .../entities/objects/misc/rubber_stamp.ftl | 7 +- .../objects/misc/subdermal_implants.ftl | 2 +- .../entities/objects/misc/tiles.ftl | 16 +- .../entities/objects/misc/utensils.ftl | 2 - .../entities/objects/shields/shields.ftl | 2 +- .../objects/specific/cargo/cargo_pallet.ftl | 6 +- .../objects/specific/hydroponics/leaves.ftl | 6 - .../objects/specific/hydroponics/seeds.ftl | 6 - .../objects/specific/janitorial/janitor.ftl | 9 + .../objects/specific/medical/disease.ftl | 2 - .../medical/handheld_crew_monitor.ftl | 10 + .../objects/specific/medical/healing.ftl | 4 +- .../objects/specific/medical/hypospray.ftl | 8 +- .../objects/specific/medical/morgue.ftl | 4 +- .../entities/objects/specific/syndicate.ftl | 3 - .../objects/tools/access_configurator.ftl | 3 - .../entities/objects/tools/tools.ftl | 14 +- .../guns/ammunition/boxes/caseless_rifle.ftl | 4 + .../guns/ammunition/boxes/light_rifle.ftl | 2 + .../weapons/guns/ammunition/boxes/magnum.ftl | 2 + .../weapons/guns/ammunition/boxes/pistol.ftl | 2 + .../weapons/guns/ammunition/boxes/rifle.ftl | 4 + .../weapons/guns/ammunition/boxes/shotgun.ftl | 2 - .../ammunition/cartridges/caseless_rifle.ftl | 2 + .../ammunition/cartridges/light_rifle.ftl | 2 + .../guns/ammunition/cartridges/magnum.ftl | 2 + .../guns/ammunition/cartridges/pistol.ftl | 2 + .../guns/ammunition/cartridges/rifle.ftl | 2 + .../ammunition/magazines/caseless_rifle.ftl | 6 + .../guns/ammunition/magazines/light_rifle.ftl | 7 +- .../guns/ammunition/magazines/magnum.ftl | 10 +- .../guns/ammunition/magazines/pistol.ftl | 17 +- .../guns/ammunition/magazines/rifle.ftl | 7 +- .../guns/ammunition/magazines/shotgun.ftl | 3 - .../ammunition/projectiles/caseless_rifle.ftl | 2 + .../ammunition/projectiles/light_rifle.ftl | 2 + .../guns/ammunition/projectiles/magnum.ftl | 2 + .../guns/ammunition/projectiles/pistol.ftl | 2 + .../guns/ammunition/projectiles/rifle.ftl | 2 + .../guns/ammunition/speedloaders/magnum.ftl | 6 +- .../guns/ammunition/speedloaders/pistol.ftl | 2 + .../weapons/guns/battery/battery_guns.ftl | 4 +- .../objects/weapons/guns/pistols/pistols.ftl | 8 +- .../weapons/guns/projectiles/magic.ftl | 2 - .../weapons/guns/projectiles/meteors.ftl | 18 +- .../weapons/guns/projectiles/projectiles.ftl | 8 +- .../objects/weapons/guns/rifles/rifles.ftl | 3 + .../weapons/guns/shotguns/shotguns.ftl | 2 +- .../objects/weapons/guns/smgs/smgs.ftl | 6 + .../objects/weapons/melee/baseball_bat.ftl | 2 - .../objects/weapons/melee/e_sword.ftl | 4 +- .../entities/objects/weapons/melee/knife.ftl | 2 - .../entities/objects/weapons/melee/sword.ftl | 2 +- .../objects/weapons/melee/white_cane.ftl | 2 +- .../objects/weapons/throwable/grenades.ftl | 2 - .../prototypes/entities/stations/base.ftl | 4 +- .../entities/stations/nanotrasen.ftl | 2 +- .../entities/stations/syndicate.ftl | 4 +- .../prototypes/entities/stations/test.ftl | 2 +- .../entities/structures/base_structure.ftl | 2 - .../structures/decoration/banners.ftl | 10 +- .../structures/decoration/bonfire.ftl | 2 +- .../dispensers/base_structuredispensers.ftl | 4 +- .../entities/structures/dispensers/soda.ftl | 6 +- .../structures/doors/airlocks/access.ftl | 163 +++-- .../structures/doors/airlocks/airlocks.ftl | 10 +- .../doors/airlocks/base_structureairlocks.ftl | 4 - .../structures/doors/airlocks/external.ftl | 2 +- .../structures/doors/firelocks/firelock.ftl | 2 +- .../doors/shutter/blast_door_autolink.ftl | 12 - .../structures/doors/windoors/windoor.ftl | 21 +- .../structures/furniture/potted_plants.ftl | 6 +- .../structures/lighting/base_lighting.ftl | 4 +- .../structures/machines/artifact_analyzer.ftl | 2 + .../machines/base_structuremachines.ftl | 2 - .../structures/machines/chem_master.ftl | 2 +- .../machines/computers/computers.ftl | 2 - .../entities/structures/machines/lathe.ftl | 10 +- .../structures/machines/microwave.ftl | 2 - .../structures/machines/reagent_grinder.ftl | 2 - .../machines/surveillance_camera_routers.ftl | 2 +- .../structures/machines/telecomms.ftl | 26 +- .../structures/machines/vending_machines.ftl | 4 +- .../entities/structures/plastic_flaps.ftl | 6 +- .../entities/structures/shuttles/cannons.ftl | 7 +- .../structures/specific/anomaly/cores.ftl | 2 +- .../structures/storage/closets/closets.ftl | 2 - .../storage/closets/lockers/lockers.ftl | 6 +- .../structures/storage/closets/wardrobe.ftl | 4 +- .../structures/storage/crates/crates.ftl | 4 +- .../structures/storage/filing_cabinets.ftl | 10 +- .../entities/structures/storage/glass_box.ftl | 18 +- .../storage/tanks/base_structuretanks.ftl | 2 - .../structures/wallmounts/intercom.ftl | 2 +- .../structures/wallmounts/shotgun_cabinet.ftl | 2 +- .../structures/wallmounts/signs/posters.ftl | 4 +- .../structures/wallmounts/signs/signs.ftl | 8 +- .../wallmounts/surveillance_camera.ftl | 2 +- .../entities/structures/wallmounts/switch.ftl | 3 - .../entities/structures/walls/walls.ftl | 6 +- .../entities/structures/windows/mining.ftl | 2 +- .../entities/structures/windows/plasma.ftl | 2 +- .../entities/structures/windows/rplasma.ftl | 2 +- .../entities/structures/windows/ruranium.ftl | 2 +- .../entities/structures/windows/shuttle.ftl | 2 +- .../entities/structures/windows/uranium.ftl | 2 +- .../entities/structures/windows/window.ftl | 4 - .../entities/tiles/shadow_basalt.ftl | 2 +- .../prototypes/gamerules/cargo_gifts.ftl | 42 +- .../ss14-ru/prototypes/gamerules/events.ftl | 64 +- .../ss14-ru/prototypes/gamerules/midround.ftl | 4 + .../prototypes/gamerules/roundstart.ftl | 16 +- .../prototypes/gamerules/variation.ftl | 2 - .../prototypes/magic/projectile_spells.ftl | 4 +- .../fills/backpacks/towngear/backpack.ftl | 6 + .../nuclear14/catalog/fills/crates.ftl | 6 + .../nuclear14/catalog/fills/storage_fills.ftl | 2 + .../entities/clothing/belt/belts.ftl | 6 +- .../nuclear14/entities/clothing/head/hats.ftl | 8 + .../entities/clothing/neck/cloaks.ftl | 2 + .../clothing/outerclothing/falloutarmor.ftl | 12 + .../entities/markers/spawners/jobs.ftl | 82 +-- .../consumable/drinks/drinks_bottles.ftl | 30 + .../consumable/flora/wastelandflora.ftl | 2 + .../consumable/smokeables/cigarette.ftl | 23 + .../objects/consumable/smokeables/packs.ftl | 15 + .../consumable/smokeables/smokeables.ftl | 8 + .../entities/objects/materials/containers.ftl | 5 + .../entities/objects/materials/materials.ftl | 6 + .../objects/misc/craftingmaterials.ftl | 10 + .../nuclear14/entities/objects/misc/junk.ftl | 6 + .../objects/specific/medical/chemicals.ftl | 14 + .../objects/specific/medical/equipment.ftl | 3 + .../weapons/guns/ammunition/boxes/45-70.ftl | 4 + .../weapons/guns/ammunition/boxes/50.ftl | 4 + .../guns/ammunition/cartridges/45-70.ftl | 2 + .../guns/ammunition/projectiles/45-70.ftl | 2 + .../guns/ammunition/speedloaders/10mm.ftl | 4 + .../guns/ammunition/speedloaders/44.ftl | 4 + .../guns/ammunition/speedloaders/45-70.ftl | 4 + .../guns/ammunition/speedloaders/9mm.ftl | 4 + .../weapons/guns/revolvers/revolvers.ftl | 6 +- .../objects/weapons/guns/smgs/smgs.ftl | 2 +- .../objects/weapons/guns/snipers/snipers.ftl | 6 +- .../objects/weapons/melee/baton-club.ftl | 2 + .../structures/furniture/street_furniture.ftl | 4 +- .../structures/machines/vending_machines.ftl | 15 + .../entities/structures/misc/ladders.ftl | 55 +- .../entities/structures/storage/closets.ftl | 2 +- .../prototypes/objectives/base_objectives.ftl | 2 - .../ss14-ru/prototypes/objectives/ninja.ftl | 4 +- .../prototypes/objectives/terminator.ftl | 1 - .../ss14-ru/prototypes/objectives/thief.ftl | 2 +- .../ss14-ru/prototypes/objectives/traitor.ftl | 2 +- .../Nuclear14/Special/reagent-effects.ftl | 2 +- .../Locale/ru-RU/Nuclear14/job-names.ftl | 6 +- .../ru-RU/Nuclear14/job-supervisors.ftl | 2 +- Resources/Locale/ru-RU/Nuclear14/reagents.ftl | 3 +- .../administration/commands/panicbunker.ftl | 8 +- .../commands/stealthmin-command.ftl | 3 +- .../ru-RU/administration/ui/admin-notes.ftl | 2 +- Resources/Locale/ru-RU/cargo/bounties.ftl | 3 +- .../ru-RU/cargo/cargo-console-component.ftl | 2 +- .../components/hypospray-component.ftl | 3 +- .../components/injector-component.ftl | 3 +- .../Locale/ru-RU/corvax/paper/doc-printer.ftl | 622 +++++++++--------- .../ru-RU/deltav/escape-menu/options-menu.ftl | 2 +- Resources/Locale/ru-RU/disease/miasma.ftl | 2 +- .../game-presets/preset-revolutionary.ftl | 11 +- .../ru-RU/guidebook/chemistry/effects.ftl | 6 +- Resources/Locale/ru-RU/implant/implant.ftl | 2 +- .../components/kitchen-spike-component.ftl | 3 +- .../Locale/ru-RU/loadouts/categories.ftl | 1 + .../oldNuclear14/Special/reagent-effects.ftl | 2 +- .../ru-RU/oldNuclear14/Special/special.ftl | 2 +- .../Locale/ru-RU/paper/book-authorbooks.ftl | 2 +- Resources/Locale/ru-RU/paper/book-salvage.ftl | 2 +- Resources/Locale/ru-RU/pda/pda-component.ftl | 2 +- .../ui/humanoid-profile-editor.ftl | 7 +- .../Locale/ru-RU/reagents/meta/narcotics.ftl | 15 +- .../ru-RU/reagents/meta/physical-desc.ftl | 2 +- .../catalog/fills/backpacks/duffelbag.ftl | 7 + .../catalog/fills/boxes/ammunition.ftl | 14 + .../catalog/fills/boxes/emergency.ftl | 3 + .../catalog/fills/boxes/general.ftl | 2 + .../catalog/fills/boxes/medical.ftl | 2 + .../catalog/fills/boxes/syndicate.ftl | 3 + .../prototypes/catalog/fills/crates/fun.ftl | 3 + .../catalog/fills/crates/service.ftl | 2 + .../prototypes/catalog/fills/items/misc.ftl | 8 +- .../catalog/fills/lockers/medical.ftl | 3 + .../catalog/fills/lockers/security.ftl | 3 + .../catalog/fills/lockers/suit_storage.ftl | 6 + .../fills/backpacks/startergear/backpack.ftl | 4 + .../fills/backpacks/startergear/duffelbag.ftl | 4 + .../fills/backpacks/startergear/satchel.ftl | 4 + .../objects/specific/command/safe.ftl | 4 +- .../clothing/eyes/base_clothingeyes.ftl | 2 +- .../prototypes/entities/clothing/eyes/hud.ftl | 8 +- .../entities/clothing/eyes/misc.ftl | 4 +- .../entities/clothing/hands/colored.ftl | 2 + .../entities/clothing/head/helmets.ftl | 2 + .../entities/clothing/head/misc.ftl | 4 + .../entities/clothing/neck/medals.ftl | 2 + .../entities/clothing/neck/misc.ftl | 2 + .../entities/clothing/outerclothing/armor.ftl | 2 + .../clothing/outerclothing/wintercoats.ftl | 20 + .../entities/clothing/uniforms/jumpskirts.ftl | 34 + .../entities/clothing/uniforms/jumpsuits.ftl | 34 + .../clothing/uniforms/random_suit.ftl | 2 + .../prototypes/entities/effects/rcd.ftl | 2 + .../entities/markers/spawners/ghost_roles.ftl | 4 + .../entities/markers/spawners/jobs.ftl | 8 + .../entities/markers/spawners/mobs.ftl | 2 + .../prototypes/entities/mobs/npcs/xeno.ftl | 14 + .../entities/mobs/player/terminator.ftl | 2 +- .../consumable/drinks/trash_drinks.ftl | 10 +- .../objects/consumable/food/produce.ftl | 4 + .../circuitboards/machine/production.ftl | 12 + .../entities/objects/devices/door_remote.ftl | 2 + .../reinforcement_teleporter.ftl | 15 +- .../entities/objects/misc/books.ftl | 4 + .../entities/objects/misc/briefcases.ftl | 3 + .../entities/objects/misc/paper.ftl | 14 + .../objects/specific/janitorial/janitor.ftl | 9 + .../medical/handheld_crew_monitor.ftl | 10 + .../objects/specific/medical/morgue.ftl | 5 + .../guns/ammunition/boxes/caseless_rifle.ftl | 4 + .../guns/ammunition/boxes/light_rifle.ftl | 2 + .../weapons/guns/ammunition/boxes/magnum.ftl | 2 + .../weapons/guns/ammunition/boxes/pistol.ftl | 2 + .../weapons/guns/ammunition/boxes/rifle.ftl | 4 + .../ammunition/cartridges/caseless_rifle.ftl | 2 + .../ammunition/cartridges/light_rifle.ftl | 2 + .../guns/ammunition/cartridges/magnum.ftl | 2 + .../guns/ammunition/cartridges/pistol.ftl | 2 + .../guns/ammunition/cartridges/rifle.ftl | 2 + .../ammunition/magazines/caseless_rifle.ftl | 6 + .../guns/ammunition/magazines/light_rifle.ftl | 2 + .../guns/ammunition/magazines/magnum.ftl | 4 + .../guns/ammunition/magazines/pistol.ftl | 4 + .../guns/ammunition/magazines/rifle.ftl | 2 + .../ammunition/projectiles/caseless_rifle.ftl | 2 + .../ammunition/projectiles/light_rifle.ftl | 2 + .../guns/ammunition/projectiles/magnum.ftl | 2 + .../guns/ammunition/projectiles/pistol.ftl | 2 + .../guns/ammunition/projectiles/rifle.ftl | 2 + .../guns/ammunition/speedloaders/magnum.ftl | 2 + .../guns/ammunition/speedloaders/pistol.ftl | 2 + .../objects/weapons/guns/pistols/pistols.ftl | 8 +- .../weapons/guns/projectiles/projectiles.ftl | 8 +- .../objects/weapons/guns/rifles/rifles.ftl | 3 + .../objects/weapons/guns/smgs/smgs.ftl | 6 + .../prototypes/entities/stations/base.ftl | 2 + .../entities/structures/dispensers/soda.ftl | 3 + .../structures/doors/airlocks/access.ftl | 9 + .../structures/doors/airlocks/airlocks.ftl | 2 + .../structures/machines/artifact_analyzer.ftl | 2 + .../structures/machines/chem_master.ftl | 2 + .../entities/structures/storage/glass_box.ftl | 3 + .../ss14-ru/prototypes/gamerules/events.ftl | 10 + .../ss14-ru/prototypes/gamerules/midround.ftl | 4 + .../prototypes/gamerules/roundstart.ftl | 6 + .../fills/backpacks/towngear/backpack.ftl | 6 + .../nuclear14/catalog/fills/crates.ftl | 6 + .../nuclear14/catalog/fills/storage_fills.ftl | 2 + .../entities/clothing/belt/belts.ftl | 2 + .../nuclear14/entities/clothing/head/hats.ftl | 8 + .../entities/clothing/neck/cloaks.ftl | 2 + .../clothing/outerclothing/falloutarmor.ftl | 12 + .../clothing/outerclothing/falloutcoats.ftl | 4 +- .../clothing/shoes/falloutshoesbasic.ftl | 2 +- .../entities/markers/spawners/jobs.ftl | 2 + .../entities/mobs/npcs/wavedefencemobs.ftl | 60 +- .../nuclear14/entities/mobs/player/ghouls.ftl | 4 +- .../consumable/drinks/drinks_bottles.ftl | 30 + .../consumable/flora/wastelandflora.ftl | 4 +- .../entities/objects/consumable/food/meat.ftl | 2 +- .../consumable/smokeables/cigarette.ftl | 23 + .../objects/consumable/smokeables/packs.ftl | 15 + .../consumable/smokeables/smokeables.ftl | 8 + .../entities/objects/materials/containers.ftl | 5 + .../entities/objects/materials/materials.ftl | 6 + .../objects/misc/craftingmaterials.ftl | 10 + .../nuclear14/entities/objects/misc/junk.ftl | 6 + .../objects/specific/medical/chemicals.ftl | 16 +- .../objects/specific/medical/equipment.ftl | 3 + .../weapons/guns/ammunition/boxes/45-70.ftl | 4 + .../weapons/guns/ammunition/boxes/50.ftl | 4 + .../guns/ammunition/cartridges/45-70.ftl | 2 + .../guns/ammunition/projectiles/45-70.ftl | 2 + .../guns/ammunition/speedloaders/10mm.ftl | 4 + .../guns/ammunition/speedloaders/44.ftl | 4 + .../guns/ammunition/speedloaders/45-70.ftl | 4 + .../guns/ammunition/speedloaders/9mm.ftl | 4 + .../weapons/guns/revolvers/revolvers.ftl | 4 + .../objects/weapons/guns/smgs/smgs.ftl | 2 + .../objects/weapons/guns/snipers/snipers.ftl | 4 + .../objects/weapons/melee/baton-club.ftl | 2 + .../entities/structures/decoration/flags.ftl | 2 +- .../structures/decoration/junk_piles.ftl | 48 +- .../entities/structures/doors/doors.ftl | 2 +- .../structures/furniture/barricades.ftl | 2 +- .../entities/structures/furniture/chairs.ftl | 2 +- .../structures/furniture/filing_cabinets.ftl | 4 +- .../entities/structures/furniture/shelf.ftl | 2 +- .../structures/furniture/street_furniture.ftl | 29 +- .../entities/structures/furniture/table.ftl | 2 +- .../structures/machines/machinepanels.ftl | 2 +- .../structures/machines/vending_machines.ftl | 16 +- .../entities/structures/misc/ladders.ftl | 27 + .../entities/structures/power/generators.ftl | 2 +- .../entities/structures/storage/barrels.ftl | 2 +- .../entities/structures/storage/closets.ftl | 24 +- .../entities/structures/storage/crates.ftl | 2 +- .../structures/wallmount/base_lighting.ftl | 2 +- .../entities/structures/wallmount/posters.ftl | 2 +- .../prototypes/objectives/terminator.ftl | 2 +- .../tools/components/welder-component.ftl | 3 +- Tools/ss14_ru/keyfinder.py | 28 +- 458 files changed, 2355 insertions(+), 1790 deletions(-) create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/catalog/fills/backpacks/towngear/backpack.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/catalog/fills/crates.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/cigarette.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/packs.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/smokeables.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/materials/containers.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/equipment.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/45-70.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/50.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/projectiles/45-70.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/10mm.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/44.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/45-70.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/9mm.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/melee/baton-club.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/backpack.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/duffelbag.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/satchel.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/backpacks/towngear/backpack.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/crates.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/cigarette.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/packs.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/smokeables.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/containers.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/equipment.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/45-70.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/50.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/projectiles/45-70.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/10mm.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/44.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/45-70.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/9mm.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/melee/baton-club.ftl diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/actions/polymorph.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/actions/polymorph.ftl index 3f2931f4a31..93ca4b34eb8 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/actions/polymorph.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/actions/polymorph.ftl @@ -2,7 +2,3 @@ ent-ActionRevertPolymorph = Revert .desc = Revert back into your original form. ent-ActionPolymorph = { "" } .desc = { "" } -ent-ActionPolymorphWizardSpider = Spider Polymorph - .desc = Polymorphs you into a Spider. -ent-ActionPolymorphWizardRod = Rod Form - .desc = CLANG! 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 fafd87f7e85..806b05ff349 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl @@ -22,8 +22,6 @@ ent-ActionActivateScramImplant = SCRAM! .desc = Randomly teleports you within a large distance. ent-ActionActivateDnaScramblerImplant = Scramble DNA .desc = Randomly changes your name and appearance. -ent-ActionMorphGeras = Morph into Geras - .desc = Morphs you into a Geras - a miniature version of you which allows you to move fast, at the cost of your inventory. ent-ActionToggleSuitPiece = Toggle Suit Piece .desc = Remember to equip the important pieces of your suit before going into action. ent-ActionCombatModeToggle = [color=red]Combat Mode[/color] diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/organs/moth.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/organs/moth.ftl index 2c32e382d62..3fba62ebcd8 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/body/organs/moth.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/organs/moth.ftl @@ -1,2 +1,2 @@ ent-OrganMothStomach = { ent-OrganAnimalStomach } - .desc = { ent-OrganAnimalStomach.desc } + .desc = { ent-OrganAnimalStomach.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/arachnid.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/arachnid.ftl index 23928dc4dca..acf9788f892 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/arachnid.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/arachnid.ftl @@ -1,22 +1,22 @@ ent-PartArachnid = arachnid body part .desc = { ent-BasePart.desc } ent-TorsoArachnid = arachnid torso - .desc = { ent-PartArachnid.desc } + .desc = { ent-BaseTorso.desc } ent-HeadArachnid = arachnid head - .desc = { ent-PartArachnid.desc } + .desc = { ent-BaseHead.desc } ent-LeftArmArachnid = left arachnid arm - .desc = { ent-PartArachnid.desc } + .desc = { ent-BaseLeftArm.desc } ent-RightArmArachnid = right arachnid arm - .desc = { ent-PartArachnid.desc } + .desc = { ent-BaseRightArm.desc } ent-LeftHandArachnid = left arachnid hand - .desc = { ent-PartArachnid.desc } + .desc = { ent-BaseLeftHand.desc } ent-RightHandArachnid = right arachnid hand - .desc = { ent-PartArachnid.desc } + .desc = { ent-BaseRightHand.desc } ent-LeftLegArachnid = left arachnid leg - .desc = { ent-PartArachnid.desc } + .desc = { ent-BaseLeftLeg.desc } ent-RightLegArachnid = right arachnid leg - .desc = { ent-PartArachnid.desc } + .desc = { ent-BaseRightLeg.desc } ent-LeftFootArachnid = left arachnid foot - .desc = { ent-PartArachnid.desc } + .desc = { ent-BaseLeftFoot.desc } ent-RightFootArachnid = right arachnid foot - .desc = { ent-PartArachnid.desc } + .desc = { ent-BaseRightFoot.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/diona.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/diona.ftl index de0cc03a852..1d191488436 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/diona.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/diona.ftl @@ -1,22 +1,22 @@ ent-PartDiona = diona body part .desc = { ent-BasePart.desc } ent-TorsoDiona = diona torso - .desc = { ent-PartDiona.desc } + .desc = { ent-BaseTorso.desc } ent-HeadDiona = diona head - .desc = { ent-PartDiona.desc } + .desc = { ent-BaseHead.desc } ent-LeftArmDiona = left diona arm - .desc = { ent-PartDiona.desc } + .desc = { ent-BaseLeftArm.desc } ent-RightArmDiona = right diona arm - .desc = { ent-PartDiona.desc } + .desc = { ent-BaseRightArm.desc } ent-LeftHandDiona = left diona hand - .desc = { ent-PartDiona.desc } + .desc = { ent-BaseLeftHand.desc } ent-RightHandDiona = right diona hand - .desc = { ent-PartDiona.desc } + .desc = { ent-BaseRightHand.desc } ent-LeftLegDiona = left diona leg - .desc = { ent-PartDiona.desc } + .desc = { ent-BaseLeftLeg.desc } ent-RightLegDiona = right diona leg - .desc = { ent-PartDiona.desc } + .desc = { ent-BaseRightLeg.desc } ent-LeftFootDiona = left diona foot - .desc = { ent-PartDiona.desc } + .desc = { ent-BaseLeftFoot.desc } ent-RightFootDiona = right diona foot - .desc = { ent-PartDiona.desc } + .desc = { ent-BaseRightFoot.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/gingerbread.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/gingerbread.ftl index a3c6c971562..73230bcf158 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/gingerbread.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/gingerbread.ftl @@ -1,22 +1,22 @@ ent-PartGingerbread = gingerbead body part - .desc = { ent-BaseItem.desc } + .desc = { ent-BasePart.desc } ent-TorsoGingerbread = gingerbread torso - .desc = { ent-PartGingerbread.desc } + .desc = { ent-BaseTorso.desc } ent-HeadGingerbread = gingerbread head - .desc = { ent-PartGingerbread.desc } + .desc = { ent-[BaseHead.desc } ent-LeftArmGingerbread = left gingerbread arm - .desc = { ent-PartGingerbread.desc } + .desc = { ent-BaseLeftArm.desc } ent-RightArmGingerbread = right gingerbread arm - .desc = { ent-PartGingerbread.desc } + .desc = { ent-BaseRightArm.desc } ent-LeftHandGingerbread = left gingerbread hand - .desc = { ent-PartGingerbread.desc } + .desc = { ent-BaseLeftHand.desc } ent-RightHandGingerbread = right gingerbread hand - .desc = { ent-PartGingerbread.desc } + .desc = { ent-BaseRightHand.desc } ent-LeftLegGingerbread = left gingerbread leg - .desc = { ent-PartGingerbread.desc } + .desc = { ent-BaseLeftLeg.desc } ent-RightLegGingerbread = right gingerbread leg - .desc = { ent-PartGingerbread.desc } + .desc = { ent-BaseRightLeg.desc } ent-LeftFootGingerbread = left gingerbread foot - .desc = { ent-PartGingerbread.desc } + .desc = { ent-BaseLeftFoot.desc } ent-RightFootGingerbread = right gingerbread foot - .desc = { ent-PartGingerbread.desc } + .desc = { ent-BaseRightFoot.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/human.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/human.ftl index 8adcb8645c3..972e1c89848 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/human.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/human.ftl @@ -1,22 +1,22 @@ ent-PartHuman = human body part .desc = { ent-BasePart.desc } ent-TorsoHuman = human torso - .desc = { ent-PartHuman.desc } + .desc = { ent-BaseTorso.desc } ent-HeadHuman = human head - .desc = { ent-PartHuman.desc } + .desc = { ent-BaseHead.desc } ent-LeftArmHuman = left human arm - .desc = { ent-PartHuman.desc } + .desc = { ent-BaseLeftArm.desc } ent-RightArmHuman = right human arm - .desc = { ent-PartHuman.desc } + .desc = { ent-BaseRightArm.desc } ent-LeftHandHuman = left human hand - .desc = { ent-PartHuman.desc } + .desc = { ent-BaseLeftHand.desc } ent-RightHandHuman = right human hand - .desc = { ent-PartHuman.desc } + .desc = { ent-BaseRightHand.desc } ent-LeftLegHuman = left human leg - .desc = { ent-PartHuman.desc } + .desc = { ent-BaseLeftLeg.desc } ent-RightLegHuman = right human leg - .desc = { ent-PartHuman.desc } + .desc = { ent-BaseRightLeg.desc } ent-LeftFootHuman = left human foot - .desc = { ent-PartHuman.desc } + .desc = { ent-BaseLeftFoot.desc } ent-RightFootHuman = right human foot - .desc = { ent-PartHuman.desc } + .desc = { ent-BaseRightFoot.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/moth.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/moth.ftl index e40b95a0bb7..67948d4868e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/moth.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/moth.ftl @@ -1,33 +1,22 @@ ent-PartMoth = moth body part - .desc = { ent-BasePart.desc } ent-TorsoMoth = moth torso - - .desc = { ent-PartMoth.desc } + .desc = { ent-BaseTorso.desc } ent-HeadMoth = moth head - - .desc = { ent-PartMoth.desc } + .desc = { ent-BaseHead.desc } ent-LeftArmMoth = left moth arm - - .desc = { ent-PartMoth.desc } + .desc = { ent-BaseLeftArm.desc } ent-RightArmMoth = right moth arm - - .desc = { ent-PartMoth.desc } + .desc = { ent-BaseRightArm.desc } ent-LeftHandMoth = left moth hand - - .desc = { ent-PartMoth.desc } + .desc = { ent-BaseLeftHand.desc } ent-RightHandMoth = right moth hand - - .desc = { ent-PartMoth.desc } + .desc = { ent-BaseRightHand.desc } ent-LeftLegMoth = left moth leg - - .desc = { ent-PartMoth.desc } + .desc = { ent-BaseLeftLeg.desc } ent-RightLegMoth = right moth leg - - .desc = { ent-PartMoth.desc } + .desc = { ent-BaseRightLeg.desc } ent-LeftFootMoth = left moth foot - - .desc = { ent-PartMoth.desc } + .desc = { ent-BaseLeftFoot.desc } ent-RightFootMoth = right moth foot - - .desc = { ent-PartMoth.desc } + .desc = { ent-BaseRightFoot.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/reptilian.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/reptilian.ftl index 9fa555a8bc2..b2faffe0cd5 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/reptilian.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/reptilian.ftl @@ -1,22 +1,22 @@ ent-PartReptilian = reptilian body part .desc = { ent-BasePart.desc } ent-TorsoReptilian = reptilian torso - .desc = {ent-PartReptilian.desc } + .desc = { ent-BaseTorso.desc } ent-HeadReptilian = reptilian head - .desc = { ent-PartReptilian.desc } + .desc = { ent-BaseHead.desc } ent-LeftArmReptilian = left reptilian arm - .desc = { ent-PartReptilian.desc } + .desc = { ent-BaseLeftArm.desc } ent-RightArmReptilian = right reptilian arm - .desc = { ent-PartReptilian.desc } + .desc = { ent-BaseRightArm.desc } ent-LeftHandReptilian = left reptilian hand - .desc = { ent-PartReptilian.desc } + .desc = { ent-BaseLeftHand.desc } ent-RightHandReptilian = right reptilian hand - .desc = { ent-PartReptilian.desc } + .desc = { ent-BaseRightHand.desc } ent-LeftLegReptilian = left reptilian leg - .desc = { ent-PartReptilian.desc } + .desc = { ent-BaseLeftLeg.desc } ent-RightLegReptilian = right reptilian leg - .desc = { ent-PartReptilian.desc } + .desc = { ent-BaseRightLeg.desc } ent-LeftFootReptilian = left reptilian foot - .desc = { ent-PartReptilian.desc } + .desc = { ent-BaseLeftFoot.desc } ent-RightFootReptilian = right reptilian foot - .desc = { ent-PartReptilian.desc } + .desc = { ent-BaseRightFoot.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/slime.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/slime.ftl index a2b0305302d..442a2457db1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/slime.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/slime.ftl @@ -1,22 +1,22 @@ ent-PartSlime = slime body part - .desc = { ent-PartSlime.desc } + .desc = { ent-BasePart.desc } ent-TorsoSlime = slime torso - .desc = { ent-PartSlime.desc } + .desc = { ent-BaseTorso.desc } ent-HeadSlime = slime head - .desc = { ent-PartSlime.desc } + .desc = { ent-BaseHead.desc } ent-LeftArmSlime = left slime arm - .desc = { ent-PartSlime.desc } + .desc = { ent-BaseLeftArm.desc } ent-RightArmSlime = right slime arm - .desc = { ent-PartSlime.desc } + .desc = { ent-BaseRightArm.desc } ent-LeftHandSlime = left slime hand - .desc = { ent-PartSlime.desc } + .desc = { ent-BaseLeftHand.desc } ent-RightHandSlime = right slime hand - .desc = { ent-PartSlime.desc } + .desc = { ent-BaseRightHand.desc } ent-LeftLegSlime = left slime leg - .desc = { ent-PartSlime.desc } + .desc = { ent-BaseLeftLeg.desc } ent-RightLegSlime = right slime leg - .desc = { ent-PartSlime.desc } + .desc = { ent-BaseRightLeg.desc } ent-LeftFootSlime = left slime foot - .desc = { ent-PartSlime.desc } + .desc = { ent-BaseLeftFoot.desc } ent-RightFootSlime = right slime foot - .desc = { ent-PartSlime.desc } + .desc = { ent-BaseRightFoot.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl index 4501e009511..dda9d4bf12d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl @@ -1,5 +1,8 @@ ent-ClothingBackpackDuffelSurgeryFilled = surgical duffel bag .desc = A large duffel bag for holding extra medical supplies - this one seems to be designed for holding surgical tools. +ent-ClothingBackpackDuffelCBURNFilled = { ent-ClothingBackpackDuffelCBURN } + .suffix = Filled + .desc = { ent-ClothingBackpackDuffelCBURN.desc } ent-ClothingBackpackDuffelSyndicateFilledMedical = syndicate surgical duffel bag .desc = A large duffel bag containing a full suite of surgical tools. ent-ClothingBackpackDuffelSyndicateFilledShotgun = Bulldog bundle @@ -41,6 +44,10 @@ ent-ClothingBackpackDuffelSyndicateHardsuitExtrasBundle = syndicate hardsuit ext .desc = Contains stuff that you will absolutely want to have when purchasing a hardsuit. ent-ClothingBackpackDuffelZombieBundle = syndicate zombie bundle .desc = An all-in-one kit for unleashing the undead upon a station. +ent-ClothingBackpackDuffelSyndicateOperative = operative duffelbag + .desc = { ent-ClothingBackpackDuffelSyndicateBundle.desc } +ent-ClothingBackpackDuffelSyndicateOperativeMedic = operative medic duffelbag + .desc = A large duffel bag for holding extra medical supplies. ent-ClothingBackpackDuffelSyndicateMedicalBundleFilled = medical bundle .desc = All you need to get your comrades back in the fight. ent-ClothingBackpackDuffelSyndicateDecoyKitFilled = decoy bundle diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl index 5c65aa1bb05..478e43f52be 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl @@ -4,28 +4,40 @@ ent-BoxMagazinePistolCaselessRifle = box of .25 caseless magazines .desc = A box full of .25 caseless magazines. ent-BoxMagazinePistolCaselessRiflePractice = box of .25 caseless (practice) magazines .desc = A box full of .25 caseless practice magazines. +ent-BoxMagazineCaselessRifleRubber = box of .25 caseless (rubber) magazines + .desc = A box full of ent-BoxMagazineLightRifle = box of .30 rifle magazines .desc = A box full of .30 rifle magazines. ent-BoxMagazineLightRiflePractice = box of .30 rifle (practice) magazines .desc = A box full of .30 rifle (practice) magazines. +ent-BoxMagazineLightRifleRubber = box of .30 rifle (rubber) magazines + .desc = A box full of .30 rifle (practice) magazines. ent-BoxMagazineMagnumSubMachineGun = box of Vector magazines .desc = A box full of Vector magazines. ent-BoxMagazineMagnumSubMachineGunPractice = box of Vector (practice) magazines .desc = A box full of Vector (practice) magazines. +ent-BoxMagazineMagnumSubMachineGunRubber = box of Vector (rubber) magazines + .desc = A box full of Vector (rubber) magazines. ent-BoxMagazinePistolSubMachineGunTopMounted = box of WT550 .35 auto magazines .desc = A box full of WT550 .35 auto magazines. ent-BoxMagazinePistol = box of pistol .35 auto magazines .desc = A box full of pistol .35 auto magazines. ent-BoxMagazinePistolPractice = box of pistol .35 auto (practice) magazines .desc = A box full of magazines. +ent-BoxMagazinePistolRubber = box of pistol .35 auto (rubber) magazines + .desc = A box full of pistol .35 auto (rubber) magazines. ent-BoxMagazinePistolHighCapacity = box of machine pistol .35 auto magazines .desc = A box full of machine pistol .35 auto magazines. ent-BoxMagazinePistolHighCapacityPractice = box of machine pistol .35 auto (practice) magazines .desc = A box full of machine pistol .35 auto (practice) magazines. +ent-BoxMagazinePistolHighCapacityRubber = box of machine pistol .35 auto (rubber) magazines + .desc = A box full of machine pistol .35 auto (rubber) magazines. ent-BoxMagazinePistolSubMachineGun = box of SMG .35 auto magazines .desc = A box full of SMG .35 auto magazines. ent-BoxMagazinePistolSubMachineGunPractice = box of SMG .35 auto (practice) magazines .desc = A box full of SMG .35 auto (practice) magazines. +ent-BoxMagazinePistolSubMachineGunRubber = box of SMG .35 auto (rubber) magazines + .desc = A box full of SMG .35 auto (rubber) magazines. ent-BoxMagazineShotgun = box of (.50 pellet) ammo drums .desc = A box full of (.50 pellet) ammo drums. ent-BoxMagazineShotgunBeanbag = box of (.50 beanbag) ammo drums @@ -38,3 +50,5 @@ ent-BoxMagazineRifle = box of .20 rifle magazines .desc = A box full of .20 rifle magazines. ent-BoxMagazineRiflePractice = box of .20 rifle (practice) magazines .desc = A box full of .20 rifle (practice) magazines. +ent-BoxMagazineRifleRubber = box of .20 rifle (rubber) magazines + .desc = A box full of .20 rifle (rubber) magazines. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl index 9954ff7e4fd..cbb64789139 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 @@ -2,10 +2,12 @@ ent-BoxSurvival = survival box .desc = It's a box with basic internals inside. ent-BoxSurvivalEngineering = extended-capacity survival box .desc = It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. - .suffix = Engineering ent-BoxSurvivalSecurity = survival box .desc = It's a box with basic internals inside. .suffix = Security +ent-BoxSurvivalBrigmedic = survival box + .desc = It's a box with basic internals inside. + .suffix = MedSec ent-BoxSurvivalMedical = survival box .desc = It's a box with basic internals inside. .suffix = Medical @@ -14,4 +16,3 @@ ent-BoxHug = box of hugs .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. - .suffix = Syndicate 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 1e4b064985e..056cb37ca01 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 @@ -5,9 +5,9 @@ ent-BoxMousetrap = mousetrap box ent-BoxLightbulb = lightbulb box .desc = This box is shaped on the inside so that only light tubes and bulbs fit. ent-BoxLighttube = lighttube box - .desc = { ent-BoxLightbulb.desc } + .desc = This box is shaped on the inside so that only light tubes and bulbs fit. ent-BoxLightMixed = mixed lights box - .desc = { ent-BoxLightbulb.desc } + .desc = This box is shaped on the inside so that only light tubes and bulbs fit. ent-BoxPDA = PDA box .desc = A box of spare PDA microcomputers. ent-BoxID = ID card box @@ -31,7 +31,7 @@ ent-BoxTrashbag = trashbag box .desc = A box of trashbags. Happy janitor noises. ent-BoxEncryptionKeyPassenger = passenger encryption key box .desc = A box of spare encryption keys. -ent-BoxEncryptionKeyCargo = cargo encryption key box +ent-BoxEncryptionKeyCargo = logistics encryption key box .desc = { ent-BoxEncryptionKeyPassenger.desc } ent-BoxEncryptionKeyEngineering = engineering encryption key box .desc = { ent-BoxEncryptionKeyPassenger.desc } @@ -41,7 +41,7 @@ ent-BoxEncryptionKeyMedical = medical encryption key box .desc = { ent-BoxEncryptionKeyPassenger.desc } ent-BoxEncryptionKeyRobo = robotech encryption key box .desc = { ent-BoxEncryptionKeyPassenger.desc } -ent-BoxEncryptionKeyScience = science encryption key box +ent-BoxEncryptionKeyScience = epistemics encryption key box .desc = { ent-BoxEncryptionKeyPassenger.desc } ent-BoxEncryptionKeySecurity = security encryption key box .desc = { ent-BoxEncryptionKeyPassenger.desc } @@ -49,12 +49,14 @@ ent-BoxEncryptionKeyService = service encryption key box .desc = { ent-BoxEncryptionKeyPassenger.desc } ent-BoxEncryptionKeySyndie = syndicate encryption key box .desc = Two syndicate encryption keys for the price of one. Miniaturized for ease of use. +ent-BoxDeathRattleImplants = deathrattle implant box + .desc = Six deathrattle implants and handheld GPS devices for the whole squad. ent-BoxLeadLined = lead-lined box .desc = This box stymies the transmission of harmful radiation. .suffix = DEBUG ent-BoxCandle = candle box - .desc = This box is specifically moulded to only carry candles. + .desc = { ent-BoxCardboard.desc } ent-BoxCandleSmall = small candle box - .desc = { ent-BoxCandle.desc } + .desc = { ent-BoxCardboard.desc } ent-BoxDarts = darts box - .desc = A box filled with colorful darts. + .desc = This box filled with colorful darts. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl index fe300db1bc1..ca3dcb9949f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl @@ -10,6 +10,8 @@ ent-BoxLatexGloves = latex gloves box .desc = Contains sterile latex gloves. ent-BoxNitrileGloves = nitrile gloves box .desc = Contains sterile nitrile gloves. Better than latex. +ent-BoxMouthSwab = sterile swab box + .desc = { ent-BoxCardboard.desc } ent-BoxBodyBag = body bag box .desc = Contains body bags. ent-BoxVial = vial box diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl index 2db47eef7c0..32cb32cf5c9 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl @@ -3,7 +3,6 @@ ent-ElectricalDisruptionKit = electrical disruption kit .desc = { ent-BoxCardboard.desc } ent-ChemicalSynthesisKit = chemical synthesis kit .desc = A starter kit for the aspiring chemist, includes toxin and vestine for all your criminal needs! -ent-ThrowingKnivesKit = throwing knives kit - .desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims. -ent-BoxDeathRattleImplants = deathrattle implant box - .desc = Six deathrattle implants for the whole squad. +ent-Observationskit = observations kit + .suffix = Filled + .desc = { ent-BoxCardboard.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/cargo.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/cargo.ftl index 34481544348..d336a65d60b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/cargo.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/cargo.ftl @@ -1,4 +1,4 @@ ent-CrateCargoLuxuryHardsuit = luxury mining hardsuit crate - .desc = Finally, a hardsuit Quartermasters could call their own. Centcomm has heard you, now stop asking. + .desc = Finally, a hardsuit the Logistics Officer could call their own. Centcomm has heard you, now stop asking. ent-CrateCargoGambling = the grand lottery $$$ .desc = A box containing treasure beyond your greatest imaginations! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl index 4560a4ec97b..5921e53eeaa 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl @@ -22,11 +22,9 @@ ent-CrateAirlockKit = airlock kit .desc = A kit for building 6 airlocks, doesn't include tools. ent-CrateEvaKit = EVA kit .desc = A set consisting of two prestigious EVA suits and helmets. -ent-CrateRCDAmmo = compressed matter crate - .desc = Contains three compressed matter cartridges. +ent-CrateRCDAmmo = RCD ammo crate + .desc = 3 RCD ammo, each restoring 5 charges. ent-CrateRCD = RCD crate - .desc = A crate containing a single rapid construction device. + .desc = A crate containing a single Rapid Construction Device. ent-CrateParticleDecelerators = particle decelerators crate .desc = A crate containing 3 Particle Decelerators. -ent-CrateEngineeringSpaceHeater = space heater crate - .desc = Contains a space heater for climate control. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/fun.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/fun.ftl index 4a5a2183120..0a1cb2b90f9 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/fun.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/fun.ftl @@ -38,5 +38,8 @@ ent-CrateFunBikeHornImplants = bike horn implants .desc = A thousand honks a day keeps security officers away! ent-CrateFunMysteryFigurines = mystery figure crate .desc = A collection of 10 Mystery Figurine boxes. Duplicates non refundable. +ent-CrateFunSprayPaints = spray paint crate + .desc = a crate filled with spray paint. + .suffix = Spray Paint ent-CrateFunDartsSet = dartboard box set .desc = A box with everything you need for a fun game of darts. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/service.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/service.ftl index 7f8340df114..eaec74ea99a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/service.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/service.ftl @@ -12,8 +12,6 @@ ent-CrateServiceCustomSmokable = DIY smokeables crate .desc = Want to get a little creative with what you use to destroy your lungs? Then this crate is for you! Has everything you need to roll your own cigarettes. ent-CrateServiceBureaucracy = bureaucracy crate .desc = Several stacks of paper, a few pens and an office toy. What more could you ask for? -ent-CrateServiceFaxMachine = fax machine crate - .desc = A fax machine and a screwdriver to set the name with. ent-CrateServicePersonnel = personnel crate .desc = Contains a box of blank ID cards and PDAs. ent-CrateServiceBooks = books crate @@ -31,3 +29,5 @@ ent-CrateJanitorBiosuit = janitor bio suit crate ent-CrateTrashCartFilled = { ent-CrateTrashCart } .suffix = Filled .desc = { ent-CrateTrashCart.desc } +ent-CrateJanitorExplosive = janitorial bomb suit crate + .desc = Supplies a bomb suit for cleaning up any explosive compounds, buy one today! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/vending.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/vending.ftl index ebacedf66dc..e41565e2997 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/vending.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/vending.ftl @@ -3,9 +3,7 @@ ent-CrateVendingMachineRestockBoozeFilled = Booze-O-Mat restock crate ent-CrateVendingMachineRestockChefvendFilled = ChefVend restock crate .desc = Contains a restock box for the ChefVend. ent-CrateVendingMachineRestockClothesFilled = clothing restock crate - .desc = Contains a restock box for the clothes vending machines. -ent-CrateVendingMachineRestockAutoDrobeFilled = AutoDrobe restock crate - .desc = Contains a restock box for the AutoDrobe. + .desc = Contains a pair of restock boxes, one for the ClothesMate and one for the AutoDrobe. ent-CrateVendingMachineRestockCondimentStationFilled = condiment station restock crate .desc = Contains a restock box for the condiment station. ent-CrateVendingMachineRestockDinnerwareFilled = Plasteel Chef restock crate @@ -24,8 +22,8 @@ ent-CrateVendingMachineRestockNutriMaxFilled = NutriMax restock crate .desc = Contains a restock box for the NutriMax vending machine. ent-CrateVendingMachineRestockPTechFilled = PTech restock crate .desc = Contains a restock box for the PTech bureaucracy dispenser. -ent-CrateVendingMachineRestockRobustSoftdrinksFilled = beverage vendor restock crate - .desc = Contains restock boxes for beverage vending machines. +ent-CrateVendingMachineRestockRobustSoftdrinksFilled = Robust Softdrinks restock crate + .desc = Contains two restock boxes for the Robust Softdrinks LLC vending machine. ent-CrateVendingMachineRestockSalvageEquipmentFilled = Salvage restock crate .desc = Contains a restock box for the salvage vendor. ent-CrateVendingMachineRestockSecTechFilled = SecTech restock crate diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/belt.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/belt.ftl index 6320b28618f..79eaaf5782c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/belt.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/belt.ftl @@ -10,9 +10,6 @@ ent-ClothingBeltChiefEngineerFilled = { ent-ClothingBeltChiefEngineer } ent-ClothingBeltSecurityFilled = { ent-ClothingBeltSecurity } .suffix = Filled .desc = { ent-ClothingBeltSecurity.desc } -ent-ClothingBeltSecurityWebbingFilled = { ent-ClothingBeltSecurityWebbing } - .suffix = Filled - .desc = { ent-ClothingBeltSecurityWebbing.desc } ent-ClothingBeltJanitorFilled = { ent-ClothingBeltJanitor } .suffix = Filled .desc = { ent-ClothingBeltJanitor.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/briefcases.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/briefcases.ftl index 74f47ccc4ac..748709bd238 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/briefcases.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/briefcases.ftl @@ -1,12 +1,12 @@ -ent-BriefcaseBrownFilled = { ent-BriefcaseBrown } +ent-BriefcaseBrownFilled = brown briefcase .suffix = Filled, Paper .desc = { ent-BriefcaseBrown.desc } -ent-BriefcaseSyndieSniperBundleFilled = { ent-BriefcaseSyndie } - .suffix = Syndicate, Sniper Bundle +ent-BriefcaseSyndieSniperBundleFilled = brown briefcase + .suffix = SniperBundle .desc = { ent-BriefcaseSyndie.desc } -ent-BriefcaseSyndieLobbyingBundleFilled = { ent-BriefcaseSyndie } +ent-BriefcaseSyndieLobbyingBundleFilled = brown briefcase .suffix = Syndicate, Spesos .desc = { ent-BriefcaseSyndie.desc } -ent-BriefcaseThiefBribingBundleFilled = { ent-BriefcaseSyndie } +ent-BriefcaseThiefBribingBundleFilled = brown briefcase .suffix = Thief, Spesos .desc = { ent-BriefcaseSyndie.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/misc.ftl index 500fda47a43..e7e3f33a99b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/misc.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/misc.ftl @@ -1,13 +1,6 @@ ent-ClothingShoesBootsCombatFilled = { ent-ClothingShoesBootsCombat } - .desc = { ent-ClothingShoesBootsCombat.desc } -ent-ClothingShoesBootsJackFilled = { ent-ClothingShoesBootsJack } - .desc = { ent-ClothingShoesBootsJack.desc } -ent-ClothingShoesBootsWinterSecFilled = { ent-ClothingShoesBootsWinterSec } - .desc = { ent-ClothingShoesBootsWinterSec.desc } -ent-ClothingShoesBootsCowboyBlackFilled = { ent-ClothingShoesBootsCowboyBlack } - .desc = { ent-ClothingShoesBootsCowboyBlack.desc } -ent-ClothingShoesHighheelBootsFilled = { ent-ClothingShoesHighheelBoots } - .desc = { ent-ClothingShoesHighheelBoots.desc } + .suffix = Filled + .desc = { ent-ClothingShoesBootsCombat.desc } ent-ClothingShoesBootsMercFilled = { ent-ClothingShoesBootsMerc } .suffix = Filled .desc = { ent-ClothingShoesBootsMerc.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/biohazard.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/biohazard.ftl index 1d387668dd0..0e7aec82aed 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/biohazard.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/biohazard.ftl @@ -11,5 +11,5 @@ ent-ClosetL3JanitorFilled = { ent-ClosetL3Janitor } .suffix = Filled, Janitor .desc = { ent-ClosetL3Janitor.desc } ent-ClosetL3ScienceFilled = { ent-ClosetL3Virology } - .suffix = Filled, Science + .suffix = Filled, Epistemics .desc = { ent-ClosetL3Virology.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/medical.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/medical.ftl index 465e1d93f8d..8e91fea3800 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/medical.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/medical.ftl @@ -16,3 +16,6 @@ ent-LockerChemistryFilled = { ent-LockerChemistry } ent-LockerParamedicFilled = { ent-LockerParamedic } .suffix = Filled .desc = { ent-LockerParamedic.desc } +ent-LockerParamedicFilledHardsuit = { ent-LockerParamedic } + .suffix = Filled, Hardsuit + .desc = { ent-LockerParamedic.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/misc.ftl index 0de3e0cadbd..0fc5433d0c5 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/misc.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/misc.ftl @@ -7,9 +7,6 @@ ent-ClosetEmergencyFilledRandom = { ent-ClosetEmergency } ent-ClosetWallEmergencyFilledRandom = { ent-ClosetWallEmergency } .suffix = Filled, Random .desc = { ent-ClosetWallEmergency.desc } -ent-ClosetEmergencyN2FilledRandom = { ent-ClosetEmergencyN2 } - .suffix = Filled, Random - .desc = { ent-ClosetEmergencyN2.desc } ent-ClosetFireFilled = { ent-ClosetFire } .suffix = Filled .desc = { ent-ClosetFire.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/security.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/security.ftl index ab24d8e629c..d68d725c7e6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/security.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/security.ftl @@ -8,7 +8,10 @@ ent-LockerSecurityFilled = { ent-LockerSecurity } .suffix = Filled .desc = { ent-LockerSecurity.desc } ent-LockerBrigmedicFilled = { ent-LockerBrigmedic } - .suffix = Brigmedic, Filled + .suffix = Corpsman, Filled + .desc = { ent-LockerBrigmedic.desc } +ent-LockerBrigmedicFilledHardsuit = { ent-LockerBrigmedic } + .suffix = Corpsman, Filled, Hardsuit .desc = { ent-LockerBrigmedic.desc } ent-LockerDetectiveFilled = { ent-LockerDetective } .suffix = Filled diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/service.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/service.ftl index 50ed6588baa..5c8f9e9ebd7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/service.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/service.ftl @@ -17,5 +17,5 @@ ent-LockerBotanistLoot = { ent-LockerBotanist } .suffix = Loot .desc = { ent-LockerBotanist.desc } ent-ClosetJanitorBombFilled = { ent-ClosetJanitorBomb } - .suffix = DO NOT MAP, Filled + .suffix = Filled .desc = { ent-ClosetJanitorBomb.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl index 33f6df8295c..c0390b9f938 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl @@ -38,7 +38,7 @@ ent-SuitStorageCMO = { ent-SuitStorageBase } .suffix = Chief Medical Officer .desc = { ent-SuitStorageBase.desc } ent-SuitStorageRD = { ent-SuitStorageBase } - .suffix = Research Director + .suffix = Mystagogue .desc = { ent-SuitStorageBase.desc } ent-SuitStorageHOS = { ent-SuitStorageBase } .suffix = Head of Security @@ -52,6 +52,12 @@ ent-SuitStorageCaptain = { ent-SuitStorageBase } ent-SuitStorageSalv = { ent-SuitStorageBase } .suffix = Salvage .desc = { ent-SuitStorageBase.desc } +ent-SuitStorageParamedic = { ent-SuitStorageBase } + .suffix = Paramedic + .desc = { ent-SuitStorageBase.desc } +ent-SuitStorageCorpsman = { ent-SuitStorageBase } + .suffix = Corpsman + .desc = { ent-SuitStorageBase.desc } ent-SuitStorageSyndie = { ent-SuitStorageBase } .suffix = Syndicate Hardsuit .desc = { ent-SuitStorageBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/command/safe.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/command/safe.ftl index 2b1977986da..477cb261bd8 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/command/safe.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/specific/command/safe.ftl @@ -1,6 +1,5 @@ ent-SpareIdCabinet = spare id cabinet .desc = There is a small label that reads "For emergency use only". -ent-SpareIdCabinetFilled = { ent-SpareIdCabinet } - +ent-SpareIdCabinetFilled = { ent-FireAxeCabinetFilled } .suffix = Filled - .desc = { ent-SpareIdCabinet.desc } \ No newline at end of file + .desc = { ent-FireAxeCabinetFilled.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl index 8ca39e82e41..f22b97048aa 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl @@ -6,7 +6,7 @@ ent-ClothingBackpackIan = Ian's backpack .desc = Sometimes he wears it. ent-ClothingBackpackSecurity = security backpack .desc = It's a very robust backpack. -ent-ClothingBackpackBrigmedic = brigmedic backpack +ent-ClothingBackpackBrigmedic = corpsman backpack .desc = It's a very sterile backpack. ent-ClothingBackpackEngineering = engineering backpack .desc = It's a tough backpack for the daily grind of station life. @@ -22,14 +22,14 @@ ent-ClothingBackpackChemistry = chemistry backpack .desc = A backpack specially designed to repel stains and hazardous liquids. ent-ClothingBackpackHydroponics = hydroponics backpack .desc = It's a backpack made of all-natural fibers. -ent-ClothingBackpackScience = science backpack +ent-ClothingBackpackScience = epistemics backpack .desc = A backpack specially designed to repel stains and hazardous liquids. ent-ClothingBackpackVirology = virology backpack .desc = A backpack made of hypo-allergenic fibers. It's designed to help prevent the spread of disease. Smells like monkey. ent-ClothingBackpackGenetics = genetics backpack .desc = A backpack designed to be super tough, just in case someone hulks out on you. -ent-ClothingBackpackCargo = cargo backpack - .desc = A robust backpack for stealing cargo's loot. +ent-ClothingBackpackCargo = logistics backpack + .desc = A robust backpack for stealing logistics's loot. ent-ClothingBackpackSalvage = salvage bag .desc = A robust backpack for stashing your loot. ent-ClothingBackpackMerc = merc bag @@ -46,10 +46,6 @@ ent-ClothingBackpackERTJanitor = ERT janitor backpack .desc = A spacious backpack with lots of pockets, worn by Janitors of an Emergency Response Team. ent-ClothingBackpackERTClown = ERT clown backpack .desc = A spacious backpack with lots of pockets, worn by Clowns of an Emergency Response Team. -ent-ClothingBackpackERTChaplain = ERT chaplain backpack - .desc = A spacious backpack with lots of pockets, worn by Chaplains of an Emergency Response Team. -ent-ClothingBackpackDeathSquad = death squad backpack - .desc = Holds the kit of CentComm's most feared agents. ent-ClothingBackpackSyndicate = syndicate backpack .desc = { ent-ClothingBackpack.desc } ent-ClothingBackpackHolding = bag of holding diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/duffel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/duffel.ftl index b8328cff320..5bc0e44a2fe 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/duffel.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/duffel.ftl @@ -12,7 +12,7 @@ ent-ClothingBackpackDuffelClown = clown duffel bag .desc = A large duffel bag for holding extra honk goods. ent-ClothingBackpackDuffelSecurity = security duffel bag .desc = A large duffel bag for holding extra security related goods. -ent-ClothingBackpackDuffelBrigmedic = brigmedic duffel bag +ent-ClothingBackpackDuffelBrigmedic = corpsman duffel bag .desc = A large duffel bag for holding extra medical related goods. ent-ClothingBackpackDuffelChemistry = chemistry duffel bag .desc = A large duffel bag for holding extra beakers and test tubes. @@ -22,12 +22,12 @@ ent-ClothingBackpackDuffelGenetics = genetics duffel bag .desc = A large duffel bag for holding extra genetic mutations. ent-ClothingBackpackDuffelMime = mime duffel bag .desc = A large duffel bag for holding... mime... stuff. -ent-ClothingBackpackDuffelScience = science duffel bag +ent-ClothingBackpackDuffelScience = epistemics duffel bag .desc = A large duffel bag for holding extra science related goods. ent-ClothingBackpackDuffelHydroponics = hydroponics duffel bag .desc = A large duffel bag for holding extra gardening tools. -ent-ClothingBackpackDuffelCargo = cargo duffel bag - .desc = A large duffel bag for stealing cargo's precious loot. +ent-ClothingBackpackDuffelCargo = logistics duffel bag + .desc = A large duffel bag for stealing logistics's precious loot. ent-ClothingBackpackDuffelSalvage = salvage duffel bag .desc = A large duffel bag for holding extra exotic treasures. ent-ClothingBackpackDuffelSyndicate = syndicate duffel bag diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/satchel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/satchel.ftl index 66ffa14bf6d..5d97ef3fbb9 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/satchel.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/satchel.ftl @@ -18,18 +18,18 @@ ent-ClothingBackpackSatchelVirology = virology satchel .desc = A satchel made of hypo-allergenic fibers. It's designed to help prevent the spread of disease. Smells like monkey. ent-ClothingBackpackSatchelGenetics = genetics satchel .desc = A sterile satchel with geneticist colours. -ent-ClothingBackpackSatchelScience = science satchel +ent-ClothingBackpackSatchelScience = epistemics satchel .desc = Useful for holding research materials. ent-ClothingBackpackSatchelSecurity = security satchel .desc = A robust satchel for security related needs. -ent-ClothingBackpackSatchelBrigmedic = brigmedic satchel +ent-ClothingBackpackSatchelBrigmedic = corpsman satchel .desc = A sterile satchel for medical related needs. ent-ClothingBackpackSatchelCaptain = captain's satchel .desc = An exclusive satchel for Nanotrasen officers. ent-ClothingBackpackSatchelHydroponics = hydroponics satchel .desc = A satchel made of all natural fibers. -ent-ClothingBackpackSatchelCargo = cargo satchel - .desc = A robust satchel for stealing cargo's loot. +ent-ClothingBackpackSatchelCargo = logistics satchel + .desc = A robust satchel for stealing logistics's loot. ent-ClothingBackpackSatchelSalvage = salvage satchel .desc = A robust satchel for stashing your loot. ent-ClothingBackpackSatchelHolding = satchel of holding diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/base_clothing.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/base_clothing.ftl index 799e24a559f..67e132403d6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/base_clothing.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/base_clothing.ftl @@ -2,8 +2,6 @@ ent-Clothing = { ent-BaseItem } .desc = { ent-BaseItem.desc } ent-GeigerCounterClothing = { "" } .desc = { "" } -ent-AllowSuitStorageClothing = { "" } - .desc = { "" } ent-ClothingSlotBase = { "" } .desc = { "" } ent-ContentsExplosionResistanceBase = { "" } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl index 890e2da94d0..da8133a7918 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl @@ -28,7 +28,7 @@ ent-ClothingBeltSyndieHolster = syndicate shoulder holster .desc = A deep shoulder holster capable of holding many types of ballistics. ent-ClothingBeltSecurityWebbing = security webbing .desc = Unique and versatile chest rig, can hold security gear. -ent-ClothingBeltMercWebbing = mercenary webbing +ent-ClothingBeltMercWebbing = mercenarie webbing .desc = Ideal for storing everything from ammo to weapons and combat essentials. ent-ClothingBeltSalvageWebbing = salvage rig .desc = Universal unloading system for work in space. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets.ftl index 82b906fc48a..adf973ddf81 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets.ftl @@ -2,12 +2,12 @@ ent-ClothingHeadset = headset .desc = An updated, modular intercom that fits over the head. Takes encryption keys. ent-ClothingHeadsetGrey = passenger headset .desc = { ent-ClothingHeadset.desc } -ent-ClothingHeadsetCargo = cargo headset +ent-ClothingHeadsetCargo = logistics headset .desc = A headset used by supply employees. ent-ClothingHeadsetMining = mining headset .desc = Headset used by shaft miners. -ent-ClothingHeadsetQM = qm headset - .desc = A headset used by the quartermaster. +ent-ClothingHeadsetQM = logistics officer's headset + .desc = A headset used by the logistics officer. ent-ClothingHeadsetCentCom = CentCom headset .desc = A headset used by the upper echelons of Nanotrasen. ent-ClothingHeadsetCommand = command headset @@ -20,17 +20,17 @@ ent-ClothingHeadsetMedical = medical headset .desc = A headset for the trained staff of the medbay. ent-ClothingHeadsetCMO = cmo headset .desc = A headset used by the CMO. -ent-ClothingHeadsetScience = science headset +ent-ClothingHeadsetScience = epistemics headset .desc = A sciency headset. Like usual. ent-ClothingHeadsetMedicalScience = medical research headset .desc = A headset that is a result of the mating between medical and science. ent-ClothingHeadsetRobotics = robotics headset .desc = Made specifically for the roboticists, who cannot decide between departments. -ent-ClothingHeadsetRD = rd headset +ent-ClothingHeadsetRD = mysta headset .desc = Lamarr used to love chewing on this... ent-ClothingHeadsetSecurity = security headset .desc = This is used by your elite security force. -ent-ClothingHeadsetBrigmedic = brigmedic headset +ent-ClothingHeadsetBrigmedic = corpsman headset .desc = A headset that helps to hear the death cries. ent-ClothingHeadsetService = service headset .desc = Headset used by the service staff, tasked with keeping the station full, happy and clean. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl index 15208f60eae..0c6a8b0f615 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl @@ -1,6 +1,6 @@ ent-ClothingHeadsetAlt = headset .desc = An updated, modular intercom that fits over the head. Takes encryption keys. -ent-ClothingHeadsetAltCargo = quartermaster's over-ear headset +ent-ClothingHeadsetAltCargo = logistics officer's over-ear headset .desc = { ent-ClothingHeadsetAlt.desc } ent-ClothingHeadsetAltCentCom = CentCom over-ear headset .desc = { ent-ClothingHeadsetAlt.desc } @@ -15,7 +15,7 @@ ent-ClothingHeadsetAltMedical = chief medical officer's over-ear headset .desc = { ent-ClothingHeadsetAlt.desc } ent-ClothingHeadsetAltSecurity = head of security's over-ear headset .desc = { ent-ClothingHeadsetAlt.desc } -ent-ClothingHeadsetAltScience = research director's over-ear headset +ent-ClothingHeadsetAltScience = mystagogue's over-ear headset .desc = { ent-ClothingHeadsetAlt.desc } ent-ClothingHeadsetAltSyndicate = blood-red over-ear headset .desc = An updated, modular syndicate intercom that fits over the head and takes encryption keys (there are 5 key slots.). diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/base_clothingeyes.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/base_clothingeyes.ftl index 3a8f769821d..35521191276 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/base_clothingeyes.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/base_clothingeyes.ftl @@ -1,7 +1,2 @@ ent-ClothingEyesBase = { ent-Clothing } .desc = { ent-Clothing.desc } -ent-ClothingHeadEyeBaseFlippable = { ent-ClothingEyesBase } - .desc = { ent-ClothingEyesBase.desc } -ent-ClothingHeadEyeBaseFlipped = { ent-ClothingHeadEyeBaseFlippable } - .suffix = flipped - .desc = { ent-ClothingHeadEyeBaseFlippable.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl index c120ea1f171..4634450ddb1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl @@ -1,7 +1,3 @@ -ent-ShowSecurityIcons = { "" } - .desc = { "" } -ent-ShowMedicalIcons = { "" } - .desc = { "" } ent-ClothingEyesHudDiagnostic = diagnostic hud .desc = A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium. ent-ClothingEyesHudMedical = medical hud @@ -26,24 +22,14 @@ ent-ClothingEyesHudOmni = omni hud .desc = Filler ent-ClothingEyesHudSyndicate = syndicate visor .desc = The syndicate's professional head-up display, designed for better detection of humanoids and their subsequent elimination. -ent-ClothingEyesHudSyndicateAgent = syndicate agent visor - .desc = The Syndicate Agent's professional heads-up display, designed for quick diagnosis of their team's status. ent-ClothingEyesGlassesHiddenSecurity = { ent-ClothingEyesGlassesSunglasses } - .suffix = Syndicate - .desc = { ent-ClothingEyesGlassesSunglasses.desc } + .suffix = Syndicate + .desc = { ent-ClothingEyesGlassesSunglasses.desc } ent-ClothingEyesEyepatchHudMedical = medical hud eyepatch .desc = A heads-up display that scans the humanoids in view and provides accurate data about their health status. For true patriots. -ent-ClothingEyesEyepatchHudMedicalFlipped = medical hud eyepatch - .desc = { ent-ClothingEyesEyepatchHudMedical.desc } ent-ClothingEyesEyepatchHudSecurity = security hud eyepatch .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. For true patriots. -ent-ClothingEyesEyepatchHudSecurityFlipped = security hud eyepatch - .desc = { ent-ClothingEyesEyepatchHudSecurity.desc } ent-ClothingEyesEyepatchHudBeer = beer hud eyepatch .desc = A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. For true patriots. -ent-ClothingEyesEyepatchHudBeerFlipped = beer hud eyepatch - .desc = { ent-ClothingEyesEyepatchHudBeer.desc } ent-ClothingEyesEyepatchHudDiag = diagnostic hud eyepatch .desc = A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium. -ent-ClothingEyesEyepatchHudDiagFlipped = diagnostic hud eyepatch - .desc = { ent-ClothingEyesEyepatchHudDiag.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/misc.ftl index 53478368b4b..74e51836c24 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/misc.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/misc.ftl @@ -1,7 +1,4 @@ -ent-ClothingEyesBlindfold = blindfold - .desc = The bind leading the blind. ent-ClothingEyesEyepatch = eyepatch .desc = Yarr. -ent-ClothingEyesEyepatchFlipped = { ent-ClothingEyesEyepatch } - .suffix = flipped - .desc = { ent-ClothingEyesEyepatch.desc } +ent-ClothingEyesBlindfold = blindfold + .desc = The bind leading the blind. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl index 1b4b6767bb7..8582dc3bbf3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl @@ -2,5 +2,3 @@ ent-ClothingHandsBase = { ent-Clothing } .desc = { ent-Clothing.desc } ent-ClothingHandsButcherable = { ent-ClothingHandsBase } .desc = { ent-ClothingHandsBase.desc } -ent-ClothingHandsGlovesSyntheticBase = { ent-ClothingHandsButcherable } - .desc = { ent-ClothingHandsButcherable.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/colored.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/colored.ftl index e75d8745ad7..86836b52a05 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/colored.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/colored.ftl @@ -1,7 +1,11 @@ +ent-ClothingHandsGlovesSyntheticBase = { ent-ClothingHandsButcherable } + .desc = { ent-ClothingHandsButcherable.desc } ent-ClothingHandsGlovesColorPurple = purple gloves .desc = Regular purple gloves that do not keep you from frying. ent-ClothingHandsGlovesColorRed = red gloves .desc = Regular red gloves that do not keep you from frying. +ent-ClothingHandsGlovesColorBlack = black gloves + .desc = Regular black gloves that do not keep you from frying. ent-ClothingHandsGlovesColorBlue = blue gloves .desc = Regular blue gloves that do not keep you from frying. ent-ClothingHandsGlovesColorBrown = brown gloves @@ -15,9 +19,7 @@ ent-ClothingHandsGlovesColorLightBrown = light brown gloves ent-ClothingHandsGlovesColorOrange = orange gloves .desc = Regular orange gloves that do not keep you from frying. ent-ClothingHandsGlovesColorWhite = white gloves - .desc = Regular white gloves that do not keep you from frying. -ent-ClothingHandsGlovesColorBlack = black gloves - .desc = Regular black gloves that do not keep you from frying. + .desc = Those gloves look fancy. ent-ClothingHandsGlovesColorYellow = insulated gloves .desc = These gloves will protect the wearer from electric shocks. ent-ClothingHandsGlovesColorYellowBudget = budget insulated gloves diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/bandanas.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/bandanas.ftl index 4761ec38edc..72d52db64c0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/bandanas.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/bandanas.ftl @@ -1,22 +1,22 @@ -ent-ClothingHeadBandBase = { ent-ClothingHeadBaseButcherable } - .desc = { ent-ClothingHeadBaseButcherable.desc } +ent-ClothingHeadBandBase = { ent-BaseFoldable } + .desc = { ent-BaseFoldable.desc } ent-ClothingHeadBandBlack = black bandana - .desc = A black bandana to make you look cool. + .desc = { ent-ClothingMaskBandBlack.desc } ent-ClothingHeadBandBlue = blue bandana - .desc = A blue bandana to make you look cool. + .desc = { ent-ClothingMaskBandBlue.desc } ent-ClothingHeadBandBotany = botany bandana - .desc = A botany bandana to make you look cool, made from natural fibers. + .desc = { ent-ClothingMaskBandBotany.desc } ent-ClothingHeadBandGold = gold bandana - .desc = A gold bandana to make you look cool. + .desc = { ent-ClothingMaskBandGold.desc } ent-ClothingHeadBandGreen = green bandana - .desc = A green bandana to make you look cool. + .desc = { ent-ClothingMaskBandGreen.desc } ent-ClothingHeadBandGrey = grey bandana - .desc = A grey bandana to make you look cool. + .desc = { ent-ClothingMaskBandGrey.desc } ent-ClothingHeadBandRed = red bandana - .desc = A red bandana to make you look cool. + .desc = { ent-ClothingMaskBandRed.desc } ent-ClothingHeadBandSkull = skull bandana - .desc = A bandana with a skull to make you look even cooler. + .desc = { ent-ClothingMaskBandSkull.desc } ent-ClothingHeadBandMerc = mercenary bandana - .desc = To protect the head from the sun, insects and other dangers of the higher path. + .desc = { ent-ClothingMaskBandMerc.desc } ent-ClothingHeadBandBrown = brown bandana - .desc = A brown bandana to make you look cool. + .desc = { ent-ClothingMaskBandBrown.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl index 2a0455ac9eb..ffaf59dc77c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl @@ -12,8 +12,8 @@ ent-ClothingHeadHelmetHardsuitMaxim = salvager maxim helmet .desc = A predication of decay washes over your mind. ent-ClothingHeadHelmetHardsuitSecurity = security hardsuit helmet .desc = Armored hardsuit helmet for security needs. -ent-ClothingHeadHelmetHardsuitBrigmedic = brigmedic hardsuit helmet - .desc = The lightweight helmet of the brigmedic hardsuit. Protects against viruses, and clowns. +ent-ClothingHeadHelmetHardsuitBrigmedic = corpsman hardsuit helmet + .desc = The lightweight helmet of the corpsman hardsuit. Protects against viruses, and clowns. ent-ClothingHeadHelmetHardsuitWarden = warden's hardsuit helmet .desc = A modified riot helmet. Oddly comfortable. ent-ClothingHeadHelmetHardsuitCap = captain's hardsuit helmet @@ -50,8 +50,6 @@ ent-ClothingHeadHelmetHardsuitPirateCap = pirate captain's hardsuit helmet .suffix = Pirate ent-ClothingHeadHelmetHardsuitERTLeader = ERT leader hardsuit helmet .desc = A special hardsuit helmet worn by members of an emergency response team. -ent-ClothingHeadHelmetHardsuitERTChaplain = ERT chaplain hardsuit helmet - .desc = A special hardsuit helmet worn by members of an emergency response team. ent-ClothingHeadHelmetHardsuitERTEngineer = ERT engineer hardsuit helmet .desc = A special hardsuit helmet worn by members of an emergency response team. ent-ClothingHeadHelmetHardsuitERTMedical = ERT medic hardsuit helmet diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl index a52b400be1b..33a3463aa73 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl @@ -12,12 +12,12 @@ ent-ClothingHeadHatBeretRND = scientific beret .desc = A beret for real scientists. ent-ClothingHeadHatBeretEngineering = engineering beret .desc = A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety. -ent-ClothingHeadHatBeretQM = quartermaster's beret - .desc = A beret with the cargo's insignia emblazoned on it. For quartermasters that are more inclined towards style. +ent-ClothingHeadHatBeretQM = logistics officer's beret + .desc = A beret with the logistics department's insignia emblazoned on it. For logistics officers that are more inclined towards style. ent-ClothingHeadHatBeretHoS = head of security's beret .desc = A black beret with a commander's rank emblem. For officers that are more inclined towards style than safety. ent-ClothingHeadHatBeretWarden = warden's beret - .desc = A corporate blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety. + .desc = A black beret with a warden's rank emblem. For officers that are more inclined towards style than safety. ent-ClothingHeadHatBeretSeniorPhysician = physician beret .desc = Donning the colours of medical and chemistry, physicians are the pride of this department! ent-ClothingHeadHatBeretBrigmedic = brigmedical beret @@ -73,13 +73,11 @@ ent-ClothingHeadHatUshanka = ushanka ent-ClothingHeadHatVioletwizard = violet wizard hat .desc = Strange-looking violet hat-wear that most certainly belongs to a real magic user. ent-ClothingHeadHatWarden = warden's cap - .desc = A police officer's Hat. This hat emphasizes that you are THE LAW + .desc = The responsibility weighs heavy, like a barbed crown. ent-ClothingHeadHatWitch = witch hat .desc = A witch hat. ent-ClothingHeadHatWizardFake = fake wizard hat .desc = It has WIZZARD written across it in sequins. Comes with a cool beard. -ent-ClothingHeadHatWizardBase = { ent-ClothingHeadBase } - .desc = { ent-ClothingHeadBase.desc } ent-ClothingHeadHatWizard = wizard hat .desc = Strange-looking blue hat-wear that most certainly belongs to a powerful magic user. ent-ClothingHeadHatXmasCrown = xmas crown diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/helmets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/helmets.ftl index 1fb5e78748d..d8da80667d3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/helmets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/helmets.ftl @@ -16,6 +16,8 @@ ent-ClothingHeadHelmetJanitorBombSuit = janitorial bombsuit helmet .suffix = DO NOT MAP ent-ClothingHeadHelmetCult = cult helmet .desc = A robust, evil-looking cult helmet. +ent-ClothingHeadHelmetScaf = scaf helmet + .desc = A robust, strong helmet. ent-ClothingHeadHelmetSpaceNinja = space ninja helmet .desc = What may appear to be a simple black garment is in fact a highly sophisticated nano-weave helmet. Standard issue ninja gear. ent-ClothingHeadHelmetTemplar = templar helmet diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hoods.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hoods.ftl index 754b5c553fc..5c5d846b3b2 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hoods.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hoods.ftl @@ -9,7 +9,7 @@ ent-ClothingHeadHatHoodBioJanitor = bio hood .suffix = Janitor ent-ClothingHeadHatHoodBioScientist = bio hood .desc = A hood that protects the head and face from biological contaminants. - .suffix = Science + .suffix = Epistemics ent-ClothingHeadHatHoodBioSecurity = bio hood .desc = A hood that protects the head and face from biological contaminants. .suffix = Security @@ -30,8 +30,6 @@ ent-ClothingHeadHatHoodIan = ian hood .desc = A hood to complete the 'Good boy' look. ent-ClothingHeadHatHoodCarp = carp hood .desc = A gnarly hood adorned with plastic space carp teeth. -ent-ClothingHeadHelmetHardsuitCarp = { ent-ClothingHeadHatHoodCarp } - .desc = { ent-ClothingHeadHatHoodCarp.desc } ent-ClothingHeadHatHoodMoth = moth mask .desc = A mask in the form of a moths head is usually made of lightweight materials. It mimics the shape of a moths head with large eyes and long antennae. Such masks are often used in cosplay, or when shooting movies and videos. ent-ClothingHeadHatHoodWinterDefault = default winter coat hood @@ -40,7 +38,7 @@ ent-ClothingHeadHatHoodWinterBartender = bartender winter coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } ent-ClothingHeadHatHoodWinterCaptain = captain's winter coat hood .desc = An expensive hood, to keep the captain's head warm. -ent-ClothingHeadHatHoodWinterCargo = cargo winter coat hood +ent-ClothingHeadHatHoodWinterCargo = logistics winter coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } ent-ClothingHeadHatHoodWinterCE = chief engineer's winter coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } @@ -68,9 +66,9 @@ ent-ClothingHeadHatHoodWinterMiner = miner coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } ent-ClothingHeadHatHoodWinterPara = paramedic coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterQM = quartermaster's coat hood +ent-ClothingHeadHatHoodWinterQM = logistics officer's coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterRD = research director's coat hood +ent-ClothingHeadHatHoodWinterRD = mystagogue's coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } ent-ClothingHeadHatHoodWinterRobo = robotics coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/misc.ftl index c2fbfa0ba72..569b706fbcd 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/misc.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/misc.ftl @@ -4,14 +4,14 @@ ent-ClothingHeadHatCake = cake hat .desc = You put the cake on your head. Brilliant. ent-ClothingHeadHatChickenhead = chicken head .desc = It's a chicken head. Bok bok bok! -ent-ClothingHeadHatFlowerWreath = flower wreath - .desc = A wreath of colourful flowers. Can be worn both on head and neck. +ent-ClothingHeadHatFlowerCrown = flower crown + .desc = A coronet of fresh and fragrant flowers. +ent-ClothingHeadHatHairflower = hairflower + .desc = A red flower for beautiful ladies. ent-ClothingHeadHatPumpkin = pumpkin hat .desc = A jack o' lantern! Believed to ward off evil spirits. ent-ClothingHeadHatPwig = pwig .desc = To be honest, those look ridiculous. -ent-ClothingHeadMirror = head mirror - .desc = I doubt even the CMO knows how to use this thing. ent-ClothingHeadHatRichard = richard .desc = Do you like hurting people? ent-ClothingHeadHatSkub = skub hat diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/soft.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/soft.ftl index c5874424664..8cef17c7ea1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/soft.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/soft.ftl @@ -1,5 +1,5 @@ -ent-ClothingHeadHeadHatBaseFlippable = { ent-ClothingHeadBaseButcherable } - .desc = { ent-ClothingHeadBaseButcherable.desc } +ent-ClothingHeadHeadHatBaseFlippable = { ent-BaseFoldable } + .desc = { ent-BaseFoldable.desc } ent-ClothingHeadHeadHatBaseFlipped = { ent-ClothingHeadHeadHatBaseFlippable } .suffix = flipped .desc = { ent-ClothingHeadHeadHatBaseFlippable.desc } @@ -7,59 +7,59 @@ ent-ClothingHeadHatBluesoft = blue cap .desc = It's a baseball hat in a tasteless blue colour. ent-ClothingHeadHatBluesoftFlipped = blue cap .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } -ent-ClothingHeadHatCargosoft = cargo cap - .desc = It's a baseball hat painted in Cargo colours. -ent-ClothingHeadHatCargosoftFlipped = cargo cap - .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } -ent-ClothingHeadHatQMsoft = quartermaster's cap - .desc = It's a baseball hat painted in the Quartermaster's colors. -ent-ClothingHeadHatQMsoftFlipped = quartermaster's cap - .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } +ent-ClothingHeadHatCargosoft = logistics cap + .desc = It's a baseball hat painted in Logistics colours. +ent-ClothingHeadHatCargosoftFlipped = logistics cap + .desc = It's a baseball hat painted in Logistics colours. Flipped. +ent-ClothingHeadHatQMsoft = logistics officer's cap + .desc = It's a baseball hat painted in the Logistics Officer's colors. +ent-ClothingHeadHatQMsoftFlipped = logistics officer's cap + .desc = { ent-ClothingHeadHatQMsoft.desc } ent-ClothingHeadHatCorpsoft = corporate cap .desc = A baseball bat in corporation colors. ent-ClothingHeadHatCorpsoftFlipped = corporate cap - .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } + .desc = { ent-ClothingHeadHatCorpsoft.desc } ent-ClothingHeadHatGreensoft = green cap .desc = It's a baseball hat in a tasteless green colour. ent-ClothingHeadHatGreensoftFlipped = green cap - .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } + .desc = { ent-ClothingHeadHatGreensoft.desc } ent-ClothingHeadHatBlacksoft = black cap .desc = It's a baseball hat in a tasteless black colour. ent-ClothingHeadHatBlacksoftFlipped = black cap - .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } + .desc = { ent-ClothingHeadHatBlacksoft.desc } ent-ClothingHeadHatGreysoft = grey cap .desc = It's a baseball hat in a tasteless grey colour. ent-ClothingHeadHatGreysoftFlipped = grey cap - .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } + .desc = { ent-ClothingHeadHatGreysoft.desc } ent-ClothingHeadHatMimesoft = mime cap .desc = It's a baseball hat in a tasteless white colour. ent-ClothingHeadHatMimesoftFlipped = mime cap - .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } + .desc = { ent-ClothingHeadHatMimesoft.desc } ent-ClothingHeadHatOrangesoft = orange cap .desc = It's a baseball hat in a good-looking orange colour. ent-ClothingHeadHatOrangesoftFlipped = orange cap - .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } + .desc = { ent-ClothingHeadHatOrangesoft.desc } ent-ClothingHeadHatPurplesoft = purple cap .desc = It's a baseball hat in a tasteless purple colour. ent-ClothingHeadHatPurplesoftFlipped = purple cap - .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } + .desc = { ent-ClothingHeadHatPurplesoft.desc } ent-ClothingHeadHatRedsoft = red cap .desc = It's a baseball hat in a tasteless red colour. ent-ClothingHeadHatRedsoftFlipped = red cap - .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } + .desc = { ent-ClothingHeadHatRedsoft.desc } ent-ClothingHeadHatSecsoft = security cap .desc = It's a robust baseball hat in tasteful red colour. ent-ClothingHeadHatSecsoftFlipped = security cap - .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } + .desc = { ent-ClothingHeadHatSecsoft.desc } ent-ClothingHeadHatYellowsoft = yellow cap .desc = A yellow baseball hat. ent-ClothingHeadHatYellowsoftFlipped = yellow cap - .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } + .desc = { ent-ClothingHeadHatYellowsoft.desc } ent-ClothingHeadHatBizarreSoft = troublemaker's cap .desc = A truly.. bizarre accessory. ent-ClothingHeadHatBizarreSoftFlipped = troublemaker's cap - .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } + .desc = { ent-ClothingHeadHatBizarreSoft.desc } ent-ClothingHeadHatParamedicsoft = paramedic cap .desc = It's a paramedic's baseball hat with a medical logo. ent-ClothingHeadHatParamedicsoftFlipped = paramedic cap - .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } + .desc = { ent-ClothingHeadHatParamedicsoft.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/bandanas.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/bandanas.ftl index 2cfa21964a3..7c8c918af33 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/bandanas.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/bandanas.ftl @@ -1,5 +1,5 @@ -ent-ClothingMaskBandanaBase = { ent-ClothingMaskBaseButcherable } - .desc = { ent-ClothingMaskBaseButcherable.desc } +ent-ClothingMaskBandanaBase = { ent-BaseFoldable } + .desc = { ent-BaseFoldable.desc } ent-ClothingMaskBandBlack = black bandana .desc = A black bandana to make you look cool. ent-ClothingMaskBandBlue = blue bandana diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/specific.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/specific.ftl index 9181c886d49..302b3d7d5b8 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/specific.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/specific.ftl @@ -4,5 +4,3 @@ ent-ClothingMaskGasChameleon = gas mask ent-ClothingMaskGasVoiceChameleon = { ent-ClothingMaskGasChameleon } .suffix = Voice Mask, Chameleon .desc = { ent-ClothingMaskGasChameleon.desc } -ent-ClothingMaskWeldingGas = welding gas mask - .desc = A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl index 69bc0ebc86a..e7d8e1c557d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl @@ -8,9 +8,9 @@ ent-ClothingNeckCloakCe = chief engineer's cloak .desc = A dark green cloak with light blue ornaments, given to those who proved themselves to master the precise art of engineering. ent-ClothingCloakCmo = chief medical officer's cloak .desc = A sterile blue cloak with a green cross, radiating with a sense of duty and willingness to help others. -ent-ClothingNeckCloakRd = research director's cloak +ent-ClothingNeckCloakRd = mystagogue's cloak .desc = A white cloak with violet stripes, showing your status as the arbiter of cutting-edge technology. -ent-ClothingNeckCloakQm = quartermaster's cloak +ent-ClothingNeckCloakQm = logistics officer's cloak .desc = A strong brown cloak with a reflective stripe, while not as fancy as others, it does show your managing skills. ent-ClothingNeckCloakHop = head of personnel's cloak .desc = A blue cloak with red shoulders and gold buttons, proving you are the gatekeeper to any airlock on the station. @@ -20,7 +20,7 @@ ent-ClothingNeckCloakNanotrasen = nanotrasen cloak .desc = A stately blue cloak to represent NanoTrasen. ent-ClothingNeckCloakCapFormal = captain's formal cloak .desc = A lavish and decorated cloak for special occasions. -ent-ClothingNeckCloakAdmin = weh cloak +ent-ClothingNeckCloakAdmin = admin cloak .desc = Weh! ent-ClothingNeckCloakMiner = miner's cloak .desc = Worn by the most skilled miners, for one who has moved mountains and filled valleys. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/mantles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/mantles.ftl index d11f0d68e57..db311cafbde 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/mantles.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/mantles.ftl @@ -1,16 +1,14 @@ ent-ClothingNeckMantleCap = captain's mantle - .desc = A formal mantle to drape around the shoulders. Others stand on the shoulders of giants. You're the giant they stand on. + .desc = A comfortable and chique mantle befitting of only the most experienced captain. ent-ClothingNeckMantleCE = chief engineer's mantle - .desc = A bright white and yellow striped mantle. Do not wear around active machinery. + .desc = High visibility, check. RIG system, check. High capacity cell, check. Everything a chief engineer could need in a stylish mantle. ent-ClothingNeckMantleCMO = chief medical officer's mantle - .desc = A light blue shoulder draping for THE medical professional. Contrasts well with blood. + .desc = For a CMO that has been in enough medbays to know that more PPE means less central command dry cleaning visits when the shift is over. ent-ClothingNeckMantleHOP = head of personnel's mantle - .desc = A decorative draping of blue and red over your shoulders, signifying your stamping prowess. + .desc = A good HOP knows that paper pushing is only half the job... petting your dog and looking fashionable is the other half. ent-ClothingNeckMantleHOS = head of security's mantle - .desc = A plated mantle that one might wrap around the upper torso. The 'scales' of the garment signify the members of security and how you're carrying them on your shoulders. -ent-ClothingNeckMantleHOSShoulder = head of security's shoulder mantle .desc = Shootouts with nukies are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station. -ent-ClothingNeckMantleRD = research director's mantle - .desc = A terribly comfortable shoulder draping for the discerning scientist of fashion. -ent-ClothingNeckMantleQM = quartermaster's mantle +ent-ClothingNeckMantleRD = mystagogue's mantle + .desc = For when long days in the office consist of explosives, poisonous gas, murder robots, and a fresh pizza from logistics; this mantle will keep you comfy. +ent-ClothingNeckMantleQM = logistics officer's mantle .desc = For the master of goods and materials to rule over the department, a befitting mantle to show off superiority! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/medals.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/medals.ftl index 464609d4838..bb1c5d94d3b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/medals.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/medals.ftl @@ -1,16 +1,18 @@ +ent-ClothingNeckMedalBase = medal + .desc = not given to anyone ent-ClothingNeckBronzeheart = bronzeheart medal .desc = Given to crewmates for exemplary bravery in the face of danger. ent-ClothingNeckGoldmedal = gold medal of crewmanship .desc = Given to crewmates who display excellent crewmanship. -ent-ClothingNeckCargomedal = cargo medal - .desc = Given for the best work in the cargo department. +ent-ClothingNeckCargomedal = logistics medal + .desc = Whether it's for superior accountancy, courageous salvage work, or just being a friendly technician - this medal is to be assigned only for the best work in the logistics department. ent-ClothingNeckEngineermedal = engineer medal - .desc = Given for the best work in the engineering department. + .desc = Whether it's by keeping the crew breathing, meticulous rewiring and upgrading, or just having plenty of materials on-hand - this medal is to be assigned only for the best work in the engineering department. ent-ClothingNeckMedicalmedal = medical medal - .desc = Given for the best work in the medical department. -ent-ClothingNeckSciencemedal = science medal - .desc = Given for the best work in the science department. + .desc = Whether it's being the first on the scene of an accident, the most caring bedside manner, or just making sure the patients don't go mad - this medal is to be assigned only for the best work in the medical department. +ent-ClothingNeckSciencemedal = epistemics medal + .desc = Whether it's pushing the edges of modern science and technology, foraying into the vast expanses of the noosphere, or just fetching the coffee - this medal is to be assigned only for the best work in the epistemics department. ent-ClothingNeckSecuritymedal = security medal - .desc = Given for the best work in the security department. -ent-ClothingNeckClownmedal = clown medal - .desc = Given for the best joke in the universe. HONK! + .desc = Whether it's catching armed terrorists, guarding the crew from alien threats, or just having a conversation in the corridor - this medal is to be assigned only for the best work in the security department. +ent-ClothingNeckClownmedal = bravado medal + .desc = Given to crewmates who laugh in the face of death, lift their peers' spirits, and uplift themselves and their friends to success. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/misc.ftl index 91dd45c5294..50ee42a3f6a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/misc.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/misc.ftl @@ -8,3 +8,5 @@ ent-ClothingNeckLawyerbadge = lawyer badge .desc = A badge to show that the owner is a 'legitimate' lawyer who passed the NT bar exam required to practice law. ent-ActionStethoscope = Listen with stethoscope .desc = { "" } +ent-ClothingNeckFlowerWreath = flower wreath + .desc = A wreath of colourful flowers. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/pins.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/pins.ftl index 5da8f2a14a7..b76940000a1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/pins.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/pins.ftl @@ -18,7 +18,3 @@ ent-ClothingNeckPansexualPin = pansexual pin .desc = be pan do crime ent-ClothingNeckTransPin = transgender pin .desc = be trans do crime -ent-ClothingNeckAutismPin = autism pin - .desc = be autism do crime -ent-ClothingNeckGoldAutismPin = golden autism pin - .desc = be autism do warcrime diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/armor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/armor.ftl index 9c65d555cb2..429ab8a8d73 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/armor.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/armor.ftl @@ -21,6 +21,8 @@ ent-ClothingOuterArmorMagusblue = blue magus armor .desc = An blue armored suit that provides good protection. ent-ClothingOuterArmorMagusred = red magus armor .desc = A red armored suit that provides good protection. +ent-ClothingOuterArmorScaf = scaf suit + .desc = A green and brown tactical suit for combat situations. ent-ClothingOuterArmorCaptainCarapace = captain's carapace .desc = An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest. ent-ClothingOuterArmorChangeling = chitinous armor diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/base_clothingouter.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/base_clothingouter.ftl index 1d66236ff44..b1ab48521c6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/base_clothingouter.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/base_clothingouter.ftl @@ -4,11 +4,6 @@ ent-ClothingOuterBaseLarge = { ent-ClothingOuterBase } .desc = { ent-ClothingOuterBase.desc } ent-ClothingOuterStorageBase = { ent-ClothingOuterBase } .desc = { ent-ClothingOuterBase.desc } -ent-ClothingOuterStorageFoldableBase = { ent-ClothingOuterStorageBase } - .desc = { ent-ClothingOuterStorageBase.desc } -ent-ClothingOuterStorageFoldableBaseOpened = { ent-ClothingOuterStorageFoldableBase } - .suffix = opened - .desc = { ent-ClothingOuterStorageFoldableBase.desc } ent-ClothingOuterStorageToggleableBase = { ent-ClothingOuterStorageBase } .desc = { ent-ClothingOuterStorageBase.desc } ent-ClothingOuterHardsuitBase = base hardsuit diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/bio.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/bio.ftl index 96b3cbf8ac4..e4846cc6a1d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/bio.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/bio.ftl @@ -9,7 +9,7 @@ ent-ClothingOuterBioJanitor = bio suit .suffix = Janitor ent-ClothingOuterBioScientist = bio suit .desc = A suit that protects against biological contamination, in Scientist colors. - .suffix = Science + .suffix = Epistemics ent-ClothingOuterBioSecurity = bio suit .desc = A suit that protects against biological contamination, in Security colors. .suffix = Security 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 58202a63ca6..b648b04cc93 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl @@ -2,14 +2,8 @@ ent-ClothingOuterCoatBomber = bomber jacket .desc = A thick, well-worn WW2 leather bomber jacket. ent-ClothingOuterCoatDetective = detective trenchcoat .desc = A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Wearing it makes you feel for the plight of the Tibetans. -ent-ClothingOuterCoatDetectiveLoadout = { ent-ClothingOuterCoatDetective } - .desc = { ent-ClothingOuterCoatDetective.desc } ent-ClothingOuterCoatGentle = gentle coat .desc = A gentle coat for a gentle man, or woman. -ent-ClothingOuterArmorHoS = { ent-AllowSuitStorageClothing } - .desc = { ent-AllowSuitStorageClothing.desc } -ent-ClothingOuterArmorWarden = { ent-AllowSuitStorageClothing } - .desc = { ent-AllowSuitStorageClothing.desc } ent-ClothingOuterCoatHoSTrench = head of security's armored trenchcoat .desc = A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence. ent-ClothingOuterCoatInspector = inspector's coat @@ -20,36 +14,20 @@ ent-ClothingOuterCoatTrench = trench coat .desc = A comfy trench coat. ent-ClothingOuterCoatLab = lab coat .desc = A suit that protects against minor chemical spills. -ent-ClothingOuterCoatLabOpened = lab coat - .desc = { ent-ClothingOuterCoatLab.desc } ent-ClothingOuterCoatLabChem = chemist lab coat .desc = A suit that protects against minor chemical spills. Has an orange stripe on the shoulder. -ent-ClothingOuterCoatLabChemOpened = chemist lab coat - .desc = { ent-ClothingOuterCoatLabChem.desc } ent-ClothingOuterCoatLabViro = virologist lab coat .desc = A suit that protects against bacteria and viruses. Has an green stripe on the shoulder. -ent-ClothingOuterCoatLabViroOpened = virologist lab coat - .desc = { ent-ClothingOuterCoatLabViro.desc } ent-ClothingOuterCoatLabGene = geneticist lab coat .desc = A suit that protects against minor chemical spills. Has an blue stripe on the shoulder. -ent-ClothingOuterCoatLabGeneOpened = geneticist lab coat - .desc = { ent-ClothingOuterCoatLabGene.desc } ent-ClothingOuterCoatLabCmo = chief medical officer's lab coat .desc = Bluer than the standard model. -ent-ClothingOuterCoatLabCmoOpened = chief medical officer's lab coat - .desc = { ent-ClothingOuterCoatLabCmo.desc } -ent-ClothingOuterCoatRnd = scientist lab coat +ent-ClothingOuterCoatRnd = epistemics lab coat .desc = A suit that protects against minor chemical spills. Has a purple stripe on the shoulder. -ent-ClothingOuterCoatRndOpened = scientist lab coat - .desc = { ent-ClothingOuterCoatRnd.desc } ent-ClothingOuterCoatRobo = roboticist lab coat .desc = More like an eccentric coat than a labcoat. Helps pass off bloodstains as part of the aesthetic. Comes with red shoulder pads. -ent-ClothingOuterCoatRoboOpened = roboticist lab coat - .desc = { ent-ClothingOuterCoatRobo.desc } ent-ClothingOuterCoatRD = research director lab coat .desc = Woven with top of the line technology, this labcoat helps protect against radiation in similar way to the experimental hardsuit. -ent-ClothingOuterCoatRDOpened = research director lab coat - .desc = { ent-ClothingOuterCoatRD.desc } ent-ClothingOuterCoatPirate = pirate garb .desc = Yarr. ent-ClothingOuterCoatWarden = warden's armored jacket diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl index cf6b49312c4..971d27f45ce 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl @@ -12,7 +12,7 @@ ent-ClothingOuterHardsuitMaxim = salvager maxim hardsuit .desc = Fire. Heat. These things forge great weapons, they also forge great salvagers. ent-ClothingOuterHardsuitSecurity = security hardsuit .desc = A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. -ent-ClothingOuterHardsuitBrigmedic = brigmedic hardsuit +ent-ClothingOuterHardsuitBrigmedic = corpsman hardsuit .desc = Special hardsuit of the guardian angel of the brig. It is the medical version of the security hardsuit. ent-ClothingOuterHardsuitWarden = warden's hardsuit .desc = A specialized riot suit geared to combat low pressure environments. @@ -23,11 +23,11 @@ ent-ClothingOuterHardsuitEngineeringWhite = chief engineer's hardsuit ent-ClothingOuterHardsuitMedical = chief medical officer's hardsuit .desc = A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement. ent-ClothingOuterHardsuitRd = experimental research hardsuit - .desc = A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. + .desc = A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. Able to be compressed to small sizes. ent-ClothingOuterHardsuitSecurityRed = head of security's hardsuit .desc = A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. ent-ClothingOuterHardsuitLuxury = luxury mining hardsuit - .desc = A refurbished mining hardsuit, fashioned after the Quartermaster's colors. Graphene lining provides less protection, but is much easier to move. + .desc = A refurbished mining hardsuit, fashioned after the Logistics Officer's colors. Graphene lining provides less protection, but is much easier to move. ent-ClothingOuterHardsuitSyndie = blood-red hardsuit .desc = A heavily armored hardsuit designed for work in special operations. Property of Gorlex Marauders. ent-ClothingOuterHardsuitSyndieMedic = blood-red medic hardsuit @@ -49,8 +49,6 @@ ent-ClothingOuterHardsuitPirateCap = pirate captain's hardsuit .desc = An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags. ent-ClothingOuterHardsuitERTLeader = ERT leader's hardsuit .desc = A protective hardsuit worn by the leader of an emergency response team. -ent-ClothingOuterHardsuitERTChaplain = ERT chaplain's hardsuit - .desc = A protective hardsuit worn by the chaplains of an Emergency Response Team. ent-ClothingOuterHardsuitERTEngineer = ERT engineer's hardsuit .desc = A protective hardsuit worn by the engineers of an emergency response team. ent-ClothingOuterHardsuitERTMedical = ERT medic's hardsuit diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/misc.ftl index b789a90957d..73647eef405 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/misc.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/misc.ftl @@ -29,8 +29,6 @@ ent-ClothingOuterPoncho = poncho .desc = A warm and comfy poncho. ent-ClothingOuterSanta = santa suit .desc = Ho ho ho! -ent-ClothingOuterWizardBase = { ent-ClothingOuterBase } - .desc = { ent-ClothingOuterBase.desc } ent-ClothingOuterWizardViolet = violet wizard robes .desc = A bizarre gem-encrusted violet robe that radiates magical energies. ent-ClothingOuterWizard = wizard robes diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/softsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/softsuits.ftl index c10c9f1ce97..0a98fec33bc 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/softsuits.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/softsuits.ftl @@ -3,7 +3,7 @@ ent-ClothingOuterHardsuitEVA = EVA suit ent-ClothingOuterHardsuitSyndicate = syndicate EVA suit .desc = Has a tag on the back that reads: 'Totally not property of an enemy corporation, honest!' ent-ClothingOuterSuitEmergency = emergency EVA suit - .desc = An emergency EVA suit with a built-in helmet. It's horribly slow and lacking in temperature protection, but enough to buy you time from the harsh vaccuum of space. + .desc = An emergency EVA suit with a built-in helmet. It's horribly slow and lacking in temperature protection, but enough to bide you time from the harsh vaccuum of space. ent-ClothingOuterHardsuitEVAPrisoner = prisoner EVA suit .desc = A lightweight space suit for prisoners to protect them from the vacuum of space during emergencies. ent-ClothingOuterHardsuitAncientEVA = NTSRA voidsuit diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/suits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/suits.ftl index 5dcc5b1ddad..2abb5e1a947 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/suits.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/suits.ftl @@ -15,14 +15,9 @@ ent-ClothingOuterSuitChicken = chicken suit .desc = Bok bok bok! ent-ClothingOuterSuitShrineMaiden = shrine maiden outfit .desc = Makes you want to go deal with some troublesome youkai. -ent-ClothingOuterSuitWitchRobes = witch robes - .desc = Magic is all about the spell power, ZE! ent-ClothingOuterSuitMonkey = monkey suit .desc = A suit that looks like a primate. ent-ClothingOuterSuitIan = ian suit .desc = Who's a good boy? ent-ClothingOuterSuitCarp = carp suit .desc = A special suit that makes you look just like a space carp, if your eyesight is bad. -ent-ClothingOuterHardsuitCarp = { ent-ClothingOuterSuitCarp } - .suffix = Hardsuit, DO NOT MAP - .desc = { ent-ClothingOuterSuitCarp.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl index 19b08724ab1..3a6fd3d81c3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl @@ -8,7 +8,7 @@ ent-ClothingOuterWinterBar = bartender winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } ent-ClothingOuterWinterCap = captain's winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterCargo = cargo winter coat +ent-ClothingOuterWinterCargo = logistics winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } ent-ClothingOuterWinterCE = chief engineer's winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } @@ -28,10 +28,8 @@ ent-ClothingOuterWinterGen = genetics winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } ent-ClothingOuterWinterHoP = head of personnel's winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterHoS = head of security's armored winter coat - .desc = A sturdy, utilitarian winter coat designed to protect a head of security from any brig-bound threats and hypothermic events. -ent-ClothingOuterWinterHoSUnarmored = head of security's winter coat - .desc = A sturdy coat, a warm coat, but not an armored coat. +ent-ClothingOuterWinterHoS = head of security's winter coat + .desc = { ent-ClothingOuterWinterCoatToggleable.desc } ent-ClothingOuterWinterHydro = hydroponics winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } ent-ClothingOuterWinterJani = janitorial winter coat @@ -44,13 +42,13 @@ ent-ClothingOuterWinterMiner = mining winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } ent-ClothingOuterWinterPara = paramedic winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterQM = quartermaster's winter coat +ent-ClothingOuterWinterQM = logistics officer's winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterRD = research director's winter coat +ent-ClothingOuterWinterRD = mystagogue's winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } ent-ClothingOuterWinterRobo = robotics winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterSci = science winter coat +ent-ClothingOuterWinterSci = epistemics winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } ent-ClothingOuterWinterSec = security winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } @@ -58,8 +56,6 @@ ent-ClothingOuterWinterViro = virology winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } ent-ClothingOuterWinterWarden = warden's armored winter coat .desc = A sturdy, utilitarian winter coat designed to protect a warden from any brig-bound threats and hypothermic events. -ent-ClothingOuterWinterWardenUnarmored = warden's winter coat - .desc = A sturdy coat, a warm coat, but not an armored coat. ent-ClothingOuterWinterSyndieCap = syndicate's winter coat .desc = The syndicate's winter coat is made of durable fabric, with gilded patterns, and coarse wool. ent-ClothingOuterWinterSyndieCapArmored = syndicate's armored winter coat @@ -70,3 +66,23 @@ ent-ClothingOuterWinterMusician = musician's winter coat .desc = An oversized, plasticine space tuxedo that'll have people asking "do you know me?" ent-ClothingOuterWinterWeb = web winter coat .desc = Feels like the inside of a cocoon, not that this would make you less afraid of being in one. +ent-ClothingOuterCsCorporateJacket = Cybersun Corporate Jacket + .desc = A cozy jacket with the Cybersun logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. +ent-ClothingOuterEeCorporateJacket = Einstein Engines Corporate Jacket + .desc = A cozy jacket with the Einstein Engines logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. +ent-ClothingOuterHiCorporateJacket = Hephaestus Industries Corporate Jacket + .desc = A cozy jacket with the Hephaestus Industries logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. +ent-ClothingOuterHmCorporateJacket = Hawkmoon Acquisitions Corporate Jacket + .desc = A cozy jacket with the Hawkmoon Acquisitions logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. +ent-ClothingOuterIdCorporateJacket = Interdyne Corporate Jacket + .desc = A cozy jacket with the Interdyne logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. +ent-ClothingOuterBcCorporateJacket = Bishop Cybernetics Corporate Jacket + .desc = A cozy jacket with the Bishop Cybernetics logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. +ent-ClothingOuterDdCorporateJacket = Discount Dan's Corporate Jacket + .desc = A cozy jacket with the Discount Dan's logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. +ent-ClothingOuterFaCorporateJacket = Five Points Armory Corporate Jacket + .desc = A cozy jacket with the Five Points Armory logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. +ent-ClothingOuterGeCorporateJacket = Gilthari Exports Corporate Jacket + .desc = A cozy jacket with the Gilthari Exports logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. +ent-ClothingOuterZhCorporateJacket = Zeng-Hu Pharmaceuticals Corporate Jacket + .desc = A cozy jacket with the Zeng-Hu Pharmaceuticals logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/base_clothingshoes.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/base_clothingshoes.ftl index 93ac7f49b5f..501d11856e2 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/base_clothingshoes.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/base_clothingshoes.ftl @@ -4,8 +4,5 @@ ent-ClothingShoesBaseButcherable = { ent-ClothingShoesBase } .desc = { ent-ClothingShoesBase.desc } ent-ClothingShoesMilitaryBase = { ent-ClothingShoesBase } .desc = { ent-ClothingShoesBase.desc } -ent-ClothingShoesBootsSecFilled = { "" } - .suffix = Filled - .desc = { "" } ent-ClothingShoesBaseWinterBoots = { ent-ClothingShoesBaseButcherable } .desc = Fluffy boots to help survive even the coldest of winters. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/boots.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/boots.ftl index c5481adb599..7b96456fc07 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/boots.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/boots.ftl @@ -16,7 +16,7 @@ ent-ClothingShoesBootsLaceup = laceup shoes .desc = The height of fashion, and they're pre-polished! ent-ClothingShoesBootsWinter = winter boots .desc = { ent-ClothingShoesBaseWinterBoots.desc } -ent-ClothingShoesBootsWinterCargo = cargo winter boots +ent-ClothingShoesBootsWinterCargo = logistics winter boots .desc = { ent-ClothingShoesBaseWinterBoots.desc } ent-ClothingShoesBootsWinterEngi = engineering winter boots .desc = { ent-ClothingShoesBaseWinterBoots.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/color.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/color.ftl index 501fd467862..42f6cd79bd9 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/color.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/color.ftl @@ -1,7 +1,5 @@ ent-ClothingShoesColorBlack = black shoes .desc = Stylish black shoes. -ent-ClothingShoesColorWhite = white shoes - .desc = Don't take them off at your office Christmas party. ent-ClothingShoesColorBlue = blue shoes .desc = Stylish blue shoes. ent-ClothingShoesColorBrown = brown shoes @@ -10,9 +8,11 @@ ent-ClothingShoesColorGreen = green shoes .desc = Stylish green shoes. ent-ClothingShoesColorOrange = orange shoes .desc = Stylish orange shoes. +ent-ClothingShoesColorPurple = purple shoes + .desc = Stylish purple shoes. ent-ClothingShoesColorRed = red shoes .desc = Stylish red shoes. +ent-ClothingShoesColorWhite = white shoes + .desc = Don't take them off at your office Christmas party. ent-ClothingShoesColorYellow = yellow shoes .desc = Stylish yellow shoes. -ent-ClothingShoesColorPurple = purple shoes - .desc = Stylish purple shoes. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/misc.ftl index f271cbeaf8f..b4f549e869d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/misc.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/misc.ftl @@ -16,5 +16,3 @@ ent-ClothingShoesBootsSpeed = speed boots .desc = High-tech boots woven with quantum fibers, able to convert electricity into pure speed! ent-ActionToggleSpeedBoots = Toggle Speed Boots .desc = Toggles the speed boots on and off. -ent-ClothingShoesBootsMoon = moon boots - .desc = Special anti-gravity boots developed with a speciality blend of lunar rock gel. Shipped from the Netherlands. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl index be847488c01..a9e31a1fcd5 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl @@ -3,9 +3,9 @@ ent-ClothingUniformJumpskirtBartender = bartender's uniform ent-ClothingUniformJumpskirtCaptain = captain's jumpskirt .desc = It's a blue jumpskirt with some gold markings denoting the rank of "Captain". ent-ClothingUniformJumpskirtCargo = cargo tech jumpskirt - .desc = A sturdy jumpskirt, issued to members of the Cargo department. + .desc = A sturdy jumpskirt, issued to members of the Logistics department. ent-ClothingUniformJumpskirtChiefEngineer = chief engineer's jumpskirt - .desc = It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer. + .desc = It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding. ent-ClothingUniformJumpskirtChiefEngineerTurtle = chief engineer's turtleneck .desc = A yellow turtleneck designed specifically for work in conditions of the engineering department. ent-ClothingUniformJumpskirtChaplain = chaplain's jumpskirt @@ -20,8 +20,6 @@ ent-ClothingUniformJumpskirtGenetics = genetics jumpskirt .desc = It's made of a special fiber that gives special protection against biohazards. It has a geneticist rank stripe on it. ent-ClothingUniformJumpskirtCMO = chief medical officer's jumpskirt .desc = It's a jumpskirt worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. -ent-ClothingUniformJumpskirtCMOTurtle = chief medical officer's turtleneck jumpskirt - .desc = It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. ent-ClothingUniformJumpskirtDetective = hard-worn suit .desc = Someone who wears this means business. ent-ClothingUniformJumpskirtDetectiveGrey = noir suit @@ -31,9 +29,9 @@ ent-ClothingUniformJumpskirtEngineering = engineering jumpskirt ent-ClothingUniformJumpskirtHoP = head of personnel's jumpskirt .desc = Rather bland and inoffensive. Perfect for vanishing off the face of the universe. ent-ClothingUniformJumpskirtHoS = head of security's jumpskirt - .desc = It's bright red and rather crisp, much like security's victims tend to be. + .desc = A standard Station Security uniform, adorned with gold emblems and commander's epaulettes. ent-ClothingUniformJumpskirtHoSAlt = head of security's turtleneck - .desc = It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security. + .desc = It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security. Its sturdy fabric provides minor protection from slash and pierce damage. ent-ClothingUniformJumpskirtHoSParadeMale = head of security's parade uniform .desc = A head of security's luxury-wear, for special occasions. ent-ClothingUniformJumpskirtHydroponics = hydroponics jumpskirt @@ -46,26 +44,58 @@ ent-ClothingUniformJumpskirtMime = mime jumpskirt .desc = ... ent-ClothingUniformJumpskirtParamedic = paramedic jumpskirt .desc = It's got a plus on it, that's a good thing right? -ent-ClothingUniformJumpskirtBrigmedic = brigmedic jumpskirt +ent-ClothingUniformJumpskirtBrigmedic = corpsman jumpskirt .desc = This uniform is issued to qualified personnel who have been trained. No one cares that the training took half a day. ent-ClothingUniformJumpskirtPrisoner = prisoner jumpskirt .desc = Busted. -ent-ClothingUniformJumpskirtQM = quartermaster's jumpskirt +ent-ClothingUniformJumpskirtQM = logistics officer's jumpskirt .desc = What can brown do for you? -ent-ClothingUniformJumpskirtQMTurtleneck = quartermasters's turtleneck +ent-ClothingUniformJumpskirtQMTurtleneck = logistics officer's turtleneck .desc = A sharp turtleneck made for the hardy work environment of supply. -ent-ClothingUniformJumpskirtResearchDirector = research director's turtleneck - .desc = It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants. +ent-ClothingUniformJumpskirtResearchDirector = mystagogue's turtleneck + .desc = It's a turtleneck worn by those with the know-how to achieve the position of Mystagogue. Its fabric provides minor protection from biological contaminants. ent-ClothingUniformJumpskirtScientist = scientist jumpskirt - .desc = It's made of a special fiber that increases perceived intelligence and decreases personal ethics. It has markings that denote the wearer as a scientist. + .desc = It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist. ent-ClothingUniformJumpskirtRoboticist = roboticist jumpskirt .desc = It's a slimming black with reinforced seams; great for industrial work. ent-ClothingUniformJumpskirtSec = security jumpskirt - .desc = A jumpskirt made of strong material, providing robust protection. -ent-ClothingUniformJumpskirtWarden = warden's uniform - .desc = A formal security suit for officers complete with Nanotrasen belt buckle. + .desc = A charcoal skirt and a dull red shirt, the standard-issue uniform of the infamous Station Security Department. +ent-ClothingUniformJumpskirtWarden = warden's jumpskirt + .desc = Red shirt on a charcoal skirt, with white markings and epaulettes that denote a warden's rank. +ent-ClothingUniformJumpskirtColorGrey = grey jumpskirt + .desc = A tasteful grey jumpskirt that reminds you of the good old days. +ent-ClothingUniformJumpskirtColorBlack = black jumpskirt + .desc = A generic black jumpskirt with no rank markings. +ent-ClothingUniformJumpskirtColorBlue = blue jumpskirt + .desc = A generic blue jumpskirt with no rank markings. +ent-ClothingUniformJumpskirtColorGreen = green jumpskirt + .desc = A generic green jumpskirt with no rank markings. +ent-ClothingUniformJumpskirtColorOrange = orange jumpskirt + .desc = Don't wear this near paranoid security officers. +ent-ClothingUniformJumpskirtColorPink = pink jumpskirt + .desc = Just looking at this makes you feel fabulous. +ent-ClothingUniformJumpskirtColorRed = red jumpskirt + .desc = A generic red jumpskirt with no rank markings. +ent-ClothingUniformJumpskirtColorWhite = white jumpskirt + .desc = A generic white jumpskirt with no rank markings. +ent-ClothingUniformJumpskirtColorYellow = yellow jumpskirt + .desc = A generic yellow jumpskirt with no rank markings. +ent-ClothingUniformJumpskirtColorDarkBlue = dark blue jumpskirt + .desc = A generic dark blue jumpskirt with no rank markings. +ent-ClothingUniformJumpskirtColorTeal = teal jumpskirt + .desc = A generic teal jumpskirt with no rank markings. +ent-ClothingUniformJumpskirtColorPurple = purple jumpskirt + .desc = A generic purple jumpskirt with no rank markings. +ent-ClothingUniformJumpskirtColorDarkGreen = dark green jumpskirt + .desc = A generic dark green jumpskirt with no rank markings. +ent-ClothingUniformJumpskirtColorLightBrown = light brown jumpskirt + .desc = A generic light brown jumpskirt with no rank markings. +ent-ClothingUniformJumpskirtColorBrown = brown jumpskirt + .desc = A generic brown jumpskirt with no rank markings. +ent-ClothingUniformJumpskirtColorMaroon = maroon jumpskirt + .desc = A generic maroon jumpskirt with no rank markings. ent-ClothingUniformJumpskirtLibrarian = librarian jumpskirt - .desc = A cosy red jumper fit for a curator of books. + .desc = A cosy green jumper fit for a curator of books. ent-ClothingUniformJumpskirtCurator = sensible skirt .desc = It's sensible. Too sensible... ent-ClothingUniformJumpskirtPerformer = performer's jumpskirt @@ -105,13 +135,13 @@ ent-ClothingUniformJumpskirtOfLife = skirt of life ent-ClothingUniformJumpskirtSeniorEngineer = senior engineer jumpskirt .desc = A sign of skill and prestige within the engineering department. ent-ClothingUniformJumpskirtSeniorResearcher = senior researcher jumpskirt - .desc = A sign of skill and prestige within the science department. + .desc = A sign of skill and prestige within the epistemics department. ent-ClothingUniformJumpskirtSeniorPhysician = senior physician jumpskirt .desc = A sign of skill and prestige within the medical department. ent-ClothingUniformJumpskirtSeniorOfficer = senior officer jumpskirt .desc = A sign of skill and prestige within the security department. ent-ClothingUniformJumpskirtSecGrey = grey security jumpskirt - .desc = A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood. + .desc = A light grey shirt with bright red highlights, for dedicated and responsive security officers. ent-ClothingUniformJumpskirtWeb = web jumpskirt .desc = Makes it clear that you are one with the webs. ent-ClothingUniformJumpskirtCasualBlue = casual blue jumpskirt @@ -120,5 +150,3 @@ ent-ClothingUniformJumpskirtCasualPurple = casual purple jumpskirt .desc = A loose worn purple shirt with a grey skirt, perfect for someone looking to relax. ent-ClothingUniformJumpskirtCasualRed = casual red jumpskirt .desc = A loose worn red shirt with a grey skirt, perfect for someone looking to relax. -ent-ClothingUniformJumpskirtOldDress = old dress - .desc = A worn-looking dress from a very long time ago. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl index 67a9e6c6791..ef525ac26b0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl @@ -11,21 +11,21 @@ ent-ClothingUniformJumpsuitBartenderPurple = purple bartender's uniform ent-ClothingUniformJumpsuitCaptain = captain's jumpsuit .desc = It's a blue jumpsuit with some gold markings denoting the rank of "Captain". ent-ClothingUniformJumpsuitCargo = cargo tech jumpsuit - .desc = A sturdy jumpsuit, issued to members of the Cargo department. + .desc = A sturdy jumpsuit, issued to members of the Logistics department. ent-ClothingUniformJumpsuitSalvageSpecialist = salvage specialist's jumpsuit .desc = It's a snappy jumpsuit with a sturdy set of overalls. It's very dirty. ent-ClothingUniformJumpsuitChiefEngineer = chief engineer's jumpsuit - .desc = It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. + .desc = It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding. ent-ClothingUniformJumpsuitChiefEngineerTurtle = chief engineer's turtleneck .desc = A yellow turtleneck designed specifically for work in conditions of the engineering department. ent-ClothingUniformJumpsuitChaplain = chaplain's jumpsuit .desc = It's a black jumpsuit, often worn by religious folk. ent-ClothingUniformJumpsuitCentcomAgent = CentCom agent's jumpsuit .desc = A suit worn by CentCom's legal team. Smells of burnt coffee. -ent-ClothingUniformJumpsuitCentcomOfficial = CentCom officer's suit - .desc = It's a suit worn by CentCom's highest-tier Commanders. -ent-ClothingUniformJumpsuitCentcomOfficer = CentCom turtleneck suit - .desc = A casual, yet refined green turtleneck, used by CentCom Officials. It has a fragrance of aloe. +ent-ClothingUniformJumpsuitCentcomOfficial = CentCom official's jumpsuit + .desc = It's a jumpsuit worn by CentCom's officials. +ent-ClothingUniformJumpsuitCentcomOfficer = CentCom officer's jumpsuit + .desc = It's a jumpsuit worn by CentCom Officers. ent-ClothingUniformJumpsuitChef = chef uniform .desc = Can't cook without this. ent-ClothingUniformJumpsuitChemistry = chemistry jumpsuit @@ -44,8 +44,6 @@ ent-ClothingUniformJumpsuitJesterAlt = { ent-ClothingUniformJumpsuitJester } .desc = { ent-ClothingUniformJumpsuitJester.desc } ent-ClothingUniformJumpsuitCMO = chief medical officer's jumpsuit .desc = It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. -ent-ClothingUniformJumpsuitCMOTurtle = chief medical officer's turtleneck jumpsuit - .desc = It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. ent-ClothingUniformJumpsuitDetective = hard-worn suit .desc = Someone who wears this means business. ent-ClothingUniformJumpsuitDetectiveGrey = noir suit @@ -57,13 +55,13 @@ ent-ClothingUniformJumpsuitEngineeringHazard = hazard jumpsuit ent-ClothingUniformJumpsuitHoP = head of personnel's jumpsuit .desc = Rather bland and inoffensive. Perfect for vanishing off the face of the universe. ent-ClothingUniformJumpsuitHoS = head of security's jumpsuit - .desc = It's bright red and rather crisp, much like security's victims tend to be. + .desc = A standard Station Security uniform, adorned with gold emblems and commander's epaulettes. ent-ClothingUniformJumpsuitHoSAlt = head of security's turtleneck .desc = It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security. ent-ClothingUniformJumpsuitHoSBlue = head of security's blue jumpsuit - .desc = A blue jumpsuit of Head of Security. + .desc = A blue Station Security shirt with charcoal trousers. Features gold emblems and commander's epaulettes. ent-ClothingUniformJumpsuitHoSGrey = head of security's grey jumpsuit - .desc = A grey jumpsuit of Head of Security, which make him look somewhat like a passenger. + .desc = A grey Station Security shirt with charcoal trousers. Stands out with red highlights, gold emblems, and commander's epaulettes. ent-ClothingUniformJumpsuitHoSParadeMale = head of security's parade uniform .desc = A male head of security's luxury-wear, for special occasions. ent-ClothingUniformJumpsuitHydroponics = hydroponics jumpsuit @@ -78,36 +76,70 @@ ent-ClothingUniformJumpsuitMime = mime suit .desc = ... ent-ClothingUniformJumpsuitParamedic = paramedic jumpsuit .desc = It's got a plus on it, that's a good thing right? -ent-ClothingUniformJumpsuitBrigmedic = brigmedic jumpsuit +ent-ClothingUniformJumpsuitBrigmedic = corpsman jumpsuit .desc = This uniform is issued to qualified personnel who have been trained. No one cares that the training took half a day. ent-ClothingUniformJumpsuitPrisoner = prisoner jumpsuit .desc = Busted. -ent-ClothingUniformJumpsuitQM = quartermaster's jumpsuit +ent-ClothingUniformJumpsuitQM = logistics officer's jumpsuit .desc = What can brown do for you? -ent-ClothingUniformJumpsuitQMTurtleneck = quartermasters's turtleneck +ent-ClothingUniformJumpsuitQMTurtleneck = logistics officer's turtleneck .desc = A sharp turtleneck made for the hardy work environment of supply. -ent-ClothingUniformJumpsuitQMFormal = quartermasters's formal suit - .desc = Inspired by the quartermasters of military's past, the perfect outfit for supplying a formal occasion. -ent-ClothingUniformJumpsuitResearchDirector = research director's turtleneck - .desc = It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants. +ent-ClothingUniformJumpsuitQMFormal = logistics officer's formal suit + .desc = Inspired by the logistics officers of military's past, the perfect outfit for supplying a formal occasion. +ent-ClothingUniformJumpsuitResearchDirector = mystagogue's turtleneck + .desc = It's a turtleneck worn by those with the know-how to achieve the position of Mystagogue. Its fabric provides minor protection from biological contaminants. ent-ClothingUniformJumpsuitScientist = scientist jumpsuit - .desc = It's made of a special fiber that increases perceived intelligence and decreases personal ethics. It has markings that denote the wearer as a scientist. + .desc = It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist. ent-ClothingUniformJumpsuitScientistFormal = scientist's formal jumpsuit .desc = A uniform for sophisticated scientists, best worn with its matching tie. ent-ClothingUniformJumpsuitRoboticist = roboticist jumpsuit .desc = It's a slimming black with reinforced seams; great for industrial work. ent-ClothingUniformJumpsuitSec = security jumpsuit - .desc = A jumpsuit made of strong material, providing robust protection. -ent-ClothingUniformJumpsuitSecBlue = blue shirt and tie - .desc = I'm a little busy right now, Calhoun. + .desc = Charcoal trousers and a dull red shirt, the standard-issue uniform of the infamous Station Security Department. +ent-ClothingUniformJumpsuitSecBlue = blue security jumpsuit + .desc = A cool blue shirt over charcoal trousers, for the calm and collected security officer. ent-ClothingUniformJumpsuitSecGrey = grey security jumpsuit - .desc = A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood. -ent-ClothingUniformJumpsuitWarden = warden's uniform - .desc = A formal security suit for officers complete with Nanotrasen belt buckle. + .desc = A light grey shirt with bright red highlights, for dedicated and responsive security officers. +ent-ClothingUniformJumpsuitWarden = warden's jumpsuit + .desc = Red shirt on charcoal trousers, with white markings and epaulettes that denote a warden's rank. +ent-ClothingUniformJumpsuitColorGrey = grey jumpsuit + .desc = A tasteful grey jumpsuit that reminds you of the good old days. +ent-ClothingUniformJumpsuitColorBlack = black jumpsuit + .desc = A generic black jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorBlue = blue jumpsuit + .desc = A generic blue jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorGreen = green jumpsuit + .desc = A generic green jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorOrange = orange jumpsuit + .desc = Don't wear this near paranoid security officers. +ent-ClothingUniformJumpsuitColorPink = pink jumpsuit + .desc = Just looking at this makes you feel fabulous. +ent-ClothingUniformJumpsuitColorRed = red jumpsuit + .desc = A generic red jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorWhite = white jumpsuit + .desc = A generic white jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorYellow = yellow jumpsuit + .desc = A generic yellow jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorDarkBlue = dark blue jumpsuit + .desc = A generic dark blue jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorTeal = teal jumpsuit + .desc = A generic teal jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorPurple = purple jumpsuit + .desc = A generic purple jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorDarkGreen = dark green jumpsuit + .desc = A generic dark green jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorLightBrown = light brown jumpsuit + .desc = A generic light brown jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorBrown = brown jumpsuit + .desc = A generic brown jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorMaroon = maroon jumpsuit + .desc = A generic maroon jumpsuit with no rank markings. +ent-ClothingUniformColorRainbow = rainbow jumpsuit + .desc = A multi-colored jumpsuit! ent-ClothingUniformOveralls = overalls .desc = Great for working outdoors. -ent-ClothingUniformJumpsuitLibrarian = sensible suit - .desc = It's very... sensible. +ent-ClothingUniformJumpsuitLibrarian = librarian jumpsuit + .desc = A cosy green jumper fit for a curator of books. ent-ClothingUniformJumpsuitCurator = sensible suit .desc = It's sensible. Too sensible... ent-ClothingUniformJumpsuitLawyerRed = red lawyer suit @@ -141,7 +173,7 @@ ent-ClothingUniformJumpsuitTacticool = tacticool jumpsuit ent-ClothingUniformJumpsuitMercenary = mercenary jumpsuit .desc = Clothing for real mercenaries who have gone through fire, water and the jungle of planets flooded with dangerous monsters or targets for which a reward has been assigned. ent-ClothingUniformJumpsuitNinja = ninja jumpsuit - .desc = A nano-enhanced jumpsuit designed for maximum comfort and tacticality. + .desc = Comfortable ninja suit, for convenience when relaxing and when you need to practice. ent-ClothingUniformJumpsuitAtmos = atmospheric technician jumpsuit .desc = I am at work. I can't leave work. Work is breathing. I am testing air quality. ent-ClothingUniformJumpsuitAtmosCasual = atmospheric technician's casual jumpsuit @@ -158,10 +190,8 @@ ent-ClothingUniformJumpsuitMonasticRobeDark = dark monastic robe .desc = It's a dark robe, often worn by religious folk. ent-ClothingUniformJumpsuitMonasticRobeLight = light monastic robe .desc = It's a light robe, often worn by religious folk. -ent-ClothingUniformJumpsuitMusician = carpskin suit - .desc = An luxurious suit made with only the finest scales, perfect for any lounge act! -ent-ClothingUniformJumpsuitERTChaplain = ERT chaplain uniform - .desc = A special suit made for Central Command's elite chaplain corps. +ent-ClothingUniformJumpsuitMusician = musician's tuxedo + .desc = A fancy tuxedo for the musically inclined. Perfect for any lounge act! ent-ClothingUniformJumpsuitERTEngineer = ERT engineering uniform .desc = A special suit made for the elite engineers under CentCom. ent-ClothingUniformJumpsuitERTJanitor = ERT janitorial uniform @@ -196,7 +226,7 @@ ent-ClothingUniformJumpsuitFlannel = flannel jumpsuit ent-ClothingUniformJumpsuitSeniorEngineer = senior engineer jumpsuit .desc = A sign of skill and prestige within the engineering department. ent-ClothingUniformJumpsuitSeniorResearcher = senior researcher jumpsuit - .desc = A sign of skill and prestige within the science department. + .desc = A sign of skill and prestige within the epistemics department. ent-ClothingUniformJumpsuitSeniorPhysician = senior physician jumpsuit .desc = A sign of skill and prestige within the medical department. ent-ClothingUniformJumpsuitSeniorOfficer = senior officer jumpsuit diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/random_suit.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/random_suit.ftl index 7e54980293f..d6cf5ddc9c5 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/random_suit.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/random_suit.ftl @@ -5,7 +5,7 @@ ent-ClothingRandomSpawner = random colorful costume .desc = { ent-ClothingUniformRandom.desc } ent-ClothingUniformRandomArmless = colorful hands-free costume .desc = { ent-ClothingUniformRandom.desc } -ent-ClothingUniformRandomStandard = colorful costume +ent-ClothingUniformRandomStandart = colorful costume .desc = { ent-ClothingUniformRandom.desc } ent-ClothingUniformRandomBra = colorful bra .desc = { ent-ClothingUniformRandom.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/effects/rcd.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/effects/rcd.ftl index 37a7e669feb..4217dee5c40 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/effects/rcd.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/effects/rcd.ftl @@ -1,22 +1,2 @@ -ent-EffectRCDBase = { "" } +ent-EffectRCDConstruction = { "" } .desc = { "" } -ent-EffectRCDDeconstructPreview = { ent-EffectRCDBase } - .desc = { ent-EffectRCDBase.desc } -ent-EffectRCDConstruct0 = { ent-EffectRCDBase } - .desc = { ent-EffectRCDBase.desc } -ent-EffectRCDConstruct1 = { ent-EffectRCDBase } - .desc = { ent-EffectRCDBase.desc } -ent-EffectRCDConstruct2 = { ent-EffectRCDBase } - .desc = { ent-EffectRCDBase.desc } -ent-EffectRCDConstruct3 = { ent-EffectRCDBase } - .desc = { ent-EffectRCDBase.desc } -ent-EffectRCDConstruct4 = { ent-EffectRCDBase } - .desc = { ent-EffectRCDBase.desc } -ent-EffectRCDDeconstruct2 = { ent-EffectRCDBase } - .desc = { ent-EffectRCDBase.desc } -ent-EffectRCDDeconstruct4 = { ent-EffectRCDBase } - .desc = { ent-EffectRCDBase.desc } -ent-EffectRCDDeconstruct6 = { ent-EffectRCDBase } - .desc = { ent-EffectRCDBase.desc } -ent-EffectRCDDeconstruct8 = { ent-EffectRCDBase } - .desc = { ent-EffectRCDBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/corpses.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/corpses.ftl index 1beeacb57f4..fb7c2102f76 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/corpses.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/corpses.ftl @@ -4,11 +4,11 @@ ent-RandomServiceCorpseSpawner = Random Service Corpse Spawner .desc = { ent-SalvageHumanCorpseSpawner.desc } ent-RandomEngineerCorpseSpawner = Random Engineer Corpse Spawner .desc = { ent-SalvageHumanCorpseSpawner.desc } -ent-RandomCargoCorpseSpawner = Random Cargo Corpse Spawner +ent-RandomCargoCorpseSpawner = Random Logistics Corpse Spawner .desc = { ent-SalvageHumanCorpseSpawner.desc } ent-RandomMedicCorpseSpawner = Random Medic Corpse Spawner .desc = { ent-SalvageHumanCorpseSpawner.desc } -ent-RandomScienceCorpseSpawner = Random Science Corpse Spawner +ent-RandomScienceCorpseSpawner = Random Epistemics Corpse Spawner .desc = { ent-SalvageHumanCorpseSpawner.desc } ent-RandomSecurityCorpseSpawner = Random Security Corpse Spawner .desc = { ent-SalvageHumanCorpseSpawner.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/ghost_roles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/ghost_roles.ftl index 8b7a5da047c..66c946f4446 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/ghost_roles.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/ghost_roles.ftl @@ -1,5 +1,3 @@ -ent-BaseAntagSpawner = ghost role spawn point - .desc = { ent-MarkerBase.desc } ent-SpawnPointGhostRatKing = ghost role spawn point .suffix = rat king .desc = { ent-MarkerBase.desc } @@ -12,16 +10,14 @@ ent-SpawnPointGhostCerberus = ghost role spawn point ent-SpawnPointGhostNukeOperative = ghost role spawn point .suffix = nukeops .desc = { ent-MarkerBase.desc } -ent-SpawnPointLoneNukeOperative = { ent-BaseAntagSpawner } - .desc = { ent-BaseAntagSpawner.desc } -ent-SpawnPointNukeopsCommander = { ent-SpawnPointLoneNukeOperative } - .desc = { ent-SpawnPointLoneNukeOperative.desc } -ent-SpawnPointNukeopsMedic = { ent-SpawnPointLoneNukeOperative } - .desc = { ent-SpawnPointLoneNukeOperative.desc } -ent-SpawnPointNukeopsOperative = { ent-SpawnPointLoneNukeOperative } - .desc = { ent-SpawnPointLoneNukeOperative.desc } -ent-SpawnPointGhostDragon = { ent-BaseAntagSpawner } - .desc = { ent-BaseAntagSpawner.desc } +ent-SpawnPointLoneNukeOperative = ghost role spawn point + .suffix = loneops + .desc = { ent-MarkerBase.desc } +ent-SpawnPointGhostDragon = ghost role spawn point + .suffix = dragon + .desc = { ent-MarkerBase.desc } ent-SpawnPointGhostSpaceNinja = ghost role spawn point .suffix = space ninja .desc = { ent-MarkerBase.desc } +ent-SpawnPointGhostTerminator = terminator spawn point + .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl index 33134932e6d..2c04921086b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl @@ -5,7 +5,7 @@ ent-SpawnPointObserver = observer spawn point .desc = { ent-MarkerBase.desc } ent-SpawnPointLatejoin = latejoin spawn point .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointQuartermaster = quartermaster +ent-SpawnPointQuartermaster = logistics officer .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointCargoTechnician = cargotechnician .desc = { ent-SpawnPointJobBase.desc } @@ -53,19 +53,25 @@ ent-SpawnPointHeadOfPersonnel = headofpersonnel .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointChiefEngineer = chiefengineer .desc = { ent-SpawnPointJobBase.desc } +ent-SpawnPointSeniorEngineer = seniorengineer + .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointStationEngineer = stationengineer .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointAtmos = atmospherics .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointChiefMedicalOfficer = chiefmedicalofficer .desc = { ent-SpawnPointJobBase.desc } +ent-SpawnPointSeniorPhysician = seniorphysician + .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointMedicalDoctor = medicaldoctor .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointParamedic = paramedic .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointChemist = chemist .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointResearchDirector = researchdirector +ent-SpawnPointResearchDirector = mystagogue + .desc = { ent-SpawnPointJobBase.desc } +ent-SpawnPointSeniorResearcher = seniorresearcher .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointScientist = scientist .desc = { ent-SpawnPointJobBase.desc } @@ -73,16 +79,16 @@ ent-SpawnPointHeadOfSecurity = headofsecurity .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointWarden = warden .desc = { ent-SpawnPointJobBase.desc } +ent-SpawnPointSeniorOfficer = seniorofficer + .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointSecurityOfficer = securityofficer .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointDetective = detective .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointBrigmedic = brigmedic +ent-SpawnPointBrigmedic = corpsman .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointERTLeader = ERTleader .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointERTChaplain = ERTchaplain - .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointERTEngineer = ERTengineer .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointERTMedical = ERTmedical diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl index 10495d6b083..2fcddb79721 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl @@ -8,6 +8,8 @@ ent-SpawnMobPossumMorty = Possum Morty Spawner .desc = { ent-MarkerBase.desc } ent-SpawnMobRaccoonMorticia = Raccoon Morticia Spawner .desc = { ent-MarkerBase.desc } +ent-SpawnMobDrone = Drone Spawner + .desc = { ent-MarkerBase.desc } ent-SpawnMobFoxRenault = Fox Renault Spawner .desc = { ent-MarkerBase.desc } ent-SpawnMobCatRuntime = Runtime Spawner @@ -118,5 +120,3 @@ ent-SpawnMobLuminousObject = luminous object spawner .desc = { ent-MarkerBase.desc } ent-SpawnMobLuminousEntity = luminous entity spawner .desc = { ent-MarkerBase.desc } -ent-SpawnClownSpider = clown spider spawner - .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/crates.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/crates.ftl index 390cf66c145..80fdd85f967 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/crates.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/crates.ftl @@ -3,7 +3,3 @@ ent-CrateEmptySpawner = Empty Crate Spawner ent-CrateFilledSpawner = Filled Crate Spawner .suffix = Low Value .desc = { ent-MarkerBase.desc } -ent-LootSpawnerRandomCrateEngineering = random engineering crate spawner - .desc = { ent-MarkerBase.desc } -ent-LootSpawnerRandomCrateSecurity = random security crate spawner - .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/corpses/corpses.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/corpses/corpses.ftl index 23684c868f0..fd10035d066 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/corpses/corpses.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/corpses/corpses.ftl @@ -5,13 +5,13 @@ ent-MobRandomEngineerCorpse = { ent-SalvageHumanCorpse } .suffix = Dead, Engineer .desc = { ent-SalvageHumanCorpse.desc } ent-MobRandomCargoCorpse = { ent-SalvageHumanCorpse } - .suffix = Dead, Cargo + .suffix = Dead, Logistics .desc = { ent-SalvageHumanCorpse.desc } ent-MobRandomMedicCorpse = { ent-SalvageHumanCorpse } .suffix = Dead, Medic .desc = { ent-SalvageHumanCorpse.desc } ent-MobRandomScienceCorpse = { ent-SalvageHumanCorpse } - .suffix = Dead, Science + .suffix = Dead, Epistemics .desc = { ent-SalvageHumanCorpse.desc } ent-MobRandomSecurityCorpse = { ent-SalvageHumanCorpse } .suffix = Dead, Security diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/cyborgs/base_borg_chassis.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/cyborgs/base_borg_chassis.ftl index 258020ffb47..d2a5091cf97 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/cyborgs/base_borg_chassis.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/cyborgs/base_borg_chassis.ftl @@ -1,7 +1,5 @@ ent-BaseBorgChassis = cyborg .desc = A man-machine hybrid that assists in station activity. They love being asked to state their laws over and over. -ent-BaseBorgTransponder = { "" } - .desc = { "" } ent-BaseBorgChassisNT = { ent-BaseBorgChassis } .desc = { ent-BaseBorgChassis.desc } ent-BaseBorgChassisSyndicate = { ent-BaseBorgChassis } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl index 43b722f16e5..44ba4b49e95 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl @@ -59,19 +59,8 @@ ent-MobMonkeySyndicateAgent = { ent-MobBaseSyndicateMonkey } ent-MobMonkeySyndicateAgentNukeops = { ent-MobBaseSyndicateMonkey } .suffix = NukeOps .desc = { ent-MobBaseSyndicateMonkey.desc } -ent-MobBaseKobold = kobold - .desc = Cousins to the sentient race of lizard people, kobolds blend in with their natural habitat and are as nasty as monkeys; ready to pull out your hair and stab you to death. ent-MobKobold = kobold .desc = Cousins to the sentient race of lizard people, kobolds blend in with their natural habitat and are as nasty as monkeys; ready to pull out your hair and stab you to death. -ent-MobBaseSyndicateKobold = { ent-MobBaseKobold } - .suffix = syndicate base - .desc = { ent-MobBaseKobold.desc } -ent-MobKoboldSyndicateAgent = { ent-MobBaseSyndicateKobold } - .suffix = syndicate agent - .desc = { ent-MobBaseSyndicateKobold.desc } -ent-MobKoboldSyndicateAgentNukeops = { ent-MobBaseSyndicateKobold } - .suffix = NukeOps - .desc = { ent-MobBaseSyndicateKobold.desc } ent-MobGuidebookMonkey = guidebook monkey .desc = A hopefully helpful monkey whose only purpose in life is for you to click on. Does this count as having a monkey give you a tutorial? ent-MobMouse = mouse @@ -86,8 +75,6 @@ ent-MobMouse1 = { ent-MobMouse } .desc = { ent-MobMouse.desc } ent-MobMouse2 = { ent-MobMouse } .desc = { ent-MobMouse.desc } -ent-MobMouseCancer = cancer mouse - .desc = Toxic. Squeak! ent-MobLizard = lizard .desc = A harmless dragon. ent-MobSlug = slug @@ -109,9 +96,6 @@ ent-MobGiantSpiderAngry = tarantula .desc = { ent-MobGiantSpider.desc } ent-MobClownSpider = clown spider .desc = Combines the two most terrifying things in existence, spiders and clowns. -ent-MobGiantSpiderWizard = wizard spider - .desc = This spider looks a little magical - .suffix = Wizard ent-MobPossum = possum .desc = "O Possum! My Possum!" -- Walt Whitman, 1865 ent-MobPossumOld = possum diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/argocyte.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/argocyte.ftl index d51912f1c92..1ad9ca90631 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/argocyte.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/argocyte.ftl @@ -1,4 +1,4 @@ -ent-BaseMobArgocyte = { ent-BaseSimpleMob } +ent-BaseMobArgocyte = { ent-MobCombat } .desc = A dangerous alien found on the wrong side of planets, known for their propensity for munching on ruins. .suffix = AI ent-MobArgocyteSlurva = slurva diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/elemental.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/elemental.ftl index 9f848b2e731..1b655d1f407 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/elemental.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/elemental.ftl @@ -1,7 +1,7 @@ ent-MobElementalBase = { "" } .desc = { "" } ent-MobOreCrab = ore crab - .desc = { ent-MobElementalBase.desc } + .desc = { ent-MobCombat.desc } ent-MobQuartzCrab = { ent-MobOreCrab } .desc = An ore crab made from Quartz. ent-MobIronCrab = { ent-MobOreCrab } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/human.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/human.ftl index a82f4fe83b6..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 @@ -9,7 +9,7 @@ ent-MobSyndicateFootsoldier = syndicate footsoldier ent-MobSyndicateFootsoldierPilot = syndicate shuttle pilot .desc = { ent-MobSyndicateFootsoldier.desc } ent-SalvageHumanCorpse = unidentified corpse - .desc = I think they're dead. + .desc = I think he's dead. .suffix = Dead ent-MobCluwne = person .desc = A polymorphed unfortunate. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/miscellaneous.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/miscellaneous.ftl index 639f3b6a337..3387b09cc9c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/miscellaneous.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/miscellaneous.ftl @@ -1,4 +1,2 @@ ent-MobLaserRaptor = laser raptor .desc = From the Viking age. -ent-MobTomatoKiller = tomato killer - .desc = it seems today it's not you eating tomatoes, it's the tomatoes eating you. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/silicon.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/silicon.ftl index 9b0c1106a45..b98b9bc4c0c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/silicon.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/silicon.ftl @@ -10,5 +10,3 @@ ent-MobMedibot = medibot .desc = No substitute for a doctor, but better than nothing. ent-MobMimeBot = mimebot .desc = Why not give mimebot a friendly wave. -ent-MobSupplyBot = supplybot - .desc = Delivers cargo! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/simplemob.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/simplemob.ftl index 46e1c6729d7..4d95de5e17d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/simplemob.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/simplemob.ftl @@ -1,9 +1,9 @@ -ent-BaseSimpleMob = { "" } - .suffix = AI - .desc = { "" } +ent-BaseSimpleMob = { ent-BaseMob } + .suffix = AI + .desc = { ent-BaseMob.desc } ent-SimpleSpaceMobBase = { ent-BaseSimpleMob } - .suffix = AI - .desc = { ent-BaseSimpleMob.desc } + .suffix = AI + .desc = { ent-BaseSimpleMob.desc } ent-SimpleMobBase = { ent-SimpleSpaceMobBase } - .suffix = AI - .desc = { ent-SimpleSpaceMobBase.desc } + .suffix = AI + .desc = { ent-SimpleSpaceMobBase.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl index 4fe569c7a1c..81f1b70b60f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl @@ -1,9 +1,5 @@ -ent-BaseMobAdultSlimes = basic slime - .desc = It looks so much like jelly. I wonder what it tastes like? ent-MobAdultSlimes = basic slime .desc = It looks so much like jelly. I wonder what it tastes like? -ent-MobSlimesGeras = geras - .desc = A geras of a slime - the name is ironic, isn't it? ent-MobAdultSlimesBlue = blue slime .desc = { ent-MobAdultSlimes.desc } ent-MobAdultSlimesBlueAngry = blue slime diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/spacetick.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/spacetick.ftl index 7dcceb363ef..4b0d7b1f1c5 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/spacetick.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/spacetick.ftl @@ -1,5 +1,5 @@ ent-MobTick = space tick - .desc = It's a space tick, watch out for its nasty bite. CentCom reports that 90 percent of cargo leg amputations are due to space tick bites. + .desc = It's a space tick, watch out for its nasty bite. CentCom reports that 90 percent of logistics leg amputations are due to space tick bites. ent-MobTickSalvage = { ent-MobTick } .suffix = Salvage Ruleset .desc = { ent-MobTick.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl index d54c283ada4..fabbed05963 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl @@ -1,18 +1,18 @@ ent-MobXeno = Burrower .desc = They mostly come at night. Mostly. -ent-MobXenoPraetorian = Praetorian +ent-MobXenoPraetorianNPC = Praetorian .desc = { ent-MobXeno.desc } -ent-MobXenoDrone = Drone +ent-MobXenoDroneNPC = Drone .desc = { ent-MobXeno.desc } -ent-MobXenoQueen = Queen +ent-MobXenoQueenNPC = Queen .desc = { ent-MobXeno.desc } -ent-MobXenoRavager = Ravager +ent-MobXenoRavagerNPC = Ravager .desc = { ent-MobXeno.desc } -ent-MobXenoRunner = Runner +ent-MobXenoRunnerNPC = Runner .desc = { ent-MobXeno.desc } -ent-MobXenoRouny = Rouny - .desc = { ent-MobXenoRunner.desc } -ent-MobXenoSpitter = Spitter +ent-MobXenoRounyNPC = Rouny + .desc = { ent-MobXenoRunnerNPC.desc } +ent-MobXenoSpitterNPC = Spitter .desc = { ent-MobXeno.desc } ent-MobPurpleSnake = space adder .desc = A menacing purple snake from Kepler-283c. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/dragon.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/dragon.ftl index 845516e57f4..228eab1e017 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/dragon.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/dragon.ftl @@ -1,10 +1,7 @@ ent-BaseMobDragon = space dragon .desc = A flying leviathan, loosely related to space carps. ent-MobDragon = { ent-BaseMobDragon } - .suffix = No role or objectives .desc = { ent-BaseMobDragon.desc } -ent-DragonsBreathGun = dragon's lung - .desc = For dragon's breathing ent-MobDragonDungeon = { ent-BaseMobDragon } .suffix = Dungeon .desc = { ent-BaseMobDragon.desc } @@ -12,5 +9,3 @@ ent-ActionSpawnRift = Summon Carp Rift .desc = Summons a carp rift that will periodically spawns carps. ent-ActionDevour = [color=red]Devour[/color] .desc = Attempt to break a structure with your jaws or swallow a creature. -ent-ActionDragonsBreath = [color=orange]Dragon's Breath[/color] - .desc = Spew out flames at anyone foolish enough to attack you! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl index d308856388c..94c41f9f03a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl @@ -10,12 +10,6 @@ ent-RandomHumanoidSpawnerERTLeaderEVA = ERT leader ent-RandomHumanoidSpawnerERTLeaderEVALecter = { ent-RandomHumanoidSpawnerERTLeaderEVA } .suffix = ERTRole, Lecter, EVA .desc = { ent-RandomHumanoidSpawnerERTLeaderEVA.desc } -ent-RandomHumanoidSpawnerERTChaplain = ERT chaplain - .suffix = ERTRole, Basic - .desc = { ent-RandomHumanoidSpawnerERTLeader.desc } -ent-RandomHumanoidSpawnerERTChaplainEVA = ERT chaplain - .suffix = ERTRole, Enviro EVA - .desc = { ent-RandomHumanoidSpawnerERTChaplain.desc } ent-RandomHumanoidSpawnerERTJanitor = ERT janitor .suffix = ERTRole, Basic .desc = { ent-RandomHumanoidSpawnerERTLeader.desc } @@ -55,29 +49,3 @@ ent-RandomHumanoidSpawnerNukeOp = Nuclear Operative ent-RandomHumanoidSpawnerCluwne = Cluwne .suffix = spawns a cluwne .desc = { "" } -ent-LostCargoTechnicianSpawner = lost cargo technician spawner - .desc = { ent-MarkerBase.desc } -ent-RandomHumanoidLostCargoTechnician = lost cargo technician ghost role - .desc = { "" } -ent-ClownTroupeSpawner = clown troupe spawner - .desc = { ent-MarkerBase.desc } -ent-RandomHumanoidClownTroupe = clown troupe ghost role - .desc = { "" } -ent-RandomHumanoidClownTroupeBanana = banana clown troupe - .desc = { ent-RandomHumanoidClownTroupe.desc } -ent-TravelingChefSpawner = traveling chef spawner - .desc = { ent-MarkerBase.desc } -ent-RandomHumanoidTravelingChef = traveling chef ghost role - .desc = { "" } -ent-DisasterVictimSpawner = disaster victim spawner - .desc = { ent-MarkerBase.desc } -ent-RandomHumanoidDisasterVictimRD = disaster victim RD ghost role - .desc = { "" } -ent-RandomHumanoidDisasterVictimCMO = disaster victim CMO ghost role - .desc = { ent-RandomHumanoidDisasterVictimRD.desc } -ent-RandomHumanoidDisasterVictimCaptain = disaster victim Captain ghost role - .desc = { ent-RandomHumanoidDisasterVictimRD.desc } -ent-SyndieDisasterVictimSpawner = syndie disaster victim spawner - .desc = { ent-MarkerBase.desc } -ent-RandomHumanoidSyndieDisasterVictim = syndie disaster victim ghost role - .desc = { "" } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/narsie.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/narsie.ftl index 8bd294bec00..412f279d236 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/narsie.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/narsie.ftl @@ -4,4 +4,4 @@ ent-MobNarsieSpawn = { ent-MobNarsieBase } .suffix = Spawn .desc = { ent-MobNarsieBase.desc } ent-MobNarsie = { ent-MobNarsieBase } - .desc = { ent-MobNarsieBase.desc } + .desc = { ent-MobNarsieBase.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/ratvar.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/ratvar.ftl index ceb00778057..2ccdfb838ff 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/ratvar.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/ratvar.ftl @@ -4,4 +4,4 @@ ent-MobRatvarSpawn = { ent-MobRatvarBase } .suffix = Spawn .desc = { ent-MobRatvarBase.desc } ent-MobRatvar = { ent-MobRatvarBase } - .desc = { ent-MobRatvarBase.desc } + .desc = { ent-MobRatvarBase.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/reptilian.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/reptilian.ftl index 98264db63fd..47cfbb9cc23 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/reptilian.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/reptilian.ftl @@ -1,3 +1,2 @@ -ent-MobReptilian = Urist McScales - .suffix = Urisst' Mzhand +ent-MobReptilian = Urisst' Mzhand .desc = { ent-BaseMobReptilian.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/terminator.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/terminator.ftl index f51c4b06e8e..ddaf31fdd6b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/terminator.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/terminator.ftl @@ -1,6 +1,6 @@ ent-MobTerminatorBase = { "" } .desc = { "" } ent-MobHumanTerminator = exterminator - .desc = { ent-MobHuman.desc } + .desc = { ent-MobTerminatorBase.desc } ent-MobTerminatorEndoskeleton = nt-800 "exterminator" endoskeleton .desc = The inner powerhouse of Susnet's infiltrator androids. Ridiculously hard alloy on the inside, unassuming flesh on the outside. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/vox.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/vox.ftl index a65a8396af6..53f3bda379e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/vox.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/vox.ftl @@ -1,2 +1,2 @@ -ent-MobVox = Urist McVox +ent-MobVox = Vox .desc = { ent-BaseMobVox.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/species/skeleton.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/species/skeleton.ftl index a4dd1140c70..90d1ebebd7c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/species/skeleton.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/species/skeleton.ftl @@ -1,4 +1,4 @@ ent-BaseMobSkeletonPerson = Urist McSkelly - .desc = { ent-BaseMobSpeciesOrganic.desc } + .desc = { ent-BaseMobSpecies.desc } ent-MobSkeletonPersonDummy = { ent-BaseSpeciesDummy } .desc = { ent-BaseSpeciesDummy.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl index d93ac50df48..f7f6cf76818 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl @@ -1,8 +1,5 @@ ent-DrinkCartonBaseFull = { ent-DrinkBase } - .suffix = Full .desc = { ent-DrinkBase.desc } -ent-DrinkCartonBaseLargeFull = { ent-DrinkCartonBaseFull } - .desc = { ent-DrinkCartonBaseFull.desc } ent-DrinkCartonVisualsOpenable = { "" } .desc = { "" } ent-DrinkJuiceLimeCarton = lime juice @@ -11,8 +8,6 @@ ent-DrinkJuiceOrangeCarton = orange juice .desc = Full of vitamins and deliciousness! ent-DrinkJuiceTomatoCarton = tomato juice .desc = Well, at least it LOOKS like tomato juice. You can't tell with all that redness. -ent-DrinkCoconutWaterCarton = coconut water - .desc = It's the inside of the coconut that counts. ent-DrinkCreamCarton = milk cream .desc = It's cream. Made from milk. What else did you think you'd find in there? ent-DrinkMilkCarton = milk diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl index f7e9940974a..7b33c6047e8 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl @@ -30,9 +30,6 @@ ent-DrinkAndalusia = { ent-DrinkGlass } ent-DrinkAntifreeze = { ent-DrinkGlass } .suffix = antifreeze .desc = { ent-DrinkGlass.desc } -ent-DrinkArnoldPalmer = { ent-DrinkGlass } - .suffix = arnold palmer - .desc = { ent-DrinkGlass.desc } ent-DrinkAtomicBombGlass = { ent-DrinkGlass } .suffix = atomic bomb .desc = { ent-DrinkGlass.desc } @@ -66,42 +63,24 @@ ent-DrinkBlueCuracaoGlass = { ent-DrinkGlass } ent-DrinkBloodyMaryGlass = { ent-DrinkGlass } .suffix = bloody mary .desc = { ent-DrinkGlass.desc } -ent-DrinkBlueHawaiianGlass = { ent-DrinkGlass } - .suffix = blue hawaiian - .desc = { ent-DrinkGlass.desc } ent-DrinkBooger = { ent-DrinkGlass } .suffix = booger .desc = { ent-DrinkGlass.desc } ent-DrinkBraveBullGlass = { ent-DrinkGlass } .suffix = brave bull .desc = { ent-DrinkGlass.desc } -ent-BudgetInsulsDrinkGlass = { ent-DrinkGlass } - .suffix = budget insuls - .desc = { ent-DrinkGlass.desc } ent-DrinkCarrotJuice = { ent-DrinkGlass } .suffix = carrot juice .desc = { ent-DrinkGlass.desc } ent-DrinkChocolateGlass = { ent-DrinkGlass } .suffix = chocolate .desc = { ent-DrinkGlass.desc } -ent-RubberneckGlass = { ent-DrinkGlass } - .suffix = rubberneck - .desc = { ent-DrinkGlass.desc } -ent-DrinkCoconutRum = { ent-DrinkGlass } - .suffix = coconut rum - .desc = { ent-DrinkGlass.desc } -ent-DrinkCoconutWaterGlass = { ent-DrinkGlass } - .suffix = coconut water - .desc = { ent-DrinkGlass.desc } ent-DrinkCoffee = { ent-DrinkGlass } .suffix = coffee .desc = { ent-DrinkGlass.desc } ent-DrinkCognacGlass = { ent-DrinkGlass } .suffix = cognac .desc = { ent-DrinkGlass.desc } -ent-DrinkCosmopolitan = { ent-DrinkGlass } - .suffix = cosmopolitan - .desc = { ent-DrinkGlass.desc } ent-DrinkCream = { ent-DrinkGlass } .suffix = cream .desc = { ent-DrinkGlass.desc } @@ -186,9 +165,6 @@ ent-DrinkIceGlass = { ent-DrinkGlass } ent-DrinkIceCreamGlass = { ent-DrinkGlass } .suffix = ice cream .desc = { ent-DrinkGlass.desc } -ent-IrishBoolGlass = { ent-DrinkGlass } - .suffix = irish bool - .desc = { ent-DrinkGlass.desc } ent-DrinkIrishCarBomb = { ent-DrinkGlass } .suffix = irish car bomb .desc = { ent-DrinkGlass.desc } @@ -258,15 +234,9 @@ ent-DrinkNuclearColaGlass = { ent-DrinkGlass } ent-DrinkOrangeJuice = { ent-DrinkGlass } .suffix = orange juice .desc = { ent-DrinkGlass.desc } -ent-DrinkPainkillerGlass = { ent-DrinkGlass } - .suffix = painkiller - .desc = { ent-DrinkGlass.desc } ent-DrinkPatronGlass = { ent-DrinkGlass } .suffix = patron .desc = { ent-DrinkGlass.desc } -ent-DrinkPinaColadaGlass = { ent-DrinkGlass } - .suffix = piña colada - .desc = { ent-DrinkGlass.desc } ent-DrinkPoisonBerryJuice = { ent-DrinkGlass } .suffix = poison berry juice .desc = { ent-DrinkGlass.desc } @@ -291,12 +261,6 @@ ent-DrinkRootBeerFloatGlass = { ent-DrinkGlass } ent-DrinkRumGlass = { ent-DrinkGlass } .suffix = rum .desc = { ent-DrinkGlass.desc } -ent-DrinkRoyRogersGlass = { ent-DrinkGlass } - .suffix = roy rogers - .desc = { ent-DrinkGlass.desc } -ent-DrinkSakeGlass = { ent-DrinkGlass } - .suffix = sake - .desc = { ent-DrinkGlass.desc } ent-DrinkSbitenGlass = { ent-DrinkGlass } .suffix = sbiten .desc = { ent-DrinkGlass.desc } @@ -318,18 +282,12 @@ ent-DrinkMoonshineGlass = { ent-DrinkGlass } ent-DrinkGlassWhite = { ent-DrinkGlass } .suffix = milk .desc = { ent-DrinkGlass.desc } -ent-DrinkShirleyTempleGlass = { ent-DrinkGlass } - .suffix = shirley temple - .desc = { ent-DrinkGlass.desc } ent-DrinkSilencerGlass = { ent-DrinkGlass } .suffix = silencer .desc = { ent-DrinkGlass.desc } ent-DrinkSingulo = { ent-DrinkGlass } .suffix = singulo .desc = { ent-DrinkGlass.desc } -ent-DrinkSolDryGlass = { ent-DrinkGlass } - .suffix = sol dry - .desc = { ent-DrinkGlass.desc } ent-DrinkSnowWhite = { ent-DrinkGlass } .suffix = snow white .desc = { ent-DrinkGlass.desc } @@ -377,9 +335,6 @@ ent-DrinkVodkaGlass = { ent-DrinkGlass } ent-DrinkVodkaMartiniGlass = { ent-DrinkGlass } .suffix = vodka martini .desc = { ent-DrinkGlass.desc } -ent-DrinkVodkaRedBool = { ent-DrinkGlass } - .suffix = vodka red bool - .desc = { ent-DrinkGlass.desc } ent-DrinkVodkaTonicGlass = { ent-DrinkGlass } .suffix = vodka tonic .desc = { ent-DrinkGlass.desc } @@ -388,9 +343,6 @@ ent-DrinkWaterJug = water jug ent-DrinkWatermelonJuice = { ent-DrinkGlass } .suffix = watermelon juice .desc = { ent-DrinkGlass.desc } -ent-DrinkWatermelonWakeup = { ent-DrinkGlass } - .suffix = watermelon wakeup - .desc = { ent-DrinkGlass.desc } ent-DrinkWhiskeyColaGlass = { ent-DrinkGlass } .suffix = whiskey cola .desc = { ent-DrinkGlass.desc } @@ -406,9 +358,6 @@ ent-DrinkWhiteRussianGlass = { ent-DrinkGlass } ent-DrinkWineGlass = { ent-DrinkGlass } .suffix = wine .desc = { ent-DrinkGlass.desc } -ent-XenoBasherGlass = { ent-DrinkGlass } - .suffix = xeno basher - .desc = { ent-DrinkGlass.desc } ent-DrinkShakeBlue = blue milkshake .desc = { ent-DrinkGlassBase.desc } ent-DrinkShakeEmpty = shakeempty diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl index f3fc14bce12..cc5a0a66e13 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_bottles.ftl @@ -1,5 +1,4 @@ ent-DrinkBottlePlasticBaseFull = { ent-DrinkBase } - .suffix = Full .desc = { ent-DrinkBase.desc } ent-DrinkBottleGlassBaseFull = { ent-DrinkBottlePlasticBaseFull } .desc = { ent-DrinkBottlePlasticBaseFull.desc } @@ -63,8 +62,6 @@ ent-DrinkSodaWaterBottleFull = soda water bottle .desc = Like water, but angry! ent-DrinkTonicWaterBottleFull = tonic water bottle .desc = Like soda water, but angrier maybe? Often sweeter. -ent-DrinkSakeBottleFull = small sake bottle - .desc = The regret of the next morning seems to be nipping on the bottle too. ent-DrinkJuiceLimeCartonXL = lime juice XL .desc = Sweet-sour goodness. ent-DrinkJuiceOrangeCartonXL = orange juice XL @@ -73,15 +70,13 @@ ent-DrinkCreamCartonXL = Milk Cream XL .desc = It's cream. Made from milk. What else did you think you'd find in there? ent-DrinkSugarJug = sugar jug .desc = some people put this in their coffee... - .suffix = For Drinks, Full + .suffix = for drinks ent-DrinkLemonLimeJug = lemon lime jug .desc = a dual citrus sensation. ent-DrinkMeadJug = mead jug .desc = storing mead in a plastic jug should be a crime. ent-DrinkIceJug = ice jug .desc = stubborn water. pretty cool. -ent-DrinkCoconutWaterJug = coconut water jug - .desc = It's on the inside of the coconut that counts. ent-DrinkCoffeeJug = coffee jug .desc = wake up juice, of the heated kind. ent-DrinkTeaJug = tea jug diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cans.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cans.ftl index 7c5efcba549..363d165b61f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cans.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cans.ftl @@ -19,8 +19,6 @@ ent-DrinkSpaceMountainWindCan = space mountain wind can .desc = Blows right through you like a space wind. ent-DrinkSpaceUpCan = space-up can .desc = Tastes like a hull breach in your mouth. -ent-DrinkSolDryCan = sol dry - .desc = Sweet ginger soda from outer space! ent-DrinkStarkistCan = starkist can .desc = The taste of a star in liquid form. And, a bit of tuna...? ent-DrinkTonicWaterCan = tonic water can diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cups.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cups.ftl index 8ec8b8eb74a..f1cdeaeb65d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cups.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cups.ftl @@ -36,7 +36,7 @@ ent-DrinkTeacup = teacup .desc = A plain white porcelain teacup. ent-DrinkGreenTea = green tea .desc = A plain white porcelain teacup. -ent-DrinkLean = grape Juice - .desc = Damn, no fun allowed. +ent-DrinkLean = Lean + .desc = Often paired with doja sweet, drinking this concoction is the staple of a trill O.G. ent-DrinkWaterCup = water cup .desc = A paper water cup. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_special.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_special.ftl index 8c697ec86cc..85cbcab662d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_special.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_special.ftl @@ -6,9 +6,3 @@ ent-DrinkJar = jar .desc = The hipster's cup ent-DrinkJarWhat = jar of something .desc = You can't really tell what this is. -ent-BartenderMixer = { "" } - .desc = { "" } -ent-DrinkJigger = jigger - .desc = Like a shaker, but smaller. Used to control the amount of ingredients. -ent-DrinkIceBucket = ice bucket - .desc = A special bucket of refreshy ice. Prohibited use for challenge with the same name! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl index 655495d0f21..daffab44509 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl @@ -1,26 +1,20 @@ ent-DrinkBottleBaseEmpty = base empty bottle .desc = An empty bottle. - .suffix = Empty -ent-DrinkBottleBaseSmallEmpty = base empty bottle - .desc = { ent-DrinkBottleBaseEmpty.desc } ent-DrinkCartonBaseEmpty = base empty carton .desc = An empty carton. - .suffix = Empty -ent-DrinkCartonBaseLargeEmpty = base empty bottle - .desc = { ent-DrinkCartonBaseEmpty.desc } ent-DrinkBottleAbsinthe = Jailbreaker Verte bottle .desc = { ent-DrinkBottleBaseEmpty.desc } ent-DrinkBottleAlcoClear = alcohol bottle .desc = { ent-DrinkBottleBaseEmpty.desc } ent-DrinkBottleAle = ale bottle - .desc = { ent-DrinkBottleBaseSmallEmpty.desc } + .desc = { ent-DrinkBottleBaseEmpty.desc } ent-DrinkBottleBeer = beer bottle - .desc = { ent-DrinkBottleBaseSmallEmpty.desc } + .desc = { ent-DrinkBottleBaseEmpty.desc } ent-DrinkBottleCognac = cognac bottle .desc = { ent-DrinkBottleBaseEmpty.desc } ent-DrinkBottleGin = Griffeater gin bottle .desc = { ent-DrinkBottleBaseEmpty.desc } -ent-DrinkBottleGildlager = gildlager bottle +ent-DrinkBottleGoldschlager = goldschlager bottle .desc = { ent-DrinkBottleBaseEmpty.desc } ent-DrinkBottleCoffeeLiqueur = coffee liqueur bottle .desc = { ent-DrinkBottleBaseEmpty.desc } @@ -51,8 +45,8 @@ ent-DrinkCartonTomato = tomato juice carton ent-DrinkCartonCream = milk cream carton .desc = { ent-DrinkCartonBaseEmpty.desc } ent-DrinkCartonMilk = milk carton - .desc = { ent-DrinkCartonBaseLargeEmpty.desc } + .desc = { ent-DrinkCartonBaseEmpty.desc } ent-DrinkCartonSoyMilk = soy milk carton - .desc = { ent-DrinkCartonBaseLargeEmpty.desc } + .desc = { ent-DrinkCartonBaseEmpty.desc } ent-DrinkCartonOatMilk = oat milk carton - .desc = { ent-DrinkCartonBaseLargeEmpty.desc } + .desc = { ent-DrinkCartonBaseEmpty.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl index b6d1c44f61c..735669e2955 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl @@ -57,7 +57,7 @@ ent-FoodBreadFrenchToast = french toast ent-FoodBreadGarlicSlice = garlic bread .desc = Alas, it is limited. ent-FoodBreadJellySlice = jelly toast - .desc = As if science are gonna give up their slimes for toast! + .desc = As if epistemics are gonna give up their slimes for toast! ent-FoodBreadMoldySlice = moldy bread slice .desc = Entire stations have been ripped apart over arguing whether this is still good to eat. ent-FoodBreadTwoSlice = two slice diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl index 67399ac7b67..e24b819842f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl @@ -32,7 +32,7 @@ ent-FoodPizzaSassysageSlice = slice of sassysage pizza .desc = Deliciously sassy. ent-FoodPizzaPineapple = Hawaiian pizza .desc = Makes people burst into tears. Tears of joy or sadness depends on the persons fondness for pineapple. -ent-FoodPizzaPineappleSlice = slice of Hawaiian pizza +ent-FoodPizzaPineappleSlice = slice of pineapple pizza .desc = A slice of joy/sin. ent-FoodPizzaArnold = Arnold's pizza .desc = Hello, you've reached Arnold's pizza shop. I'm not here now, I'm out killing pepperoni. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/egg.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/egg.ftl index b56210a59a8..19b0e8e0452 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/egg.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/egg.ftl @@ -1,5 +1,5 @@ -ent-FoodEggBase = { ent-FoodInjectableBase } - .desc = An egg! +ent-FoodEggBase = { ent-ItemHeftyBase } + .desc = An egg! ent-Eggshells = eggshells .desc = You're walkin' on 'em bud. ent-FoodEgg = egg diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/meals.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/meals.ftl index 11b9aafb6ee..0b4d666be2c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/meals.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/meals.ftl @@ -45,7 +45,7 @@ ent-DisgustingSweptSoup = salty sweet miso cola soup ent-FoodMealQueso = queso .desc = A classic dipping sauce that you can't go wrong with. ent-FoodMealSashimi = sashimi - .desc = Its taste can only be described as "Exotic". The poisoning though? That's pretty common. + .desc = Its taste can only be described as "Exotic". ent-FoodMealEnchiladas = enchiladas .desc = Viva La Mexico! ent-FoodSaladWatermelonFruitBowl = melon fruit bowl diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl index dcb46286634..dff96009ad3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl @@ -78,9 +78,9 @@ ent-FoodOnionSlice = onion slice .desc = Nothing to cry over. ent-FoodOnionRedSlice = red onion slice .desc = Purple despite the name. -ent-FoodChiliPepper = chili pepper +ent-FoodChili = chili .desc = Spicy, best not touch your eyes. -ent-FoodChillyPepper = chilly pepper +ent-FoodChilly = chilly pepper .desc = Icy hot. ent-FoodAloe = aloe .desc = A fragrant plant with soothing properties. @@ -126,5 +126,3 @@ ent-FoodPumpkin = pumpkin .desc = A large, orange... berry. Seriously. ent-CottonBol = cotton boll .desc = Moth people's favorite snack, and just as fluffy as them. -ent-PyrottonBol = pyrotton boll - .desc = This will probably set you on fire. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/cigarettes/joints.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/cigarettes/joints.ftl index 93f58720f68..457cb530e22 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/cigarettes/joints.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/cigarettes/joints.ftl @@ -1,10 +1,4 @@ ent-Joint = joint .desc = A roll of dried plant matter wrapped in thin paper. -ent-JointRainbow = joint - .desc = A roll of dried plant matter wrapped in thin paper. Seems to be colorful inside. - .suffix = Rainbow ent-Blunt = blunt .desc = A roll of dried plant matter wrapped in a dried tobacco leaf. -ent-BluntRainbow = blunt - .desc = A roll of dried plant matter wrapped in a dried tobacco leaf. Seems to be colorful inside. - .suffix = Rainbow diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/pipes/pipe.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/pipes/pipe.ftl index 5677f9ac27e..9e3977c4c33 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/pipes/pipe.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/pipes/pipe.ftl @@ -6,6 +6,3 @@ ent-SmokingPipeFilledTobacco = pipe ent-SmokingPipeFilledCannabis = pipe .desc = Just like grandpappy used to smoke. .suffix = Cannabis -ent-SmokingPipeFilledCannabisRainbow = pipe - .desc = Just like grandpappy used to smoke. - .suffix = Rainbow Cannabis diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/present.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/present.ftl index aa7a3e6dde2..2ef8081d0b1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/present.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/present.ftl @@ -3,24 +3,19 @@ ent-PresentBase = present ent-Present = { ent-PresentBase } .suffix = Empty .desc = { ent-PresentBase.desc } - ent-PresentRandomUnsafe = { ent-PresentBase } - .suffix = Filled, any item .desc = { ent-PresentBase.desc } ent-PresentRandomInsane = { ent-PresentRandomUnsafe } .suffix = Filled, any entity .desc = { ent-PresentRandomUnsafe.desc } ent-PresentRandom = { ent-PresentBase } - .suffix = Filled Safe .desc = { ent-PresentBase.desc } ent-PresentRandomAsh = { ent-PresentBase } - .suffix = Filled Ash .desc = { ent-PresentBase.desc } ent-PresentRandomCash = { ent-PresentBase } - .suffix = Filled Cash .desc = { ent-PresentBase.desc } ent-PresentTrash = Wrapping Paper diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/computer.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/computer.ftl index f3438bfde3f..e72910bafb6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/computer.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/computer.ftl @@ -12,8 +12,6 @@ ent-StationRecordsComputerCircuitboard = station records computer board .desc = A computer printed circuit board for a station records computer. ent-CargoRequestComputerCircuitboard = cargo request computer board .desc = A computer printed circuit board for a cargo request computer. -ent-CargoSaleComputerCircuitboard = cargo sale computer board - .desc = A computer printed circuit board for a cargo sale computer. ent-CargoBountyComputerCircuitboard = cargo bounty computer board .desc = A computer printed circuit board for a cargo bounty computer. ent-CargoShuttleComputerCircuitboard = cargo shuttle computer board @@ -70,5 +68,3 @@ ent-ComputerMassMediaCircuitboard = news manager console board .desc = Write your message to the world! ent-SensorConsoleCircuitboard = sensor monitoring console board .desc = A computer printed circuit board for a sensor monitoring console. -ent-RoboticsConsoleCircuitboard = robotics control console board - .desc = A computer printed circuit board for a robotics control console. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl index 7048cfd0e23..d33853cd240 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl @@ -16,8 +16,6 @@ ent-MedicalTechFabCircuitboard = medical techfab machine board .desc = A machine printed circuit board for a medical techfab. ent-CircuitImprinterMachineCircuitboard = circuit imprinter machine board .desc = { ent-BaseMachineCircuitboard.desc } -ent-CircuitImprinterHyperConvectionMachineCircuitboard = hyper convection circuit imprinter machine board - .desc = A machine printed circuit board for a hyper convection circuit imprinter. ent-ExosuitFabricatorMachineCircuitboard = exosuit fabricator machine board .desc = { ent-BaseMachineCircuitboard.desc } ent-ResearchAndDevelopmentServerMachineCircuitboard = R&D server machine board @@ -30,6 +28,8 @@ ent-DiagnoserMachineCircuitboard = diagnoser machine board .desc = { ent-BaseMachineCircuitboard.desc } ent-ArtifactAnalyzerMachineCircuitboard = artifact analyzer machine board .desc = A machine printed circuit board for an artifact analyzer. +ent-TraversalDistorterMachineCircuitboard = traversal distorter machine board + .desc = A machine printed circuit board for a traversal distorter. ent-ArtifactCrusherMachineCircuitboard = artifact crusher machine board .desc = A machine printed circuit board for an artifact crusher. ent-AnomalyVesselCircuitboard = anomaly vessel machine board @@ -120,8 +120,6 @@ ent-SheetifierMachineCircuitboard = sheet-meister 2000 machine board .desc = { ent-BaseMachineCircuitboard.desc } ent-MicrowaveMachineCircuitboard = microwave machine board .desc = { ent-BaseMachineCircuitboard.desc } -ent-SyndicateMicrowaveMachineCircuitboard = donk co. microwave machine board - .desc = { ent-BaseMachineCircuitboard.desc } ent-FatExtractorMachineCircuitboard = lipid extractor machine board .desc = { ent-BaseMachineCircuitboard.desc } ent-FlatpackerMachineCircuitboard = Flatpacker 1001 machine board @@ -150,7 +148,13 @@ ent-SalvageMagnetMachineCircuitboard = salvage magnet machine board .desc = A machine printed circuit board for a salvage magnet. ent-MiniGravityGeneratorCircuitboard = mini gravity generator machine board .desc = A machine printed circuit board for a mini gravity generator. -ent-ReagentGrinderIndustrialMachineCircuitboard = industrial reagent grinder machine board - .desc = { ent-BaseMachineCircuitboard.desc } -ent-JukeboxCircuitBoard = jukebox machine board - .desc = A machine printed circuit board for a jukebox. +ent-ShuttleGunSvalinnMachineGunCircuitboard = LSE-400c "Svalinn machine gun" machine board + .desc = A machine printed circuit board for an LSE-400c "Svalinn machine gun" +ent-ShuttleGunPerforatorCircuitboard = LSE-1200c "Perforator" machine board + .desc = A machine printed circuit board for an LSE-1200c "Perforator" +ent-ShuttleGunFriendshipCircuitboard = EXP-320g "Friendship" machine board + .desc = A machine printed circuit board for an EXP-320g "Friendship" +ent-ShuttleGunDusterCircuitboard = EXP-2100g "Duster" machine board + .desc = A machine printed circuit board for an EXP-2100g "Duster" +ent-ShuttleGunKineticCircuitboard = PTK-800 "Matter Dematerializer" machine board + .desc = A machine printed circuit board for an PTK-800 "Matter Dematerializer" diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/door_remote.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/door_remote.ftl index fbeb03ac06a..8592b84b9ac 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/door_remote.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/door_remote.ftl @@ -10,12 +10,14 @@ ent-DoorRemoteService = service door remote .desc = { ent-DoorRemoteDefault.desc } ent-DoorRemoteResearch = research door remote .desc = { ent-DoorRemoteDefault.desc } -ent-DoorRemoteCargo = cargo door remote +ent-DoorRemoteCargo = logistics door remote .desc = { ent-DoorRemoteDefault.desc } ent-DoorRemoteMedical = medical door remote .desc = { ent-DoorRemoteDefault.desc } ent-DoorRemoteEngineering = engineering door remote .desc = { ent-DoorRemoteDefault.desc } +ent-DoorRemoteFirefight = fire-fighting door remote + .desc = A gadget which can open and bolt FireDoors remotely. ent-DoorRemoteAll = super door remote .suffix = Admeme .desc = { ent-DoorRemoteDefault.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/encryption_keys.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/encryption_keys.ftl index 89b5c81b0bd..8a268817712 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/encryption_keys.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/encryption_keys.ftl @@ -2,7 +2,7 @@ ent-EncryptionKey = encryption key .desc = A small cypher chip for headsets. ent-EncryptionKeyCommon = common encryption key .desc = An encryption key used by anyone. -ent-EncryptionKeyCargo = cargo encryption key +ent-EncryptionKeyCargo = logistics encryption key .desc = An encryption key used by supply employees. ent-EncryptionKeyCentCom = central command encryption key .desc = An encryption key used by captain's bosses. @@ -14,9 +14,9 @@ ent-EncryptionKeyEngineering = engineering encryption key .desc = An encryption key used by the engineers. ent-EncryptionKeyMedical = medical encryption key .desc = An encryption key used by those who save lives. -ent-EncryptionKeyMedicalScience = med-sci encryption key +ent-EncryptionKeyMedicalScience = med-epi encryption key .desc = An encryption key used by someone who hasn't decided which side to take. -ent-EncryptionKeyScience = science encryption key +ent-EncryptionKeyScience = epistemics encryption key .desc = An encryption key used by scientists. Maybe it is plasmaproof? ent-EncryptionKeyRobo = robotech encryption key .desc = An encryption key used by robototech engineers. Maybe it has a LAH-6000 on it? diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl index 59d5007f3a5..7d9817d7bef 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl @@ -10,8 +10,6 @@ ent-RadiationCollectorFlatpack = radiation collector flatpack .desc = A flatpack used for constructing a radiation collector. ent-ContainmentFieldGeneratorFlatpack = containment field generator flatpack .desc = A flatpack used for constructing a containment field generator. -ent-EmitterFlatpack = emitter flatpack - .desc = A flatpack used for constructing an emitter. ent-TeslaGeneratorFlatpack = tesla generator flatpack .desc = A flatpack used for constructing a tesla generator. ent-TeslaCoilFlatpack = tesla coil flatpack @@ -22,7 +20,3 @@ ent-GyroscopeFlatpack = gyroscope flatpack .desc = A flatpack used for constructing a gyroscope. ent-ThrusterFlatpack = thruster flatpack .desc = A flatpack used for constructing a thruster. -ent-SpaceHeaterFlatpack = space heater flatpack - .desc = A flatpack used for constructing a space heater. -ent-FaxMachineFlatpack = fax machine flatpack - .desc = A flatpack used for constructing a fax machine. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/pda.ftl index 135b9cb77c5..aa52d0e56ef 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/pda.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/pda.ftl @@ -24,9 +24,9 @@ ent-MimePDA = mime PDA .desc = Suprisingly not on mute. ent-ChaplainPDA = chaplain PDA .desc = God's chosen PDA. -ent-QuartermasterPDA = quartermaster PDA - .desc = PDA for the guy that orders the guns. -ent-CargoPDA = cargo PDA +ent-QuartermasterPDA = logistics officer PDA + .desc = PDA for the guy that directs logistics. +ent-CargoPDA = logistics PDA .desc = PDA for the guys that order the pizzas. ent-SalvagePDA = salvage PDA .desc = Smells like ash. @@ -54,9 +54,9 @@ ent-ParamedicPDA = paramedic PDA .desc = Shiny and sterile. Has a built-in rapid health analyzer. ent-ChemistryPDA = chemistry PDA .desc = It has a few discolored blotches here and there. -ent-RnDPDA = research director PDA +ent-RnDPDA = mystagogue PDA .desc = It appears surprisingly ordinary. -ent-SciencePDA = science PDA +ent-SciencePDA = epistemics PDA .desc = It's covered with an unknown gooey substance. ent-HoSPDA = head of security PDA .desc = Whosoever bears this PDA is the law. @@ -68,7 +68,6 @@ ent-CentcomPDA = CentCom PDA .desc = Light green sign of walking bureaucracy. ent-AdminPDA = Admin PDA .desc = If you are not an admin please return this PDA to the nearest admin. - .suffix = Admin ent-CentcomPDAFake = { ent-CentcomPDA } .suffix = Fake .desc = { ent-CentcomPDA.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/radio.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/radio.ftl index 83de35c5220..9e2b8667184 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/radio.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/radio.ftl @@ -1,4 +1,2 @@ ent-RadioHandheld = handheld radio .desc = A handy handheld radio. -ent-RadioHandheldSecurity = security radio - .desc = A handy security radio. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_beacon.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_beacon.ftl index 4dc876add7c..e33016d9d50 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_beacon.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_beacon.ftl @@ -45,9 +45,9 @@ ent-DefaultStationBeaconDetectiveRoom = { ent-DefaultStationBeaconSecurity } ent-DefaultStationBeaconCourtroom = { ent-DefaultStationBeaconSecurity } .suffix = Courtroom .desc = { ent-DefaultStationBeaconSecurity.desc } -ent-DefaultStationBeaconLawOffice = { ent-DefaultStationBeaconSecurity } +ent-DefaultStationBeaconLawOffice = { ent-DefaultStationBeaconService } .suffix = Law Office - .desc = { ent-DefaultStationBeaconSecurity.desc } + .desc = { ent-DefaultStationBeaconService.desc } ent-DefaultStationBeaconSecurityCheckpoint = { ent-DefaultStationBeaconSecurity } .suffix = Sec Checkpoint .desc = { ent-DefaultStationBeaconSecurity.desc } @@ -73,7 +73,7 @@ ent-DefaultStationBeaconSurgery = { ent-DefaultStationBeaconMedical } .suffix = Surgery .desc = { ent-DefaultStationBeaconMedical.desc } ent-DefaultStationBeaconScience = { ent-DefaultStationBeacon } - .suffix = Science + .suffix = Epistemics .desc = { ent-DefaultStationBeacon.desc } ent-DefaultStationBeaconRND = { ent-DefaultStationBeaconScience } .suffix = Research and Development @@ -82,7 +82,7 @@ ent-DefaultStationBeaconServerRoom = { ent-DefaultStationBeaconScience } .suffix = Research Server Room .desc = { ent-DefaultStationBeaconScience.desc } ent-DefaultStationBeaconRDRoom = { ent-DefaultStationBeaconScience } - .suffix = RD's Room + .suffix = MG's Room .desc = { ent-DefaultStationBeaconScience.desc } ent-DefaultStationBeaconRobotics = { ent-DefaultStationBeaconScience } .suffix = Robotics @@ -94,16 +94,16 @@ ent-DefaultStationBeaconAnomalyGenerator = { ent-DefaultStationBeaconScience } .suffix = Anomaly Generator .desc = { ent-DefaultStationBeaconScience.desc } ent-DefaultStationBeaconSupply = { ent-DefaultStationBeacon } - .suffix = Supply + .suffix = Logistics .desc = { ent-DefaultStationBeacon.desc } ent-DefaultStationBeaconCargoReception = { ent-DefaultStationBeaconSupply } - .suffix = Cargo Reception + .suffix = Logistics Reception .desc = { ent-DefaultStationBeaconSupply.desc } ent-DefaultStationBeaconCargoBay = { ent-DefaultStationBeaconSupply } .suffix = Cargo Bay .desc = { ent-DefaultStationBeaconSupply.desc } ent-DefaultStationBeaconQMRoom = { ent-DefaultStationBeaconSupply } - .suffix = QM's Room + .suffix = LO .desc = { ent-DefaultStationBeaconSupply.desc } ent-DefaultStationBeaconSalvage = { ent-DefaultStationBeaconSupply } .suffix = Salvage @@ -174,9 +174,9 @@ ent-DefaultStationBeaconEvac = { ent-DefaultStationBeacon } ent-DefaultStationBeaconEVAStorage = { ent-DefaultStationBeacon } .suffix = EVA Storage .desc = { ent-DefaultStationBeacon.desc } -ent-DefaultStationBeaconChapel = { ent-DefaultStationBeacon } +ent-DefaultStationBeaconChapel = { ent-DefaultStationBeaconScience } .suffix = Chapel - .desc = { ent-DefaultStationBeacon.desc } + .desc = { ent-DefaultStationBeaconScience.desc } ent-DefaultStationBeaconLibrary = { ent-DefaultStationBeacon } .suffix = Library .desc = { ent-DefaultStationBeacon.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl index 860a2206828..7513825ad06 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl @@ -3,13 +3,11 @@ ent-ReinforcementRadioSyndicate = syndicate reinforcement radio ent-ReinforcementRadioSyndicateNukeops = { ent-ReinforcementRadioSyndicate } .suffix = NukeOps .desc = { ent-ReinforcementRadioSyndicate.desc } -ent-ReinforcementRadioSyndicateAncestor = syndicate genetic ancestor reinforcement radio - .desc = Calls in a specially trained ancestor of your choosing to assist you. -ent-ReinforcementRadioSyndicateAncestorNukeops = { ent-ReinforcementRadioSyndicateAncestor } +ent-ReinforcementRadioSyndicateMonkey = syndicate monkey reinforcement radio + .desc = Calls in a specially trained monkey to assist you. +ent-ReinforcementRadioSyndicateMonkeyNukeops = { ent-ReinforcementRadioSyndicateMonkey } .suffix = NukeOps - .desc = { ent-ReinforcementRadioSyndicateAncestor.desc } -ent-ReinforcementRadioSyndicateSyndiCat = syndicat reinforcement radio - .desc = Calls in a faithfully trained cat with a microbomb to assist you. + .desc = { ent-ReinforcementRadioSyndicateMonkey.desc } ent-ReinforcementRadioSyndicateCyborgAssault = syndicate assault cyborg reinforcement radio .desc = Call in a well armed assault cyborg, instantly! .suffix = NukeOps diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/figurines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/figurines.ftl index 174f75dad60..78f4e1bfb01 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/figurines.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/figurines.ftl @@ -32,16 +32,16 @@ ent-ToyFigurineCargoTech = cargo technican figure .desc = A figurine depicting a reptillian Cargo Technican. ent-ToyFigurineSalvage = salvage specialist figure .desc = A figurine depicting a Salvage Specialist holding a survival knife. -ent-ToyFigurineQuartermaster = quartermaster figure - .desc = A figurine depicting the glorious head of the Cargo department. +ent-ToyFigurineQuartermaster = logistics officer figure + .desc = A figurine depicting the glorious head of the Logistics department. ent-ToyFigurineChiefEngineer = chief engineer figure .desc = A figurine depicting the glorious head of the Engineering department. ent-ToyFigurineEngineer = station engineer figure .desc = A figurine depicting a Station Engineer holding a crowbar at-ready. ent-ToyFigurineAtmosTech = atmospheric technician figure .desc = A figurine depicting an Atmos Tech holding an unlit welder. -ent-ToyFigurineResearchDirector = research director figure - .desc = A figurine depicting the glorious head of the Science department. +ent-ToyFigurineResearchDirector = mystagogue figure + .desc = A figurine depicting the glorious head of the Epistemics department. ent-ToyFigurineScientist = scientist figurine .desc = A figurine depicting a Scientist donning a labcoat. ent-ToyFigurineChiefMedicalOfficer = chief medical officer figure @@ -67,7 +67,7 @@ ent-ToyFigurineJanitor = janitor figure ent-ToyFigurineNukie = syndicate operative figure .desc = A figurine depicting someone in a blood-red hardsuit, similar to what someone on a nuclear operative team might wear. ent-ToyFigurineNukieElite = elite syndicate operative figure - .desc = A figurine depicting someone in an elite blood-red hardsuit, similar to what someone on a nuclear operative team might wear. + .desc = A figurine depicting someone in an elite blood-red hardsuit, similar to what the medic of a nuclear operative team might wear. ent-ToyFigurineNukieCommander = syndicate operative commander figure .desc = A figurine depicting someone in a beefed-up blood-red hardsuit, similar to what the commander of a nuclear operative team might wear. ent-ToyFigurineFootsoldier = syndicate footsoldier figure diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/immovable_rod.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/immovable_rod.ftl index 6524297c2fc..b0182c58c0c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/immovable_rod.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/immovable_rod.ftl @@ -1,31 +1,11 @@ ent-ImmovableRod = immovable rod .desc = You can sense that it's hungry. That's usually a bad sign. -ent-ImmovableRodDespawn = { ent-ImmovableRod } - .suffix = Despawn - .desc = { ent-ImmovableRod.desc } -ent-ImmovableRodSlow = { ent-ImmovableRodDespawn } +ent-ImmovableRodSlow = { ent-ImmovableRod } .suffix = Slow - .desc = { ent-ImmovableRodDespawn.desc } -ent-ImmovableRodKeepTiles = { ent-ImmovableRodDespawn } + .desc = { ent-ImmovableRod.desc } +ent-ImmovableRodKeepTiles = { ent-ImmovableRod } .suffix = Keep Tiles - .desc = { ent-ImmovableRodDespawn.desc } -ent-ImmovableRodWizard = { ent-ImmovableRod } - .suffix = Wizard .desc = { ent-ImmovableRod.desc } ent-ImmovableRodKeepTilesStill = { ent-ImmovableRodKeepTiles } .suffix = Keep Tiles, Still .desc = { ent-ImmovableRodKeepTiles.desc } -ent-ImmovableRodMop = immovable mop - .desc = Hurled like a javelin, with the power of a thousand furious janitors. -ent-ImmovableRodShark = immovable shark - .desc = SHARK TORNADO! -ent-ImmovableRodClown = immovable clown - .desc = Ejected from the neighbouring station one solar system over. HONK! -ent-ImmovableRodBanana = immovable banana - .desc = At least you won't slip on it. -ent-ImmovableRodHammer = immovable hammer - .desc = Bwoink. -ent-ImmovableRodThrongler = immovable throngler - .desc = If you catch it, you can keep it. -ent-ImmovableRodGibstick = immovable gibstick - .desc = What did you expect? diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_wind.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_wind.ftl index df20fbdc1de..77e7e3da350 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_wind.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_wind.ftl @@ -3,7 +3,7 @@ ent-SaxophoneInstrument = saxophone ent-AccordionInstrument = accordion .desc = { ent-BaseHandheldInstrument.desc } ent-HarmonicaInstrument = harmonica - .desc = { ent-BaseHandheldInstrument.desc } + .desc = { ent-BaseHandheldInstrument.desc } ent-ClarinetInstrument = clarinet .desc = Skweedward tintacklays. ent-FluteInstrument = flute diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/snap_pops.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/snap_pops.ftl index adcac3b5c7c..006015dd480 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/snap_pops.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/snap_pops.ftl @@ -1,4 +1,4 @@ ent-SnapPop = snap pop .desc = Throw it at the floor and listen to it POP! ent-SnapPopBox = snap pop box - .desc = Contains snap pops for a few minutes of popping fun! + .desc = Contains twenty snap pops for a few minutes of popping fun! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/whistles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/whistles.ftl index 9afda65e472..5d40be7d818 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/whistles.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/whistles.ftl @@ -1,7 +1,5 @@ ent-BaseWhistle = whistle .desc = Someone forgot to turn off kettle? -ent-Whistle = { ent-BaseWhistle } - .desc = { ent-BaseWhistle.desc } ent-SecurityWhistle = { ent-BaseWhistle } .desc = Sound of it make you feel fear. ent-SyndicateWhistle = trench whistle diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/magic/books.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/magic/books.ftl index b6a3d0a500f..9ea1e9a8d6a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/magic/books.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/magic/books.ftl @@ -1,11 +1,5 @@ ent-BaseSpellbook = spellbook .desc = { ent-BaseItem.desc } -ent-WizardsGrimoire = wizards grimoire - .suffix = Wizard - .desc = { ent-BaseItem.desc } -ent-WizardsGrimoireNoRefund = wizards grimoire - .suffix = Wizard, No Refund - .desc = { ent-WizardsGrimoire.desc } ent-SpawnSpellbook = spawn spellbook .desc = { ent-BaseSpellbook.desc } ent-ForceWallSpellbook = force wall spellbook diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/crystal_shard.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/crystal_shard.ftl index 70c4fabdf9e..79552576295 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/crystal_shard.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/crystal_shard.ftl @@ -12,5 +12,3 @@ ent-ShardCrystalGreen = green crystal shard .desc = { ent-ShardCrystalBase.desc } ent-ShardCrystalRed = red crystal shard .desc = { ent-ShardCrystalBase.desc } -ent-ShardCrystalRandom = random crystal shard - .desc = { ent-ShardCrystalBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/materials.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/materials.ftl index 57af2d1777a..147ecdf73bb 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/materials.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/materials.ftl @@ -55,12 +55,6 @@ ent-MaterialCotton = cotton ent-MaterialCotton1 = { ent-MaterialCotton } .suffix = Single .desc = { ent-MaterialCotton.desc } -ent-MaterialPyrotton = pyrotton - .suffix = Full - .desc = { ent-MaterialBase.desc } -ent-MaterialPyrotton1 = { ent-MaterialPyrotton } - .suffix = Single - .desc = { ent-MaterialPyrotton.desc } ent-MaterialBananium = bananium .suffix = Full .desc = { ent-MaterialBase.desc } @@ -82,5 +76,3 @@ ent-MaterialBones = bones ent-MaterialBones1 = { ent-MaterialBones } .suffix = 1 .desc = { ent-MaterialBones.desc } -ent-MaterialGunpowder = gunpowder - .desc = An explosive compound. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/bedsheets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/bedsheets.ftl index a7735563797..880ff96a5eb 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/bedsheets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/bedsheets.ftl @@ -40,13 +40,13 @@ ent-BedsheetOrange = orange bedsheet .desc = { ent-BedsheetBase.desc } ent-BedsheetPurple = purple bedsheet .desc = { ent-BedsheetBase.desc } -ent-BedsheetQM = QM's bedsheet +ent-BedsheetQM = LO's bedsheet .desc = { ent-BedsheetBase.desc } ent-BedsheetRainbow = rainbow bedsheet .desc = { ent-BedsheetBase.desc } -ent-BedsheetRD = RD's bedsheet +ent-BedsheetRD = Mystagogue's bedsheet .desc = It appears to have a beaker emblem, and is made out of fire-resistant material, although it probably won't protect you in the event of fires you're familiar with every day. -ent-BedsheetBrigmedic = brigmedic's bedsheet +ent-BedsheetBrigmedic = corpsman's bedsheet .desc = Not worse than cotton. ent-BedsheetRed = red bedsheet .desc = { ent-BedsheetBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/books.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/books.ftl index 142e3713e9e..b0858dce50b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/books.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/books.ftl @@ -27,11 +27,12 @@ ent-BookHowToSurvive = how to survive ent-BookChemicalCompendium = chempendium .desc = A comprehensive guide written by some old skeleton of a professor about chemical synthesis. ent-BookRandom = { ent-BookBase } - .desc = Each book is unique! What is hidden in this one? - .suffix = random visual -ent-BookRandomStory = { ent-BookRandom } - .suffix = random visual, random story - .desc = { ent-BookRandom.desc } + .suffix = random + .desc = { ent-BookBase.desc } +ent-BookEscalation = Robert's Rules of Escalation + .desc = The book is stained with blood. It seems to have been used more as a weapon than reading material. +ent-BookEscalationSecurity = Robert's Rules of Escalation: Security Edition + .desc = The book is stained with blood. It seems to have been used more as a weapon than reading material. ent-BookAtmosDistro = Newton's Guide to Atmos: The Distro .desc = There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks. ent-BookAtmosWaste = Newton's Guide to Atmos: Waste diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl index b37a3326c44..a694534bb4c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl @@ -1,7 +1,9 @@ ent-BriefcaseBase = { ent-BaseStorageItem } .desc = Useful for carrying items in your hands. ent-BriefcaseBrown = brown briefcase - .desc = { ent-BriefcaseBase.desc } -ent-BriefcaseSyndie = { ent-BriefcaseBrown } + .desc = A handy briefcase. +ent-BriefcaseSyndieBase = { ent-BriefcaseBase } + .desc = Useful for carrying items in your hands. .suffix = Syndicate, Empty - .desc = { ent-BriefcaseBrown.desc } +ent-BriefcaseSyndie = brown briefcase + .desc = A handy briefcase. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl index a19cf572aa9..bfcff01ff75 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl @@ -26,11 +26,11 @@ ent-ParamedicIDCard = paramedic ID card .desc = { ent-IDCardStandard.desc } ent-ChemistIDCard = chemist ID card .desc = { ent-IDCardStandard.desc } -ent-CargoIDCard = cargo ID card +ent-CargoIDCard = logistics ID card .desc = { ent-IDCardStandard.desc } ent-SalvageIDCard = salvage ID card .desc = { ent-IDCardStandard.desc } -ent-QuartermasterIDCard = quartermaster ID card +ent-QuartermasterIDCard = logistics officer ID card .desc = { ent-IDCardStandard.desc } ent-ResearchIDCard = research ID card .desc = { ent-IDCardStandard.desc } @@ -60,11 +60,11 @@ ent-CEIDCard = chief engineer ID card .desc = { ent-IDCardStandard.desc } ent-CMOIDCard = chief medical officer ID card .desc = { ent-IDCardStandard.desc } -ent-RDIDCard = research director ID card +ent-RDIDCard = mystagogue ID card .desc = { ent-IDCardStandard.desc } ent-HoSIDCard = head of security ID card .desc = { ent-IDCardStandard.desc } -ent-BrigmedicIDCard = brigmedic ID card +ent-BrigmedicIDCard = corpsman ID card .desc = { ent-IDCardStandard.desc } ent-CentcomIDCard = command officer ID card .desc = { ent-IDCardStandard.desc } @@ -116,13 +116,10 @@ ent-CluwneIDCard = cluwne ID card .suffix = Unremoveable .desc = { ent-IDCardStandard.desc } ent-SeniorEngineerIDCard = senior engineer ID card - .desc = { ent-EngineeringIDCard.desc } + .desc = { ent-IDCardStandard.desc } ent-SeniorResearcherIDCard = senior researcher ID card - .desc = { ent-ResearchIDCard.desc } + .desc = { ent-IDCardStandard.desc } ent-SeniorPhysicianIDCard = senior physician ID card - .desc = { ent-MedicalIDCard.desc } + .desc = { ent-IDCardStandard.desc } ent-SeniorOfficerIDCard = senior officer ID card - .desc = { ent-SecurityIDCard.desc } -ent-UniversalIDCard = universal ID card - .desc = An ID card that gives you access beyond your wildest dreams. - .suffix = Admin + .desc = { ent-IDCardStandard.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/implanters.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/implanters.ftl index fbfc6632b55..6424396cb77 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/implanters.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/implanters.ftl @@ -37,5 +37,5 @@ ent-DeathRattleImplanter = death rattle implanter .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } ent-DeathAcidifierImplanter = death acidifier implanter .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } -ent-MindShieldImplanter = mindshield implanter +ent-MindShieldImplanter = mind-shield implanter .desc = { ent-BaseImplantOnlyImplanter.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/kudzu.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/kudzu.ftl index f36ae9760a6..e81396cd721 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/kudzu.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/kudzu.ftl @@ -14,6 +14,6 @@ ent-KudzuFlowerAngry = { ent-KudzuFlowerFriendly } ent-FleshKudzu = tendons .desc = A rapidly growing cluster of meaty tendons. WHY ARE YOU STOPPING TO LOOK AT IT?! ent-ShadowKudzu = dark haze - .desc = { ent-BaseKudzu.desc } + .desc = { ent-BaseShadow.desc } ent-ShadowKudzuWeak = Haze .desc = { ent-ShadowKudzu.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl index eee0e0bf5d9..29857dfa943 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/paper.ftl @@ -21,6 +21,20 @@ ent-NukeCodePaper = nuclear authentication codes ent-NukeCodePaperStation = { ent-NukeCodePaper } .suffix = Station Only .desc = { ent-NukeCodePaper.desc } +ent-Pen = pen + .desc = A dark ink pen. +ent-PenEmbeddable = { ent-Pen } + .desc = { ent-Pen.desc } +ent-LuxuryPen = luxury pen + .desc = A fancy and expensive pen that you only deserve to own if you're qualified to handle vast amounts of paperwork. +ent-CyberPen = Cybersun pen + .desc = A high-tech pen straight from Cybersun's legal department, capable of refracting hard-light at impossible angles through its diamond tip in order to write. So powerful, it's even able to rewrite officially stamped documents should the need arise. +ent-PenCap = captain's fountain pen + .desc = A luxurious fountain pen for the captain of the station. +ent-PenCentcom = CentCom pen + .desc = In an attempt to keep up with the "power" of the cybersun bureaucracy, NT made a replica of cyber pen, in their corporate style. +ent-PenHop = hop's fountain pen + .desc = A luxurious fountain pen for the hop of the station. ent-BoxFolderBase = folder .desc = A folder filled with top secret paperwork. ent-BoxFolderRed = { ent-BoxFolderBase } 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 eafc7e97b3b..2c0acbed8b6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl @@ -11,9 +11,6 @@ ent-RubberStampCentcom = CentCom rubber stamp ent-RubberStampChaplain = chaplain's rubber stamp .suffix = DO NOT MAP .desc = { ent-RubberStampBase.desc } -ent-RubberStampLawyer = lawyer's rubber stamp - .suffix = DO NOT MAP - .desc = { ent-RubberStampBase.desc } ent-RubberStampClown = clown's rubber stamp .suffix = DO NOT MAP .desc = { ent-RubberStampBase.desc } @@ -32,10 +29,10 @@ ent-RubberStampHos = head of security's rubber stamp ent-RubberStampMime = mime's rubber stamp .suffix = DO NOT MAP .desc = { ent-RubberStampBase.desc } -ent-RubberStampQm = quartermaster's rubber stamp +ent-RubberStampQm = logistics officer's rubber stamp .suffix = DO NOT MAP .desc = { ent-RubberStampBase.desc } -ent-RubberStampRd = research director's rubber stamp +ent-RubberStampRd = mystagogue's rubber stamp .suffix = DO NOT MAP .desc = { ent-RubberStampBase.desc } ent-RubberStampTrader = trader's rubber stamp diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/subdermal_implants.ftl index 5fd3733456e..fc68ca27796 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/subdermal_implants.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/subdermal_implants.ftl @@ -28,5 +28,5 @@ ent-DeathAcidifierImplant = death-acidifier implant .desc = This implant melts the user and their equipment upon death. ent-DeathRattleImplant = death rattle implant .desc = This implant will inform the Syndicate radio channel should the user fall into critical condition or die. -ent-MindShieldImplant = mindshield implant +ent-MindShieldImplant = mind-shield implant .desc = This implant will ensure loyalty to Nanotrasen and prevent mind control devices. 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 0ba39a65e69..e8a7bc8df77 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 @@ -1,5 +1,5 @@ ent-FloorTileItemBase = { ent-BaseItem } - .desc = These could work as a pretty decent throwing weapon. + .desc = The floor was meant to hold this, not you. ent-FloorTileItemSteel = steel tile .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemSteelCheckerDark = steel dark checker tile @@ -7,17 +7,17 @@ ent-FloorTileItemSteelCheckerDark = steel dark checker tile ent-FloorTileItemSteelCheckerLight = steel light checker tile .desc = { ent-FloorTileItemSteel.desc } ent-FloorTileItemMetalDiamond = steel tile - .desc = { ent-FloorTileItemBase.desc } + .desc = { ent-FloorTileItemSteel.desc } ent-FloorTileItemWood = wood floor .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemWhite = white tile .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemDark = dark tile - .desc = { ent-FloorTileItemBase.desc } + .desc = { ent-FloorTileItemSteel.desc } ent-FloorTileItemTechmaint = techmaint floor - .desc = { ent-FloorTileItemBase.desc } + .desc = { ent-FloorTileItemSteel.desc } ent-FloorTileItemReinforced = reinforced tile - .desc = { ent-FloorTileItemBase.desc } + .desc = { ent-FloorTileItemSteel.desc } ent-FloorTileItemMono = mono tile .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemLino = linoleum floor @@ -29,7 +29,7 @@ ent-FloorTileItemBrassReebe = smooth brass plate ent-FloorTileItemDirty = dirty tile .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemElevatorShaft = elevator shaft tile - .desc = { ent-FloorTileItemBase.desc } + .desc = { ent-FloorTileItemSteel.desc } ent-FloorTileItemRockVault = rock vault tile .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemBlue = blue tile @@ -39,9 +39,9 @@ ent-FloorTileItemLime = lime tile ent-FloorTileItemMining = mining tile .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemMiningDark = dark mining tile - .desc = { ent-FloorTileItemBase.desc } + .desc = { ent-FloorTileItemSteel.desc } ent-FloorTileItemMiningLight = light mining tile - .desc = { ent-FloorTileItemBase.desc } + .desc = { ent-FloorTileItemSteel.desc } ent-FloorTileItemFreezer = freezer tile .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemShowroom = showroom tile diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/utensils.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/utensils.ftl index b59633f5877..183dbfb7d05 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/utensils.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/utensils.ftl @@ -12,5 +12,3 @@ ent-SpoonPlastic = plastic spoon .desc = There is no spoon. ent-KnifePlastic = plastic knife .desc = That's not a knife. This is a knife. -ent-BarSpoon = bar spoon - .desc = Your personal helper to mix drinks and changes lives. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/shields/shields.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/shields/shields.ftl index 589d466db31..d5517c8655d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/shields/shields.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/shields/shields.ftl @@ -15,7 +15,7 @@ ent-WebShield = web shield ent-ClockworkShield = clockwork shield .desc = Ratvar oyrffrf lbh jvgu uvf cebgrpgvba. ent-MirrorShield = mirror shield - .desc = Glows an eerie red. You hear the Geometer whispering... + .desc = Eerily glows red... you hear the geometer whispering ent-EnergyShield = energy shield .desc = Exotic energy shield, when folded, can even fit in your pocket. ent-BrokenEnergyShield = broken energy shield diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/cargo/cargo_pallet.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/cargo/cargo_pallet.ftl index db49ea6fef6..aaae1ec67d6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/cargo/cargo_pallet.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/cargo/cargo_pallet.ftl @@ -1,6 +1,2 @@ ent-CargoPallet = cargo pallet - .desc = Common fixture of logistics and cargo. Subtle reminder where crates go during transport to avoid bruised shins. -ent-CargoPalletSell = cargo selling pallet - .desc = Designates valid items to sell. -ent-CargoPalletBuy = cargo buying pallet - .desc = Designates where orders will appear when purchased. + .desc = Designates valid items to sell to CentCom when a shuttle is recalled. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/leaves.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/leaves.ftl index dc63fc38934..34695704ebe 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/leaves.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/leaves.ftl @@ -4,12 +4,6 @@ ent-LeavesCannabisDried = dried cannabis leaves .desc = Dried cannabis leaves, ready to be ground. ent-GroundCannabis = ground cannabis .desc = Ground cannabis, ready to take you on a trip. -ent-LeavesCannabisRainbow = rainbow cannabis leaves - .desc = Is it supposed to be glowing like that...? -ent-LeavesCannabisRainbowDried = dried rainbow cannabis leaves - .desc = Dried rainbow cannabis leaves, ready to be ground. -ent-GroundCannabisRainbow = ground rainbow cannabis - .desc = Ground rainbow cannabis, ready to take you on a trip. ent-LeavesTobacco = tobacco leaves .desc = Dry them out to make some smokes. ent-LeavesTobaccoDried = dried tobacco leaves diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl index 1cf9147ad36..e8392b3b13a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl @@ -40,8 +40,6 @@ ent-BlueTomatoSeeds = packet of blue tomato seeds .desc = { ent-SeedBase.desc } ent-BloodTomatoSeeds = packet of blood tomato seeds .desc = { ent-SeedBase.desc } -ent-KillerTomatoSeeds = packet of killer tomato seeds - .desc = { ent-SeedBase.desc } ent-EggplantSeeds = packet of eggplant seeds .desc = { ent-SeedBase.desc } ent-AppleSeeds = packet of apple seeds @@ -56,8 +54,6 @@ ent-TobaccoSeeds = packet of tobacco seeds .desc = These seeds grow into tobacco plants. ent-CannabisSeeds = packet of cannabis seeds .desc = Taxable. -ent-RainbowCannabisSeeds = packet of rainbow cannabis seeds - .desc = These seeds grow into rainbow weed. Groovy... and also highly addictive. ent-NettleSeeds = packet of nettle seeds .desc = Handle with gloves. ent-DeathNettleSeeds = packet of death nettle seeds @@ -112,5 +108,3 @@ ent-PumpkinSeeds = packet of pumpkin seeds .desc = { ent-SeedBase.desc } ent-CottonSeeds = packet of cotton seeds .desc = { ent-SeedBase.desc } -ent-PyrottonSeeds = packet of pyrotton seeds - .desc = { ent-SeedBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl index 46a43f0361f..c49cce472f7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl @@ -2,11 +2,20 @@ ent-MopItem = mop .desc = A mop that can't be stopped, viscera cleanup detail awaits. ent-AdvMopItem = advanced mop .desc = Motorized mop that has a bigger reservoir and quickly replaces reagents inside with water. Automatic Clown Countermeasure not included. +ent-MopBucket = mop bucket + .desc = Holds water and the tears of the janitor. +ent-MopBucketFull = mop bucket + .suffix = full + .desc = { ent-MopBucket.desc } ent-WetFloorSign = wet floor sign .desc = Caution! Wet Floor! ent-WetFloorSignMineExplosive = { ent-WetFloorSign } .suffix = Explosive .desc = { ent-WetFloorSign.desc } +ent-JanitorialTrolley = janitorial trolley + .desc = This is the alpha and omega of sanitation. +ent-FloorDrain = drain + .desc = Drains puddles around it. Useful for dumping mop buckets or keeping certain rooms clean. ent-Plunger = plunger .desc = A plunger with a red plastic suction-cup and a wooden handle. Used to unclog drains. ent-RagItem = damp rag diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/disease.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/disease.ftl index 71e25241f9e..9c62b95ae55 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/disease.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/disease.ftl @@ -1,6 +1,4 @@ ent-DiseaseSwab = sterile swab .desc = Used for taking and transfering samples. Sterile until open. Single use only. -ent-BoxMouthSwab = sterile swab dispenser - .desc = Dispenses 30 sterile swabs, extremely useful for botany. ent-Vaccine = vaccine .desc = Prevents people who DON'T already have a disease from catching it. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/handheld_crew_monitor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/handheld_crew_monitor.ftl index cf64858c372..c7d18e01a71 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/handheld_crew_monitor.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/handheld_crew_monitor.ftl @@ -4,3 +4,13 @@ ent-HandheldCrewMonitor = handheld crew monitor ent-HandheldCrewMonitorEmpty = { ent-HandheldCrewMonitor } .suffix = Empty .desc = { ent-HandheldCrewMonitor.desc } +ent-SpyCrewMonitor = spy monitor + .desc = A spy device capable of connecting to crew monitoring servers. +ent-SpyCrewMonitorEmpty = { ent-SpyCrewMonitor } + .suffix = Empty + .desc = { ent-SpyCrewMonitor.desc } +ent-SyndiCrewMonitor = syndicate crew monitor + .desc = The syndicated version of crew monitor, intercepts information from the server. +ent-SyndiCrewMonitorEmpty = { ent-SyndiCrewMonitor } + .suffix = Empty + .desc = { ent-SyndiCrewMonitor.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl index 2d4c60d8afc..9ecb5c349c0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl @@ -87,7 +87,7 @@ ent-PillDermaline = pill (dermaline 10u) ent-PillCanisterDermaline = pill canister (dermaline 10u) .suffix = Dermaline, 5 .desc = { ent-PillCanister.desc } -ent-PillSpaceDrugs = space mirage +ent-PillSpaceDrugs = space drugs .desc = { ent-Pill.desc } ent-PillTricordrazine = pill (tricordrazine 10u) .desc = { ent-Pill.desc } @@ -139,5 +139,5 @@ ent-SyringeSaline = saline syringe .desc = { ent-PrefilledSyringe.desc } ent-SyringeRomerol = romerol syringe .desc = { ent-PrefilledSyringe.desc } -ent-SyringeStimulants = hyperzine syringe +ent-SyringeStimulants = stimulants syringe .desc = { ent-PrefilledSyringe.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl index 1f157b97b55..b6774d7d827 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl @@ -21,10 +21,10 @@ ent-RadAutoInjector = rad auto-injector .desc = A rapid dose of anti-radiation. Contains arithrazine and bicaridine. ent-SpaceMedipen = space medipen .desc = Contains a mix of chemicals that protect you from the deadly effects of space. -ent-Stimpack = hyperzine injector - .desc = Contains enough hyperzine for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down. -ent-StimpackMini = hyperzine microinjector - .desc = A microinjector of hyperzine that give you about fifteen seconds of the chemical's effects. +ent-Stimpack = stimulant injector + .desc = Contains enough stimulants for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down. +ent-StimpackMini = stimulant microinjector + .desc = A microinjector of stimulants that give you about fifteen seconds of the chemical's effects. ent-CombatMedipen = combat medipen .desc = A single-use medipen containing chemicals that regenerate most types of damage. ent-Hypopen = pen diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl index 013c2946f48..2d63adab82d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl @@ -1,6 +1,6 @@ -ent-BodyBag = body bag +ent-BodyBag_Container = body bag .desc = A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. -ent-BodyBagFolded = body bag +ent-BodyBag_Folded = body bag .desc = A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. .suffix = folded ent-Ash = ash diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/syndicate.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/syndicate.ftl index 1559a4f2e6d..14ebbb86d8e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/syndicate.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/syndicate.ftl @@ -22,9 +22,6 @@ ent-BaseUplinkRadio25TC = { ent-BaseUplinkRadio } ent-BaseUplinkRadio40TC = { ent-BaseUplinkRadio } .suffix = 40 TC, NukeOps .desc = { ent-BaseUplinkRadio.desc } -ent-BaseUplinkRadio60TC = { ent-BaseUplinkRadio } - .suffix = 60 TC, LoneOps - .desc = { ent-BaseUplinkRadio.desc } ent-BaseUplinkRadioDebug = { ent-BaseUplinkRadio } .suffix = DEBUG .desc = { ent-BaseUplinkRadio.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/access_configurator.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/access_configurator.ftl index 5422c6c19e2..8a5a38eb56a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/access_configurator.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/access_configurator.ftl @@ -1,5 +1,2 @@ ent-AccessConfigurator = access configurator .desc = Used to modify the access level requirements for airlocks and other lockable devices. -ent-AccessConfiguratorUniversal = universal access configurator - .desc = A modified access configurator used only by the mythical Administrator. - .suffix = Admin diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/tools.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/tools.ftl index ec59a1f7e90..50b5368f4c4 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/tools.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/tools.ftl @@ -15,18 +15,18 @@ ent-NetworkConfigurator = network configurator ent-PowerDrill = power drill .desc = A simple powered hand drill. ent-RCD = RCD - .desc = The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function. + .desc = An advanced construction device which can place/remove walls, floors, and airlocks quickly. ent-RCDEmpty = { ent-RCD } .suffix = Empty .desc = { ent-RCD.desc } -ent-RCDRecharging = experimental RCD - .desc = A bluespace-enhanced rapid construction device that passively generates its own compressed matter. +ent-RCDRecharging = experimental rcd + .desc = A bluespace-enhanced RCD that regenerates charges passively. .suffix = AutoRecharge -ent-RCDExperimental = experimental RCD - .desc = A bluespace-enhanced rapid construction device that passively generates its own compressed matter. +ent-RCDExperimental = experimental rcd + .desc = A bluespace-enhanced RCD that regenerates charges passively. .suffix = Admeme -ent-RCDAmmo = compressed matter - .desc = A cartridge of raw matter compacted by bluespace technology. Used in rapid construction devices. +ent-RCDAmmo = RCD Ammo + .desc = Ammo cartridge for an RCD. ent-Omnitool = omnitool .desc = A drone's best friend. ent-Shovel = shovel diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl index 850b0a8e5e9..20428907ce2 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl @@ -4,7 +4,11 @@ ent-MagazineBoxCaselessRifle10x24 = ammunition box (.25 caseless) .desc = { ent-BaseMagazineBoxCaselessRifle.desc } ent-MagazineBoxCaselessRifleBig = ammunition box (.25 caseless) .desc = { ent-BaseMagazineBoxCaselessRifle.desc } +ent-MagazineBoxCaselessRifleBigRubber = ammunition box (.25 caseless rubber) + .desc = { ent-BaseMagazineBoxCaselessRifle.desc } ent-MagazineBoxCaselessRifle = ammunition box (.25 caseless) .desc = { ent-BaseMagazineBoxCaselessRifle.desc } ent-MagazineBoxCaselessRiflePractice = ammunition box (.25 caseless practice) .desc = { ent-BaseMagazineBoxCaselessRifle.desc } +ent-MagazineBoxCaselessRifleRubber = ammunition box (.25 caseless rubber) + .desc = { ent-BaseMagazineBoxCaselessRifle.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl index d0364a5089c..66fde99b175 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl @@ -6,6 +6,8 @@ ent-MagazineBoxLightRifle = ammunition box (.30 rifle) .desc = { ent-BaseMagazineBoxLightRifle.desc } ent-MagazineBoxLightRiflePractice = ammunition box (.30 rifle practice) .desc = { ent-BaseMagazineBoxLightRifle.desc } +ent-MagazineBoxLightRifleRubber = ammunition box (.30 rifle rubber) + .desc = { ent-BaseMagazineBoxLightRifle.desc } ent-MagazineBoxLightRifleIncendiary = ammunition box (.30 rifle incendiary) .desc = { ent-BaseMagazineBoxLightRifle.desc } ent-MagazineBoxLightRifleUranium = ammunition box (.30 rifle uranium) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl index 2d9d9a68484..ae1c07a5652 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl @@ -4,6 +4,8 @@ ent-MagazineBoxMagnum = ammunition box (.45 magnum) .desc = { ent-BaseMagazineBoxMagnum.desc } ent-MagazineBoxMagnumPractice = ammunition box (.45 magnum practice) .desc = { ent-BaseMagazineBoxMagnum.desc } +ent-MagazineBoxMagnumRubber = ammunition box (.45 magnum rubber) + .desc = { ent-BaseMagazineBoxMagnum.desc } ent-MagazineBoxMagnumIncendiary = ammunition box (.45 magnum incendiary) .desc = { ent-BaseMagazineBoxMagnum.desc } ent-MagazineBoxMagnumUranium = ammunition box (.45 magnum uranium) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl index 5c454c0d68c..cb3ee93c7fc 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl @@ -4,6 +4,8 @@ ent-MagazineBoxPistol = ammunition box (.35 auto) .desc = { ent-BaseMagazineBoxPistol.desc } ent-MagazineBoxPistolPractice = ammunition box (.35 auto practice) .desc = { ent-BaseMagazineBoxPistol.desc } +ent-MagazineBoxPistolRubber = ammunition box (.35 auto rubber) + .desc = { ent-BaseMagazineBoxPistol.desc } ent-MagazineBoxPistolIncendiary = ammunition box (.35 auto incendiary) .desc = { ent-BaseMagazineBoxPistol.desc } ent-MagazineBoxPistolUranium = ammunition box (.35 auto uranium) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl index 9b23c2ee4ea..0396ac76ac7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl @@ -2,10 +2,14 @@ ent-BaseMagazineBoxRifle = { ent-BaseItem } .desc = { ent-BaseItem.desc } ent-MagazineBoxRifleBig = ammunition box (.20 rifle) .desc = { ent-BaseMagazineBoxRifle.desc } +ent-MagazineBoxRifleBigRubber = ammunition box (.20 rifle rubber) + .desc = { ent-BaseMagazineBoxRifle.desc } ent-MagazineBoxRifle = ammunition box (.20 rifle) .desc = { ent-BaseMagazineBoxRifle.desc } ent-MagazineBoxRiflePractice = ammunition box (.20 rifle practice) .desc = { ent-BaseMagazineBoxRifle.desc } +ent-MagazineBoxRifleRubber = ammunition box (.20 rifle rubber) + .desc = { ent-BaseMagazineBoxRifle.desc } ent-MagazineBoxRifleIncendiary = ammunition box (.20 rifle incendiary) .desc = { ent-BaseMagazineBoxRifle.desc } ent-MagazineBoxRifleUranium = ammunition box (.20 rifle uranium) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl index 6ea6810eb6f..0fcb3501fef 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl @@ -12,8 +12,6 @@ ent-BoxShotgunFlare = shotgun flare cartridges dispenser .desc = A dispenser box full of flare cartridges, designed for riot shotguns. ent-BoxShotgunIncendiary = shotgun incendiary cartridges dispenser .desc = A dispenser box full of incendiary cartridges, designed for riot shotguns. -ent-BoxShotgunUranium = shotgun uranium cartridges dispenser - .desc = A dispenser box full of uranium cartridges, designed for riot shotguns. ent-BoxShotgunPractice = shotgun practice cartridges dispenser .desc = A dispenser box full of practice cartridges, designed for riot shotguns. ent-BoxShellTranquilizer = tranquilizer cartridges dispenser diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl index c45fd3f8ac7..afe83629543 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl @@ -4,3 +4,5 @@ ent-CartridgeCaselessRifle = cartridge (.25 caseless) .desc = { ent-BaseCartridgeCaselessRifle.desc } ent-CartridgeCaselessRiflePractice = cartridge (.25 caseless practice) .desc = { ent-BaseCartridgeCaselessRifle.desc } +ent-CartridgeCaselessRifleRubber = cartridge (.25 caseless rubber) + .desc = { ent-BaseCartridgeCaselessRifle.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl index 067fadb22a9..7c07b506645 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl @@ -4,6 +4,8 @@ ent-CartridgeLightRifle = cartridge (.30 rifle) .desc = { ent-BaseCartridgeLightRifle.desc } ent-CartridgeLightRiflePractice = cartridge (.30 rifle practice) .desc = { ent-BaseCartridgeLightRifle.desc } +ent-CartridgeLightRifleRubber = cartridge (.30 rifle rubber) + .desc = { ent-BaseCartridgeLightRifle.desc } ent-CartridgeLightRifleIncendiary = cartridge (.30 rifle incendiary) .desc = { ent-BaseCartridgeLightRifle.desc } ent-CartridgeLightRifleUranium = cartridge (.30 rifle uranium) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl index 131b0f9346a..d0d74d06655 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl @@ -4,6 +4,8 @@ ent-CartridgeMagnum = cartridge (.45 magnum) .desc = { ent-BaseCartridgeMagnum.desc } ent-CartridgeMagnumPractice = cartridge (.45 magnum practice) .desc = { ent-BaseCartridgeMagnum.desc } +ent-CartridgeMagnumRubber = cartridge (.45 magnum rubber) + .desc = { ent-BaseCartridgeMagnum.desc } ent-CartridgeMagnumIncendiary = cartridge (.45 magnum incendiary) .desc = { ent-BaseCartridgeMagnum.desc } ent-CartridgeMagnumAP = cartridge (.45 magnum armor-piercing) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl index a35b46ab6bb..293080ad5f8 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl @@ -4,6 +4,8 @@ ent-CartridgePistol = cartridge (.35 auto) .desc = { ent-BaseCartridgePistol.desc } ent-CartridgePistolPractice = cartridge (.35 auto practice) .desc = { ent-BaseCartridgePistol.desc } +ent-CartridgePistolRubber = cartridge (.35 auto rubber) + .desc = { ent-BaseCartridgePistol.desc } ent-CartridgePistolIncendiary = cartridge (.35 auto incendiary) .desc = { ent-BaseCartridgePistol.desc } ent-CartridgePistolUranium = cartridge (.35 auto uranium) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl index ff045da1b28..f929f52beab 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl @@ -4,6 +4,8 @@ ent-CartridgeRifle = cartridge (.20 rifle) .desc = { ent-BaseCartridgeRifle.desc } ent-CartridgeRiflePractice = cartridge (.20 rifle practice) .desc = { ent-BaseCartridgeRifle.desc } +ent-CartridgeRifleRubber = cartridge (.20 rifle rubber) + .desc = { ent-BaseCartridgeRifle.desc } ent-CartridgeRifleIncendiary = cartridge (.20 rifle incendiary) .desc = { ent-BaseCartridgeRifle.desc } ent-CartridgeRifleUranium = cartridge (.20 rifle uranium) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl index d90d2602c6c..1a0fc91323d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl @@ -10,11 +10,17 @@ ent-MagazinePistolCaselessRifle = pistol magazine (.25 caseless) .desc = { ent-BaseMagazinePistolCaselessRifle.desc } ent-MagazinePistolCaselessRiflePractice = pistol magazine (.25 caseless practice) .desc = { ent-BaseMagazinePistolCaselessRifle.desc } +ent-MagazinePistolCaselessRifleRubber = pistol magazine (.25 caseless rubber) + .desc = { ent-BaseMagazinePistolCaselessRifle.desc } ent-MagazineCaselessRifle = magazine (.25 caseless) .desc = { ent-BaseMagazineCaselessRifle.desc } ent-MagazineCaselessRiflePractice = magazine (.25 caseless practice) .desc = { ent-BaseMagazineCaselessRifle.desc } +ent-MagazineCaselessRifleRubber = magazine (.25 caseless rubber) + .desc = { ent-BaseMagazineCaselessRifle.desc } ent-MagazineCaselessRifleShort = short magazine (.25 caseless) .desc = { ent-BaseMagazineCaselessRifleShort.desc } ent-MagazineCaselessRifleShortPractice = short magazine (.25 caseless practice) .desc = { ent-BaseMagazineCaselessRifleShort.desc } +ent-MagazineCaselessRifleShortRubber = short magazine (.25 caseless rubber) + .desc = { ent-BaseMagazineCaselessRifleShort.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl index d5c0a5da6fc..e73b20b50ac 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl @@ -4,15 +4,12 @@ ent-MagazineLightRifleBox = L6 SAW magazine box (.30 rifle) .desc = { ent-BaseMagazineLightRifle.desc } ent-MagazineLightRifle = magazine (.30 rifle) .desc = { ent-BaseMagazineLightRifle.desc } -ent-MagazineLightRifleEmpty = magazine (.30 rifle any) - .suffix = empty - .desc = { ent-MagazineLightRifle.desc } ent-MagazineLightRiflePractice = magazine (.30 rifle practice) .desc = { ent-BaseMagazineLightRifle.desc } +ent-MagazineLightRifleRubber = magazine (.30 rifle rubber) + .desc = { ent-BaseMagazineLightRifle.desc } ent-MagazineLightRifleUranium = magazine (.30 rifle uranium) .desc = { ent-BaseMagazineLightRifle.desc } -ent-MagazineLightRifleIncendiary = magazine (.30 rifle incendiary) - .desc = { ent-MagazineLightRifle.desc } ent-MagazineLightRifleMaxim = pan magazine (.30 rifle) .desc = { ent-BaseMagazineLightRifle.desc } ent-MagazineLightRiflePkBox = PK munitions box (.30 rifle) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl index 4d0a7c65ee7..75e59fe4f3b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl @@ -2,24 +2,22 @@ ent-BaseMagazineMagnum = pistol magazine (.45 magnum) .desc = { ent-BaseMagazinePistol.desc } ent-BaseMagazineMagnumSubMachineGun = Vector magazine (.45 magnum) .desc = { ent-BaseItem.desc } -ent-MagazineMagnumEmpty = pistol magazine (.45 magnum any) - .suffix = empty - .desc = { ent-BaseMagazineMagnum.desc } ent-MagazineMagnum = pistol magazine (.45 magnum) .desc = { ent-BaseMagazineMagnum.desc } ent-MagazineMagnumPractice = pistol magazine (.45 magnum practice) .desc = { ent-BaseMagazineMagnum.desc } +ent-MagazineMagnumRubber = pistol magazine (.45 magnum rubber) + .desc = { ent-BaseMagazineMagnum.desc } ent-MagazineMagnumUranium = pistol magazine (.45 magnum uranium) .desc = { ent-BaseMagazineMagnum.desc } ent-MagazineMagnumAP = pistol magazine (.45 magnum armor-piercing) .desc = { ent-BaseMagazineMagnum.desc } -ent-MagazineMagnumSubMachineGunEmpty = Vector magazine (.45 magnum any) - .suffix = empty - .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } ent-MagazineMagnumSubMachineGun = Vector magazine (.45 magnum) .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } ent-MagazineMagnumSubMachineGunPractice = Vector magazine (.45 magnum practice) .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } +ent-MagazineMagnumSubMachineGunRubber = Vector magazine (.45 magnum rubber) + .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } ent-MagazineMagnumSubMachineGunUranium = Vector magazine (.45 magnum uranium) .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } ent-MagazineMagnumSubMachineGunPiercing = Vector magazine (.45 magnum armor-piercing) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl index 4689a29cbc5..42584975093 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl @@ -6,22 +6,12 @@ ent-BaseMagazinePistolSubMachineGun = SMG magazine (.35 auto) .desc = { ent-BaseItem.desc } ent-MagazinePistolSubMachineGunTopMounted = WT550 magazine (.35 auto top-mounted) .desc = { ent-BaseItem.desc } -ent-MagazinePistolSubMachineGunTopMountedEmpty = WT550 magazine (.35 auto top-mounted any) - .desc = { ent-MagazinePistolSubMachineGunTopMounted.desc } ent-MagazinePistol = pistol magazine (.35 auto) .desc = { ent-BaseMagazinePistol.desc } -ent-MagazinePistolEmpty = pistol magazine (.35 auto any) - .suffix = empty - .desc = { ent-MagazinePistol.desc } -ent-MagazinePistolIncendiary = pistol magazine (.35 auto incendiary) - .desc = { ent-MagazinePistol.desc } ent-MagazinePistolPractice = pistol magazine (.35 auto practice) .desc = { ent-BaseMagazinePistol.desc } -ent-MagazinePistolUranium = pistol magazine (.35 auto uranium) +ent-MagazinePistolRubber = pistol magazine (.35 auto rubber) .desc = { ent-BaseMagazinePistol.desc } -ent-MagazinePistolHighCapacityEmpty = machine pistol magazine (.35 auto any) - .suffix = empty - .desc = { ent-BaseMagazinePistolHighCapacity.desc } ent-MagazinePistolHighCapacity = machine pistol magazine (.35 auto) .desc = { ent-BaseMagazinePistolHighCapacity.desc } ent-MagazinePistolHighCapacityPractice = machine pistol magazine (.35 auto practice) @@ -30,10 +20,9 @@ ent-MagazinePistolHighCapacityRubber = machine pistol magazine (.35 auto rubber) .desc = { ent-BaseMagazinePistolHighCapacity.desc } ent-MagazinePistolSubMachineGun = SMG magazine (.35 auto) .desc = { ent-BaseMagazinePistolSubMachineGun.desc } -ent-MagazinePistolSubMachineGunEmpty = SMG magazine (.35 auto any) - .suffix = empty - .desc = { ent-BaseMagazinePistolSubMachineGun.desc } ent-MagazinePistolSubMachineGunPractice = SMG magazine (.35 auto practice) .desc = { ent-BaseMagazinePistolSubMachineGun.desc } +ent-MagazinePistolSubMachineGunRubber = SMG magazine (.35 auto rubber) + .desc = { ent-BaseMagazinePistolSubMachineGun.desc } ent-MagazinePistolSubMachineGunUranium = SMG magazine (.35 auto rubber) .desc = { ent-BaseMagazinePistolSubMachineGun.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl index af9dc33ad20..a4c85f0400d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl @@ -2,12 +2,9 @@ ent-BaseMagazineRifle = magazine (.20 rifle) .desc = { ent-BaseItem.desc } ent-MagazineRifle = magazine (.20 rifle) .desc = { ent-BaseMagazineRifle.desc } -ent-MagazineRifleEmpty = magazine (.20 rifle any) - .suffix = empty - .desc = { ent-MagazineRifle.desc } -ent-MagazineRifleIncendiary = magazine (.20 rifle incendiary) - .desc = { ent-MagazineRifle.desc } ent-MagazineRiflePractice = magazine (.20 rifle practice) .desc = { ent-BaseMagazineRifle.desc } +ent-MagazineRifleRubber = magazine (.20 rifle rubber) + .desc = { ent-BaseMagazineRifle.desc } ent-MagazineRifleUranium = magazine (.20 rifle uranium) .desc = { ent-BaseMagazineRifle.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl index 0d1f45af0bc..9b7752fbf40 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl @@ -1,8 +1,5 @@ ent-BaseMagazineShotgun = ammo drum (.50 shells) .desc = { ent-BaseItem.desc } -ent-MagazineShotgunEmpty = ammo drum (.50 shells any) - .suffix = empty - .desc = { ent-BaseMagazineShotgun.desc } ent-MagazineShotgun = ammo drum (.50 pellet) .desc = { ent-BaseMagazineShotgun.desc } ent-MagazineShotgunBeanbag = ammo drum (.50 beanbags) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/caseless_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/caseless_rifle.ftl index f6357d7c3a4..b98a7f82be5 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/caseless_rifle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/caseless_rifle.ftl @@ -2,3 +2,5 @@ ent-BulletCaselessRifle = bullet (.25 caseless) .desc = { ent-BaseBullet.desc } ent-BulletCaselessRiflePractice = bullet (.25 caseless practice) .desc = { ent-BaseBulletPractice.desc } +ent-BulletCaselessRifleRubber = bullet (.25 caseless rubber) + .desc = { ent-BaseBulletRubber.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/light_rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/light_rifle.ftl index 343cae67d12..0250e09da6a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/light_rifle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/light_rifle.ftl @@ -2,6 +2,8 @@ ent-BulletLightRifle = bullet (.20 rifle) .desc = { ent-BaseBullet.desc } ent-BulletLightRiflePractice = bullet (.20 rifle practice) .desc = { ent-BaseBulletPractice.desc } +ent-BulletLightRifleRubber = bullet (.20 rifle rubber) + .desc = { ent-BaseBulletRubber.desc } ent-BulletLightRifleIncendiary = bullet (.20 rifle incendiary) .desc = { ent-BaseBulletIncendiary.desc } ent-BulletLightRifleUranium = bullet (.20 rifle uranium) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/magnum.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/magnum.ftl index a0f05bc001d..4e1186af254 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/magnum.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/magnum.ftl @@ -2,6 +2,8 @@ ent-BulletMagnum = bullet (.45 magnum) .desc = { ent-BaseBullet.desc } ent-BulletMagnumPractice = bullet (.45 magnum practice) .desc = { ent-BaseBulletPractice.desc } +ent-BulletMagnumRubber = bullet (.45 magnum rubber) + .desc = { ent-BaseBulletRubber.desc } ent-BulletMagnumIncendiary = bullet (.45 magnum incendiary) .desc = { ent-BaseBulletIncendiary.desc } ent-BulletMagnumAP = bullet (.45 magnum armor-piercing) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/pistol.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/pistol.ftl index f3aa8f862ec..1c153146492 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/pistol.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/pistol.ftl @@ -2,6 +2,8 @@ ent-BulletPistol = bullet (.35 auto) .desc = { ent-BaseBullet.desc } ent-BulletPistolPractice = bullet (.35 auto practice) .desc = { ent-BaseBulletPractice.desc } +ent-BulletPistolRubber = bullet (.35 auto rubber) + .desc = { ent-BaseBulletRubber.desc } ent-BulletPistolIncendiary = bullet (.35 auto incendiary) .desc = { ent-BaseBulletIncendiary.desc } ent-BulletPistolUranium = bullet (.35 auto uranium) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/rifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/rifle.ftl index c2c27fa9575..c413c8a6bb7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/rifle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/rifle.ftl @@ -2,6 +2,8 @@ ent-BulletRifle = bullet (0.20 rifle) .desc = { ent-BaseBullet.desc } ent-BulletRiflePractice = bullet (0.20 rifle practice) .desc = { ent-BaseBulletPractice.desc } +ent-BulletRifleRubber = bullet (0.20 rifle rubber) + .desc = { ent-BaseBulletRubber.desc } ent-BulletRifleIncendiary = bullet (0.20 rifle incendiary) .desc = { ent-BaseBulletIncendiary.desc } ent-BulletRifleUranium = bullet (0.20 rifle uranium) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl index 35abf592cca..1684b99a371 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl @@ -2,12 +2,10 @@ ent-BaseSpeedLoaderMagnum = speed loader (.45 magnum) .desc = { ent-BaseItem.desc } ent-SpeedLoaderMagnum = speed loader (.45 magnum) .desc = { ent-BaseSpeedLoaderMagnum.desc } -ent-SpeedLoaderMagnumEmpty = speed loader (.45 magnum any) - .desc = { ent-SpeedLoaderMagnum.desc } -ent-SpeedLoaderMagnumIncendiary = speed loader (.45 magnum incendiary) - .desc = { ent-SpeedLoaderMagnum.desc } ent-SpeedLoaderMagnumPractice = speed loader (.45 magnum practice) .desc = { ent-BaseSpeedLoaderMagnum.desc } +ent-SpeedLoaderMagnumRubber = speed loader (.45 magnum rubber) + .desc = { ent-BaseSpeedLoaderMagnum.desc } ent-SpeedLoaderMagnumAP = speed loader (.45 magnum armor-piercing) .desc = { ent-BaseSpeedLoaderMagnum.desc } ent-SpeedLoaderMagnumUranium = speed loader (.45 magnum uranium) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/pistol.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/pistol.ftl index 4e6b1edb003..c515ba04657 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/pistol.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/pistol.ftl @@ -4,3 +4,5 @@ ent-SpeedLoaderPistol = speed loader (.35 auto) .desc = { ent-BaseSpeedLoaderPistol.desc } ent-SpeedLoaderPistolPractice = speed loader (.35 auto practice) .desc = { ent-BaseSpeedLoaderPistol.desc } +ent-SpeedLoaderPistolRubber = speed loader (.35 auto rubber) + .desc = { ent-BaseSpeedLoaderPistol.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl index 9e08215ac89..93ee69051f2 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl @@ -17,7 +17,7 @@ ent-WeaponTeslaGun = tesla gun ent-WeaponLaserCarbine = laser rifle .desc = Favoured by Nanotrasen Security for being cheap and easy to use. ent-WeaponLaserCarbinePractice = practice laser rifle - .desc = This modified laser rifle fires nearly harmless beams in the 40-watt range, for target practice. + .desc = This modified laser rifle fires harmless beams in the 40-watt range, for target practice. ent-WeaponPulsePistol = pulse pistol .desc = A state of the art energy pistol favoured as a sidearm by the NT operatives. ent-WeaponPulseCarbine = pulse carbine @@ -35,7 +35,7 @@ ent-WeaponDisabler = disabler ent-WeaponDisablerSMG = disabler SMG .desc = Advanced weapon that exhausts organic targets, weakening them until they collapse. ent-WeaponDisablerPractice = practice disabler - .desc = A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for cadets making it mostly harmless. + .desc = A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for cadets. ent-WeaponTaser = taser .desc = A low-capacity, energy-based stun gun used by security teams to subdue targets at range. ent-WeaponAntiqueLaser = antique laser pistol diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl index 28fff08435c..48c9cb9045b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl @@ -1,10 +1,16 @@ ent-BaseWeaponPistol = BasePistol .desc = A rooty tooty point and shooty. ent-WeaponPistolViper = viper - .desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses .35 auto ammo. + .desc = A small, easily concealable, but somewhat underpowered gun, produced by a bulk arms manufacturer now defunct for over a century. Uses .35 auto ammo. ent-WeaponPistolCobra = cobra .desc = A rugged, robust operator handgun with inbuilt silencer. Uses .25 caseless ammo. ent-WeaponPistolMk58 = mk 58 .desc = A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo. +ent-WeaponPistolMk58Nonlethal = { ent-WeaponPistolMk58 } + .suffix = Non-lethal + .desc = { ent-WeaponPistolMk58.desc } ent-WeaponPistolN1984 = N1984 .desc = The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber. +ent-WeaponPistolN1984Nonlethal = N1984 + .suffix = Non-lethal + .desc = { ent-WeaponPistolN1984.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/magic.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/magic.ftl index 655b5662ab6..e2ca9fb0bc3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/magic.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/magic.ftl @@ -1,7 +1,5 @@ ent-ProjectileFireball = fireball .desc = You better GITTAH WEIGH. -ent-ProjectileDragonsBreath = dragon's breath - .desc = Try not to get toasted. ent-ProjectileAnomalyFireball = fireball .desc = Hovering blob of flame. ent-ProjectilePolyboltBase = { ent-BaseBullet } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/meteors.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/meteors.ftl index e72ad643803..39f60c88f6f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/meteors.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/meteors.ftl @@ -1,16 +1,2 @@ -ent-BaseMeteor = meteor - .desc = You prefer them when they're burning up in the atmosphere. -ent-MeteorSpaceDust = space dust - .desc = Makes a station sneeze. -ent-MeteorSmall = { ent-BaseMeteor } - .suffix = Small - .desc = { ent-BaseMeteor.desc } -ent-MeteorMedium = { ent-BaseMeteor } - .suffix = Medium - .desc = { ent-BaseMeteor.desc } -ent-MeteorLarge = { ent-BaseMeteor } - .suffix = Large - .desc = { ent-BaseMeteor.desc } -ent-MeteorUrist = Urist McMeteor - .desc = As a successful member of society with a stable unflinching psyche and limitless drive, natural affinity for finance and domination, you have been selected, no, you have been effortlessly guided by divine (biological) trauma towards this moment. The gates of destiny fling open, and once again you're left standing on pulsating nothingness. A strobing headache of the soul. - .suffix = Meteor +ent-MeteorLarge = meteor + .desc = { "" } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl index d9835d775dd..0c4a76f289b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl @@ -6,6 +6,8 @@ ent-BaseBulletTrigger = { ent-BaseBullet } .desc = { ent-BaseBullet.desc } ent-BaseBulletPractice = base bullet practice .desc = { ent-BaseBullet.desc } +ent-BaseBulletRubber = base bullet rubber + .desc = { ent-BaseBullet.desc } ent-BaseBulletIncendiary = base bullet incendiary .desc = { ent-BaseBullet.desc } ent-BaseBulletAP = base bullet armor-piercing @@ -44,10 +46,6 @@ ent-AnomalousParticleZetaStrong = { ent-AnomalousParticleZeta } .desc = { ent-AnomalousParticleZeta.desc } ent-AnomalousParticleOmegaStrong = omega particles .desc = { ent-AnomalousParticleDelta.desc } -ent-AnomalousParticleSigma = sigma particles - .desc = { ent-AnomalousParticleDelta.desc } -ent-AnomalousParticleSigmaStrong = sigma particles - .desc = { ent-AnomalousParticleSigma.desc } ent-BulletRocket = rocket .desc = { ent-BaseBulletTrigger.desc } ent-BulletWeakRocket = weak rocket @@ -76,3 +74,5 @@ ent-BulletDisablerSmg = disabler bolt smg .desc = { ent-BaseBullet.desc } ent-TeslaGunBullet = tesla gun lightning .desc = { ent-BaseBullet.desc } +ent-BulletEnergyGunLaser = energy bolt + .desc = { ent-BaseBullet.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl index 9122d95a09c..623b3433375 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl @@ -6,3 +6,6 @@ ent-WeaponRifleM90GrenadeLauncher = M-90gl .desc = An older bullpup carbine model, with an attached underbarrel grenade launcher. Uses .20 rifle ammo. ent-WeaponRifleLecter = Lecter .desc = A high end military grade assault rifle. Uses .20 rifle ammo. +ent-WeaponRifleLecterRubber = Lecter + .suffix = Non-lethal + .desc = { ent-WeaponRifleLecter.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/shotguns/shotguns.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/shotguns/shotguns.ftl index 30ba9d52b45..0a8e70e3845 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/shotguns/shotguns.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/shotguns/shotguns.ftl @@ -16,7 +16,7 @@ ent-WeaponShotgunKammerer = Kammerer .desc = When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells. ent-WeaponShotgunSawn = sawn-off shotgun .desc = Groovy! Uses .50 shotgun shells. -ent-WeaponShotgunSawnEmpty = sawn-off shotgun +ent-WeaponShotgunSawnEmpty = sawn-off shogun .desc = Groovy! Uses .50 shotgun shells. .suffix = Empty ent-WeaponShotgunHandmade = handmade pistol diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl index cdb666c424b..1730ca59126 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl @@ -11,3 +11,9 @@ ent-WeaponSubMachineGunVector = Vector .suffix = Deprecated use Drozd ent-WeaponSubMachineGunWt550 = WT550 .desc = An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. +ent-WeaponSubMachineGunDrozdRubber = Drozd + .suffix = Non-Lethal + .desc = { ent-WeaponSubMachineGunDrozd.desc } +ent-WeaponSubMachineGunVectorRubber = Vector + .desc = An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. + .suffix = Non-Lethal diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baseball_bat.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baseball_bat.ftl index 8478dfb10d5..8505dbee00d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baseball_bat.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baseball_bat.ftl @@ -1,7 +1,5 @@ ent-BaseBallBat = baseball bat .desc = A robust baseball bat. -ent-IncompleteBaseBallBat = incomplete baseball bat - .desc = A few planks of wood stuck together. ent-WeaponMeleeKnockbackStick = knockback stick .desc = And then he spleefed all over. .suffix = Do not map diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl index 6e687d9ab83..40ebddb2cad 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/e_sword.ftl @@ -7,6 +7,6 @@ ent-EnergyDaggerBox = e-dagger box .desc = A small box containing an e-dagger. Packaging disintegrates when opened, leaving no evidence behind. .suffix = E-Dagger ent-EnergyCutlass = energy cutlass - .desc = An exotic energy weapon. + .desc = An exotic energy weapon, brutal blade crackling with crudely harnessed plasma. ent-EnergySwordDouble = double-bladed energy sword - .desc = Syndicate Command's intern thought that having only one blade on energy swords was not cool enough. This can be stored in pockets. + .desc = Syndicate Command Interns thought that having one blade on the energy sword was not enough. This can be stored in pockets. 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 51999106b1c..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 @@ -23,5 +23,3 @@ ent-PlasmaShiv = plasma shiv .desc = A crude weapon fashioned from a piece of cloth and a plasma glass shard. ent-UraniumShiv = uranium shiv .desc = A crude weapon fashioned from a piece of cloth and a uranium glass shard. Violates the geneva convention! -ent-ThrowingKnife = throwing knife - .desc = This bloodred knife is very aerodynamic and easy to throw, but good luck trying to fight someone hand-to-hand. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl index 660822f227d..5855dc3a7e2 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/sword.ftl @@ -11,4 +11,4 @@ ent-Claymore = claymore ent-Cutlass = cutlass .desc = A wickedly curved blade, often seen in the hands of space pirates. ent-Throngler = The Throngler - .desc = Why would someone make this? + .desc = Why would you make this? diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/white_cane.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/white_cane.ftl index 817a7be1d1b..1d80258a9f6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/white_cane.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/white_cane.ftl @@ -1,2 +1,2 @@ ent-WhiteCane = white cane - .desc = This isn't for you. It's for the people who can't figure out you're blind when you ask if cargo is the bar. + .desc = This isn't for you. It's for the people who can't figure out you're blind when you ask if logistics is the bar. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/grenades.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/grenades.ftl index e049d4b5666..a3497dcac6d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/grenades.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/grenades.ftl @@ -8,8 +8,6 @@ ent-GrenadeFlashEffect = { "" } .desc = { "" } ent-SyndieMiniBomb = syndicate minibomb .desc = A syndicate-manufactured explosive used to stow destruction and cause chaos. -ent-SelfDestructSeq = Self Destruct - .desc = Go out on your own terms! ent-SupermatterGrenade = supermatter grenade .desc = Grenade that simulates delamination of the supermatter engine, pulling things in a heap and exploding after some time. ent-WhiteholeGrenade = whitehole grenade diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/base.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/base.ftl index e89548db24d..6229b300e56 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/base.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/base.ftl @@ -1,7 +1,5 @@ ent-BaseStation = { "" } .desc = { "" } -ent-BaseRandomStation = { "" } - .desc = { "" } ent-BaseStationCargo = { "" } .desc = { "" } ent-BaseStationJobsSpawning = { "" } @@ -14,6 +12,8 @@ ent-BaseStationGateway = { "" } .desc = { "" } ent-BaseStationShuttles = { "" } .desc = { "" } +ent-BaseStationShuttlesCore = { "" } + .desc = { "" } ent-BaseStationCentcomm = { "" } .desc = { "" } ent-BaseStationEvacuation = { "" } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/nanotrasen.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/nanotrasen.ftl index 6b0c4042c09..78ec9ef2c20 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/nanotrasen.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/nanotrasen.ftl @@ -5,4 +5,4 @@ ent-StandardNanotrasenStation = { ent-BaseStation } ent-NanotrasenCentralCommand = { ent-BaseStation } .desc = { ent-BaseStation.desc } ent-StandardStationArena = { ent-BaseStation } - .desc = { ent-BaseStation.desc } + .desc = { ent-BaseStation.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/syndicate.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/syndicate.ftl index c254efea33a..66bbb03279a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/syndicate.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/syndicate.ftl @@ -1,4 +1,4 @@ ent-BaseStationSyndicate = { "" } .desc = { "" } -ent-StandardNukieOutpost = { ent-BaseStationSyndicate } - .desc = { ent-BaseStationSyndicate.desc } +ent-StandardNukieOutpost = { ent-BaseStation } + .desc = { ent-BaseStation.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/test.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/test.ftl index fcb5bf3f22f..850fc39f047 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/test.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/stations/test.ftl @@ -1,2 +1,2 @@ ent-TestStation = { ent-BaseStation } - .desc = { ent-BaseStation.desc } + .desc = { ent-BaseStation.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/base_structure.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/base_structure.ftl index d38b843a347..887761c9f3e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/base_structure.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/base_structure.ftl @@ -2,5 +2,3 @@ ent-BaseStructure = { "" } .desc = { "" } ent-BaseStructureDynamic = { ent-BaseStructure } .desc = { ent-BaseStructure.desc } -ent-StructureWheeled = { "" } - .desc = { "" } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/banners.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/banners.ftl index 687bd9a7115..61a4e6b7307 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/banners.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/banners.ftl @@ -2,8 +2,8 @@ ent-BannerBase = base banner .desc = It's the concept of a banner, you shouldn't be seeing this. ent-BannerNanotrasen = nanotrasen banner .desc = A banner displaying the Nanotrasen logo. It looks rather cheap. -ent-BannerCargo = cargo banner - .desc = A banner displaying the colors of the cargo department. Not. Cargonia. +ent-BannerCargo = logistics banner + .desc = A banner displaying the colors of the logistics department. Not. Cargonia. ent-BannerEngineering = engineering banner .desc = A banner displaying the colors of the engineering department. Scrungularty. ent-BannerMedical = medical banner @@ -12,10 +12,10 @@ ent-BannerRevolution = revolution banner .desc = A banner displaying revolution. Viva! ent-BannerSyndicate = syndicate banner .desc = A banner from which, according to the syndicate, you should feel hatred for NT. -ent-BannerScience = science banner - .desc = A banner displaying the colors of the science department. Where science has no bounds, and regulations are rarely followed. +ent-BannerScience = epistemics banner + .desc = A banner displaying the colors of the epistemics department. Where stupidity is proven greater than the universe. ent-BannerSecurity = security banner - .desc = A banner displaying the colors of the security department. You're surprised it's not vandalised. + .desc = A banner displaying the colors of the shitcurity department. Security, my bad. ent-BannerBlue = blue banner .desc = A banner displaying the color blue. Dabudidabudai. ent-BannerRed = red banner diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/bonfire.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/bonfire.ftl index fc1b617af95..fe24c9c9d83 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/bonfire.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/bonfire.ftl @@ -1,4 +1,4 @@ ent-Bonfire = bonfire - .desc = What can be better than a late evening under the sky with guitar and friends? + .desc = What can be better then late evening under the sky with guitar and friends. ent-LegionnaireBonfire = legionnaire bonfire .desc = There, in the land of lava and ash, place to to cook marshmallow and potato. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/dispensers/base_structuredispensers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/dispensers/base_structuredispensers.ftl index 2c7c0e4aaee..39303332a80 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/dispensers/base_structuredispensers.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/dispensers/base_structuredispensers.ftl @@ -1,2 +1,2 @@ -ent-ReagentDispenserBase = { ent-SmallConstructibleMachine } - .desc = { ent-SmallConstructibleMachine.desc } +ent-ReagentDispenserBase = { ent-ConstructibleMachine } + .desc = { ent-ConstructibleMachine.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/dispensers/soda.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/dispensers/soda.ftl index df99f4e7775..27a850cd013 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/dispensers/soda.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/dispensers/soda.ftl @@ -1,6 +1,6 @@ -ent-SodaDispenser = soda dispenser +ent-soda_dispenser = soda dispenser .desc = A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers. .suffix = Filled -ent-SodaDispenserEmpty = { ent-SodaDispenser } +ent-SodaDispenserEmpty = { ent-soda_dispenser } .suffix = Empty - .desc = { ent-SodaDispenser.desc } + .desc = { ent-soda_dispenser.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 04248e5917b..fedaf9bd935 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl @@ -1,32 +1,35 @@ ent-AirlockServiceLocked = { ent-Airlock } .suffix = Service, Locked .desc = { ent-Airlock.desc } -ent-AirlockLawyerLocked = { ent-AirlockServiceLocked } +ent-AirlockLawyerLocked = { ent-Airlock } .suffix = Lawyer, Locked - .desc = { ent-AirlockServiceLocked.desc } -ent-AirlockTheatreLocked = { ent-AirlockServiceLocked } + .desc = { ent-Airlock.desc } +ent-AirlockTheatreLocked = { ent-Airlock } .suffix = Theatre, Locked - .desc = { ent-AirlockServiceLocked.desc } -ent-AirlockChapelLocked = { ent-AirlockServiceLocked } + .desc = { ent-Airlock.desc } +ent-AirlockChapelLocked = { ent-AirlockScience } .suffix = Chapel, Locked - .desc = { ent-AirlockServiceLocked.desc } -ent-AirlockJanitorLocked = { ent-AirlockServiceLocked } + .desc = { ent-AirlockScience.desc } +ent-AirlockJanitorLocked = { ent-Airlock } .suffix = Janitor, Locked - .desc = { ent-AirlockServiceLocked.desc } -ent-AirlockKitchenLocked = { ent-AirlockServiceLocked } + .desc = { ent-Airlock.desc } +ent-AirlockKitchenLocked = { ent-Airlock } .suffix = Kitchen, Locked - .desc = { ent-AirlockServiceLocked.desc } -ent-AirlockBarLocked = { ent-AirlockServiceLocked } + .desc = { ent-Airlock.desc } +ent-AirlockBarLocked = { ent-Airlock } .suffix = Bar, Locked - .desc = { ent-AirlockServiceLocked.desc } -ent-AirlockHydroponicsLocked = { ent-AirlockServiceLocked } + .desc = { ent-Airlock.desc } +ent-AirlockHydroponicsLocked = { ent-Airlock } .suffix = Hydroponics, Locked - .desc = { ent-AirlockServiceLocked.desc } + .desc = { ent-Airlock.desc } +ent-AirlockServiceCaptainLocked = { ent-Airlock } + .suffix = Captain, Locked + .desc = { ent-Airlock.desc } ent-AirlockExternalLocked = { ent-AirlockExternal } .suffix = External, Locked .desc = { ent-AirlockExternal.desc } ent-AirlockExternalCargoLocked = { ent-AirlockExternal } - .suffix = External, Cargo, Locked + .suffix = External, Logistics, Locked .desc = { ent-AirlockExternal.desc } ent-AirlockExternalEngineeringLocked = { ent-AirlockExternal } .suffix = External, Engineering, Locked @@ -56,7 +59,7 @@ ent-AirlockAtmosphericsLocked = { ent-AirlockAtmospherics } .suffix = Atmospherics, Locked .desc = { ent-AirlockAtmospherics.desc } ent-AirlockCargoLocked = { ent-AirlockCargo } - .suffix = Cargo, Locked + .suffix = Logistics, Locked .desc = { ent-AirlockCargo.desc } ent-AirlockSalvageLocked = { ent-AirlockCargo } .suffix = Salvage, Locked @@ -67,20 +70,20 @@ ent-AirlockMiningLocked = { ent-AirlockMining } ent-AirlockMedicalLocked = { ent-AirlockMedical } .suffix = Medical, Locked .desc = { ent-AirlockMedical.desc } +ent-AirlockParamedicLocked = { ent-AirlockMedical } + .suffix = Paramedic, Locked + .desc = { ent-AirlockMedical.desc } ent-AirlockVirologyLocked = { ent-AirlockVirology } .suffix = Virology, Locked .desc = { ent-AirlockVirology.desc } ent-AirlockChemistryLocked = { ent-AirlockChemistry } .suffix = Chemistry, Locked .desc = { ent-AirlockChemistry.desc } -ent-AirlockMedicalMorgueLocked = { ent-AirlockMedical } - .suffix = Morgue, Locked - .desc = { ent-AirlockMedical.desc } ent-AirlockScienceLocked = { ent-AirlockScience } - .suffix = Science, Locked + .suffix = Epistemics, Locked .desc = { ent-AirlockScience.desc } ent-AirlockMedicalScienceLocked = { ent-AirlockScience } - .suffix = Medical/Science, Locked + .suffix = Medical/Epistemics, Locked .desc = { ent-AirlockScience.desc } ent-AirlockCentralCommandLocked = { ent-AirlockCentralCommand } .suffix = Central Command, Locked @@ -107,7 +110,7 @@ ent-AirlockHeadOfPersonnelLocked = { ent-AirlockCommand } .suffix = HeadOfPersonnel, Locked .desc = { ent-AirlockCommand.desc } ent-AirlockQuartermasterLocked = { ent-AirlockCommand } - .suffix = Quartermaster, Locked + .suffix = Logistics Officer, Locked .desc = { ent-AirlockCommand.desc } ent-AirlockSecurityLocked = { ent-AirlockSecurity } .suffix = Security, Locked @@ -115,9 +118,6 @@ ent-AirlockSecurityLocked = { ent-AirlockSecurity } ent-AirlockDetectiveLocked = { ent-AirlockSecurity } .suffix = Detective, Locked .desc = { ent-AirlockSecurity.desc } -ent-AirlockBrigLocked = { ent-AirlockSecurity } - .suffix = Brig, Locked - .desc = { ent-AirlockSecurity.desc } ent-AirlockSecurityLawyerLocked = { ent-AirlockSecurity } .suffix = Security/Lawyer, Locked .desc = { ent-AirlockSecurity.desc } @@ -133,12 +133,12 @@ ent-AirlockEVALocked = { ent-AirlockCommand } ent-AirlockServiceGlassLocked = { ent-AirlockGlass } .suffix = Service, Locked .desc = { ent-AirlockGlass.desc } -ent-AirlockLawyerGlassLocked = { ent-AirlockServiceGlassLocked } +ent-AirlockLawyerGlassLocked = { ent-AirlockGlass } .suffix = Lawyer, Locked - .desc = { ent-AirlockServiceGlassLocked.desc } -ent-AirlockTheatreGlassLocked = { ent-AirlockServiceGlassLocked } + .desc = { ent-AirlockGlass.desc } +ent-AirlockTheatreGlassLocked = { ent-AirlockGlass } .suffix = Theatre, Locked - .desc = { ent-AirlockServiceGlassLocked.desc } + .desc = { ent-AirlockGlass.desc } ent-AirlockBarGlassLocked = { ent-AirlockGlass } .suffix = Bar, Locked .desc = { ent-AirlockGlass.desc } @@ -146,7 +146,7 @@ ent-AirlockExternalGlassLocked = { ent-AirlockExternalGlass } .suffix = External, Glass, Locked .desc = { ent-AirlockExternalGlass.desc } ent-AirlockExternalGlassCargoLocked = { ent-AirlockExternalGlass } - .suffix = External, Glass, Cargo, Locked + .suffix = External, Glass, Logistics, Locked .desc = { ent-AirlockExternalGlass.desc } ent-AirlockExternalGlassSyndicateLocked = { ent-AirlockExternalGlass } .suffix = External, Glass, Syndicate, Locked @@ -160,18 +160,18 @@ ent-AirlockExternalGlassEngineeringLocked = { ent-AirlockExternalGlass } ent-AirlockExternalGlassAtmosphericsLocked = { ent-AirlockExternalGlass } .suffix = External, Glass, Atmospherics, Locked .desc = { ent-AirlockExternalGlass.desc } -ent-AirlockKitchenGlassLocked = { ent-AirlockServiceGlassLocked } +ent-AirlockKitchenGlassLocked = { ent-AirlockGlass } .suffix = Kitchen, Locked - .desc = { ent-AirlockServiceGlassLocked.desc } -ent-AirlockJanitorGlassLocked = { ent-AirlockServiceGlassLocked } + .desc = { ent-AirlockGlass.desc } +ent-AirlockJanitorGlassLocked = { ent-AirlockGlass } .suffix = Janitor, Locked - .desc = { ent-AirlockServiceGlassLocked.desc } -ent-AirlockHydroGlassLocked = { ent-AirlockServiceGlassLocked } + .desc = { ent-AirlockGlass.desc } +ent-AirlockHydroGlassLocked = { ent-AirlockGlass } .suffix = Hydroponics, Locked - .desc = { ent-AirlockServiceGlassLocked.desc } -ent-AirlockChapelGlassLocked = { ent-AirlockServiceGlassLocked } + .desc = { ent-AirlockGlass.desc } +ent-AirlockChapelGlassLocked = { ent-AirlockScienceGlass } .suffix = Chapel, Locked - .desc = { ent-AirlockServiceGlassLocked.desc } + .desc = { ent-AirlockScienceGlass.desc } ent-AirlockEngineeringGlassLocked = { ent-AirlockEngineeringGlass } .suffix = Engineering, Locked .desc = { ent-AirlockEngineeringGlass.desc } @@ -179,7 +179,7 @@ ent-AirlockAtmosphericsGlassLocked = { ent-AirlockAtmosphericsGlass } .suffix = Atmospherics, Locked .desc = { ent-AirlockAtmosphericsGlass.desc } ent-AirlockCargoGlassLocked = { ent-AirlockCargoGlass } - .suffix = Cargo, Locked + .suffix = Logistics, Locked .desc = { ent-AirlockCargoGlass.desc } ent-AirlockSalvageGlassLocked = { ent-AirlockCargoGlass } .suffix = Salvage, Locked @@ -193,14 +193,17 @@ ent-AirlockChemistryGlassLocked = { ent-AirlockChemistryGlass } ent-AirlockMedicalGlassLocked = { ent-AirlockMedicalGlass } .suffix = Medical, Locked .desc = { ent-AirlockMedicalGlass.desc } +ent-AirlockParamedicGlassLocked = { ent-AirlockMedicalGlass } + .suffix = Paramedic, Locked + .desc = { ent-AirlockMedicalGlass.desc } ent-AirlockVirologyGlassLocked = { ent-AirlockVirologyGlass } .suffix = Virology, Locked .desc = { ent-AirlockVirologyGlass.desc } ent-AirlockScienceGlassLocked = { ent-AirlockScienceGlass } - .suffix = Science, Locked + .suffix = Epistemics, Locked .desc = { ent-AirlockScienceGlass.desc } ent-AirlockMedicalScienceGlassLocked = { ent-AirlockScienceGlass } - .suffix = Medical/Science, Locked + .suffix = Medical/Epistemics, Locked .desc = { ent-AirlockScienceGlass.desc } ent-AirlockCentralCommandGlassLocked = { ent-AirlockCentralCommandGlass } .suffix = Central Command, Locked @@ -227,7 +230,7 @@ ent-AirlockHeadOfPersonnelGlassLocked = { ent-AirlockCommandGlass } .suffix = HeadOfPersonnel, Locked .desc = { ent-AirlockCommandGlass.desc } ent-AirlockQuartermasterGlassLocked = { ent-AirlockCommandGlass } - .suffix = Quartermaster, Locked + .suffix = Logistics Officer, Locked .desc = { ent-AirlockCommandGlass.desc } ent-AirlockSecurityGlassLocked = { ent-AirlockSecurityGlass } .suffix = Security, Locked @@ -235,9 +238,6 @@ ent-AirlockSecurityGlassLocked = { ent-AirlockSecurityGlass } ent-AirlockDetectiveGlassLocked = { ent-AirlockSecurityGlass } .suffix = Detective, Locked .desc = { ent-AirlockSecurityGlass.desc } -ent-AirlockBrigGlassLocked = { ent-AirlockSecurityGlass } - .suffix = Brig, Locked - .desc = { ent-AirlockSecurityGlass.desc } ent-AirlockSecurityLawyerGlassLocked = { ent-AirlockSecurityGlass } .suffix = Security/Lawyer, Locked .desc = { ent-AirlockSecurityGlass.desc } @@ -263,7 +263,7 @@ ent-AirlockMaintSalvageLocked = { ent-AirlockMaint } .suffix = Salvage, Locked .desc = { ent-AirlockMaint.desc } ent-AirlockMaintCargoLocked = { ent-AirlockMaint } - .suffix = Cargo, Locked + .suffix = Logistics, Locked .desc = { ent-AirlockMaint.desc } ent-AirlockMaintCommandLocked = { ent-AirlockMaint } .suffix = Command, Locked @@ -277,72 +277,69 @@ ent-AirlockMaintEngiLocked = { ent-AirlockMaint } ent-AirlockMaintAtmoLocked = { ent-AirlockMaint } .suffix = Atmospherics, Locked .desc = { ent-AirlockMaint.desc } -ent-AirlockMaintBarLocked = { ent-AirlockMaintServiceLocked } +ent-AirlockMaintBarLocked = { ent-AirlockMaint } .suffix = Bar, Locked - .desc = { ent-AirlockMaintServiceLocked.desc } -ent-AirlockMaintChapelLocked = { ent-AirlockMaintServiceLocked } + .desc = { ent-AirlockMaint.desc } +ent-AirlockMaintChapelLocked = { ent-AirlockMaint } .suffix = Chapel, Locked - .desc = { ent-AirlockMaintServiceLocked.desc } -ent-AirlockMaintHydroLocked = { ent-AirlockMaintServiceLocked } + .desc = { ent-AirlockMaint.desc } +ent-AirlockMaintHydroLocked = { ent-AirlockMaint } .suffix = Hydroponics, Locked - .desc = { ent-AirlockMaintServiceLocked.desc } -ent-AirlockMaintJanitorLocked = { ent-AirlockMaintServiceLocked } + .desc = { ent-AirlockMaint.desc } +ent-AirlockMaintJanitorLocked = { ent-AirlockMaint } .suffix = Janitor, Locked - .desc = { ent-AirlockMaintServiceLocked.desc } -ent-AirlockMaintLawyerLocked = { ent-AirlockMaintServiceLocked } + .desc = { ent-AirlockMaint.desc } +ent-AirlockMaintLawyerLocked = { ent-AirlockMaint } .suffix = Lawyer, Locked - .desc = { ent-AirlockMaintServiceLocked.desc } + .desc = { ent-AirlockMaint.desc } ent-AirlockMaintServiceLocked = { ent-AirlockMaint } .suffix = Service, Locked .desc = { ent-AirlockMaint.desc } -ent-AirlockMaintTheatreLocked = { ent-AirlockMaintServiceLocked } +ent-AirlockMaintTheatreLocked = { ent-AirlockMaint } .suffix = Theatre, Locked - .desc = { ent-AirlockMaintServiceLocked.desc } -ent-AirlockMaintKitchenLocked = { ent-AirlockMaintServiceLocked } + .desc = { ent-AirlockMaint.desc } +ent-AirlockMaintKitchenLocked = { ent-AirlockMaint } .suffix = Kitchen, Locked - .desc = { ent-AirlockMaintServiceLocked.desc } + .desc = { ent-AirlockMaint.desc } ent-AirlockMaintIntLocked = { ent-AirlockMaint } .suffix = Interior, Locked .desc = { ent-AirlockMaint.desc } ent-AirlockMaintMedLocked = { ent-AirlockMaint } .suffix = Medical, Locked .desc = { ent-AirlockMaint.desc } -ent-AirlockMaintChemLocked = { ent-AirlockMaintMedLocked } +ent-AirlockMaintChemLocked = { ent-AirlockMaint } .suffix = Chemistry, Locked - .desc = { ent-AirlockMaintMedLocked.desc } + .desc = { ent-AirlockMaint.desc } ent-AirlockMaintRnDLocked = { ent-AirlockMaint } - .suffix = Science, Locked + .suffix = Epistemics, Locked + .desc = { ent-AirlockMaint.desc } +ent-AirlockMaintRnDMedLocked = { ent-AirlockMaint } + .suffix = Medical/Epistemics, Locked .desc = { ent-AirlockMaint.desc } -ent-AirlockMaintRnDMedLocked = { ent-AirlockMaintRnDLocked } - .suffix = Medical/Science, Locked - .desc = { ent-AirlockMaintRnDLocked.desc } ent-AirlockMaintSecLocked = { ent-AirlockMaint } .suffix = Security, Locked .desc = { ent-AirlockMaint.desc } -ent-AirlockMaintDetectiveLocked = { ent-AirlockMaintSecLocked } +ent-AirlockMaintDetectiveLocked = { ent-AirlockMaint } .suffix = Detective, Locked - .desc = { ent-AirlockMaintSecLocked.desc } -ent-AirlockMaintHOPLocked = { ent-AirlockMaintCommandLocked } + .desc = { ent-AirlockMaint.desc } +ent-AirlockMaintHOPLocked = { ent-AirlockMaint } .suffix = HeadOfPersonnel, Locked - .desc = { ent-AirlockMaintCommandLocked.desc } -ent-AirlockMaintCaptainLocked = { ent-AirlockMaintCommandLocked } + .desc = { ent-AirlockMaint.desc } +ent-AirlockMaintCaptainLocked = { ent-AirlockMaint } .suffix = Captain, Locked - .desc = { ent-AirlockMaintCommandLocked.desc } -ent-AirlockMaintChiefEngineerLocked = { ent-AirlockMaintCommandLocked } + .desc = { ent-AirlockMaint.desc } +ent-AirlockMaintChiefEngineerLocked = { ent-AirlockMaint } .suffix = ChiefEngineer, Locked - .desc = { ent-AirlockMaintCommandLocked.desc } -ent-AirlockMaintChiefMedicalOfficerLocked = { ent-AirlockMaintCommandLocked } + .desc = { ent-AirlockMaint.desc } +ent-AirlockMaintChiefMedicalOfficerLocked = { ent-AirlockMaint } .suffix = ChiefMedicalOfficer, Locked - .desc = { ent-AirlockMaintCommandLocked.desc } -ent-AirlockMaintHeadOfSecurityLocked = { ent-AirlockMaintCommandLocked } + .desc = { ent-AirlockMaint.desc } +ent-AirlockMaintHeadOfSecurityLocked = { ent-AirlockMaint } .suffix = HeadOfSecurity, Locked - .desc = { ent-AirlockMaintCommandLocked.desc } -ent-AirlockMaintResearchDirectorLocked = { ent-AirlockMaintCommandLocked } + .desc = { ent-AirlockMaint.desc } +ent-AirlockMaintResearchDirectorLocked = { ent-AirlockMaint } .suffix = ResearchDirector, Locked - .desc = { ent-AirlockMaintCommandLocked.desc } -ent-AirlockMaintQuartermasterLocked = { ent-AirlockMaintCommandLocked } - .suffix = Quartermaster, Locked - .desc = { ent-AirlockMaintCommandLocked.desc } + .desc = { ent-AirlockMaint.desc } ent-AirlockMaintArmoryLocked = { ent-AirlockMaint } .suffix = Armory, Locked .desc = { ent-AirlockMaint.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl index 8a74f6731c0..f2ba0471d14 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl @@ -8,7 +8,7 @@ ent-AirlockAtmospherics = { ent-AirlockEngineering } .suffix = Atmospherics .desc = { ent-AirlockEngineering.desc } ent-AirlockCargo = { ent-Airlock } - .suffix = Cargo + .suffix = Logistics .desc = { ent-Airlock.desc } ent-AirlockMedical = { ent-Airlock } .suffix = Medical @@ -20,7 +20,7 @@ ent-AirlockChemistry = { ent-AirlockMedical } .suffix = Chemistry .desc = { ent-AirlockMedical.desc } ent-AirlockScience = { ent-Airlock } - .suffix = Science + .suffix = Epistemics .desc = { ent-Airlock.desc } ent-AirlockCommand = { ent-Airlock } .suffix = Command @@ -43,6 +43,8 @@ ent-AirlockHatch = airtight hatch .desc = { ent-Airlock.desc } ent-AirlockHatchMaintenance = maintenance hatch .desc = { ent-Airlock.desc } +ent-AirlockGlass = glass airlock + .desc = { ent-Airlock.desc } ent-AirlockEngineeringGlass = { ent-AirlockGlass } .suffix = Engineering .desc = { ent-AirlockGlass.desc } @@ -53,7 +55,7 @@ ent-AirlockAtmosphericsGlass = { ent-AirlockEngineeringGlass } .suffix = Atmospherics .desc = { ent-AirlockEngineeringGlass.desc } ent-AirlockCargoGlass = { ent-AirlockGlass } - .suffix = Cargo + .suffix = Logistics .desc = { ent-AirlockGlass.desc } ent-AirlockMedicalGlass = { ent-AirlockGlass } .suffix = Medical @@ -65,7 +67,7 @@ ent-AirlockVirologyGlass = { ent-AirlockMedicalGlass } .suffix = Virology .desc = { ent-AirlockMedicalGlass.desc } ent-AirlockScienceGlass = { ent-AirlockGlass } - .suffix = Science + .suffix = Epistemics .desc = { ent-AirlockGlass.desc } ent-AirlockCommandGlass = { ent-AirlockGlass } .suffix = Command diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/base_structureairlocks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/base_structureairlocks.ftl index 75fe77ca9fa..81876b6d6a1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/base_structureairlocks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/base_structureairlocks.ftl @@ -1,6 +1,2 @@ ent-Airlock = airlock .desc = It opens, it closes, and maybe crushes you. -ent-AirlockRCDResistant = { ent-Airlock } - .desc = { ent-Airlock.desc } -ent-AirlockGlass = glass airlock - .desc = { ent-Airlock.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/external.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/external.ftl index 8442c07603d..290aedf2c55 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/external.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/external.ftl @@ -1,4 +1,4 @@ -ent-AirlockExternal = { ent-AirlockRCDResistant } +ent-AirlockExternal = { ent-Airlock } .desc = It opens, it closes, it might crush you, and there might be only space behind it. .suffix = External ent-AirlockExternalGlass = { ent-AirlockExternal } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/firelocks/firelock.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/firelocks/firelock.ftl index 35edb82e4b0..13da64766c0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/firelocks/firelock.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/firelocks/firelock.ftl @@ -5,4 +5,4 @@ ent-Firelock = { ent-BaseFirelock } ent-FirelockGlass = glass firelock .desc = { ent-Firelock.desc } ent-FirelockEdge = firelock - .desc = { ent-Firelock.desc } + .desc = { ent-BaseFirelock.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/shutter/blast_door_autolink.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/shutter/blast_door_autolink.ftl index 27bf0dfbc36..1a01017f5e7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/shutter/blast_door_autolink.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/shutter/blast_door_autolink.ftl @@ -22,18 +22,6 @@ ent-BlastDoorBridge = { ent-BlastDoor } ent-BlastDoorBridgeOpen = { ent-BlastDoorOpen } .suffix = Open, Autolink, Bridge .desc = { ent-BlastDoorOpen.desc } -ent-BlastDoorEngineering = { ent-BlastDoor } - .suffix = Autolink, Engineering - .desc = { ent-BlastDoor.desc } -ent-BlastDoorEngineeringOpen = { ent-BlastDoorOpen } - .suffix = Open, Autolink, Engineering - .desc = { ent-BlastDoorOpen.desc } -ent-BlastDoorScience = { ent-BlastDoor } - .suffix = Autolink, Science - .desc = { ent-BlastDoor.desc } -ent-BlastDoorScienceOpen = { ent-BlastDoorOpen } - .suffix = Open, Autolink, Science - .desc = { ent-BlastDoorOpen.desc } ent-BlastDoorWindows = { ent-BlastDoor } .suffix = Autolink, Windows .desc = { ent-BlastDoor.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl index a16f26c8acb..787b5dc7bcb 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 @@ -19,7 +19,7 @@ ent-WindoorBarKitchenLocked = { ent-Windoor } .suffix = Bar&Kitchen, Locked .desc = { ent-Windoor.desc } ent-WindoorCargoLocked = { ent-Windoor } - .suffix = Cargo, Locked + .suffix = Logistics, Locked .desc = { ent-Windoor.desc } ent-WindoorChapelLocked = { ent-Windoor } .suffix = Chapel, Locked @@ -48,23 +48,14 @@ ent-WindoorTheatreLocked = { ent-Windoor } ent-WindoorSecureArmoryLocked = { ent-WindoorSecureSecurityLocked } .suffix = Armory, Locked .desc = { ent-WindoorSecureSecurityLocked.desc } -ent-PlasmaWindoorSecureArmoryLocked = { ent-WindoorSecurePlasma } - .suffix = Armory, Locked, Plasma - .desc = { ent-WindoorSecurePlasma.desc } ent-WindoorSecureAtmosphericsLocked = { ent-WindoorSecure } .suffix = Atmospherics, Locked .desc = { ent-WindoorSecure.desc } -ent-PlasmaWindoorSecureAtmosphericsLocked = { ent-WindoorSecurePlasma } - .suffix = Atmospherics, Locked, Plasma - .desc = { ent-WindoorSecurePlasma.desc } ent-WindoorSecureBarLocked = { ent-WindoorSecure } .suffix = Bar, Locked .desc = { ent-WindoorSecure.desc } -ent-WindoorSecureBrigLocked = { ent-WindoorSecureSecurityLocked } - .suffix = Brig, Locked - .desc = { ent-WindoorSecureSecurityLocked.desc } ent-WindoorSecureCargoLocked = { ent-WindoorSecure } - .suffix = Cargo, Locked + .suffix = Logistics, Locked .desc = { ent-WindoorSecure.desc } ent-WindoorSecureChapelLocked = { ent-WindoorSecure } .suffix = Chapel, Locked @@ -87,9 +78,6 @@ ent-UraniumWindoorSecureCentralCommandLocked = { ent-WindoorSecureUranium } ent-WindoorSecureCommandLocked = { ent-WindoorSecure } .suffix = Command, Locked .desc = { ent-WindoorSecure.desc } -ent-PlasmaWindoorSecureCommandLocked = { ent-WindoorSecurePlasma } - .suffix = Command, Locked, Plasma - .desc = { ent-WindoorSecurePlasma.desc } ent-WindoorSecureDetectiveLocked = { ent-WindoorSecure } .suffix = Detective, Locked .desc = { ent-WindoorSecure.desc } @@ -126,11 +114,8 @@ ent-WindoorSecureSalvageLocked = { ent-WindoorSecure } ent-WindoorSecureSecurityLocked = { ent-WindoorSecure } .suffix = Security, Locked .desc = { ent-WindoorSecure.desc } -ent-PlasmaWindoorSecureSecurityLocked = { ent-WindoorSecurePlasma } - .suffix = Security, Locked, Plasma - .desc = { ent-WindoorSecurePlasma.desc } ent-WindoorSecureScienceLocked = { ent-WindoorSecure } - .suffix = Science, Locked + .suffix = Epistemics, Locked .desc = { ent-WindoorSecure.desc } ent-PlasmaWindoorSecureScienceLocked = { ent-WindoorSecurePlasma } .suffix = Science, Locked, Plasma diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/potted_plants.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/potted_plants.ftl index 824236add9d..190aa8afeaf 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/potted_plants.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/potted_plants.ftl @@ -50,8 +50,10 @@ ent-PottedPlant23 = { ent-PottedPlantBase } .desc = { ent-PottedPlantBase.desc } ent-PottedPlant24 = { ent-PottedPlantBase } .desc = { ent-PottedPlantBase.desc } -ent-PottedPlantRD = RD's potted plant - .desc = A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says "Y'all come back now, y'hear?" It doesn't look very healthy... +ent-PottedPlantRD = Mystagogue's potted plant + .desc = + A gift from the botanical staff, presented after the Mystagogue's reassignment. There's a tag on it that says "Y'all come back now, y'hear?" + It doesn't look very healthy... ent-PottedPlant26 = { ent-PottedPlantBase } .desc = Is it just me, or is it blinking? ent-PottedPlant27 = plastic potted plant diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/base_lighting.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/base_lighting.ftl index 6efa8c5b8b1..71241f2630a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/base_lighting.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/base_lighting.ftl @@ -14,9 +14,9 @@ ent-AlwaysPoweredLightLED = { ent-AlwaysPoweredWallLight } .desc = { ent-AlwaysPoweredWallLight.desc } ent-PoweredlightExterior = { ent-Poweredlight } .desc = A light fixture. Draws power and produces light when equipped with a light tube. - .suffix = Exterior + .suffix = Blue ent-AlwaysPoweredLightExterior = { ent-AlwaysPoweredWallLight } - .suffix = Always Powered, Exterior + .suffix = Always Powered, Blue .desc = { ent-AlwaysPoweredWallLight.desc } ent-PoweredlightSodium = { ent-Poweredlight } .desc = A light fixture. Draws power and produces light when equipped with a light tube. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl index 9e91ddba3d5..1ebf2cf3cec 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl @@ -1,4 +1,6 @@ ent-MachineArtifactAnalyzer = artifact analyzer .desc = A platform capable of performing analysis on various types of artifacts. +ent-MachineTraversalDistorter = traversal distorter + .desc = A machine capable of distorting the traversal of artifact nodes. ent-MachineArtifactCrusher = artifact crusher .desc = Best not to let your fingers get stuck... diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/base_structuremachines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/base_structuremachines.ftl index bcb0245a84e..97f665003b6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/base_structuremachines.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/base_structuremachines.ftl @@ -4,5 +4,3 @@ ent-BaseMachinePowered = { ent-BaseMachine } .desc = { ent-BaseMachine.desc } ent-ConstructibleMachine = { "" } .desc = { "" } -ent-SmallConstructibleMachine = { ent-ConstructibleMachine } - .desc = { ent-ConstructibleMachine.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/chem_master.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/chem_master.ftl index 8b93b628ecc..d039ae4201e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/chem_master.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/chem_master.ftl @@ -1,2 +1,2 @@ -ent-ChemMaster = ChemMaster 4000 +ent-chem_master = ChemMaster 4000 .desc = An industrial grade chemical manipulator with pill and bottle production included. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl index f4f98bad56e..dac0d89c3eb 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl @@ -64,5 +64,3 @@ ent-ComputerMassMedia = news manager console ent-ComputerSensorMonitoring = sensor monitoring computer .desc = A flexible console for monitoring all kinds of sensors. .suffix = TESTING, DO NOT MAP -ent-ComputerRoboticsControl = robotics control console - .desc = Used to remotely monitor, disable and destroy the station's cyborgs. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/lathe.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/lathe.ftl index 7b4d8f4f21d..32e8dd4c1e1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/lathe.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/lathe.ftl @@ -1,21 +1,15 @@ ent-BaseLathe = lathe .desc = { ent-BaseMachinePowered.desc } -ent-BaseLatheLube = { ent-BaseLathe } - .desc = { ent-BaseLathe.desc } -ent-BaseHyperlathe = { "" } - .desc = { "" } ent-Autolathe = autolathe - .desc = It produces basic items using metal and glass. + .desc = It produces items using metal and glass. ent-AutolatheHyperConvection = hyper convection autolathe .desc = A highly-experimental autolathe that harnesses the power of extreme heat to slowly create objects more cost-effectively. ent-Protolathe = protolathe - .desc = Converts raw materials into advanced items. + .desc = Converts raw materials into useful objects. ent-ProtolatheHyperConvection = hyper convection protolathe .desc = A highly-experimental protolathe that harnesses the power of extreme heat to slowly create objects more cost-effectively. ent-CircuitImprinter = circuit imprinter .desc = Prints circuit boards for machines. -ent-CircuitImprinterHyperConvection = hyper convection circuit imprinter - .desc = A highly-experimental circuit imprinter that harnesses the power of extreme heat to slowly create objects more cost-effectively. ent-ExosuitFabricator = exosuit fabricator .desc = Creates parts for robotics and other mechanical needs ent-Biofabricator = biofabricator diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/microwave.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/microwave.ftl index c4471e65890..b2667536e58 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/microwave.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/microwave.ftl @@ -1,4 +1,2 @@ ent-KitchenMicrowave = microwave .desc = It's magic. -ent-SyndicateMicrowave = donk co. microwave - .desc = So advanced, it can cook donk-pockets in a mere 2.5 seconds! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/reagent_grinder.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/reagent_grinder.ftl index 999e504a735..9cf50ed2aa0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/reagent_grinder.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/reagent_grinder.ftl @@ -1,5 +1,3 @@ ent-KitchenReagentGrinder = reagent grinder .desc = From BlenderTech. Will It Blend? Let's find out! .suffix = grinder/juicer -ent-ReagentGrinderIndustrial = industrial reagent grinder - .desc = An industrial reagent grinder. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/surveillance_camera_routers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/surveillance_camera_routers.ftl index d7f2801e660..fc33d31277e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/surveillance_camera_routers.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/surveillance_camera_routers.ftl @@ -10,7 +10,7 @@ ent-SurveillanceCameraRouterSecurity = { ent-SurveillanceCameraRouterBase } .suffix = Security .desc = { ent-SurveillanceCameraRouterBase.desc } ent-SurveillanceCameraRouterScience = { ent-SurveillanceCameraRouterBase } - .suffix = Science + .suffix = Epistemics .desc = { ent-SurveillanceCameraRouterBase.desc } ent-SurveillanceCameraRouterSupply = { ent-SurveillanceCameraRouterBase } .suffix = Supply diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/telecomms.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/telecomms.ftl index 92123b1cb44..5660f4c119b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/telecomms.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/telecomms.ftl @@ -1,29 +1,5 @@ ent-TelecomServer = telecommunication server .desc = When powered and filled with encryption keys it allows radio headset communication. ent-TelecomServerFilled = { ent-TelecomServer } - .suffix = Filled All - .desc = { ent-TelecomServer.desc } -ent-TelecomServerFilledCommon = { ent-TelecomServer } - .suffix = Common - .desc = { ent-TelecomServer.desc } -ent-TelecomServerFilledCargo = { ent-TelecomServer } - .suffix = Cargo - .desc = { ent-TelecomServer.desc } -ent-TelecomServerFilledEngineering = { ent-TelecomServer } - .suffix = Engineering - .desc = { ent-TelecomServer.desc } -ent-TelecomServerFilledMedical = { ent-TelecomServer } - .suffix = Medical - .desc = { ent-TelecomServer.desc } -ent-TelecomServerFilledScience = { ent-TelecomServer } - .suffix = Science - .desc = { ent-TelecomServer.desc } -ent-TelecomServerFilledSecurity = { ent-TelecomServer } - .suffix = Security - .desc = { ent-TelecomServer.desc } -ent-TelecomServerFilledService = { ent-TelecomServer } - .suffix = Service - .desc = { ent-TelecomServer.desc } -ent-TelecomServerFilledCommand = { ent-TelecomServer } - .suffix = Command + .suffix = Filled .desc = { ent-TelecomServer.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl index 6eef88fff93..e541f852a87 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl @@ -106,8 +106,8 @@ ent-VendingBarDrobe = BarDrobe .desc = A stylish vendor to dispense the most stylish bar clothing! ent-VendingMachineChapel = PietyVend .desc = { ent-VendingMachine.desc } -ent-VendingMachineCargoDrobe = CargoDrobe - .desc = A highly advanced vending machine for buying cargo related clothing for free. +ent-VendingMachineCargoDrobe = LogiDrobe + .desc = A highly advanced vending machine for buying logistics related clothing for free. ent-VendingMachineMediDrobe = MediDrobe .desc = A vending machine rumoured to be capable of dispensing clothing for medical personnel. ent-VendingMachineChemDrobe = ChemDrobe diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/plastic_flaps.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/plastic_flaps.ftl index 74f79f883fe..8bb210e36ec 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/plastic_flaps.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/plastic_flaps.ftl @@ -1,5 +1,3 @@ -ent-PlasticFlapsBase = { ent-BaseStructureDynamic } - .desc = { ent-BaseStructureDynamic.desc } ent-PlasticFlapsClear = plastic flaps .desc = Heavy duty, plastic flaps. Definitely can't get past those. No way. .suffix = Clear @@ -8,7 +6,7 @@ ent-PlasticFlapsOpaque = plastic flaps .suffix = Opaque ent-PlasticFlapsAirtightClear = airtight plastic flaps .desc = Heavy duty, slightly stronger, airtight plastic flaps. Definitely can't get past those. No way. - .suffix = Airtight, Clear + .suffix = Airtight Clear ent-PlasticFlapsAirtightOpaque = airtight plastic flaps .desc = Heavy duty, slightly stronger, airtight plastic flaps. Definitely can't get past those. No way. - .suffix = Airtight, Opaque + .suffix = Airtight Opaque diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/shuttles/cannons.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/shuttles/cannons.ftl index ddab5bb2b75..208bb424c91 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/shuttles/cannons.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/shuttles/cannons.ftl @@ -1,19 +1,14 @@ ent-ShuttleGunBase = shittle gun .desc = { "" } ent-ShuttleGunSvalinnMachineGun = LSE-400c "Svalinn machine gun" - .desc = Basic stationary laser unit. Effective against live targets and electronics. Uses regular power cells to fire, and has an extremely high rate of fire. - .suffix = DO NOT MAP + .desc = Basic stationary laser unit. Effective against live targets and electronics. Uses regular power cells to fire, and has an extremely high rate of fire ent-ShuttleGunPerforator = LSE-1200c "Perforator" .desc = Advanced stationary laser unit. Annihilates electronics and is extremely dangerous to health! Uses the power cage to fire. - .suffix = DO NOT MAP ent-ShuttleGunFriendship = EXP-320g "Friendship" .desc = A small stationary grenade launcher that holds 2 grenades. - .suffix = DO NOT MAP ent-ShuttleGunDuster = EXP-2100g "Duster" .desc = A powerful stationary grenade launcher. A cartridge is required for use. - .suffix = DO NOT MAP ent-ShuttleGunPirateCannon = pirate ship cannon .desc = Kaboom! ent-ShuttleGunKinetic = PTK-800 "Matter Dematerializer" .desc = Salvage stationary mining turret. Gradually accumulates charges on its own, extremely effective for asteroid excavation. - .suffix = DO NOT MAP diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/anomaly/cores.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/anomaly/cores.ftl index 9368de36a69..8ed0cba6f2f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/anomaly/cores.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/anomaly/cores.ftl @@ -61,4 +61,4 @@ ent-AnomalyCoreFloraInert = { ent-BaseAnomalyInertCore } .desc = { ent-BaseAnomalyInertCore.desc } ent-AnomalyCoreShadowInert = { ent-BaseAnomalyInertCore } .suffix = Shadow, Inert - .desc = { ent-BaseAnomalyInertCore.desc } + .desc = { ent-BaseAnomalyInertCore.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/closets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/closets.ftl index d049fde98ff..8aec68e8b0e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/closets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/closets.ftl @@ -4,8 +4,6 @@ ent-ClosetRadiationSuit = radiation suit closet .desc = More comfortable than radiation poisioning. ent-ClosetEmergency = emergency closet .desc = It's a storage unit for emergency breath masks and O2 tanks. -ent-ClosetEmergencyN2 = emergency nitrogen closet - .desc = It's full of life-saving equipment. Assuming, that is, that you breathe nitrogen. ent-ClosetFire = fire-safety closet .desc = It's a storage unit for fire-fighting supplies. ent-ClosetBomb = EOD closet diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl index 648ff64158d..8eb7a4abb43 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl @@ -2,7 +2,7 @@ ent-LockerBooze = booze storage .desc = This is where the bartender keeps the booze. ent-LockerSteel = secure closet .desc = { ent-LockerBaseSecure.desc } -ent-LockerQuarterMaster = quartermaster's locker +ent-LockerQuarterMaster = logistics officer's locker .desc = { ent-LockerBaseSecure.desc } ent-LockerSalvageSpecialist = salvage specialist's equipment .desc = Nevermind the pickaxe. @@ -38,7 +38,7 @@ ent-LockerChemistry = chemical locker .desc = { ent-LockerBase.desc } ent-LockerChiefMedicalOfficer = chief medical officer's locker .desc = { ent-LockerBaseSecure.desc } -ent-LockerResearchDirector = research director's locker +ent-LockerResearchDirector = mystagogue's locker .desc = { ent-LockerBase.desc } ent-LockerScientist = scientist's locker .desc = { ent-LockerBase.desc } @@ -46,7 +46,7 @@ ent-LockerHeadOfSecurity = head of security's locker .desc = { ent-LockerBaseSecure.desc } ent-LockerWarden = warden's locker .desc = { ent-LockerBaseSecure.desc } -ent-LockerBrigmedic = brigmedic locker +ent-LockerBrigmedic = corpsman locker .desc = { ent-LockerBaseSecure.desc } ent-LockerSecurity = security officer's locker .desc = { ent-LockerBaseSecure.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/wardrobe.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/wardrobe.ftl index c370007f133..0d980a47ad4 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/wardrobe.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/closets/wardrobe.ftl @@ -32,7 +32,7 @@ ent-WardrobeChapel = chaplain's wardrobe .desc = It's a storage unit for Nanotrasen-approved religious attire. ent-ClosetLegal = legal closet .desc = It's a storage unit for courtroom apparel and items. -ent-WardrobeCargo = cargo wardrobe +ent-WardrobeCargo = logistics wardrobe .desc = { ent-WardrobePrison.desc } ent-WardrobeSalvage = salvage wardrobe .desc = Notably not salvaged. @@ -48,7 +48,7 @@ ent-WardrobeGenetics = genetics wardrobe .desc = { ent-WardrobeWhite.desc } ent-WardrobeVirology = virology wardrobe .desc = { ent-WardrobeWhite.desc } -ent-WardrobeScience = science wardrobe +ent-WardrobeScience = epistemics wardrobe .desc = { ent-WardrobeWhite.desc } ent-WardrobeBotanist = botanist wardrobe .desc = { ent-WardrobeGreen.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/crates.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/crates.ftl index f39c1961922..72cef7142d3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/crates.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/crates.ftl @@ -16,7 +16,7 @@ ent-CrateElectrical = electrical crate .desc = { ent-CrateGenericSteel.desc } ent-CrateEngineering = engineering crate .desc = { ent-CrateGenericSteel.desc } -ent-CrateScience = science crate +ent-CrateScience = epistemics crate .desc = { ent-CrateGenericSteel.desc } ent-CrateSurgery = surgery crate .desc = { ent-CrateGenericSteel.desc } @@ -32,7 +32,7 @@ ent-CrateChemistrySecure = secure chemistry crate .desc = { ent-CrateBaseSecure.desc } ent-CratePrivateSecure = private crate .desc = { ent-CrateBaseSecure.desc } -ent-CrateScienceSecure = secure science crate +ent-CrateScienceSecure = secure epistemics crate .desc = { ent-CrateBaseSecure.desc } ent-CratePlasma = plasma crate .desc = { ent-CrateBaseSecure.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/filing_cabinets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/filing_cabinets.ftl index 97144429df4..2d5a849c38b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/filing_cabinets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/filing_cabinets.ftl @@ -9,12 +9,12 @@ ent-filingCabinetDrawer = chest drawer .suffix = Empty ent-BaseBureaucraticStorageFill = { "" } .desc = { "" } -ent-filingCabinetRandom = { ent-filingCabinetDrawer } +ent-filingCabinetRandom = { ent-filingCabinet } .suffix = Random - .desc = { ent-filingCabinetDrawer.desc } -ent-filingCabinetTallRandom = { ent-filingCabinetDrawer } + .desc = { ent-filingCabinet.desc } +ent-filingCabinetTallRandom = { ent-filingCabinetTall } .suffix = Random - .desc = { ent-filingCabinetDrawer.desc } + .desc = { ent-filingCabinetTall.desc } ent-filingCabinetDrawerRandom = { ent-filingCabinetDrawer } .suffix = Random - .desc = { ent-filingCabinetDrawer.desc } + .desc = { ent-filingCabinetDrawer.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl index b9537b139ad..07bdcf53988 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl @@ -1,22 +1,14 @@ -ent-BaseGlassBox = { ent-BaseStructureDynamic } - .desc = { ent-BaseStructureDynamic.desc } -ent-GlassBox = glass box +ent-GlassBoxLaser = glass box .desc = A sturdy showcase for an expensive exhibit. -ent-GlassBoxLaser = { ent-GlassBox } - .suffix = AntiqueLaser - .desc = { ent-GlassBox.desc } ent-GlassBoxLaserOpen = { ent-GlassBoxLaser } - .suffix = AntiqueLaser, Open + .suffix = Open .desc = { ent-GlassBoxLaser.desc } ent-GlassBoxLaserFilled = { ent-GlassBoxLaser } - .suffix = AntiqueLaser, Filled + .suffix = Filled .desc = { ent-GlassBoxLaser.desc } ent-GlassBoxLaserFilledOpen = { ent-GlassBoxLaserFilled } - .suffix = AntiqueLaser, Filled, Open + .suffix = Filled, Open .desc = { ent-GlassBoxLaserFilled.desc } -ent-GlassBoxFrame = glass box frame - .desc = A glassless sturdy showcase for an expensive exhibit. - .suffix = Frame -ent-GlassBoxBroken = broken glass box +ent-GlassBoxLaserBroken = broken glass box .desc = A broken showcase for a stolen expensive exhibit. .suffix = Broken diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/base_structuretanks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/base_structuretanks.ftl index 5e1d055c3a0..03bc356a464 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/base_structuretanks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/base_structuretanks.ftl @@ -1,4 +1,2 @@ ent-StorageTank = storage tank .desc = A liquids storage tank. -ent-StorageTankBig = { ent-StorageTank } - .desc = { ent-StorageTank.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/intercom.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/intercom.ftl index 51673b166d3..92369cad3b1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/intercom.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/intercom.ftl @@ -15,7 +15,7 @@ ent-IntercomMedical = { ent-Intercom } .suffix = Medical .desc = { ent-Intercom.desc } ent-IntercomScience = { ent-Intercom } - .suffix = Science + .suffix = Epistemics .desc = { ent-Intercom.desc } ent-IntercomSecurity = { ent-Intercom } .suffix = Security diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/shotgun_cabinet.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/shotgun_cabinet.ftl index 96938269dfd..46820230dd1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/shotgun_cabinet.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/shotgun_cabinet.ftl @@ -8,4 +8,4 @@ ent-ShotGunCabinetFilled = { ent-ShotGunCabinet } .desc = { ent-ShotGunCabinet.desc } ent-ShotGunCabinetFilledOpen = { ent-ShotGunCabinetFilled } .suffix = Filled, Open - .desc = { ent-ShotGunCabinetFilled.desc } + .desc = { ent-ShotGunCabinetFilled.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl index 08c6d7259ea..1272c8f8670 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl @@ -39,7 +39,7 @@ ent-PosterContrabandSpaceCube = Space Cube ent-PosterContrabandCommunistState = Communist State .desc = All hail the Communist party! ent-PosterContrabandLamarr = Lamarr - .desc = This poster depicts Lamarr. Probably made by a traitorous Research Director. + .desc = This poster depicts Lamarr. Probably made by a traitorous Mystagogue. ent-PosterContrabandBorgFancy = Borg Fancy .desc = Being fancy can be for any borg, just need a suit. ent-PosterContrabandBorgFancyv2 = Borg Fancy v2 @@ -181,7 +181,7 @@ ent-PosterLegitFruitBowl = Fruit Bowl ent-PosterLegitPDAAd = PDA Ad .desc = A poster advertising the latest PDA from Nanotrasen suppliers. ent-PosterLegitEnlist = Enlist - .desc = Enlist in the Nanotrasen Deathsquadron reserves today! + .desc = Enlist in the NanoTrasen ERT reserves today! ent-PosterLegitNanomichiAd = Nanomichi Ad .desc = A poster advertising Nanomichi brand audio cassettes. ent-PosterLegit12Gauge = 12 gauge 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 0f95786a6f0..a3d5512e820 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 @@ -40,8 +40,8 @@ ent-SignDirectionalMed = medical sign .desc = A direction sign, pointing out which way the Medical department is. ent-SignDirectionalSalvage = salvage sign .desc = A direction sign, pointing out which way the Salvage department is. -ent-SignDirectionalSci = science sign - .desc = A direction sign, pointing out which way the Science department is. +ent-SignDirectionalSci = epistemics sign + .desc = A direction sign, pointing out which way the Epistemics department is. ent-SignDirectionalSec = sec sign .desc = A direction sign, pointing out which way Security is. ent-SignDirectionalSolar = solars sign @@ -78,8 +78,8 @@ ent-SignBridge = bridge sign .desc = A sign indicating the bridge. ent-SignCanisters = canisters sign .desc = A sign warning the viewer about pressurised canisters. -ent-SignCargo = cargo sign - .desc = A sign indicating the cargo area. +ent-SignCargo = logistics sign + .desc = A sign indicating the logistics area. ent-SignCargoDock = cargo dock sign .desc = A sign indicating a cargo dock. ent-SignChapel = chapel sign diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/surveillance_camera.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/surveillance_camera.ftl index 213a42ac70d..9166ef7a42a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/surveillance_camera.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/surveillance_camera.ftl @@ -10,7 +10,7 @@ ent-SurveillanceCameraSecurity = camera .suffix = Security .desc = { ent-SurveillanceCameraBase.desc } ent-SurveillanceCameraScience = camera - .suffix = Science + .suffix = Epistemics .desc = { ent-SurveillanceCameraBase.desc } ent-SurveillanceCameraSupply = camera .suffix = Supply 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 4ebc623ea1b..3488b8a3940 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 @@ -50,9 +50,6 @@ ent-LockableButtonDetective = { ent-LockableButton } ent-LockableButtonArmory = { ent-LockableButton } .suffix = Armory .desc = { ent-LockableButton.desc } -ent-LockableButtonBrig = { ent-LockableButton } - .suffix = Brig - .desc = { ent-LockableButton.desc } ent-LockableButtonLawyer = { ent-LockableButton } .suffix = Lawyer .desc = { ent-LockableButton.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl index 03f3313a783..ba1f27c88c7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl @@ -47,13 +47,9 @@ ent-WallSilver = silver wall .desc = { ent-BaseWall.desc } ent-WallShuttleDiagonal = shuttle wall .desc = Keeps the air in and the greytide out. - .suffix = Diagonal + .suffix = diagonal ent-WallShuttle = shuttle wall - .suffix = Reinforced, Exterior .desc = { ent-WallReinforced.desc } -ent-WallShuttleInterior = shuttle wall - .suffix = Interior - .desc = { ent-WallSolid.desc } ent-WallSolid = solid wall .desc = { ent-BaseWall.desc } ent-WallSolidDiagonal = solid wall diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/mining.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/mining.ftl index 2ee7660beac..067a50ec9c5 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/mining.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/mining.ftl @@ -1,5 +1,5 @@ ent-MiningWindow = mining window - .desc = { ent-WindowRCDResistant.desc } + .desc = { ent-Window.desc } ent-MiningWindowDiagonal = { ent-ShuttleWindow } .suffix = diagonal .desc = { ent-ShuttleWindow.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plasma.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plasma.ftl index 126d0a30268..995d3a3ba1c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plasma.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plasma.ftl @@ -1,5 +1,5 @@ ent-PlasmaWindow = plasma window - .desc = { ent-WindowRCDResistant.desc } + .desc = { ent-Window.desc } ent-PlasmaWindowDirectional = directional plasma window .desc = Don't smudge up the glass down there. ent-PlasmaWindowDiagonal = { ent-PlasmaWindow } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/rplasma.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/rplasma.ftl index e047dc7a508..b92158ed2b6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/rplasma.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/rplasma.ftl @@ -1,5 +1,5 @@ ent-ReinforcedPlasmaWindow = reinforced plasma window - .desc = { ent-WindowRCDResistant.desc } + .desc = { ent-Window.desc } ent-PlasmaReinforcedWindowDirectional = directional reinforced plasma window .desc = Don't smudge up the glass down there. ent-ReinforcedPlasmaWindowDiagonal = { ent-ReinforcedPlasmaWindow } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/ruranium.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/ruranium.ftl index 0ba3040f467..12840215fd7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/ruranium.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/ruranium.ftl @@ -1,5 +1,5 @@ ent-ReinforcedUraniumWindow = reinforced uranium window - .desc = { ent-WindowRCDResistant.desc } + .desc = { ent-Window.desc } ent-UraniumReinforcedWindowDirectional = directional reinforced uranium window .desc = Don't smudge up the glass down there. ent-ReinforcedUraniumWindowDiagonal = { ent-ReinforcedUraniumWindow } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/shuttle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/shuttle.ftl index 6c5272cfdd0..65ce1bc1c3a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/shuttle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/shuttle.ftl @@ -1,5 +1,5 @@ ent-ShuttleWindow = shuttle window - .desc = { ent-WindowRCDResistant.desc } + .desc = { ent-Window.desc } ent-ShuttleWindowDiagonal = { ent-ShuttleWindow } .suffix = diagonal .desc = { ent-ShuttleWindow.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/uranium.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/uranium.ftl index 012b81a4745..1781cae50c3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/uranium.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/uranium.ftl @@ -1,5 +1,5 @@ ent-UraniumWindow = uranium window - .desc = { ent-WindowRCDResistant.desc } + .desc = { ent-Window.desc } ent-UraniumWindowDirectional = directional uranium window .desc = Don't smudge up the glass down there. ent-UraniumWindowDiagonal = { ent-UraniumWindow } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/window.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/window.ftl index 21dd2cc33a0..7da6a090ed3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/window.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/window.ftl @@ -1,11 +1,7 @@ ent-Window = window .desc = Don't smudge up the glass down there. -ent-WindowRCDResistant = { ent-Window } - .desc = { ent-Window.desc } ent-WindowDirectional = directional window .desc = Don't smudge up the glass down there. -ent-WindowDirectionalRCDResistant = { ent-WindowDirectional } - .desc = { ent-WindowDirectional.desc } ent-WindowFrostedDirectional = directional frosted window .desc = Don't smudge up the glass down there. ent-WindowDiagonal = { ent-Window } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/tiles/shadow_basalt.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/tiles/shadow_basalt.ftl index f6107fa98a7..066d61eb9d9 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/tiles/shadow_basalt.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/tiles/shadow_basalt.ftl @@ -1,5 +1,5 @@ ent-ShadowBasaltOne = shadowstone - .desc = Glowing cracks in reality. It's probably fine. + .desc = Cold rock ent-ShadowBasaltTwo = { ent-ShadowBasaltOne } .desc = { ent-ShadowBasaltOne.desc } ent-ShadowBasaltThree = { ent-ShadowBasaltOne } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/cargo_gifts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/cargo_gifts.ftl index 8b12e96f91a..1a6a572b7e0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/cargo_gifts.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/cargo_gifts.ftl @@ -1,22 +1,20 @@ -ent-CargoGiftsBase = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-GiftsPizzaPartySmall = { ent-CargoGiftsBase } - .desc = { ent-CargoGiftsBase.desc } -ent-GiftsPizzaPartyLarge = { ent-CargoGiftsBase } - .desc = { ent-CargoGiftsBase.desc } -ent-GiftsEngineering = { ent-CargoGiftsBase } - .desc = { ent-CargoGiftsBase.desc } -ent-GiftsVendingRestock = { ent-CargoGiftsBase } - .desc = { ent-CargoGiftsBase.desc } -ent-GiftsJanitor = { ent-CargoGiftsBase } - .desc = { ent-CargoGiftsBase.desc } -ent-GiftsMedical = { ent-CargoGiftsBase } - .desc = { ent-CargoGiftsBase.desc } -ent-GiftsSpacingSupplies = { ent-CargoGiftsBase } - .desc = { ent-CargoGiftsBase.desc } -ent-GiftsFireProtection = { ent-CargoGiftsBase } - .desc = { ent-CargoGiftsBase.desc } -ent-GiftsSecurityGuns = { ent-CargoGiftsBase } - .desc = { ent-CargoGiftsBase.desc } -ent-GiftsSecurityRiot = { ent-CargoGiftsBase } - .desc = { ent-CargoGiftsBase.desc } +ent-GiftsPizzaPartySmall = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-GiftsPizzaPartyLarge = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-GiftsEngineering = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-GiftsVendingRestock = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-GiftsJanitor = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-GiftsMedical = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-GiftsSpacingSupplies = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-GiftsFireProtection = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-GiftsSecurityGuns = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-GiftsSecurityRiot = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/events.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/events.ftl index 8b268c84e84..9a837182bbf 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/events.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/events.ftl @@ -1,13 +1,7 @@ -ent-BaseStationEvent = { ent-BaseGameRule } +ent-AnomalySpawn = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } -ent-BaseStationEventShortDelay = { ent-BaseGameRule } +ent-BluespaceArtifact = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } -ent-BaseStationEventLongDelay = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-AnomalySpawn = { ent-BaseStationEventShortDelay } - .desc = { ent-BaseStationEventShortDelay.desc } -ent-BluespaceArtifact = { ent-BaseStationEventShortDelay } - .desc = { ent-BaseStationEventShortDelay.desc } ent-BluespaceLocker = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-BreakerFlip = { ent-BaseGameRule } @@ -24,34 +18,40 @@ ent-NinjaSpawn = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-RevenantSpawn = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } -ent-GasLeak = { ent-BaseStationEventShortDelay } - .desc = { ent-BaseStationEventShortDelay.desc } -ent-KudzuGrowth = { ent-BaseStationEventLongDelay } - .desc = { ent-BaseStationEventLongDelay.desc } -ent-MouseMigration = { ent-BaseStationEventShortDelay } - .desc = { ent-BaseStationEventShortDelay.desc } -ent-KingRatMigration = { ent-BaseStationEventShortDelay } - .desc = { ent-BaseStationEventShortDelay.desc } -ent-CockroachMigration = { ent-BaseStationEventShortDelay } - .desc = { ent-BaseStationEventShortDelay.desc } -ent-PowerGridCheck = { ent-BaseStationEventShortDelay } - .desc = { ent-BaseStationEventShortDelay.desc } +ent-FalseAlarm = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-GasLeak = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-KudzuGrowth = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-MeteorSwarm = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-MouseMigration = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-CockroachMigration = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-PowerGridCheck = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-RandomSentience = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } ent-SolarFlare = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } -ent-VentClog = { ent-BaseStationEventLongDelay } - .desc = { ent-BaseStationEventLongDelay.desc } -ent-SlimesSpawn = { ent-BaseStationEventShortDelay } - .desc = { ent-BaseStationEventShortDelay.desc } -ent-SpiderSpawn = { ent-BaseStationEventShortDelay } - .desc = { ent-BaseStationEventShortDelay.desc } -ent-SpiderClownSpawn = { ent-BaseStationEventShortDelay } - .desc = { ent-BaseStationEventShortDelay.desc } +ent-TerminatorSpawn = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-VentClog = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-VentCritters = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-SlimesSpawn = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-SpiderSpawn = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-SpiderClownSpawn = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } ent-ZombieOutbreak = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } -ent-LoneOpsSpawn = { ent-BaseNukeopsRule } - .desc = { ent-BaseNukeopsRule.desc } -ent-SleeperAgentsRule = { ent-BaseTraitorRule } - .desc = { ent-BaseTraitorRule.desc } +ent-LoneOpsSpawn = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } ent-MassHallucinations = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-ImmovableRodSpawn = { ent-BaseGameRule } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/midround.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/midround.ftl index ffd302b5a10..c69881cab97 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/midround.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/midround.ftl @@ -1,4 +1,8 @@ ent-Ninja = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } +ent-Dragon = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } ent-Thief = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } +ent-Exterminator = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/roundstart.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/roundstart.ftl index 04695ff16b3..0ee466481b2 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/roundstart.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/roundstart.ftl @@ -1,7 +1,5 @@ ent-BaseGameRule = { "" } .desc = { "" } -ent-RespawnDeadRule = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } ent-SubGamemodesRule = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-DeathMatch31 = { ent-BaseGameRule } @@ -10,14 +8,12 @@ ent-InactivityTimeRestart = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-MaxTimeRestart = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } -ent-BaseNukeopsRule = { ent-BaseGameRule } +ent-Nukeops = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-Pirates = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } -ent-Nukeops = { ent-BaseNukeopsRule } - .desc = { ent-BaseNukeopsRule.desc } -ent-BaseTraitorRule = { ent-BaseGameRule } +ent-Traitor = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } -ent-Traitor = { ent-BaseTraitorRule } - .desc = { ent-BaseTraitorRule.desc } ent-Revolutionary = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-Sandbox = { ent-BaseGameRule } @@ -26,6 +22,10 @@ ent-Secret = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-Zombie = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } +ent-Vault = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-Waves = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } ent-BasicStationEventScheduler = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-RampingStationEventScheduler = { ent-BaseGameRule } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/variation.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/variation.ftl index 8c3f23a6c37..545c4c52c52 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/variation.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/variation.ftl @@ -12,5 +12,3 @@ ent-BasicPuddleMessVariationPass = { ent-BaseVariationPass } .desc = { ent-BaseVariationPass.desc } ent-BloodbathPuddleMessVariationPass = { ent-BaseVariationPass } .desc = { ent-BaseVariationPass.desc } -ent-CutWireVariationPass = { ent-BaseVariationPass } - .desc = { ent-BaseVariationPass.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/magic/projectile_spells.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/magic/projectile_spells.ftl index 423cb199566..57c05eefc80 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/magic/projectile_spells.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/magic/projectile_spells.ftl @@ -1,6 +1,4 @@ ent-ActionFireball = Fireball .desc = Fires an explosive fireball towards the clicked location. ent-ActionFireballII = Fireball II - .desc = Fires a fireball, but faster! -ent-ActionFireballIII = Fireball III - .desc = The fastest fireball in the west! + .desc = Fire three explosive fireball towards the clicked location. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/catalog/fills/backpacks/towngear/backpack.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/catalog/fills/backpacks/towngear/backpack.ftl new file mode 100644 index 00000000000..ca14514c753 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/catalog/fills/backpacks/towngear/backpack.ftl @@ -0,0 +1,6 @@ +ent-N14ClothingBackpackMayorFilled = { ent-N14ClothingBackpackExplorer } + .desc = { ent-N14ClothingBackpackExplorer.desc } +ent-N14ClothingBackpackSheriffFilled = { ent-N14ClothingBackpackMilitary } + .desc = { ent-N14ClothingBackpackMilitary.desc } +ent-N14ClothingBackpackDeputyFilled = { ent-N14ClothingBackpackMilitary } + .desc = { ent-N14ClothingBackpackMilitary.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/catalog/fills/crates.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/catalog/fills/crates.ftl new file mode 100644 index 00000000000..52218184db0 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/catalog/fills/crates.ftl @@ -0,0 +1,6 @@ +ent-N14CrateBreakPlainFilledCigarettes = { ent-N14CrateBreakPlain } + .suffix = cigarette packs random + .desc = { ent-N14CrateBreakPlain.desc } +ent-N14CrateBreakPlainFilledCigarettesRepublic = Republic cigarette crate + .suffix = republics + .desc = { ent-N14CrateBreakPlain.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/catalog/fills/storage_fills.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/catalog/fills/storage_fills.ftl index d943ec75e32..04e12b8f688 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/catalog/fills/storage_fills.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/catalog/fills/storage_fills.ftl @@ -2,6 +2,8 @@ ent-N14BaseTimedStorageFill = { "" } .desc = { "" } ent-N14BaseLockerTimedStorageFill = { "" } .desc = { "" } +ent-N14BaseSmallLockerTimedStorageFill = { "" } + .desc = { "" } ent-N14TimedStorageFillDomestic = { "" } .desc = { "" } ent-N14BaseMilitaryTimedStorageFill = { "" } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/belt/belts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/belt/belts.ftl index 5361e3cec9f..dcd0cf9e445 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/belt/belts.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/belt/belts.ftl @@ -8,7 +8,9 @@ ent-ClothingBeltNCRPouches = NCR pouches bandolier .desc = A leather bandolier with multiple pouches designed by the NCR for their troops. ent-ClothingBeltNCRHarness = NCR Harness .desc = A leather harness designed by the NCR for their troops. -ent-ClothingBeltNCRBandolier = NCR bandolier - .desc = A bandolier commonly used by NCR marksmans and pointmans to carry single shells or cartridges. +ent-ClothingBeltNCRBandolier = bandolier + .desc = A bandolier commonly used to carry single shells or cartridges. ent-ClothingBeltRope = rope belt .desc = A handmade belt with a rope, not the best but at least works. +ent-ClothingBeltRevolver = revolver holster + .desc = Can hold security gear like handcuffs and flashes. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/head/hats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/head/hats.ftl index a32209769ab..171e7944967 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/head/hats.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/head/hats.ftl @@ -2,6 +2,10 @@ ent-N14ClothingHeadHatBaseball = pre-war baseball cap .desc = A pre-war baseball cap. ent-N14ClothingHeadHatTrucker = { ent-ClothingHeadHatTrucker } .desc = { ent-ClothingHeadHatTrucker.desc } +ent-N14ClothingHeadHatDeputy = deputy hat + .desc = When the sheriff cant do the job alone, there is when a deputy come in. +ent-N14ClothingHeadHatSheriff = sheriff hat + .desc = The law personified in a hat. ent-N14ClothingHeadHatHeadscarf = cloth headscarf .desc = A headscarf made from scraps of cloth ent-N14ClothingHeadHatArmyBeret = army beret @@ -46,3 +50,7 @@ ent-N14ClothingHeadHatTribalOutcastHood = tribal outcast hood .desc = Shame! A hood worn by outcasts. ent-N14ClothingHeadHatVaultRiot = vault riot helmet .desc = The only thing standing between your face and a knife. +ent-N14ClothingHeadHatAnimal = canine hat + .desc = Made from a dog-like creature, this wild looking hat will keep your head warm and safe. +ent-N14ClothingHeadHatNightstalker = nightstalker hat + .desc = A warm and resistent hat made from the head of a nightstalker. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/neck/cloaks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/neck/cloaks.ftl index f2e84b77a16..fddf02db085 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/neck/cloaks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/neck/cloaks.ftl @@ -4,3 +4,5 @@ ent-ClothingNeckCloakNCR = NCR cloak .desc = A comfy cloak with a NCR logo on one side, this kind of cloaks are commonly used by the troopers during hard weathers. ent-ClothingNeckCloakLeather = leather cloak .desc = A handmade cloak, comfy and warm. +ent-ClothingNeckCloakYaoguai = yaoguai cloak + .desc = A handmade cloak, comfy and warm this piece comes from a dangerous yaoguai. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/outerclothing/falloutarmor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/outerclothing/falloutarmor.ftl index b5b49e75023..6ea9249372d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/outerclothing/falloutarmor.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/clothing/outerclothing/falloutarmor.ftl @@ -26,6 +26,12 @@ ent-N14ClothingOuterRaiderCombat1 = raider combat armor .desc = An armor piece infamously used by Raiders of all kinds in combat. ent-N14ClothingOuterRaiderCombat2 = raider combat armor mk2 .desc = An armor piece infamously used by Raiders of all kinds in combat, this one seems to hold some pieces of a salvaged mk2 combat armor. +ent-N14ClothingOuterPoliceCombat = police combat armor + .desc = A blue lighter variant of combat armor used by police forces of the pre-war. +ent-N14ClothingOuterPoliceVest = police vest + .desc = A protective vest used for the pre-war police. +ent-N14ClothingOuterSheriffVest = sheriff vest + .desc = Sheriff job needs a good piece to protect themselfs from the dangers of the wasteland. ent-N14ClothingOuterNCRVest = leather NCR vest .desc = A light ballistic plate inside a leather vest, cheap and easy to mass produce, perfect armor for light infantry. ent-N14ClothingOuterNCRPlate = NCR plate armor @@ -50,3 +56,9 @@ ent-N14ClothingOuterMidwestArmor = midwest BoS combat armor .desc = A suit of combat armor modified with multiple well polished metal plates. ent-N14ClothingOuterMidwestArmorMK2 = veteran midwest BoS combat armor .desc = A suit of combat armor modified with multiple well polished metal plates and orange lines, a more robust version. +ent-N14ClothingOuterChitinArmor = chitin armor + .desc = A suit of handmade armor, made from a lot of chitin from insects. +ent-N14ClothingOuterRadArmor = radscorpion armor + .desc = A suit of handmade armor, made of pieces of exoskeleton from radscorpions. +ent-N14ClothingOuterLightMetalArmor = light metal armor + .desc = A suit of light metal armor that provides protection against physical threats. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/markers/spawners/jobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/markers/spawners/jobs.ftl index 2167f50c8f6..a7e805f83fb 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/markers/spawners/jobs.ftl @@ -1,82 +1,84 @@ ent-N14SpawnPointWastelander = wastelander .desc = { ent-SpawnPointJobBase.desc } ent-N14SpawnPointBoSMidPaladinCommander = BOS midwest paladin commander - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointBoSMidKnight = BOS midwest knight - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointBoSMidPaladin = BOS midwest paladin - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointBoSMidInitiate = BOS midwest initiate - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointBoSMidScribe = BOS midwest scribe - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointBoSWashingtonCommander = BOS washington commander - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointBoSWashingtonRecruit = BOS washington recruit - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointBoSWashingtonCaptain = BOS washington caaptain - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointBoSWashingtonSoldier = BOS washington soldier - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointBoSWashingtonResearcher = BOS washington researcher - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointCaravanLeader = caravan leader - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointCaravanTrader = caravan trader - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } +ent-N14SpawnPointCaravanGuard = caravan guard + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointNCRCadet = NCR cadet - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointNCRNCO = NCR NCO - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointNCROfficer = NCR officer - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointNCRSoldier = NCR Soldier - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointTribal = tribal - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointTribalElder = tribal elder - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointTribalFarmer = tribal farmer - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointTribalHealer = tribal healer - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointOverseer = overseer - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointVaultDoctor = vault doctor - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointVaultDweller = vault dweller - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointVaultEngineer = vault engineer - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointVaultSecurity = vault security - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointWastelandBartender = wasteland bartender - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointWastelandChaplain = wasteland chaplain - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointWastelandFarmer = wasteland farmer - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointWastelandMusician = wasteland musician - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointWastelandReporter = wasteland reporter - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointWastelandScavenger = wasteland scavenger - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointTownsfolkTownsperson = townsperson - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointTownsfolkTownMechanic = town mechanic - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointTownsfolkTownDoctor = town doctor - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointTownsfolkTownShopkeeper = town shopkeeper - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointTownsfolkTownDeputy = town deputy - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointTownsfolkTownSheriff = town sheriff - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointTownsfolkTownMayor = town mayor - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointFollowers = followers of the apocalypse - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointZetan = Zetan - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-N14SpawnPointWastelander.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/drinks/drinks_bottles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/drinks/drinks_bottles.ftl index 3caec48fb98..297a4658d06 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/drinks/drinks_bottles.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/drinks/drinks_bottles.ftl @@ -12,3 +12,33 @@ ent-N14DrinkNukaColaBottleFull = Nuka Cola bottle .desc = The leading cola since 2044. ent-N14DrinkIrradiatedNukaColaBottleFull = irratiated Nuka Cola bottle .desc = The leading cola since 2044. Looks a bit... weird. +ent-N14DrinkNukaColaEmpty = Nuka Cola bottle + .desc = The leading cola since 2044. +ent-N14DrinkNukaColaBroken = broken Nuka Cola bottle + .desc = The leading cola since 2044. +ent-N14DrinkNukaColaCherry = Nuka Cola Cherry + .desc = The leading cola since 2044. Cherry flavor. +ent-N14DrinkNukaCola = Nuka Cola + .desc = The leading cola since 2044. +ent-N14DrinkNukaColaGrape = Nuka Cola Grape + .desc = The leading cola since 2044. Grape flavor. +ent-N14DrinkNukaColaOrange = Nuka Cola Orange + .desc = The leading cola since 2044. Orange flavor. +ent-N14DrinkNukaColaYellow = Nuka Cola Yellow + .desc = A rare flavor of Nuka-Cola from crazy naked Roshambo. +ent-N14DrinkNukaColaQuantum = Nuka Cola Quantum + .desc = The leading cola since 2044. +ent-N14DrinkNukaColaQuartz = Nuka Cola Quartz + .desc = The leading cola since 2044. +ent-N14DrinkNukaColaVictory = Nuka Cola Victory + .desc = The leading cola since 2044. +ent-N14DrinkNukaColaWild = Nuka Cola Wild + .desc = The leading cola since 2044. +ent-N14DrinkGammagulpBeer = Gamma Gulp Beer + .desc = One of Gecko's biggest exports. A mild, radioactive alcohol. +ent-N14DrinkRoentgenRum = Roentgen Rum + .desc = One of Gecko's biggest exports. A strong, tingly alcohol. +ent-N14DrinkWhisky = whiskey + .desc = A bottle of standard looking whiskey +ent-N14DrinkWine = wine + .desc = Nappa Valley Wine. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/flora/wastelandflora.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/flora/wastelandflora.ftl index b6721359a4d..a4d96563f06 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/flora/wastelandflora.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/flora/wastelandflora.ftl @@ -20,6 +20,8 @@ ent-N14WastelandFloraWildCaveFungus = wild cave fungus .desc = A wild fungi. It looks healthy. ent-N14WastelandFloraWildCaveFungusRad = wild irradiated cave fungus .desc = A wild fungi. It glows. +ent-N14WastelandFloraWildCotton = wild cotton plant + .desc = A cotton plant growing wild. It's healthy. ent-N14WastelandFloraWildCoyote = wild coyote plant .desc = A coyote plant growing wild. It's healthy. ent-N14WastelandFloraWildDatura = wild datura plant diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/cigarette.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/cigarette.ftl new file mode 100644 index 00000000000..32b78e56841 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/cigarette.ftl @@ -0,0 +1,23 @@ +ent-N14Cigarette = { ent-Cigarette } + .desc = { ent-Cigarette.desc } +ent-N14CigaretteSpent = { ent-N14Cigarette } + .suffix = spent + .desc = { ent-N14Cigarette.desc } +ent-N14CigaretteKool = { ent-N14Cigarette } + .desc = A Kool brand cigarette. + .suffix = kool +ent-N14CigaretteSalem = { ent-N14CigaretteKool } + .desc = A Salem brand cigarette. + .suffix = salem +ent-N14CigaretteMarlboro = { ent-N14Cigarette } + .desc = A Marlboro brand cigarette. + .suffix = marlboro +ent-N14CigaretteRepublic = { ent-N14Cigarette } + .desc = A Republic brand cigarette. + .suffix = republic +ent-N14CigaretteRollie = { ent-N14Cigarette } + .desc = A roll up cigarette. + .suffix = rollie +ent-N14CigaretteWinston = { ent-N14Cigarette } + .desc = A Winston brand cigarette. + .suffix = winston diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/packs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/packs.ftl new file mode 100644 index 00000000000..e247978f71d --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/packs.ftl @@ -0,0 +1,15 @@ +ent-N14CigPackBase = cigarette pack + .desc = { ent-BaseStorageItem.desc } +ent-N14CigarettePackSalem = Salem cigs pack + .desc = A refined green cigarette packet. A label on the packaging reads, Salem. Refreshes your taste. +ent-N14CigarettePackKool = Kools cigs pack + .desc = A kool green cigarette packet. A label on the packaging reads, KOOL. So good, it's got to be KOOL! +ent-N14CigarettePackMarlboro = Marlboro cigs pack + .desc = A cool red cigarette packet. A label on the packaging reads, Marlboro. Where theres a man, theres a Marlboro. +ent-N14CigarettePackWinston = Winston cigs pack + .desc = A refined red cigarette packet. A label on the packaging reads, Winston. Winston tastes good, like a cigarette should! +ent-N14CigarettePackCustom = cardboard cigs pack + .desc = A simple hand-made cardboard cigarette pack + .suffix = custom +ent-N14CigarettePackRepublics = Republics cig pack + .desc = A rustic cardboard cigarette pack with the flag of the New Californian Republic on it. A label on the packaging reads, Republics. Taste the freedom, feel the burn. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/smokeables.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/smokeables.ftl new file mode 100644 index 00000000000..333b0d9b982 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/smokeables.ftl @@ -0,0 +1,8 @@ +ent-N14PackRollingPaper = pack of rolling paper + .desc = A pack of thin pieces of paper used to make fine smokeables. +ent-N14RollingPaper = { ent-PaperRolling } + .suffix = Full + .desc = { ent-PaperRolling.desc } +ent-N14RollingPaper1 = { ent-N14RollingPaper } + .suffix = Single + .desc = { ent-N14RollingPaper.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/materials/containers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/materials/containers.ftl new file mode 100644 index 00000000000..e80bba7685c --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/materials/containers.ftl @@ -0,0 +1,5 @@ +ent-N14FuelTankHandy = fuel tank + .desc = A tank of Mr Handy fuel. +ent-N14FuelTankHandyRusty = fuel tank + .desc = A rusty tank of Mr Handy fuel. + .suffix = rusty diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/materials/materials.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/materials/materials.ftl index 480afed4930..e3ea96e8875 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/materials/materials.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/materials/materials.ftl @@ -16,3 +16,9 @@ ent-SulfurPowder1 = { ent-SulfurPowder } ent-SulfurPowder10 = { ent-SulfurPowder } .suffix = 10 .desc = { ent-SulfurPowder.desc } +ent-N14Paper = paper + .suffix = 10 + .desc = { ent-SheetPaper.desc } +ent-N14Paper1 = { ent-N14Paper } + .suffix = Single + .desc = { ent-N14Paper.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/misc/craftingmaterials.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/misc/craftingmaterials.ftl index 9cb2d18fc2b..87dfcdae76b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/misc/craftingmaterials.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/misc/craftingmaterials.ftl @@ -2,3 +2,13 @@ ent-N14MaterialRadscorpionTail = radscorpion tail .desc = It's the stinger from a radscorpion. ent-N14MaterialBrahminHide = brahmin hide .desc = The flesh of a brahmin. Leather-like and tough. +ent-N14MaterialAntChitin = ant chitin + .desc = A strong and resistent piece of ant "skin". +ent-N14MaterialExoskeleton = radscorpion exoskeleton piece + .desc = A strong and resistent piece of radscorpion exoskeleton. +ent-N14MaterialNightstalkerPelt = nightstalker pelt + .desc = A pelt of fresh nightstalker leather. +ent-N14MaterialYaoguaiHide = yaoguai hide + .desc = A big hide of yaoguai, heavy and strong. +ent-N14MaterialLeather = leather + .desc = A piece of leather, just non special leather. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/misc/junk.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/misc/junk.ftl index 50eafc74fc4..f98a223cad7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/misc/junk.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/misc/junk.ftl @@ -1,5 +1,11 @@ ent-N14JunkItemBase = junk .desc = it's junk! +ent-N14JunkItemBasePlastic = { ent-N14JunkItemBase } + .desc = { ent-N14JunkItemBase.desc } +ent-N14JunkItemBaseMetal = { ent-N14JunkItemBase } + .desc = { ent-N14JunkItemBase.desc } +ent-N14JunkItemBaseContainer = { ent-N14JunkItemBase } + .desc = { ent-N14JunkItemBase.desc } ent-N14JunkAbraxoCleaner = Abraxo Cleaner .desc = Abraxo brand detergent. ent-N14Junk8Ball = 8 Ball diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/chemicals.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/chemicals.ftl index 6d9d91e3d8d..976823bbffc 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/chemicals.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/chemicals.ftl @@ -1,5 +1,9 @@ ent-N14ChemicalSyringe = chemical syringe .desc = A syringe filled with an unknown chemical. Chem junkies would kill you for it. +ent-N14BaseSyringe = doctors syringe + .desc = Used to draw blood samples from mobs, or to inject them with reagents. Chem junkies would kill you for it. +ent-N14DoctorSyringe = { ent-N14BaseSyringe } + .desc = { ent-N14BaseSyringe.desc } ent-N14Stimpak = stimpak .desc = A syringe filled with a wondrous mixture of medical reagents. Essential for those with little to no medical knowledge. ent-N14StimpakDirty = dirty stimpak @@ -26,3 +30,13 @@ ent-N14HealingPowder = healing powder .desc = A bag of tribal healing powder. Nausiating. ent-N14Antidote = antidote .desc = A toxin antidote made from radscorpion tail and water. +ent-N14SmellingSalts = smelling salts + .desc = A small glass ampoule containing smelling salts. Their smell is said to wake up even a dead ghoul. +ent-N14HealingPoultice = healing Healing + .desc = A bag of poultice to help with all common ailments slowly. +ent-N14Bitterdrink = Bitterdrink + .desc = A bottle containing a mixture of plants to aid against poisons and radiation. +ent-N14MourningPoultice = mourning poultice + .desc = A bag of powder made from poisonous flowers for use within tribal ceremenoies. +ent-N14UltraStimpak = ultra stimpak + .desc = A special type of super stimpak with an additional mixture of chemicals which makes a man near invincible at a great cost. It is widely deemed inhumane and outlawed. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/equipment.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/equipment.ftl new file mode 100644 index 00000000000..22e7b97b7ff --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/equipment.ftl @@ -0,0 +1,3 @@ +ent-N14MortarpestleGrinder = mortar & pestle + .desc = A mortar and pestle for grinding things into reagents. + .suffix = grinder/juicer diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/45-70.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/45-70.ftl new file mode 100644 index 00000000000..6d1462ac4fc --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/45-70.ftl @@ -0,0 +1,4 @@ +ent-BaseMagazineBox45-70 = { ent-BaseItem } + .desc = { ent-BaseItem.desc } +ent-MagazineBox45-70 = ammunition box (.45-70 gov't) + .desc = { ent-BaseMagazineBox45-70.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/50.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/50.ftl new file mode 100644 index 00000000000..73fa887b556 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/50.ftl @@ -0,0 +1,4 @@ +ent-BaseMagazineBox50 = { ent-BaseItem } + .desc = { ent-BaseItem.desc } +ent-MagazineBox50 = ammunition box (.50 anti materiel) + .desc = { ent-BaseMagazineBox50.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl new file mode 100644 index 00000000000..6bb1d633393 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl @@ -0,0 +1,2 @@ +ent-N14Cartridge45-70 = cartridge (.45-70 gov't) + .desc = { ent-BaseCartridgeLightRifle.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/projectiles/45-70.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/projectiles/45-70.ftl new file mode 100644 index 00000000000..43d569a1e68 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/projectiles/45-70.ftl @@ -0,0 +1,2 @@ +ent-N14Bullet45-70 = bullet (.45-70 gov't) + .desc = { ent-BaseBullet.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/10mm.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/10mm.ftl new file mode 100644 index 00000000000..eae284c0504 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/10mm.ftl @@ -0,0 +1,4 @@ +ent-N14BaseSpeedLoader10 = speed loader (10mm) + .desc = { ent-BaseItem.desc } +ent-SpeedLoader10 = speed loader (10mm) + .desc = { ent-N14BaseSpeedLoader10.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/44.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/44.ftl new file mode 100644 index 00000000000..2b706c72499 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/44.ftl @@ -0,0 +1,4 @@ +ent-N14BaseSpeedLoader44 = speed loader (.44 magnum) + .desc = { ent-BaseItem.desc } +ent-SpeedLoader44 = speed loader (.44 magnum) + .desc = { ent-N14BaseSpeedLoader44.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/45-70.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/45-70.ftl new file mode 100644 index 00000000000..5189de04888 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/45-70.ftl @@ -0,0 +1,4 @@ +ent-N14BaseSpeedLoader45-70 = speed loader (45-70 gov) + .desc = { ent-BaseItem.desc } +ent-SpeedLoader45-70 = speed loader (45-70 gov) + .desc = { ent-N14BaseSpeedLoader45-70.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/9mm.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/9mm.ftl new file mode 100644 index 00000000000..2a0fe4a7104 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/9mm.ftl @@ -0,0 +1,4 @@ +ent-N14BaseSpeedLoader9 = speed loader (9mm) + .desc = { ent-BaseItem.desc } +ent-SpeedLoader9 = speed loader (9mm) + .desc = { ent-N14BaseSpeedLoader9.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/revolvers/revolvers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/revolvers/revolvers.ftl index d7b4bf35a9a..69a7c40cd9c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/revolvers/revolvers.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/revolvers/revolvers.ftl @@ -1,6 +1,10 @@ ent-N14WeaponRevolver9mm = 9mm revolver .desc = A small, compact six shooter. Uses 9mm ammo. +ent-N14WeaponRevolver10mm = 10mm revolver + .desc = The first prototype for the semiauto 10mm pistol, Uses 10mm. ent-N14WeaponRevolverMagnun = Magnum revolver .desc = The Big Iron. Uses .44 magnum ammo. ent-N14WeaponHunterRevolver = hunting revolver - .desc = A heavy revolver with a long cannon designed to hunt small animals, but it also works for people. Uses .44 magnum ammo. + .desc = A heavy revolver with a long cannon designed to hunt small animals, but it also works for people. Uses .45-70 gov't ammo. +ent-N14WeaponRangerSequoia = ranger sequoia + .desc = 20 years of suffering for a good looking glorified revolver, worth it. Uses .45-70 gov't ammo. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/smgs/smgs.ftl index 17524f20ce8..ec7394ad184 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/smgs/smgs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/smgs/smgs.ftl @@ -10,5 +10,5 @@ ent-N14WeaponAdvanceSubMachineGun12mm = advance 12.7mm SMG .desc = A bulky sub machine gun with a top magazine fed system, it uses 12mm ammmo. ent-N14weapon9mmSMG = 9mm SMG .desc = a metallic pre-war simple SMG, chambered in 9mm. -ent-N14weapon45SMG = .45 SMG +ent-N14Weapon45SMG = .45 SMG .desc = A pre-war SMG with a wooden stock, chambered in .45. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/snipers/snipers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/snipers/snipers.ftl index b95d8fc9cf4..0d4d47ac7e8 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/snipers/snipers.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/snipers/snipers.ftl @@ -2,11 +2,15 @@ ent-N14WeaponSniperHunting = hunting rifle .desc = A rugged bolt action rifle. Uses .308 ammo. ent-N14WeaponAntiMateriel = Anti-Materiel rifle .desc = A anti materiel rifle with a ergonomic, metallic skeleton design. only seeing at it you can tell it will rip some limbs apart. Uses .50 anti-material ammo. +ent-N14Weapon50NcrRifle = .50 NCR rifle + .desc = A try by the NCR to make .50 ammo a standart on normal infantry, very cheap but it will deal a lot of damage. Uses .50 anti-material ammo. ent-N14WeaponLeverCarbine = lever action carbine .desc = A lever action short carbine. Uses .44 ammo. ent-N14WeaponLeverRifle = lever action rifle .desc = A long lever action repeater rifle. Uses .308 ammo. -ent-N14WeaponPipeRifle = Pipe Rifle +ent-N14WeaponBrushGun = brush gun + .desc = A powerfull lever action carbine. Uses .45-70 gov't ammo. +ent-N14WeaponPipeRifle = pipe rifle .desc = A piece of metal pipe with a wooden stock, works has a gun and uses .308 ammo. ent-N14WeaponSniperVarmint = varmint rifle .desc = A pre-war low power bolt action rifle, originally designed to hunt small animals this gun works fine with anything not bigger than a human. Uses 5.56 ammo. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/melee/baton-club.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/melee/baton-club.ftl new file mode 100644 index 00000000000..05221542115 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/objects/weapons/melee/baton-club.ftl @@ -0,0 +1,2 @@ +ent-N14BaseBallBat = baseball bat + .desc = A robust baseball bat. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/furniture/street_furniture.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/furniture/street_furniture.ftl index c61d34e83e4..0b6681d9283 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/furniture/street_furniture.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/furniture/street_furniture.ftl @@ -108,9 +108,9 @@ ent-N14LightStreetLampPostRaiderPoweredEmptyRight = { ent-N14LightStreetLampPost ent-N14LightStreetLampPostRaiderPoweredEmptyLeft = { ent-N14LightStreetLampPostPoweredEmptyLeft } .suffix = Empty, Left .desc = { ent-N14LightStreetLampPostPoweredEmptyLeft.desc } -ent-N14LightStreetLampPostRaiderPoweredRight = { ent-N14LightStreetLampPostPoweredRight } +ent-N14LightStreetLampPostRaiderPoweredRight = { ent-N14LightStreetLampPostRaiderPoweredEmptyRight } .suffix = Powered, Right - .desc = { ent-N14LightStreetLampPostPoweredRight.desc } + .desc = { ent-N14LightStreetLampPostRaiderPoweredEmptyRight.desc } ent-N14LightStreetLampPostRaiderPoweredLeft = { ent-N14LightStreetLampPostPoweredLeft } .suffix = Powered, Left .desc = { ent-N14LightStreetLampPostPoweredLeft.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/machines/vending_machines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/machines/vending_machines.ftl index 9f27c4ba8f3..3cea35266c0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/machines/vending_machines.ftl @@ -3,3 +3,18 @@ ent-N14VendingMachineNukaCola = Nuka-Cola machine ent-N14VendingMachineNukaColaIrradiated = Nuka-Cola machine .desc = A Pre-War vending machine that dispenses Nuka-Cola Corporation branded beverages. .suffix = irradiated +ent-N14VendingMachineNukaColaNew = Nuka-Cola machine + .desc = A Pre-War vending machine that dispenses Nuka-Cola Corporation branded beverages. + .suffix = storage, empty +ent-N14VendingMachineNukaColaNewFilled = { ent-N14VendingMachineNukaColaNew } + .suffix = storage, random + .desc = { ent-N14VendingMachineNukaColaNew.desc } +ent-N14VendingMachineCigarette = cigarette vendor + .desc = A Pre-War vending machine that dispenses cigarettes. + .suffix = storage, empty +ent-N14VendingMachineCigaretteFilled = { ent-N14VendingMachineCigarette } + .suffix = random + .desc = { ent-N14VendingMachineCigarette.desc } +ent-N14VendingMachineCigaretteFilledRepublic = Republics cig vendor + .desc = A pre-war cigarette vendor that's been filled with Republic cigarette packs. + .suffix = republics diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/misc/ladders.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/misc/ladders.ftl index cfda01ae8cf..05fc42ff577 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/misc/ladders.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/misc/ladders.ftl @@ -1,45 +1,72 @@ -ent-BaseLadder = { "" } +ent-BaseLadder = ladder .desc = { "" } -ent-LadderTop = ladder +ent-LadderTop = { ent-BaseLadder } .desc = The top of a ladder. Use it to go down. .suffix = top -ent-LadderBottom = ladder +ent-LadderBottom = { ent-BaseLadder } .desc = The bottom of a ladder. Use it to go up. .suffix = bottom -ent-LadderTopMetal = ladder +ent-LadderTopBunkerOpen = bunker entrance + .desc = Looks like it leads down somewhere. + .suffix = open +ent-LadderTopManholeOpen = manhole + .desc = Looks like it leads down somewhere. + .suffix = open +ent-LadderSquareTop = { ent-LadderTop } + .desc = Looks like it leads down somewhere. + .suffix = square +ent-LadderSquareBottom = { ent-LadderBottom } + .desc = The bottom of a ladder. Use it to go up. + .suffix = bottom, square +ent-LadderSquareMid = { ent-LadderSquareBottom } + .desc = The middle of a ladder. Up or down. + .suffix = mid, square +ent-LadderRopeTop1 = climbing rope + .desc = The top of a rope. Going down! + .suffix = rope, top +ent-LadderRopeBottom1 = climbing rope + .desc = The bottom of a rope. Going up! + .suffix = rope, bottom +ent-LadderTopBunkerClosed = bunker entrance + .desc = A closed up entrance to a bunker. + .suffix = closed +ent-LadderTopManholeClosed = manhole cover + .desc = A closed up entrance to a bunker. + .suffix = closed +ent-LadderTopMetal = { ent-BaseLadder } .desc = The top of a ladder. Use it to go down. .suffix = top, metal, painted -ent-LadderTopMetalPaint2 = ladder +ent-LadderTopMetalPaint2 = { ent-LadderTopMetal } .desc = The top of a ladder. Use it to go down. .suffix = top, metal, flaking -ent-LadderTopMetalPaint3 = ladder +ent-LadderTopMetalPaint3 = { ent-LadderTopMetal } .desc = The top of a ladder. Use it to go down. .suffix = top, metal, flaked -ent-LadderTopMetalRusted = ladder +ent-LadderTopMetalRusted = { ent-LadderTopMetal } .desc = The top of a ladder. Use it to go down. Rusty. .suffix = top, metal, rusted -ent-LadderTopMetalDamaged = ladder +ent-LadderTopMetalDamaged = { ent-LadderTopMetal } .desc = The top of a ladder. Use it to go down. This one looks damaged. .suffix = top, metal ent-LadderTopRope = rope ladder .desc = The top of a ladder. Use it to go down. .suffix = top, rope -ent-LadderBottomMetal = ladder +ent-LadderBottomMetal = { ent-LadderBottom } .desc = The bottom of a ladder. Use it to go up. .suffix = bottom, metal -ent-LadderBottomMetalPaint1 = ladder +ent-LadderBottomMetalPaint1 = { ent-LadderBottomMetal } .desc = The bottom of a ladder. Use it to go down. .suffix = bottom, metal, painted -ent-LadderBottomMetalPaint2 = ladder +ent-LadderBottomMetalPaint2 = { ent-LadderBottomMetal } .desc = The bottom of a ladder. Use it to go down. .suffix = bottom, metal, flaking -ent-LadderBottomMetalPaint3 = ladder +ent-LadderBottomMetalPaint3 = { ent-LadderBottomMetal } .desc = The bottom of a ladder. Use it to go down. .suffix = bottom, metal, flaked -ent-LadderBottomMetalDamaged = ladder +ent-LadderBottomMetalDamaged = { ent-LadderBottomMetal } .desc = The bottom of a ladder. Use it to go up. Looks damaged. .suffix = bottom -ent-LadderBottomMetalRusted = ladder +ent-LadderBottomMetalRusted = { ent-LadderBottomMetal } .desc = The bottom of a ladder. Use it to go down. Rusty. .suffix = bottom, metal, rusted ent-LadderBottomRope = rope ladder diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/storage/closets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/storage/closets.ftl index 469ed4da2de..c34df91af8b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/storage/closets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nuclear14/entities/structures/storage/closets.ftl @@ -41,4 +41,4 @@ ent-N14ClosetGeneric = { ent-N14ClosetBaseW } .suffix = generic roller .desc = { ent-N14ClosetBaseW.desc } ent-N14ClosetWallMedicabinet = medicabinet - .desc = A medicabinet mounted on the wall. + .desc = A medicabinet mounted on the wall. \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/base_objectives.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/base_objectives.ftl index cdc00f3bcb1..2174dffdf15 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/base_objectives.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/base_objectives.ftl @@ -16,5 +16,3 @@ ent-BaseStealObjective = { ent-BaseLivingObjective } .desc = { ent-BaseLivingObjective.desc } ent-BaseSurviveObjective = { ent-BaseObjective } .desc = { ent-BaseObjective.desc } -ent-BaseCodeObjective = { ent-BaseObjective } - .desc = { ent-BaseObjective.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/ninja.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/ninja.ftl index 8f6a96f3793..83b74b888be 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/ninja.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/ninja.ftl @@ -3,12 +3,10 @@ ent-BaseNinjaObjective = { ent-BaseObjective } ent-DoorjackObjective = { ent-BaseNinjaObjective } .desc = { ent-BaseNinjaObjective.desc } ent-StealResearchObjective = { ent-BaseNinjaObjective } - .desc = Your gloves can be used to hack a research server and steal its precious data. If science has been slacking you'll have to get to work. + .desc = Your gloves can be used to hack a research server and steal its precious data. If epistemics has been slacking you'll have to get to work. ent-SpiderChargeObjective = { ent-BaseNinjaObjective } .desc = This bomb can be detonated in a specific location. Note that the bomb will not work anywhere else! ent-NinjaSurviveObjective = Survive .desc = You wouldn't be a very good ninja if you died, now would you? ent-TerrorObjective = Call in a threat .desc = Use your gloves on a communication console in order to bring another threat to the station. -ent-MassArrestObjective = Set everyone to wanted - .desc = Use your gloves to hack a criminal records console, setting the entire station to be wanted! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/terminator.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/terminator.ftl index 50c1cdb07ab..fbd7364460a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/terminator.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/terminator.ftl @@ -1,7 +1,6 @@ ent-BaseTerminatorObjective = { ent-BaseObjective } .desc = { ent-BaseObjective.desc } ent-TerminateObjective = { ent-BaseTerminatorObjective } - .desc = Follow your programming and terminate the target. ent-ShutDownObjective = Shut down .desc = Once the mission is complete die to prevent our technology from being stolen. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/thief.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/thief.ftl index e708f5997e1..b9055fb9cde 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/thief.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/thief.ftl @@ -89,4 +89,4 @@ ent-ShivaStealObjective = { ent-BaseThiefStealAnimalObjective } ent-TropicoStealObjective = { ent-BaseThiefStealAnimalObjective } .desc = { ent-BaseThiefStealAnimalObjective.desc } ent-EscapeThiefShuttleObjective = Escape to centcom alive and unrestrained. - .desc = You don't want your illegal activities to be discovered by anyone, do you? + .desc = You don't want your illegal activities to be discovered by anyone, do you? \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/traitor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/traitor.ftl index 7164f38b0ee..7a74d3e26a4 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/traitor.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/traitor.ftl @@ -45,4 +45,4 @@ ent-CaptainJetpackStealObjective = { ent-BaseCaptainObjective } ent-CaptainGunStealObjective = { ent-BaseCaptainObjective } .desc = { ent-BaseCaptainObjective.desc } ent-NukeDiskStealObjective = { ent-BaseCaptainObjective } - .desc = { ent-BaseCaptainObjective.desc } + .desc = { ent-BaseCaptainObjective.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/Nuclear14/Special/reagent-effects.ftl b/Resources/Locale/ru-RU/Nuclear14/Special/reagent-effects.ftl index ac2e382f4d1..88aadeb40c5 100644 --- a/Resources/Locale/ru-RU/Nuclear14/Special/reagent-effects.ftl +++ b/Resources/Locale/ru-RU/Nuclear14/Special/reagent-effects.ftl @@ -34,4 +34,4 @@ reagent-effect-guidebook-luck-modifier = { $chance -> [1] Изменяет *[other] изменяют - } удачу на { $luck } минимум на { NATURALFIXED($time, 3) } { MANY("second", $time) } \ No newline at end of file + } удачу на { $luck } минимум на { NATURALFIXED($time, 3) } { MANY("second", $time) } diff --git a/Resources/Locale/ru-RU/Nuclear14/job-names.ftl b/Resources/Locale/ru-RU/Nuclear14/job-names.ftl index 4cf049fcba8..7287603bfcb 100644 --- a/Resources/Locale/ru-RU/Nuclear14/job-names.ftl +++ b/Resources/Locale/ru-RU/Nuclear14/job-names.ftl @@ -4,9 +4,11 @@ job-description-bos-mid-knight-comm = Ведите Среднезападное job-name-bos-mid-scribe = Писарь Среднезападного Братства Стали job-description-bos-mid-scribe = Проводите научные миссии и исследования для вашего отделения Братства. job-name-bos-washington-elder = Старейшина Вашингтонского Братства Стали +jb-description-bos-mid-knight = Помогайте Командиру Паладинов в его миссии. job-description-bos-washington-elder = Ведите Вашингтонское Братство Стали к славе в их миссии. job-name-bos-washington-initiate = Послушник Вашингтонского Братства Стали job-description-bos-washington-initiate = Доказывайте свою ценность вашему отделению, чтобы продвигаться по службе. +jb-description-bos-mid-squire = Следуйте за своим рыцарем в их священной миссии. job-name-bos-washington-knight = Рыцарь Вашингтонского Братства Стали job-description-bos-washington-knight = Военная сила Братства. Защищайте ваше отделение и производите оборудование. job-name-bos-washington-paladin = Паладин Вашингтонского Братства Стали @@ -72,7 +74,7 @@ job-description-followers = Распространяйте идеи Послед job-name-survivor = Выживший job-description-survivor = Выживайте как можно дольше! Это никогда не закончится. job-name-zetan = Дзетанский похититель -job-description-zetan = Ради материнского корабля! Исследуйте местное население для выполнения своих задач. +job-description-zetan = Ради материнского корабля! Исследуйте местное население для выполнения своих задач. # N14 Role Timers # Is this needed? Survivor = Выживший job-name-bos-mid-paladin-comm = Командир Паладинов Среднезападного Братства Стали @@ -92,4 +94,4 @@ job-description-bos-washington-soldier = Военная сила Братств job-name-bos-washington-captain = Капитан Вашингтонского Братства Стали job-description-bos-washington-captain = Защищайте Братство любой ценой. Выполняйте волю Командиров в пустошах. job-name-bos-washington-researcher = Писарь Вашингтонского Братства Стали -job-description-bos-washington-researcher = Проводите научные миссии и исследования для вашего отделения Братства. \ No newline at end of file +job-description-bos-washington-researcher = Проводите научные миссии и исследования для вашего отделения Братства. diff --git a/Resources/Locale/ru-RU/Nuclear14/job-supervisors.ftl b/Resources/Locale/ru-RU/Nuclear14/job-supervisors.ftl index 3cf0aa5c18a..590aac4b03c 100644 --- a/Resources/Locale/ru-RU/Nuclear14/job-supervisors.ftl +++ b/Resources/Locale/ru-RU/Nuclear14/job-supervisors.ftl @@ -1,4 +1,4 @@ -job-supervisors-bos-mid = командиру рыцарей среднезападного братства стали +job-supervisors-bos-mid = командиру рыцарей среднезападного братства стали job-supervisors-bos-washington-elder = ведите свою фракцию к победе! job-supervisors-bos-washington = следуйте за старейшиной к победе! job-supervisors-bos-washington-recruit = подчиняйтесь приказам всех других ролей diff --git a/Resources/Locale/ru-RU/Nuclear14/reagents.ftl b/Resources/Locale/ru-RU/Nuclear14/reagents.ftl index 39ab10307d5..3382157e38d 100644 --- a/Resources/Locale/ru-RU/Nuclear14/reagents.ftl +++ b/Resources/Locale/ru-RU/Nuclear14/reagents.ftl @@ -198,7 +198,6 @@ reagent-desc-fertilizer = удобрение # Other reagent-name-scorpiontail = хвост скорпиона reagent-desc-scorpiontail = Хвост скорпиона. Острый. - reagent-name-extract-fungusrad = экстракт облученного гриба reagent-desc-extract-fungusrad = Облученный и светящийся зеленый гриб. На вкус отвратительный и мягкий. С радостью поделится с вами своим зеленым свечением. reagent-name-healing-poultice = целебная припарка @@ -215,4 +214,4 @@ reagent-name-antiseptic = Антисептик reagent-desc-antiseptic = Чистящий раствор, сделанный из Чистящего средства "Абраксо" и немного Медицинского спирта. reagent-desc-fertilizer = Измельченное удобрение. Идеально подходит для ваших растений! reagent-name-sulfur = сера -reagent-desc-sulfur = Измельченная сера в порошкообразной форме. Вам действительно стоит надеть противогаз. \ No newline at end of file +reagent-desc-sulfur = Измельченная сера в порошкообразной форме. Вам действительно стоит надеть противогаз. diff --git a/Resources/Locale/ru-RU/administration/commands/panicbunker.ftl b/Resources/Locale/ru-RU/administration/commands/panicbunker.ftl index c4b414cf40d..f0065691cb8 100644 --- a/Resources/Locale/ru-RU/administration/commands/panicbunker.ftl +++ b/Resources/Locale/ru-RU/administration/commands/panicbunker.ftl @@ -20,9 +20,9 @@ panicbunker-command-show-reason-enabled = The panic bunker will now show a reaso panicbunker-command-show-reason-disabled = The panic bunker will no longer show a reason to users it blocks from connecting. cmd-panicbunker_min_account_age-desc = Gets or sets the minimum account age in minutes that an account must have to be allowed to connect with the panic bunker enabled. cmd-panicbunker_min_account_age-help = Usage: panicbunker_min_account_age -panicbunker-command-min-account-age-is = The minimum account age for the panic bunker is {$minutes} minutes. -panicbunker-command-min-account-age-set = Set the minimum account age for the panic bunker to {$minutes} minutes. +panicbunker-command-min-account-age-is = The minimum account age for the panic bunker is { $minutes } minutes. +panicbunker-command-min-account-age-set = Set the minimum account age for the panic bunker to { $minutes } minutes. cmd-panicbunker_min_overall_minutes-desc = Gets or sets the minimum overall playtime in minutes that an account must have to be allowed to connect with the panic bunker enabled. cmd-panicbunker_min_overall_minutes-help = Usage: panicbunker_min_overall_minutes -panicbunker-command-min-overall-minutes-is = The minimum overall playtime for the panic bunker is {$minutes} minutes. -panicbunker-command-min-overall-minutes-set = Set the minimum overall playtime for the panic bunker to {$minutes} minutes. +panicbunker-command-min-overall-minutes-is = The minimum overall playtime for the panic bunker is { $minutes } minutes. +panicbunker-command-min-overall-minutes-set = Set the minimum overall playtime for the panic bunker to { $minutes } minutes. diff --git a/Resources/Locale/ru-RU/administration/commands/stealthmin-command.ftl b/Resources/Locale/ru-RU/administration/commands/stealthmin-command.ftl index e6a3a3b15b9..d69ff663fe2 100644 --- a/Resources/Locale/ru-RU/administration/commands/stealthmin-command.ftl +++ b/Resources/Locale/ru-RU/administration/commands/stealthmin-command.ftl @@ -1,4 +1,5 @@ cmd-stealthmin-desc = Переключение видимости вас через adminwho. -cmd-stealthmin-help = Использование: stealthmin +cmd-stealthmin-help = + Использование: stealthmin Используйте stealthmin для переключения отображение вас в результате вывода команды adminwho. cmd-stealthmin-no-console = Вы не можете использовать эту команду через консоль сервера diff --git a/Resources/Locale/ru-RU/administration/ui/admin-notes.ftl b/Resources/Locale/ru-RU/administration/ui/admin-notes.ftl index 501bfb02be1..b52ae0b018d 100644 --- a/Resources/Locale/ru-RU/administration/ui/admin-notes.ftl +++ b/Resources/Locale/ru-RU/administration/ui/admin-notes.ftl @@ -23,7 +23,7 @@ admin-notes-hide = Скрыть admin-notes-delete-confirm = Вы уверены? admin-notes-edited = Последнее изменение от { $author } в { $date } admin-notes-unbanned = Разбанил { $admin } в { $date } -admin-notes-message-desc = [color=white]Вы получили { $count -> +admin-notes-message-desc =[color=white]Вы получили { $count -> [1] новое сообщение от администрации *[other] новых сообщений от администрации } с момента последней игры на сервере.[/color] diff --git a/Resources/Locale/ru-RU/cargo/bounties.ftl b/Resources/Locale/ru-RU/cargo/bounties.ftl index ad454c1dd3f..64baa3cab26 100644 --- a/Resources/Locale/ru-RU/cargo/bounties.ftl +++ b/Resources/Locale/ru-RU/cargo/bounties.ftl @@ -67,7 +67,6 @@ bounty-item-cotton-boll = Хлопковый шарик bounty-item-microwave-machine-board = Машинная плата микроволновки bounty-lasergun = Лазерное оружие bounty-food = Мясная еда - bounty-description-artifact = Nanotrasen находится в затруднительном положении из-за кражи артефактов с некосмических планет. Верните один, и мы выплатим за него компенсацию. bounty-description-baseball-bat = В Центкоме началась бейсбольная лихорадка! Будьте добры отправить им несколько бейсбольных бит, чтобы руководство могло исполнить свою детскую мечту. bounty-description-box-hugs = Несколько главных чиновников получили серьёзные ушибы. Для их выздоровления срочно требуется коробка обнимашек @@ -135,4 +134,4 @@ bounty-description-microwave-machine-board = Мистер Хихстер реш bounty-description-lasergun = Караван утилизаторов запрашивает большую партию лазерного оружия для уничтожения улья ксеноморфов. bounty-description-food = После нашествия крысиного короля соседняя станция унатхов осталась без еды. Необходима большая партия мясных блюд. bounty-description-lasergun = Караван мусорщиков запрашивает крупную партию лазерного оружия для зачистки гнезда ксеноморфов. -bounty-description-food = После нашествия крысиного короля, соседняя станция унатхи осталась полностью без еды. Требуется крупная поставка мясных продуктов. \ No newline at end of file +bounty-description-food = После нашествия крысиного короля, соседняя станция унатхи осталась полностью без еды. Требуется крупная поставка мясных продуктов. diff --git a/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl b/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl index 8f10a9e8482..6bbe207342e 100644 --- a/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl +++ b/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl @@ -35,7 +35,7 @@ cargo-console-paper-print-name = Заказ #{ $orderNumber } cargo-console-paper-print-text = Заказ #{ $orderNumber } Товар: { $itemName } - Кол-во: {$orderQuantity} + Кол-во: { $orderQuantity } Запросил: { $requester } Причина: { $reason } Одобрил: { $approver } diff --git a/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl b/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl index 13050db2d98..e28f25c4e8f 100644 --- a/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl +++ b/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl @@ -3,7 +3,8 @@ hypospray-all-mode-text = Только ввод hypospray-mobs-only-mode-text = Забор и ввод hypospray-invalid-text = Ошибка -hypospray-volume-label = Объём: [color=white]{ $currentVolume }/{ $totalVolume } ед.[/color] +hypospray-volume-label = + Объём: [color=white]{ $currentVolume }/{ $totalVolume } ед.[/color] Режим: [color=white]{ $modeString }[/color] ## Entity diff --git a/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl b/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl index 3526b47059a..ebc585fa240 100644 --- a/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl +++ b/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl @@ -3,7 +3,8 @@ injector-draw-text = Забор injector-inject-text = Введение injector-invalid-injector-toggle-mode = Неверный режим -injector-volume-label = Объём: [color=white]{ $currentVolume }/{ $totalVolume }[/color] +injector-volume-label = + Объём: [color=white]{ $currentVolume }/{ $totalVolume }[/color] Режим: [color=white]{ $modeString }[/color] ([color=white]{ $transferVolume } ед.[/color]) ## Entity diff --git a/Resources/Locale/ru-RU/corvax/paper/doc-printer.ftl b/Resources/Locale/ru-RU/corvax/paper/doc-printer.ftl index 4fcabb64ec7..f02fb484967 100644 --- a/Resources/Locale/ru-RU/corvax/paper/doc-printer.ftl +++ b/Resources/Locale/ru-RU/corvax/paper/doc-printer.ftl @@ -1,156 +1,156 @@ doc-text-printer-report-station = - ⠀[color=#1b487e]███░███░░░░██░░░░[/color] - ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] - ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] - ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ-ЦК[/bold] - ⠀[color=#1b487e]░░░░██░░░████░███[/color] - ============================================= - ОТЧЁТ О СИТУАЦИИ - ============================================= - Время от начала смены и дата: - Составитель документа: - Должность составителя: - - Цель: - Статус выполнения цели: - Код уровня угрозы: - Причина установления кода: - Активные угрозы: - Потери среди экипажа: - Текущая ситуация: - - ============================================= - ⠀[italic]Место для печатей[/italic] + ⠀[color=#1b487e]███░███░░░░██░░░░[/color] + ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] + ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] + ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ-ЦК[/bold] + ⠀[color=#1b487e]░░░░██░░░████░███[/color] + ============================================= + ОТЧЁТ О СИТУАЦИИ + ============================================= + Время от начала смены и дата: + Составитель документа: + Должность составителя: + + Цель: + Статус выполнения цели: + Код уровня угрозы: + Причина установления кода: + Активные угрозы: + Потери среди экипажа: + Текущая ситуация: + + ============================================= + ⠀[italic]Место для печатей[/italic] doc-text-printer-report-on-elimination-of-violations = - ⠀[color=#1b487e]███░███░░░░██░░░░[/color] - ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] - ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] - ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold] - ⠀[color=#1b487e]░░░░██░░░████░███[/color] - ============================================= - ОТЧЁТ ОБ УСТРАНЕНИИ НАРУШЕНИЙ - ============================================= - Время от начала смены и дата: - Составитель документа: - Должность составителя: - - Я, (ФИО), в должности (полное наименование должности), отчитываюсь об устранении нарушений в работе, выявленных (ФИО), в должности (полное наименование должности). - Предъявленные нарушения: - - Причина нарушений: - - Проведённые мероприятия по устранению нарушений: - - ============================================= - ⠀[italic]Место для печатей[/italic] + ⠀[color=#1b487e]███░███░░░░██░░░░[/color] + ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] + ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] + ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold] + ⠀[color=#1b487e]░░░░██░░░████░███[/color] + ============================================= + ОТЧЁТ ОБ УСТРАНЕНИИ НАРУШЕНИЙ + ============================================= + Время от начала смены и дата: + Составитель документа: + Должность составителя: + + Я, (ФИО), в должности (полное наименование должности), отчитываюсь об устранении нарушений в работе, выявленных (ФИО), в должности (полное наименование должности). + Предъявленные нарушения: + + Причина нарушений: + + Проведённые мероприятия по устранению нарушений: + + ============================================= + ⠀[italic]Место для печатей[/italic] doc-text-printer-report-department = - ⠀[color=#1b487e]███░███░░░░██░░░░[/color] - ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] - ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] - ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold] - ⠀[color=#1b487e]░░░░██░░░████░███[/color] - ============================================= - ОТЧЁТ О РАБОТЕ ОТДЕЛА - ============================================= - Время от начала смены и дата: - Составитель документа: - Должность составителя: - - Количество сотрудников в отделе: - Количество стажёров: - Неактивные сотрудники отдела: - ФИО, должность, причина - Степень готовности цели: - Общее состояние отдела: - - ============================================= - ⠀[italic]Место для печатей[/italic] + ⠀[color=#1b487e]███░███░░░░██░░░░[/color] + ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] + ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] + ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold] + ⠀[color=#1b487e]░░░░██░░░████░███[/color] + ============================================= + ОТЧЁТ О РАБОТЕ ОТДЕЛА + ============================================= + Время от начала смены и дата: + Составитель документа: + Должность составителя: + + Количество сотрудников в отделе: + Количество стажёров: + Неактивные сотрудники отдела: + ФИО, должность, причина + Степень готовности цели: + Общее состояние отдела: + + ============================================= + ⠀[italic]Место для печатей[/italic] doc-text-printer-report-employee-performance = - ⠀[color=#1b487e]███░███░░░░██░░░░[/color] - ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] - ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] - ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ПД-КОМ[/bold] - ⠀[color=#1b487e]░░░░██░░░████░███[/color] - ============================================= - ОТЧЁТ О РАБОТЕ СОТРУДНИКА - ============================================= - Время от начала смены и дата: - Составитель документа: - Должность составителя: - - Я, (ФИО), в должности (полное наименования должности), в ходе исполнения своих обязанностей выполнил положенный объём работ. Прошу принять результат работ Главой отдела (наименование отдела). - Произведённые работы: - - ============================================= - ⠀[italic]Место для печатей[/italic] + ⠀[color=#1b487e]███░███░░░░██░░░░[/color] + ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] + ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] + ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ПД-КОМ[/bold] + ⠀[color=#1b487e]░░░░██░░░████░███[/color] + ============================================= + ОТЧЁТ О РАБОТЕ СОТРУДНИКА + ============================================= + Время от начала смены и дата: + Составитель документа: + Должность составителя: + + Я, (ФИО), в должности (полное наименования должности), в ходе исполнения своих обязанностей выполнил положенный объём работ. Прошу принять результат работ Главой отдела (наименование отдела). + Произведённые работы: + + ============================================= + ⠀[italic]Место для печатей[/italic] doc-text-printer-report-on-the-chapters-meeting = - ⠀[color=#1b487e]███░███░░░░██░░░░[/color] - ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] - ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] - ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold] - ⠀[color=#1b487e]░░░░██░░░████░███[/color] - ============================================= - ОТЧЁТ О СОБРАНИИ ГЛАВ - ============================================= - Время от начала смены и дата: - Составитель документа: - Должность составителя: - - Причина созыва Собрания Глав: - Формулировка поставленного перед Главами вопроса: - Количество голосов «За»: - Проголосовавшие «За»: - - Количество голосов «Против»: - Проголосовавшие «Против»: - - Количество воздержавшихся от голосования: - Воздержавшиеся от голосования: - - Решение Собрания Глав: - ============================================= - ⠀[italic]Место для печатей[/italic] + ⠀[color=#1b487e]███░███░░░░██░░░░[/color] + ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] + ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] + ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 КОМ[/bold] + ⠀[color=#1b487e]░░░░██░░░████░███[/color] + ============================================= + ОТЧЁТ О СОБРАНИИ ГЛАВ + ============================================= + Время от начала смены и дата: + Составитель документа: + Должность составителя: + + Причина созыва Собрания Глав: + Формулировка поставленного перед Главами вопроса: + Количество голосов «За»: + Проголосовавшие «За»: + + Количество голосов «Против»: + Проголосовавшие «Против»: + + Количество воздержавшихся от голосования: + Воздержавшиеся от голосования: + + Решение Собрания Глав: + ============================================= + ⠀[italic]Место для печатей[/italic] doc-text-printer-internal-affairs-agents-report = - ⠀[color=#1b487e]███░███░░░░██░░░░[/color] - ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] - ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] - ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ЮР-КОМ[/bold] - ⠀[color=#1b487e]░░░░██░░░████░███[/color] - ============================================= - ОТЧЁТ О ВНУТРЕННЕМ РАСЛЕДОВАНИИ - ============================================= - Время от начала смены и дата: - Составитель документа: - Должность составителя: - - Я, (ФИО), в должности Агента Внутренних Дел, в ходе внутренней проверки, запрошенной (ФИО), в должности (полное наименование должности) по причине (причина проверки) выявил следующие нарушения: - - Также хочу сообщить о следующем: - - ============================================= - ⠀[italic]Место для печатей[/italic] + ⠀[color=#1b487e]███░███░░░░██░░░░[/color] + ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] + ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] + ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ЮР-КОМ[/bold] + ⠀[color=#1b487e]░░░░██░░░████░███[/color] + ============================================= + ОТЧЁТ О ВНУТРЕННЕМ РАСЛЕДОВАНИИ + ============================================= + Время от начала смены и дата: + Составитель документа: + Должность составителя: + + Я, (ФИО), в должности Агента Внутренних Дел, в ходе внутренней проверки, запрошенной (ФИО), в должности (полное наименование должности) по причине (причина проверки) выявил следующие нарушения: + + Также хочу сообщить о следующем: + + ============================================= + ⠀[italic]Место для печатей[/italic] doc-text-printer-condition-report = - ⠀[color=#1b487e]███░███░░░░██░░░░[/color] - ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] - ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] - ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ИНЖ[/bold] - ⠀[color=#1b487e]░░░░██░░░████░███[/color] - ============================================= - ОТЧЁТ О ТЕХНИЧЕСКОМ СОСТОЯНИИ - ============================================= - Время от начала смены и дата: - Составитель документа: - Должность составителя: - - Была произведена проверка (название системы или объекта), результаты проверки были проанализированы, был проведён анализ причин возникновения нестабильной работы объекта. - Причина поломки объекта: - - Выявленные повреждения объекта: - - Произведённый ремонт объекта: - - ============================================= - ⠀[italic]Место для печатей[/italic] + ⠀[color=#1b487e]███░███░░░░██░░░░[/color] + ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] + ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] + ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 ИНЖ[/bold] + ⠀[color=#1b487e]░░░░██░░░████░███[/color] + ============================================= + ОТЧЁТ О ТЕХНИЧЕСКОМ СОСТОЯНИИ + ============================================= + Время от начала смены и дата: + Составитель документа: + Должность составителя: + + Была произведена проверка (название системы или объекта), результаты проверки были проанализированы, был проведён анализ причин возникновения нестабильной работы объекта. + Причина поломки объекта: + + Выявленные повреждения объекта: + + Произведённый ремонт объекта: + + ============================================= + ⠀[italic]Место для печатей[/italic] doc-text-printer-Report-study-object = ⠀[color=#1b487e]███░███░░░░██░░░░[/color] ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] @@ -163,12 +163,12 @@ doc-text-printer-Report-study-object = Время от начала смены и дата: Составитель документа: Должность составителя: - + Для проведения экспертизы было представлено (кто или какой отдел передал объект) приспособление с неизученными свойствами. В ходе экспертизы объект был изучен, были установлены свойства объекта и его видовая принадлежность. Внешнее описание объекта: - + Выявленные свойства объекта: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-experiment-report = @@ -183,20 +183,20 @@ doc-text-printer-experiment-report = Время от начала смены и дата: Составитель документа: Должность составителя: - + Внешнее описание объекта эксперимента: - + Экспериментатор(-ы): - + Эксперимент №... Описание эксперимента: - + Ожидаемый результат: - + Используемое оборудование: - + Фактический результат: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-disposal-report = @@ -211,10 +211,10 @@ doc-text-printer-disposal-report = Время от начала смены и дата: Составитель документа: Должность составителя: - + Отделом Снабжения была произведена утилизация объектов при (метод утилизации). В ходе утилизации были обнаружены ценные предметы и вещи, ценные предметы были переданы в соответствующие отделы для их использования. Перечень найденных вещей: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-application-appointment-interim = @@ -229,10 +229,10 @@ doc-text-printer-application-appointment-interim = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), прошу согласовать моё назначение на должность временно исполняющего обязанности Главы (полное наименование отдела)/Капитана. При вступлении в должность обязуюсь следовать Стандартным Рабочим Процедурам и до появления Главы (полное наименование отдела)/Капитана с Центрального Командования обеспечивать порядок и управление отделом, обеспечивать сохранность вверяемых мне особо ценных предметов и снаряжения. - + По прибытии Главы отдела/Капитана с Центрального Командования обязуюсь сдать повышенный доступ, особо ценные предметы и снаряжение. ============================================= ⠀[italic]Место для печатей[/italic] @@ -248,7 +248,7 @@ doc-text-printer-application-employment = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в текущей должности (полное наименование должности), прошу назначить меня сотрудником (название отдела трудоустройства) в должности (полное наименование должности). Обязуюсь следовать Стандартным Рабочим Процедурам отдела. Обязуюсь сдать рабочее снаряжение и экипировку отдела при переводе. ============================================= @@ -265,7 +265,7 @@ doc-text-printer-letter-resignation = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в текущей должности (полное наименование должности), хочу уволится с отдела (название отдела) по причине (причина). Обязуюсь заплатить штраф, установленный условиями расторжения срочного/бессрочного контракта, на станции Центрального Командования. ============================================= @@ -282,11 +282,11 @@ doc-text-printer-application-access = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), прошу предоставить мне следующие доступы: - + Причина получения повышенного доступа: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-application-equipment = @@ -301,11 +301,11 @@ doc-text-printer-application-equipment = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное название должности), прошу выдать мне следующее снаряжение отдела (наименование отдела)/личное снаряжение: - + Причина получения снаряжения: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-appeal = @@ -320,12 +320,12 @@ doc-text-printer-appeal = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), прошу рассмотреть (ФИО), в должности (полное наименование должности) моё обращение. Содержание обращения: - + Причины его написания: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-evacuation-shuttle-request = @@ -340,10 +340,10 @@ doc-text-printer-evacuation-shuttle-request = Время от начала смены и дата: Составитель документа: Должность составителя: - + Уважаемое Центральное Командование! Я, (ФИО), в должности (полное наименование должности), прошу запустить протоколы эвакуации и прислать эвакуационный шаттл, приняв решение об окончании смены. Причина окончания смены: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-shuttle-registration-request = @@ -358,16 +358,16 @@ doc-text-printer-shuttle-registration-request = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), прошу провести регистрацию шаттла в системе NanoTrasen для идентификации. Размеры шаттла: - + Класс шаттла: - + Ответственный за постройку: - + Запрашиваемое наименование: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-request-call-members-central-committee-dso = @@ -382,11 +382,11 @@ doc-text-printer-request-call-members-central-committee-dso = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), прошу рассмотреть возможность вызова на станцию: - + Причина вызова: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-request-to-establish-threat-level = @@ -401,11 +401,11 @@ doc-text-printer-request-to-establish-threat-level = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), прошу рассмотреть возможность установления на станции уровня угрозы: - + Причина установления кода: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-request-change-salary = @@ -420,10 +420,10 @@ doc-text-printer-request-change-salary = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), прошу рассмотреть возможность повышения/понижения заработной платы на (сумма или количество процентов) сотруднику (ФИО) в должности (полное название должности)/отделу (наименование отдела)/текущей смене. Причина повышения/понижения заработной платы: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-request-for-non-listed-employment = @@ -438,18 +438,18 @@ doc-text-printer-request-for-non-listed-employment = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), прошу рассмотреть возможность принятия в рабочий штат текущей смены (ФИО) на внеперечневую должность. Полное наименование должности: - + Ответственный за работника глава или сотрудник: - + Выполняемые работы в должности (СРП): - + Предоставляемые доступы работнику: - + Причина трудоустройства: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-request-for-promotion = @@ -464,14 +464,14 @@ doc-text-printer-request-for-promotion = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), прошу рассмотреть возможность повышения (ФИО), в должности (полное наименование должности), согласно иерархии командования. Сотрудник получил необходимую для данной работы квалификацию. Запрашиваемая должность: - + Ответственный за работника глава или сотрудник: - + Причина повышения: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-request-documents = @@ -486,9 +486,9 @@ doc-text-printer-request-documents = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности Агента Внутренних Дел, прошу предоставить для проверки соответствия Корпоративному Закону копию/оригинал документов: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-request-euthanasia = @@ -503,7 +503,7 @@ doc-text-printer-request-euthanasia = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), прошу содействие медицинского отдела в проведении эвтаназии в качестве врачебного лечения по причине (указать причину запроса). С последствиями данного решения ознакомлен, медицинским персоналом была установлена рациональность и гуманность данного решения. Претензий к к медицинскому отделу при соблюдении ими протоколов эвтаназии не имею. По окончании процедуры прошу утилизировать тело путём (способ утилизации) при наличии на это возможности. ============================================= @@ -520,10 +520,10 @@ doc-text-printer-request-construction-work = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), прошу провести строительные работы в (название отдела или объекта) по причине (причина запроса). Перечень строительных работ: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-request-modernization = @@ -538,10 +538,10 @@ doc-text-printer-request-modernization = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), прошу модернизировать приборы в (название отдела или объекта) по причине (причина запроса). Перечень модернизации: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-complaint-violation-labor-rules = @@ -556,9 +556,9 @@ doc-text-printer-complaint-violation-labor-rules = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), считаю, что в ходе работы отдела (наименование отдела) были допущены следующие нарушения: - + Прошу провести внутреннюю проверку по данным фактам нарушений. ============================================= ⠀[italic]Место для печатей[/italic] @@ -574,10 +574,10 @@ doc-text-printer-complaint-offense = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), считаю, что (ФИО), в должности (полное наименование должности), нарушил Корпоративный Закон, потому что (причина). Произошедшее с моей точки зрения: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-permission-equipment = @@ -592,12 +592,12 @@ doc-text-printer-permission-equipment = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности главы отдела (полное наименование отдела), разрешаю использовать (ФИО) в должности (полное наименование должности) следующее рабочее снаряжение отдела: - + ============================================= ⠀[italic]Место для печатей[/italic] -doc-text-printer-permission-to-travel-in-case-of-threat= +doc-text-printer-permission-to-travel-in-case-of-threat = ⠀[color=#1b487e]███░███░░░░██░░░░[/color] ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] @@ -609,12 +609,12 @@ doc-text-printer-permission-to-travel-in-case-of-threat= Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), разрешаю сотруднику (ФИО) в должности (полное наименование должности) передвижение по станции с целью выполнения им рабочих обязанностей. Уровни кодов угроз, при которых даётся данное разрешение: - + Разрешённые части станции для местонахождения сотрудника (можно указать всю станцию): - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-search-permission = @@ -629,10 +629,10 @@ doc-text-printer-search-permission = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), разрешаю произвести обыск (ФИО)/(полное наименование отдела), в должности (полное наименование должности). Причина обыска: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-permission-to-carry-weapons = @@ -647,14 +647,14 @@ doc-text-printer-permission-to-carry-weapons = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), разрешаю ношение оружия (ФИО), в должности (полное наименование должности), до тех пор, пока оно используется по назначению. В случае нарушения разрешение аннулируется, оружие изымается Службой Безопасности. Оружие и тип патронов к нему: - + Способ получения оружия и патронов к нему: - + Причина выдачи разрешения: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-prescription-drug-authorization = @@ -669,12 +669,12 @@ doc-text-printer-prescription-drug-authorization = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), разрешаю хранение и использование рецептурного препарата или наркотического препарата "(полное наименование вещества)" пациенту (ФИО), в должности (полное наименование должности). Поставленный диагноз: - + Причина выдачи препарата: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-permission-dispose-body = @@ -689,10 +689,10 @@ doc-text-printer-permission-dispose-body = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), разрешаю утилизировать тело (ФИО), в должности (полное наименование должности) в связи с невозможностью его реанимации и клонирования. Способ утилизации: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-construction-permit = @@ -707,10 +707,10 @@ doc-text-printer-construction-permit = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), разрешаю произвести (ФИО), в должности (полное наименование должности), перепланировку части станции (указание места перепланировки) по причине (причина перепланировки). Согласованный объём перепланировки: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-permission-to-extend-marriage = @@ -725,7 +725,7 @@ doc-text-printer-permission-to-extend-marriage = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), даю своё разрешение на расширение брака, заключённого между: (ФИО), в должности (полное наименование должности) ⠀... @@ -748,9 +748,9 @@ doc-text-printer-order-dismissal = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), приказываю уволить сотрудника (ФИО) отдела (наименование отдела) в должности (полное наименование должности увольняемого) по причине: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-order-deprivation-access = @@ -765,9 +765,9 @@ doc-text-printer-order-deprivation-access = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), приказываю лишить сотрудника (ФИО) в должности (полное наименование должности) следующего доступа(-ов): - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-order-encouragement = @@ -782,9 +782,9 @@ doc-text-printer-order-encouragement = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности) награждаю (ФИО) в должности (полное наименование должности награждаемого) медалью/грамотой/памятной вещью/премией в размере (размер премии) за следующие заслуги: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-order-parole-prisoner = @@ -799,7 +799,7 @@ doc-text-printer-order-parole-prisoner = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), разрешаю освободить заключённого под стражу (ФИО) в бриг/пермабриг. После выдачи условно-досрочного заключения заключённому под стражу будет выдана гражданская профессия с обязательной работой до конца смены. Выдаваемая профессия: ============================================= @@ -816,12 +816,12 @@ doc-text-printer-order-recognizing-rentience-creature = Время от начала смены и дата: Составитель документа: Должность составителя: - + В ходе тестирования существа были выявлены признаки высшей мозговой деятельности и разумности данного существа, его способность мыслить, обучаться, понимание морали, наличие здравого смысла в поступках. Таким образом я, (ФИО), в должности (полное наименование должности), исходя из принципов равенства прав всех разумных существ, установленного ОПРС, признаю данное существо разумным. Внешний вид существа: - + Устанавливаемое полное имя существа: - + Существо принято/не принято в качестве пассажира станции до окончания смены. ============================================= ⠀[italic]Место для печатей[/italic] @@ -837,10 +837,10 @@ doc-text-printer-order-medical-intervention = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), распоряжаюсь провести медицинское вмешательство с целью (описание цели медицинского вмешательства), в отношении (ФИО) в должности (полное наименование должности). Основание для проведения операции: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-product-manufacturing-order = @@ -855,12 +855,12 @@ doc-text-printer-product-manufacturing-order = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), прошу произвести продукцию отделом (наименование отдела). Перечень необходимых продуктов: - + Причина заказа: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-order-purchase-resources-equipment = @@ -875,13 +875,13 @@ doc-text-printer-order-purchase-resources-equipment = Время от начала смены и дата: Составитель документа: Должность составителя: - + Перечень товаров для заказа: - + Место доставки товара: - + Причина: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-ordering-special-equipment = @@ -896,12 +896,12 @@ doc-text-printer-ordering-special-equipment = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), прошу предоставить специальное снаряжение станции от Центрального Командования. Перечень запрашиваемого снаряжения: - + Причина запроса: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-order-purchase-weapons = @@ -916,10 +916,10 @@ doc-text-printer-order-purchase-weapons = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), произвожу заказ боевого оружия и (или) боевых приспособлений через отдел Снабжения. Причина заказа: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-certificate = @@ -934,9 +934,9 @@ doc-text-printer-certificate = Время от начала смены и дата: Составитель документа: Должность составителя: - + (ФИО), в должности (полное наименование должности) награждается грамотой за следующие заслуги: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-certificate-advanced-training = @@ -951,7 +951,7 @@ doc-text-printer-certificate-advanced-training = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности главы отдела (полное наименование отдела), свидетельствую, что сотрудник (ФИО) в должности (должность сотрудника), успешно завершил образовательный курс "(название курса)" и был аттестован. ============================================= ⠀[italic]Место для печатей[/italic] @@ -967,7 +967,7 @@ doc-text-printer-certificate-offense = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), свидетельствую о правонарушениях/самолично признаюсь в совершении правонарушений, предусмотренных статьями: (перечисление статей) По данному инциденту могу пояснить следующее. @@ -977,7 +977,7 @@ doc-text-printer-certificate-offense = Характер и размер вреда, причинённого преступлением: Пособники в преступлении: Полная хронология событий: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-death-certificate = @@ -992,14 +992,14 @@ doc-text-printer-death-certificate = Время от начала смены и дата: Составитель документа: Должность составителя: - + ФИО умершего: Должность умершего: Раса: Пол: Причина смерти: Возможность проведения реанимации или клонирования: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-marriage-certificate = @@ -1014,13 +1014,13 @@ doc-text-printer-marriage-certificate = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), заключаю брак между: ⠀(ФИО), в должности (полное наименование должности) ⠀... ⠀(ФИО), в должности (полное наименование должности) После заключения брака брачующимся были присвоены следующие полные имена: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-divorce-certificate = @@ -1035,15 +1035,15 @@ doc-text-printer-divorce-certificate = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), расторгаю брак между: (ФИО), в должности (полное наименование должности) ⠀... (ФИО), в должности (полное наименование должности) После расторжения брака бывшим супругам были присвоены следующие полные имена: - + Разделение имущества было произведено следующим образом: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-closing-indictment = @@ -1058,39 +1058,39 @@ doc-text-printer-closing-indictment = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), разрешаю произвести арест (ФИО), в должности (полное наименование должности) в связи с подозрением в совершении данным лицом следующих правонарушений: - + В ходе предварительного следствия были обнаружены доказательства, указывающие на совершение правонарушения данным лицом. Прямые доказательства: - + Косвенные доказательства: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-sentence = - ⠀[color=#1b487e]███░███░░░░██░░░░[/color] - ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] - ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] - ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 СБ[/bold] - ⠀[color=#1b487e]░░░░██░░░████░███[/color] - ============================================= - ПРИГОВОР - ============================================= - Время от начала смены и дата: - Составитель документа: - Должность составителя: - - Я, (ФИО), в должности (полное название должности), выношу приговор согласно данным мне полномочиям в отношении (ФИО), в должности (полное название должности). - Данное лицо нарушило следующие статьи Корпоративного Закона: - (перечисление статей) - С учётом всех смягчающих и отягчающих обстоятельств, правовое наказание данного лица представлено в виде: - (суммарный срок, пожизненно заключение, либо приговор к казни) - Административное наказание: - (понижение в должности, увольнение) - Срок заключения под стражу отсчитывается с: (время начала заключения) - ============================================= - ⠀[italic]Место для печатей[/italic] + ⠀[color=#1b487e]███░███░░░░██░░░░[/color] + ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] + ⠀[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head] + ⠀[color=#1b487e]░░░░██░░██░██░██░[/color] [bold]Station XX-000 СБ[/bold] + ⠀[color=#1b487e]░░░░██░░░████░███[/color] + ============================================= + ПРИГОВОР + ============================================= + Время от начала смены и дата: + Составитель документа: + Должность составителя: + + Я, (ФИО), в должности (полное название должности), выношу приговор согласно данным мне полномочиям в отношении (ФИО), в должности (полное название должности). + Данное лицо нарушило следующие статьи Корпоративного Закона: + (перечисление статей) + С учётом всех смягчающих и отягчающих обстоятельств, правовое наказание данного лица представлено в виде: + (суммарный срок, пожизненно заключение, либо приговор к казни) + Административное наказание: + (понижение в должности, увольнение) + Срок заключения под стражу отсчитывается с: (время начала заключения) + ============================================= + ⠀[italic]Место для печатей[/italic] doc-text-printer-judgment = ⠀[color=#1b487e]███░███░░░░██░░░░[/color] ⠀[color=#1b487e]░██░████░░░██░░░░[/color] [head=3]Бланк документа[/head] @@ -1103,14 +1103,14 @@ doc-text-printer-judgment = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), выношу решение по судебному разбирательству в отношении (ФИО), в должности (полное наименование должности). Предъявляемые правонарушения: - + Решение приговора Службы Безопасности: - + Проведённое до судебного разбирательства время ареста: - + Данное лицо нарушило следующие статьи Корпоративного Закона: (перечисление статей) С учётом всех смягчающих и отягчающих обстоятельств, правовое наказание данного лица представлено в виде: @@ -1120,7 +1120,7 @@ doc-text-printer-judgment = Срок заключения под стражу отсчитывается с: (время начала заключения) Моё решение обосновано (тем, что): - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-statement-health = @@ -1135,18 +1135,18 @@ doc-text-printer-statement-health = Время от начала смены и дата: Составитель документа: Должность составителя: - + Пациент (ФИО), в должности (полное наименование должности), был направлен на медицинское обследование в связи с (причина прохождения обследования). Был произведён полный осмотр пациента, проведены необходимые исследования и анализы. Состав врачебной комиссии: (ФИО врача, полное наименование должности или специализации) Состояние пациента при поступлении: - + Поставленный диагноз: - + Психологическое состояние пациента: - + Оказанное лечение в ходе госпитализации: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-decision-to-start-trial = @@ -1161,10 +1161,10 @@ doc-text-printer-decision-to-start-trial = Время от начала смены и дата: Составитель документа: Должность составителя: - + Я, (ФИО), в должности (полное наименование должности), сообщаю о начале судебного разбирательства по делу (ФИО) в связи со сложностью и неоднозначностью дела. Предъявляемые правонарушения: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-error-loading-form-header = @@ -1178,7 +1178,7 @@ doc-text-printer-error-loading-form-header = ============================================= Время от начала смены и дата: Позывной Агента: - + Полное содержание документа со всей необходимой информацией и описанием ============================================= ⠀[italic]Место для печатей[/italic] @@ -1193,10 +1193,10 @@ doc-text-printer-notice-of-liquidation = ============================================= Время от начала смены и дата: Позывной агента: - + Уважаемый (ФИО), в должности (полное наименование должности)! Руководством Синдиката принято решение о вашей немедленной ликвидации в ходе данной смены. Просим заранее подготовить завещание и направить его Медицинскому отделу станции. Уничтожение вашего тела будет произведено силами Синдиката. Причина ликвидации: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-business-deal = @@ -1210,11 +1210,11 @@ doc-text-printer-business-deal = ============================================= Время от начала смены и дата: Позывной агента: - + Синдикат любезно предлагает заключить сделку между станцией и агентом (позывной агента). Со стороны станции необходимо: - + Причина выполнения условий сделки: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-note-beginning-military-actions = @@ -1228,10 +1228,10 @@ doc-text-printer-note-beginning-military-actions = ============================================= Время от начала смены и дата: Позывной агента: - + Неуважаемые корпоративные крысы NanoTrasen! Синдикат официально объявляет о начале военных действий с вами, а также о начале операции по вашему истреблению. Причина предъявления ноты: - + ============================================= ⠀[italic]Место для печатей[/italic] doc-text-printer-report-accomplishment-goals = @@ -1245,9 +1245,9 @@ doc-text-printer-report-accomplishment-goals = ============================================= Время от начала смены и дата: Позывной агента: - + Я, (позывной агента), успешно выполнил поставленные передо мной руководством Синдиката цели. Прошу принять отчёт о выполнении. Отчёт: - + ============================================= ⠀[italic]Место для печатей[/italic] diff --git a/Resources/Locale/ru-RU/deltav/escape-menu/options-menu.ftl b/Resources/Locale/ru-RU/deltav/escape-menu/options-menu.ftl index 60a9eafde68..801a451d366 100644 --- a/Resources/Locale/ru-RU/deltav/escape-menu/options-menu.ftl +++ b/Resources/Locale/ru-RU/deltav/escape-menu/options-menu.ftl @@ -1,3 +1,3 @@ ui-options-tab-deltav = Особые ui-options-general-forknotice = Обратите внимание: Эти настройки доступны только в данном билде и могут отсутствовать на других серверах. -ui-options-no-filters = Отключить эффекты влияющие на зрение \ No newline at end of file +ui-options-no-filters = Отключить эффекты влияющие на зрение diff --git a/Resources/Locale/ru-RU/disease/miasma.ftl b/Resources/Locale/ru-RU/disease/miasma.ftl index 20c7abc5fb3..3425d898c4e 100644 --- a/Resources/Locale/ru-RU/disease/miasma.ftl +++ b/Resources/Locale/ru-RU/disease/miasma.ftl @@ -25,4 +25,4 @@ rotting-extremely-bloated = [color=red]{ CAPITALIZE(SUBJECT($target)) } силь }![/color] rotting-rotting-nonmob = [color=orange]{ CAPITALIZE(SUBJECT($target)) } гниёт![/color] rotting-bloated-nonmob = [color=orangered]{ CAPITALIZE(SUBJECT($target)) } вздулось![/color] -rotting-extremely-bloated-nonmob = [color=red]{ CAPITALIZE(SUBJECT($target)) } сильно вздулось![/color] +rotting-extremely-bloated-nonmob = [color=red]{ CAPITALIZE(SUBJECT($target)) } сильно вздулось![/color] \ No newline at end of file diff --git a/Resources/Locale/ru-RU/game-ticking/game-presets/preset-revolutionary.ftl b/Resources/Locale/ru-RU/game-ticking/game-presets/preset-revolutionary.ftl index 216c9b0c376..ebb3e56a9f4 100644 --- a/Resources/Locale/ru-RU/game-ticking/game-presets/preset-revolutionary.ftl +++ b/Resources/Locale/ru-RU/game-ticking/game-presets/preset-revolutionary.ftl @@ -2,8 +2,7 @@ roles-antag-rev-head-name = Глава революции roles-antag-rev-head-objective = Ваша задача - захватить станцию, склонив членов экипажа на свою сторону, и уничтожив весь командный состав станции. -head-rev-role-greeting = - Вы - глава революции. +head-rev-role-greeting = Вы - глава революции. Вам поручено устранить весь командный состав станции путём убийства, изгнания за борт, или ареста. Синдикат проспонсировал вас особой вспышкой, которая конвертирует членов экипажа на вашу сторону. Осторожно, она не сработает на сотрудниках службы безопасности, членах командного состава, и на тех, кто носит солнцезащитные очки. @@ -23,8 +22,7 @@ rev-break-control = { $name } { $gender -> [epicene] вспомнили, кому они верни *[neuter] вспомнило, кому оно верно } на самом деле! -rev-role-greeting = - Вы - Революционер. +rev-role-greeting = Вы - Революционер. Вам поручено захватить станцию и защищать глав революции. Избавьтесь от всего командного состава станции. Viva la revolución! @@ -54,8 +52,7 @@ rev-headrev-name = [color=#5e9cff]{ $name }[/color] конвертировал { } экипажа rev-reverse-stalemate = Главы революции и командный состав станции выжили. rev-deconverted-title = Разконвертированы! -rev-deconverted-text = - Со смертью последнего главы революции, революция оканчивается. - +rev-deconverted-text = Со смертью последнего главы революции, революция оканчивается. + Вы больше не революционер, так что ведите себя хорошо. rev-deconverted-confirm = Подтвердить diff --git a/Resources/Locale/ru-RU/guidebook/chemistry/effects.ftl b/Resources/Locale/ru-RU/guidebook/chemistry/effects.ftl index 647c8f5dd21..c6b291dd302 100644 --- a/Resources/Locale/ru-RU/guidebook/chemistry/effects.ftl +++ b/Resources/Locale/ru-RU/guidebook/chemistry/effects.ftl @@ -319,12 +319,12 @@ reagent-effect-guidebook-innoculate-zombie-infection = reagent-effect-guidebook-area-reaction = { $chance -> [1] Вызывает - *[other] вызывают - } дымовую или пенную реакцию на {NATURALFIXED($duration, 3)} {MANY("second", $duration)} + *[other] вызывают + } дымовую или пенную реакцию на { NATURALFIXED($duration, 3) } { MANY("second", $duration) } reagent-effect-guidebook-add-to-solution-reaction = { $chance -> [1] Заставляет - *[other] заставляют + *[other] заставляют } химикаты, применённые к объекту, добавиться во внутренний контейнер для растворов этого объекта reagent-effect-guidebook-plant-attribute = { $chance -> diff --git a/Resources/Locale/ru-RU/implant/implant.ftl b/Resources/Locale/ru-RU/implant/implant.ftl index 7afb60dd6cc..4f8e94f8b19 100644 --- a/Resources/Locale/ru-RU/implant/implant.ftl +++ b/Resources/Locale/ru-RU/implant/implant.ftl @@ -19,4 +19,4 @@ implanter-contained-implant-text = [color=green]{ $desc }[/color] scramble-implant-activated-popup = Вы превратились в { $identity } deathrattle-implant-dead-message = Зафиксирована смерть { $user } { $position }. -deathrattle-implant-critical-message = Жизненные показатели { $user } критические, требуется немедленная помощь { $position }. +deathrattle-implant-critical-message = Жизненные показатели { $user } критические, требуется немедленная помощь { $position }. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl b/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl index 5bc537d33cc..4dbe634c88c 100644 --- a/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl +++ b/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl @@ -1,7 +1,8 @@ comp-kitchen-spike-deny-collect = { CAPITALIZE($this) } уже чем-то занят, сначала закончите срезать мясо! comp-kitchen-spike-deny-butcher = { CAPITALIZE($victim) } не может быть разделан на { $this }. comp-kitchen-spike-deny-butcher-knife = { CAPITALIZE($victim) } не может быть разделан на { $this }, используйте нож для разделки. -comp-kitchen-spike-deny-not-dead = { CAPITALIZE($victim) } не может быть разделан. { CAPITALIZE(SUBJECT($victim)) } { GENDER($victim) -> +comp-kitchen-spike-deny-not-dead = + { CAPITALIZE($victim) } не может быть разделан. { CAPITALIZE(SUBJECT($victim)) } { GENDER($victim) -> [male] ещё жив [female] ещё жива [epicene] ещё живы diff --git a/Resources/Locale/ru-RU/loadouts/categories.ftl b/Resources/Locale/ru-RU/loadouts/categories.ftl index b6faa84f0a8..f61cbaee316 100644 --- a/Resources/Locale/ru-RU/loadouts/categories.ftl +++ b/Resources/Locale/ru-RU/loadouts/categories.ftl @@ -3,5 +3,6 @@ loadout-category-Accessories = Аксессуары loadout-category-Items = Предметы loadout-category-Jobs = Работа loadout-category-Outer = Верхняя одежда +loadout-category-Roles = Роли loadout-category-Uncategorized = Без категории loadout-category-Uniform = Униформа diff --git a/Resources/Locale/ru-RU/oldNuclear14/Special/reagent-effects.ftl b/Resources/Locale/ru-RU/oldNuclear14/Special/reagent-effects.ftl index ac2e382f4d1..88aadeb40c5 100644 --- a/Resources/Locale/ru-RU/oldNuclear14/Special/reagent-effects.ftl +++ b/Resources/Locale/ru-RU/oldNuclear14/Special/reagent-effects.ftl @@ -34,4 +34,4 @@ reagent-effect-guidebook-luck-modifier = { $chance -> [1] Изменяет *[other] изменяют - } удачу на { $luck } минимум на { NATURALFIXED($time, 3) } { MANY("second", $time) } \ No newline at end of file + } удачу на { $luck } минимум на { NATURALFIXED($time, 3) } { MANY("second", $time) } diff --git a/Resources/Locale/ru-RU/oldNuclear14/Special/special.ftl b/Resources/Locale/ru-RU/oldNuclear14/Special/special.ftl index 3b77c24793f..547f6618320 100644 --- a/Resources/Locale/ru-RU/oldNuclear14/Special/special.ftl +++ b/Resources/Locale/ru-RU/oldNuclear14/Special/special.ftl @@ -15,4 +15,4 @@ clothing-agility-increase-equal-examine = [color=green]повышает[/color] clothing-agility-decrease-equal-examine = [color=red]понижает[/color] параметр [color=yellow]Ловкость[/color] на [color=red]{ $agility }[/color] clothing-luck-increase-equal-examine = [color=green]повышает[/color] параметр [color=yellow]Удача[/color] на [color=green]{ $luck }[/color] clothing-luck-decrease-equal-examine = [color=red]понижает[/color] параметр [color=yellow]Удача[/color] на [color=red]{ $luck }[/color] -player-component-not-enough-strength-weild = Вам необходимо иметь { $number } [color=yellow]Сила[/color] чтобы носить это. \ No newline at end of file +player-component-not-enough-strength-weild = Вам необходимо иметь { $number } [color=yellow]Сила[/color] чтобы носить это. diff --git a/Resources/Locale/ru-RU/paper/book-authorbooks.ftl b/Resources/Locale/ru-RU/paper/book-authorbooks.ftl index 3afccd59c1f..8a46b92425b 100644 --- a/Resources/Locale/ru-RU/paper/book-authorbooks.ftl +++ b/Resources/Locale/ru-RU/paper/book-authorbooks.ftl @@ -260,4 +260,4 @@ book-text-janitor = [bold][color=black][head=3]The Tales of a Tired Janitor[/hea And the tools they give us! You'd expect state-of-the-art cleaning gadgets, but nope. They raided a dollar store on Earth before launching us into the cosmos. Mops that barely work in microgravity, spray bottles that run out in one use, and don't even get me started on the space janitor jumpsuit. I feel like a reject from a sci-fi B-movie. Speaking of jumpsuits, the lack of respect is astronomical. The scientists and astronauts zoom past in their sleek suits, utterly oblivious to the fact that I'm the unsung hero keeping this place from turning into a cosmic trash heap. I bet they don't even know my name. "Hey, Space Janitor!" That's what I get. No appreciation for the elbow grease I put into keeping their precious station spick and span. And let's remember the hazards. Cleaning up alien slime? Yeah, that's a regular Tuesday for me. One wrong move and I'm dealing with an intergalactic biohazard. It's like playing Russian roulette with space critters that could burst out of some hidden nook and cranny. I signed up to mop floors, not play host to extraterrestrial invaders. - Being a janitor on this so-called Space Station 14 is a cosmic joke. Where did the other 13 stations go? It's not all spacewalks and futuristic gadgets; it's scrubbing toilets and battling alien goo. If anyone thinks space is glamorous, they clearly haven't seen the mess we space janitors deal with every single day. It's time they appreciate the unsung heroes of the space station – the custodians of the cosmos. + Being a janitor on this so-called Space Station 14 is a cosmic joke. Where did the other 13 stations go? It's not all spacewalks and futuristic gadgets; it's scrubbing toilets and battling alien goo. If anyone thinks space is glamorous, they clearly haven't seen the mess we space janitors deal with every single day. It's time they appreciate the unsung heroes of the space station – the custodians of the cosmos. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/paper/book-salvage.ftl b/Resources/Locale/ru-RU/paper/book-salvage.ftl index 96f616e0e22..9f05e3a4e3b 100644 --- a/Resources/Locale/ru-RU/paper/book-salvage.ftl +++ b/Resources/Locale/ru-RU/paper/book-salvage.ftl @@ -80,4 +80,4 @@ book-text-detective = ГЛАВА 1: МАЛЕНЬКИЙ ПЕРЕПОЛОХ НА Здесь всегда всё идёт наперекосяк... Я никогда больше не буду относиться к клоунам как раньше. - Вопрос в том... Кто это сделал на самом деле? + Вопрос в том... Кто это сделал на самом деле? \ No newline at end of file diff --git a/Resources/Locale/ru-RU/pda/pda-component.ftl b/Resources/Locale/ru-RU/pda/pda-component.ftl index a0549ca97d7..574df7e78ba 100644 --- a/Resources/Locale/ru-RU/pda/pda-component.ftl +++ b/Resources/Locale/ru-RU/pda/pda-component.ftl @@ -28,4 +28,4 @@ pda-bound-user-interface-music-button = Музыкальный инструме comp-pda-ui-unknown = Неизвестно comp-pda-ui-unassigned = Не назначено pda-notification-message = [font size=12][bold]КПК[/bold] { $header }: [/font] - "{ $message }" + "{ $message }" \ No newline at end of file diff --git a/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl index 0fc911d6010..9c163228548 100644 --- a/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl +++ b/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl @@ -3,6 +3,7 @@ humanoid-profile-editor-name-label = Имя: humanoid-profile-editor-name-random-button = Сгенерировать humanoid-profile-editor-appearance-tab = Внешность humanoid-profile-editor-clothing = Отображать одежду +humanoid-profile-editor-loadouts = Показать инвентарь humanoid-profile-editor-clothing-show = Переключить humanoid-profile-editor-sex-label = Пол: humanoid-profile-editor-sex-male-text = Мужской @@ -19,6 +20,8 @@ humanoid-profile-editor-pronouns-neuter-text = Оно / Его humanoid-profile-editor-import-button = Импорт humanoid-profile-editor-export-button = Экспорт humanoid-profile-editor-save-button = Сохранить +humanoid-profile-editor-clothing-label = Одежда: +humanoid-profile-editor-backpack-label = Рюкзак: humanoid-profile-editor-reset-button = Сбросить humanoid-profile-editor-spawn-priority-label = Приоритет спавна: humanoid-profile-editor-eyes-label = Цвет глаз: @@ -55,9 +58,9 @@ trait-category-speech = Черты речи humanoid-profile-editor-loadouts-tab = Инвентарь humanoid-profile-editor-loadouts-uncategorized-tab = Без категории humanoid-profile-editor-loadouts-no-loadouts = Инвентарь отсутствует -humanoid-profile-editor-loadouts-points-label = У вас осталось {$points} из {$max} очков +humanoid-profile-editor-loadouts-points-label = У вас осталось { $points } из { $max } очков humanoid-profile-editor-loadouts-show-unusable-button = Показать недоступное humanoid-profile-editor-loadouts-show-unusable-button-tooltip = Если эта функция включена, снаряжение, которое не подходит для текущей конфигурации вашего персонажа, будет выделено красным цветом. Вы по-прежнему не сможете использовать недоступное снаряжение, пока конфигурация вашего персонажа не будет соответствовать требованиям. - Эта опция может быть полезна, если вы часто переключаетесь между несколькими профессиями и не хотите каждый раз заново выбирать снаряжение. \ No newline at end of file + Эта опция может быть полезна, если вы часто переключаетесь между несколькими профессиями и не хотите каждый раз заново выбирать снаряжение. diff --git a/Resources/Locale/ru-RU/reagents/meta/narcotics.ftl b/Resources/Locale/ru-RU/reagents/meta/narcotics.ftl index 047ad95ab7f..ea4f9cf7912 100644 --- a/Resources/Locale/ru-RU/reagents/meta/narcotics.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/narcotics.ftl @@ -1,41 +1,28 @@ reagent-name-desoxyephedrine = дезоксиэфедрин reagent-desc-desoxyephedrine = Более эффективный эфедрин с более выраженными побочными эффектами. Требует меньшей дозы для лечения нарколепсии. - reagent-name-ephedrine = эфедрин reagent-desc-ephedrine = Кофеиновый адреналиновый стимулятор, который делает вас быстрее и устойчивее на ногах. Также помогает противостоять нарколепсии в дозах выше 30, но ценой сильного нервного стресса. - reagent-name-stimulants = стимуляторы reagent-desc-stimulants = Химический коктейль, разработанный компанией Donk Co., который позволяет агентам быстрее оправляться от оглушения, быстрее передвигаться и немного исцеляться при критическом состоянии. Из-за комплексной природы этого вещества организму гораздо труднее вывести его естественным путём. - reagent-name-experimental-stimulants = экспериментальный стимулятор reagent-desc-experimental-stimulants = Прототип смеси стимуляторов. Использование даёт практически полную невосприимчивость к оглушающему оружию, быструю регенерацию тканей, огромную скорость бега за счёт снижения выработки молочной кислоты и общее чувство эйфории. Среди побочных эффектов: экстремальное снижение свертываемости крови, туннельное зрение, сильное скопление токсинов в кровеносной системе и быстрое отмирание печени. Беречь от животных. - reagent-name-thc = ТГК reagent-desc-thc = Основное психоактивное вещество в конопле. - reagent-name-thc-oil = масло ТГК reagent-desc-thc-oil = Чистое масло ТГК, извлеченное из листьев растения конопли. Гораздо сильнее, чем в естественной форме, и может использоваться для облегчения хронической боли у пациентов. - reagent-name-bananadine = бананадин reagent-desc-bananadine = Слабый психоделик, который содержится в небольших количествах в банановой кожуре. - reagent-name-nicotine = никотин reagent-desc-nicotine = Опасен и вызывает сильное привыкание, но так утверждает пропаганда. - reagent-name-impedrezene = импедризин reagent-desc-impedrezene = Наркотик, который лишает человека дееспособности, замедляя высшие функции клеток мозга. - reagent-name-space-drugs = космический мираж reagent-desc-space-drugs = Запрещённое вещество, вызывающее ряд таких эффектов, как потеря равновесия и нарушения зрения. - reagent-name-nocturine = ноктюрин reagent-desc-nocturine = Высокоэффективное снотворное и гипнотическое средство, разработанное Синдикатом для тайных операций. Билет в один конец в хонкоград. - reagent-name-mute-toxin = токсин немоты reagent-desc-mute-toxin = Густой препарат, воздействующий на голосовые связки и лишающий пользователя возможности говорить пока усваивается организмом. - reagent-name-norepinephric-acid = норэпинефриновая кислота reagent-desc-norepinephric-acid = Мягкое химическое вещество, которое блокирует оптические рецепторы, делая употребившего слепым пока усваивается организмом. - reagent-name-tear-gas = слезоточивый газ -reagent-desc-tear-gas = Химическое вещество, вызывающее сильное раздражение и слезотечение, обычно используется для подавления массовых беспорядков. \ No newline at end of file +reagent-desc-tear-gas = Химическое вещество, вызывающее сильное раздражение и слезотечение, обычно используется для подавления массовых беспорядков. diff --git a/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl index 27372771c5c..3bbc055bc62 100644 --- a/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl @@ -98,4 +98,4 @@ reagent-physical-desc-alkaline = щелочное reagent-physical-desc-reflective = светоотражающее reagent-physical-desc-holy = святое reagent-physical-desc-slimy = склизкое -reagent-physical-desc-neural = нейронное \ No newline at end of file +reagent-physical-desc-neural = нейронное diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl index d8941b7c467..5d5bd3f2681 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl @@ -1,5 +1,8 @@ ent-ClothingBackpackDuffelSurgeryFilled = хирургический вещмешок .desc = Большой вещевой мешок для хранения дополнительного медицинского снаряжения - похоже, этот мешок предназначен для хранения хирургических инструментов. +ent-ClothingBackpackDuffelCBURNFilled = { ent-ClothingBackpackDuffelCBURN } + .suffix = Filled + .desc = { ent-ClothingBackpackDuffelCBURN.desc } # Corvax-HiddenDesc-Start ent-ClothingBackpackDuffelSyndicateFilledMedical = { ent-ClothingBackpackDuffelSyndicate } .desc = { ent-ClothingBackpackDuffelSyndicate.desc } @@ -58,6 +61,10 @@ ent-ClothingBackpackDuffelSyndicateEliteHardsuitBundle = { ent-ClothingBackpackD ent-ClothingBackpackDuffelSyndicateHardsuitExtrasBundle = { ent-ClothingBackpackDuffelSyndicate } .suffix = набор дополнений скафандров Синдиката .desc = { ent-ClothingBackpackDuffelSyndicate.desc } +ent-ClothingBackpackDuffelSyndicateOperative = вещмешок оперативника + .desc = { ent-ClothingBackpackDuffelSyndicateBundle.desc } +ent-ClothingBackpackDuffelSyndicateOperativeMedic = вещмешок медика оперативников + .desc = Большой вещмешок для хранения медикаментов. ent-ClothingBackpackDuffelZombieBundle = { ent-ClothingBackpackDuffelSyndicate } .suffix = зомби набор Синдиката .desc = { ent-ClothingBackpackDuffelSyndicate.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl index e6b9e48a6f9..e07eaa6aa19 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl @@ -4,28 +4,40 @@ ent-BoxMagazinePistolCaselessRifle = коробка магазинов с .25 б .desc = Полная коробка магазинов с патронами калибра .25 безгильзовый. ent-BoxMagazinePistolCaselessRiflePractice = коробка магазинов с .25 безгильзовыми (учебными) .desc = Полная коробка магазинов с учебными патронами калибра .25 безгильзовый. +ent-BoxMagazineCaselessRifleRubber = коробка магазинов с .25 безгильзовыми (резиновые) + .desc = Полная коробка магазинов с резиновыми патронами калибра .25 безгильзовый. ent-BoxMagazineLightRifle = коробка магазинов с .30 винтовочными .desc = Полная коробка магазинов с патронами калибра .30 винтовочный. ent-BoxMagazineLightRiflePractice = коробка магазинов с .30 винтовочными (учебными) .desc = Полная коробка магазинов с учебными патронами калибра .30 винтовочный. +ent-BoxMagazineLightRifleRubber = коробка магазинов с .30 винтовочными (резиновые) + .desc = олная коробка магазинов с резиновыми патронами калибра .30 винтовочный. ent-BoxMagazineMagnumSubMachineGun = коробка магазинов Вектор .desc = Полная коробка магазинов с патронами для ПП Вектор. ent-BoxMagazineMagnumSubMachineGunPractice = коробка магазинов Вектор (учебными) .desc = Полная коробка магазинов с учебными патронами для ПП Вектор. +ent-BoxMagazineMagnumSubMachineGunRubber = коробка магазинов Вектор (резиновые) + .desc = Полная коробка магазинов с резиновыми патронами для ПП Вектор. ent-BoxMagazinePistolSubMachineGunTopMounted = коробка магазинов WT550 .35 авто .desc = Полная коробка магазинов с патронами калибра .35 авто для WT550. ent-BoxMagazinePistol = коробка магазинов пистолетных .35 авто .desc = Полная коробка пистолетных магазинов с патронами калибра .35 авто. ent-BoxMagazinePistolPractice = коробка магазинов пистолетных .35 авто (учебные) .desc = Полная коробка пистолетных магазинов с учебными патронами калибра .35 авто. +ent-BoxMagazinePistolRubber = коробка магазинов пистолетных .35 авто (резиновые) + .desc = Полная коробка пистолетных магазинов с резиновыми патронами калибра .35 авто. ent-BoxMagazinePistolHighCapacity = коробка магазинов автопистолетных .35 авто .desc = Полная коробка автопистолетных магазинов с патронами калибра .35 авто. ent-BoxMagazinePistolHighCapacityPractice = коробка магазинов автопистолетных .35 авто (учебные) .desc = Полная коробка автопистолетных магазинов с учебными патронами калибра .35 авто. +ent-BoxMagazinePistolHighCapacityRubber = коробка магазинов автопистолетных .35 авто (резиновые) + .desc = Полная коробка автопистолетных магазинов с резиновыми патронами калибра .35 авто. ent-BoxMagazinePistolSubMachineGun = коробка магазинов для ПП .35 авто .desc = Полная коробка магазинов для ПП с патронами калибра .35 авто. ent-BoxMagazinePistolSubMachineGunPractice = коробка магазинов для ПП .35 авто (учебные) .desc = Полная коробка магазинов для ПП с учебными патронами калибра .35 авто. +ent-BoxMagazinePistolSubMachineGunRubber = коробка магазинов для ПП .35 авто (онзиновые) + .desc = Полная коробка магазинов для ПП с резиновыми патронами калибра .35 авто. ent-BoxMagazineShotgun = коробка барабанов (.50 дробь) .desc = Полная коробка барабанов с патронами .50 дробь. ent-BoxMagazineShotgunBeanbag = коробка барабанов (.50 травматические) @@ -38,3 +50,5 @@ ent-BoxMagazineRifle = коробка магазинов с .20 винтовоч .desc = Полная коробка магазинов с патронами калибра .20 винтовочный. ent-BoxMagazineRiflePractice = коробка магазинов с .20 винтовочными (учебные) .desc = Полная коробка магазинов с учебными патронами калибра .20 винтовочный. +ent-BoxMagazineRifleRubber = коробка магазинов с .20 винтовочными (резиновые) + .desc = Полная коробка магазинов с резиновыми патронами калибра .20 винтовочный. 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 9c81947cc4b..97cc90cb9f9 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 @@ -6,6 +6,9 @@ ent-BoxSurvivalEngineering = расширенный аварийный запа ent-BoxSurvivalSecurity = аварийный запас .desc = Коробка с базовым набором для выживания. .suffix = СБ +ent-BoxSurvivalBrigmedic = аварийный запас + .desc = Коробка с базовым набором для выживания. + .suffix = МедСБ ent-BoxSurvivalMedical = аварийный запас .desc = Коробка с базовым набором для выживания. .suffix = Медицинский 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 d26d795b5ef..0fd893958fe 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 @@ -51,6 +51,8 @@ ent-BoxEncryptionKeyService = коробка ключей шифрования ent-BoxEncryptionKeySyndie = коробка ключей шифрования .suffix = коробка ключей шифрования Синдиката .desc = { ent-BoxEncryptionKeyPassenger.desc } +ent-BoxDeathRattleImplants = коробка имплантеров Предсмертный хрип + .desc = Коробка, содержащая достаточное количество имплантов "Предсмертный хрип" на целый отряд. Передаёт сообщение с вашими координатами по радиоканалу Синдиката когда вы попадаете в критическое состояние или погибаете. # Corvax-HiddenDesc-End ent-BoxLeadLined = освинцованная коробка .desc = Эта коробка препятствует распространению радиации. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl index 45675b00a0d..b9c5a60d78b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl @@ -10,6 +10,8 @@ ent-BoxLatexGloves = коробка латексных перчаток .desc = Содержит стерильные латексные перчатки. ent-BoxNitrileGloves = коробка нитриловых перчаток .desc = Содержит стерильные нитриловые перчатки. Лучше латексных. +ent-BoxMouthSwab = коробка стерильных палочек + .desc = { ent-BoxCardboard.desc } ent-BoxBodyBag = коробка мешков для тел .desc = Содержит мешки для тел. ent-BoxVial = коробка пробирок diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl index ac3b94e048d..8c595909841 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl @@ -3,6 +3,9 @@ ent-ElectricalDisruptionKit = набор отключения электриче .desc = { ent-BoxCardboard.desc } ent-ChemicalSynthesisKit = набор химического синтеза .desc = Стартовый набор начинающего химика, включающий токсин и вестин для всех ваших преступных нужд! +ent-Observationskit = набор слежки + .suffix = Заполненный + .desc = { ent-BoxCardboard.desc } ent-ThrowingKnivesKit = набор метательных ножей .desc = Набор из 4 фирменных метательных ножей Синдиката, идеально подходящих для вонзания в тело жертвы. ent-BoxDeathRattleImplants = коробка имплантеров Предсмертный хрип diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/fun.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/fun.ftl index 3721dfe1c69..89782e64b07 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/fun.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/fun.ftl @@ -38,5 +38,8 @@ ent-CrateFunBikeHornImplants = ящик хонк-имплантов .desc = Тысяча гудков за день отпугнёт СБ на день! ent-CrateFunMysteryFigurines = ящик минифигурок Загадочные космонавты .desc = Коллекция из 10 коробок загадочных минифигурок. Дубликаты возврату не подлежат. +ent-CrateFunSprayPaints = ящик баллончиков с краской + .desc = Ящик заполненный баллончиками с краской. + .suffix = Краска ent-CrateFunDartsSet = набор для дартса .desc = Коробка со всем необходимым для увлекательной игры в дартс. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/service.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/service.ftl index fa619988bbc..5f1b8d79342 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/service.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/service.ftl @@ -28,6 +28,8 @@ ent-CrateServiceBox = ящик коробок .desc = Содержит 6 пустых универсальных коробок. ent-CrateJanitorBiosuit = ящик биозащитных костюмов уборщика .desc = Содержит 2 костюма биологической защиты, чтобы никакая зараза не отвлекала вас от уборки станции. +ent-CrateJanitorExplosive = сапёрный костюм уборщика + .desc = Смывайте калий водой с удовольствием! ent-CrateTrashCartFilled = { ent-CrateTrashCart } .suffix = Заполнен .desc = { ent-CrateTrashCart.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/misc.ftl index b8413b209ef..0623c216eec 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/misc.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/misc.ftl @@ -2,13 +2,13 @@ ent-ClothingShoesBootsCombatFilled = { ent-ClothingShoesBootsCombat } .suffix = Заполненный .desc = { ent-ClothingShoesBootsCombat.desc } ent-ClothingShoesBootsJackFilled = { ent-ClothingShoesBootsJack } - .desc = { ent-ClothingShoesBootsJack.desc } + .desc = { ent-ClothingShoesBootsJack.desc } ent-ClothingShoesBootsWinterSecFilled = { ent-ClothingShoesBootsWinterSec } - .desc = { ent-ClothingShoesBootsWinterSec.desc } + .desc = { ent-ClothingShoesBootsWinterSec.desc } ent-ClothingShoesBootsCowboyBlackFilled = { ent-ClothingShoesBootsCowboyBlack } - .desc = { ent-ClothingShoesBootsCowboyBlack.desc } + .desc = { ent-ClothingShoesBootsCowboyBlack.desc } ent-ClothingShoesHighheelBootsFilled = { ent-ClothingShoesHighheelBoots } - .desc = { ent-ClothingShoesHighheelBoots.desc } + .desc = { ent-ClothingShoesHighheelBoots.desc } ent-ClothingShoesBootsMercFilled = { ent-ClothingShoesBootsMerc } .suffix = Заполненный .desc = { ent-ClothingShoesBootsMerc.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/medical.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/medical.ftl index 8e6ed377bd6..996899e8abf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/medical.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/medical.ftl @@ -16,3 +16,6 @@ ent-LockerChemistryFilled = { ent-LockerChemistry } ent-LockerParamedicFilled = { ent-LockerParamedic } .suffix = Заполненный .desc = { ent-LockerParamedic.desc } +ent-LockerParamedicFilledHardsuit = { ent-LockerParamedic } + .suffix = Заполненный, Скафандр + .desc = { ent-LockerParamedic.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/security.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/security.ftl index 14a020a6afe..fddee308584 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/security.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/security.ftl @@ -10,6 +10,9 @@ ent-LockerSecurityFilled = { ent-LockerSecurity } ent-LockerBrigmedicFilled = { ent-LockerBrigmedic } .suffix = Бригмедик, Заполненный .desc = { ent-LockerBrigmedic.desc } +ent-LockerBrigmedicFilledHardsuit = { ent-LockerBrigmedic } + .suffix = Бригмедик, Заполненный, Скафандр + .desc = { ent-LockerBrigmedic.desc } ent-LockerDetectiveFilled = { ent-LockerDetective } .suffix = Заполненный .desc = { ent-LockerDetective.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl index 693552dfd7f..a014be4ffa3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl @@ -52,6 +52,12 @@ ent-SuitStorageCaptain = { ent-SuitStorageBase } ent-SuitStorageSalv = { ent-SuitStorageBase } .suffix = Утилизатор .desc = { ent-SuitStorageBase.desc } +ent-SuitStorageParamedic = { ent-SuitStorageBase } + .suffix = Парамедик + .desc = { ent-SuitStorageBase.desc } +ent-SuitStorageCorpsman = { ent-SuitStorageBase } + .suffix = Бригмедик + .desc = { ent-SuitStorageBase.desc } ent-SuitStorageSyndie = { ent-SuitStorageBase } .suffix = Скафандр Синдикат .desc = { ent-SuitStorageBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/backpack.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/backpack.ftl new file mode 100644 index 00000000000..35508073687 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/backpack.ftl @@ -0,0 +1,4 @@ +ent-ClothingBackpackIAAFilled = { ent-ClothingBackpack } + .desc = { ent-ClothingBackpack.desc } +ent-ClothingBackpackPsychologistFilled = { ent-ClothingBackpackMedical } + .desc = { ent-ClothingBackpackMedical.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/duffelbag.ftl new file mode 100644 index 00000000000..bf39d8f1258 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/duffelbag.ftl @@ -0,0 +1,4 @@ +ent-ClothingBackpackDuffelIAAFilled = { ent-ClothingBackpackDuffel } + .desc = { ent-ClothingBackpackDuffel.desc } +ent-ClothingBackpackDuffelPsychologistFilled = { ent-ClothingBackpackDuffelMedical } + .desc = { ent-ClothingBackpackDuffelMedical.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/satchel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/satchel.ftl new file mode 100644 index 00000000000..b8728031901 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/satchel.ftl @@ -0,0 +1,4 @@ +ent-ClothingBackpackSatchelIAAFilled = { ent-ClothingBackpackSatchel } + .desc = { ent-ClothingBackpackSatchel.desc } +ent-ClothingBackpackSatchelPsychologistFilled = { ent-ClothingBackpackSatchelMedical } + .desc = { ent-ClothingBackpackSatchelMedical.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/command/safe.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/command/safe.ftl index bbaaeaaf606..1635af0abdb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/command/safe.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/command/safe.ftl @@ -1,5 +1,5 @@ ent-SpareIdCabinet = spare id cabinet .desc = There is a small label that reads "For emergency use only". ent-SpareIdCabinetFilled = { ent-SpareIdCabinet } - .suffix = Filled - .desc = { ent-SpareIdCabinet.desc } \ No newline at end of file + .suffix = Filled + .desc = { ent-SpareIdCabinet.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/base_clothingeyes.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/base_clothingeyes.ftl index ab6201cec63..17807bec0e3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/base_clothingeyes.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/base_clothingeyes.ftl @@ -1,7 +1,7 @@ ent-ClothingEyesBase = { ent-Clothing } .desc = { ent-Clothing.desc } ent-ClothingHeadEyeBaseFlippable = { ent-ClothingEyesBase } - .desc = { ent-ClothingEyesBase.desc } + .desc = { ent-ClothingEyesBase.desc } ent-ClothingHeadEyeBaseFlipped = { ent-ClothingHeadEyeBaseFlippable } .suffix = Перевёрнутый .desc = { ent-ClothingHeadEyeBaseFlippable.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl index 4a7ad59472e..8c1a8353601 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl @@ -37,16 +37,16 @@ ent-ClothingEyesGlassesHiddenSecurity = { ent-ClothingEyesGlassesSunglasses } ent-ClothingEyesEyepatchHudMedical = медицинский моновизор .desc = Окуляр с индикатором на стекле, который сканирует гуманоидов в поле зрения и предоставляет точные данные о состоянии их здоровья. Для настоящих патриотов. ent-ClothingEyesEyepatchHudMedicalFlipped = медицинский моновизор - .desc = { ent-ClothingEyesEyepatchHudMedical.desc } + .desc = { ent-ClothingEyesEyepatchHudMedical.desc } ent-ClothingEyesEyepatchHudSecurity = моновизор охраны .desc = Окуляр с индикатором на стекле, который сканирует гуманоидов в поле зрения и предоставляет точные данные об их идентификационном статусе и записях в системе безопасности. Для настоящих патриотов. ent-ClothingEyesEyepatchHudSecurityFlipped = моновизор охраны - .desc = { ent-ClothingEyesEyepatchHudSecurity.desc } + .desc = { ent-ClothingEyesEyepatchHudSecurity.desc } ent-ClothingEyesEyepatchHudBeer = пивной монокуляр .desc = Пара солнцезащитных очков, оснащённых сканером реагентов, а также дающих понимание вязкости жидкости во время движения. Для настоящих патриотов. ent-ClothingEyesEyepatchHudBeerFlipped = пивной монокуляр - .desc = { ent-ClothingEyesEyepatchHudBeer.desc } + .desc = { ent-ClothingEyesEyepatchHudBeer.desc } ent-ClothingEyesEyepatchHudDiag = диагностический моновизор .desc = Окуляр с индикатором на стекле, способный анализировать целостность и состояние роботов и экзокостюмов. Сделан из си-боргия. ent-ClothingEyesEyepatchHudDiagFlipped = diagnostic hud eyepatch - .desc = { ent-ClothingEyesEyepatchHudDiag.desc } + .desc = { ent-ClothingEyesEyepatchHudDiag.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/misc.ftl index de1197b21a4..5f6ebd8cd87 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/misc.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/misc.ftl @@ -3,5 +3,5 @@ ent-ClothingEyesEyepatch = глазная повязка ent-ClothingEyesBlindfold = повязка на глаза .desc = Полоса непроницаемого материала. ent-ClothingEyesEyepatchFlipped = { ent-ClothingEyesEyepatch } - .suffix = Перевёрнутый - .desc = { ent-ClothingEyesEyepatch.desc } + .suffix = Перевёрнутый + .desc = { ent-ClothingEyesEyepatch.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/colored.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/colored.ftl index ee2d94cb848..ad8caa81140 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/colored.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/colored.ftl @@ -1,3 +1,5 @@ +ent-ClothingHandsGlovesSyntheticBase = { ent-ClothingHandsButcherable } + .desc = { ent-ClothingHandsButcherable.desc } ent-ClothingHandsGlovesColorPurple = фиолетовые перчатки .desc = Обычные фиолетовые перчатки, которые не спасут вас от поджаривания. ent-ClothingHandsGlovesColorRed = красные перчатки diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/helmets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/helmets.ftl index b33d4ccde68..f521d0df2f9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/helmets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/helmets.ftl @@ -16,6 +16,8 @@ ent-ClothingHeadHelmetJanitorBombSuit = сапёрно-уборочный шле .suffix = НЕ МАППИТЬ ent-ClothingHeadHelmetRiot = лёгкий противоударный шлем .desc = Это шлем был специально разработан для защиты в ближнем бою. +ent-ClothingHeadHelmetScaf = шлем СКАФандра + .desc = Робастный крепкий шлем. ent-ClothingHeadHelmetSpaceNinja = шлем космического ниндзя .desc = То, что может показаться простой чёрной одеждой, на самом деле является сложнейшим шлемом с нано-плетением. Стандартное снаряжение ниндзя. ent-ClothingHeadHelmetTemplar = шлем тамплиера diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/misc.ftl index b39cbd55c29..616ceddf020 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/misc.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/misc.ftl @@ -4,6 +4,10 @@ ent-ClothingHeadHatCake = шляпа с тортом .desc = Вы надели торт на голову. Гениально. ent-ClothingHeadHatChickenhead = голова цыплёнка .desc = Это голова цыплёнка. Бок-бок-бок! +ent-ClothingHeadHatFlowerCrown = цветочная корона + .desc = Корона из свежих и ароматных цветов. +ent-ClothingHeadHatHairflower = цветок для волос + .desc = Красный цветок для прекрасных дам. ent-ClothingHeadHatFlowerWreath = цветочный венок .desc = Венок из красочных цветов. Можно носить как на голове, так и на шее. ent-ClothingHeadHatPumpkin = шляпа из тыквы diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/medals.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/medals.ftl index d3af899ae78..6b525541c7a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/medals.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/medals.ftl @@ -1,3 +1,5 @@ +ent-ClothingNeckMedalBase = медаль + .desc = Не доставайся же ты никому. ent-ClothingNeckBronzeheart = медаль бронзовое сердце .desc = Выдаётся членам экипажа за проявленную храбрость перед лицом опасности. ent-ClothingNeckGoldmedal = золотая медаль мастерства экипажа diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/misc.ftl index 69d074097fa..8d31981eb19 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/misc.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/misc.ftl @@ -8,3 +8,5 @@ ent-ClothingNeckLawyerbadge = значок адвоката .desc = Значок, свидетельствующий что владелец является "законным" юристом, сдавшим экзамен Nanotrasen, необходимый для занятия юридической практикой. ent-ActionStethoscope = Прослушать стетоскопом .desc = { "" } +ent-ClothingNeckFlowerWreath = цветочный венок + .desc = Венок из разноцветных цветов. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/armor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/armor.ftl index 823bb577fc9..14ca4712235 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/armor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/armor.ftl @@ -21,6 +21,8 @@ ent-ClothingOuterArmorMagusblue = синие доспехи магуса .desc = Синий бронекостюм, обеспечивающий хорошую защиту. ent-ClothingOuterArmorMagusred = красные доспехи магуса .desc = Красный бронекостюм, обеспечивающий хорошую защиту. +ent-ClothingOuterArmorScaf = СКАФандр + .desc = Надёжный тактический боевой скафандр. ent-ClothingOuterArmorCaptainCarapace = панцирь капитана .desc = Бронированный нагрудник, обеспечивающий защиту и при этом обладающий мобильностью и гибкостью. Выдаётся только лучшим представителям станции. ent-ClothingOuterArmorChangeling = хитиновый панцирь diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl index e62369c82bb..6e79c94870f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl @@ -66,6 +66,26 @@ ent-ClothingOuterWinterSyndieCapArmored = зимняя бронекуртка С .desc = Зимняя бронекуртка Синдиката изготовлено из прочной ткани с позолоченными узорами и грубой шерсти. ent-ClothingOuterWinterSyndie = зимняя куртка Синдиката .desc = Утеплённая зимняя куртка, похожая на товар из "Синдиленда". +ent-ClothingOuterCsCorporateJacket = Корпоративная куртка Cybersun + .desc = Уютная куртка с логотипом Cybersun, напечатанным на спине. Мерч, которым награждаются станции с коэффициентом безопасности, эмм... семь. +ent-ClothingOuterEeCorporateJacket = Корпоративная куртка Einstein Engines + .desc = Уютная куртка с логотипом Einstein Engines, напечатанным на спине. Мерч, которым награждаются станции с коэффициентом безопасности, эмм... семь. +ent-ClothingOuterHiCorporateJacket = Корпоративная куртка Hephaestus Industries + .desc = Уютная куртка с логотипом Hephaestus Industries, напечатанным на спине. Мерч, которым награждаются станции с коэффициентом безопасности, эмм... семь. +ent-ClothingOuterHmCorporateJacket = Корпоративная куртка Hawkmoon Acquisitions + .desc = Уютная куртка с логотипом Hawkmoon Acquisitions, напечатанным на спине. Мерч, которым награждаются станции с коэффициентом безопасности, эмм... семь. +ent-ClothingOuterIdCorporateJacket = Корпоративная куртка Interdyne + .desc = Уютная куртка с логотипом Interdyne, напечатанным на спине. Мерч, которым награждаются станции с коэффициентом безопасности, эмм... семь. +ent-ClothingOuterBcCorporateJacket = Корпоративная куртка Bishop Cybernetics + .desc = Уютная куртка с логотипом Bishop Cybernetics, напечатанным на спине. Мерч, которым награждаются станции с коэффициентом безопасности, эмм... семь. +ent-ClothingOuterDdCorporateJacket = Корпоративная куртка Discount Dan's + .desc = Уютная куртка с логотипом Discount Dan's, напечатанным на спине. Мерч, которым награждаются станции с коэффициентом безопасности, эмм... семь. +ent-ClothingOuterFaCorporateJacket = Корпоративная куртка Five Points Armory + .desc = Уютная куртка с логотипом Five Points Armory, напечатанным на спине. Мерч, которым награждаются станции с коэффициентом безопасности, эмм... семь. +ent-ClothingOuterGeCorporateJacket = Корпоративная куртка Gilthari Exports + .desc = Уютная куртка с логотипом Gilthari Exports, напечатанным на спине. Мерч, которым награждаются станции с коэффициентом безопасности, эмм... семь. +ent-ClothingOuterZhCorporateJacket = Корпоративная куртка Zeng-Hu Pharmaceuticals + .desc = Уютная куртка с логотипом Zeng-Hu Pharmaceuticals, напечатанным на спине. Мерч, которым награждаются станции с коэффициентом безопасности, эмм... семь. ent-ClothingOuterWinterMusician = зимняя куртка музыканта .desc = Безразмерный пластилиновый космический фрак, который заставит людей спрашивать: "Вы меня знаете?". ent-ClothingOuterWinterWeb = паутинная зимняя куртка diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl index 559ef42f67b..30c838ec95e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl @@ -62,6 +62,38 @@ ent-ClothingUniformJumpskirtRoboticist = юбка-комбинезон робо .desc = Стройнящий чёрный цвет и усиленные швы; отлично подходит для работы на производстве. ent-ClothingUniformJumpskirtSec = юбка-комбинезон службы безопасности .desc = Юбка-комбинезон из прочного материала, обеспечивающая надёжную защиту. +ent-ClothingUniformJumpskirtColorGrey = серая юбка-комбинезон + .desc = Изящная серая юбка-комбинезон, которая напоминает вам о старых добрых временах. +ent-ClothingUniformJumpskirtColorBlack = чёрная юбка-комбинезон + .desc = Стандартная чёрная юбка-комбинезон без знаков отличия. +ent-ClothingUniformJumpskirtColorBlue = синяя юбка-комбинезон + .desc = Стандартная синяя юбка-комбинезон без знаков отличия. +ent-ClothingUniformJumpskirtColorGreen = зелёная юбка-комбинезон + .desc = Стандартная зелёная юбка-комбинезон без знаков отличия. +ent-ClothingUniformJumpskirtColorOrange = оранжевая юбка-комбинезон + .desc = Не носите это рядом с параноидальными офицерами службы безопасности. +ent-ClothingUniformJumpskirtColorPink = розовая юбка-комбинезон + .desc = Просто глядя на это, вы чувствуете себя потрясающе. +ent-ClothingUniformJumpskirtColorRed = красная юбка-комбинезон + .desc = Стандартная красная юбка-комбинезон без знаков отличия. +ent-ClothingUniformJumpskirtColorWhite = белая юбка-комбинезон + .desc = Стандартная белая юбка-комбинезон без знаков отличия. +ent-ClothingUniformJumpskirtColorYellow = жёлтая юбка-комбинезон + .desc = Стандартная жёлтая юбка-комбинезон без знаков отличия. +ent-ClothingUniformJumpskirtColorDarkBlue = тёмно-синяя юбка-комбинезон + .desc = Стандартная тёмно-синяя юбка-комбинезон без знаков отличия. +ent-ClothingUniformJumpskirtColorTeal = бирюзовая юбка-комбинезон + .desc = Стандартная бирюзовая юбка-комбинезон без знаков отличия. +ent-ClothingUniformJumpskirtColorPurple = фиолетовая юбка-комбинезон + .desc = Стандартная фиолетовая юбка-комбинезон без знаков отличия. +ent-ClothingUniformJumpskirtColorDarkGreen = тёмно-зелёная юбка-комбинезон + .desc = Стандартная тёмно-зелёная юбка-комбинезон без знаков отличия. +ent-ClothingUniformJumpskirtColorLightBrown = светло-коричневая юбка-комбинезон + .desc = Стандартная светло-коричневая юбка-комбинезон без знаков отличия. +ent-ClothingUniformJumpskirtColorBrown = коричневая юбка-комбинезон + .desc = Стандартная коричневая юбка-комбинезон без знаков отличия. +ent-ClothingUniformJumpskirtColorMaroon = бордовая юбка-комбинезон + .desc = Стандартная бордовая юбка-комбинезон без знаков отличия. ent-ClothingUniformJumpskirtWarden = униформа смотрителя .desc = Формальный костюм службы безопасности для офицеров в комплекте с пряжкой для ремня Nanotrasen. ent-ClothingUniformJumpskirtLibrarian = юбка-комбинезон библиотекаря @@ -124,3 +156,5 @@ ent-ClothingUniformJumpskirtCasualRed = повседневная красная .desc = Свободная потёртая красная рубашка с серой юбкой - идеальный вариант для тех, кто хочет расслабиться. ent-ClothingUniformJumpskirtOldDress = старое платье .desc = Очень старое поношенное платье. +ent-ClothingUniformColorRainbow = радужная юбка-комбинезон + .desc = Носи радугу с собой. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl index 305b1fac044..0b3a486e2e5 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl @@ -102,6 +102,40 @@ ent-ClothingUniformJumpsuitSecBlue = голубая рубашка и галст .desc = Я сейчас немного занят, Калхаун. ent-ClothingUniformJumpsuitSecGrey = серый комбинезон службы безопасности .desc = Пережиток прошлых лет, они использовались до того, как в Nanotrasen решили, что дешевле красить костюмы в красный цвет вместо того, чтобы смывать кровь. +ent-ClothingUniformJumpsuitColorGrey = grey jumpsuit + .desc = A tasteful grey jumpsuit that reminds you of the good old days. +ent-ClothingUniformJumpsuitColorBlack = black jumpsuit + .desc = A generic black jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorBlue = blue jumpsuit + .desc = A generic blue jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorGreen = green jumpsuit + .desc = A generic green jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorOrange = orange jumpsuit + .desc = Don't wear this near paranoid security officers. +ent-ClothingUniformJumpsuitColorPink = pink jumpsuit + .desc = Just looking at this makes you feel fabulous. +ent-ClothingUniformJumpsuitColorRed = red jumpsuit + .desc = A generic red jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorWhite = white jumpsuit + .desc = A generic white jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorYellow = yellow jumpsuit + .desc = A generic yellow jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorDarkBlue = dark blue jumpsuit + .desc = A generic dark blue jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorTeal = teal jumpsuit + .desc = A generic teal jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorPurple = purple jumpsuit + .desc = A generic purple jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorDarkGreen = dark green jumpsuit + .desc = A generic dark green jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorLightBrown = light brown jumpsuit + .desc = A generic light brown jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorBrown = brown jumpsuit + .desc = A generic brown jumpsuit with no rank markings. +ent-ClothingUniformJumpsuitColorMaroon = maroon jumpsuit + .desc = A generic maroon jumpsuit with no rank markings. +ent-ClothingUniformColorRainbow = rainbow jumpsuit + .desc = A multi-colored jumpsuit! ent-ClothingUniformJumpsuitWarden = униформа смотрителя .desc = Формальный костюм службы безопасности для офицеров в комплекте с пряжкой для ремня Nanotrasen. ent-ClothingUniformOveralls = комбинезон на лямках diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/random_suit.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/random_suit.ftl index 2a52bbbe7be..8ce3ec26993 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/random_suit.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/random_suit.ftl @@ -5,6 +5,8 @@ ent-ClothingRandomSpawner = случайный яркий костюм .desc = { ent-ClothingUniformRandom.desc } ent-ClothingUniformRandomArmless = яркий костюм с безрукавкой .desc = { ent-ClothingUniformRandom.desc } +ent-ClothingUniformRandomStandart = разноцветный костюм + .desc = { ent-ClothingUniformRandom.desc } ent-ClothingUniformRandomStandard = яркий костюм .desc = { ent-ClothingUniformRandom.desc } ent-ClothingUniformRandomBra = яркий костюм с бюстгальтером diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/effects/rcd.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/effects/rcd.ftl index 37a7e669feb..daf1eb630ed 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/effects/rcd.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/effects/rcd.ftl @@ -1,3 +1,5 @@ +ent-EffectRCDConstruction = { "" } + .desc = { "" } ent-EffectRCDBase = { "" } .desc = { "" } ent-EffectRCDDeconstructPreview = { ent-EffectRCDBase } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/ghost_roles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/ghost_roles.ftl index 8e20783db01..adda5657bd5 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/ghost_roles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/ghost_roles.ftl @@ -14,14 +14,18 @@ ent-SpawnPointGhostNukeOperative = спавнер роли призрак .desc = { ent-MarkerBase.desc } ent-SpawnPointLoneNukeOperative = { ent-BaseAntagSpawner } .desc = { ent-BaseAntagSpawner.desc } + .suffix = loneops ent-SpawnPointNukeopsCommander = { ent-SpawnPointLoneNukeOperative } .desc = { ent-SpawnPointLoneNukeOperative.desc } +ent-SpawnPointGhostTerminator = спавнер терминатор + .desc = { ent-MarkerBase.desc } ent-SpawnPointNukeopsMedic = { ent-SpawnPointLoneNukeOperative } .desc = { ent-SpawnPointLoneNukeOperative.desc } ent-SpawnPointNukeopsOperative = { ent-SpawnPointLoneNukeOperative } .desc = { ent-SpawnPointLoneNukeOperative.desc } ent-SpawnPointGhostDragon = { ent-BaseAntagSpawner } .desc = { ent-BaseAntagSpawner.desc } + .suffix = dragon ent-SpawnPointGhostSpaceNinja = спавнер роли призрак .suffix = Космический ниндзя .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl index b0d047898f2..d360be28654 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl @@ -53,12 +53,16 @@ ent-SpawnPointHeadOfPersonnel = глава персонала .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointChiefEngineer = старший инженер .desc = { ent-SpawnPointJobBase.desc } +ent-SpawnPointSeniorEngineer = старший инженер + .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointStationEngineer = инженер .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointAtmos = атмосферный техник .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointChiefMedicalOfficer = главный врач .desc = { ent-SpawnPointJobBase.desc } +ent-SpawnPointSeniorPhysician = старший врач + .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointMedicalDoctor = врач .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointParamedic = парамедик @@ -67,12 +71,16 @@ ent-SpawnPointChemist = химик .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointResearchDirector = научный руководитель .desc = { ent-SpawnPointJobBase.desc } +ent-SpawnPointSeniorResearcher = старший учёный + .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointScientist = учёный .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointHeadOfSecurity = глава службы безопасности .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointWarden = смотритель .desc = { ent-SpawnPointJobBase.desc } +ent-SpawnPointSeniorOfficer = сташрий офицер + .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointSecurityOfficer = офицер СБ .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointDetective = детектив diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl index 051e9e16b3e..e2c4a091ca4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl @@ -8,6 +8,8 @@ ent-SpawnMobCorgi = спавнер корги .desc = { ent-MarkerBase.desc } ent-SpawnMobPossumMorty = спавнер опоссум Морти .desc = { ent-MarkerBase.desc } +ent-SpawnMobDrone = спавнер дрона + .desc = { ent-MarkerBase.desc } ent-SpawnMobRaccoonMorticia = спавнер енот Мортиша .desc = { ent-MarkerBase.desc } ent-SpawnMobCatRuntime = спавнер кот Рантайм diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl index d6fbec371b1..b351f4678d9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl @@ -1,5 +1,19 @@ ent-MobXeno = Бурильщик .desc = Обычно они приходят ночью. Обычно. +ent-MobXenoPraetorianNPC = Преторианец + .desc = { ent-MobXeno.desc } +ent-MobXenoDroneNPC = Дрон + .desc = { ent-MobXeno.desc } +ent-MobXenoQueenNPC = Королева + .desc = { ent-MobXeno.desc } +ent-MobXenoRavagerNPC = Разрушитель + .desc = { ent-MobXeno.desc } +ent-MobXenoRunnerNPC = Бегун + .desc = { ent-MobXeno.desc } +ent-MobXenoRounyNPC = Руни + .desc = { ent-MobXenoRunnerNPC.desc } +ent-MobXenoSpitterNPC = Плевальщик + .desc = { ent-MobXeno.desc } ent-MobXenoPraetorian = Преторианец .desc = { ent-MobXeno.desc } ent-MobXenoDrone = Дрон diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/terminator.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/terminator.ftl index f51c4b06e8e..e1442f0d556 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/terminator.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/terminator.ftl @@ -1,6 +1,6 @@ ent-MobTerminatorBase = { "" } .desc = { "" } ent-MobHumanTerminator = exterminator - .desc = { ent-MobHuman.desc } + .desc = { ent-MobHuman.desc } ent-MobTerminatorEndoskeleton = nt-800 "exterminator" endoskeleton .desc = The inner powerhouse of Susnet's infiltrator androids. Ridiculously hard alloy on the inside, unassuming flesh on the outside. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl index cf0f34d0b58..43ffd39c5c8 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl @@ -1,12 +1,12 @@ -ent-DrinkBottleBaseEmpty = base empty bottle +ent-DrinkBottleBaseEmpty = пустая бутылка .desc = Пустая бутылка. .suffix = Пустой -ent-DrinkBottleBaseSmallEmpty = base empty bottle +ent-DrinkBottleBaseSmallEmpty = пустая бутылка .desc = { ent-DrinkBottleBaseEmpty.desc } -ent-DrinkCartonBaseEmpty = base empty carton +ent-DrinkCartonBaseEmpty = пустая пачка .desc = Пустая упаковка. .suffix = Пустой -ent-DrinkCartonBaseLargeEmpty = base empty bottle +ent-DrinkCartonBaseLargeEmpty = пустая бутылка .desc = { ent-DrinkCartonBaseEmpty.desc } ent-DrinkBottleAbsinthe = бутылка от Джейлбрейк Верте .desc = { ent-DrinkBottleBaseEmpty.desc } @@ -16,6 +16,8 @@ ent-DrinkBottleAle = бутылка от эля .desc = { ent-DrinkBottleBaseSmallEmpty.desc } ent-DrinkBottleBeer = пивная бутылка .desc = { ent-DrinkBottleBaseSmallEmpty.desc } +ent-DrinkBottleGoldschlager = бутылка гольдшлягера + .desc = { ent-DrinkBottleBaseEmpty.desc } ent-DrinkBottleCognac = бутылка от коньяка .desc = { ent-DrinkBottleBaseEmpty.desc } ent-DrinkBottleGin = бутылка от джина Гриффитер diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl index 4748cd023d1..516eebaedba 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl @@ -78,6 +78,10 @@ ent-FoodOnionSlice = ломтик лука .desc = Не о чем плакать. ent-FoodOnionRedSlice = ломтик красного лука .desc = Фиолетовый, несмотря на название. +ent-FoodChili = чили + .desc = Обжигающе остро, лучше не подносить к глазам. +ent-FoodChilly = перец чили + .desc = Леденяще жарко. ent-FoodChiliPepper = перец чили .desc = Острый, лучше не трогать глаза. ent-FoodChillyPepper = перец чилли diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl index b80ceb1c937..29890d12c33 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl @@ -28,6 +28,8 @@ ent-VaccinatorMachineCircuitboard = вакцинатор (машинная пл .desc = { ent-BaseMachineCircuitboard.desc } ent-DiagnoserMachineCircuitboard = диагностировщик заболеваний (машинная плата) .desc = { ent-BaseMachineCircuitboard.desc } +ent-TraversalDistorterMachineCircuitboard = искажающая машина (машинная плата) + .desc = Печатная плата для искажающей машины. ent-ArtifactAnalyzerMachineCircuitboard = анализатор артефактов (машинная плата) .desc = Печатная плата для анализатора артефактов. ent-ArtifactCrusherMachineCircuitboard = дробитель артефактов (машинная плата) @@ -146,6 +148,16 @@ ent-SodaDispenserMachineCircuitboard = раздатчик безалкоголя .desc = Печатная плата раздатчика безалкоголя. ent-TelecomServerCircuitboard = телекоммуникационный сервер (машинная плата) .desc = Печатная плата телекоммуникационного сервера. +ent-ShuttleGunSvalinnMachineGunCircuitboard = пулемёт "Свалинн" (машинная плата) + .desc = Печатная плата для пулемёта "Свалинн" LSE-400c. +ent-ShuttleGunPerforatorCircuitboard = перфоратор (машинная плата) + .desc = Печатная плата для перфоратора LSE-1200c. +ent-ShuttleGunFriendshipCircuitboard = "Дружба" (машинная плата) + .desc = Печатная плата для оружия "Дружба" EXP-320g. +ent-ShuttleGunDusterCircuitboard = "Дастер" (машинная плата) + .desc = Печатная плата для оружия "Дастер" EXP-2100g. +ent-ShuttleGunKineticCircuitboard = дематериализатор материи (машинная плата) + .desc = Печатная плата для дематериализатора материи PTK-800. ent-SalvageMagnetMachineCircuitboard = магнит обломков (машинная плата) .desc = Печатная плата магнита обломков. ent-MiniGravityGeneratorCircuitboard = мини-генератор гравитации (машинная плата) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/door_remote.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/door_remote.ftl index 690b6f8d9db..ea8ce7e8e11 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/door_remote.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/door_remote.ftl @@ -16,6 +16,8 @@ ent-DoorRemoteMedical = пульт от шлюзов медотсека .desc = { ent-DoorRemoteDefault.desc } ent-DoorRemoteEngineering = пульт от шлюзов инженерного отдела .desc = { ent-DoorRemoteDefault.desc } +ent-DoorRemoteFirefight = пульт от пожарных шлюзов + .desc = Гаджет, который может открывать и закрывать пожарные шлюзы дистанционно. ent-DoorRemoteAll = супер-пульт от шлюзов .suffix = Адмемы .desc = { ent-DoorRemoteDefault.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl index 2f0b16674f0..5cfcb524a6d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/reinforcement_teleporter.ftl @@ -1,10 +1,14 @@ -# Corvax-HiddenDesc-Start -ent-ReinforcementRadioSyndicate = старое радио +ent-ReinforcementRadioSyndicate = радио подкрепления синдиката .suffix = радио подкрепления Cиндиката - .desc = Винтажное радио с незнакомыми частотами. + .desc = Призовите на помощь агента Синдиката сомнительного качества, мгновенно! Предоставляется только базовое снаряжение. ent-ReinforcementRadioSyndicateNukeops = { ent-ReinforcementRadioSyndicate } .suffix = Радио подкрепления ЯО, Ядерный Оперативник .desc = { ent-ReinforcementRadioSyndicate.desc } +ent-ReinforcementRadioSyndicateMonkey = телепорт обезьяньего подкрепления + .desc = Призывает на помощь специально обученную обезьяну с сигаретой. +ent-ReinforcementRadioSyndicateMonkeyNukeops = { ent-ReinforcementRadioSyndicateMonkey } + .suffix = Ядерные оперативники + .desc = { ent-ReinforcementRadioSyndicateMonkey.desc } ent-ReinforcementRadioSyndicateAncestor = телепорт подкрепления генетическим предком Синдиката .desc = Призывает на помощь специально обученного предка по вашему выбору. ent-ReinforcementRadioSyndicateAncestorNukeops = { ent-ReinforcementRadioSyndicateAncestor } @@ -15,7 +19,4 @@ ent-ReinforcementRadioSyndicateSyndiCat = телепорт подкреплен ent-ReinforcementRadioSyndicateCyborgAssault = { ent-ReinforcementRadioSyndicate } .suffix = радио подкрепления штурмового киборга Синдиката .desc = Призовите хорошо вооружённого штурмового киборга, немедленно! - .suffix = Ядерные оперативники - -# Corvax-HiddenDesc-End - + .suffix = Ядерные оперативники \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/books.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/books.ftl index 997819a514c..e0df85ffa32 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/books.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/books.ftl @@ -29,6 +29,10 @@ ent-BookChemicalCompendium = Химпендиум ent-BookRandom = { ent-BookBase } .desc = Каждая книга уникальна! Что таится в этой? .suffix = Случайная обложка +ent-BookEscalation = Правила эскалации Роберта + .desc = Книга испачкана кровью. Похоже, её использовали больше как оружие, чем как учебное пособие. +ent-BookEscalationSecurity = Правила эскалации Роберта: версия для охраны + .desc = Книга испачкана кровью. Похоже, её использовали больше как оружие, чем как учебное пособие. ent-BookRandomStory = { ent-BookRandom } .desc = { ent-BookRandom.desc } .suffix = Случайная обложка, случайная история diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl index c9a8a36b46c..e5e53ef8432 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl @@ -2,6 +2,9 @@ ent-BriefcaseBase = { ent-BaseStorageItem } .desc = Пригодится для переноски предметов в руках. ent-BriefcaseBrown = коричневый чемодан .desc = { ent-BriefcaseBase.desc } +ent-BriefcaseSyndieBase = { ent-BriefcaseBase } + .desc = Пригодится для переноски предметов в руках. + .suffix = Синдикат, Пустой ent-BriefcaseSyndie = { ent-BriefcaseBrown } .suffix = Синдикат, Пустой .desc = { ent-BriefcaseBrown.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl index 84755ea946f..2fc3ef8330c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/paper.ftl @@ -21,6 +21,20 @@ ent-NukeCodePaper = коды ядерной аутентификации ent-NukeCodePaperStation = { ent-NukeCodePaper } .suffix = Только станция .desc = { ent-NukeCodePaper.desc } +ent-Pen = ручка + .desc = Ручка с тёмными чернилами. +ent-PenEmbeddable = { ent-Pen } + .desc = { ent-Pen.desc } +ent-LuxuryPen = роскошная ручка + .desc = Дорогая и изысканная ручка, которую можно заслужить только если вы способны справляться с огромным количеством бумажной работы. +ent-CyberPen = ручка Cybersun + .desc = Высокотехнологичная ручка прямо из юридического отдела Cybersun, способная преломлять твёрдый свет под невозможными углами через свой алмазный наконечник для письма. Настолько мощная, что она даже способна переписывать официально заверенные документы при необходимости. +ent-PenCap = капитанская перьевая ручка + .desc = Роскошная перьевая ручка для капитана станции. +ent-PenCentcom = ручка Центком + .desc = В попытке не отставать от "мощи" бюрократии Cybersun, NT создала реплику ручки Cybersun в своём корпоративном стиле. +ent-PenHop = перьевая ручка главы персонала + .desc = Роскошная перьевая ручка для главы персонала станции. ent-BoxFolderBase = папка .desc = Папка, заполненная совершенно секретными документами. ent-BoxFolderRed = { ent-BoxFolderBase } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl index ff70375f3e0..5228066eda2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl @@ -2,11 +2,20 @@ ent-MopItem = швабра .desc = Швабра, которую невозможно остановить, viscera cleanup detail ждёт вас. ent-AdvMopItem = продвинутая швабра .desc = Моторизованная швабра с увеличенным резервуаром и возможностью уборки нескольких луж одновременно. Система автоматического противодействия клоунам в комплект не входит. +ent-MopBucket = ведро для швабры + .desc = Содержит воду и слёзы уборщика. +ent-MopBucketFull = ведро для швабры + .suffix = полное + .desc = { ent-MopBucket.desc } ent-WetFloorSign = знак "мокрый пол" .desc = Осторожно! Мокрый пол! ent-WetFloorSignMineExplosive = { ent-WetFloorSign } .desc = { ent-WetFloorSign.desc } .suffix = Взрывчатка +ent-JanitorialTrolley = уборочная тележка + .desc = Альфа и Омега клининговых технологий. +ent-FloorDrain = слив + .desc = Стягивает лужи вокруг себя. Пригодится для выливания ведер со швабрами или для поддержания чистоты в определенных помещениях. ent-Plunger = вантуз .desc = Вантуз с красной пластиковой присоской и деревянной ручкой. Используется для прочистки засоров. ent-RagItem = тряпка diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/handheld_crew_monitor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/handheld_crew_monitor.ftl index 0363477e978..3d15d0c7705 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/handheld_crew_monitor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/handheld_crew_monitor.ftl @@ -4,3 +4,13 @@ ent-HandheldCrewMonitor = портативный монитор экипажа ent-HandheldCrewMonitorEmpty = { ent-HandheldCrewMonitor } .suffix = Пустой .desc = { ent-HandheldCrewMonitor.desc } +ent-SpyCrewMonitor = шпионский монитор экипажа + .desc = Шпионское устройство, способное подключаться к серверам мониторинга экипажа. +ent-SpyCrewMonitorEmpty = { ent-SpyCrewMonitor } + .suffix = Пустой + .desc = { ent-SpyCrewMonitor.desc } +ent-SyndiCrewMonitor = синдикатовский монитор экипажа + .desc = Синдицированная версия портативного монитора экипажа, перехватывает информацию с сервера. +ent-SyndiCrewMonitorEmpty = { ent-SyndiCrewMonitor } + .suffix = Пустой + .desc = { ent-SyndiCrewMonitor.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl index 4c627bd5871..ed90fdb2dd9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl @@ -1,3 +1,8 @@ +ent-BodyBag_Container = мешок для тела + .desc = Пластиковый мешок, предназначенный для хранения и транспортировки трупов, и предовтвращения их гниения. +ent-BodyBag_Folded = мешок для тела + .desc = Пластиковый мешок, предназначенный для хранения и транспортировки трупов, и предовтвращения их гниения. + .suffix = Сложенный ent-BodyBag = мешок для тела .desc = Пластиковый мешок, предназначенный для хранения и транспортировки трупов, и предовтвращения их гниения. ent-BodyBagFolded = мешок для тела diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl index 49a83780aca..33ac9fcbb72 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl @@ -4,7 +4,11 @@ ent-MagazineBoxCaselessRifle10x24 = ящик патронов (.25 безгил .desc = { ent-BaseMagazineBoxCaselessRifle.desc } ent-MagazineBoxCaselessRifleBig = ящик патронов (.25 безгильзовые) .desc = { ent-BaseMagazineBoxCaselessRifle.desc } +ent-MagazineBoxCaselessRifleBigRubber = ящик патронов (.25 безгильзовые резиновые) + .desc = { ent-BaseMagazineBoxCaselessRifle.desc } ent-MagazineBoxCaselessRifle = коробка патронов (.25 безгильзовые) .desc = { ent-BaseMagazineBoxCaselessRifle.desc } ent-MagazineBoxCaselessRiflePractice = коробка патронов (.25 безгильзовые учебные) .desc = { ent-BaseMagazineBoxCaselessRifle.desc } +ent-MagazineBoxCaselessRifleRubber = коробка патронов (.25 безгильзовые резиновые) + .desc = { ent-BaseMagazineBoxCaselessRifle.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl index 50a01235a0e..b5a6d8829ab 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl @@ -6,6 +6,8 @@ ent-MagazineBoxLightRifle = коробка патронов (.30 винтово .desc = { ent-BaseMagazineBoxLightRifle.desc } ent-MagazineBoxLightRiflePractice = коробка патронов (.30 винтовочные учебные) .desc = { ent-BaseMagazineBoxLightRifle.desc } +ent-MagazineBoxLightRifleRubber = коробка патронов (.30 винтовочные резиновые) + .desc = { ent-BaseMagazineBoxLightRifle.desc } ent-MagazineBoxLightRifleIncendiary = коробка патронов (.30 винтовочные зажигательные) .desc = { ent-BaseMagazineBoxLightRifle.desc } ent-MagazineBoxLightRifleUranium = коробка патронов (.30 винтовочные урановые) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl index b2c4638b198..461e1cd7d7f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl @@ -4,6 +4,8 @@ ent-MagazineBoxMagnum = коробка патронов (.45 магнум) .desc = { ent-BaseMagazineBoxMagnum.desc } ent-MagazineBoxMagnumPractice = коробка патронов (.45 магнум учебные) .desc = { ent-BaseMagazineBoxMagnum.desc } +ent-MagazineBoxMagnumRubber = коробка патронов (.45 магнум резиновые) + .desc = { ent-BaseMagazineBoxMagnum.desc } ent-MagazineBoxMagnumIncendiary = коробка патронов (.45 магнум зажигательные) .desc = { ent-BaseMagazineBoxMagnum.desc } ent-MagazineBoxMagnumUranium = коробка патронов (.45 магнум урановые) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl index b0fa6bafb8f..b05f22958bb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl @@ -4,6 +4,8 @@ ent-MagazineBoxPistol = коробка патронов (.35 авто) .desc = { ent-BaseMagazineBoxPistol.desc } ent-MagazineBoxPistolPractice = коробка патронов (.35 авто учебные) .desc = { ent-BaseMagazineBoxPistol.desc } +ent-MagazineBoxPistolRubber = коробка патронов (.35 авто резиновые) + .desc = { ent-BaseMagazineBoxPistol.desc } ent-MagazineBoxPistolIncendiary = коробка патронов (.35 авто зажигательные) .desc = { ent-BaseMagazineBoxPistol.desc } ent-MagazineBoxPistolUranium = коробка патронов (.35 авто урановые) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl index a8153cd7c97..028ec76065b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl @@ -2,10 +2,14 @@ ent-BaseMagazineBoxRifle = { ent-BaseItem } .desc = { ent-BaseItem.desc } ent-MagazineBoxRifleBig = ящик патронов (.20 винтовочные) .desc = { ent-BaseMagazineBoxRifle.desc } +ent-MagazineBoxRifleBigRubber = ящик патронов (.20 винтовочные резиновые) + .desc = { ent-BaseMagazineBoxRifle.desc } ent-MagazineBoxRifle = коробка патронов (.20 винтовочные) .desc = { ent-BaseMagazineBoxRifle.desc } ent-MagazineBoxRiflePractice = коробка патронов (.20 винтовочные учебные) .desc = { ent-BaseMagazineBoxRifle.desc } +ent-MagazineBoxRifleRubber = коробка патронов (.20 винтовочные резиновые) + .desc = { ent-BaseMagazineBoxRifle.desc } ent-MagazineBoxRifleIncendiary = коробка патронов (.20 винтовочные зажигательные) .desc = { ent-BaseMagazineBoxRifle.desc } ent-MagazineBoxRifleUranium = коробка патронов (.20 винтовочные урановые) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl index 4c92d8f3360..e231f2ddc9c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl @@ -4,3 +4,5 @@ ent-CartridgeCaselessRifle = патрон (.25 безгильзовый) .desc = { ent-BaseCartridgeCaselessRifle.desc } ent-CartridgeCaselessRiflePractice = патрон (.25 безгильзовый учебный) .desc = { ent-BaseCartridgeCaselessRifle.desc } +ent-CartridgeCaselessRifleRubber = патрон (.25 безгильзовый резиновый) + .desc = { ent-BaseCartridgeCaselessRifle.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl index 0dae7f3df74..6789711a491 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl @@ -4,6 +4,8 @@ ent-CartridgeLightRifle = патрон (.30 винтовочный) .desc = { ent-BaseCartridgeLightRifle.desc } ent-CartridgeLightRiflePractice = патрон (.30 винтовочный учебный) .desc = { ent-BaseCartridgeLightRifle.desc } +ent-CartridgeLightRifleRubber = патрон (.30 винтовочный резиновый) + .desc = { ent-BaseCartridgeLightRifle.desc } ent-CartridgeLightRifleIncendiary = патрон (.30 винтовочный зажигательный) .desc = { ent-BaseCartridgeLightRifle.desc } ent-CartridgeLightRifleUranium = патрон (.30 винтовочный урановый) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl index bb4b596d943..f5de36d52d1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl @@ -4,6 +4,8 @@ ent-CartridgeMagnum = патрон (.45 магнум) .desc = { ent-BaseCartridgeMagnum.desc } ent-CartridgeMagnumPractice = патрон (.45 магнум учебный) .desc = { ent-BaseCartridgeMagnum.desc } +ent-CartridgeMagnumRubber = патрон (.45 магнум резиновые) + .desc = { ent-BaseCartridgeMagnum.desc } ent-CartridgeMagnumIncendiary = патрон (.45 магнум зажигательный) .desc = { ent-BaseCartridgeMagnum.desc } ent-CartridgeMagnumAP = патрон (.45 магнум бронебойный) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl index bc7df8e4ad7..f9dc6386c23 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl @@ -4,6 +4,8 @@ ent-CartridgePistol = патрон (.35 авто) .desc = { ent-BaseCartridgePistol.desc } ent-CartridgePistolPractice = патрон (.35 авто учебный) .desc = { ent-BaseCartridgePistol.desc } +ent-CartridgePistolRubber = патрон (.35 авто резиновый) + .desc = { ent-BaseCartridgePistol.desc } ent-CartridgePistolIncendiary = патрон (.35 авто зажигательный) .desc = { ent-BaseCartridgePistol.desc } ent-CartridgePistolUranium = патрон (.35 авто урановый) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl index 7cf4f9e2cf4..76e01645bc2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl @@ -4,6 +4,8 @@ ent-CartridgeRifle = патрон (.20 винтовочный) .desc = { ent-BaseCartridgeRifle.desc } ent-CartridgeRiflePractice = патрон (.20 винтовочный учебный) .desc = { ent-BaseCartridgeRifle.desc } +ent-CartridgeRifleRubber = патрон (.20 винтовочный резиновый) + .desc = { ent-BaseCartridgeRifle.desc } ent-CartridgeRifleIncendiary = патрон (.20 винтовочный зажигательный) .desc = { ent-BaseCartridgeRifle.desc } ent-CartridgeRifleUranium = патрон (.20 винтовочный урановый) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl index 89fb86450ce..9b6866e9e0f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl @@ -10,11 +10,17 @@ ent-MagazinePistolCaselessRifle = пистолетный магазин (.25 б .desc = { ent-BaseMagazinePistolCaselessRifle.desc } ent-MagazinePistolCaselessRiflePractice = пистолетный магазин (.25 безгильзовые учебные) .desc = { ent-BaseMagazinePistolCaselessRifle.desc } +ent-MagazinePistolCaselessRifleRubber = pistol magazine (.25 безгильзовые резиновые) + .desc = { ent-BaseMagazinePistolCaselessRifle.desc } ent-MagazineCaselessRifle = магазин (.25 безгильзовые) .desc = { ent-BaseMagazineCaselessRifle.desc } ent-MagazineCaselessRiflePractice = магазин (.25 безгильзовые учебные) .desc = { ent-BaseMagazineCaselessRifle.desc } +ent-MagazineCaselessRifleRubber = магазин (.25 безгильзовые резиновые) + .desc = { ent-BaseMagazineCaselessRifle.desc } ent-MagazineCaselessRifleShort = короткий магазин (.25 безгильзовые) .desc = { ent-BaseMagazineCaselessRifleShort.desc } ent-MagazineCaselessRifleShortPractice = короткий магазин (.25 безгильзовые учебные) .desc = { ent-BaseMagazineCaselessRifleShort.desc } +ent-MagazineCaselessRifleShortRubber = короткий магазин (.25 безгильзовые резиновые) + .desc = { ent-BaseMagazineCaselessRifleShort.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl index d00eae98274..79ee70d9234 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl @@ -7,6 +7,8 @@ ent-MagazineLightRifle = магазин (.30 винтовочные) ent-MagazineLightRifleEmpty = магазин (.30 винтовочные любые) .suffix = Пустой .desc = { ent-MagazineLightRifle.desc } +ent-MagazineLightRifleRubber = магазин (.30 винтовочные резиновые) + .desc = { ent-BaseMagazineLightRifle.desc } ent-MagazineLightRiflePractice = магазин (.30 винтовочные учебные) .desc = { ent-BaseMagazineLightRifle.desc } ent-MagazineLightRifleUranium = магазин (.30 винтовочные урановые) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl index 0878b9eeb42..7bef7d772c9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl @@ -7,6 +7,8 @@ ent-MagazineMagnumEmpty = пистолетный магазин (.45 магну .desc = { ent-BaseMagazineMagnum.desc } ent-MagazineMagnum = пистолетный магазин (.45 магнум) .desc = { ent-BaseMagazineMagnum.desc } +ent-MagazineMagnumRubber = пистолетный магазин (.45 магнум резиновые) + .desc = { ent-BaseMagazineMagnum.desc } ent-MagazineMagnumPractice = пистолетный магазин (.45 магнум учебные) .desc = { ent-BaseMagazineMagnum.desc } ent-MagazineMagnumUranium = пистолетный магазин (.45 магнум урановые) @@ -16,6 +18,8 @@ ent-MagazineMagnumAP = пистолетный магазин (.45 магнум ent-MagazineMagnumSubMachineGunEmpty = магазин Вектора (.45 магнум любые) .suffix = Пустой .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } +ent-MagazineMagnumSubMachineGunRubber = магазин Вектора (.45 магнум резиновые) + .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } ent-MagazineMagnumSubMachineGun = магазин Вектора (.45 магнум) .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } ent-MagazineMagnumSubMachineGunPractice = магазин Вектора (.45 магнум учебные) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl index a7c7f816690..6cb179b70ec 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl @@ -10,6 +10,8 @@ ent-MagazinePistolSubMachineGunTopMountedEmpty = магазин WT550 (.35 ав .desc = { ent-MagazinePistolSubMachineGunTopMounted.desc } ent-MagazinePistol = пистолетный магазин (.35 авто) .desc = { ent-BaseMagazinePistol.desc } +ent-MagazinePistolRubber = пистолетный магазин (.35 авто резиновые) + .desc = { ent-BaseMagazinePistol.desc } ent-MagazinePistolEmpty = пистолетный магазин (.35 авто любые) .suffix = Пустой .desc = { ent-MagazinePistol.desc } @@ -22,6 +24,8 @@ ent-MagazinePistolUranium = пистолетный магазин (.35 авто ent-MagazinePistolHighCapacityEmpty = автопистолетный магазин (.35 авто любые) .suffix = Пустой .desc = { ent-BaseMagazinePistolHighCapacity.desc } +ent-MagazinePistolSubMachineGunRubber = автопистолетный магазин (.35 авто резиновые) + .desc = { ent-BaseMagazinePistolSubMachineGun.desc } ent-MagazinePistolHighCapacity = автопистолетный магазин (.35 авто) .desc = { ent-BaseMagazinePistolHighCapacity.desc } ent-MagazinePistolHighCapacityPractice = автопистолетный магазин (.35 авто учебные) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl index 50ccb9df8dd..31d371180cc 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl @@ -5,6 +5,8 @@ ent-MagazineRifle = магазин (.20 винтовочные) ent-MagazineRifleEmpty = магазин (.20 винтовочные любые) .suffix = Пустой .desc = { ent-MagazineRifle.desc } +ent-MagazineRifleRubber = магазин (.20 винтовочные резиновые) + .desc = { ent-BaseMagazineRifle.desc } ent-MagazineRifleIncendiary = магазин (.20 винтовочные зажигательные) .desc = { ent-MagazineRifle.desc } ent-MagazineRiflePractice = магазин (.20 винтовочные учебные) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/caseless_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/caseless_rifle.ftl index 890cffedd23..8bbac046f90 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/caseless_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/caseless_rifle.ftl @@ -2,3 +2,5 @@ ent-BulletCaselessRifle = пуля (.25 безгильзовая) .desc = { ent-BaseBullet.desc } ent-BulletCaselessRiflePractice = пуля (.25 безгильзовая учебная) .desc = { ent-BaseBulletPractice.desc } +ent-BulletCaselessRifleRubber = пуля (.25 безгильзовая резиновая) + .desc = { ent-BaseBulletRubber.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/light_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/light_rifle.ftl index 334ace81f86..1dac7777d47 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/light_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/light_rifle.ftl @@ -2,6 +2,8 @@ ent-BulletLightRifle = пуля (.20 винтовочная) .desc = { ent-BaseBullet.desc } ent-BulletLightRiflePractice = пуля (.20 винтовочная учебная) .desc = { ent-BaseBulletPractice.desc } +ent-BulletLightRifleRubber = пуля (.20 винтовочная резиновая) + .desc = { ent-BaseBulletRubber.desc } ent-BulletLightRifleIncendiary = пуля (.20 винтовочная зажигательная) .desc = { ent-BaseBulletIncendiary.desc } ent-BulletLightRifleUranium = пуля (.20 винтовочная урановая) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/magnum.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/magnum.ftl index c4eed302cdb..00f5943114d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/magnum.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/magnum.ftl @@ -2,6 +2,8 @@ ent-BulletMagnum = пуля (.45 магнум) .desc = { ent-BaseBullet.desc } ent-BulletMagnumPractice = пуля (.45 магнум учебная) .desc = { ent-BaseBulletPractice.desc } +ent-BulletMagnumRubber = пуля (.45 магнум резиновая) + .desc = { ent-BaseBulletRubber.desc } ent-BulletMagnumIncendiary = пуля (.45 магнум зажигательная) .desc = { ent-BaseBulletIncendiary.desc } ent-BulletMagnumAP = пуля (.45 магнум бронебойная) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/pistol.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/pistol.ftl index ac1274f3554..9b0ff24bbdd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/pistol.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/pistol.ftl @@ -2,6 +2,8 @@ ent-BulletPistol = пуля (.35 авто) .desc = { ent-BaseBullet.desc } ent-BulletPistolPractice = пуля (.35 авто учебная) .desc = { ent-BaseBulletPractice.desc } +ent-BulletPistolRubber = пуля (.35 авто резиновая) + .desc = { ent-BaseBulletRubber.desc } ent-BulletPistolIncendiary = пуля (.35 авто зажигательная) .desc = { ent-BaseBulletIncendiary.desc } ent-BulletPistolUranium = пуля (.35 авто урановая) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/rifle.ftl index d04ec2c8c4a..3f4edb90f21 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/rifle.ftl @@ -2,6 +2,8 @@ ent-BulletRifle = пуля (0.20 винтовочная) .desc = { ent-BaseBullet.desc } ent-BulletRiflePractice = пуля (0.20 винтовочная учебная) .desc = { ent-BaseBulletPractice.desc } +ent-BulletRifleRubber = пуля (0.20 винтовочная резиновая) + .desc = { ent-BaseBulletRubber.desc } ent-BulletRifleIncendiary = пуля (0.20 винтовочная зажигательная) .desc = { ent-BaseBulletIncendiary.desc } ent-BulletRifleUranium = пуля (0.20 винтовочная урановая) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl index 0f1e6a0e54f..e90d8796025 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl @@ -4,6 +4,8 @@ ent-SpeedLoaderMagnum = спидлоадер (.45 магнум) .desc = { ent-BaseSpeedLoaderMagnum.desc } ent-SpeedLoaderMagnumEmpty = спидлоадер (.45 магнум любые) .desc = { ent-SpeedLoaderMagnum.desc } +ent-SpeedLoaderMagnumRubber = спидлоадер (.45 магнум резиновые) + .desc = { ent-BaseSpeedLoaderMagnum.desc } ent-SpeedLoaderMagnumIncendiary = спидлоадер (.45 магнум зажигательные) .desc = { ent-SpeedLoaderMagnum.desc } ent-SpeedLoaderMagnumPractice = спидлоадер (.45 магнум учебные) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/pistol.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/pistol.ftl index 57c166eeb4d..85daea7ec08 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/pistol.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/pistol.ftl @@ -4,3 +4,5 @@ ent-SpeedLoaderPistol = спидлоадер (.35 авто) .desc = { ent-BaseSpeedLoaderPistol.desc } ent-SpeedLoaderPistolPractice = спидлоадер (.35 авто учебные) .desc = { ent-BaseSpeedLoaderPistol.desc } +ent-SpeedLoaderPistolRubber = спидлоадер (.35 авто резиновые) + .desc = { ent-BaseSpeedLoaderPistol.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl index bea12278be2..52185a265f0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl @@ -1,4 +1,4 @@ -ent-BaseWeaponPistol = BasePistol +ent-BaseWeaponPistol = Пистоль .desc = Дерзай — налетай, целься и стреляй. ent-WeaponPistolViper = Гадюка .desc = Небольшой, легко скрываемый, но маломощный пистолет. Оснащён полностью автоматическим ресивером. Использует патроны калибра .35 авто. @@ -9,5 +9,11 @@ ent-WeaponPistolCobra = Кобра ent-WeaponPistolMk58 = МК 58 .desc = Дешёвый и распространённый пистолет, производимый дочерней компанией Nanotrasen. Использует патроны калибра .35 авто. .suffix = Пистолет +ent-WeaponPistolMk58Nonlethal = { ent-WeaponPistolMk58 } + .suffix = Травматическое + .desc = { ent-WeaponPistolMk58.desc } ent-WeaponPistolN1984 = N1984 .desc = Запасное оружие любого уважающего себя офицера. Выпускается в калибре .45 магнум, самом богоугодном калибре. +ent-WeaponPistolN1984Nonlethal = N1984 + .suffix = Травматическое + .desc = { ent-WeaponPistolN1984.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl index ff030b90d53..a8e4281371f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl @@ -1,16 +1,18 @@ ent-MuzzleFlashEffect = { "" } .desc = { "" } -ent-BaseBullet = BaseBullet +ent-BaseBullet = Пуля .desc = Если вы можете видеть это, вы вероятно мертвы! ent-BaseBulletTrigger = { ent-BaseBullet } .desc = { ent-BaseBullet.desc } ent-BaseBulletPractice = базовая пуля учебная .desc = { ent-BaseBullet.desc } +ent-BaseBulletRubber = base bullet rubber + .desc = { ent-BaseBullet.desc } ent-BaseBulletIncendiary = базовая пуля зажигательная .desc = { ent-BaseBullet.desc } ent-BaseBulletAP = базовая пуля бронебойная .desc = { ent-BaseBullet.desc } -ent-BaseBulletUranium = base bullet uranium +ent-BaseBulletUranium = базовая пуля урановая .desc = { ent-BaseBullet.desc } ent-BulletTaser = заряд тазера .desc = { ent-BaseBullet.desc } @@ -72,6 +74,8 @@ ent-BulletCannonBall = пушечное ядро .desc = { ent-BaseBulletTrigger.desc } ent-GrapplingHook = якорь .desc = { "" } +ent-BulletEnergyGunLaser = энергетический заряд + .desc = { ent-BaseBullet.desc } ent-BulletDisablerSmg = заряд станнера-пулемёта .desc = { ent-BaseBullet.desc } ent-TeslaGunBullet = молния Тесла-пушки diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl index e63f8527006..25479c95952 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl @@ -9,3 +9,6 @@ ent-WeaponRifleM90GrenadeLauncher = М-90gl ent-WeaponRifleLecter = Лектер .desc = Первоклассная армейская штурмовая винтовка. Использует патроны калибра .20 винтовочный. .suffix = Автомат +ent-WeaponRifleLecterRubber = Лектер + .suffix = Травматический + .desc = { ent-WeaponRifleLecter.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl index 65eade1b702..60b4de0cece 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl @@ -14,3 +14,9 @@ ent-WeaponSubMachineGunVector = Вектор ent-WeaponSubMachineGunWt550 = WT550 .desc = Отличный пистолет-пулемёт, производства NanoTrasen's Small Arms Division. Использует патроны калибра .35 авто. .suffix = Пистолет-пулемёт +ent-WeaponSubMachineGunDrozdRubber = Дрозд + .suffix = Травматический + .desc = { ent-WeaponSubMachineGunDrozd.desc } +ent-WeaponSubMachineGunVectorRubber = Вектор + .desc = Превосходный тяжёлый пистолет-пулемёт. Использует патроны калибра .45 магнум. + .suffix = Травматический diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/stations/base.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/stations/base.ftl index e89548db24d..66df932d75a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/stations/base.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/stations/base.ftl @@ -12,6 +12,8 @@ ent-BaseStationArrivals = { "" } .desc = { "" } ent-BaseStationGateway = { "" } .desc = { "" } +ent-BaseStationShuttlesCore = { "" } + .desc = { "" } ent-BaseStationShuttles = { "" } .desc = { "" } ent-BaseStationCentcomm = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/dispensers/soda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/dispensers/soda.ftl index de2606cd3c7..3ed1c8f2428 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/dispensers/soda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/dispensers/soda.ftl @@ -1,3 +1,6 @@ +ent-soda_dispenser = раздатчик безалкоголя + .desc = Разливочный автомат с ассортиментом из газировки и ряда других популярных напитков. Имеет один слот для ёмкостей. + .suffix = Заполненный ent-SodaDispenser = раздатчик безалкоголя .desc = Разливочный автомат с ассортиментом из газировки и ряда других популярных напитков. Имеет один слот для ёмкостей. .suffix = Заполненный 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 ccb5722a617..f49e568f7b4 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 @@ -22,6 +22,9 @@ ent-AirlockBarLocked = { ent-AirlockServiceLocked } ent-AirlockHydroponicsLocked = { ent-AirlockServiceLocked } .suffix = Гидропоника, Закрыт .desc = { ent-AirlockServiceLocked.desc } +ent-AirlockServiceCaptainLocked = { ent-Airlock } + .suffix = Капитан, Закрыт + .desc = { ent-Airlock.desc } ent-AirlockExternalLocked = { ent-AirlockExternal } .suffix = Внешний, Закрыт .desc = { ent-AirlockExternal.desc } @@ -67,6 +70,9 @@ ent-AirlockMiningLocked = { ent-AirlockMining } ent-AirlockMedicalLocked = { ent-AirlockMedical } .suffix = Медицинский, Закрыт .desc = { ent-AirlockMedical.desc } +ent-AirlockParamedicLocked = { ent-AirlockMedical } + .suffix = Парамедик, Закрыт + .desc = { ent-AirlockMedical.desc } ent-AirlockVirologyLocked = { ent-AirlockVirology } .suffix = Вирусология, Закрыт .desc = { ent-AirlockVirology.desc } @@ -187,6 +193,9 @@ ent-AirlockSalvageGlassLocked = { ent-AirlockCargoGlass } ent-AirlockMiningGlassLocked = { ent-AirlockMiningGlass } .suffix = Шахтёрский(Утилизаторский), Закрыт .desc = { ent-AirlockMiningGlass.desc } +ent-AirlockParamedicGlassLocked = { ent-AirlockMedicalGlass } + .suffix = Парамедик, Закрыт + .desc = { ent-AirlockMedicalGlass.desc } ent-AirlockChemistryGlassLocked = { ent-AirlockChemistryGlass } .suffix = Химия, Закрыт .desc = { ent-AirlockChemistryGlass.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl index c2ad311460c..f49f0267f33 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl @@ -43,6 +43,8 @@ ent-AirlockHatch = герметичный люк .desc = { ent-Airlock.desc } ent-AirlockHatchMaintenance = герметичный люк техобслуживания .desc = { ent-Airlock.desc } +ent-AirlockGlass = воздушный шлюз + .desc = { ent-Airlock.desc } ent-AirlockEngineeringGlass = { ent-AirlockGlass } .suffix = Инженерный .desc = { ent-AirlockGlass.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl index 54a243c6435..8761920a0fe 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/artifact_analyzer.ftl @@ -1,4 +1,6 @@ ent-MachineArtifactAnalyzer = анализатор артефактов .desc = Платформа, позволяющая выполнять анализ различных типов артефактов. +ent-MachineTraversalDistorter = исказитель обхода + .desc = Позволяет сменить узел артефакта. ent-MachineArtifactCrusher = дробитель артефактов .desc = Лучше не совать туда пальцы... diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/chem_master.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/chem_master.ftl index 84e1cefeca6..a7b216187f3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/chem_master.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/chem_master.ftl @@ -1,2 +1,4 @@ +ent-chem_master = ХимМастер 4000 + .desc = Химический манипулятор промышленного класса с возможностью производства таблеток и бутылочек. ent-ChemMaster = ХимМастер 4000 .desc = Химический манипулятор промышленного класса с возможностью производства таблеток и бутылочек. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl index efb5d0e76e6..83bb562037d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl @@ -8,6 +8,9 @@ ent-GlassBoxLaser = { ent-GlassBox } ent-GlassBoxLaserOpen = { ent-GlassBoxLaser } .suffix = Антикварный лазер, Открытый .desc = { ent-GlassBoxLaser.desc } +ent-GlassBoxLaserBroken = сломанный стеклянный короб + .desc = Разбитая витрина для дорогостоящего экспоната. + .suffix = Разбитый ent-GlassBoxLaserFilled = { ent-GlassBoxLaser } .suffix = Антикварный лазер, Заполненный .desc = { ent-GlassBoxLaser.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/gamerules/events.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/gamerules/events.ftl index 8b268c84e84..91a95eb1a4b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/gamerules/events.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/gamerules/events.ftl @@ -18,20 +18,30 @@ ent-ClericalError = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-ClosetSkeleton = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } +ent-FalseAlarm = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } ent-DragonSpawn = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-NinjaSpawn = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } +ent-MeteorSwarm = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } ent-RevenantSpawn = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-GasLeak = { ent-BaseStationEventShortDelay } .desc = { ent-BaseStationEventShortDelay.desc } ent-KudzuGrowth = { ent-BaseStationEventLongDelay } .desc = { ent-BaseStationEventLongDelay.desc } +ent-RandomSentience = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } ent-MouseMigration = { ent-BaseStationEventShortDelay } .desc = { ent-BaseStationEventShortDelay.desc } +ent-TerminatorSpawn = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } ent-KingRatMigration = { ent-BaseStationEventShortDelay } .desc = { ent-BaseStationEventShortDelay.desc } +ent-VentCritters = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } ent-CockroachMigration = { ent-BaseStationEventShortDelay } .desc = { ent-BaseStationEventShortDelay.desc } ent-PowerGridCheck = { ent-BaseStationEventShortDelay } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/gamerules/midround.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/gamerules/midround.ftl index ffd302b5a10..c69881cab97 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/gamerules/midround.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/gamerules/midround.ftl @@ -1,4 +1,8 @@ ent-Ninja = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } +ent-Dragon = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } ent-Thief = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } +ent-Exterminator = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.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 fe8c724343d..b5d236681b0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/gamerules/roundstart.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/gamerules/roundstart.ftl @@ -10,6 +10,8 @@ ent-InactivityTimeRestart = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-MaxTimeRestart = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } +ent-Pirates = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } ent-BaseNukeopsRule = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-Nukeops = { ent-BaseGameRule } @@ -20,6 +22,10 @@ ent-Traitor = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-Revolutionary = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } +ent-Vault = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-Waves = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } ent-Sandbox = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-Secret = { ent-BaseGameRule } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/backpacks/towngear/backpack.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/backpacks/towngear/backpack.ftl new file mode 100644 index 00000000000..ca14514c753 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/backpacks/towngear/backpack.ftl @@ -0,0 +1,6 @@ +ent-N14ClothingBackpackMayorFilled = { ent-N14ClothingBackpackExplorer } + .desc = { ent-N14ClothingBackpackExplorer.desc } +ent-N14ClothingBackpackSheriffFilled = { ent-N14ClothingBackpackMilitary } + .desc = { ent-N14ClothingBackpackMilitary.desc } +ent-N14ClothingBackpackDeputyFilled = { ent-N14ClothingBackpackMilitary } + .desc = { ent-N14ClothingBackpackMilitary.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/crates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/crates.ftl new file mode 100644 index 00000000000..52218184db0 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/crates.ftl @@ -0,0 +1,6 @@ +ent-N14CrateBreakPlainFilledCigarettes = { ent-N14CrateBreakPlain } + .suffix = cigarette packs random + .desc = { ent-N14CrateBreakPlain.desc } +ent-N14CrateBreakPlainFilledCigarettesRepublic = Republic cigarette crate + .suffix = republics + .desc = { ent-N14CrateBreakPlain.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/storage_fills.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/storage_fills.ftl index d943ec75e32..04e12b8f688 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/storage_fills.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/storage_fills.ftl @@ -2,6 +2,8 @@ ent-N14BaseTimedStorageFill = { "" } .desc = { "" } ent-N14BaseLockerTimedStorageFill = { "" } .desc = { "" } +ent-N14BaseSmallLockerTimedStorageFill = { "" } + .desc = { "" } ent-N14TimedStorageFillDomestic = { "" } .desc = { "" } ent-N14BaseMilitaryTimedStorageFill = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/belt/belts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/belt/belts.ftl index 6cfbf4ec78a..fbbe4399e33 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/belt/belts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/belt/belts.ftl @@ -12,3 +12,5 @@ ent-ClothingBeltNCRBandolier = патронтаж НКР .desc = Кожаный патронташ с несколькими подсумками, используемая бойцами НКР. ent-ClothingBeltRope = верёвочный пояс .desc = Пояс ручной работы сделанный из обрывок верёвки. +ent-ClothingBeltRevolver = кобура для револьвера + .desc = Может удерживать охранное снаряжение, такое как наручники и вспышки. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/head/hats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/head/hats.ftl index 46cf0edae55..22145b9ef1b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/head/hats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/head/hats.ftl @@ -2,6 +2,10 @@ ent-N14ClothingHeadHatBaseball = довоенная бейсбольная ке .desc = Довоенная бейсбольная кепка ent-N14ClothingHeadHatTrucker = { ent-ClothingHeadHatTrucker } .desc = { ent-ClothingHeadHatTrucker.desc } +ent-N14ClothingHeadHatDeputy = шапка помощника шерифа + .desc = Когда шериф не справляется. +ent-N14ClothingHeadHatSheriff = шапка шерифа + .desc = Закон, персонифицированный в виде шапки. ent-N14ClothingHeadHatHeadscarf = тканевая повязка .desc = Повязка из ткани на голову ручной выделки. ent-N14ClothingHeadHatArmyBeret = армейский берет @@ -46,3 +50,7 @@ ent-N14ClothingHeadHatTribalOutcastHood = племенной капюшон из .desc = Позор! Позор! Позор! ent-N14ClothingHeadHatVaultRiot = противоударный шлем .desc = Это шлем был специально разработан для защиты в ближнем бою. +ent-N14ClothingHeadHatAnimal = шапка из псины + .desc = Сшита из шкуры псоподобного существа, эта дикая шапка не только согреет вас, но и защитит в бою. +ent-N14ClothingHeadHatNightstalker = шапка из ночного охотника + .desc = Тёплая и прочная шапка, изготовленная из головы ночного охотника. Идеальна для выживания в пустошах. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/neck/cloaks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/neck/cloaks.ftl index f507249d26f..4c3dcfd7b69 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/neck/cloaks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/neck/cloaks.ftl @@ -4,3 +4,5 @@ ent-ClothingNeckCloakNCR = плащ НКР .desc = Удобный плащ с логотипом НКР. ent-ClothingNeckCloakLeather = кожаный плащ .desc = Самодельный плащ, тёплый и комфортный. +ent-ClothingNeckCloakYaoguai = плащ из яо-гая + .desc = Ручной работы плащ, уютный и тёплый, изготовлен из шкуры могучего яо-гая. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/outerclothing/falloutarmor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/outerclothing/falloutarmor.ftl index cbdd634b56d..6760e83d36b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/outerclothing/falloutarmor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/outerclothing/falloutarmor.ftl @@ -26,6 +26,12 @@ ent-N14ClothingOuterRaiderCombat1 = боевая броня рейдера .desc = Броня, печально известная использованием рейдерами в бою. ent-N14ClothingOuterRaiderCombat2 = боевая броня рейдера MK2 .desc = Броня, печально известная использованием рейдерами в бою. Модифицирована дополнительными бронепластинами. +ent-N14ClothingOuterPoliceCombat = полицейская боевая броня + .desc = Голубой облегченный вариант боевой брони, использовавшийся полицейскими силами до войны. +ent-N14ClothingOuterPoliceVest = полицейский жилет + .desc = Защитный жилет, использовавшийся полицейскими до войны. +ent-N14ClothingOuterSheriffVest = жилет шерифа + .desc = Работа шерифа требует хорошего защитного средства для защиты от опасностей пустоши. ent-N14ClothingOuterNCRVest = кожаный жилет НКР .desc = Легкий кожаный бронежилет, массово производимый в связи со своей дешевизной. Идеально подходит для лёгкой пехоты. ent-N14ClothingOuterNCRPlate = пластинчатая броня НКР @@ -50,3 +56,9 @@ ent-N14ClothingOuterMidwestArmor = боевая броня Среднезапа .desc = Боевая броня, модифицированная множеством хорошо отполированных металлических пластин. ent-N14ClothingOuterMidwestArmorMK2 = боевая броня Среднезападного Братства Стали МК2 .desc = Боевая броня, модифицированная множеством хорошо отполированных металлических пластин, более прочная версия. +ent-N14ClothingOuterChitinArmor = хитиновая броня + .desc = Ручной работы броня, сделанная из множества хитиновых пластин насекомых. +ent-N14ClothingOuterRadArmor = броня из радскорпиона + .desc = Ручной работы броня, изготовленная из частей экзоскелета радскорпионов. +ent-N14ClothingOuterLightMetalArmor = легкая металлическая броня + .desc = Комплект легкой металлической брони, обеспечивающий защиту от физических угроз. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/outerclothing/falloutcoats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/outerclothing/falloutcoats.ftl index 8fd7cc94980..79fd253b146 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/outerclothing/falloutcoats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/outerclothing/falloutcoats.ftl @@ -4,7 +4,7 @@ ent-N14ClothingOuterBattlecoatCoat = боевое пальто .desc = Для тех, кто отправляется в бой. ent-N14ClothingOuterBattlecoatTan = пустынное пальто .desc = { ent-N14ClothingOuterBattlecoatCoat.desc } -ent-N14ClothingOuterCoatFollowerLab = лабораторный халат Последователей +ent-N14ClothingOuterCoatFollowerLab = лабораторный халат Последователей .desc = Лабораторный халат Последователей Апокалипсиса ent-N14ClothingOuterCoatDuster = пальто .desc = Главное не запачкай. @@ -19,4 +19,4 @@ ent-N14ClothingOuterEnclaverOfficerCoat = офицерское пальто Ан ent-N14ClothingOuterOverseerCoat = пальто смотрителя .desc = Пальто, носимое важной персоной. На спине выгравирован номер 14. ent-N14ClothingOuterMidwestBoSCoat = стеганая броня писца - .desc = Стеганая ткань с эмблемами Среднезападного Братства Стали и металлическими пластинами. Имеет дополнительные карманамы для инструментов. + .desc = Стеганая ткань с эмблемами Среднезападного Братства Стали и металлическими пластинами. Имеет дополнительные карманамы для инструментов. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/shoes/falloutshoesbasic.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/shoes/falloutshoesbasic.ftl index 1c87db7eca7..87437d97d4e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/shoes/falloutshoesbasic.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/clothing/shoes/falloutshoesbasic.ftl @@ -5,7 +5,7 @@ ent-N14ClothingShoesBlack = чёрные туфли ent-N14ClothingShoesBrown = коричневые туфли .desc = Коричневые туфли, особо больше нечего добавить. ent-N14ClothingShoesTribal = племенные ботинки - .desc = Ручная работа, фактически кусок кожи с веревкой вокруг, но всё еще лучше, чем ничего. + .desc = Ручная работа, фактически кусок кожи с веревкой вокруг, но всё еще лучше, чем ничего. ent-N14ClothingShoesRags = обмотки для ног .desc = Не лучшее, но хоть что-то. ent-N14ClothingShoesRaider = рейдерские ботинки diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/markers/spawners/jobs.ftl index 3355b998638..9d5610a581b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/markers/spawners/jobs.ftl @@ -24,6 +24,8 @@ ent-N14SpawnPointCaravanLeader = Лидер Каравана .desc = { ent-SpawnPointJobBase.desc } ent-N14SpawnPointCaravanTrader = Караванный Торговец .desc = { ent-SpawnPointJobBase.desc } +ent-N14SpawnPointCaravanGuard = Охранник Каравана + .desc = { ent-N14SpawnPointWastelander.desc } ent-N14SpawnPointNCRCadet = Кадет НКР .desc = { ent-SpawnPointJobBase.desc } ent-N14SpawnPointNCRNCO = Унтер-офицер НКР diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/mobs/npcs/wavedefencemobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/mobs/npcs/wavedefencemobs.ftl index 8c5ce3b7aca..3cde179b4b4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/mobs/npcs/wavedefencemobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/mobs/npcs/wavedefencemobs.ftl @@ -1,54 +1,54 @@ ent-N14MobMoleratWave = { ent-N14MobMolerat } - .suffix = Режим Обороны - .desc = { ent-N14MobMolerat.desc } + .suffix = Режим Обороны + .desc = { ent-N14MobMolerat.desc } ent-N14MobNightstalkerCubWave = { ent-N14MobNightstalkerCub } - .suffix = Режим Обороны - .desc = { ent-N14MobNightstalkerCub.desc } + .suffix = Режим Обороны + .desc = { ent-N14MobNightstalkerCub.desc } ent-N14MobGeckoWave = { ent-N14MobGecko } - .suffix = Режим Обороны - .desc = { ent-N14MobGecko.desc } + .suffix = Режим Обороны + .desc = { ent-N14MobGecko.desc } ent-N14MobNightstalkerWave = { ent-N14MobNightstalker } - .suffix = Режим Обороны - .desc = { ent-N14MobNightstalker.desc } + .suffix = Режим Обороны + .desc = { ent-N14MobNightstalker.desc } ent-N14MobYaoguaiWaveBoss = { ent-N14MobYaoguai } - .suffix = Режим Обороны - .desc = { ent-N14MobYaoguai.desc } + .suffix = Режим Обороны + .desc = { ent-N14MobYaoguai.desc } ent-N14MobDeathclawWaveBoss = { ent-N14MobDeathclaw } - .suffix = Режим Обороны - .desc = { ent-N14MobDeathclaw.desc } + .suffix = Режим Обороны + .desc = { ent-N14MobDeathclaw.desc } ent-N14MobDeathclawWave = { ent-N14MobDeathclawWaveBoss } .suffix = Режим Обороны .desc = { ent-N14MobDeathclawWaveBoss.desc } ent-N14MobDeathclawAlbinoWaveBoss = { ent-N14MobDeathclawAlbino } - .suffix = Режим Обороны - .desc = { ent-N14MobDeathclawAlbino.desc } + .suffix = Режим Обороны + .desc = { ent-N14MobDeathclawAlbino.desc } ent-N14MobDeathclawAlbinoWave = { ent-N14MobDeathclawAlbinoWaveBoss } .suffix = Режим Обороны .desc = { ent-N14MobDeathclawAlbinoWaveBoss.desc } ent-N14MobDeathclawMetalWaveBoss = { ent-N14MobDeathclawMetal } - .suffix = Режим Обороны - .desc = { ent-N14MobDeathclawMetal.desc } + .suffix = Режим Обороны + .desc = { ent-N14MobDeathclawMetal.desc } ent-N14MobDeathclawMetalWave = { ent-N14MobDeathclawMetalWaveBoss } .suffix = Режим Обороны .desc = { ent-N14MobDeathclawMetalWaveBoss.desc } ent-N14MobRadroachWave = { ent-N14MobRadroach } - .suffix = Режим Обороны - .desc = { ent-N14MobRadroach.desc } + .suffix = Режим Обороны + .desc = { ent-N14MobRadroach.desc } ent-N14MobBloatflyWave = { ent-N14MobBloatfly } - .suffix = Режим Обороны - .desc = { ent-N14MobBloatfly.desc } + .suffix = Режим Обороны + .desc = { ent-N14MobBloatfly.desc } ent-N14MobGiantAntWave = { ent-N14MobGiantAnt } - .suffix = Режим Обороны - .desc = { ent-N14MobGiantAnt.desc } + .suffix = Режим Обороны + .desc = { ent-N14MobGiantAnt.desc } ent-N14MobGiantFireAntWave = { ent-N14MobGiantFireAnt } - .suffix = Режим Обороны - .desc = { ent-N14MobGiantFireAnt.desc } + .suffix = Режим Обороны + .desc = { ent-N14MobGiantFireAnt.desc } ent-N14MobCazadorWave = { ent-N14MobCazador } - .suffix = Режим Обороны - .desc = { ent-N14MobCazador.desc } + .suffix = Режим Обороны + .desc = { ent-N14MobCazador.desc } ent-N14MobRadscorpionWave = { ent-N14MobRadscorpion } - .suffix = Режим Обороны - .desc = { ent-N14MobRadscorpion.desc } + .suffix = Режим Обороны + .desc = { ent-N14MobRadscorpion.desc } ent-N14MobRadscorpionBarkWave = { ent-N14MobRadscorpionBark } - .suffix = Режим Обороны - .desc = { ent-N14MobRadscorpionBark.desc } \ No newline at end of file + .suffix = Режим Обороны + .desc = { ent-N14MobRadscorpionBark.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/mobs/player/ghouls.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/mobs/player/ghouls.ftl index 615c854cab1..1ab4fe2181d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/mobs/player/ghouls.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/mobs/player/ghouls.ftl @@ -1,4 +1,4 @@ ent-N14MobGhoul = гуль - .desc = { ent-N14BaseMobGhoul.desc } + .desc = { ent-N14BaseMobGhoul.desc } ent-N14MobGhoulGlowing = светящийся гуль - .desc = { ent-N14BaseMobGhoulGlowing.desc } \ No newline at end of file + .desc = { ent-N14BaseMobGhoulGlowing.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/drinks/drinks_bottles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/drinks/drinks_bottles.ftl index 56453eca8d4..e5504f15766 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/drinks/drinks_bottles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/drinks/drinks_bottles.ftl @@ -12,3 +12,33 @@ ent-N14DrinkNukaColaBottleFull = бутылка Ядер-Колы .desc = Лучшая кола с 2044. ent-N14DrinkIrradiatedNukaColaBottleFull = радиоактивная Ядер-Кола .desc = Лучшая кола с 2044. Эта бутылка выглядит немного... странно. +ent-N14DrinkNukaColaEmpty = бутылка Ядер-колы + .desc = Лучшая кола с 2044 года. +ent-N14DrinkNukaColaBroken = разбитая бутылка Ядер-колы + .desc = Лучшая кола с 2044 года. +ent-N14DrinkNukaColaCherry = Ядер-Кола вишнёвая + .desc = Лучшая кола с 2044 года. Вишнёвый вкус. +ent-N14DrinkNukaCola = Ядер-Кола + .desc = Лучшая кола с 2044 года. +ent-N14DrinkNukaColaGrape = Ядер-Кола виноградная + .desc = Лучшая кола с 2044 года. Виноградный вкус. +ent-N14DrinkNukaColaOrange = Ядер-Кола апельсиновая + .desc = Лучшая кола с 2044 года. Апельсиновый вкус. +ent-N14DrinkNukaColaYellow = Ядер-Кола жёлтая + .desc = Редкий вкус Ядер-колы от сумасшедшего голого Рошамбо. +ent-N14DrinkNukaColaQuantum = Ядер-Кола Квант + .desc = Лучшая кола с 2044 года. +ent-N14DrinkNukaColaQuartz = Ядер-Кола Кварц + .desc = Лучшая кола с 2044 года. +ent-N14DrinkNukaColaVictory = Ядер-Кола Виктори + .desc = Лучшая кола с 2044 года. +ent-N14DrinkNukaColaWild = Ядер-Кола Дикая + .desc = Лучшая кола с 2044 года. +ent-N14DrinkGammagulpBeer = Пиво "Гамма-глоток" + .desc = Один из главных экспортных товаров Гекко. Слабый радиоактивный алкоголь. +ent-N14DrinkRoentgenRum = Ром "Рентген" + .desc = Один из главных экспортных товаров Гекко. Крепкий, покалывающий алкоголь. +ent-N14DrinkWhisky = виски + .desc = Бутылка обычного на вид виски +ent-N14DrinkWine = вино + .desc = Вино из долины Наппа. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/flora/wastelandflora.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/flora/wastelandflora.ftl index b8cc91120da..61ab612b85b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/flora/wastelandflora.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/flora/wastelandflora.ftl @@ -20,6 +20,8 @@ ent-N14WastelandFloraWildCaveFungus = дикие пещерные грибы .desc = Дикорастущие грибы. Выглядят здоровыми. ent-N14WastelandFloraWildCaveFungusRad = дикие облучённые пещерные грибы .desc = Дикорастущие грибы. Светятся. +ent-N14WastelandFloraWildCotton = дикий хлопок + .desc = Хлопковое растение, растущее в дикой природе. Оно выглядит здоровым. ent-N14WastelandFloraWildCoyote = дикий койотовый табак .desc = Дикорастущее растение койотового табака. Выглядит здоровым. ent-N14WastelandFloraWildDatura = дикая дурман-трава @@ -107,4 +109,4 @@ ent-N14FloraProduceWildTato = дикая тошка ent-N14FloraProduceWildWhiteHorsenettle = цветок белого паслёна каролинского .desc = Цветок белого паслёна каролинского. ent-N14FloraProduceWildXander = дикий корень ксандера - .desc = Корень ксандера с дикого растения. \ No newline at end of file + .desc = Корень ксандера с дикого растения. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/food/meat.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/food/meat.ftl index 82a764c41e4..65da33b82ff 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/food/meat.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/food/meat.ftl @@ -89,4 +89,4 @@ ent-N14FoodMeatRadchickenCutletCooked = приготовленная котле ent-N14FoodMeatGeckoCutletCooked = приготовленная котлета из геккона .desc = Вкусная приготовленная котлета из динозавра. ent-N14FoodMeatRadscorpionCutletCooked = приготовленная котлета из радскорпиона - .desc = Котлета из приготовленного мяса радскорпиона. Наконец-то съедобная. \ No newline at end of file + .desc = Котлета из приготовленного мяса радскорпиона. Наконец-то съедобная. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/cigarette.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/cigarette.ftl new file mode 100644 index 00000000000..32b78e56841 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/cigarette.ftl @@ -0,0 +1,23 @@ +ent-N14Cigarette = { ent-Cigarette } + .desc = { ent-Cigarette.desc } +ent-N14CigaretteSpent = { ent-N14Cigarette } + .suffix = spent + .desc = { ent-N14Cigarette.desc } +ent-N14CigaretteKool = { ent-N14Cigarette } + .desc = A Kool brand cigarette. + .suffix = kool +ent-N14CigaretteSalem = { ent-N14CigaretteKool } + .desc = A Salem brand cigarette. + .suffix = salem +ent-N14CigaretteMarlboro = { ent-N14Cigarette } + .desc = A Marlboro brand cigarette. + .suffix = marlboro +ent-N14CigaretteRepublic = { ent-N14Cigarette } + .desc = A Republic brand cigarette. + .suffix = republic +ent-N14CigaretteRollie = { ent-N14Cigarette } + .desc = A roll up cigarette. + .suffix = rollie +ent-N14CigaretteWinston = { ent-N14Cigarette } + .desc = A Winston brand cigarette. + .suffix = winston diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/packs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/packs.ftl new file mode 100644 index 00000000000..e247978f71d --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/packs.ftl @@ -0,0 +1,15 @@ +ent-N14CigPackBase = cigarette pack + .desc = { ent-BaseStorageItem.desc } +ent-N14CigarettePackSalem = Salem cigs pack + .desc = A refined green cigarette packet. A label on the packaging reads, Salem. Refreshes your taste. +ent-N14CigarettePackKool = Kools cigs pack + .desc = A kool green cigarette packet. A label on the packaging reads, KOOL. So good, it's got to be KOOL! +ent-N14CigarettePackMarlboro = Marlboro cigs pack + .desc = A cool red cigarette packet. A label on the packaging reads, Marlboro. Where theres a man, theres a Marlboro. +ent-N14CigarettePackWinston = Winston cigs pack + .desc = A refined red cigarette packet. A label on the packaging reads, Winston. Winston tastes good, like a cigarette should! +ent-N14CigarettePackCustom = cardboard cigs pack + .desc = A simple hand-made cardboard cigarette pack + .suffix = custom +ent-N14CigarettePackRepublics = Republics cig pack + .desc = A rustic cardboard cigarette pack with the flag of the New Californian Republic on it. A label on the packaging reads, Republics. Taste the freedom, feel the burn. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/smokeables.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/smokeables.ftl new file mode 100644 index 00000000000..333b0d9b982 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/smokeables.ftl @@ -0,0 +1,8 @@ +ent-N14PackRollingPaper = pack of rolling paper + .desc = A pack of thin pieces of paper used to make fine smokeables. +ent-N14RollingPaper = { ent-PaperRolling } + .suffix = Full + .desc = { ent-PaperRolling.desc } +ent-N14RollingPaper1 = { ent-N14RollingPaper } + .suffix = Single + .desc = { ent-N14RollingPaper.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/containers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/containers.ftl new file mode 100644 index 00000000000..e80bba7685c --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/containers.ftl @@ -0,0 +1,5 @@ +ent-N14FuelTankHandy = fuel tank + .desc = A tank of Mr Handy fuel. +ent-N14FuelTankHandyRusty = fuel tank + .desc = A rusty tank of Mr Handy fuel. + .suffix = rusty diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/materials.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/materials.ftl index 6c3e1db59d5..e6ab7985b28 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/materials.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/materials.ftl @@ -16,3 +16,9 @@ ent-SulfurPowder1 = { ent-SulfurPowder } ent-SulfurPowder10 = { ent-SulfurPowder } .suffix = 10 .desc = { ent-SulfurPowder.desc } +ent-N14Paper = paper + .suffix = 10 + .desc = { ent-SheetPaper.desc } +ent-N14Paper1 = { ent-N14Paper } + .suffix = Single + .desc = { ent-N14Paper.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/misc/craftingmaterials.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/misc/craftingmaterials.ftl index e4fceb29f20..ccb6998f150 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/misc/craftingmaterials.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/misc/craftingmaterials.ftl @@ -2,3 +2,13 @@ ent-N14MaterialRadscorpionTail = хвост радскорпиона .desc = Оторван от радскорпиона. Очевидно. ent-N14MaterialBrahminHide = шкура брамина .desc = Жесткая прочная кожа. +ent-N14MaterialAntChitin = ant chitin + .desc = A strong and resistent piece of ant "skin". +ent-N14MaterialExoskeleton = radscorpion exoskeleton piece + .desc = A strong and resistent piece of radscorpion exoskeleton. +ent-N14MaterialNightstalkerPelt = nightstalker pelt + .desc = A pelt of fresh nightstalker leather. +ent-N14MaterialYaoguaiHide = yaoguai hide + .desc = A big hide of yaoguai, heavy and strong. +ent-N14MaterialLeather = leather + .desc = A piece of leather, just non special leather. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/misc/junk.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/misc/junk.ftl index 28532bb2472..11b132a2b12 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/misc/junk.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/misc/junk.ftl @@ -1,5 +1,11 @@ ent-N14JunkItemBase = мусор .desc = Это мусор! +ent-N14JunkItemBasePlastic = { ent-N14JunkItemBase } + .desc = { ent-N14JunkItemBase.desc } +ent-N14JunkItemBaseMetal = { ent-N14JunkItemBase } + .desc = { ent-N14JunkItemBase.desc } +ent-N14JunkItemBaseContainer = { ent-N14JunkItemBase } + .desc = { ent-N14JunkItemBase.desc } ent-N14JunkAbraxoCleaner = Очиститель Абраксо .desc = Фирменный очиститель Абраско. ent-N14Junk8Ball = шар 8 diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/chemicals.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/chemicals.ftl index db3750810f9..539e3181f49 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/chemicals.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/chemicals.ftl @@ -1,5 +1,9 @@ ent-N14ChemicalSyringe = химический шприц .desc = Шприц, наполненный неизвестным химикатом. Наркоманы убили бы за него. +ent-N14BaseSyringe = doctors syringe + .desc = Used to draw blood samples from mobs, or to inject them with reagents. Chem junkies would kill you for it. +ent-N14DoctorSyringe = { ent-N14BaseSyringe } + .desc = { ent-N14BaseSyringe.desc } ent-N14Stimpak = стимпак .desc = Шприц, наполненный чудесной смесью медицинских реагентов. Незаменим для тех, у кого мало или вовсе нет медицинских знаний. ent-N14StimpakDirty = грязный стимпак @@ -25,4 +29,14 @@ ent-N14RadAwayBloodbag = антирад ent-N14HealingPowder = целебный порошок .desc = Мешочек с племенным целебным порошком. Вызывает тошноту. ent-N14Antidote = антидот - .desc = Противоядие, сделанное из хвоста радскорпиона и воды. \ No newline at end of file + .desc = Противоядие, сделанное из хвоста радскорпиона и воды. +ent-N14SmellingSalts = smelling salts + .desc = A small glass ampoule containing smelling salts. Their smell is said to wake up even a dead ghoul. +ent-N14HealingPoultice = healing Healing + .desc = A bag of poultice to help with all common ailments slowly. +ent-N14Bitterdrink = Bitterdrink + .desc = A bottle containing a mixture of plants to aid against poisons and radiation. +ent-N14MourningPoultice = mourning poultice + .desc = A bag of powder made from poisonous flowers for use within tribal ceremenoies. +ent-N14UltraStimpak = ultra stimpak + .desc = A special type of super stimpak with an additional mixture of chemicals which makes a man near invincible at a great cost. It is widely deemed inhumane and outlawed. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/equipment.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/equipment.ftl new file mode 100644 index 00000000000..22e7b97b7ff --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/equipment.ftl @@ -0,0 +1,3 @@ +ent-N14MortarpestleGrinder = mortar & pestle + .desc = A mortar and pestle for grinding things into reagents. + .suffix = grinder/juicer diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/45-70.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/45-70.ftl new file mode 100644 index 00000000000..6d1462ac4fc --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/45-70.ftl @@ -0,0 +1,4 @@ +ent-BaseMagazineBox45-70 = { ent-BaseItem } + .desc = { ent-BaseItem.desc } +ent-MagazineBox45-70 = ammunition box (.45-70 gov't) + .desc = { ent-BaseMagazineBox45-70.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/50.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/50.ftl new file mode 100644 index 00000000000..73fa887b556 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/50.ftl @@ -0,0 +1,4 @@ +ent-BaseMagazineBox50 = { ent-BaseItem } + .desc = { ent-BaseItem.desc } +ent-MagazineBox50 = ammunition box (.50 anti materiel) + .desc = { ent-BaseMagazineBox50.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl new file mode 100644 index 00000000000..6bb1d633393 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl @@ -0,0 +1,2 @@ +ent-N14Cartridge45-70 = cartridge (.45-70 gov't) + .desc = { ent-BaseCartridgeLightRifle.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/projectiles/45-70.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/projectiles/45-70.ftl new file mode 100644 index 00000000000..43d569a1e68 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/projectiles/45-70.ftl @@ -0,0 +1,2 @@ +ent-N14Bullet45-70 = bullet (.45-70 gov't) + .desc = { ent-BaseBullet.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/10mm.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/10mm.ftl new file mode 100644 index 00000000000..eae284c0504 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/10mm.ftl @@ -0,0 +1,4 @@ +ent-N14BaseSpeedLoader10 = speed loader (10mm) + .desc = { ent-BaseItem.desc } +ent-SpeedLoader10 = speed loader (10mm) + .desc = { ent-N14BaseSpeedLoader10.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/44.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/44.ftl new file mode 100644 index 00000000000..2b706c72499 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/44.ftl @@ -0,0 +1,4 @@ +ent-N14BaseSpeedLoader44 = speed loader (.44 magnum) + .desc = { ent-BaseItem.desc } +ent-SpeedLoader44 = speed loader (.44 magnum) + .desc = { ent-N14BaseSpeedLoader44.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/45-70.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/45-70.ftl new file mode 100644 index 00000000000..5189de04888 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/45-70.ftl @@ -0,0 +1,4 @@ +ent-N14BaseSpeedLoader45-70 = speed loader (45-70 gov) + .desc = { ent-BaseItem.desc } +ent-SpeedLoader45-70 = speed loader (45-70 gov) + .desc = { ent-N14BaseSpeedLoader45-70.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/9mm.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/9mm.ftl new file mode 100644 index 00000000000..2a0fe4a7104 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/9mm.ftl @@ -0,0 +1,4 @@ +ent-N14BaseSpeedLoader9 = speed loader (9mm) + .desc = { ent-BaseItem.desc } +ent-SpeedLoader9 = speed loader (9mm) + .desc = { ent-N14BaseSpeedLoader9.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/revolvers/revolvers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/revolvers/revolvers.ftl index 2932b780271..ef8f4431705 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/revolvers/revolvers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/revolvers/revolvers.ftl @@ -1,6 +1,10 @@ ent-N14WeaponRevolver9mm = 9-мм револьвер .desc = Маленький удобный револьвер, использующий боеприпасы 9мм калибра. +ent-N14WeaponRevolver10mm = 10mm revolver + .desc = The first prototype for the semiauto 10mm pistol, Uses 10mm. ent-N14WeaponRevolverMagnun = магнум .desc = Большой и мощный револьвер. Использует боеприпасы .44 калибра. ent-N14WeaponHunterRevolver = охотничий револьвер .desc = Тяжелый револьвер с длинным стволом, предназначенный для охоты на мелких животных. Также подходит и для людей. Использует патроны "магнум" 44-го калибра. +ent-N14WeaponRangerSequoia = ranger sequoia + .desc = 20 years of suffering for a good looking glorified revolver, worth it. Uses .45-70 gov't ammo. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/smgs/smgs.ftl index 1f1e097c77c..8ac614ec54c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/smgs/smgs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/smgs/smgs.ftl @@ -10,5 +10,7 @@ ent-N14WeaponAdvanceSubMachineGun12mm = продвинутый 12,7-мм пис .desc = Громоздкий пистолет-пулемет с системой подачи магазина сверху, он использует патроны калибра 12 мм. ent-N14weapon9mmSMG = пистолет-пулемёт 9 мм .desc = Простой металлический пистолет-пулемёт довоенного производства, под патронник калибра 9 мм. +ent-N14Weapon45SMG = .45 SMG + .desc = A pre-war SMG with a wooden stock, chambered in .45. ent-N14weapon45SMG = пистолет-пулемёт 45 мм .desc = Довоенный автомат SMG с деревянным прикладом, под патронник 45-го калибра. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/snipers/snipers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/snipers/snipers.ftl index 72ee26721f6..653ae3b482f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/snipers/snipers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/snipers/snipers.ftl @@ -2,10 +2,14 @@ ent-N14WeaponSniperHunting = охотничья винтовка .desc = Надёжная винтовка со скользящим затвором. Использует патроны .308 калибра. ent-N14WeaponAntiMateriel = Анти-Материальная винтовка .desc = С одного взгляда внушает страх. Использует анти-материальные патроны .50 калибра. +ent-N14Weapon50NcrRifle = .50 NCR rifle + .desc = A try by the NCR to make .50 ammo a standart on normal infantry, very cheap but it will deal a lot of damage. Uses .50 anti-material ammo. ent-N14WeaponLeverCarbine = карабин с рычажным затвором .desc = Карабин с рычажным затвором. Использует патроны .44 калибра. ent-N14WeaponLeverRifle = винтовка с рычажным затвором .desc = Винтовка с рычажным затвором. Использует патроны .308 калибра. +ent-N14WeaponBrushGun = brush gun + .desc = A powerfull lever action carbine. Uses .45-70 gov't ammo. ent-N14WeaponPipeRifle = гладкоствольная винтовка .desc = Кусок металлической трубы с деревянным прикладом. Использует патроны .308 калибра ent-N14WeaponSniperVarmint = варминт-винтовка diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/melee/baton-club.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/melee/baton-club.ftl new file mode 100644 index 00000000000..05221542115 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/melee/baton-club.ftl @@ -0,0 +1,2 @@ +ent-N14BaseBallBat = baseball bat + .desc = A robust baseball bat. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/decoration/flags.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/decoration/flags.ftl index 9eade4cce24..1d0868bdc65 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/decoration/flags.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/decoration/flags.ftl @@ -25,4 +25,4 @@ ent-N14DecorationFlagYuma = флаг Юмы Флэтс ent-N14DecorationFlagKhans = флаг Великих Ханов .desc = Флаг, потертый его долгой и славной историей. Украшен улыбающимся черепом, который насмехается над теми, кто бросает ему вызов. ent-N14DecorationFlagChurch = флаг Церкви Детей Атома - .desc = Кроваво-красный флаг с изображением символа радиации. \ No newline at end of file + .desc = Кроваво-красный флаг с изображением символа радиации. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/decoration/junk_piles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/decoration/junk_piles.ftl index 6023acd1ee7..4abeff25cc7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/decoration/junk_piles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/decoration/junk_piles.ftl @@ -25,38 +25,38 @@ ent-N14JunkPile11 = { ent-N14JunkPile1 } ent-N14JunkPile12 = { ent-N14JunkPile1 } .desc = { ent-N14JunkPile1.desc } ent-N14JunkPile1Refilling1 = { ent-N14JunkPile1 } - .suffix = Пополняемый,Случайный - .desc = { ent-N14JunkPile1.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14JunkPile1.desc } ent-N14JunkPile1Refilling2 = { ent-N14JunkPile2 } - .suffix = Пополняемый,Случайный - .desc = { ent-N14JunkPile2.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14JunkPile2.desc } ent-N14JunkPile1Refilling3 = { ent-N14JunkPile3 } - .suffix = Пополняемый,Случайный - .desc = { ent-N14JunkPile3.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14JunkPile3.desc } ent-N14JunkPile1Refilling4 = { ent-N14JunkPile4 } - .suffix = Пополняемый,Случайный - .desc = { ent-N14JunkPile4.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14JunkPile4.desc } ent-N14JunkPile1Refilling5 = { ent-N14JunkPile5 } - .suffix = Пополняемый,Случайный - .desc = { ent-N14JunkPile5.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14JunkPile5.desc } ent-N14JunkPile1Refilling6 = { ent-N14JunkPile6 } - .suffix = Пополняемый,Случайный - .desc = { ent-N14JunkPile6.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14JunkPile6.desc } ent-N14JunkPile1Refilling7 = { ent-N14JunkPile7 } - .suffix = Пополняемый,Случайный - .desc = { ent-N14JunkPile7.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14JunkPile7.desc } ent-N14JunkPile1Refilling8 = { ent-N14JunkPile8 } - .suffix = Пополняемый,Случайный - .desc = { ent-N14JunkPile8.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14JunkPile8.desc } ent-N14JunkPile1Refilling9 = { ent-N14JunkPile9 } - .suffix = Пополняемый,Случайный - .desc = { ent-N14JunkPile9.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14JunkPile9.desc } ent-N14JunkPile1Refilling10 = { ent-N14JunkPile10 } - .suffix = Пополняемый,Случайный - .desc = { ent-N14JunkPile10.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14JunkPile10.desc } ent-N14JunkPile1Refilling11 = { ent-N14JunkPile11 } - .suffix = Пополняемый,Случайный - .desc = { ent-N14JunkPile11.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14JunkPile11.desc } ent-N14JunkPile1Refilling12 = { ent-N14JunkPile12 } - .suffix = Пополняемый,Случайный - .desc = { ent-N14JunkPile12.desc } \ No newline at end of file + .suffix = Пополняемый,Случайный + .desc = { ent-N14JunkPile12.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/doors/doors.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/doors/doors.ftl index 0ec435db26b..59cb6a47bd0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/doors/doors.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/doors/doors.ftl @@ -56,4 +56,4 @@ ent-N14DoorTentflap = клапан палатки ent-N14DoorTentLeatherflap = кожаный клапан палатки .desc = Клапан для палатки из кожи. ent-N14DoorTentClothflap = тканевый клапан палатки - .desc = Клапан для палатки из ткани. \ No newline at end of file + .desc = Клапан для палатки из ткани. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/barricades.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/barricades.ftl index 80be0c7c610..bb373e2a4b3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/barricades.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/barricades.ftl @@ -5,4 +5,4 @@ ent-N14BarricadeTanktrap = противотанковый еж ent-N14BarricadeTanktrapRusty = противотанковый еж .desc = Ржавый металлический шип для блокирования транспортных средств. ent-N14BarricadeRazorwire = баррикада с колючей проволокой - .desc = Укрепление с колючей проволокой. \ No newline at end of file + .desc = Укрепление с колючей проволокой. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/chairs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/chairs.ftl index fedd0a2ed6e..6842cad4e2a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/chairs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/chairs.ftl @@ -74,4 +74,4 @@ ent-N14ChairPlastic = пластиковый стул .suffix = пластиковый .desc = { ent-N14ChairMetalGreen.desc } ent-N14ChairDinerBench = стул из закусочной - .desc = { ent-N14ChairMetalGreen.desc } \ No newline at end of file + .desc = { ent-N14ChairMetalGreen.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/filing_cabinets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/filing_cabinets.ftl index 0cb2f8fa132..69705d006f9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/filing_cabinets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/filing_cabinets.ftl @@ -2,5 +2,5 @@ ent-N14filingCabinet = картотечный шкаф .desc = Шкаф для хранения документов. .suffix = Пустой ent-N14FilingCabinetRefilling = { ent-N14filingCabinet } - .suffix = Восполняемый,Случайный - .desc = { ent-N14filingCabinet.desc } \ No newline at end of file + .suffix = Восполняемый,Случайный + .desc = { ent-N14filingCabinet.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/shelf.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/shelf.ftl index 9dc33a8ba1c..530ce2ae72e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/shelf.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/shelf.ftl @@ -78,4 +78,4 @@ ent-N14ShelfMetalMeds = медицинская полка ent-N14ShelfMetalMedsEast = медицинская полка .desc = Металлическая полка для хранения медикаментов. ent-N14ShelfMetalMedsWest = медицинская полка - .desc = Металлическая полка для хранения медикаментов. \ No newline at end of file + .desc = Металлическая полка для хранения медикаментов. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/street_furniture.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/street_furniture.ftl index 4663b68a396..e6cea88f861 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/street_furniture.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/street_furniture.ftl @@ -109,11 +109,11 @@ ent-N14LightStreetLampPostRaiderPoweredEmptyLeft = { ent-N14LightStreetLampPostP .suffix = пустой, слева .desc = { ent-N14LightStreetLampPostPoweredEmptyLeft.desc } ent-N14LightStreetLampPostRaiderPoweredRight = { ent-N14LightStreetLampPostPoweredRight } - .suffix = включен, справа - .desc = { ent-N14LightStreetLampPostPoweredRight.desc } + .suffix = включен, справа + .desc = { ent-N14LightStreetLampPostPoweredRight.desc } ent-N14LightStreetLampPostRaiderPoweredLeft = { ent-N14LightStreetLampPostPoweredLeft } - .suffix = включен, слева - .desc = { ent-N14LightStreetLampPostPoweredLeft.desc } + .suffix = включен, слева + .desc = { ent-N14LightStreetLampPostPoweredLeft.desc } ent-N14LightStreetLampPostAlwaysPoweredRight2 = { ent-N14LightStreetLampPostAlwaysPoweredRight } .suffix = всегда включен, справа .desc = { ent-N14LightStreetLampPostAlwaysPoweredRight.desc } @@ -130,4 +130,23 @@ ent-N14LightStreetLampPostPoweredRight2 = { ent-N14LightStreetLampPostPoweredRig .suffix = включен, справа .desc = { ent-N14LightStreetLampPostPoweredRight.desc } ent-N14LightStreetLampPostPoweredLeft2 = { ent-N14LightStreetLampPostPoweredLeft } - .suffix = включен, слева \ No newline at end of file + .suffix = включен, слева + .desc = { ent-N14LightStreetLampPostPoweredLeft.desc } +ent-N14LightStreetLampPostRaiderAlwaysPoweredRight2 = { ent-N14LightStreetLampPostAlwaysPoweredRight } + .suffix = Always Powered, Right + .desc = { ent-N14LightStreetLampPostAlwaysPoweredRight.desc } +ent-N14LightStreetLampPostRaiderAlwaysPoweredLeft2 = { ent-N14LightStreetLampPostAlwaysPoweredLeft } + .suffix = Always Powered, Left + .desc = { ent-N14LightStreetLampPostAlwaysPoweredLeft.desc } +ent-N14LightStreetLampPostRaiderPoweredEmptyRight2 = { ent-N14LightStreetLampPostPoweredEmptyRight } + .suffix = Empty, Right + .desc = { ent-N14LightStreetLampPostPoweredEmptyRight.desc } +ent-N14LightStreetLampPostRaiderPoweredEmptyLeft2 = { ent-N14LightStreetLampPostPoweredEmptyLeft } + .suffix = Empty, Left + .desc = { ent-N14LightStreetLampPostPoweredEmptyLeft.desc } +ent-N14LightStreetLampPostRaiderPoweredRight2 = { ent-N14LightStreetLampPostPoweredRight } + .suffix = Powered, Right + .desc = { ent-N14LightStreetLampPostPoweredRight.desc } +ent-N14LightStreetLampPostRaiderPoweredLeft2 = { ent-N14LightStreetLampPostPoweredLeft } + .suffix = Powered, Left + .desc = { ent-N14LightStreetLampPostPoweredLeft.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/table.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/table.ftl index e89ca10bbac..80dbe196516 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/table.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/table.ftl @@ -91,4 +91,4 @@ ent-N14TableCounterMetalCross = { ent-N14TableCounterMetal } ent-N14TableMetalGrate = металлический стол .desc = Холодный самодельный металлический стол, сделанный из решетки. ent-N14TableCounterBar = барная стойка - .desc = Барная стойка с пятнами от алкоголя. \ No newline at end of file + .desc = Барная стойка с пятнами от алкоголя. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/machines/machinepanels.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/machines/machinepanels.ftl index 736b77a60e0..29541a8cae1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/machines/machinepanels.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/machines/machinepanels.ftl @@ -17,4 +17,4 @@ ent-N14MachineRackServer = серверная стойка ent-N14MachineRackRecorder = электрический регистратор .desc = Старая стойка с регистратором неисправностей. ent-N14MachineComputerMainframe = мейнфрейм - .desc = Вероятно, самый большой компьютер, который вы когда-либо видели. \ No newline at end of file + .desc = Вероятно, самый большой компьютер, который вы когда-либо видели. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/machines/vending_machines.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/machines/vending_machines.ftl index b26db763dea..7b60e91389c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/machines/vending_machines.ftl @@ -3,4 +3,18 @@ ent-N14VendingMachineNukaCola = автомат с Ядер-Колой ent-N14VendingMachineNukaColaIrradiated = автомат с Ядер-Колой .desc = Довоенный торговый автомат, который продает напитки бренда Ядер-Кола. .suffix = радиоактивный - +ent-N14VendingMachineNukaColaNew = Nuka-Cola machine + .desc = A Pre-War vending machine that dispenses Nuka-Cola Corporation branded beverages. + .suffix = storage, empty +ent-N14VendingMachineNukaColaNewFilled = { ent-N14VendingMachineNukaColaNew } + .suffix = storage, random + .desc = { ent-N14VendingMachineNukaColaNew.desc } +ent-N14VendingMachineCigarette = cigarette vendor + .desc = A Pre-War vending machine that dispenses cigarettes. + .suffix = storage, empty +ent-N14VendingMachineCigaretteFilled = { ent-N14VendingMachineCigarette } + .suffix = random + .desc = { ent-N14VendingMachineCigarette.desc } +ent-N14VendingMachineCigaretteFilledRepublic = Republics cig vendor + .desc = A pre-war cigarette vendor that's been filled with Republic cigarette packs. + .suffix = republics diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/misc/ladders.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/misc/ladders.ftl index bd4322b82f5..e622df8f1f5 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/misc/ladders.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/misc/ladders.ftl @@ -6,6 +6,33 @@ ent-LadderTop = лестница ent-LadderBottom = лестница .desc = Низ лестницы. Используйте, чтобы подняться наверх. .suffix = низ +ent-LadderTopBunkerOpen = bunker entrance + .desc = Looks like it leads down somewhere. + .suffix = open +ent-LadderTopManholeOpen = manhole + .desc = Looks like it leads down somewhere. + .suffix = open +ent-LadderSquareTop = { ent-LadderTop } + .desc = Looks like it leads down somewhere. + .suffix = square +ent-LadderSquareBottom = { ent-LadderBottom } + .desc = The bottom of a ladder. Use it to go up. + .suffix = bottom, square +ent-LadderSquareMid = { ent-LadderSquareBottom } + .desc = The middle of a ladder. Up or down. + .suffix = mid, square +ent-LadderRopeTop1 = climbing rope + .desc = The top of a rope. Going down! + .suffix = rope, top +ent-LadderRopeBottom1 = climbing rope + .desc = The bottom of a rope. Going up! + .suffix = rope, bottom +ent-LadderTopBunkerClosed = bunker entrance + .desc = A closed up entrance to a bunker. + .suffix = closed +ent-LadderTopManholeClosed = manhole cover + .desc = A closed up entrance to a bunker. + .suffix = closed ent-LadderTopMetal = лестница .desc = Верх лестницы. Используйте, чтобы спуститься вниз. .suffix = верх, металл, окрашенная diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/power/generators.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/power/generators.ftl index 7e1199d366e..14525235518 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/power/generators.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/power/generators.ftl @@ -16,4 +16,4 @@ ent-N14GeneratorReactorFloor = довоенный реактор .desc = Старый реактор, встроенный в пол. ent-N14GeneratorReactorFloorDestroyed = довоенный реактор .desc = Старый реактор, встроенный в пол. Этот пережил расплавление активной зоны. - .suffix = разрушенный \ No newline at end of file + .suffix = разрушенный diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/storage/barrels.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/storage/barrels.ftl index 88cb175a048..8faa8193994 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/storage/barrels.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/storage/barrels.ftl @@ -35,4 +35,4 @@ ent-N14YellowBarrelFull = { ent-N14YellowBarrelOpen } ent-N14BurningBarrel = обгоревшая бочка .desc = Похоже, в этой бочке когда-то горел огонь. ent-N14BurningBarrelLit = горящая бочка - .desc = Эта бочка тлеет. Тепленькая \ No newline at end of file + .desc = Эта бочка тлеет. Тепленькая diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/storage/closets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/storage/closets.ftl index 8cc5940db05..c4062199ae6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/storage/closets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/storage/closets.ftl @@ -5,35 +5,35 @@ ent-N14ClosetBaseW = шкаф ent-N14ClosetGrey1 = { ent-N14ClosetBaseW } .desc = { ent-N14ClosetBaseW.desc } ent-N14ClosetGrey1Refilling = { ent-N14ClosetGrey1 } - .suffix = Пополняемый,Случайный - .desc = { ent-N14ClosetGrey1.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14ClosetGrey1.desc } ent-N14ClosetGrey2 = { ent-N14ClosetBaseW } .desc = { ent-N14ClosetBaseW.desc } ent-N14ClosetGrey2Refilling = { ent-N14ClosetGrey2 } - .suffix = Пополняемый,Случайный - .desc = { ent-N14ClosetGrey2.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14ClosetGrey2.desc } ent-N14ClosetRusty = ржавый шкаф .desc = Старый ржавый шкаф. ent-N14ClosetRustyRefilling = { ent-N14ClosetRusty } - .suffix = Пополняемый,Случайный - .desc = { ent-N14ClosetRusty.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14ClosetRusty.desc } ent-N14ClosetGunCabinet = оружейный сейф .desc = Зищащённый сейф для хранения оружия. ent-N14ClosetGunCabinetRefilling = { ent-N14ClosetGunCabinet } - .suffix = Пополняемый,Случайный - .desc = { ent-N14ClosetGunCabinet.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14ClosetGunCabinet.desc } ent-N14ClosetFridgeDirty = холодильник .desc = Старый вонючий холодильник. ent-N14ClosetDouble = двойной шкаф .desc = Больше дверей - больше вещей! ent-N14ClosetDoubleRefilling = { ent-N14ClosetDouble } - .suffix = Пополняемый,Случайный - .desc = { ent-N14ClosetDouble.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14ClosetDouble.desc } ent-N14ClosetCabinetWood = комод .desc = Довоенный деревянный комод. ent-N14ClosetCabinetWoodRefilling = { ent-N14ClosetCabinetWood } - .suffix = Пополняемый,Случайный - .desc = { ent-N14ClosetCabinetWood.desc } + .suffix = Пополняемый,Случайный + .desc = { ent-N14ClosetCabinetWood.desc } ent-N14ClosetEnclave = { ent-N14ClosetBaseW } .suffix = Анклав .desc = { ent-N14ClosetBaseW.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/storage/crates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/storage/crates.ftl index e20411c1a8a..f7d0cfc9632 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/storage/crates.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/storage/crates.ftl @@ -66,4 +66,4 @@ ent-N14CrateBreakArmy = армейский ящик .desc = { ent-N14CrateBreakBase.desc } ent-N14CrateBreakArmyDamaged = { ent-N14CrateBreakArmy } .suffix = повреждённый - .desc = { ent-N14CrateBreakArmy.desc } \ No newline at end of file + .desc = { ent-N14CrateBreakArmy.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/wallmount/base_lighting.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/wallmount/base_lighting.ftl index e912a330b5c..fb579d72779 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/wallmount/base_lighting.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/wallmount/base_lighting.ftl @@ -1,5 +1,5 @@ ent-N14LightSmallAlwayson = маленький светильник - .desc = Всегда работающий светильник. + .desc = Всегда работающий светильник. .suffix = Всегда запитанный ent-N14LightSmallEmpty = маленький светильник .desc = Осветительный прибор. Потребляет энергию и излучает свет, если оснащён лампой накаливания. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/wallmount/posters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/wallmount/posters.ftl index 2fbe4499d13..27862e2e8da 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/wallmount/posters.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/wallmount/posters.ftl @@ -93,7 +93,7 @@ ent-N14PosterVaultTec09 = плакат Vault-Tec ent-N14PosterAbraxo = плакат 'Абраксо' .desc = Потрёпанный плакат чистящего средства 'Абраксо'. ent-N14PosterBoscom = плакат 'Боском' - .desc = Потрёпанный плакат бостонской телекоммуникационной компании. + .desc = Потрёпанный плакат бостонской телекоммуникационной компании. ent-N14PosterGNN = плакат 'Галактические новости' .desc = Потрёпанный плакат радиостанции 'Галактические новости'. ent-N14PosterWideNukacola1 = { ent-N14PosterBase } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/terminator.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/terminator.ftl index fbd7364460a..3581ea34cf7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/terminator.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/terminator.ftl @@ -1,6 +1,6 @@ ent-BaseTerminatorObjective = { ent-BaseObjective } .desc = { ent-BaseObjective.desc } ent-TerminateObjective = { ent-BaseTerminatorObjective } - .desc = Follow your programming and terminate the target. + .desc = Follow your programming and terminate the target. ent-ShutDownObjective = Shut down .desc = Once the mission is complete die to prevent our technology from being stolen. diff --git a/Resources/Locale/ru-RU/tools/components/welder-component.ftl b/Resources/Locale/ru-RU/tools/components/welder-component.ftl index 99694e02587..3876a3f748d 100644 --- a/Resources/Locale/ru-RU/tools/components/welder-component.ftl +++ b/Resources/Locale/ru-RU/tools/components/welder-component.ftl @@ -4,7 +4,8 @@ welder-component-no-fuel-message = В устройстве не осталось welder-component-no-fuel-in-tank = { $owner } пуст. welder-component-on-examine-welder-lit-message = [color=orange]Горит[/color] welder-component-on-examine-welder-not-lit-message = Не горит -welder-component-on-examine-detailed-message = Топливо: [color={ $colorName }]{ $fuelLeft }/{ $fuelCapacity }[/color] +welder-component-on-examine-detailed-message = + Топливо: [color={ $colorName }]{ $fuelLeft }/{ $fuelCapacity }[/color] { $status } welder-component-suicide-lit-others-message = { $victim } заваривает все свои отверстия! Похоже, что они пытаются совершить самоубийство! welder-component-suicide-lit-message = Ты завариваешь все свои отверстия! diff --git a/Tools/ss14_ru/keyfinder.py b/Tools/ss14_ru/keyfinder.py index b06d4282868..3b8fb33fcc5 100644 --- a/Tools/ss14_ru/keyfinder.py +++ b/Tools/ss14_ru/keyfinder.py @@ -128,21 +128,23 @@ def write_to_ru_files(self, ru_file, ru_file_parsed, en_file_parsed): for idx, en_message in enumerate(en_file_parsed.body): if isinstance(en_message, ast.ResourceComment) or isinstance(en_message, ast.GroupComment) or isinstance(en_message, ast.Comment): continue - + ru_message_analog_idx = py_.find_index(ru_file_parsed.body, lambda ru_message: self.find_duplicate_message_id_name(ru_message, en_message)) have_changes = False - - # Attributes - if getattr(en_message, 'attributes', None) and ru_message_analog_idx != -1: - if not ru_file_parsed.body[ru_message_analog_idx].attributes: - ru_file_parsed.body[ru_message_analog_idx].attributes = en_message.attributes - have_changes = True - else: - for en_attr in en_message.attributes: - ru_attr_analog = py_.find(ru_file_parsed.body[ru_message_analog_idx].attributes, lambda ru_attr: ru_attr.id.name == en_attr.id.name) - if not ru_attr_analog: - ru_file_parsed.body[ru_message_analog_idx].attributes.append(en_attr) - have_changes = True + + # Проверка, что объект не является Junk и имеет атрибуты + if ru_message_analog_idx != -1 and not isinstance(ru_file_parsed.body[ru_message_analog_idx], ast.Junk) and hasattr(ru_file_parsed.body[ru_message_analog_idx], 'attributes'): + # Attributes + if getattr(en_message, 'attributes', None): + if not ru_file_parsed.body[ru_message_analog_idx].attributes: + ru_file_parsed.body[ru_message_analog_idx].attributes = en_message.attributes + have_changes = True + else: + for en_attr in en_message.attributes: + ru_attr_analog = py_.find(ru_file_parsed.body[ru_message_analog_idx].attributes, lambda ru_attr: ru_attr.id.name == en_attr.id.name) + if not ru_attr_analog: + ru_file_parsed.body[ru_message_analog_idx].attributes.append(en_attr) + have_changes = True # New elements if ru_message_analog_idx == -1: From 6aa2cefed3963a41332afb9106f5837434f72142 Mon Sep 17 00:00:00 2001 From: Vonsant Date: Sun, 30 Jun 2024 03:04:38 +0300 Subject: [PATCH 02/34] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/en-US/ss14-ru/prototypes/body/parts/gingerbread.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/gingerbread.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/gingerbread.ftl index 73230bcf158..c2f1aa0a3e0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/gingerbread.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/gingerbread.ftl @@ -3,7 +3,7 @@ ent-PartGingerbread = gingerbead body part ent-TorsoGingerbread = gingerbread torso .desc = { ent-BaseTorso.desc } ent-HeadGingerbread = gingerbread head - .desc = { ent-[BaseHead.desc } + .desc = { ent-BaseHead.desc } ent-LeftArmGingerbread = left gingerbread arm .desc = { ent-BaseLeftArm.desc } ent-RightArmGingerbread = right gingerbread arm From 54c2745a99aecade44ac73beba9fd100b323e6f0 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 15:42:48 +0300 Subject: [PATCH 03/34] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/administration/commands/stealthmin-command.ftl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/administration/commands/stealthmin-command.ftl b/Resources/Locale/ru-RU/administration/commands/stealthmin-command.ftl index d69ff663fe2..e6a3a3b15b9 100644 --- a/Resources/Locale/ru-RU/administration/commands/stealthmin-command.ftl +++ b/Resources/Locale/ru-RU/administration/commands/stealthmin-command.ftl @@ -1,5 +1,4 @@ cmd-stealthmin-desc = Переключение видимости вас через adminwho. -cmd-stealthmin-help = - Использование: stealthmin +cmd-stealthmin-help = Использование: stealthmin Используйте stealthmin для переключения отображение вас в результате вывода команды adminwho. cmd-stealthmin-no-console = Вы не можете использовать эту команду через консоль сервера From 928182775065a4c6db88e03bdcbc4a6c978130f3 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 15:43:23 +0300 Subject: [PATCH 04/34] Update admin-notes.ftl --- Resources/Locale/ru-RU/administration/ui/admin-notes.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/administration/ui/admin-notes.ftl b/Resources/Locale/ru-RU/administration/ui/admin-notes.ftl index b52ae0b018d..501bfb02be1 100644 --- a/Resources/Locale/ru-RU/administration/ui/admin-notes.ftl +++ b/Resources/Locale/ru-RU/administration/ui/admin-notes.ftl @@ -23,7 +23,7 @@ admin-notes-hide = Скрыть admin-notes-delete-confirm = Вы уверены? admin-notes-edited = Последнее изменение от { $author } в { $date } admin-notes-unbanned = Разбанил { $admin } в { $date } -admin-notes-message-desc =[color=white]Вы получили { $count -> +admin-notes-message-desc = [color=white]Вы получили { $count -> [1] новое сообщение от администрации *[other] новых сообщений от администрации } с момента последней игры на сервере.[/color] From f658d20d89515f154ba3f5bda5bfba9827261a87 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 15:44:26 +0300 Subject: [PATCH 05/34] Update hypospray-component.ftl --- .../Locale/ru-RU/chemistry/components/hypospray-component.ftl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl b/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl index e28f25c4e8f..13050db2d98 100644 --- a/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl +++ b/Resources/Locale/ru-RU/chemistry/components/hypospray-component.ftl @@ -3,8 +3,7 @@ hypospray-all-mode-text = Только ввод hypospray-mobs-only-mode-text = Забор и ввод hypospray-invalid-text = Ошибка -hypospray-volume-label = - Объём: [color=white]{ $currentVolume }/{ $totalVolume } ед.[/color] +hypospray-volume-label = Объём: [color=white]{ $currentVolume }/{ $totalVolume } ед.[/color] Режим: [color=white]{ $modeString }[/color] ## Entity From 19783e3fb015a3f937187e6fc34e5e6639c8bac0 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 15:44:59 +0300 Subject: [PATCH 06/34] Update injector-component.ftl --- .../Locale/ru-RU/chemistry/components/injector-component.ftl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl b/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl index ebc585fa240..3526b47059a 100644 --- a/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl +++ b/Resources/Locale/ru-RU/chemistry/components/injector-component.ftl @@ -3,8 +3,7 @@ injector-draw-text = Забор injector-inject-text = Введение injector-invalid-injector-toggle-mode = Неверный режим -injector-volume-label = - Объём: [color=white]{ $currentVolume }/{ $totalVolume }[/color] +injector-volume-label = Объём: [color=white]{ $currentVolume }/{ $totalVolume }[/color] Режим: [color=white]{ $modeString }[/color] ([color=white]{ $transferVolume } ед.[/color]) ## Entity From 1f7a05321981cc1c71bfd675681b4afc2fae37a8 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 15:46:14 +0300 Subject: [PATCH 07/34] Update kitchen-spike-component.ftl --- .../ru-RU/kitchen/components/kitchen-spike-component.ftl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl b/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl index 4dbe634c88c..5bc537d33cc 100644 --- a/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl +++ b/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl @@ -1,8 +1,7 @@ comp-kitchen-spike-deny-collect = { CAPITALIZE($this) } уже чем-то занят, сначала закончите срезать мясо! comp-kitchen-spike-deny-butcher = { CAPITALIZE($victim) } не может быть разделан на { $this }. comp-kitchen-spike-deny-butcher-knife = { CAPITALIZE($victim) } не может быть разделан на { $this }, используйте нож для разделки. -comp-kitchen-spike-deny-not-dead = - { CAPITALIZE($victim) } не может быть разделан. { CAPITALIZE(SUBJECT($victim)) } { GENDER($victim) -> +comp-kitchen-spike-deny-not-dead = { CAPITALIZE($victim) } не может быть разделан. { CAPITALIZE(SUBJECT($victim)) } { GENDER($victim) -> [male] ещё жив [female] ещё жива [epicene] ещё живы From 0b7cd37ac5764d97886593cd617a261eb17f4da9 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 15:50:49 +0300 Subject: [PATCH 08/34] Update crates.ftl --- .../ss14-ru/prototypes/nuclear14/catalog/fills/crates.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/crates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/crates.ftl index 52218184db0..2fb804939e7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/crates.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/catalog/fills/crates.ftl @@ -1,6 +1,6 @@ ent-N14CrateBreakPlainFilledCigarettes = { ent-N14CrateBreakPlain } - .suffix = cigarette packs random + .suffix = ящик случайных сигарет .desc = { ent-N14CrateBreakPlain.desc } -ent-N14CrateBreakPlainFilledCigarettesRepublic = Republic cigarette crate - .suffix = republics +ent-N14CrateBreakPlainFilledCigarettesRepublic = Ящик республиканских сигарет + .suffix = республиканские .desc = { ent-N14CrateBreakPlain.desc } From 9b4564b3d75b5e3b292f1f2f31d4ed19c7d303b0 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 15:54:42 +0300 Subject: [PATCH 09/34] Update cigarette.ftl --- .../consumable/smokeables/cigarette.ftl | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/cigarette.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/cigarette.ftl index 32b78e56841..7bfd558621a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/cigarette.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/cigarette.ftl @@ -1,23 +1,23 @@ ent-N14Cigarette = { ent-Cigarette } .desc = { ent-Cigarette.desc } ent-N14CigaretteSpent = { ent-N14Cigarette } - .suffix = spent + .suffix = выкуренная .desc = { ent-N14Cigarette.desc } ent-N14CigaretteKool = { ent-N14Cigarette } - .desc = A Kool brand cigarette. - .suffix = kool + .desc = Сигарета марки 'Кул'. + .suffix = кул ent-N14CigaretteSalem = { ent-N14CigaretteKool } - .desc = A Salem brand cigarette. - .suffix = salem + .desc = Сигарета марки 'Салем'. + .suffix = салем ent-N14CigaretteMarlboro = { ent-N14Cigarette } - .desc = A Marlboro brand cigarette. - .suffix = marlboro + .desc = Сигарета марки 'Мальборо'. + .suffix = мальборо ent-N14CigaretteRepublic = { ent-N14Cigarette } - .desc = A Republic brand cigarette. - .suffix = republic + .desc = Сигарета марки 'Республика'. + .suffix = республика ent-N14CigaretteRollie = { ent-N14Cigarette } - .desc = A roll up cigarette. - .suffix = rollie + .desc = Самокрутка. + .suffix = самокрутка ent-N14CigaretteWinston = { ent-N14Cigarette } - .desc = A Winston brand cigarette. - .suffix = winston + .desc = Сигарета марки 'Винстон'. + .suffix = винстон From 0e4cfadc0e1aed04771987a765d03e308475bf79 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 15:56:53 +0300 Subject: [PATCH 10/34] Update packs.ftl --- .../objects/consumable/smokeables/packs.ftl | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/packs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/packs.ftl index e247978f71d..04bc8e0149a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/packs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/packs.ftl @@ -1,15 +1,15 @@ -ent-N14CigPackBase = cigarette pack - .desc = { ent-BaseStorageItem.desc } -ent-N14CigarettePackSalem = Salem cigs pack - .desc = A refined green cigarette packet. A label on the packaging reads, Salem. Refreshes your taste. -ent-N14CigarettePackKool = Kools cigs pack - .desc = A kool green cigarette packet. A label on the packaging reads, KOOL. So good, it's got to be KOOL! -ent-N14CigarettePackMarlboro = Marlboro cigs pack - .desc = A cool red cigarette packet. A label on the packaging reads, Marlboro. Where theres a man, theres a Marlboro. -ent-N14CigarettePackWinston = Winston cigs pack - .desc = A refined red cigarette packet. A label on the packaging reads, Winston. Winston tastes good, like a cigarette should! -ent-N14CigarettePackCustom = cardboard cigs pack - .desc = A simple hand-made cardboard cigarette pack - .suffix = custom -ent-N14CigarettePackRepublics = Republics cig pack - .desc = A rustic cardboard cigarette pack with the flag of the New Californian Republic on it. A label on the packaging reads, Republics. Taste the freedom, feel the burn. +ent-N14CigPackBase = пачка сигарет + .desc = { ent-BaseStorageItem.desc } +ent-N14CigarettePackSalem = пачка "Салем" + .desc = Изысканная зелёная пачка сигарет. На упаковке надпись: "Салем. Освежающий вкус". +ent-N14CigarettePackKool = пачка "Кул" + .desc = Крутая зелёная пачка сигарет. На упаковке надпись: "КУЛ. Настолько хороши, что могут быть только КУЛ!" +ent-N14CigarettePackMarlboro = пачка "Мальборо" + .desc = Крутая красная пачка сигарет. На упаковке надпись: "Мальборо. Где есть мужчина, там есть Мальборо". +ent-N14CigarettePackWinston = пачка "Винстон" + .desc = Изысканная красная пачка сигарет. На упаковке надпись: "Винстон. Винстон на вкус хорош, как и положено сигарете!" +ent-N14CigarettePackCustom = пачка самокруток + .desc = Простая самодельная картонная пачка для сигарет. + .suffix = самодельная +ent-N14CigarettePackRepublics = пачка "Республика" + .desc = Грубая картонная пачка сигарет с флагом Новой Калифорнийской Республики. На упаковке надпись: "Республика. Почувствуй обжигающий вкус свободы". From a6b0dc4379519b77390673f5f8fb1ab40989c42a Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 15:58:02 +0300 Subject: [PATCH 11/34] Update smokeables.ftl --- .../entities/objects/consumable/smokeables/smokeables.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/smokeables.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/smokeables.ftl index 333b0d9b982..54e4ba28af3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/smokeables.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/consumable/smokeables/smokeables.ftl @@ -1,8 +1,8 @@ -ent-N14PackRollingPaper = pack of rolling paper - .desc = A pack of thin pieces of paper used to make fine smokeables. +ent-N14PackRollingPaper = пачка папиросной бумаги + .desc = Пачка тонких листков бумаги, используемых для создания отменного курева. ent-N14RollingPaper = { ent-PaperRolling } - .suffix = Full + .suffix = Полный .desc = { ent-PaperRolling.desc } ent-N14RollingPaper1 = { ent-N14RollingPaper } - .suffix = Single + .suffix = Один .desc = { ent-N14RollingPaper.desc } From dd24f2fc8e727ab80760be02c3afc686e05727b1 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 15:59:37 +0300 Subject: [PATCH 12/34] Update containers.ftl --- .../entities/objects/materials/containers.ftl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/containers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/containers.ftl index e80bba7685c..22420a92c82 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/containers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/containers.ftl @@ -1,5 +1,5 @@ -ent-N14FuelTankHandy = fuel tank - .desc = A tank of Mr Handy fuel. -ent-N14FuelTankHandyRusty = fuel tank - .desc = A rusty tank of Mr Handy fuel. - .suffix = rusty +ent-N14FuelTankHandy = топливный бак + .desc = Бак с топливом производства Mr Handy. +ent-N14FuelTankHandyRusty = топливный бак + .desc = Бак с топливом производства Mr Handy. + .suffix = ржавый From 6db34d1e68cffe8bbc5e11b267cd07515c5aada2 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:00:12 +0300 Subject: [PATCH 13/34] Update materials.ftl --- .../nuclear14/entities/objects/materials/materials.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/materials.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/materials.ftl index e6ab7985b28..084dc016a1b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/materials.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/materials/materials.ftl @@ -16,9 +16,9 @@ ent-SulfurPowder1 = { ent-SulfurPowder } ent-SulfurPowder10 = { ent-SulfurPowder } .suffix = 10 .desc = { ent-SulfurPowder.desc } -ent-N14Paper = paper +ent-N14Paper = бумага .suffix = 10 .desc = { ent-SheetPaper.desc } ent-N14Paper1 = { ent-N14Paper } - .suffix = Single + .suffix = Один .desc = { ent-N14Paper.desc } From 299ddcb4c498148c635083b86237f253bbf7279b Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:02:22 +0300 Subject: [PATCH 14/34] Update craftingmaterials.ftl --- .../objects/misc/craftingmaterials.ftl | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/misc/craftingmaterials.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/misc/craftingmaterials.ftl index ccb6998f150..62453cd6361 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/misc/craftingmaterials.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/misc/craftingmaterials.ftl @@ -2,13 +2,13 @@ ent-N14MaterialRadscorpionTail = хвост радскорпиона .desc = Оторван от радскорпиона. Очевидно. ent-N14MaterialBrahminHide = шкура брамина .desc = Жесткая прочная кожа. -ent-N14MaterialAntChitin = ant chitin - .desc = A strong and resistent piece of ant "skin". -ent-N14MaterialExoskeleton = radscorpion exoskeleton piece - .desc = A strong and resistent piece of radscorpion exoskeleton. -ent-N14MaterialNightstalkerPelt = nightstalker pelt - .desc = A pelt of fresh nightstalker leather. -ent-N14MaterialYaoguaiHide = yaoguai hide - .desc = A big hide of yaoguai, heavy and strong. -ent-N14MaterialLeather = leather - .desc = A piece of leather, just non special leather. +ent-N14MaterialAntChitin = хитин муравья + .desc = Крепкий и стойкий кусок муравьиной "кожи". +ent-N14MaterialExoskeleton = часть экзоскелета радскорпиона + .desc = Крепкий и стойкий фрагмент экзоскелета радскорпиона. +ent-N14MaterialNightstalkerPelt = шкура ночного охотника + .desc = Свежесодранная кожа ночного охотника. +ent-N14MaterialYaoguaiHide = шкура яо-гая + .desc = Большая шкура яо-гая, тяжелая и прочная. +ent-N14MaterialLeather = кожа + .desc = Кусок обычной кожи, ничего особенного. From 74916753deb16cb8bdf76dcbba5686c424ed5547 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:05:13 +0300 Subject: [PATCH 15/34] Update chemicals.ftl --- .../objects/specific/medical/chemicals.ftl | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/chemicals.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/chemicals.ftl index 539e3181f49..e3ff0ba6376 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/chemicals.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/chemicals.ftl @@ -1,7 +1,7 @@ ent-N14ChemicalSyringe = химический шприц .desc = Шприц, наполненный неизвестным химикатом. Наркоманы убили бы за него. -ent-N14BaseSyringe = doctors syringe - .desc = Used to draw blood samples from mobs, or to inject them with reagents. Chem junkies would kill you for it. +ent-N14BaseSyringe = медицинский шприц + .desc = Используется для забора образцов крови у пациентов или для введения им реагентов. Торчки убили бы за него. ent-N14DoctorSyringe = { ent-N14BaseSyringe } .desc = { ent-N14BaseSyringe.desc } ent-N14Stimpak = стимпак @@ -30,13 +30,13 @@ ent-N14HealingPowder = целебный порошок .desc = Мешочек с племенным целебным порошком. Вызывает тошноту. ent-N14Antidote = антидот .desc = Противоядие, сделанное из хвоста радскорпиона и воды. -ent-N14SmellingSalts = smelling salts - .desc = A small glass ampoule containing smelling salts. Their smell is said to wake up even a dead ghoul. -ent-N14HealingPoultice = healing Healing - .desc = A bag of poultice to help with all common ailments slowly. -ent-N14Bitterdrink = Bitterdrink - .desc = A bottle containing a mixture of plants to aid against poisons and radiation. -ent-N14MourningPoultice = mourning poultice - .desc = A bag of powder made from poisonous flowers for use within tribal ceremenoies. -ent-N14UltraStimpak = ultra stimpak - .desc = A special type of super stimpak with an additional mixture of chemicals which makes a man near invincible at a great cost. It is widely deemed inhumane and outlawed. +ent-N14SmellingSalts = нюхательная соль + .desc = Небольшая стеклянная ампула, содержащая нюхательную соль. Говорят, её запах способен разбудить даже мёртвого гуля. +ent-N14HealingPoultice = целебная припарка + .desc = Мешочек с припаркой, медленно помогающей от всех распространённых недугов. +ent-N14Bitterdrink = горький напиток + .desc = Бутылка, содержащая смесь растений, помогающую против ядов и радиации. +ent-N14MourningPoultice = траурная припарка + .desc = Мешочек с порошком, изготовленным из ядовитых цветов, для использования в племенных церемониях. +ent-N14UltraStimpak = ультрастимпак + .desc = Особый тип суперстимпака с дополнительной смесью химикатов, которая делает человека почти неуязвимым, но взимает за это огромную цену. Считается абсолютно негуманным. From 1bdc54d3aba0452c5676cbf9aa8af8992994e896 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:06:40 +0300 Subject: [PATCH 16/34] Update equipment.ftl --- .../entities/objects/specific/medical/equipment.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/equipment.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/equipment.ftl index 22e7b97b7ff..40a74ab6ce8 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/equipment.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/specific/medical/equipment.ftl @@ -1,3 +1,3 @@ -ent-N14MortarpestleGrinder = mortar & pestle - .desc = A mortar and pestle for grinding things into reagents. - .suffix = grinder/juicer +ent-N14MortarpestleGrinder = ступка с пестиком + .desc = Ступка и пестик для измельчения вещей в реагенты. + .suffix = измельчитель/соковыжималка From a7ef1b8b98a00f7076403892c8fee9098b686d6b Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:08:27 +0300 Subject: [PATCH 17/34] Update 45-70.ftl --- .../entities/objects/weapons/guns/ammunition/boxes/45-70.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/45-70.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/45-70.ftl index 6d1462ac4fc..98785f27319 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/45-70.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/45-70.ftl @@ -1,4 +1,4 @@ ent-BaseMagazineBox45-70 = { ent-BaseItem } .desc = { ent-BaseItem.desc } -ent-MagazineBox45-70 = ammunition box (.45-70 gov't) +ent-MagazineBox45-70 = коробка патронов (.45-70) .desc = { ent-BaseMagazineBox45-70.desc } From 72fe411d6cd0787a440e3e29da7c02e795be084e Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:09:19 +0300 Subject: [PATCH 18/34] Update 50.ftl --- .../entities/objects/weapons/guns/ammunition/boxes/50.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/50.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/50.ftl index 73fa887b556..5e5f3463d8a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/50.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/boxes/50.ftl @@ -1,4 +1,4 @@ ent-BaseMagazineBox50 = { ent-BaseItem } .desc = { ent-BaseItem.desc } -ent-MagazineBox50 = ammunition box (.50 anti materiel) +ent-MagazineBox50 = коробка патронов (.50 анти-материальные) .desc = { ent-BaseMagazineBox50.desc } From 753d844a96bafb5abd2e02a7a789fd743eae2850 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:09:50 +0300 Subject: [PATCH 19/34] Update 45-70.ftl --- .../objects/weapons/guns/ammunition/cartridges/45-70.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl index 6bb1d633393..4b0487f017d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl @@ -1,2 +1,2 @@ -ent-N14Cartridge45-70 = cartridge (.45-70 gov't) +ent-N14Cartridge45-70 = пуля (.45-70) .desc = { ent-BaseCartridgeLightRifle.desc } From 745d215841ace48e6819b047cc6d3c178c772ef7 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:10:17 +0300 Subject: [PATCH 20/34] Update 45-70.ftl --- .../objects/weapons/guns/ammunition/projectiles/45-70.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/projectiles/45-70.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/projectiles/45-70.ftl index 43d569a1e68..00026e6b9a9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/projectiles/45-70.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/projectiles/45-70.ftl @@ -1,2 +1,2 @@ -ent-N14Bullet45-70 = bullet (.45-70 gov't) +ent-N14Bullet45-70 = пуля (.45-70 gov't) .desc = { ent-BaseBullet.desc } From fa97cceeec9ea74dc8de3ad253ee12f172549aeb Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:10:39 +0300 Subject: [PATCH 21/34] Update 45-70.ftl --- .../objects/weapons/guns/ammunition/cartridges/45-70.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl index 4b0487f017d..89994d1a1d1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/cartridges/45-70.ftl @@ -1,2 +1,2 @@ -ent-N14Cartridge45-70 = пуля (.45-70) +ent-N14Cartridge45-70 = патрон (.45-70) .desc = { ent-BaseCartridgeLightRifle.desc } From a9495ab1d2ad667b5d714e794abcab7c18b66d77 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:11:21 +0300 Subject: [PATCH 22/34] Update 10mm.ftl --- .../objects/weapons/guns/ammunition/speedloaders/10mm.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/10mm.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/10mm.ftl index eae284c0504..e81fe09f648 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/10mm.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/10mm.ftl @@ -1,4 +1,4 @@ -ent-N14BaseSpeedLoader10 = speed loader (10mm) +ent-N14BaseSpeedLoader10 = спидлоадер (10-мм) .desc = { ent-BaseItem.desc } -ent-SpeedLoader10 = speed loader (10mm) +ent-SpeedLoader10 = спидлоадер (10-мм) .desc = { ent-N14BaseSpeedLoader10.desc } From f17a507ce1c0d0e454155a63474cafb3be590ed8 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:12:31 +0300 Subject: [PATCH 23/34] Update 44.ftl --- .../objects/weapons/guns/ammunition/speedloaders/44.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/44.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/44.ftl index 2b706c72499..ea5a9308675 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/44.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/44.ftl @@ -1,4 +1,4 @@ -ent-N14BaseSpeedLoader44 = speed loader (.44 magnum) +ent-N14BaseSpeedLoader44 = спидлоадер (.44 магнум) .desc = { ent-BaseItem.desc } -ent-SpeedLoader44 = speed loader (.44 magnum) +ent-SpeedLoader44 = спидлоадер (.44 магнум) .desc = { ent-N14BaseSpeedLoader44.desc } From ea18738380e3b4a0bb9e117b841f461fcf9f54d3 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:13:15 +0300 Subject: [PATCH 24/34] Update 45-70.ftl --- .../objects/weapons/guns/ammunition/speedloaders/45-70.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/45-70.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/45-70.ftl index 5189de04888..f791341ea4e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/45-70.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/45-70.ftl @@ -1,4 +1,4 @@ -ent-N14BaseSpeedLoader45-70 = speed loader (45-70 gov) +ent-N14BaseSpeedLoader45-70 = спидлоадер (45-70) .desc = { ent-BaseItem.desc } -ent-SpeedLoader45-70 = speed loader (45-70 gov) +ent-SpeedLoader45-70 = спидлоадер (45-70) .desc = { ent-N14BaseSpeedLoader45-70.desc } From 64624fd1f186ea93fa3d5406fef51cb9f35101b3 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:13:56 +0300 Subject: [PATCH 25/34] Update 9mm.ftl --- .../objects/weapons/guns/ammunition/speedloaders/9mm.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/9mm.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/9mm.ftl index 2a0fe4a7104..d237d6df692 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/9mm.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/ammunition/speedloaders/9mm.ftl @@ -1,4 +1,4 @@ -ent-N14BaseSpeedLoader9 = speed loader (9mm) +ent-N14BaseSpeedLoader9 = спидлоадер (9-мм) .desc = { ent-BaseItem.desc } -ent-SpeedLoader9 = speed loader (9mm) +ent-SpeedLoader9 = спидлоадер (9-мм) .desc = { ent-N14BaseSpeedLoader9.desc } From ce3b56e3afd2f6c7c5fe9f5b9ce0e0072bbd6084 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:15:52 +0300 Subject: [PATCH 26/34] Update revolvers.ftl --- .../objects/weapons/guns/revolvers/revolvers.ftl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/revolvers/revolvers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/revolvers/revolvers.ftl index ef8f4431705..516749b1daf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/revolvers/revolvers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/revolvers/revolvers.ftl @@ -1,10 +1,10 @@ ent-N14WeaponRevolver9mm = 9-мм револьвер - .desc = Маленький удобный револьвер, использующий боеприпасы 9мм калибра. -ent-N14WeaponRevolver10mm = 10mm revolver - .desc = The first prototype for the semiauto 10mm pistol, Uses 10mm. + .desc = Маленький удобный револьвер, использующий боеприпасы 9-мм калибра. +ent-N14WeaponRevolver10mm = 10-мм револьвер + .desc = Первый прототип полуавтоматического 10-мм пистолита, использует боеприпасы 10-мм калибра. ent-N14WeaponRevolverMagnun = магнум .desc = Большой и мощный револьвер. Использует боеприпасы .44 калибра. ent-N14WeaponHunterRevolver = охотничий револьвер .desc = Тяжелый револьвер с длинным стволом, предназначенный для охоты на мелких животных. Также подходит и для людей. Использует патроны "магнум" 44-го калибра. -ent-N14WeaponRangerSequoia = ranger sequoia - .desc = 20 years of suffering for a good looking glorified revolver, worth it. Uses .45-70 gov't ammo. +ent-N14WeaponRangerSequoia = 'Секвойя' рейнджера + .desc = 20 лет страданий ради красивого пафосного револьвера. Оно того стоило. Использует патроны .45-70. From 1147ebc54fd5b74193b9136c390d1332573cc260 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:17:41 +0300 Subject: [PATCH 27/34] Update smgs.ftl --- .../nuclear14/entities/objects/weapons/guns/smgs/smgs.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/smgs/smgs.ftl index 8ac614ec54c..00d85b85a9c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/smgs/smgs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/smgs/smgs.ftl @@ -10,7 +10,7 @@ ent-N14WeaponAdvanceSubMachineGun12mm = продвинутый 12,7-мм пис .desc = Громоздкий пистолет-пулемет с системой подачи магазина сверху, он использует патроны калибра 12 мм. ent-N14weapon9mmSMG = пистолет-пулемёт 9 мм .desc = Простой металлический пистолет-пулемёт довоенного производства, под патронник калибра 9 мм. -ent-N14Weapon45SMG = .45 SMG - .desc = A pre-war SMG with a wooden stock, chambered in .45. +ent-N14Weapon45SMG = пистолет-пулемёт 45 мм + .desc = Довоенный автомат SMG с деревянным прикладом, под патронник .45-го калибра. ent-N14weapon45SMG = пистолет-пулемёт 45 мм - .desc = Довоенный автомат SMG с деревянным прикладом, под патронник 45-го калибра. + .desc = Довоенный автомат SMG с деревянным прикладом, под патронник .45-го калибра. From 788eee9a5af229a32f889fad47103f6500811709 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:19:25 +0300 Subject: [PATCH 28/34] Update snipers.ftl --- .../entities/objects/weapons/guns/snipers/snipers.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/snipers/snipers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/snipers/snipers.ftl index 653ae3b482f..3c1c5247b0f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/snipers/snipers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/guns/snipers/snipers.ftl @@ -2,14 +2,14 @@ ent-N14WeaponSniperHunting = охотничья винтовка .desc = Надёжная винтовка со скользящим затвором. Использует патроны .308 калибра. ent-N14WeaponAntiMateriel = Анти-Материальная винтовка .desc = С одного взгляда внушает страх. Использует анти-материальные патроны .50 калибра. -ent-N14Weapon50NcrRifle = .50 NCR rifle - .desc = A try by the NCR to make .50 ammo a standart on normal infantry, very cheap but it will deal a lot of damage. Uses .50 anti-material ammo. +ent-N14Weapon50NcrRifle = винтовка НКР + .desc = Попытка НКР сделать патроны калибра .50 стандартом для обычной пехоты. Очень дешёвая, но наносит серьёзный урон. Использует анти-материальные патроны калибра .50. ent-N14WeaponLeverCarbine = карабин с рычажным затвором .desc = Карабин с рычажным затвором. Использует патроны .44 калибра. ent-N14WeaponLeverRifle = винтовка с рычажным затвором .desc = Винтовка с рычажным затвором. Использует патроны .308 калибра. -ent-N14WeaponBrushGun = brush gun - .desc = A powerfull lever action carbine. Uses .45-70 gov't ammo. +ent-N14WeaponBrushGun = 'Очиститель зарослей' +.desc = Мощный карабин с рычажным затвором. Использует патроны .45-70. ent-N14WeaponPipeRifle = гладкоствольная винтовка .desc = Кусок металлической трубы с деревянным прикладом. Использует патроны .308 калибра ent-N14WeaponSniperVarmint = варминт-винтовка From 0f11c798287996f0ac983cadfe7c591ed4690f05 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:20:05 +0300 Subject: [PATCH 29/34] Update baton-club.ftl --- .../nuclear14/entities/objects/weapons/melee/baton-club.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/melee/baton-club.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/melee/baton-club.ftl index 05221542115..b4eca38ed12 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/melee/baton-club.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/objects/weapons/melee/baton-club.ftl @@ -1,2 +1,2 @@ -ent-N14BaseBallBat = baseball bat - .desc = A robust baseball bat. +ent-N14BaseBallBat = бейсбольная бита + .desc = Робастная бейсбольная бита. From e967ed51259f17e879a11bc683e37770ca9d869e Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:23:18 +0300 Subject: [PATCH 30/34] Update street_furniture.ftl --- .../structures/furniture/street_furniture.ftl | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/street_furniture.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/street_furniture.ftl index e6cea88f861..050dd72a712 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/street_furniture.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/furniture/street_furniture.ftl @@ -72,81 +72,81 @@ ent-N14SignStreetSnake = знак извилистой дороги .desc = Старый знак извилистой дороги. ent-N14StreetPowerPoleRight = электрический столб .desc = Старый деревянный столб с трансформатором для распределения электроэнергии. - .suffix = справа + .suffix = правый ent-N14StreetPowerPoleRightLeft = { ent-N14StreetPowerPoleRight } - .suffix = слева + .suffix = левый .desc = { ent-N14StreetPowerPoleRight.desc } ent-N14BaseLightStructure = фонарный столб .desc = Да будет свет. ent-N14LightStreetLampPostAlwaysPoweredRight = { ent-N14BaseLightStructure } - .suffix = всегда включен, справа + .suffix = всегда включен, правый .desc = { ent-N14BaseLightStructure.desc } ent-N14LightStreetLampPostAlwaysPoweredLeft = { ent-N14LightStreetLampPostAlwaysPoweredRight } .desc = Этот фонарь не имеет очевидного источника питания. - .suffix = всегда включен, слева + .suffix = всегда включен, левый ent-N14LightStreetLampPostPoweredEmptyRight = { ent-N14BaseLightStructure } - .suffix = пустой, справа + .suffix = пустой, правый .desc = { ent-N14BaseLightStructure.desc } ent-N14LightStreetLampPostPoweredEmptyLeft = { ent-N14LightStreetLampPostPoweredEmptyRight } - .suffix = пустой, слева + .suffix = пустой, левый .desc = { ent-N14LightStreetLampPostPoweredEmptyRight.desc } ent-N14LightStreetLampPostPoweredRight = { ent-N14LightStreetLampPostPoweredEmptyRight } .desc = Светильник. Подключается к источнику питания и излучает свет при оснащении лампой. - .suffix = включен, справа + .suffix = включен, правый ent-N14LightStreetLampPostPoweredLeft = { ent-N14LightStreetLampPostPoweredEmptyLeft } .desc = Светильник. Подключается к источнику питания и излучает свет при оснащении лампой. - .suffix = включен, слева + .suffix = включен, левый ent-N14LightStreetLampPostRaiderAlwaysPoweredRight = { ent-N14LightStreetLampPostAlwaysPoweredRight } - .suffix = всегда включен, справа + .suffix = всегда включен, правый .desc = { ent-N14LightStreetLampPostAlwaysPoweredRight.desc } ent-N14LightStreetLampPostRaiderAlwaysPoweredLeft = { ent-N14LightStreetLampPostAlwaysPoweredLeft } - .suffix = всегда включен, слева + .suffix = всегда включен, левый .desc = { ent-N14LightStreetLampPostAlwaysPoweredLeft.desc } ent-N14LightStreetLampPostRaiderPoweredEmptyRight = { ent-N14LightStreetLampPostPoweredEmptyRight } - .suffix = пустой, справа + .suffix = пустой, правый .desc = { ent-N14LightStreetLampPostPoweredEmptyRight.desc } ent-N14LightStreetLampPostRaiderPoweredEmptyLeft = { ent-N14LightStreetLampPostPoweredEmptyLeft } - .suffix = пустой, слева + .suffix = пустой, левый .desc = { ent-N14LightStreetLampPostPoweredEmptyLeft.desc } ent-N14LightStreetLampPostRaiderPoweredRight = { ent-N14LightStreetLampPostPoweredRight } - .suffix = включен, справа + .suffix = включен, правый .desc = { ent-N14LightStreetLampPostPoweredRight.desc } ent-N14LightStreetLampPostRaiderPoweredLeft = { ent-N14LightStreetLampPostPoweredLeft } - .suffix = включен, слева + .suffix = включен, левый .desc = { ent-N14LightStreetLampPostPoweredLeft.desc } ent-N14LightStreetLampPostAlwaysPoweredRight2 = { ent-N14LightStreetLampPostAlwaysPoweredRight } - .suffix = всегда включен, справа + .suffix = всегда включен, правый .desc = { ent-N14LightStreetLampPostAlwaysPoweredRight.desc } ent-N14LightStreetLampPostAlwaysPoweredLeft2 = { ent-N14LightStreetLampPostAlwaysPoweredLeft } - .suffix = всегда включен, слева + .suffix = всегда включен, левый .desc = { ent-N14LightStreetLampPostAlwaysPoweredLeft.desc } ent-N14LightStreetLampPostPoweredEmptyRight2 = { ent-N14LightStreetLampPostPoweredEmptyRight } - .suffix = пустой, справа + .suffix = пустой, правый .desc = { ent-N14LightStreetLampPostPoweredEmptyRight.desc } ent-N14LightStreetLampPostPoweredEmptyLeft2 = { ent-N14LightStreetLampPostPoweredEmptyLeft } - .suffix = пустой, слева + .suffix = пустой, левый .desc = { ent-N14LightStreetLampPostPoweredEmptyLeft.desc } ent-N14LightStreetLampPostPoweredRight2 = { ent-N14LightStreetLampPostPoweredRight } - .suffix = включен, справа + .suffix = включен, правый .desc = { ent-N14LightStreetLampPostPoweredRight.desc } ent-N14LightStreetLampPostPoweredLeft2 = { ent-N14LightStreetLampPostPoweredLeft } - .suffix = включен, слева + .suffix = включен, левый .desc = { ent-N14LightStreetLampPostPoweredLeft.desc } ent-N14LightStreetLampPostRaiderAlwaysPoweredRight2 = { ent-N14LightStreetLampPostAlwaysPoweredRight } - .suffix = Always Powered, Right + .suffix = всегда включен, правый .desc = { ent-N14LightStreetLampPostAlwaysPoweredRight.desc } ent-N14LightStreetLampPostRaiderAlwaysPoweredLeft2 = { ent-N14LightStreetLampPostAlwaysPoweredLeft } - .suffix = Always Powered, Left + .suffix = всегда включен, левый .desc = { ent-N14LightStreetLampPostAlwaysPoweredLeft.desc } ent-N14LightStreetLampPostRaiderPoweredEmptyRight2 = { ent-N14LightStreetLampPostPoweredEmptyRight } - .suffix = Empty, Right + .suffix = пустой, правый .desc = { ent-N14LightStreetLampPostPoweredEmptyRight.desc } ent-N14LightStreetLampPostRaiderPoweredEmptyLeft2 = { ent-N14LightStreetLampPostPoweredEmptyLeft } - .suffix = Empty, Left + .suffix = пустой, левый .desc = { ent-N14LightStreetLampPostPoweredEmptyLeft.desc } ent-N14LightStreetLampPostRaiderPoweredRight2 = { ent-N14LightStreetLampPostPoweredRight } - .suffix = Powered, Right + .suffix = включен, правый .desc = { ent-N14LightStreetLampPostPoweredRight.desc } ent-N14LightStreetLampPostRaiderPoweredLeft2 = { ent-N14LightStreetLampPostPoweredLeft } - .suffix = Powered, Left + .suffix = включен, левый .desc = { ent-N14LightStreetLampPostPoweredLeft.desc } From fe0907ef6340c5421830c92d562b308c177b5317 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:25:02 +0300 Subject: [PATCH 31/34] Update vending_machines.ftl --- .../structures/machines/vending_machines.ftl | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/machines/vending_machines.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/machines/vending_machines.ftl index 7b60e91389c..29408d9d58b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/machines/vending_machines.ftl @@ -3,18 +3,18 @@ ent-N14VendingMachineNukaCola = автомат с Ядер-Колой ent-N14VendingMachineNukaColaIrradiated = автомат с Ядер-Колой .desc = Довоенный торговый автомат, который продает напитки бренда Ядер-Кола. .suffix = радиоактивный -ent-N14VendingMachineNukaColaNew = Nuka-Cola machine - .desc = A Pre-War vending machine that dispenses Nuka-Cola Corporation branded beverages. - .suffix = storage, empty +ent-N14VendingMachineNukaColaNew = автомат с Ядер-Колой + .desc = Довоенный торговый автомат, который продает напитки бренда Ядер-Кола. + .suffix = хранилище, пустой ent-N14VendingMachineNukaColaNewFilled = { ent-N14VendingMachineNukaColaNew } - .suffix = storage, random + .suffix = хранилище, случайнык .desc = { ent-N14VendingMachineNukaColaNew.desc } -ent-N14VendingMachineCigarette = cigarette vendor - .desc = A Pre-War vending machine that dispenses cigarettes. - .suffix = storage, empty +ent-N14VendingMachineCigarette = автомат с сигаретами + .desc = Довоенный торговый автомат, который продает сигареты. + .suffix = хранилище, пустой ent-N14VendingMachineCigaretteFilled = { ent-N14VendingMachineCigarette } - .suffix = random + .suffix = случайные .desc = { ent-N14VendingMachineCigarette.desc } -ent-N14VendingMachineCigaretteFilledRepublic = Republics cig vendor - .desc = A pre-war cigarette vendor that's been filled with Republic cigarette packs. - .suffix = republics +ent-N14VendingMachineCigaretteFilledRepublic = автомат с сигаретами 'Республика' + .desc = Довоенный автомат с сигаретами, заполненный пачками сигарет 'Республика'. + .suffix = республика From f12ebcd7529507d62a0bddcd049fbee7a9b90734 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:27:13 +0300 Subject: [PATCH 32/34] Update ladders.ftl --- .../entities/structures/misc/ladders.ftl | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/misc/ladders.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/misc/ladders.ftl index e622df8f1f5..805de9fe635 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/misc/ladders.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nuclear14/entities/structures/misc/ladders.ftl @@ -6,33 +6,33 @@ ent-LadderTop = лестница ent-LadderBottom = лестница .desc = Низ лестницы. Используйте, чтобы подняться наверх. .suffix = низ -ent-LadderTopBunkerOpen = bunker entrance - .desc = Looks like it leads down somewhere. - .suffix = open -ent-LadderTopManholeOpen = manhole - .desc = Looks like it leads down somewhere. - .suffix = open +ent-LadderTopBunkerOpen = вход в бункер + .desc = Похоже, ведет куда-то вниз. + .suffix = открытый +ent-LadderTopManholeOpen = канализационный люк + .desc = Похоже, ведет куда-то вниз. + .suffix = открытый ent-LadderSquareTop = { ent-LadderTop } - .desc = Looks like it leads down somewhere. - .suffix = square + .desc = Похоже, ведет куда-то вниз. + .suffix = квадратная ent-LadderSquareBottom = { ent-LadderBottom } - .desc = The bottom of a ladder. Use it to go up. - .suffix = bottom, square + .desc = Низ лестницы. Используйте, чтобы подняться наверх. + .suffix = низ, квадратная ent-LadderSquareMid = { ent-LadderSquareBottom } - .desc = The middle of a ladder. Up or down. - .suffix = mid, square -ent-LadderRopeTop1 = climbing rope - .desc = The top of a rope. Going down! - .suffix = rope, top -ent-LadderRopeBottom1 = climbing rope - .desc = The bottom of a rope. Going up! - .suffix = rope, bottom -ent-LadderTopBunkerClosed = bunker entrance - .desc = A closed up entrance to a bunker. - .suffix = closed -ent-LadderTopManholeClosed = manhole cover - .desc = A closed up entrance to a bunker. - .suffix = closed + .desc = Середина лестницы. Вверх или вниз. + .suffix = середина, квадратная +ent-LadderRopeTop1 = верёвка для лазания + .desc = Верх верёвки. Вниз! + .suffix = верёвка, верх +ent-LadderRopeBottom1 = верёвка для лазания + .desc = Низ верёвки. Вверх! + .suffix = верёвка, низ +ent-LadderTopBunkerClosed = вход в бункер + .desc = Закрытый вход в бункер. + .suffix = закрытый +ent-LadderTopManholeClosed = крышка люка + .desc = Закрытый вход в канализацию. + .suffix = закрытая ent-LadderTopMetal = лестница .desc = Верх лестницы. Используйте, чтобы спуститься вниз. .suffix = верх, металл, окрашенная From a8737481bf6345f8b8213c0aee4536b6320c5f71 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:28:32 +0300 Subject: [PATCH 33/34] Update welder-component.ftl --- Resources/Locale/ru-RU/tools/components/welder-component.ftl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/tools/components/welder-component.ftl b/Resources/Locale/ru-RU/tools/components/welder-component.ftl index 3876a3f748d..99694e02587 100644 --- a/Resources/Locale/ru-RU/tools/components/welder-component.ftl +++ b/Resources/Locale/ru-RU/tools/components/welder-component.ftl @@ -4,8 +4,7 @@ welder-component-no-fuel-message = В устройстве не осталось welder-component-no-fuel-in-tank = { $owner } пуст. welder-component-on-examine-welder-lit-message = [color=orange]Горит[/color] welder-component-on-examine-welder-not-lit-message = Не горит -welder-component-on-examine-detailed-message = - Топливо: [color={ $colorName }]{ $fuelLeft }/{ $fuelCapacity }[/color] +welder-component-on-examine-detailed-message = Топливо: [color={ $colorName }]{ $fuelLeft }/{ $fuelCapacity }[/color] { $status } welder-component-suicide-lit-others-message = { $victim } заваривает все свои отверстия! Похоже, что они пытаются совершить самоубийство! welder-component-suicide-lit-message = Ты завариваешь все свои отверстия! From 3012cf58026c54a4541fdc2a337dc09047c5ce78 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:32:56 +0300 Subject: [PATCH 34/34] Update tips.yml --- Resources/Prototypes/Datasets/tips.yml | 280 +++++++++++-------------- 1 file changed, 127 insertions(+), 153 deletions(-) diff --git a/Resources/Prototypes/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml index 54d0378ecd9..ae582fd5294 100644 --- a/Resources/Prototypes/Datasets/tips.yml +++ b/Resources/Prototypes/Datasets/tips.yml @@ -1,156 +1,130 @@ - type: dataset id: Tips values: - - "If you're on fire, you can click the alert on the right of your screen to stop, drop, and roll." - - "You can view and edit all keybindings used in-game at any time through the Options menu." - - "You can access the in-game guidebook through the escape menu, or by pressing Numpad 0 by default." - - "Some entities ingame have guidebook entries associated with them, which you can view by examining the entity and clicking the question mark icon." - - "Artifacts have the ability to gain permanent effects for some triggered nodes, including becoming an intercom or an extremely efficient generator." - - "You can avoid slipping on most puddles by walking. However, some strong chemicals like space lube will slip people anyway." - - "Some plants, such as galaxy thistle, can be ground up into extremely useful and potent medicines." - - "Mopping up puddles and draining them into other containers conserves the reagents found in the puddle." - - "Floor drains, usually found in the chef's freezer or janitor's office, rapidly consume reagent found in puddles around them--including blood." - - "Cognizine, a hard to manufacture chemical, makes animals sentient when they are injected with it." - - "Loaded mousetraps are incredibly effective at dealing with all manner of low-mass mobs--including Rat Servants." - - "Fire extinguishers can be loaded with any reagent in the game." - - "Some reagents, like chlorine trifluoride, have unique effects when applied by touch, such as through a spray bottle or foam." - - "Remember to touch grass in between playing Space Station 14 every once in a while." - - "You can use the Activate in World keybind, E by default, to interact with objects while your hands are full, or without picking them up." - - "Common sense goes a long way to avoiding conflict." - - "Every other player in game is a human being as well." - - "When running the Singularity, make sure to check on it periodically. If sabotaged, it could put the entire station at risk." - - "If the Singularity is up, make sure to refuel the radiation collectors once in a while." - - "Chemicals don't react while inside the ChemMaster's buffer." - - "Don't anger the bartender by throwing their glasses! Politely place them on the table by tapping Q." - - "You can hold SPACE by default to slow the movement of the shuttle when piloting, to allow for precise movements--or even coming to a complete stop." - - "Dexalin, Dexalin Plus, and Epinephrine will all purge heartbreaker toxin from your bloodstream while metabolizing." - - "Every crewmember comes with an emergency medipen in their survival box containing epinephrine and tranexamic acid." - - "The AME is a high-priority target and is easily sabotaged. Make sure to set up the Singularity or Solars so that you don't run out of power if it blows." - - "During a teslaloose, make sure to get rid of all electronic items so you don't become a target." - - "You can add labels to any item, including food or pill canisters, using a hand labeller." - - "Riot armor is significantly more powerful against opponents that aren't using guns compared to regular armor." - - "As a ghost, you can use the Verb Menu to orbit around and follow any entity in game automatically." - - "As a Traitor, you may sometimes be assigned to hunt other traitors, and in turn be hunted by others." - - "As a Traitor, the syndicate encryption key can be used to communicate through a secure channel with any other traitors who have purchased it." - - "As a Traitor, compromising important communications channels like security or engineering can give valuable intelligence. Be aware that this goes in both ways - security can compromise syndicate communications as well!" - - "As a Traitor, the syndicate toolbox is extremely versatile. For only 2 telecrystals, you can get a full set of tools to help you in an emergency, insulated combat gloves and a syndicate gas mask." - - "As a Traitor, never underestimate the web vest. It may not provide space protection, but its cheap cost and robust protection makes it handy for protecting against trigger-happy foes." - - "As a Traitor, any purchased grenade penguins won't attack you, and will explode if killed." - - "As a Traitor, be careful when using vestine from the chemical synthesis kit. If someone checks your station, they could easily out you." - - "As a Traitor, remember that power sinks will create a loud sound and alert the crew after running for long enough. Try to hide them in a tricky-to-find spot, or reinforce the area around them so that they're harder to reach." - - "As a Traitor, plasma gas is an excellent way to create chaos. It can be ignited to make an area extra-uninhabitable, and can cause toxin damage to those that inhale it." - - "As a Traitor, dehydrated carps are useful for killing a large hoard of people. As long as you pat it before rehydrating it, it can be used as a great distraction." - - "As a Traitor, have you tried injecting plasma into batteries? In the case of a defibrillator, it explodes on use; hurting the user and the patient!" - - "As a Nuclear Operative, stick together! While your equipment is robust, your fellow operatives are much better at saving your life: they can drag you away from danger while stunned and provide cover fire." - - "As a Nuclear Operative, communication is key! Use your radio to speak to your fellow operatives and coordinate an attack plan." - - "As a Nuclear Operative, remember that stealth is an option. It'll be hard for the captain to fight back if he gets caught off guard by what he thinks is just a regular passenger!" - - "As an antagonist, be mindful of the power of destroying telecommunications. It'll be a lot harder for people to call you out if they can't do so effectively!" - - "You can examine your headset to see which radio channels you have available and how to speak in them." - - "As a Salvage Specialist, always carry a GPS on you and take note of the station's coordinates in case your salvage is lost to space." - - "As a Salvage Specialist, you can use your proto-kinetic accelerator to move yourself in space when in a pinch. Just be wary that it isn't very effective." - - "As a Salvage Specialist, never forget to mine ore! Ore can be sold to logistics for a pretty penny, be used for construction, and also be used by Scientists for fancy technology." - - "As a Salvage Specialist, try asking epistemics for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!" - - "As a Salvage Specialist, try asking science for a grappling hook. It can be used to propel yourself onto wrecks, or if stuck in space you don't have to rely on the proto-kinetic accelerator." - - "As a Salvage Specialist, consider cooperating with the Cargo Technicians. They can order you a wide variety of useful items, including ones that may be hard to get otherwise, such laser guns and shuttle building materials." - - "As a Cargo Technician, consider asking epistemics for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner." - - "As a Cargo Technician, try to maintain a surplus of materials. They are extremely useful for Scientists and Station Engineers to have immediate access to." - - "As a Cargo Technician, if you have a surplus of cash try gambling! Sometimes you gain more money than you begin with." - - "As a Cargo Technician, remember that you can order guns in an emergency! The extra firepower can often be the difference between you and your fellow crewmembers living or dying." - - "As the Bartender, you can use a circular saw on your shotgun to make it easier to store." - - "As the Bartender, try experimenting with unique drinks. Have you tried to make demon's blood yet?" - - "As a Botanist, you can mutate and crossbreed plants together to create more potent produce that also has higher yields." - - "As the Clown, spice your gimmicks up! Nobody likes a one-trick pony." - - "As the Clown, if you lose your banana peels and soap, you can still slip people with your PDA! Honk!" - - "As the Chef, your knife can act as a weapon in an emergency." - - "As the Chef, you can sneak liquids into your foods. As a traitor, putting a little bit of amatoxin or other poison can greatly annoy the crew!" - - "As the Mime, your oath of silence is your source of power. Breaking it robs you of your powers and of your honor." - - "As the Lawyer, try to negotiate with the Warden if sentences seem too high for the crime." - - "As a Security Officer, communicate and coordinate with your fellow officers using the security radio channel to avoid confusion." - - "As a Security Officer, remember that correlation does not equal causation. Someone may have just been at the wrong place at the wrong time!" - - "As a Detective, you can chase criminals more effectively by using fingerprint fiber data and DNA obtained from forensic scans of objects the perpetrator likely interacted with." - - "As an Atmospheric Technician, your ATMOS holofan projector blocks gases while allowing objects to pass through. With it, you can quickly contain gas spills, fires and hull breaches." - - "As an Atmospheric Technician, try to resist the temptation of making canister bombs for Nuclear Operatives, unless you're in a last-ditch scenario. They often lead to large amounts of unnecessary friendly fire!" - - "As an Engineer, you can repair cracked windows by using a lit welding tool on them while not in combat mode." - - "As an Engineer, you can electrify grilles by placing powered cables beneath them." - - "As an Engineer, always double check when you're setting up the singularity. It is easier than you think to loose it!" - - "As an Engineer, you can use plasma glass to reinforce an area and prevent radiation. Uranium glass can also be used to prevent radiation." - - "As the Captain, you are one of the highest priority targets on the station. Everything from revolutions, to nuclear operatives, to traitors that need to rob you of your unique laser pistol or your life are things to worry about." - - "As the Captain, always take the nuclear disk and pinpointer with you every shift. It's a good idea to give one of these to another head you can trust with keeping it safe." - - "As the Captain, you have absolute access and control over the station, but this does not mean that being a horrible person won't result in mutiny." - - "As the Captain, try to be active and patrol the station. Staying in the bridge might be tempting, but you'll just end up putting a bigger target on your back!" - - "As a Scientist, you can try random things on an artifact while the scanner is on cooldown to speed up the point extraction process significantly." - - "As a Scientist, you can utilize upgraded versions of machines to increase its effectiveness. This can make certain machines significantly better; salvage will love you if you upgrade their ore processor!" - - "As a Scientist, you can build cyborgs using positronic brains and a chassis, they are just as useful as a new crew member." - - "As a Medical Doctor, try to be wary of overdosing your patients, especially if someone else has already been on the scene. Overdoses are often lethal to patients in crit!" - - "As a Medical Doctor, don't underestimate your cryo pods! They heal almost every type of damage, making them very useful when you are overloaded or need to heal someone in a pinch." - - "As a Medical Doctor, exercise caution when putting reptilians in cryopods. They will take a lot of extra cold damage, but you can mitigate this with some burn medicine or leporazine." - - "As a Medical Doctor, remember that the health analyzer can be used if you lose your PDA. However it has a battery, and if it drains too quickly for your taste you can ask epistemics to print a better battery for you!" - - "As a Chemist, once you've made everything you've needed to, don't be afraid to make more silly reagents. Have you tried desoxyephedrine or licoxide?" - - "As a Medical Doctor, Chemist, or Chief Medical Officer, you can use chloral hydrate to non-lethally sedate unruly patients." - - "Don't be afraid to ask for help, whether from your peers in character or through LOOC, or from admins!" - - "You'll quickly lose your interest in the game if you play to win and kill. If you find yourself doing this, take a step back and talk to people--it's a much better experience!" - - "If there's something you need from another department, try asking! This game isn't singleplayer and you'd be surprised what you can get accomplished together!" - - "The station's nuke is invincible. Go find the disk instead of trying to destroy it." - - "Maintenance is full of equipment that is randomized every round. Look around and see if anything is worth using." - - "We were all new once, be patient and guide new players, especially those playing intern roles, in the right direction." - - "Firesuits, winter coats and emergency EVA suits offer mild protection from the cold, allowing you to spend longer periods of time near breaches and space than if wearing nothing at all." - - "In an emergency, you can always rely on firesuits and emergency EVA suits; they will always spawn in their respective lockers. They might be awkward to move around in, but can easily save your life in a dangerous situation." - - "In an emergency, remember that you can craft improvised weapons! A baseball bat or spear could easily mean the difference between deterring an attacker or perishing from the hands of one." - - "Spears can be tipped with chemicals, and will inject a few units every time you hit someone with them directly." - - "You can make spears with reinforced glass, plasma glass, or uranium glass shards to enhance their damage." - - "Thrown spears deal extra damage! Beware, however, as throwing them too much will end up breaking them." - - "All forms of toxin damage are fairly difficult to treat, and usually involve the use of chemicals or other inconvenient methods. You can use this to your advantage in combat." - - "You can throw crafted bolas at people to slow them down, letting you follow up on them for an easier kill or getaway." - - "You can put napalm in a backpack water tank to make a flamethrower." - - "Some jobs have alternate uniforms in their respective drobe vendors. Don't be afraid to try out a new look!" - - "Speed is almost everything in combat. Using hardsuits just for their armor is usually a terrible idea unless the resistances it provides are geared towards combat, or you're not planning to go head-first into the fray." - - "Just because a job can't be a traitor at the beginning of a round doesn't mean that they'll never be a traitor." - - "Syndicate gas masks will both provide welding protection and block flashes. Think twice before trying to flash a Nuclear Operative!" - - "Demoman takes skill." - - "You can spray a fire extinguisher, throw items or fire a gun while floating through space to give yourself a minor boost. Simply fire opposite to where you want to go." - - "You can drag other players onto yourself to open the strip menu, allowing you to remove their equipment or force them to wear something. Note that exosuits or helmets will block your access to the clothing beneath them, and that certain items take longer to strip or put on than others." - - "You can climb onto a table by dragging yourself onto one." - - "You can move an item out of the way by dragging it, and then holding CTRL + right click and moving your mouse into the direction you want it to go." - - "When dealing with security, you can often get your sentence negated entirely through cooperation and deception." - - "Fire can spread to other players through touch! Be careful around flaming bodies or large crowds with people on fire in them." - - "Hull breaches take a few seconds to fully space an area. You can use this time to patch up the hole if you're confident enough, or just run away." - - "Burn damage, such as that from a welding tool or lightbulb, can be used to cauterize wounds and stop bleeding." - - "Bleeding is no joke! If you've been shot or acquired any other major injury, make sure to treat it quickly." - - "In an emergency, you can butcher a jumpsuit with a sharp object to get cloth, which can be crafted into gauze." - - "You can use sharp objects to butcher clothes or animals in the right click context menu. This includes glass shards." - - "Most explosives have an adjustable timer that you can set in the right click menu. This includes grenade penguins!" - - "You can stun grenade penguins, which can bide valuable time for you to kill them." - - "You can click on the names of items to pick them up in the right click menu, instead of hovering over the item and then selecting pick up." - - "Space Station 14 is open source! If there's a change you want to make, or a simple item you want to add, then try contributing to the game. It's not as hard as you'd think it is." - - "In a pinch, you can throw drinks or other reagent containers behind you to create a spill that can slip people chasing you." - - "Some weapons, such as knives & shivs, have a fast attack speed." - - "The jaws of life can be used to open powered doors." - - "If you're not a human, you can drink blood to heal back some of your blood volume, albeit very inefficiently." - - "If you're a human, don't drink blood! It makes you sick and you'll begin to take damage." - - "There is a chemical metabolism limit that limits the amount of reagents of a certain type you can digest at once. Certain species have higher metabolism limits, such as slimes." - - "Welding without proper eye protection can cause eye damage, which must be cured with oculine." - - "Zombies are very vulnerable to heat damage, making welding tools and laser guns extremely effective against them." - - "You can weld glass shards into glass sheets." - - "By right clicking on a player, and then clicking the heart icon, you can quickly examine them to check for injuries or how badly they're bleeding. You can also do this to yourself." - - "Monkeys and kobolds have a rare chance to be sentient. Ook!" - - "Lottery crates can very rarely contain The Throngler." - - "You can tell if an area with firelocks up is spaced by looking to see if the firelocks have lights beside them." - - "Instead of picking it up, you can alt-click food to eat it. This also works for mice and other creatures without hands." - # Nyanotrasen - Specific tips below - - "Psionic insulation prevents you from using or being targeted by psionic abilities. Look for insulative headgear or cryptobiolin pills." - - "Lotophagoi oil from the oracle will drug you up for a long time, but is one of the most reliable sources of psionics." - - "Turn off glimmer probers when glimmer approaches cautious levels." - - "Glimmer probers power themselves when glimmer gets too high." - - "Oneirophages have psionic invisiblity. Psionic insulation will allow you to see them." - - "Someone who looks just like you may be a paradox anomaly." - - "Rat kings can command their rats to attack someone by pointing at them." - - "Some rat kings are known to be friendly. As long as the rat army never goes rogue, it could be a great boon to the station." - - "The reverse engineering machine benefits greatly from machine upgrades." - - "The reverse engineering machine can reverse engineer blood red hardsuits." - # - "You can perform CPR by using an empty hand on someone in critical condition." - - "The metempsychotic machine's chance to reincarnate you into a humanoid is guaranteed for a number of times equal to its scanning module tier." - - "Glimmer wisps will only attack you if they detect you are psionic, or you aggravate them by damaging them or dragging away a body they are trying to drain." - - "Bibles, holy water, and the anti-psychic knife can deal holy damage, which has strong effects against some creatures." - - "Ectoplasm is used in the recipe for normality crystals." - # DeltaV - Specific tips below - - "As a Security Officer, if you're not sure how to determine the severity of a crime or the appropriate punishment, take a look at the Crime Assist application in your PDA!" + - "Если вы загорелись — нажмите на иконку горения в правой части экрана, чтобы упасть на землю и начать сбивать пламя." + - "Вы в любое время можете просмотреть и изменить привязки клавиш в меню \"Настройки.\"" + - "Вы можете открыть внутриигровое Руководство через меню на клавишу Esc, или нажав клавишу 0 на нумпаде (по умолчанию)." + - "Некоторые внутриигровые объекты имеют связанные с ними записи в Руководстве. Осмотрев объект и нажав на иконку с вопросительным знаком вы можете прочитать эти записи." + - "Вы можете приблизительно оценить состояние чьего-либо здоровья осмотрев его и нажав на иконку сердца." + - "Артефакты могут приобретать постоянные эффекты от некоторых активированных узлов, например, становиться интеркомом или чрезвычайно эффективным генератором." + - "Вы можете избежать поскальзывания на большинстве луж, если будете идти шагом. Однако некоторые сильные вещества, такие как космическая смазка, все равно заставят вас поскользнуться." + - "Некоторые растения, такие как галакточертополох, можно измельчить для получения чрезвычайно полезных и сильнодействующих лекарств." + - "Убирайте лужи и выжимайте их в другие ёмкости, чтобы собрать вещества находившиеся в луже." + - "Дренажи, обычно находящиеся в морозильной камере повара или в каморке уборщика, быстро поглощают лужи вокруг себя — в том числе и кровь." + - "Когнизин, сложное в изготовлении химическое вещество, делает животных, в которых его вводят, разумными." +# - "Loaded mousetraps are incredibly effective at dealing with all manner of low-mass mobs--including Rat Servants." + - "Огнетушители могут быть заправлены абсолютно любым реагентом в игре." + - "Некоторые реагенты, например, трифторид хлора (CLF3), обладают уникальными эффектами, проявляющимися через прикосновение, например, будучи выпущенными из распылителя или в виде пены." + - "Большинство устройств в игре можно улучшить при помощи высокоуровневых компонентов, которые могут быть созданы учёными или найдены на обломках." + - "Не забывайте хоть иногда выходить на улицу потрогать траву в перерывах между раундами Space Station 14." + - "Используйте кнопку Использовать предмет в мире (клавиша Е по умолчанию) чтобы взаимодействовать с объектами, если вам не хочется их брать в руки или у вас они заняты." + - "Здравый смысл помогает избегать конфликтов." + - "Другие игроки — тоже люди." +# - "When running the Singularity, make sure to check on it periodically. If sabotaged, it could put the entire station at risk." + - "Периодически проверяйте Сингулярность, пока она запущена. Её саботаж может поставить под угрозу всю станцию." + - "Химикаты не реагируют между собой, пока находятся в буфере ХимМастера." + - "Зажмите ПРОБЕЛ (по умолчанию) чтобы замедлить движение шаттла во время пилотирования. Это позволит выполнять более точные маневры или даже полностью остановиться." +# - "Dexalin, Dexalin Plus, and Epinephrine will all purge heartbreaker toxin from your bloodstream while metabolizing." + - "Каждый член экипажа имеет в своем аварийном запасе экстренный медипен, содержащий эпинефрин и транексамовую кислоту." +# - "The AME is a high-priority target and is easily sabotaged. Make sure to set up the Singularity or Solars so that you don't run out of power if it blows." + - "С помощью ручного этикетировщика можно маркировать любые предметы, в том числе продукты питания или баночки с таблетками." + - "Противоударная броня значительно эффективнее обычной если противник не использует огнестрельное оружие." + - "Будучи призраком, вы можете использовать меню взаимодействия, чтобы автоматически следовать и крутиться вокруг любого объекта в игре." +# - "As a Traitor, you may sometimes be assigned to hunt other traitors, and in turn be hunted by others." +# - "As a Traitor, the syndicate encryption key can be used to communicate through a secure channel with any other traitors who have purchased it." +# - "As a Traitor, compromising important communications channels like security or engineering can give valuable intelligence. Be aware that this goes in both ways - security can compromise syndicate communications as well!" +# - "As a Traitor, the syndicate toolbox is extremely versatile. For only 2 telecrystals, you can get a full set of tools to help you in an emergency, insulated combat gloves and a syndicate gas mask." +# - "As a Traitor, never underestimate the web vest. It may not provide space protection, but its cheap cost and robust protection makes it handy for protecting against trigger-happy foes." +# - "As a Traitor, any purchased grenade penguins won't attack you, and will explode if killed." +# - "As a Traitor, remember that power sinks will create a loud sound and alert the crew after running for long enough. Try to hide them in a tricky-to-find spot, or reinforce the area around them so that they're harder to reach." +# - "As a Traitor, plasma gas is an an excellent way to create chaos. It can be ignited to make an area extra-uninhabitable, and can cause toxin damage to those that inhale it." +# - "As a Nuclear Operative, stick together! While your equipment is robust, your fellow operatives are much better at saving your life: they can drag you away from danger while stunned and provide cover fire." +# - "As a Nuclear Operative, communication is key! Use your radio to speak to your fellow operatives and coordinate an attack plan." +# - "As a Nuclear Operative, remember that stealth is an option. It'll be hard for the captain to fight back if he gets caught off-gaurd by what he thinks is just a regular passenger!" +# - "As an antagonist, be mindful of the power of destroying telecommunications. It'll be a lot harder for people to call you out if they can't do so effectively!" + - "Вы можете осмотреть свою гарнитуру, чтобы узнать, какие радиоканалы вам доступны и как по ним говорить." +# - "As a Salvage Technician, always carry a GPS on you and take note of the station's coordinates in case your salvage is lost to space." + - "Будучи утилизатором, в крайнем случае вы можете использовать протокинетический ускоритель для передвижения в космосе. Просто знайте, что это не очень эффективно." +# - "As a Salvage Technician, never forget to mine ore! Ore can be sold to cargo for a pretty penny, be used for construction, and also be used by Scientists for fancy technology." +# - "As a Salvage Technician, try asking science for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!" +# - "As a Salvage Technician, consider cooperating with the Cargo Technicians. They can order you a wide variety of useful items, including ones that may be hard to get otherwise, such laser guns and shuttle building materials." +# - "As a Cargo Technician, consider asking science for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner." +# - "As a Cargo Technician, try to maintain a surplus of materials. They are extremely useful for Scientists and Station Engineers to have immediate access to." +# - "As a Cargo Technician, remember that you can order guns in an emergency! The extra firepower can often be the difference between you and your fellow crewmembers living or dying." +# - "As the Bartender, you can use a circular saw on your shotgun to make it easier to store." + - "Будучи Барменом помните, что вы можете экспериментировать при приготовлении напитков. Вы уже пробовали сделать коктейль Кровь Демона?" + - "Будучи ботаником, вы можете мутировать и скрещивать растения для создания более эффективных и урожайных сортов." +# - "As the Clown, spice your gimmicks up! Nobody likes a one-trick pony." +# - "As the Clown, if you lose your banana peel, you can still slip people with your PDA! Honk!" +# - "As the Mime, your oath of silence is your source of power. Breaking it robs you of your powers and of your honor." + - "Занимаясь судебным делом, если наказание кажется вам слишком суровым, попытайтесь обсудить это со смотрителем." + - "Будучи сотрудником службы безопасности, общайтесь и координируйте свои действия с коллегами при помощи радиоканала службы безопасности, чтобы избежать неразберихи." + - "Как сотрудник службы безопасности помните — подозрений мало для обвинений. Возможно кто-то просто оказался не в том месте и не в то время!" + - "Будучи детективом, вы можете более эффективно разыскивать преступников, опираясь на данные об оставленных им отпечатках пальцев и волокнах - сканируйте предметы с которым тот мог взаимодействовать." +# - "As an Atmospheric Technician, your ATMOS holofan projector blocks gases while allowing objects to pass through. With it, you can quickly contain gas spills, fires and hull breaches." +# - "As an Atmospheric Technician, try to resist the temptation of making canister bombs for Nuclear Operatives, unless you're in a last-ditch scenario. They often lead to large amounts of unnessecarry friendly fire!" + - "Будучи инженером, помните, что вы можете ремонтировать окна сварочным аппаратом, находясь не в боевом режиме." +# - "As an Engineer, you can electrify grilles by placing powered cables beneath them." + - "Будучи инженером, вы можете использовать плазменное стекло для укрепления местности и защиты от радиации. Урановое стекло может быть тоже использовано для защиты от радиации." +# - "As the Captain, you are one of the highest priority targets on the station. Everything from revolutions, to nuclear operatives, to traitors that need to rob you of your unique laser pistol or your life are things to worry about." +# - "As the Captain, always take the nuclear disk and pinpointer with you every shift. It's a good idea to give one of these to another head you can trust with keeping it safe." +# - "As the Captain, you have absolute access and control over the station, but this does not mean that being a horrible person won't result in mutiny." +# - "As the Captain, try to be active and patrol the station. Staying in the bridge might be tempting, but you'll just end up putting a bigger target on your back!" + - "Будучи учёным, вы можете попробовать различные вещи с артефактом, пока сканер перезаряжается, чтобы значительно ускорить процесс извлечения очков." + - "Будучи учёным, вы можете использовать детали машин получше для повышения эффективности машин. Это может сделать некоторые машины, такие как переработчик биомассы, значительно лучше!" + - "Будучи учёным, вы можете попытаться угадать, что делает улучшение машины, исходя их того, какой компонент вы улучшаете. Ёмкости материи увеличивают возможности хранения, конденсаторы увеличивают эффективность, и манипуляторы увеличивают мощность." + - "Будучи врачом, постарайтесь быть аккуратным с передозировкой пациентов, особенно если им уже оказали первую помощь. Передозировки могут быть летальны для пациентов в критическом состоянии!" +# - "As a Medical Doctor, don't underestimate your cryo pods! They heal almost every type of damage, making them very useful when you are overloaded or need to heal someone in a pinch." +# - "As a Medical Doctor, exercise caution when putting reptilians in cryopods. They will take a lot of extra cold damage, but you can mitigate this with some burn medicine or leporazine." + - "Будучи врачом, помните, что в вашем анализаторе здоровья есть сменная батарея. Если, на ваш взгляд, батарея разряжается слишком быстро, вы можете попросить ученых напечатать для вас батарею получше!" + - "Будучи химиком, как только вы сделали все, что вам нужно, не бойтесь делать больше глупых реагентов. Вы пробовали дезоксиэфедрин?" +# - "As a Medical Doctor, Chemist, or Chief Medical Officer, you can use chloral hydrate to non-lethally sedate unruly patients." + - "Не бойтесь просить о помощи, будь то у ваших коллег по отделу, или через LOOC-чат, или у администраторов!" + - "Ваш интерес к игре быстро угаснет, если вы будете играть ради убийств и на победу. Если вы обнаружили, что так и играете, то сделайте шаг назад и поговорите с людьми — это гораздо лучше!" +# - "If there's something you need from another department, try asking! This game isn't singleplayer and you'd be surprised what you can get accomplished together!" +# - "The station's self-destruct terminal is invincible. Go find the disk instead of trying to destroy it." +# - "Maintenance is full of equipment that is randomized every round. Look around and see if anything is worth using." + - "Все мы когда-то были новичками. Будьте терпеливы и подсказывайте новым игрокам, особенно тем, кто играет роли стажеров, направляя их в правильное русло." + - "Пожарные костюмы и зимние куртки обеспечивают умеренную защиту от холода, позволяя вам проводить в космосе и в разгерметизированных отсеках больше времени, чем если бы на вас не было ничего." + - "В экстренной ситуации не забывайте, что пожарные и экстренные EVA скафандры всегда находятся в соответствующих шкафчиках. В них может быть неудобно передвигаться, но они могут легко спасти вам жизнь в плохой ситуации!" + - "В экстренной ситуации помните, что вы можете создать импровизированное оружие! Бейсбольная бита или копьё могут легко стать решающим фактором между отпугиванием нападающего и гибелью от его рук." + - "Копья могут быть обработаны химикатами и будут вводить несколько юнитов каждый раз, когда вы бьёте кого-то напрямую." + - "Вы можете создать копья с осколков армированного, плазменного и уранового стекла для увеличения урона." + - "Бросайте копья для нанесения дополнительного урона! Однако, будьте осторожны, так как, если вы будете бросать их слишком часто, они могут сломаться." + - "Заточки и копья, сделанные с уранового стекла, могут наносить радиационный урон, который требует лекарства для правильного лечения." + - "Все формы поражения токсинами довольно трудно поддаются лечению и обычно включают использование химикатов или других неудобных методов. Вы можете использовать это в своих интересах в бою." + - "Вы можете бросать созданные болы в людей, для того чтобы замедлить их, позволяя вам преследовать для более лёгкого убийства или для быстрого ухода." + - "Вы можете наполнить ранцевый водяной резервуар напалмом для создания огнемёта." +# - "Some jobs have alternate uniforms in their respective drobe vendors. Don't be afraid to try out a new look!" + - "Скорость - это почти самое главное в бою. Использование скафандров только для защиты - обычно ужасная идея, если только сопротивление, которое они обеспечивают, не предназначено для боя, или вы не планируете бросаться в бой очертя голову." +# - "Just because a job can't be a traitor at the beginning of a round doesn't mean that they'll never be a traitor." +# - "Syndicate gas masks will both provide welding protection and block flashes. Think twice before trying to flash a Nuclear Operative!" +# - "Demoman takes skill." + - "Вы можете пшикать огнетушителем, бросать вещи или стрелять из оружия, когда летаете в космосе, чтобы получить незначительное ускорение. Просто стреляйте в противоположную сторону от той, куда вам нужно попасть." + - "Вы можете перетаскивать других игроков на себя, чтобы открыть меню обыска, позволяющее вам снимать их снаряжение или принудительно надевать что-то. Обратите внимание, что скафандры или шлемы могут блокировать доступ к одежде под ними, и что определенные предметы требуют больше времени для снятия или надевания, чем другие.." + - "Вы можете залезть на стол, перетащив себя на него." + - "Вы можете переместить объект в сторону, перетащив его, а затем, удерживая CTRL щелкайте правой кнопкой мыши, и двигайте мышь в нужном вам направлении." + - "Имея дело со службой безопасности, вы часто можете избежать своего приговора за счёт сотрудничества или обмана." + - "Огонь может распространятся на других игроков через прикосновения! Будьте осторожны с горящими телами или с большими толпами людей, находящихся в огне." + - "Пробоины в корпусе требуют несколько секунд для полной разгерметизации местности. Вы можете использовать это время, чтобы заделать дыру, если достаточно уверены в своих способностях, или просто убежать." + - "Ожоги, например, от сварочного аппарата, можно использовать для прижигания ран и остановки кровотечения." + - "Кровотечение не шутка! Если вас подстрелили или вы получили другую серьёзную травму, позаботьтесь о том, чтобы быстро её вылечить." + - "В экстренной ситуации, вы можете разрезать комбинезон острым предметом, чтобы получить ткань, которая может быть использована как менее эффективная версия бинта." + - "Вы можете использовать острые предметы для разделки животных или одежды в контекстном меню при нажатии ПКМ. В том числе осколки стекла." + - "Большинство взрывчаток имеют таймер, который вы можете установить через ПКМ меню. В том числе пингвин гренадёр!" +# - "You can stun grenade penguins, which can bide valuable time for you to kill them." + - "Вы можете кликнуть на имена предметов в ПКМ меню, чтобы подобрать их, вместо того, чтобы наводиться на предмет, а затем подбирать его." + - "Космическая Станция 14 - это игра с открытым кодом! Если вы хотите что-то изменить или добавить простой предмет, попробуйте внести вклад в игру. Это не так сложно, как вы думаете." + - "В крайнем случае вы можете бросать напитки или другие ёмкости с реагентами позади себя для создания луж, на которых поскользнутся ваши преследователи." + - "Некоторые оружия, такие как ножи и заточки, имеют большую скорость атаки." + - "Челюсти жизни могут открывать запитанные двери." +# - "You can drink blood to heal back some of your blood volume, albeit very inefficiently." + - "Если вы не Унатх, не пытайтесь пить кровь! Это отравит вас и нанесёт урон." + - "Существует предел химического метаболизма, который ограничивает количество реагентов определенного типа, которые вы можете переварить за один раз. Некоторые расы имеют более высокие пределы метаболизма, например, слаймолюды." + - "Использование сварки без соответствующей защиты для глаз, вызовет нарушение зрения, которое можно вылечить окулином." +# - "Zombies are very vunerable to heat damage, making welding tools and laser guns extremely effective against them." + - "Вы можете сплавить осколки стекла в стеклянные листы." + - "Нажатием ПКМ по игроку, а затем нажатием на иконку сердца, вы можете быстро проверить наличие внешних повреждений или наличие кровотечения. Вы так же можете сделать это с собой." + - "Обезьяны имеют малый шанс быть разумными. УУК!" + - "Вы можете определить, разгерметизирована ли область с пожарными шлюзами, посмотря, есть ли у пожарных замков кроме них огни." + - "Вместо поднятия, вы можете альт-кликнуть по еде, чтобы скушать её. Это так же работает для мышей и других существ без рук."