From 60a282d58a60e2808f70146ccaec8722b33d5fcb Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Fri, 26 Apr 2024 21:08:36 +0200 Subject: [PATCH] Revert "Update locale" This reverts commit 5a09ebb8ac2f4585331201fe94c8da3939f565b6. --- .../fills/backpacks/duffelbag_npc_loot.ftl | 8 - .../fills/backpacks/startergear/backpack.ftl | 16 +- .../fills/backpacks/startergear/duffelbag.ftl | 16 +- .../fills/backpacks/startergear/satchel.ftl | 16 +- .../_nf/catalog/fills/boxes/emergency.ftl | 3 - .../_nf/catalog/fills/boxes/general.ftl | 4 +- .../_nf/catalog/fills/boxes/nfsd.ftl | 20 -- .../_nf/catalog/fills/crates/nfsd.ftl | 16 +- .../_nf/catalog/fills/crates/nfsdarmory.ftl | 12 +- .../_nf/catalog/fills/items/belt.ftl | 5 +- .../_nf/catalog/fills/items/misc.ftl | 26 +-- .../_nf/catalog/fills/lockers/dressers.ftl | 3 - .../_nf/catalog/fills/lockers/heads.ftl | 3 - .../catalog/fills/lockers/suit_storage.ftl | 27 +-- .../fills/lockers/suit_storage_wallmount.ftl | 174 ++++++--------- .../_nf/entities/clothing/back/backpacks.ftl | 19 +- .../_nf/entities/clothing/back/duffel.ftl | 17 +- .../_nf/entities/clothing/back/messenger.ftl | 10 +- .../_nf/entities/clothing/back/satchel.ftl | 19 +- .../_nf/entities/clothing/belt/belts.ftl | 4 - .../_nf/entities/clothing/ears/headsets.ftl | 34 ++- .../entities/clothing/ears/headsets_alt.ftl | 8 +- .../_nf/entities/clothing/eyes/glasses.ftl | 2 +- .../_nf/entities/clothing/eyes/hud.ftl | 6 +- .../_nf/entities/clothing/hands/gloves.ftl | 2 - .../clothing/head/base_clothinghead.ftl | 4 - .../clothing/head/hardsuit-helmets.ftl | 26 +-- .../_nf/entities/clothing/head/hats.ftl | 5 - .../_nf/entities/clothing/head/helmets.ftl | 4 +- .../_nf/entities/clothing/head/hoods.ftl | 5 - .../_nf/entities/clothing/masks/masks.ftl | 6 - .../_nf/entities/clothing/neck/cloaks.ftl | 2 - .../_nf/entities/clothing/neck/mantles.ftl | 2 - .../_nf/entities/clothing/neck/scarfs.ftl | 4 +- .../entities/clothing/outerclothing/armor.ftl | 4 +- .../outerclothing/base_clothingouter.ftl | 4 - .../entities/clothing/outerclothing/coats.ftl | 7 - .../clothing/outerclothing/hardsuits.ftl | 14 +- .../_nf/entities/clothing/shoes/boots.ftl | 4 +- .../entities/clothing/uniforms/jumpskirts.ftl | 8 +- .../entities/clothing/uniforms/jumpsuits.ftl | 18 +- .../spawners/conditional/bloodcultmobs.ftl | 24 -- .../random/bloodcult_inhand_weapons.ftl | 6 - .../markers/spawners/random/syndicatemobs.ftl | 41 ---- .../spawners/random/wizardfederationmobs.ftl | 30 --- .../entities/mobs/npcs/artifact_construct.ftl | 10 +- .../mobs/npcs/base_humanoid_hostile.ftl | 6 +- .../entities/mobs/npcs/bloodcultistmob.ftl | 19 +- .../mobs/npcs/emotionalsupportanimals.ftl | 63 +++--- .../mobs/npcs/wizardfederationmob.ftl | 12 +- .../entities/objects/devices/door_remote.ftl | 2 - .../devices/electronics/door_access.ftl | 15 -- .../objects/devices/encryption_keys.ftl | 2 +- .../entities/objects/devices/flatpacks.ftl | 2 - .../objects/devices/holoprojectors.ftl | 5 - .../devices/misc/identification_cards.ftl | 16 +- .../_nf/entities/objects/devices/pda.ftl | 16 +- .../entities/objects/devices/production.ftl | 24 +- .../_nf/entities/objects/fun/whistles.ftl | 2 - .../_nf/entities/objects/misc/bedsheets.ftl | 6 - .../_nf/entities/objects/misc/implanters.ftl | 5 +- .../entities/objects/misc/rubber_stamp.ftl | 8 - .../objects/misc/subdermal_implants.ftl | 4 +- .../entities/objects/specific/security.ftl | 2 +- .../service/vending_machine_restock.ftl | 4 + .../specific/wizard/conjured_items.ftl | 11 +- .../entities/objects/tools/flashlights.ftl | 2 - .../_nf/entities/objects/tools/jetpacks.ftl | 11 +- .../objects/weapons/guns/guns/revolvers.ftl | 2 +- .../weapons/guns/launchers/launchers.ftl | 2 +- .../objects/weapons/melee/wizard_staff.ftl | 11 +- .../objects/weapons/snipers/snipers.ftl | 2 - .../_nf/entities/structures/atm.ftl | 26 --- .../structures/decoration/banners.ftl | 4 +- .../structures/doors/airlocks/access.ftl | 71 ++---- .../structures/doors/airlocks/airlocks.ftl | 8 +- .../structures/holographic/projections.ftl | 2 - .../machines/computers/computers.ftl | 12 + .../machines/computers/computers_shipyard.ftl | 14 -- .../computers_shipyard_mothership.ftl | 16 -- .../machines/computers/computers_tabletop.ftl | 211 ++++++++---------- .../computers/computers_tabletop_shipyard.ftl | 21 -- .../entities/structures/machines/cryopod.ftl | 2 - .../structures/machines/fax_machine.ftl | 3 - .../entities/structures/machines/lathe.ftl | 2 +- .../structures/machines/vending_machines.ftl | 10 +- .../structures/shuttles/thrusters.ftl | 28 ++- .../structures/shuttles/thrusters_nfsd.ftl | 26 --- .../shuttles/thrusters_security.ftl | 28 --- .../structures/specific/bloodcult.ftl | 15 +- .../storage/closets/lockers/lockers.ftl | 17 +- .../storage/closets/suit_storage_wall.ftl | 3 +- .../storage/crates/base_structurecrates.ftl | 5 +- .../structures/storage/crates/crates.ftl | 6 +- .../structures/wallmounts/intercom.ftl | 4 +- .../structures/wallmounts/signs/signs.ftl | 4 - .../structures/walls/diagonal_walls.ftl | 9 +- .../ss14-ru/prototypes/_nf/events/events.ftl | 20 ++ .../_nf/events/events_bluespace.ftl | 20 -- .../prototypes/_nf/markers/spawners/jobs.ftl | 14 -- .../ss14-ru/prototypes/_nf/shipyard/base.ftl | 37 ++- .../ss14-ru/prototypes/actions/types.ftl | 2 - .../ss14-ru/prototypes/alerts/alerts.ftl | 2 - .../ss14-ru/prototypes/alerts/revenant.ftl | 2 - .../ss14-ru/prototypes/body/organs/moth.ftl | 5 +- .../prototypes/body/parts/arachnid.ftl | 33 +-- .../ss14-ru/prototypes/body/parts/diona.ftl | 33 +-- .../prototypes/body/parts/gingerbread.ftl | 33 +-- .../ss14-ru/prototypes/body/parts/human.ftl | 33 +-- .../ss14-ru/prototypes/body/parts/moth.ftl | 33 +-- .../prototypes/body/parts/reptilian.ftl | 33 +-- .../ss14-ru/prototypes/body/parts/slime.ftl | 33 +-- .../catalog/fills/backpacks/duffelbag.ftl | 2 - .../fills/backpacks/startergear/backpack.ftl | 10 +- .../fills/backpacks/startergear/duffelbag.ftl | 8 +- .../fills/backpacks/startergear/satchel.ftl | 8 +- .../catalog/fills/boxes/emergency.ftl | 6 +- .../catalog/fills/boxes/general.ftl | 5 +- .../catalog/fills/boxes/medical.ftl | 2 + .../catalog/fills/boxes/syndicate.ftl | 2 - .../catalog/fills/crates/engineering.ftl | 6 +- .../catalog/fills/crates/engines.ftl | 2 +- .../catalog/fills/crates/materials.ftl | 2 - .../catalog/fills/crates/vending.ftl | 4 +- .../catalog/fills/items/briefcases.ftl | 10 +- .../prototypes/catalog/fills/lockers/misc.ftl | 3 - .../catalog/fills/lockers/space_ruin.ftl | 6 - .../catalog/fills/lockers/suit_storage.ftl | 10 +- .../corvax/body/parts/vulpkanin.ftl | 33 +-- .../corvax/entities/mobs/player/vulpkanin.ftl | 3 +- .../entities/clothing/shoes/winter-boots.ftl | 2 +- .../objects/weapons/bombs/plastic.ftl | 2 - .../weapons/guns/battery/battery_guns.ftl | 4 +- .../entities/clothing/back/backpacks.ftl | 4 - .../entities/clothing/ears/headsets.ftl | 4 +- .../entities/clothing/ears/headsets_alt.ftl | 2 +- .../entities/clothing/eyes/glasses.ftl | 2 - .../clothing/hands/base_clothinghands.ftl | 2 - .../entities/clothing/hands/colored.ftl | 8 +- .../entities/clothing/head/bandanas.ftl | 35 +-- .../clothing/head/hardsuit-helmets.ftl | 2 - .../entities/clothing/head/hats.ftl | 8 +- .../entities/clothing/head/helmets.ftl | 2 + .../entities/clothing/head/hoods.ftl | 2 +- .../entities/clothing/head/misc.ftl | 6 +- .../entities/clothing/head/soft.ftl | 50 ++--- .../entities/clothing/masks/bandanas.ftl | 5 +- .../entities/clothing/masks/masks.ftl | 2 - .../entities/clothing/neck/cloaks.ftl | 2 +- .../entities/clothing/neck/mantles.ftl | 2 +- .../entities/clothing/neck/misc.ftl | 2 + .../entities/clothing/neck/pins.ftl | 4 - .../entities/clothing/outerclothing/armor.ftl | 2 + .../outerclothing/base_clothingouter.ftl | 9 +- .../entities/clothing/outerclothing/coats.ftl | 26 --- .../clothing/outerclothing/hardsuits.ftl | 2 - .../clothing/outerclothing/wintercoats.ftl | 2 +- .../clothing/shoes/base_clothingshoes.ftl | 5 +- .../entities/clothing/shoes/color.ftl | 8 +- .../entities/clothing/shoes/specific.ftl | 3 - .../clothing/uniforms/color_jumpskirts.ftl | 32 --- .../clothing/uniforms/color_jumpsuits.ftl | 34 --- .../entities/clothing/uniforms/jumpskirts.ftl | 34 ++- .../entities/clothing/uniforms/jumpsuits.ftl | 38 +++- .../clothing/uniforms/random_suit.ftl | 2 +- .../prototypes/entities/effects/rcd.ftl | 22 +- .../prototypes/entities/markers/shuttle.ftl | 2 - .../entities/markers/spawners/jobs.ftl | 2 - .../entities/mobs/npcs/argocyte.ftl | 3 +- .../entities/mobs/npcs/elemental.ftl | 3 +- .../prototypes/entities/mobs/npcs/human.ftl | 6 +- .../prototypes/entities/mobs/npcs/shadows.ftl | 5 +- .../prototypes/entities/mobs/npcs/silicon.ftl | 5 +- .../entities/mobs/npcs/simplemob.ftl | 15 +- .../prototypes/entities/mobs/player/human.ftl | 13 +- .../entities/mobs/player/humanoid.ftl | 6 - .../entities/mobs/player/narsie.ftl | 5 +- .../entities/mobs/player/ratvar.ftl | 5 +- .../entities/mobs/player/terminator.ftl | 3 +- .../prototypes/entities/mobs/species/base.ftl | 12 +- .../entities/mobs/species/skeleton.ftl | 3 +- .../consumable/drinks/drinks-cartons.ftl | 5 - .../objects/consumable/drinks/drinks.ftl | 30 --- .../consumable/drinks/drinks_bottles.ftl | 5 +- .../objects/consumable/drinks/drinks_cans.ftl | 2 - .../consumable/drinks/trash_drinks.ftl | 16 +- .../objects/consumable/food/baked/donut.ftl | 3 +- .../entities/objects/consumable/food/egg.ftl | 3 +- .../objects/consumable/food/snacks.ftl | 5 +- .../smokeables/cigarettes/packs.ftl | 6 +- .../entities/objects/decoration/flora.ftl | 12 - .../entities/objects/decoration/present.ftl | 27 +-- .../entities/objects/devices/cartridges.ftl | 2 +- .../devices/circuitboards/computer.ftl | 6 +- .../circuitboards/machine/production.ftl | 6 +- .../devices/electronics/door_access.ftl | 111 --------- .../entities/objects/devices/flatpack.ftl | 16 -- .../objects/devices/holoprojectors.ftl | 9 - .../entities/objects/devices/pda.ftl | 24 +- .../entities/objects/devices/station_map.ftl | 8 +- .../syndicate_gadgets/war_declarator.ftl | 2 +- .../entities/objects/fun/figurines.ftl | 6 +- .../entities/objects/fun/immovable_rod.ftl | 25 +-- .../fun/instruments/instruments_wind.ftl | 3 +- .../prototypes/entities/objects/fun/toys.ftl | 10 +- .../entities/objects/fun/whistles.ftl | 2 - .../objects/materials/crystal_shard.ftl | 2 - .../entities/objects/materials/materials.ftl | 2 - .../entities/objects/materials/ore.ftl | 6 - .../entities/objects/materials/shards.ftl | 2 - .../objects/materials/sheets/glass.ftl | 6 - .../objects/materials/sheets/metal.ftl | 9 - .../objects/materials/sheets/other.ftl | 3 +- .../entities/objects/misc/books.ftl | 11 +- .../entities/objects/misc/books_author.ftl | 62 ----- .../entities/objects/misc/briefcases.ftl | 8 +- .../entities/objects/misc/carpets.ftl | 46 ++-- .../prototypes/entities/objects/misc/cds.ftl | 2 - .../entities/objects/misc/diskcases.ftl | 2 - .../objects/misc/identification_cards.ftl | 2 +- .../entities/objects/misc/kudzu.ftl | 3 +- .../entities/objects/misc/rubber_stamp.ftl | 6 - .../entities/objects/misc/tiles.ftl | 10 - .../entities/objects/power/lights.ftl | 2 - .../objects/specific/cargo/cargo_pallet.ftl | 4 - .../entities/objects/specific/chemistry.ftl | 2 - .../objects/specific/janitorial/janitor.ftl | 9 + .../objects/specific/medical/defib.ftl | 5 +- .../objects/specific/medical/disease.ftl | 2 - .../objects/specific/medical/healing.ftl | 28 +-- .../specific/medical/healthanalyzer.ftl | 5 +- .../objects/specific/medical/morgue.ftl | 4 +- .../objects/specific/research/anomaly.ftl | 10 +- .../specific/robotics/borg_modules.ftl | 80 +++---- .../entities/objects/specific/syndicate.ftl | 3 - .../entities/objects/tools/decoys.ftl | 5 +- .../objects/tools/handheld_mass_scanner.ftl | 2 + .../entities/objects/tools/jammer.ftl | 2 +- .../entities/objects/tools/tools.ftl | 14 +- .../guns/ammunition/cartridges/shotgun.ftl | 2 +- .../weapons/guns/battery/battery_guns.ftl | 34 +-- .../objects/weapons/guns/hmgs/hmgs.ftl | 2 +- .../objects/weapons/guns/lmgs/lmgs.ftl | 4 +- .../objects/weapons/guns/pistols/pistols.ftl | 8 +- .../weapons/guns/projectiles/projectiles.ftl | 4 - .../weapons/guns/revolvers/revolvers.ftl | 12 +- .../objects/weapons/guns/rifles/rifles.ftl | 6 +- .../weapons/guns/shotguns/shotguns.ftl | 18 +- .../objects/weapons/guns/smgs/smgs.ftl | 12 +- .../objects/weapons/guns/snipers/snipers.ftl | 6 +- .../objects/weapons/melee/baseball_bat.ftl | 2 - .../entities/objects/weapons/melee/knife.ftl | 7 - .../entities/objects/weapons/security.ftl | 2 +- .../objects/weapons/throwable/grenades.ftl | 6 - .../prototypes/entities/stations/base.ftl | 4 - .../entities/stations/nanotrasen.ftl | 15 +- .../entities/stations/syndicate.ftl | 5 +- .../prototypes/entities/stations/test.ftl | 5 +- .../entities/structures/base_structure.ftl | 2 - .../structures/decoration/curtains.ftl | 61 +---- .../structures/doors/airlocks/access.ftl | 126 +++++------ .../structures/doors/airlocks/airlocks.ftl | 2 + .../structures/doors/airlocks/assembly.ftl | 6 - .../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/assembly.ftl | 10 - .../doors/windoors/base_structurewindoors.ftl | 8 - .../structures/doors/windoors/windoor.ftl | 38 +--- .../entities/structures/furniture/carpets.ftl | 32 +-- .../entities/structures/furniture/chairs.ftl | 20 +- .../structures/furniture/tables/tables.ftl | 31 --- .../structures/lighting/base_lighting.ftl | 3 - .../structures/lighting/ground_lighting.ftl | 5 +- .../structures/lighting/strobe_lighting.ftl | 15 -- .../entities/structures/machines/bombs.ftl | 3 - .../machines/computers/computers.ftl | 2 +- .../entities/structures/machines/hotplate.ftl | 7 +- .../entities/structures/machines/lathe.ftl | 3 +- .../machines/medical/chemistry_machines.ftl | 5 +- .../entities/structures/machines/nuke.ftl | 8 - .../structures/machines/reagent_grinder.ftl | 2 - .../structures/machines/vending_machines.ftl | 2 +- .../piping/atmospherics/portable.ftl | 9 - .../structures/piping/atmospherics/unary.ftl | 3 +- .../entities/structures/plastic_flaps.ftl | 4 +- .../entities/structures/power/chargers.ftl | 8 +- .../power/generation/generators.ftl | 5 +- .../power/generation/portable_generator.ftl | 5 +- .../structures/shuttles/thrusters.ftl | 3 +- .../structures/specific/anomaly/cores.ftl | 10 +- .../structures/specific/janitor/drain.ftl | 2 - .../structures/specific/janitor/janicart.ftl | 7 - .../prototypes/entities/structures/stairs.ftl | 18 +- .../structures/storage/closets/closets.ftl | 2 - .../storage/closets/lockers/lockers.ftl | 12 +- .../storage/crates/base_structurecrates.ftl | 1 - .../structures/storage/crates/crates.ftl | 6 +- .../structures/storage/filing_cabinets.ftl | 15 +- .../storage/tanks/base_structuretanks.ftl | 2 - .../structures/storage/tanks/tanks.ftl | 7 +- .../structures/wallmounts/shotgun_cabinet.ftl | 15 +- .../structures/wallmounts/signs/signs.ftl | 18 +- .../entities/structures/wallmounts/switch.ftl | 109 --------- .../entities/structures/walls/asteroid.ftl | 28 +-- .../entities/structures/walls/girders.ftl | 2 - .../entities/structures/walls/grille.ftl | 6 - .../entities/structures/windows/mining.ftl | 2 +- .../entities/structures/windows/plasma.ftl | 2 +- .../structures/windows/plastitanium.ftl | 5 +- .../entities/structures/windows/rplasma.ftl | 2 +- .../entities/structures/windows/ruranium.ftl | 4 +- .../entities/structures/windows/shuttle.ftl | 2 +- .../entities/structures/windows/uranium.ftl | 4 +- .../entities/structures/windows/window.ftl | 4 - .../ss14-ru/prototypes/gamerules/events.ftl | 32 --- .../prototypes/gamerules/roundstart.ftl | 2 - .../prototypes/gamerules/variation.ftl | 2 - .../entities/mobs/player/felinid.ftl | 3 +- .../nyanotrasen/entities/mobs/player/oni.ftl | 3 +- .../prototypes/objectives/terminator.ftl | 3 +- .../ss14-ru/prototypes/objectives/thief.ftl | 30 +-- .../ss14-ru/prototypes/objectives/traitor.ftl | 24 +- .../prototypes/procedural/salvage_mods.ftl | 2 +- 325 files changed, 1196 insertions(+), 2908 deletions(-) delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/emergency.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/nfsd.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/dressers.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/base_clothinghead.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/base_clothingouter.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/conditional/bloodcultmobs.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/bloodcult_inhand_weapons.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/syndicatemobs.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/wizardfederationmobs.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/door_remote.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/electronics/door_access.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/holoprojectors.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/fun/whistles.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/bedsheets.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/rubber_stamp.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/flashlights.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/snipers/snipers.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/atm.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/holographic/projections.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_shipyard.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_shipyard_mothership.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_tabletop_shipyard.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/cryopod.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters_nfsd.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters_security.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/wallmounts/signs/signs.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events_bluespace.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/alerts/alerts.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/alerts/revenant.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/weapons/bombs/plastic.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpskirts.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpsuits.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/books_author.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/cds.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/diskcases.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/strobe_lighting.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/nuke.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/janitor/drain.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/janitor/janicart.ftl diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/duffelbag_npc_loot.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/duffelbag_npc_loot.ftl index c73f355bd67..4200f995517 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/duffelbag_npc_loot.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/duffelbag_npc_loot.ftl @@ -89,11 +89,3 @@ ent-ClothingBackpackBloodCultZealotLootC = { ent-ClothingBackpackBloodCultZealot .desc = { ent-ClothingBackpackBloodCultZealotLootA.desc } ent-ClothingBackpackBloodCultZealotLootD = { ent-ClothingBackpackBloodCultZealotLootA } .desc = { ent-ClothingBackpackBloodCultZealotLootA.desc } -ent-ClothingBackpackBloodCultLootA = { ent-ClothingBackpackBloodCultZealotLootA } - .desc = { ent-ClothingBackpackBloodCultZealotLootA.desc } -ent-ClothingBackpackBloodCultLootB = { ent-ClothingBackpackBloodCultZealotLootA } - .desc = { ent-ClothingBackpackBloodCultZealotLootA.desc } -ent-ClothingBackpackBloodCultLootC = { ent-ClothingBackpackBloodCultZealotLootA } - .desc = { ent-ClothingBackpackBloodCultZealotLootA.desc } -ent-ClothingBackpackBloodCultLootD = { ent-ClothingBackpackBloodCultZealotLootA } - .desc = { ent-ClothingBackpackBloodCultZealotLootA.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/backpack.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/backpack.ftl index a82e7ea58c2..50f873bcab1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/backpack.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/backpack.ftl @@ -4,21 +4,13 @@ ent-ClothingBackpackReporterFilled = { ent-ClothingBackpack } .desc = { ent-ClothingBackpack.desc } ent-ClothingBackpackPsychologistFilled = { ent-ClothingBackpackMedical } .desc = { ent-ClothingBackpackMedical.desc } +ent-ClothingBackpackLawyerFilled = { ent-ClothingBackpack } + .desc = { ent-ClothingBackpack.desc } ent-ClothingBackpackStcFilled = { ent-ClothingBackpack } .desc = { ent-ClothingBackpack.desc } ent-ClothingBackpackPilotFilled = { ent-ClothingBackpackPilot } .desc = { ent-ClothingBackpackPilot.desc } +ent-ClothingBackpackOfficerFilled = { ent-ClothingBackpacknfsd } + .desc = { ent-ClothingBackpacknfsd.desc } ent-ClothingBackpackERTMailCarrierFilled = { ent-ClothingBackpackERTMailCarrier } .desc = { ent-ClothingBackpackERTMailCarrier.desc } -ent-ClothingBackpackSrFilled = { ent-ClothingBackpack } - .desc = { ent-ClothingBackpack.desc } -ent-ClothingBackpackNfsdBrownFilled = { ent-ClothingBackpackNfsdBrown } - .desc = { ent-ClothingBackpackNfsdBrown.desc } -ent-ClothingBackpackNfsdCreamFilled = { ent-ClothingBackpackNfsdBrownFilled } - .desc = { ent-ClothingBackpackNfsdBrownFilled.desc } -ent-ClothingBackpackNfsdBrownDetectiveFilled = { ent-ClothingBackpackNfsdBrown } - .desc = { ent-ClothingBackpackNfsdBrown.desc } -ent-ClothingBackpackNfsdBrownRadioFilled = { ent-ClothingBackpackNfsdBrown } - .desc = { ent-ClothingBackpackNfsdBrown.desc } -ent-ClothingBackpackNfsdBrownSheriffFilled = { ent-ClothingBackpackNfsdBrown } - .desc = { ent-ClothingBackpackNfsdBrown.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/duffelbag.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/duffelbag.ftl index 2971142de4b..eccc73530f5 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/duffelbag.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/duffelbag.ftl @@ -4,19 +4,11 @@ ent-ClothingBackpackDuffelReporterFilled = { ent-ClothingBackpackDuffel } .desc = { ent-ClothingBackpackDuffel.desc } ent-ClothingBackpackDuffelPsychologistFilled = { ent-ClothingBackpackDuffelMedical } .desc = { ent-ClothingBackpackDuffelMedical.desc } +ent-ClothingBackpackDuffelLawyerFilled = { ent-ClothingBackpackDuffel } + .desc = { ent-ClothingBackpackDuffel.desc } ent-ClothingBackpackDuffelStcFilled = { ent-ClothingBackpackDuffel } .desc = { ent-ClothingBackpackDuffel.desc } ent-ClothingBackpackDuffelPilotFilled = { ent-ClothingBackpackDuffelPilot } .desc = { ent-ClothingBackpackDuffelPilot.desc } -ent-ClothingBackpackDuffelSrFilled = { ent-ClothingBackpackDuffel } - .desc = { ent-ClothingBackpackDuffel.desc } -ent-ClothingBackpackDuffelNfsdBrownFilled = { ent-ClothingBackpackDuffelNfsdBrown } - .desc = { ent-ClothingBackpackDuffelNfsdBrown.desc } -ent-ClothingBackpackDuffelNfsdCreamFilled = { ent-ClothingBackpackDuffelNfsdBrownFilled } - .desc = { ent-ClothingBackpackDuffelNfsdBrownFilled.desc } -ent-ClothingBackpackDuffelNfsdBrownDetectiveFilled = { ent-ClothingBackpackDuffelNfsdBrown } - .desc = { ent-ClothingBackpackDuffelNfsdBrown.desc } -ent-ClothingBackpackDuffelNfsdBrownRadioFilled = { ent-ClothingBackpackDuffelNfsdBrown } - .desc = { ent-ClothingBackpackDuffelNfsdBrown.desc } -ent-ClothingBackpackDuffelNfsdBrownSheriffFilled = { ent-ClothingBackpackDuffelNfsdBrown } - .desc = { ent-ClothingBackpackDuffelNfsdBrown.desc } +ent-ClothingBackpackDuffelOfficerFilled = { ent-ClothingBackpackDuffelnfsd } + .desc = { ent-ClothingBackpackDuffelnfsd.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/satchel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/satchel.ftl index 3964f33abb5..9ab46db6e99 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/satchel.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/satchel.ftl @@ -4,19 +4,11 @@ ent-ClothingBackpackSatchelReporterFilled = { ent-ClothingBackpackSatchel } .desc = { ent-ClothingBackpackSatchel.desc } ent-ClothingBackpackSatchelPsychologistFilled = { ent-ClothingBackpackSatchelMedical } .desc = { ent-ClothingBackpackSatchelMedical.desc } +ent-ClothingBackpackSatchelLawyerFilled = { ent-ClothingBackpackSatchel } + .desc = { ent-ClothingBackpackSatchel.desc } ent-ClothingBackpackSatchelStcFilled = { ent-ClothingBackpackSatchel } .desc = { ent-ClothingBackpackSatchel.desc } ent-ClothingBackpackSatchelPilotFilled = { ent-ClothingBackpackSatchelPilot } .desc = { ent-ClothingBackpackSatchelPilot.desc } -ent-ClothingBackpackSatchelSrFilled = { ent-ClothingBackpackSatchel } - .desc = { ent-ClothingBackpackSatchel.desc } -ent-ClothingBackpackSatchelNfsdBrownFilled = { ent-ClothingBackpackSatchelNfsdBrown } - .desc = { ent-ClothingBackpackSatchelNfsdBrown.desc } -ent-ClothingBackpackSatchelNfsdCreamFilled = { ent-ClothingBackpackSatchelNfsdBrownFilled } - .desc = { ent-ClothingBackpackSatchelNfsdBrownFilled.desc } -ent-ClothingBackpackSatchelNfsdBrownDetectiveFilled = { ent-ClothingBackpackSatchelNfsdBrown } - .desc = { ent-ClothingBackpackSatchelNfsdBrown.desc } -ent-ClothingBackpackSatchelNfsdBrownRadioFilled = { ent-ClothingBackpackSatchelNfsdBrown } - .desc = { ent-ClothingBackpackSatchelNfsdBrown.desc } -ent-ClothingBackpackSatchelNfsdBrownSheriffFilled = { ent-ClothingBackpackSatchelNfsdBrown } - .desc = { ent-ClothingBackpackSatchelNfsdBrown.desc } +ent-ClothingBackpackSatchelOfficerFilled = { ent-ClothingBackpackSatchelnfsd } + .desc = { ent-ClothingBackpackSatchelnfsd.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/emergency.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/emergency.ftl deleted file mode 100644 index 6482386d2a5..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/emergency.ftl +++ /dev/null @@ -1,3 +0,0 @@ -ent-BoxSurvivalNfsd = аварийный набор - .desc = Коробка с базовым набором для выживания. Согласно этикетке, содержит более ёмкий баллон. - .suffix = ДСБФ diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/general.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/general.ftl index aa294be0019..a7b83eb1f61 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/general.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/general.ftl @@ -10,5 +10,5 @@ ent-MysteryFigureBoxBulk = mystery spacemen minifigure bulk box .desc = A box containing six mystery minifigure boxes. ent-BoxT3SuperCapacitor = Thruster upgrade kit .desc = A box of super capacitors. -ent-BoxEncryptionKeyNfsd = nfsd encryption key box - .desc = { ent-BoxEncryptionKeySecurity.desc } +ent-BoxEncryptionKeyNFSD = nfsd encryption key box + .desc = { ent-BoxEncryptionKeyPassenger.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/nfsd.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/nfsd.ftl deleted file mode 100644 index 793c58f7dc3..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/boxes/nfsd.ftl +++ /dev/null @@ -1,20 +0,0 @@ -ent-BoxBundleNfsd = box of nfsd items - .desc = A box full of nfsd items. -ent-BoxExplosiveGrenades = box of explosive grenades - .desc = A box full of explosive grenades. -ent-BoxIncendiaryGrenades = box of incendiary grenades - .desc = A box full of incendiary grenades. -ent-BoxShrapnelGrenades = box of shrapnel grenades - .desc = A box full of shrapnel grenades. -ent-BoxSmokeGrenades = box of smoke grenades - .desc = A box full of smoke grenades. -ent-BoxTeargasGrenades = box of tear gas grenades - .desc = A box full of tear gas grenades. -ent-BoxEMPGrenades = { ent-BoxBundleNfsd } - .desc = A box full of EMP grenades. -ent-BoxFlashBangGrenades = box of flashbang grenades - .desc = A box full of flashbang grenades. -ent-BoxStingerGrenades = box of stinger grenades - .desc = A box full of stinger grenades. -ent-BoxBreachingCharges = box of breaching charges grenades - .desc = A box full of breaching charges. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsd.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsd.ftl index a77d322d522..13b2c1e7091 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsd.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsd.ftl @@ -1,16 +1,16 @@ -ent-CrateNfsdArmor = nfsd armor crate +ent-CrateNFSDArmor = nfsd armor crate .desc = Three vests of well-rounded, decently-protective armor. Requires Security access to open. -ent-CrateNfsdHelmet = nfsd helmet crate +ent-CrateNFSDHelmet = nfsd helmet crate .desc = Contains three standard-issue brain buckets. Requires Security access to open. -ent-CrateNfsdNonlethal = nfsd nonlethals crate +ent-CrateNFSDNonlethal = nfsd nonlethals crate .desc = Disabler weapons. Requires Security access to open. -ent-CrateNfsdRiot = nfsd swat crate +ent-CrateNFSDRiot = nfsd swat crate .desc = Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open. -ent-CrateNfsdSupplies = nfsd supplies crate +ent-CrateNFSDSupplies = nfsd supplies crate .desc = Contains various supplies for the station's Security team. Requires Security access to open. -ent-CrateNfsdRestraints = nfsd restraints crate +ent-CrateNFSDRestraints = nfsd restraints crate .desc = Contains two boxes each of handcuffs and zipties. Requires Security access to open. -ent-CrateNfsdBioSuit = nfsd bio suit crate +ent-CrateNFSDBioSuit = nfsd bio suit crate .desc = Contains 2 biohazard suits to ensure that no disease will distract you from your duties. Requires Security access to open. -ent-CrateNfsdImplants = nfsd implanter crate +ent-CrateNFSDImplants = nfsd implanter crate .desc = Contains 4 MindShield implants and 4 tracking implant. Requires Security access to open. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsdarmory.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsdarmory.ftl index 7d34122d4e5..09d19df8e54 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsdarmory.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/crates/nfsdarmory.ftl @@ -1,12 +1,12 @@ -ent-CrateArmorySMGNfsd = nfsd SMG crate +ent-CrateArmorySMGNFSD = nfsd SMG crate .desc = Contains two high-powered, semiautomatic rifles with four mags. Requires Armory access to open. -ent-CrateArmoryShotgunNfsd = nfsd shotgun crate +ent-CrateArmoryShotgunNFSD = nfsd shotgun crate .desc = For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open. -ent-CrateTrackingImplantsNfsd = nfsd tracking implants +ent-CrateTrackingImplantsNFSD = nfsd tracking implants .desc = Contains a handful of tracking implanters. Good for prisoners you'd like to release but still keep track of. -ent-CrateTrainingBombsNfsd = nfsd training bombs +ent-CrateTrainingBombsNFSD = nfsd training bombs .desc = Contains three low-yield training bombs for security to learn defusal and safe ordnance disposal, EOD suit not included. Requires Armory access to open. -ent-CrateArmoryLaserNfsd = nfsd lasers crate +ent-CrateArmoryLaserNFSD = nfsd lasers crate .desc = Contains three standard-issue laser rifles. Requires Armory access to open. -ent-CrateArmoryPistolsNfsd = nfsd pistols crate +ent-CrateArmoryPistolsNFSD = nfsd pistols crate .desc = Contains two standard NT pistols with four mags. Requires Armory access to open. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/belt.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/belt.ftl index a633d2290f2..67bc6be38dc 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/belt.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/belt.ftl @@ -1,9 +1,8 @@ ent-ClothingBeltPilotFilled = { ent-ClothingBeltPilot } .suffix = Filled .desc = { ent-ClothingBeltPilot.desc } -ent-ClothingBeltNfsdFilled = { ent-['ClothingBeltNfsd', 'ClothingBeltSecurityFilled'] } - - .desc = { ent-['ClothingBeltNfsd', 'ClothingBeltSecurityFilled'].desc } +ent-ClothingBeltNfsdFilled = { ent-ClothingBeltNfsd } + .desc = { ent-ClothingBeltNfsd.desc } ent-ClothingBeltNfsdWebbingFilledBrigmedic = { ent-ClothingBeltNfsdWebbing } .suffix = Filled, Brigmedic .desc = { ent-ClothingBeltNfsdWebbing.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/misc.ftl index 07e9363cd54..540394addfb 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/misc.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/misc.ftl @@ -1,18 +1,8 @@ -ent-ClothingShoesBootsMagCombatFilled = { ent-['ClothingShoesBootsMagCombat', 'ClothingShoesBootsCombatFilled'] } - - .desc = { ent-['ClothingShoesBootsMagCombat', 'ClothingShoesBootsCombatFilled'].desc } -ent-ClothingShoesBootsMagNfsdFilled = { ent-['ClothingShoesBootsMagNfsd', 'ClothingShoesBootsCombatFilled'] } - - .desc = { ent-['ClothingShoesBootsMagNfsd', 'ClothingShoesBootsCombatFilled'].desc } -ent-ClothingShoesBootsMagPirateFilled = { ent-['ClothingShoesBootsMagPirate', 'ClothingShoesBootsCombatFilled'] } - - .desc = { ent-['ClothingShoesBootsMagPirate', 'ClothingShoesBootsCombatFilled'].desc } -ent-ClothingShoesBootsMagMercenaryFilled = { ent-['ClothingShoesBootsMagMercenary', 'ClothingShoesBootsMercenaryFilled'] } - - .desc = { ent-['ClothingShoesBootsMagMercenary', 'ClothingShoesBootsMercenaryFilled'].desc } -ent-ClothingShoesBootsNfsdBrownFilled = { ent-['ClothingShoesBootsNfsdBrown', 'ClothingShoesBootsCombatFilled'] } - - .desc = { ent-['ClothingShoesBootsNfsdBrown', 'ClothingShoesBootsCombatFilled'].desc } -ent-ClothingShoesBootsNfsdCreamFilled = { ent-['ClothingShoesBootsNfsdCream', 'ClothingShoesBootsCombatFilled'] } - - .desc = { ent-['ClothingShoesBootsNfsdCream', 'ClothingShoesBootsCombatFilled'].desc } \ No newline at end of file +ent-ClothingShoesBootsMagCombatFilled = { ent-ClothingShoesBootsMagCombat } + .desc = { ent-lothingShoesBootsMagCombat.desc } +ent-ClothingShoesBootsMagNfsdFilled = { ent-ClothingShoesBootsMagNfsd } + .desc = { ent-ClothingShoesBootsMagNfsd.desc } +ent-ClothingShoesBootsMagPirateFilled = { ent-ClothingShoesBootsMagPirate } + .desc = { ent-ClothingShoesBootsMagPirate.desc } +ent-ClothingShoesBootsMagMercenaryFilled = { ent-ClothingShoesBootsMagMercenary } + .desc = { ent-ClothingShoesBootsMagMercenary.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/dressers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/dressers.ftl deleted file mode 100644 index 298442f9a70..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/dressers.ftl +++ /dev/null @@ -1,3 +0,0 @@ -ent-DresserStationRepresentativeFilled = { ent-Dresser } - .suffix = Filled, Station Representative - .desc = { ent-Dresser.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/heads.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/heads.ftl index 32b2851d72c..a72daf75150 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/heads.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/heads.ftl @@ -1,6 +1,3 @@ ent-LockerQuarterMasterFilledHardsuit = { ent-LockerQuarterMaster } .suffix = Filled, Hardsuit .desc = { ent-LockerQuarterMaster.desc } -ent-LockerStationRepresentativeFilled = { ent-LockerStationRepresentative } - .suffix = Filled - .desc = { ent-LockerStationRepresentative.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage.ftl index 3967592aa97..f990467034d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage.ftl @@ -1,8 +1,8 @@ ent-SuitStorageParamedic = { ent-SuitStorageBase } .suffix = Paramedic .desc = { ent-SuitStorageBase.desc } -ent-SuitStorageHydro = { ent-SuitStorageBase } - .suffix = Hydroponics +ent-SuitStorageBrigmedic = { ent-SuitStorageBase } + .suffix = Brigmedic .desc = { ent-SuitStorageBase.desc } ent-SuitStorageQuartermaster = { ent-SuitStorageBase } .suffix = Quartermaster @@ -10,9 +10,6 @@ ent-SuitStorageQuartermaster = { ent-SuitStorageBase } ent-SuitStorageMercenary = { ent-SuitStorageBase } .suffix = Mercenary .desc = { ent-SuitStorageBase.desc } -ent-SuitStorageScaf = { ent-SuitStorageBase } - .suffix = SCAF - .desc = { ent-SuitStorageBase.desc } ent-SuitStoragePilot = { ent-SuitStorageBase } .suffix = Pilot .desc = { ent-SuitStorageBase.desc } @@ -20,26 +17,20 @@ ent-SuitStorageClown = { ent-SuitStorageBase } .suffix = Clown .desc = { ent-SuitStorageBase.desc } ent-SuitStorageCadet = { ent-SuitStorageBase } - .suffix = NFSD Cadet + .suffix = NFSDCadet .desc = { ent-SuitStorageBase.desc } ent-SuitStorageDeputy = { ent-SuitStorageBase } - .suffix = NFSD Deputy + .suffix = NFSDDeputy .desc = { ent-SuitStorageBase.desc } -ent-SuitStorageBrigmedic = { ent-SuitStorageBase } - .suffix = NFSD Brigmedic +ent-SuitStorageBrigmed = { ent-SuitStorageBase } + .suffix = NFSDBrigMedic .desc = { ent-SuitStorageBase.desc } ent-SuitStorageSergeant = { ent-SuitStorageBase } - .suffix = NFSD Sergeant + .suffix = NFSDSergeant .desc = { ent-SuitStorageBase.desc } ent-SuitStorageBailiff = { ent-SuitStorageBase } - .suffix = NFSD Bailiff + .suffix = NFSDBailiff .desc = { ent-SuitStorageBase.desc } ent-SuitStorageSheriff = { ent-SuitStorageBase } - .suffix = NFSD Sheriff - .desc = { ent-SuitStorageBase.desc } -ent-SuitStorageNfsdCombat = { ent-SuitStorageBase } - .suffix = NFSD Combat - .desc = { ent-SuitStorageBase.desc } -ent-SuitStorageNfsdCommand = { ent-SuitStorageBase } - .suffix = NFSD Command + .suffix = NFSDSheriff .desc = { ent-SuitStorageBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage_wallmount.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage_wallmount.ftl index 3e1dea3743b..f816a86d9ec 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage_wallmount.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/suit_storage_wallmount.ftl @@ -1,108 +1,66 @@ -ent-SuitStorageWallmountParamedic = { ent-['SuitStorageWallmount', 'SuitStorageParamedic'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageParamedic'].desc } -ent-SuitStorageWallmountHydro = { ent-['SuitStorageWallmount', 'SuitStorageHydro'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageHydro'].desc } -ent-SuitStorageWallmountQuartermaster = { ent-['SuitStorageWallmount', 'SuitStorageQuartermaster'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageQuartermaster'].desc } -ent-SuitStorageWallmountMercenary = { ent-['SuitStorageWallmount', 'SuitStorageMercenary'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageMercenary'].desc } -ent-SuitStorageWallmountScaf = { ent-['SuitStorageWallmount', 'SuitStorageScaf'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageScaf'].desc } -ent-SuitStorageWallmountPilot = { ent-['SuitStorageWallmount', 'SuitStoragePilot'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStoragePilot'].desc } -ent-SuitStorageWallmountEVA = { ent-['SuitStorageWallmount', 'SuitStorageEVA'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageEVA'].desc } -ent-SuitStorageWallmountEVAAlternate = { ent-['SuitStorageWallmount', 'SuitStorageEVAAlternate'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageEVAAlternate'].desc } -ent-SuitStorageWallmountEVAEmergency = { ent-['SuitStorageWallmount', 'SuitStorageEVAEmergency'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageEVAEmergency'].desc } -ent-SuitStorageWallmountEVAPrisoner = { ent-['SuitStorageWallmount', 'SuitStorageEVAPrisoner'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageEVAPrisoner'].desc } -ent-SuitStorageWallmountEVASyndicate = { ent-['SuitStorageWallmount', 'SuitStorageEVASyndicate'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageEVASyndicate'].desc } -ent-SuitStorageWallmountEVAPirate = { ent-['SuitStorageWallmount', 'SuitStorageEVAPirate'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageEVAPirate'].desc } -ent-SuitStorageWallmountNTSRA = { ent-['SuitStorageWallmount', 'SuitStorageNTSRA'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageNTSRA'].desc } -ent-SuitStorageWallmountBasic = { ent-['SuitStorageWallmount', 'SuitStorageBasic'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageBasic'].desc } -ent-SuitStorageWallmountEngi = { ent-['SuitStorageWallmount', 'SuitStorageEngi'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageEngi'].desc } -ent-SuitStorageWallmountAtmos = { ent-['SuitStorageWallmount', 'SuitStorageAtmos'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageAtmos'].desc } -ent-SuitStorageWallmountSec = { ent-['SuitStorageWallmount', 'SuitStorageSec'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageSec'].desc } -ent-SuitStorageWallmountCE = { ent-['SuitStorageWallmount', 'SuitStorageCE'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageCE'].desc } -ent-SuitStorageWallmountCMO = { ent-['SuitStorageWallmount', 'SuitStorageCMO'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageCMO'].desc } -ent-SuitStorageWallmountRD = { ent-['SuitStorageWallmount', 'SuitStorageRD'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageRD'].desc } -ent-SuitStorageWallmountHOS = { ent-['SuitStorageWallmount', 'SuitStorageHOS'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageHOS'].desc } -ent-SuitStorageWallmountWarden = { ent-['SuitStorageWallmount', 'SuitStorageWarden'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageWarden'].desc } -ent-SuitStorageWallmountCaptain = { ent-['SuitStorageWallmount', 'SuitStorageCaptain'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageCaptain'].desc } -ent-SuitStorageWallmountSalv = { ent-['SuitStorageWallmount', 'SuitStorageSalv'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageSalv'].desc } -ent-SuitStorageWallmountSyndie = { ent-['SuitStorageWallmount', 'SuitStorageSyndie'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageSyndie'].desc } -ent-SuitStorageWallmountPirateCap = { ent-['SuitStorageWallmount', 'SuitStoragePirateCap'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStoragePirateCap'].desc } -ent-SuitStorageWallmountWizard = { ent-['SuitStorageWallmount', 'SuitStorageWizard'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageWizard'].desc } -ent-SuitStorageWallmountClown = { ent-['SuitStorageWallmount', 'SuitStorageClown'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageClown'].desc } -ent-SuitStorageWallmountCadet = { ent-['SuitStorageWallmount', 'SuitStorageCadet'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageCadet'].desc } -ent-SuitStorageWallmountDeputy = { ent-['SuitStorageWallmount', 'SuitStorageDeputy'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageDeputy'].desc } -ent-SuitStorageWallmountBrigmedic = { ent-['SuitStorageWallmount', 'SuitStorageBrigmedic'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageBrigmedic'].desc } -ent-SuitStorageWallmountSergeant = { ent-['SuitStorageWallmount', 'SuitStorageSergeant'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageSergeant'].desc } -ent-SuitStorageWallmountBailiff = { ent-['SuitStorageWallmount', 'SuitStorageBailiff'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageBailiff'].desc } -ent-SuitStorageWallmountSheriff = { ent-['SuitStorageWallmount', 'SuitStorageSheriff'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageSheriff'].desc } -ent-SuitStorageWallmountNfsdCombat = { ent-['SuitStorageWallmount', 'SuitStorageNfsdCombat'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageNfsdCombat'].desc } -ent-SuitStorageWallmountNfsdCommand = { ent-['SuitStorageWallmount', 'SuitStorageNfsdCommand'] } - - .desc = { ent-['SuitStorageWallmount', 'SuitStorageNfsdCommand'].desc } \ No newline at end of file +ent-SuitStorageWallmountParamedic = { ent-SuitStorageParamedic } + .desc = { ent-SuitStorageParamedic.desc } +ent-SuitStorageWallmountBrigmedic = { ent-SuitStorageBrigmedic } + .desc = { ent-SuitStorageBrigmedic.desc } +ent-SuitStorageWallmountQuartermaster = { ent-SuitStorageQuartermaster } + .desc = { ent-SuitStorageQuartermaster.desc } +ent-SuitStorageWallmountMercenary = { ent-SuitStorageMercenary } + .desc = { ent-SuitStorageMercenary.desc } +ent-SuitStorageWallmountPilot = { ent-SuitStoragePilot } + .desc = { ent-SuitStoragePilot.desc } +ent-SuitStorageWallmountEVA = { ent-SuitStorageEVA } + .desc = { ent-SuitStorageEVA.desc } +ent-SuitStorageWallmountEVAAlternate = { ent-SuitStorageEVAAlternate } + .desc = { ent-SuitStorageEVAAlternate.desc } +ent-SuitStorageWallmountEVAEmergency = { ent-SuitStorageEVAEmergency } + .desc = { ent-SuitStorageEVAEmergency.desc } +ent-SuitStorageWallmountEVAPrisoner = { ent-SuitStorageEVAPrisoner } + .desc = { ent-SuitStorageEVAPrisoner.desc } +ent-SuitStorageWallmountEVASyndicate = { ent-SuitStorageEVASyndicate } + .desc = { ent-SuitStorageEVASyndicate.desc } +ent-SuitStorageWallmountEVAPirate = { ent-SuitStorageEVAPirate } + .desc = { ent-SuitStorageEVAPirate.desc } +ent-SuitStorageWallmountNTSRA = { ent-SuitStorageNTSRA } + .desc = { ent-SuitStorageNTSRA.desc } +ent-SuitStorageWallmountBasic = { ent-SuitStorageBasic } + .desc = { ent-SuitStorageBasic.desc } +ent-SuitStorageWallmountEngi = { ent-SuitStorageEngi } + .desc = { ent-SuitStorageEngi.desc } +ent-SuitStorageWallmountAtmos = { ent-SuitStorageAtmos } + .desc = { ent-SuitStorageAtmos.desc } +ent-SuitStorageWallmountSec = { ent-SuitStorageSec } + .desc = { ent-SuitStorageSec.desc } +ent-SuitStorageWallmountCE = { ent-SuitStorageCE } + .desc = { ent-SuitStorageCE.desc } +ent-SuitStorageWallmountCMO = { ent-SuitStorageCMO } + .desc = { ent-SuitStorageCMO.desc } +ent-SuitStorageWallmountRD = { ent-SuitStorageRD } + .desc = { ent-SuitStorageRD.desc } +ent-SuitStorageWallmountHOS = { ent-SuitStorageHOS } + .desc = { ent-SuitStorageHOS.desc } +ent-SuitStorageWallmountWarden = { ent-SuitStorageWarden } + .desc = { ent-SuitStorageWarden.desc } +ent-SuitStorageWallmountCaptain = { ent-SuitStorageCaptain } + .desc = { ent-SuitStorageCaptain.desc } +ent-SuitStorageWallmountSalv = { ent-SuitStorageSalv } + .desc = { ent-SuitStorageSalv.desc } +ent-SuitStorageWallmountSyndie = { ent-SuitStorageSyndie } + .desc = { ent-SuitStorageSyndie.desc } +ent-SuitStorageWallmountPirateCap = { ent-SuitStoragePirateCap } + .desc = { ent-SuitStoragePirateCap.desc } +ent-SuitStorageWallmountWizard = { ent-SuitStorageWizard } + .desc = { ent-SuitStorageWizard.desc } +ent-SuitStorageWallmountClown = { ent-SuitStorageClown } + .desc = { ent-SuitStorageClown.desc } +ent-SuitStorageWallmountCadet = { ent-SuitStorageCadet } + .desc = { ent-SuitStorageCadet.desc } +ent-SuitStorageWallmountDeputy = { ent-SuitStorageDeputy } + .desc = { ent-SuitStorageDeputy.desc } +ent-SuitStorageWallmountBrigmed = { ent-SuitStorageBrigmed } + .desc = { ent-SuitStorageBrigmed.desc } +ent-SuitStorageWallmountSergeant = { ent-SuitStorageSergeant } + .desc = { ent-SuitStorageSergeant.desc } +ent-SuitStorageWallmountBailiff = { ent-SuitStorageBailiff } + .desc = { ent-SuitStorageBailiff.desc } +ent-SuitStorageWallmountSheriff = { ent-SuitStorageSheriff } + .desc = { ent-SuitStorageSheriff.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/backpacks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/backpacks.ftl index 0af3671843a..3781bf1588d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/backpacks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/backpacks.ftl @@ -6,7 +6,18 @@ ent-ClothingBackpackERTMailCarrier = ERT mail carrier backpack .desc = A spacious backpack with lots of pockets, worn by Mail Carrier's of an Emergency Response Team. ent-ClothingBackpackClippy = Clippy's backpack .desc = Made from a real Clippy. -ent-ClothingBackpackNfsdBrown = nfsd backpack - .desc = { ent-ClothingBackpackSecurity.desc } -ent-ClothingBackpackNfsdCream = { ent-ClothingBackpackNfsdBrown } - .desc = { ent-ClothingBackpackNfsdBrown.desc } +ent-ClothingBackpacknfsdFilled = nfsd backpack + .desc = A backpack for Deputy Sheriff. + .suffix = Filled +ent-ClothingBackpacknfsd = nfsd backpack + .desc = A backpack for Deputy Sheriff. +ent-ClothingBackpacknfsdsheriffFilled = nfsd backpack + .desc = A backpack for the Sheriff. + .suffix = Filled - Sheriff +ent-ClothingBackpacknfsdsheriff = nfsd backpack + .desc = A backpack for the Sheriff. +ent-ClothingBackpacknfsdBrigmedFilled = nfsd brigmedic backpack + .desc = A backpack for Deputized Physician. + .suffix = Filled +ent-ClothingBackpacknfsdBrigmed = nfsd brigmedic backpack + .desc = A backpack for Deputized Physician. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/duffel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/duffel.ftl index e0fc8d2fb46..c4cd291460a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/duffel.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/duffel.ftl @@ -4,7 +4,16 @@ ent-ClothingBackpackDuffelArcadia = arcadia duffel .desc = A duffelbag produced by Arcadia Industries ent-ClothingBackpackDuffelPilot = pilot duffel .desc = A duffelbag produced for a True Ace. -ent-ClothingBackpackDuffelNfsdBrown = nfsd duffel - .desc = { ent-ClothingBackpackDuffelSecurity.desc } -ent-ClothingBackpackDuffelNfsdCream = { ent-ClothingBackpackDuffelNfsdBrown } - .desc = { ent-ClothingBackpackDuffelNfsdBrown.desc } +ent-ClothingBackpackDuffelnfsdFilled = nfsd duffel + .desc = A duffelbag produced for a Deputy Sheriff. + .suffix = Filled +ent-ClothingBackpackDuffelnfsd = nfsd duffel + .desc = A duffelbag produced for a Deputy Sheriff. +ent-ClothingBackpackDuffelnfsdsheriffFilled = nfsd duffel + .desc = A duffelbag produced for a Deputy Sheriff. + .suffix = Filled - Sheriff +ent-ClothingBackpackDuffelnfsdBrigmed = nfsd brigmedic duffel + .desc = A duffelbag produced for a Deputized Physician. +ent-ClothingBackpackDuffelnfsdBrigmedFilled = nfsd brigmedic duffel + .desc = A duffelbag produced for a Deputized Physician. + .suffix = Filled diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/messenger.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/messenger.ftl index fd07cdd3518..a302870e3bc 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/messenger.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/messenger.ftl @@ -16,6 +16,10 @@ ent-ClothingBackpackMessengerGenetics = genetics messenger bag .desc = A sterile messenger bag with geneticist colours. ent-ClothingBackpackMessengerScience = science messenger bag .desc = Useful for holding research materials. +ent-ClothingBackpackMessengerSecurity = security messenger bag + .desc = A robust messenger bag for security related needs. +ent-ClothingBackpackMessengerBrigmedic = brigmedic messenger bag + .desc = A sterile messenger bag for medical related needs. ent-ClothingBackpackMessengerCaptain = captain's messenger bag .desc = An exclusive messenger bag for Nanotrasen officers. ent-ClothingBackpackMessengerHydroponics = hydroponics messenger bag @@ -38,9 +42,3 @@ ent-ClothingBackpackMessengerJanitor = janitor messenger bag .desc = A robust messenger bag for waging war against dirt. ent-ClothingBackpackMessengerMime = mime messenger bag .desc = A robust messenger bag for waging war against clowns. -ent-ClothingBackpackMessengerNfsdBrown = nfsd messenger bag - .desc = { ent-ClothingBackpackMessenger.desc } -ent-ClothingBackpackMessengerNfsdCream = { ent-ClothingBackpackMessenger } - .desc = { ent-ClothingBackpackMessenger.desc } -ent-ClothingBackpackMessengerBloodCult = cultist messenger bag - .desc = { ent-ClothingBackpackMessenger.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/satchel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/satchel.ftl index 7d37ca25262..4c3656a5aa6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/satchel.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/satchel.ftl @@ -4,7 +4,18 @@ ent-ClothingBackpackSatchelArcadia = arcadia satchel .desc = A satchel produced by Arcadia Industries. ent-ClothingBackpackSatchelPilot = pilot satchel .desc = A satchel produced for a True Ace. -ent-ClothingBackpackSatchelNfsdBrown = nfsd satchel - .desc = { ent-ClothingBackpackSatchelSecurity.desc } -ent-ClothingBackpackSatchelNfsdCream = { ent-ClothingBackpackSatchelNfsdBrown } - .desc = { ent-ClothingBackpackSatchelNfsdBrown.desc } +ent-ClothingBackpackSatchelnfsdFilled = nfsd satchel + .desc = A satchel produced for a Deputy Sheriff. + .suffix = Filled +ent-ClothingBackpackSatchelnfsd = nfsd satchel + .desc = A satchel produced for a Deputy Sheriff. +ent-ClothingBackpackSatchelnfsdsheriffFilled = nfsd satchel + .desc = A satchel produced for the Sheriff. + .suffix = Filled - Sheriff +ent-ClothingBackpackSatchelnfsdsheriff = nfsd satchel + .desc = A satchel produced for the Sheriff. +ent-ClothingBackpackSatchelnfsdBrigmedFilled = nfsd brigmedic satchel + .desc = A satchel produced for a Deputized Physician. + .suffix = Filled +ent-ClothingBackpackSatchelnfsdBrigmed = nfsd brigmedic satchel + .desc = A satchel produced for a Deputized Physician. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/belt/belts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/belt/belts.ftl index d834d4ca234..b2506fe3794 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/belt/belts.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/belt/belts.ftl @@ -8,7 +8,3 @@ ent-ClothingBeltNfsd = nfsd belt .desc = A tactical assault belt. ent-ClothingBeltNfsdWebbing = nfsd webbing .desc = A tactical assault webbing. -ent-ClothingBeltCultForceField = cult runic belt buckle - .desc = { ent-ClothingBeltBase.desc } -ent-ClothingBeltCultWebbing = cult webbing - .desc = A webbing with pockets lined with waterproof (water, huh?) material. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets.ftl index c2165bcd3a1..d116c5303d3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets.ftl @@ -1,21 +1,19 @@ -ent-ClothingHeadsetSecuritySafe = nfsd headset +ent-ClothingHeadsetSecuritySafe = { ent-ClothingHeadsetSecurity } .suffix = Safe .desc = { ent-ClothingHeadsetSecurity.desc } -ent-ClothingHeadsetNfsdSafe = { ent-ClothingHeadsetSecuritySafe } - .desc = { ent-ClothingHeadsetSecuritySafe.desc } -ent-ClothingHeadsetNfsd = nfsd headset +ent-ClothingHeadsetMailCarrier = mail carrier headset + .desc = A headset used by mail carrier employees. +ent-ClothingHeadsetNFSD = nfsd headset .desc = This is used by your elite sheriff's department force. -ent-ClothingHeadsetNfsdGreen = { ent-ClothingHeadsetNfsd } - .desc = { ent-ClothingHeadsetNfsd.desc } -ent-ClothingHeadsetNfsdBrown = { ent-ClothingHeadsetNfsd } - .desc = { ent-ClothingHeadsetNfsd.desc } -ent-ClothingHeadsetNfsdCream = { ent-ClothingHeadsetNfsd } - .desc = { ent-ClothingHeadsetNfsd.desc } -ent-ClothingHeadsetNfsdGreenSafe = { ent-ClothingHeadsetNfsdSafe } - .desc = { ent-ClothingHeadsetNfsdSafe.desc } -ent-ClothingHeadsetNfsdBrownSafe = { ent-ClothingHeadsetNfsdSafe } - .desc = { ent-ClothingHeadsetNfsdSafe.desc } -ent-ClothingHeadsetNfsdCreamSafe = { ent-ClothingHeadsetNfsdSafe } - .desc = { ent-ClothingHeadsetNfsdSafe.desc } -ent-ClothingHeadsetNfsdCreamMed = { ent-ClothingHeadsetNfsdCream } - .desc = { ent-ClothingHeadsetNfsdCream.desc } +ent-ClothingHeadsetNFSDgreen = nfsd headset + .desc = A headset for deputy sheriff's. +ent-ClothingHeadsetNFSDbrown = nfsd headset + .desc = A headset for deputy sheriff's. +ent-ClothingHeadsetNFSDcb = nfsd headset + .desc = A headset for deputy sheriff's. +ent-ClothingHeadsetNFSDgreenSafe = nfsd headset + .desc = A headset for deputy sheriff's. +ent-ClothingHeadsetNFSDbrownSafe = nfsd headset + .desc = A headset for deputy sheriff's. +ent-ClothingHeadsetNFSDcbSafe = nfsd headset + .desc = A headset for deputy sheriff's. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets_alt.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets_alt.ftl index a6ce6071757..cfbdb4d60bd 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets_alt.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets_alt.ftl @@ -4,9 +4,9 @@ ent-ClothingHeadsetAltMercenary = mercenary over-ear headset .desc = { ent-ClothingHeadsetAlt.desc } ent-ClothingHeadsetAltPilot = pilot over-ear headset .desc = { ent-ClothingHeadsetAlt.desc } -ent-ClothingHeadsetAltNfsdgreen = nfsd over-ear headset +ent-ClothingHeadsetAltNFSDgreen = nfsd over-ear headset .desc = { ent-ClothingHeadsetAltSecurityWarden.desc } -ent-ClothingHeadsetAltNfsdbrown = nfsd over-ear headset +ent-ClothingHeadsetAltNFSDbrown = nfsd over-ear headset .desc = { ent-ClothingHeadsetAltSecurityWarden.desc } -ent-ClothingHeadsetAltNfsdCreamandBrown = sheriff's over-ear headset - .desc = { ent-ClothingHeadsetAltSecurity.desc } +ent-ClothingHeadsetAltNFSDCreamandBrown = sheriff's over-ear headset + .desc = { ent-ClothingHeadsetAltCommand.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/glasses.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/glasses.ftl index 59d34f50f93..b513937006f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/glasses.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/glasses.ftl @@ -2,5 +2,5 @@ ent-ClothingEyesArcadiaVisor = arcadia visor .desc = A visor produced by Arcadia Industries, with some high tech optics systems built in. ent-ClothingEyesGlassesPilot = pilot goggles .desc = I'm sorry, but you can't pilot a ship without cool glasses. Those are the Rules. Has a GPS built in them too. -ent-ClothingEyesGlassesNfsd = nfsd glasses +ent-ClothingEyesGlassesNFSD = nfsd glasses .desc = Upgraded sunglasses that provide flash immunity and a security HUD. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/hud.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/hud.ftl index 95956247b3e..d0d364e910d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/hud.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/hud.ftl @@ -1,8 +1,4 @@ ent-ClothingEyesHudNfsd = nfsd hud - .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status and criminal records. + .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. ent-ClothingEyesHudMail = mail hud .desc = A heads-up display that scans mail in view and provides accurate mail data. -ent-ClothingEyesHudNfsdMed = brigmedic hud - .desc = An eye display that looks like a mixture of medical and nfsd huds. -ent-ClothingEyesHudNfsdPatch = nfsd hud eyepatch - .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status and criminal records. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/hands/gloves.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/hands/gloves.ftl index 82c56257942..ad1fe7d468e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/hands/gloves.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/hands/gloves.ftl @@ -33,5 +33,3 @@ ent-ClothingHandsGlovesColorBlackCrossbow = combat gloves ent-ClothingHandsGlovesColorBlackLaserPistol = combat gloves .suffix = laser pistol .desc = { ent-ClothingHandsGlovesColorBlackSMG.desc } -ent-ClothingHandsGlovesSr = papercut-proof gloves - .desc = Perfect for dealing with paperwork and matters with bureaucracy. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/base_clothinghead.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/base_clothinghead.ftl deleted file mode 100644 index e39d0a57398..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/base_clothinghead.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-ClothingHeadHardsuitWithLightBaseNF = { ent-ClothingHeadHardsuitWithLightBase } - .desc = { ent-ClothingHeadHardsuitWithLightBase.desc } -ent-ClothingHeadHardsuitWithLightBaseNfsd = { ent-ClothingHeadHardsuitWithLightBaseNF } - .desc = { ent-ClothingHeadHardsuitWithLightBaseNF.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hardsuit-helmets.ftl index b547014a0f6..de8cb8c0f72 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hardsuit-helmets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hardsuit-helmets.ftl @@ -1,3 +1,5 @@ +ent-ClothingHeadHelmetHardsuitSecuritypatrol = security patrol hardsuit helmet + .desc = Lightly armored hardsuit helmet for security beat-cop needs. ent-ClothingHeadHelmetHardsuitMercenary = mercenary hardsuit helmet .desc = Lightly armored hardsuit helmet for mercenary needs. ent-ClothingHeadHelmetHardsuitPilot = pilot hardsuit helmet @@ -6,21 +8,17 @@ ent-ClothingHeadHelmetHardsuitERTMailCarrier = ERT mail carrier hardsuit helmet .desc = A special hardsuit helmet worn by members of an emergency response team. ent-ClothingHeadHelmetHardsuitMaximPrototype = experimental salvager helmet .desc = A predication of decay washes over your mind. +ent-ClothingHeadHelmetHardsuitSundie = sundicate crimson-red hardsuit helmet + .desc = A heavily armored helmet designed for work in special operations. Manufactored in Twinwine Colony by Goreblox Looters LLC. ent-ClothingHeadHelmetHardsuitNfsdBronze = nfsd patrol hardsuit helmet .desc = Lightly armored hardsuit helmet for beat-cop needs. -ent-ClothingHeadHelmetHardsuitNfsdSilver = { ent-ClothingHeadHelmetHardsuitNfsdBronze } - .desc = { ent-ClothingHeadHelmetHardsuitNfsdBronze.desc } +ent-ClothingHeadHelmetHardsuitNfsdSilver = nfsd patrol hardsuit helmet + .desc = Lightly armored hardsuit helmet for beat-cop needs. ent-ClothingHeadHelmetHardsuitNfsdGold = nfsd patrol hardsuit helmet .desc = Lightly armored hardsuit helmet for beat-cop needs. -ent-ClothingHeadHelmetHardsuitNfsdBrigmedic = { ent-ClothingHeadHelmetHardsuitNfsdBronze } - .desc = { ent-ClothingHeadHelmetHardsuitNfsdBronze.desc } -ent-ClothingHeadHelmetHardsuitNfsdSheriff = { ent-ClothingHeadHelmetHardsuitNfsdBronze } - .desc = { ent-ClothingHeadHelmetHardsuitNfsdBronze.desc } -ent-ClothingHeadHelmetHardsuitNfsdExperimental = experimental nfsd hardsuit helmet - .desc = experimental nfsd hardsuit helmet -ent-ClothingHeadHelmetHardsuitNfsdCombat = nfsd combat hardsuit helmet - .desc = Medium armored hardsuit helmet for NFSD raids. -ent-ClothingHeadHelmetHardsuitNfsdCommand = nfsd command hardsuit helmet - .desc = Medium armored hardsuit helmet for NFSD raids. -ent-ClothingHeadHelmetHardsuitScaf = scaf hardsuit helmet - .desc = A robust, strong helmet. On the inside smells of pent up anger. +ent-ClothingHeadHelmetHardsuitNfsdBrigmed = nfsd patrol hardsuit helmet + .desc = Lightly armored hardsuit helmet for beat-cop needs. +ent-ClothingHeadHelmetHardsuitNfsdSheriff = nfsd sheriff hardsuit helmet + .desc = Lightly armored hardsuit helmet for beat-cop-cop needs. +ent-ClothingHeadHelmetHardsuitNfsdExperimental = nfsd experimental hardsuit helmet + .desc = An experimental nfsd hardsuit helmet. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hats.ftl index 63b7bf23643..0eca164e736 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hats.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hats.ftl @@ -26,10 +26,5 @@ ent-ClothingHeadHatNfsdBeretCream = nfsd beret .desc = a cream beret produced for deputy sheriff's. ent-ClothingHeadHatNfsdCampaign = nfsd campaign hat .desc = yee-haw partner. -ent-ClothingHeadHatNfsdCampaignFilled = nfsd campaign hat - .desc = yee-haw partner. - .suffix = Filled ent-ClothingHeadHatNfsdSmallCampaign = nfsd campaign cap .desc = yee partner. -ent-ClothingHeadHatSrCap = station representative's cap - .desc = A cap issued to Frontier Outpost's station representative. Try not to lose it. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/helmets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/helmets.ftl index 1553d796e1f..a6dcc313ce7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/helmets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/helmets.ftl @@ -6,7 +6,5 @@ ent-ClothingHeadHelmetHardsuitSyndieEliteUnremoveable = { ent-ClothingHeadHelmet .desc = { ent-ClothingHeadHelmetHardsuitSyndie.desc } ent-ClothingHeadHelmetHardsuitSyndieUnremoveable = { ent-ClothingHeadHelmetHardsuitSyndie } .desc = { ent-ClothingHeadHelmetHardsuitSyndie.desc } -ent-ClothingHeadHelmetNfsd = nfsd helmet +ent-ClothingHeadHelmetNFSD = nfsd helmet .desc = an nfsd issued helmet to protect your head -ent-ClothingHeadHelmetCultJanitor = cult leader helmet - .desc = { ent-ClothingHeadHelmetBasic.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hoods.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hoods.ftl index 81cf13d6f83..844cd679cc1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hoods.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hoods.ftl @@ -5,8 +5,3 @@ ent-ClothingHeadHatHoodBioArmoredSyndicate = bio hood .suffix = Syndicate ent-ClothingHeadHatHoodWinterSyndieUnremoveable = syndicate coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodBloodCulthood = cult hood - .desc = { ent-ClothingHeadBase.desc } -ent-ClothingHeadHatHoodBloodCulthoodUnremoveable = cult hood - - .desc = { ent-['ClothingHeadHatHoodBloodCulthood', 'ClothingHeadHelmetBasic'].desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/masks/masks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/masks/masks.ftl index 814497df3a4..ab66537e5ea 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/masks/masks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/masks/masks.ftl @@ -4,9 +4,3 @@ ent-FaceHuggerPlushie = facehugger plushie .desc = The perfect plushie to scare your friends with aliens! ent-ClothingMaskPilot = pilot breathing mask .desc = A close-fitting breathing mask designed for, it would seems, minimal comfort of wearer. -ent-ClothingMaskGasNfsd = nfsd gas mask - .desc = A standard issue nfsd gas mask. -ent-ClothingMaskGasSheriff = nfsd sheriff gas mask - .desc = A gas mask worthy of a sheriff. -ent-ClothingMaskCultJanitor = cult leader mask - .desc = A close-fitting imposing breathing mask designed for cult leaders who value style. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/cloaks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/cloaks.ftl index cc626af406c..f9a109f820f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/cloaks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/cloaks.ftl @@ -1,4 +1,2 @@ ent-ClothingNeckCloakSheriff = sheriff's cloak .desc = An exquisite brown and green cloak fitting for those who can assert dominance over wrongdoers. Take a stab at being civil in prosecution! -ent-ClothingNeckCloakSr = station representative's cloak - .desc = A top of the line cloak for Frontier Outpost's station representative. Made from exquisite fibers and furs, this thing must have cost a fortune! The fact this cloak was even issued shows the trust Central Command is placing in their representative on this outpost. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/mantles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/mantles.ftl index dd6f6e0f484..ec6d95a1017 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/mantles.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/mantles.ftl @@ -5,5 +5,3 @@ ent-ClothingNeckCloakJanitorFilled = { ent-ClothingNeckCloakJanitor } .desc = { ent-ClothingNeckCloakJanitor.desc } ent-ClothingNeckMantleSheriff = sheriff's mantle .desc = Shootouts with nukies are just another Tuesday for this Sheriff. This mantle is a symbol of commitment to the station. -ent-ClothingNeckMantleSr = station representative's mantle - .desc = This mantle protects the station representative's neck and shoulders from vicious papercuts. This mantle is a symbol of Central Command's trust. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/scarfs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/scarfs.ftl index 6e489ac9a96..984f1183c6a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/scarfs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/neck/scarfs.ftl @@ -10,7 +10,7 @@ ent-ClothingNeckNfsdBadgeSecurityCadet = { ent-ClothingNeckNfsdBadge } ent-ClothingNeckNfsdBadgeSecurity = { ent-ClothingNeckNfsdBadge } .suffix = Silver - Deputy .desc = { ent-ClothingNeckNfsdBadge.desc } -ent-ClothingNeckNfsdBadgeSecurityBrigmedic = { ent-ClothingNeckNfsdBadge } +ent-ClothingNeckNfsdBadgeSecurityBrigmed = { ent-ClothingNeckNfsdBadge } .suffix = Silver - Brigmedic .desc = { ent-ClothingNeckNfsdBadge.desc } ent-ClothingNeckNfsdBadgeDetective = { ent-ClothingNeckNfsdBadge } @@ -22,6 +22,6 @@ ent-ClothingNeckNfsdBadgeSeniorOfficer = { ent-ClothingNeckNfsdBadge } ent-ClothingNeckNfsdBadgeWarden = { ent-ClothingNeckNfsdBadge } .suffix = Gold - Bailiff .desc = { ent-ClothingNeckNfsdBadge.desc } -ent-ClothingNeckNfsdBadgeSheriff = { ent-ClothingNeckNfsdBadge } +ent-ClothingNeckNfsdBadgeHoS = { ent-ClothingNeckNfsdBadge } .suffix = Star - Sheriff .desc = { ent-ClothingNeckNfsdBadge.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/armor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/armor.ftl index f9bebe3c14b..ec7073a589a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/armor.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/armor.ftl @@ -1,7 +1,7 @@ -ent-ClothingOuterArmorSrCarapace = station representative's carapace +ent-ClothingOuterArmorSRCarapace = station rep's carapace .desc = A premium armored chestpiece that provides above average protection for its size. It offers maximum mobility and flexibility thanks to the premium composite materials. Issued only to the station representative. ent-ClothingOuterBioArmoredSyndicate = bio suit .desc = Favorite protective gear of any syndicate chemical warfare enjoyers. .suffix = Syndicate -ent-ClothingOuterArmorNfsd = nfsd armor +ent-ClothingOuterArmorNfsdArmor = nfsd armor .desc = get shot, maybe survive? diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/base_clothingouter.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/base_clothingouter.ftl deleted file mode 100644 index 8ce03837636..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/base_clothingouter.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-ClothingOuterHardsuitBaseNF = { ent-ClothingOuterHardsuitBase } - .desc = { ent-ClothingOuterHardsuitBase.desc } -ent-ClothingOuterHardsuitBaseNFNfsd = { ent-ClothingOuterHardsuitBaseNF } - .desc = { ent-ClothingOuterHardsuitBaseNF.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/coats.ftl index 6484728ef39..c0ff226e1fb 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/coats.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/coats.ftl @@ -16,10 +16,3 @@ ent-ClothingOuterCoatNfsdFormalSheriff = nfsd sheriff's formal coat .desc = Snazzier. ent-ClothingOuterCoatNfsdLongCoat = nfsd long coat .desc = Big iron on his hip.. -ent-ClothingOuterCoatCultJanitor = cult leader armored robes - .desc = Regal robes fitting for a cult leader. -ent-ClothingOuterCoatBloodCultRobes = cult robes - .desc = There's no cult without classic red/crimson cult robes with bulletproof vests. - .suffix = Frontier -ent-ClothingOuterJacketSr = station representative's jacket - .desc = The upper part of the station representative's uniform. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/hardsuits.ftl index 237a6e60f50..f1535a1c96b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/outerclothing/hardsuits.ftl @@ -1,3 +1,5 @@ +ent-ClothingOuterHardsuitSecuritypatrol = security patrol hardsuit + .desc = A special suit that protects from the danger of space, employed by security patrol officers. Not certified to be blunderbuss proof. ent-ClothingOuterHardsuitMercenary = mercenary hardsuit .desc = A special suit that protects from the danger of space, employed by mercenary forces. Not certified to be blunderbuss proof. ent-ClothingOuterHardsuitPilot = pilot hardsuit @@ -6,6 +8,8 @@ ent-ClothingOuterHardsuitERTMailCarrier = ERT mail carrier's hardsuit .desc = A protective hardsuit worn by the mail carriers of an emergency response team. ent-ClothingOuterHardsuitMaximPrototype = experimental salvager hardsuit .desc = Fire. Heat. These things forge great weapons, they also forge great salvagers. +ent-ClothingOuterHardsuitSundie = sundicate crimson-red hardsuit + .desc = A heavily armored hardsuit designed for work in special operations. Manufactored in Twinwine Colony by Goreblox Looters LLC. ent-ClothingOuterHardsuitSyndieEliteUnremoveable = syndicate hardsuit .desc = { ent-ClothingOuterHardsuitSyndie.desc } ent-ClothingOuterHardsuitSyndieBloodRedUnremoveable = syndicate hardsuit @@ -18,13 +22,7 @@ ent-ClothingOuterHardsuitNfsdGold = nfsd gold patrol hardsuit .desc = A special suit that protects from the danger of space, employed by nfsd patrol officers. Not certified to be blunderbuss proof. ent-ClothingOuterHardsuitNfsdSheriff = nfsd sheriff patrol hardsuit .desc = A special suit that protects from the danger of space, employed by nfsd patrol officers. Not certified to be blunderbuss proof. -ent-ClothingOuterHardsuitNfsdBrigmedic = nfsd brigmedic patrol hardsuit +ent-ClothingOuterHardsuitNfsdBrigMed = nfsd brigmedic patrol hardsuit .desc = A special suit that protects from the danger of space, employed by nfsd patrol officers. Not certified to be blunderbuss proof. -ent-ClothingOuterHardsuitNfsdExperimental = experimental nfsd hardsuit +ent-ClothingOuterHardsuitNfsdExperimental = an experimental nfsd hardsuit .desc = An experimental nfsd hardsuit, never before seen! -ent-ClothingOuterHardsuitNfsdCombat = nfsd combat hardsuit - .desc = Medium armored hardsuit helmet for NFSD raids. -ent-ClothingOuterHardsuitNfsdCommand = nfsd command hardsuit - .desc = Medium armored hardsuit helmet for NFSD raids. -ent-ClothingOuterHardsuitScaf = scaf hardsuit - .desc = A green and brown combat hardsuit. Old yet sturdy nonetheless. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/shoes/boots.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/shoes/boots.ftl index f482454eb12..c791e993554 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/shoes/boots.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/shoes/boots.ftl @@ -1,6 +1,6 @@ ent-ClothingShoesBootsPilot = pilot boots .desc = Stylish boots for running in circles on a deck during emergencies. -ent-ClothingShoesBootsNfsdBrown = nfsd brown boots +ent-ClothingShoesBootsNFSDBrown = nfsd brown boots .desc = Stylish boots for running in circles on a deck during emergencies. -ent-ClothingShoesBootsNfsdCream = nfsd cream boots +ent-ClothingShoesBootsNFSDCream = nfsd cream boots .desc = Stylish boots for running in circles on a deck during emergencies. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpskirts.ftl index 40a43fbec83..6dcf1d636e2 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpskirts.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpskirts.ftl @@ -8,13 +8,9 @@ ent-ClothingUniformJumpskirtBHGrey = noir suit .desc = A grey suit, complete with tie clip. ent-ClothingUniformJumpskirtMercenary = mercenary jumpskirt .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-ClothingUniformJumpskirtSecGuard = security guard's uniform - .desc = A specialized uniform for Frontier Outpost's station guard. Crisp and official to let dock loiterers know you mean business. +ent-ClothingUniformJumpskirtSecGuard = security guard jumpskirt + .desc = A specialized uniform for a security guard. Crisp and official to let dock loiterers know you mean business. ent-ClothingUniformJumpskirtNfsd = nfsd jumpskirt .desc = A long sleeved jumpskirt produced for deputy sheriff's. Designed to reduce chaffing between the legs for the comfort of skin, slime, scales, fluff, and wood ent-ClothingUniformJumpskirtNfsdShort = nfsd jumpskirt .desc = A short sleeved jumpskirt produced for deputy sheriff's. Designed to reduce chaffing between the legs for the comfort of skin, slime, scales, fluff, and wood -ent-ClothingUniformJumpskirtPrivateSec = private security jumpskirt - .desc = A specialized uniform for a private security guard. For the discerning private contractor in need of a professional look. -ent-ClothingUniformJumpskirtSr = station representative's uniform - .desc = A top of the line outfit for Frontier Outpost's station representative. No expense was spared in the tailoring, every stitch is a masterpiece. The fact this suit was even issued shows the trust Central Command is placing in their representative on this outpost. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpsuits.ftl index e7598027851..fdf795505e9 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/uniforms/jumpsuits.ftl @@ -8,8 +8,8 @@ ent-ClothingUniformJumpsuitBHGrey = noir suit .desc = A grey suit, complete with tie clip. ent-ClothingUniformJumpsuitChaplainPilgrimVest = pilgrim jumpsuit .desc = Knock-knock. Would you care to have a word about our Lord-n-Savior Nar-Sss.. Err.. Space Jeebus? -ent-ClothingUniformJumpsuitSecGuard = security guard's uniform - .desc = A specialized uniform for Frontier Outpost's station guard. Crisp and official to let dock loiterers know you mean business. +ent-ClothingUniformJumpsuitSecGuard = security guard jumpsuit + .desc = A specialized uniform for a security guard. Crisp and official to let dock loiterers know you mean business. ent-ClothingUniformJumpsuitPilot = pilot jumpsuit .desc = You too think there should be a pocket for your fav smokes? ent-ClothingUniformJumpsuitERTMailCarrier = ERT mail carrier uniform @@ -26,17 +26,3 @@ ent-ClothingUniformJumpsuitNfsdTacCamo = nfsd tactical jumpsuit .desc = A tactical jumpsuit for deputies in the field. ent-ClothingUniformJumpsuitNfsdTacCream = nfsd tactical jumpsuit .desc = A tactical jumpsuit for deputies in the field. -ent-ClothingUniformJumpsuitRecruitSyndieNF = { ent-ClothingUniformJumpsuitRecruitSyndie } - .desc = { ent-ClothingUniformJumpsuitRecruitSyndie.desc } -ent-ClothingUniformJumpsuitRepairmanSyndieNF = { ent-ClothingUniformJumpsuitRepairmanSyndie } - .desc = { ent-ClothingUniformJumpsuitRepairmanSyndie.desc } -ent-ClothingUniformJumpsuitParamedicSyndieNF = { ent-ClothingUniformJumpsuitParamedicSyndie } - .desc = { ent-ClothingUniformJumpsuitParamedicSyndie.desc } -ent-ClothingUniformJumpsuitChiefEngineerSyndieNF = { ent-ClothingUniformJumpsuitChiefEngineerSyndie } - .desc = { ent-ClothingUniformJumpsuitChiefEngineerSyndie.desc } -ent-ClothingUniformJumpsuitSyndieFormalNF = { ent-ClothingUniformJumpsuitSyndieFormal } - .desc = { ent-ClothingUniformJumpsuitSyndieFormal.desc } -ent-ClothingUniformJumpsuitPrivateSec = private security jumpsuit - .desc = A specialized uniform for a private security guard. For the discerning private contractor in need of a professional look. -ent-ClothingUniformJumpsuitSr = station representative's uniform - .desc = A top of the line outfit for Frontier Outpost's station representative. No expense was spared in the tailoring, every stitch is a masterpiece. The fact this suit was even issued shows the trust Central Command is placing in their representative on this outpost. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/conditional/bloodcultmobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/conditional/bloodcultmobs.ftl deleted file mode 100644 index 002eb62353f..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/conditional/bloodcultmobs.ftl +++ /dev/null @@ -1,24 +0,0 @@ -ent-SpawnMobBloodCultistPriest = Blood Cult Priest Spawner - .suffix = AI, Hostile, Caster - .desc = { ent-MarkerBase.desc } -ent-SpawnMobBloodCultistAcolyte = Blood Cult Acolyte - .suffix = AI, Hostile, Melee - .desc = { ent-MarkerBase.desc } -ent-SpawnMobBloodCultistZealotMelee = Blood Cult Zealot - .suffix = AI, Hostile, Melee - .desc = { ent-MarkerBase.desc } -ent-SpawnMobBloodCultistZealotRanged = Blood Cult Zealot - .suffix = AI, Hostile, Ranged - .desc = { ent-MarkerBase.desc } -ent-SpawnMobBloodCultistCaster = Blood Cult Zealot - .suffix = AI, Hostile, Caster - .desc = { ent-MarkerBase.desc } -ent-SpawnMobBloodCultLeech = Blood Cult Leech - .suffix = AI, Hostile, Melee, Fast - .desc = { ent-MarkerBase.desc } -ent-SpawnMobBloodCultistAscended = Ascended Cultist - .suffix = AI, Hostile, Caster, Megafauna - .desc = { ent-MarkerBase.desc } -ent-SpawnMobBloodCultistJanitor = Blood Cult Janitor - .suffix = AI, Hostile, Melee - .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/bloodcult_inhand_weapons.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/bloodcult_inhand_weapons.ftl deleted file mode 100644 index 04e84049f01..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/bloodcult_inhand_weapons.ftl +++ /dev/null @@ -1,6 +0,0 @@ -ent-SpawnInhandMeleeWeaponBloodCultLow = random melee weapon - .suffix = Blood cult, Low - .desc = { ent-MarkerBase.desc } -ent-SpawnInhandMeleeWeaponBloodCultHigh = random melee weapon - .suffix = Blood cult, High - .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/syndicatemobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/syndicatemobs.ftl deleted file mode 100644 index 48dc4f7517a..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/syndicatemobs.ftl +++ /dev/null @@ -1,41 +0,0 @@ -ent-SpawnMobSyndicateNavalCaptain = Syndicate Naval Captain Spawner - .suffix = AI, Hostile, RND - .desc = { ent-MarkerBase.desc } -ent-SpawnMobSyndicateNavalEngineer = Syndicate Naval Engineer Spawner - .suffix = AI, Hostile, RND - .desc = { ent-MarkerBase.desc } -ent-SpawnMobSyndicateNavalMedic = Syndicate Naval Medic Spawner - .suffix = AI, Hostile, RND - .desc = { ent-MarkerBase.desc } -ent-SpawnMobSyndicateNavalSecondOfficer = Syndicate Naval Second Officer Spawner - .suffix = AI, Hostile, RND - .desc = { ent-MarkerBase.desc } -ent-SpawnMobSyndicateNavalOperator = Syndicate Naval Operator Spawner - .suffix = AI, Hostile, RND - .desc = { ent-MarkerBase.desc } -ent-SpawnMobSyndicateNavalGrenadier = Syndicate Naval Grenadier Spawner - .suffix = AI, Hostile, RND - .desc = { ent-MarkerBase.desc } -ent-SpawnMobSyndicateNavalSaboteur = Syndicate Naval Saboteur Spawner - .suffix = AI, Hostile, RND - .desc = { ent-MarkerBase.desc } -ent-SpawnMobExperimentationVictim = Victim of Experimentation Spawner - .suffix = AI, Hostile - .desc = { ent-MarkerBase.desc } -ent-SpawnMobSyndicateNavalCommander = Syndicate Naval Commander Spawner - .suffix = AI, Hostile, RND - .desc = { ent-MarkerBase.desc } -ent-SpawnMobSyndicateNavalDeckhand = Syndicate Naval Deckhand Spawner - .suffix = AI, Hostile, RND - .desc = { ent-MarkerBase.desc } -ent-SpawnMobCatSyndy = syndicat - .desc = { ent-MarkerBase.desc } -ent-SpawnMobSyndicateNavalMime = Syndicate Naval Mime Spawner - .suffix = AI, Hostile - .desc = { ent-MarkerBase.desc } -ent-SpawnMobSyndicateNavalChemwarrior = Syndicate Naval Chemwarrior Spawner - .suffix = AI, Hostile, RND - .desc = { ent-MarkerBase.desc } -ent-SpawnMobSyndicateNavalHorror = Syndicate Naval Horror Spawner - .suffix = AI, Hostile, RND - .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/wizardfederationmobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/wizardfederationmobs.ftl deleted file mode 100644 index 60b4ace22f6..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/markers/spawners/random/wizardfederationmobs.ftl +++ /dev/null @@ -1,30 +0,0 @@ -ent-SpawnMobWizFedWizard = Random Wizard Spawner - .suffix = AI - .desc = { ent-MarkerBase.desc } -ent-SpawnMobWizFedWizardHardsuit = Random Wizard Spawner - .suffix = AI, Hardsuit - .desc = { ent-MarkerBase.desc } -ent-SpawnMobWizFedWizardBlue = Blue Wizard Spawner - .suffix = AI - .desc = { ent-MarkerBase.desc } -ent-SpawnMobWizFedWizardRed = Red Wizard Spawner - .suffix = AI - .desc = { ent-MarkerBase.desc } -ent-SpawnMobWizFedWizardViolet = Violet Wizard Spawner - .suffix = AI - .desc = { ent-MarkerBase.desc } -ent-SpawnMobWizFedWizardSoap = Soap Wizard Spawner - .suffix = AI - .desc = { ent-MarkerBase.desc } -ent-SpawnMobWizFedWizardBlueHardsuit = Blue Wizard Spawner - .suffix = AI, Hardsuit - .desc = { ent-MarkerBase.desc } -ent-SpawnMobWizFedWizardRedHardsuit = Red Wizard Spawner - .suffix = AI, Hardsuit - .desc = { ent-MarkerBase.desc } -ent-SpawnMobWizFedWizardVioletHardsuit = Violet Wizard Spawner - .suffix = AI, Hardsuit - .desc = { ent-MarkerBase.desc } -ent-SpawnMobWizFedWizardSoapHardsuit = Soap Wizard Spawner - .suffix = AI, Hardsuit - .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/artifact_construct.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/artifact_construct.ftl index 1d6f00cdce1..df882b0d2fb 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/artifact_construct.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/artifact_construct.ftl @@ -1,9 +1,7 @@ -ent-SimpleArtifactMobBase = { ent-['MobAtmosNF', 'BaseSimpleMob', 'MobCombat', 'FlyingMobBase'] } - +ent-SimpleArtifactMobBase = { ent-MobCombat } .suffix = AI - .desc = { ent-['MobAtmosNF', 'BaseSimpleMob', 'MobCombat', 'FlyingMobBase'].desc } + .desc = { ent-MobCombat.desc } ent-BaseMobArtifactConstruct = artifact construct - .desc = { ent-SimpleArtifactMobBase.desc } -ent-MobGrimForged = Grimforged Construct .desc = A towering golem crafted from twisted metal and ancient stones. - .suffix = AI +ent-MobGrimForged = artifact construct 1 + .desc = { ent-BaseMobArtifactConstruct.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/base_humanoid_hostile.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/base_humanoid_hostile.ftl index 4b3b0fa3592..7a6a6262eca 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/base_humanoid_hostile.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/base_humanoid_hostile.ftl @@ -5,10 +5,8 @@ ent-MobPassiveRegen = { "" } ent-MobLaserReflect = { "" } .desc = { "" } ent-MobHumanoidHostileBase = Human NPC - .suffix = AI, Hostile - .desc = { ent-['MobAtmosNF', 'MobBloodstream', 'MobFlammable', 'MobLaserReflect', 'BaseMobSpecies'].desc } + .desc = { ent-BaseMobSpecies.desc } ent-MobNonHumanHostileBase = Mob NPC - .suffix = AI, Hostile - .desc = { ent-['MobAtmosNF', 'MobLaserReflect', 'SimpleSpaceMobBase'].desc } \ No newline at end of file + .desc = { ent-SimpleSpaceMobBase.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/bloodcultistmob.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/bloodcultistmob.ftl index ac7d9be6278..4a7e07c203b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/bloodcultistmob.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/bloodcultistmob.ftl @@ -1,26 +1,31 @@ ent-MobBloodCultistBase = Blood Cultist .desc = { ent-MobHumanoidHostileBase.desc } ent-MobBloodCultistPriest = Blood Cult Priest - .desc = { ent-MobBloodCultistBase.desc } -ent-MobBloodCultistJanitor = Blood Cult Janitor + .suffix = AI, Ranged .desc = { ent-MobBloodCultistBase.desc } ent-MobBloodCultistAcolyte = Blood Cult Acolyte + .suffix = AI, Melee .desc = { ent-MobBloodCultistBase.desc } ent-MobBloodCultistZealotMelee = Blood Cult Zealot + .suffix = AI, Melee .desc = { ent-MobBloodCultistBase.desc } ent-MobBloodCultistZealotRanged = Blood Cult Zealot + .suffix = AI, Crossbow .desc = { ent-MobBloodCultistBase.desc } ent-MobBloodCultistCaster = Blood Cult Zealot + .suffix = AI, Ranged .desc = { ent-MobBloodCultistBase.desc } ent-MobBloodCultistAscended = Ascended Cultist - .desc = { ent-MobNonHumanHostileBase.desc } + .suffix = AI, Ranged + .desc = { ent-MobBloodCultistBase.desc } ent-MobBloodCultLeech = Blood Leech - - .desc = { ent-['MobNonHumanHostileBase', 'MobPassiveRegen'].desc } + .suffix = AI, Melee + .desc = { ent-MobBloodCultistBase.desc } ent-MobBloodCultDrainedOne = Drained One - - .desc = { ent-['MobNonHumanHostileBase', 'FlyingMobBase'].desc } + .suffix = AI, Melee + .desc = { ent-MobBloodCultistBase.desc } ent-MobBloodCultDrainedOneNanoTrasen = Drained One + .suffix = AI, Melee .desc = { ent-MobBloodCultDrainedOne.desc } ent-BloodCultTurret = blood pylon .desc = { ent-BaseWeaponTurret.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/emotionalsupportanimals.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/emotionalsupportanimals.ftl index 271e927f3c6..90eeb51b54e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/emotionalsupportanimals.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/emotionalsupportanimals.ftl @@ -4,39 +4,30 @@ ent-BaseEmotionalGhostCat = { "" } .desc = { "" } ent-BaseEmotionalGhostDog = { "" } .desc = { "" } -ent-MobCatGhost = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostCat', 'MobCat'] } - - .suffix = Ghost - .desc = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostCat', 'MobCat'].desc } -ent-MobCatCalicoGhost = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostCat', 'MobCatCalico'] } - - .suffix = Ghost - .desc = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostCat', 'MobCatCalico'].desc } -ent-MobCatCaracalGhost = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostCat', 'MobCatCaracal'] } - - .suffix = Ghost - .desc = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostCat', 'MobCatCaracal'].desc } -ent-MobCatSpaceGhost = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostCat', 'MobCatSpace'] } - - .suffix = Ghost - .desc = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostCat', 'MobCatSpace'].desc } -ent-MobBingusGhost = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostCat', 'MobBingus'] } - - .suffix = Ghost - .desc = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostCat', 'MobBingus'].desc } -ent-MobCorgiGhost = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostDog', 'MobCorgi'] } - - .suffix = Ghost - .desc = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostDog', 'MobCorgi'].desc } -ent-MobCorgiPuppyGhost = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostDog', 'MobCorgiPuppy'] } - - .suffix = Ghost - .desc = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostDog', 'MobCorgiPuppy'].desc } -ent-MobPibbleGhost = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostDog', 'MobPibble'] } - - .suffix = Ghost - .desc = { ent-['BaseEmotionalGhost', 'BaseEmotionalGhostDog', 'MobPibble'].desc } -ent-MobChickenGhost = { ent-['BaseEmotionalGhost', 'MobChicken'] } - - .suffix = Ghost - .desc = { ent-['BaseEmotionalGhost', 'MobChicken'].desc } \ No newline at end of file +ent-MobCatGhost = { ent-MobCat } + .suffix = Ghost + .desc = { ent-MobCat.desc } +ent-MobCatCalicoGhost = { ent-MobCatCalico } + .suffix = Ghost + .desc = { ent-MobCatCalico.desc } +ent-MobCatCaracalGhost = { ent-MobCatCaracal } + .suffix = Ghost + .desc = { ent-MobCatCaracal.desc } +ent-MobCatSpaceGhost = { ent-MobCatSpace } + .suffix = Ghost + .desc = { ent-MobCatSpace.desc } +ent-MobBingusGhost = { ent-MobBingus } + .suffix = Ghost + .desc = { ent-MobBingus.desc } +ent-MobCorgiGhost = { ent-MobCorgi } + .suffix = Ghost + .desc = { ent-MobCorgi.desc } +ent-MobCorgiPuppyGhost = { ent-MobCorgiPuppy } + .suffix = Ghost + .desc = { ent-MobCorgiPuppy.desc } +ent-MobPibbleGhost = { ent-MobPibble } + .suffix = Ghost + .desc = { ent-MobPibble.desc } +ent-MobChickenGhost = { ent-MobChicken } + .suffix = Ghost + .desc = { ent-MobChicken.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/wizardfederationmob.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/wizardfederationmob.ftl index 4bded5168ad..194924d10e0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/wizardfederationmob.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/mobs/npcs/wizardfederationmob.ftl @@ -1,6 +1,6 @@ ent-MobWizFedlBase = Wizard - - .desc = { ent-['MobHumanoidHostileBase', 'MobPassiveRegen'].desc } + .suffix = AI + .desc = { ent-MobWizFedlBase.desc } ent-MobWizFedWizardBlue = Blue Wizard .desc = { ent-MobWizFedlBase.desc } ent-MobWizFedWizardRed = Red Wizard @@ -8,16 +8,20 @@ ent-MobWizFedWizardRed = Red Wizard ent-MobWizFedWizardViolet = Violet Wizard .desc = { ent-MobWizFedlBase.desc } ent-MobWizFedWizardSoap = Soap Wizard + .suffix = AI .desc = { ent-MobWizFedlBase.desc } ent-MobWizFedWizardBlueHardsuit = Blue Wizard + .suffix = AI, Hardsuit .desc = { ent-MobWizFedWizardBlue.desc } ent-MobWizFedWizardRedHardsuit = Red Wizard + .suffix = AI, Hardsuit .desc = { ent-MobWizFedWizardRed.desc } ent-MobWizFedWizardVioletHardsuit = Violet Wizard + .suffix = AI, Hardsuit .desc = { ent-MobWizFedWizardViolet.desc } ent-MobWizFedWizardSoapHardsuit = Soap Wizard .suffix = AI, Hardsuit .desc = { ent-MobWizFedWizardSoap.desc } ent-WaterElementalConjured = Blue Curacao Elemental - - .desc = { ent-['MobNonHumanHostileBase'].desc } \ No newline at end of file + .suffix = AI + .desc = { ent-MobNonHumanHostileBase.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/door_remote.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/door_remote.ftl deleted file mode 100644 index 4d436132613..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/door_remote.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-DoorRemoteNfsd = nfsd door remote - .desc = { ent-DoorRemoteDefault.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/electronics/door_access.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/electronics/door_access.ftl deleted file mode 100644 index 7e365f80514..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/electronics/door_access.ftl +++ /dev/null @@ -1,15 +0,0 @@ -ent-DoorElectronicsFrontier = { ent-DoorElectronics } - .suffix = Frontier, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsFrontierBridge = { ent-DoorElectronics } - .suffix = Theatre, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsFrontierCommand = { ent-DoorElectronics } - .suffix = Chapel, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsMailCarrier = { ent-DoorElectronics } - .suffix = Mail, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsMercenary = { ent-DoorElectronics } - .suffix = Mercenary, Locked - .desc = { ent-DoorElectronics.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/encryption_keys.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/encryption_keys.ftl index b3d917ccc85..b888426b0f6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/encryption_keys.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/encryption_keys.ftl @@ -1,5 +1,5 @@ ent-EncryptionKeyTraffic = traffic control encryption key .desc = An encryption key for the space traffic control channel. -ent-EncryptionKeyNfsd = nfsd encryption key +ent-EncryptionKeyNFSD = nfsd encryption key .desc = An encryption key for the new frontier security department channel. .suffix = DO NOT MAP diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/flatpacks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/flatpacks.ftl index 420ab426c1f..d913277a4d9 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/flatpacks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/flatpacks.ftl @@ -108,5 +108,3 @@ ent-UprightPianoInstrumentFlatpack = upright piano flatpack .desc = A flatpack containing a upright piano. ent-DawInstrumentFlatpack = daw flatpack .desc = A flatpack containing a daw. -ent-NfsdTechFabFlatpack = nfsd tech fab flatpack - .desc = A flatpack used for constructing a nfsd tech fab. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/holoprojectors.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/holoprojectors.ftl deleted file mode 100644 index 8abbddf2c70..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/holoprojectors.ftl +++ /dev/null @@ -1,5 +0,0 @@ -ent-HoloprojectorNfsd = nfsd holobarrier projector - .desc = Creates a solid but fragile holographic barrier. -ent-HoloprojectorNfsdEmpty = { ent-HoloprojectorSecurityEmpty } - .suffix = Empty - .desc = { ent-HoloprojectorSecurityEmpty.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/misc/identification_cards.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/misc/identification_cards.ftl index 530218cf1d0..98b9a9e53c4 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/misc/identification_cards.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/misc/identification_cards.ftl @@ -4,23 +4,19 @@ ent-PilotIDCard = pilot ID card .desc = { ent-IDCardStandard.desc } ent-StcIDCard = station traffic controller ID card .desc = { ent-IDCardStandard.desc } -ent-CadetIDCard = nfsd cadet ID card +ent-nfsdcadetID = nfsd cadet ID card .desc = { ent-IDCardStandard.desc } -ent-DeputyIDCard = nfsd deputy ID card +ent-nfsddeputyID = nfsd deputy ID card .desc = { ent-IDCardStandard.desc } -ent-BrigmedicNFIDCard = nfsd brigmedic ID card +ent-nfsdbrigmedicID = nfsd brigmedic ID card .desc = { ent-IDCardStandard.desc } -ent-SergeantIDCard = nfsd sergeant ID card +ent-nfsdsergeantID = nfsd sergeant ID card .desc = { ent-IDCardStandard.desc } -ent-BailiffIDCard = nfsd bailiff ID card +ent-nfsdbailiffID = nfsd bailiff ID card .desc = { ent-IDCardStandard.desc } -ent-ShriffIDCard = nfsd sheriff ID card - .desc = { ent-IDCardStandard.desc } -ent-DetectiveNFIDCard = detective ID card +ent-nfsdsheriffID = nfsd sheriff ID card .desc = { ent-IDCardStandard.desc } ent-SecurityGuardIDCard = security guard ID card .desc = { ent-SecurityIDCard.desc } ent-ERTMailCarrierIDCard = ERT mail carrier ID card .desc = { ent-ERTChaplainIDCard.desc } -ent-SrIDCard = station representative ID card - .desc = { ent-HoPIDCard.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/pda.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/pda.ftl index 0f08f222428..8a655eddfd9 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/pda.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/pda.ftl @@ -11,19 +11,15 @@ ent-SecurityGuardPDA = security guard PDA ent-ERTMailCarrierPDA = { ent-ERTLeaderPDA } .suffix = Mail Carrier .desc = { ent-ERTLeaderPDA.desc } -ent-SheriffPDA = sheriff PDA +ent-NfsdSheriff = sheriff PDA .desc = Whosoever bears this PDA is the law. -ent-CadetPDA = cadet PDA +ent-NfsdCadet = cadet PDA .desc = Whosoever bears this PDA could be the law. -ent-DeputyPDA = deputy PDA +ent-NfsdDeputy = deputy PDA .desc = Whosoever bears this PDA is close to being the law. -ent-BrigmedicNFPDA = brigmedic PDA +ent-NfsdBrigmedic = brigmedic PDA .desc = Whosoever bears this PDA heals the law. -ent-SergeantPDA = sergeant PDA +ent-NfsdSergeant = sergeant PDA .desc = Whosoever bears this PDA puts the law on their back. -ent-BailiffPDA = bailiff PDA +ent-NfsdBailiff = bailiff PDA .desc = Whosoever bears this PDA puts the law on their back. -ent-DetectiveNFPDA = detective PDA - .desc = Smells like rain... pouring down the rooftops... -ent-SrPDA = station representative PDA - .desc = Looks like it's been clawed on. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/production.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/production.ftl index 46459f83a50..9111dff1712 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/production.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/devices/production.ftl @@ -1,24 +1,12 @@ ent-ShredderMachineCircuitboard = shredder machine board .desc = A machine printed circuit board for a shredder. -ent-TilePrinterNFMachineCircuitboard = tile-meister 5000 machine board - .desc = A machine printed circuit board for an tile-meister 5000 -ent-SalvageTechFabCircuitboardNF = salvage techfab machine board - .desc = A machine printed circuit board for a salvage techfab -ent-NfsdTechFabCircuitboard = nfsd techfab machine board - .desc = A machine printed circuit board for an nfsd techfab. -ent-ThrusterSecurityMachineCircuitboard = security thruster machine board - .desc = { ent-BaseMachineCircuitboard.desc } -ent-ThrusterNfsdMachineCircuitboard = nfsd thruster machine board - .desc = { ent-BaseMachineCircuitboard.desc } ent-SmallThrusterMachineCircuitboard = small thruster machine board .desc = { ent-BaseMachineCircuitboard.desc } -ent-GyroscopeSecurityMachineCircuitboard = security gyroscope machine board - .desc = { ent-BaseMachineCircuitboard.desc } -ent-SmallGyroscopeSecurityMachineCircuitboard = small security gyroscope machine board - .desc = { ent-BaseMachineCircuitboard.desc } -ent-GyroscopeNfsdMachineCircuitboard = nfsd gyroscope machine board - .desc = { ent-BaseMachineCircuitboard.desc } -ent-SmallGyroscopeNfsdMachineCircuitboard = small nfsd gyroscope machine board - .desc = { ent-BaseMachineCircuitboard.desc } ent-SmallGyroscopeMachineCircuitboard = small gyroscope machine board .desc = { ent-BaseMachineCircuitboard.desc } +ent-ThrusterSecurityMachineCircuitboard = security thruster machine board + .desc = { ent-BaseMachineCircuitboard.desc } +ent-TilePrinterNFMachineCircuitboard = tile-meister 5000 machine board + .desc = A machine printed circuit board for an tile-meister 5000 +ent-SalvageTechFabCircuitboardNF = salvage techfab machine board + .desc = A machine printed circuit board for a salvage techfab diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/fun/whistles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/fun/whistles.ftl deleted file mode 100644 index ace2226aa9a..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/fun/whistles.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-NfsdWhistle = nfsd whistle - .desc = Sound of it make you feel fear. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/bedsheets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/bedsheets.ftl deleted file mode 100644 index 7a31bb0d20d..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/bedsheets.ftl +++ /dev/null @@ -1,6 +0,0 @@ -ent-BedsheetNfsd = nfsd bedsheet - .desc = { ent-BedsheetBase.desc } -ent-BedsheetNfsdBrigmedic = brigmedic bedsheet - .desc = { ent-BedsheetBase.desc } -ent-BedsheetNfsdSheriff = sheriff bedsheet - .desc = { ent-BedsheetBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/implanters.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/implanters.ftl index 43768e229e1..dfedb32fa06 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/implanters.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/implanters.ftl @@ -1,8 +1,5 @@ -ent-MedicalTrackingImplanter = medical tracking implanter +ent-MedicalTrackingImplanter = medical insurance tracking implanter .desc = { ent-BaseImplantOnlyImplanter.desc } -ent-FreelanceTrackingImplanter = freelance tracking implanter - .suffix = Freelance - .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } ent-DeathAcidifierImplanterNF = death acidifier implanter .suffix = All .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/rubber_stamp.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/rubber_stamp.ftl deleted file mode 100644 index 44ac715f16d..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/rubber_stamp.ftl +++ /dev/null @@ -1,8 +0,0 @@ -ent-RubberStampSr = station representative's rubber stamp - .desc = { ent-RubberStampHop.desc } -ent-RubberStampPsychologist = psychologist rubber stamp - .suffix = DO NOT MAP - .desc = { ent-RubberStampBase.desc } -ent-RubberStampStc = station traffic controller's rubber stamp - .suffix = DO NOT MAP - .desc = { ent-RubberStampBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/subdermal_implants.ftl index c862ad54004..d5e646f6c27 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/subdermal_implants.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/misc/subdermal_implants.ftl @@ -1,6 +1,4 @@ -ent-MedicalTrackingImplant = medical tracking implant +ent-MedicalTrackingImplant = medical insurance tracking implant .desc = This implant has a tracking device monitor for the Medical radio channel. -ent-FreelanceTrackingImplant = freelance tracking implant - .desc = This implant has a tracking device monitor for the Freelance radio channel. ent-DeathAcidifierImplantNF = death-acidifier implant .desc = This implant melts the user and their equipment upon death. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/security.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/security.ftl index 6d1e4f7f693..0345f0ec4a6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/security.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/security.ftl @@ -22,5 +22,5 @@ ent-BaseSecurityUplinkRadioSheriff = { ent-BaseSecurityUplinkRadio } ent-BaseSecurityUplinkRadioOfficer = { ent-BaseSecurityUplinkRadio } .suffix = Officer 10 .desc = { ent-BaseSecurityUplinkRadio.desc } -ent-NfsdDeployableBarrier = nfsd deployable barrier +ent-NFSDDeployableBarrier = nfsd deployable barrier .desc = A deployable barrier. Swipe your ID card to lock/unlock it. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/service/vending_machine_restock.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/service/vending_machine_restock.ftl index 21d2010e417..227db85d94d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/service/vending_machine_restock.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/service/vending_machine_restock.ftl @@ -14,3 +14,7 @@ ent-VendingMachineRestockAutoTuneVend = AutoTuneVend restock box .desc = A box containing music and stuff for the Auto Tune vending machine. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM. ent-VendingMachineRestockPottedPlantVend = Plant-O-Matic restock box .desc = A box containing potted plants for the Plant-O-Matic vending machine. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM. +ent-VendingMachineRestockNFSDDrobe = NFSDDrobe restock box + .desc = nfsddrobe restock box - may explode on contact with appendages. +ent-VendingMachineRestockNFSDTec = NFSDTec restock box + .desc = nfsdtec restock box - may unleash a singulo on contact with appendages diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/wizard/conjured_items.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/wizard/conjured_items.ftl index cc00e835baf..d0a4415c185 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/wizard/conjured_items.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/specific/wizard/conjured_items.ftl @@ -2,13 +2,4 @@ ent-ConjuredObject10 = { "" } .desc = A magically created entity, that'll vanish from existence eventually. .suffix = Conjured ent-SoapConjured = soap - - .desc = { ent-['BaseBullet', 'Soap', 'ConjuredObject10'].desc } -ent-SoapletBloodCult = soaplet - .desc = { ent-SoapConjured.desc } -ent-SoapConjuredBloodCultCluster = soap - - .desc = { ent-['Soap', 'ConjuredObject10'].desc } -ent-ShellSoapConjuredBloodCultCluster = { ent-['SoapConjured', 'BaseCartridge'] } - - .desc = { ent-['SoapConjured', 'BaseCartridge'].desc } \ No newline at end of file + .desc = { ent-Soap.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/flashlights.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/flashlights.ftl deleted file mode 100644 index 0748de9f16c..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/flashlights.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-FlashlightNfsdLite = nfsdlite - .desc = A robust flashlight used by the nfsd. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/jetpacks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/jetpacks.ftl index 51078723f54..d5406936b81 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/jetpacks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/tools/jetpacks.ftl @@ -1,7 +1,6 @@ -ent-JetpackNfsd = nfsd jetpack +ent-Jetpacknfsd = nfsd jetpack .suffix = Empty - .desc = { ent-JetpackSecurity.desc } -ent-JetpackNfsdFilled = nfsd jetpack - - .suffix = Filled - .desc = { ent-['JetpackNfsd', 'JetpackSecurityFilled'].desc } \ No newline at end of file + .desc = { ent-BaseJetpack.desc } +ent-JetpackNFSDFilled = nfsd jetpack + .suffix = Filled + .desc = { ent-Jetpacknfsd.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/guns/revolvers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/guns/revolvers.ftl index 8eeb34f96f0..fc476182cba 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/guns/revolvers.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/guns/revolvers.ftl @@ -1,5 +1,5 @@ ent-WeaponRevolverArgenti = Argenti - .desc = The civilian grade Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo. + .desc = Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo. ent-WeaponRevolverArgentiNonlethal = { ent-WeaponRevolverArgenti } .suffix = Non-lethal .desc = { ent-WeaponRevolverArgenti.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/launchers/launchers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/launchers/launchers.ftl index 864ad811a9f..677aec9c0b7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/launchers/launchers.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/launchers/launchers.ftl @@ -2,7 +2,7 @@ ent-WeaponLauncherChinaLakeEmp = china lake .desc = PLOOP .suffix = EMP ent-WeaponLauncherRocketEmp = RPG-7 - .desc = A modified ancient rocket-propelled grenade launcher. On the handle is a label that says 'for authorized use only.' + .desc = A modified ancient rocket-propelled grenade launcher. .suffix = EMP ent-WeaponMailLake = mail RPDS .desc = Rap(b?)id Parcel Delivery System diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/melee/wizard_staff.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/melee/wizard_staff.ftl index 6221f9e48c2..4b29d5dee42 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/melee/wizard_staff.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/melee/wizard_staff.ftl @@ -1,13 +1,10 @@ ent-WizardStaffMeleeBase = wizard staff .desc = Symbol of wizard's mastery of arcane arts. -ent-WizardStaffMeleeRed = inert red wizard staff +ent-WizardStaffMeleeRed = red wizard staff .desc = { ent-WizardStaffMeleeBase.desc } -ent-WizardStaffMeleeViolet = inert violet wizard staff +ent-WizardStaffMeleeViolet = violet wizard staff .desc = { ent-WizardStaffMeleeBase.desc } -ent-WizardStaffMeleeSoap = inert soap wizard staff +ent-WizardStaffMeleeSoap = soap wizard staff .desc = { ent-WizardStaffMeleeBase.desc } -ent-WizardStaffMeleeBlood = inert cultist staff +ent-WizardStaffMeleeBlood = blood cult staff .desc = { ent-WizardStaffMeleeRed.desc } -ent-WizardStaffDarkBolt = cultist staff - .suffix = Dark bolt - .desc = { ent-WizardStaffMeleeBlood.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/snipers/snipers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/snipers/snipers.ftl deleted file mode 100644 index 07c00eb0f68..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/weapons/snipers/snipers.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-WeaponSniperRepeater = N2524 Pattern Repeater - .desc = A civilian grade lever action firearm, favored by space cowboys across the Frontier for its reliability and stopping power. Uses .45 magnum ammo. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/atm.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/atm.ftl deleted file mode 100644 index 296dea28b16..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/atm.ftl +++ /dev/null @@ -1,26 +0,0 @@ -ent-ComputerBankATMBase = { "" } - .desc = { "" } -ent-ComputerBankATMDeposit = bank atm - .desc = Used to deposit and withdraw funds from a personal bank account. -ent-ComputerBankATMWithdraw = bank atm withdraw-only - .desc = Used to withdraw funds from a personal bank account, unable to deposit. -ent-ComputerBankATM = { ent-['ComputerBankATMBase', 'ComputerBankATMDeposit', 'BaseStructureDisableToolUse', 'BaseStructureIndestructible', 'BaseStructureComputer'] } - - .desc = { ent-['ComputerBankATMBase', 'ComputerBankATMDeposit', 'BaseStructureDisableToolUse', 'BaseStructureIndestructible', 'BaseStructureComputer'].desc } -ent-ComputerWithdrawBankATM = { ent-['ComputerBankATMBase', 'ComputerBankATMWithdraw', 'BaseStructureDisableToolUse', 'BaseStructureIndestructible', 'BaseStructureComputer'] } - - .desc = { ent-['ComputerBankATMBase', 'ComputerBankATMWithdraw', 'BaseStructureDisableToolUse', 'BaseStructureIndestructible', 'BaseStructureComputer'].desc } -ent-ComputerWallmountBankATM = { ent-['ComputerBankATMBase', 'ComputerBankATMDeposit', 'BaseStructureDisableToolUse', 'BaseStructureIndestructible', 'BaseStructureWallmount', 'BaseStructureComputer'] } - - .suffix = Wallmount - .desc = { ent-['ComputerBankATMBase', 'ComputerBankATMDeposit', 'BaseStructureDisableToolUse', 'BaseStructureIndestructible', 'BaseStructureWallmount', 'BaseStructureComputer'].desc } -ent-ComputerWallmountWithdrawBankATM = { ent-['ComputerBankATMBase', 'ComputerBankATMWithdraw', 'BaseStructureDisableToolUse', 'BaseStructureIndestructible', 'BaseStructureWallmount', 'BaseStructureComputer'] } - - .suffix = Wallmount - .desc = { ent-['ComputerBankATMBase', 'ComputerBankATMWithdraw', 'BaseStructureDisableToolUse', 'BaseStructureIndestructible', 'BaseStructureWallmount', 'BaseStructureComputer'].desc } -ent-ComputerBlackMarketBankATM = { ent-['ComputerBankATMBase', 'ComputerBankATMDeposit', 'BaseStructureDisableToolUse', 'BaseStructureDestructible', 'BaseStructureComputer'] } - - .desc = Has some sketchy looking modifications and a sticker that says DEPOSIT FEE 30% - .suffix = BlackMarket -ent-StationAdminBankATM = station administration console - .desc = Used to pay out from the station's bank account diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/decoration/banners.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/decoration/banners.ftl index 823035d74a0..3480cf74f26 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/decoration/banners.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/decoration/banners.ftl @@ -1,4 +1,4 @@ -ent-BannerNfsd = nfsd banner +ent-BannerNFSD = nfsd banner .desc = A banner displaying the colors of the new frontier sheriff's department. -ent-FlagNfsd = nfsd flag +ent-FlagNFSD = nfsd flag .desc = A flag displaying the colors of the new frontier sheriff's department. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/access.ftl index d99b27f8934..965ff59bbd7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/access.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/access.ftl @@ -1,69 +1,30 @@ -ent-AirlockFrontierLocked = { ent-AirlockCommandLocked } +ent-AirlockFrontierLocked = { ent-AirlockCommand } .suffix = Frontier, Locked - .desc = { ent-AirlockCommandLocked.desc } -ent-AirlockSeviceFrontierLocked = { ent-AirlockServiceLocked } - .suffix = Frontier, Locked - .desc = { ent-AirlockServiceLocked.desc } -ent-AirlockFrontierBridgeLocked = { ent-AirlockCommandLocked } - .suffix = Frontier Bridge, Locked - .desc = { ent-AirlockCommandLocked.desc } -ent-AirlockMaintFrontierBridgeLocked = { ent-AirlockMaintCommandLocked } - .suffix = Frontier Bridge, Locked - .desc = { ent-AirlockMaintCommandLocked.desc } -ent-AirlockFrontierCommandLocked = { ent-AirlockCommandLocked } - .suffix = Frontier Command, Locked - .desc = { ent-AirlockCommandLocked.desc } -ent-HighSecFrontierCommandLocked = { ent-HighSecDoor } + .desc = { ent-AirlockCommand.desc } +ent-AirlockFrontierCommandLocked = { ent-AirlockCommand } .suffix = Frontier Command, Locked - .desc = { ent-HighSecDoor.desc } -ent-AirlockMailCarrierLocked = { ent-AirlockServiceLocked } + .desc = { ent-AirlockCommand.desc } +ent-AirlockMailCarrierLocked = { ent-Airlock } .suffix = Mail, Locked - .desc = { ent-AirlockServiceLocked.desc } + .desc = { ent-Airlock.desc } ent-AirlockMercenaryLocked = { ent-AirlockMercenary } .suffix = Mercenary, Locked .desc = { ent-AirlockMercenary.desc } -ent-AirlockNfsdGlassLocked = { ent-AirlockNfsdGlass } - .suffix = NFSD, Locked - .desc = { ent-AirlockNfsdGlass.desc } -ent-AirlockNfsdLocked = { ent-AirlockNfsd } - .suffix = NFSD, Locked - .desc = { ent-AirlockNfsd.desc } -ent-AirlockNfsdBrigLocked = { ent-AirlockNfsd } - .suffix = NFSD Brig, Locked - .desc = { ent-AirlockNfsd.desc } -ent-AirlockNfsdBrigGlassLocked = { ent-AirlockNfsdGlass } - .suffix = NFSD Brig, Locked - .desc = { ent-AirlockNfsdGlass.desc } -ent-AirlockNfsdDetectiveLocked = { ent-AirlockNfsd } - .suffix = NFSD Detective, Locked - .desc = { ent-AirlockNfsd.desc } -ent-AirlockNfsdDetectiveGlassLocked = { ent-AirlockNfsdGlass } - .suffix = NFSD Detective, Locked - .desc = { ent-AirlockNfsdGlass.desc } -ent-AirlockNfsdLawyerLocked = { ent-AirlockNfsd } - .suffix = NFSD Lawyer, Locked - .desc = { ent-AirlockNfsd.desc } -ent-AirlockNfsdLawyerGlassLocked = { ent-AirlockNfsdGlass } - .suffix = NFSD Lawyer, Locked - .desc = { ent-AirlockNfsdGlass.desc } -ent-AirlockNfsdArmoryLocked = { ent-AirlockNfsd } - .suffix = NFSD Armory, Locked - .desc = { ent-AirlockNfsd.desc } -ent-AirlockNfsdArmoryGlassLocked = { ent-AirlockNfsdGlass } - .suffix = NFSD Armory, Locked - .desc = { ent-AirlockNfsdGlass.desc } -ent-AirlockFrontierGlassLocked = { ent-AirlockCommandGlassLocked } +ent-AirlockFrontierGlassLocked = { ent-AirlockCommandGlass } .suffix = Frontier, Locked - .desc = { ent-AirlockCommandGlassLocked.desc } -ent-AirlockFrontierBridgeGlassLocked = { ent-AirlockCommandGlassLocked } - .suffix = Frontier Bridge, Locked - .desc = { ent-AirlockCommandGlassLocked.desc } -ent-AirlockFrontierCommandGlassLocked = { ent-AirlockCommandGlassLocked } + .desc = { ent-AirlockCommandGlass.desc } +ent-AirlockFrontierCommandGlassLocked = { ent-AirlockCommandGlass } .suffix = Frontier Command, Locked - .desc = { ent-AirlockCommandGlassLocked.desc } + .desc = { ent-AirlockCommandGlass.desc } ent-AirlockMailCarrierGlassLocked = { ent-AirlockGlass } .suffix = Mail, Locked .desc = { ent-AirlockGlass.desc } ent-AirlockMercenaryGlassLocked = { ent-AirlockMercenaryGlass } .suffix = Mercenary, Locked .desc = { ent-AirlockMercenaryGlass.desc } +ent-AirlockExternalGlassShuttleTransit = { ent-AirlockGlassShuttle } + .suffix = External, PubTrans, Glass, Docking + .desc = { ent-AirlockGlassShuttle.desc } +ent-AirlockNFSDGlassLocked = { ent-AirlockNFSDGlass } + .suffix = NFSD, Locked + .desc = { ent-AirlockNFSDGlass.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/airlocks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/airlocks.ftl index 128e1e2020e..8f2072b8e4e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/airlocks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/doors/airlocks/airlocks.ftl @@ -1,15 +1,9 @@ ent-AirlockMercenary = { ent-Airlock } .suffix = Mercenary .desc = { ent-Airlock.desc } -ent-AirlockNfsd = { ent-Airlock } - .suffix = NFSD - .desc = { ent-Airlock.desc } ent-AirlockMercenaryGlass = { ent-AirlockGlass } .suffix = Mercenary .desc = { ent-AirlockGlass.desc } -ent-AirlockNfsdGlass = { ent-AirlockGlass } +ent-AirlockNFSDGlass = { ent-AirlockGlass } .suffix = NFSD .desc = { ent-AirlockGlass.desc } -ent-AirlockExternalGlassShuttleTransit = { ent-AirlockGlassShuttle } - .suffix = External, PubTrans, Glass, Docking - .desc = { ent-AirlockGlassShuttle.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/holographic/projections.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/holographic/projections.ftl deleted file mode 100644 index 4dd3e6b7da3..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/holographic/projections.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-HolosignNfsd = nfsd holographic barrier - .desc = A barrier of hard light that blocks movement, but pretty weak. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers.ftl index ed9af90c9cc..6c9fc2b7b30 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers.ftl @@ -1,3 +1,15 @@ +ent-ComputerShipyard = shipyard console + .desc = Used to purchase and sell shuttles +ent-ComputerShipyardSecurity = security shipyard console + .desc = Used to enlist into Nanotrasen Security Forces +ent-ComputerShipyardNFSD = nfsd shipyard console + .desc = Used to buy nfsd patrol vessels +ent-ComputerShipyardBlackMarket = black market shipyard console + .desc = Used to buy ships not available through other means. Has a sticker that says SALES TAX 30% +ent-ComputerShipyardExpedition = expedition shipyard console + .desc = Used to buy ships outfitted for planetary expeditions +ent-ComputerShipyardScrap = scrapyard console + .desc = Used to purchase and sell "shuttles" ent-ComputerPalletConsoleNFNormalMarket = cargo sale computer .desc = Used to sell goods loaded onto cargo pallets .suffix = Normal diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_shipyard.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_shipyard.ftl deleted file mode 100644 index cf10c81f72f..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_shipyard.ftl +++ /dev/null @@ -1,14 +0,0 @@ -ent-ComputerShipyard = shipyard console - .desc = Used to purchase and sell shuttles -ent-ComputerShipyardSecurity = security shipyard console - .desc = Used to enlist into Nanotrasen Security Forces -ent-ComputerShipyardNfsd = nfsd shipyard console - .desc = Used to buy nfsd patrol vessels -ent-ComputerShipyardSyndicate = syndicate shipyard console - .desc = Used to buy ships not available through other means. Has a sticker that says SALES TAX 30% -ent-ComputerShipyardBlackMarket = black market shipyard console - .desc = Used to buy ships not available through other means. Has a sticker that says SALES TAX 30% -ent-ComputerShipyardExpedition = expedition shipyard console - .desc = Used to buy ships outfitted for planetary expeditions -ent-ComputerShipyardScrap = scrapyard console - .desc = Used to purchase and sell "shuttles" diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_shipyard_mothership.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_shipyard_mothership.ftl deleted file mode 100644 index 033c5b7f21d..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_shipyard_mothership.ftl +++ /dev/null @@ -1,16 +0,0 @@ -ent-BaseMothershipComputer = { ent-['BaseStructureDisableToolUse', 'BaseStructureIndestructible', 'ComputerShipyard'] } - - .desc = Used on motherships to purchase and sell ships without returning to a station. - .suffix = Mothership -ent-EmpressMothershipComputer = empress shipyard console - .desc = { ent-BaseMothershipComputer.desc } -ent-McCargoMothershipComputer = mccargo shipyard console - .desc = { ent-BaseMothershipComputer.desc } -ent-CaduceusMothershipComputer = caduceus shipyard console - .desc = { ent-BaseMothershipComputer.desc } -ent-GasbenderMothershipComputer = gasbender shipyard console - .desc = { ent-BaseMothershipComputer.desc } -ent-CrescentMothershipComputer = crescent shipyard console - .desc = { ent-BaseMothershipComputer.desc } -ent-MailCarrierMothershipComputer = mail carrier shipyard console - .desc = { ent-BaseMothershipComputer.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_tabletop.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_tabletop.ftl index 3eccc844184..14cf2d4c3b1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_tabletop.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_tabletop.ftl @@ -1,117 +1,94 @@ -ent-ComputerTabletopAlert = { ent-['BaseStructureComputerTabletop', 'ComputerAlert'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerAlert'].desc } -ent-ComputerTabletopEmergencyShuttle = { ent-['BaseStructureComputerTabletop', 'ComputerEmergencyShuttle'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerEmergencyShuttle'].desc } -ent-ComputerTabletopShuttle = { ent-['BaseStructureComputerTabletop', 'ComputerShuttle'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerShuttle'].desc } -ent-ComputerTabletopShuttleSyndie = { ent-['BaseStructureComputerTabletop', 'ComputerShuttleSyndie'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerShuttleSyndie'].desc } -ent-ComputerTabletopShuttleCargo = { ent-['BaseStructureComputerTabletop', 'ComputerShuttleCargo'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerShuttleCargo'].desc } -ent-ComputerTabletopShuttleSalvage = { ent-['BaseStructureComputerTabletop', 'ComputerShuttleSalvage'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerShuttleSalvage'].desc } -ent-ComputerTabletopIFF = { ent-['BaseStructureComputerTabletop', 'ComputerIFF'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerIFF'].desc } -ent-ComputerTabletopIFFSyndicate = { ent-['BaseStructureComputerTabletop', 'ComputerIFFSyndicate'] } - - .suffix = Syndicate, Tabletop - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerIFFSyndicate'].desc } -ent-ComputerTabletopPowerMonitoring = { ent-['BaseStructureComputerTabletop', 'ComputerPowerMonitoring'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerPowerMonitoring'].desc } -ent-ComputerTabletopMedicalRecords = { ent-['BaseStructureComputerTabletop', 'ComputerMedicalRecords'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerMedicalRecords'].desc } -ent-ComputerTabletopCriminalRecords = { ent-['BaseStructureComputerTabletop', 'ComputerCriminalRecords'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerCriminalRecords'].desc } -ent-ComputerTabletopStationRecords = { ent-['BaseStructureComputerTabletop', 'ComputerStationRecords'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerStationRecords'].desc } -ent-ComputerTabletopCrewMonitoring = { ent-['BaseStructureComputerTabletop', 'ComputerCrewMonitoring'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerCrewMonitoring'].desc } -ent-ComputerTabletopResearchAndDevelopment = { ent-['BaseStructureComputerTabletop', 'ComputerResearchAndDevelopment'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerResearchAndDevelopment'].desc } -ent-ComputerTabletopAnalysisConsole = { ent-['BaseStructureComputerTabletop', 'ComputerAnalysisConsole'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerAnalysisConsole'].desc } -ent-ComputerTabletopId = { ent-['BaseStructureComputerTabletop', 'ComputerId'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerId'].desc } -ent-ComputerTabletopBodyScanner = { ent-['BaseStructureComputerTabletop', 'computerBodyScanner'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'computerBodyScanner'].desc } -ent-ComputerTabletopComms = { ent-['BaseStructureComputerTabletop', 'ComputerComms'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerComms'].desc } -ent-SyndicateComputerTabletopComms = { ent-['BaseStructureComputerTabletop', 'SyndicateComputerComms'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'SyndicateComputerComms'].desc } -ent-ComputerTabletopSolarControl = { ent-['BaseStructureComputerTabletop', 'ComputerSolarControl'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerSolarControl'].desc } -ent-ComputerTabletopRadar = { ent-['BaseStructureComputerTabletop', 'ComputerRadar'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerRadar'].desc } -ent-ComputerTabletopAdvancedRadar = { ent-['BaseStructureComputerTabletop', 'ComputerAdvancedRadar'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerAdvancedRadar'].desc } -ent-ComputerTabletopCargoShuttle = { ent-['BaseStructureComputerTabletop', 'ComputerCargoShuttle'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerCargoShuttle'].desc } -ent-ComputerTabletopCargoOrders = { ent-['BaseStructureComputerTabletop', 'ComputerCargoOrders'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerCargoOrders'].desc } -ent-ComputerTabletopCargoBounty = { ent-['BaseStructureComputerTabletop', 'ComputerCargoBounty'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerCargoBounty'].desc } -ent-ComputerTabletopCloningConsole = { ent-['BaseStructureComputerTabletop', 'ComputerCloningConsole'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerCloningConsole'].desc } -ent-ComputerTabletopSalvageExpedition = { ent-['BaseStructureComputerTabletop', 'ComputerSalvageExpedition'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerSalvageExpedition'].desc } -ent-ComputerTabletopSurveillanceCameraMonitor = { ent-['BaseStructureComputerTabletop', 'ComputerSurveillanceCameraMonitor'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerSurveillanceCameraMonitor'].desc } -ent-ComputerTabletopSurveillanceWirelessCameraMonitor = { ent-['BaseStructureComputerTabletop', 'ComputerSurveillanceWirelessCameraMonitor'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerSurveillanceWirelessCameraMonitor'].desc } -ent-ComputerTabletopMassMedia = { ent-['BaseStructureComputerTabletop', 'ComputerMassMedia'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerMassMedia'].desc } -ent-ComputerTabletopSensorMonitoring = { ent-['BaseStructureComputerTabletop', 'ComputerSensorMonitoring'] } - - .suffix = Tabletop, TESTING, DO NOT MAP - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerSensorMonitoring'].desc } -ent-ComputerTabletopPalletConsoleNFHighMarket = { ent-['BaseStructureComputerTabletop', 'ComputerPalletConsoleNFHighMarket'] } - - .suffix = High, Tabletop - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerPalletConsoleNFHighMarket'].desc } -ent-ComputerTabletopPalletConsoleNFNormalMarket = { ent-['BaseStructureComputerTabletop', 'ComputerPalletConsoleNFNormalMarket'] } - - .suffix = Normal, Tabletop - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerPalletConsoleNFNormalMarket'].desc } -ent-ComputerTabletopPalletConsoleNFLowMarket = { ent-['BaseStructureComputerTabletop', 'ComputerPalletConsoleNFLowMarket'] } - - .suffix = Low, Tabletop - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerPalletConsoleNFLowMarket'].desc } -ent-ComputerTabletopPalletConsoleNFVeryLowMarket = { ent-['BaseStructureComputerTabletop', 'ComputerPalletConsoleNFVeryLowMarket'] } - - .suffix = VeryLow, Tabletop - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerPalletConsoleNFVeryLowMarket'].desc } -ent-ComputerTabletopStationAdminBankATM = { ent-['BaseStructureComputerTabletop', 'StationAdminBankATM'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'StationAdminBankATM'].desc } -ent-ComputerTabletopContrabandPalletConsole = { ent-['BaseStructureComputerTabletop', 'ComputerContrabandPalletConsole'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerContrabandPalletConsole'].desc } \ No newline at end of file +ent-ComputerTabletopAlert = { ent-ComputerAlert } + .desc = { ent-ComputerAlert.desc } +ent-ComputerTabletopEmergencyShuttle = { ent-ComputerEmergencyShuttle } + .desc = { ent-ComputerEmergencyShuttle.desc } +ent-ComputerTabletopShuttle = { ent-ComputerShuttle } + .desc = { ent-ComputerShuttle.desc } +ent-ComputerTabletopShuttleSyndie = { ent-ComputerShuttleSyndie } + .desc = { ent-ComputerShuttleSyndie.desc } +ent-ComputerTabletopShuttleCargo = { ent-ComputerShuttleCargo } + .desc = { ent-ComputerShuttleCargo.desc } +ent-ComputerTabletopShuttleSalvage = { ent-ComputerShuttleSalvage } + .desc = { ent-ComputerShuttleSalvage.desc } +ent-ComputerTabletopIFF = { ent-ComputerIFF } + .desc = { ent-ComputerIFF.desc } +ent-ComputerTabletopIFFSyndicate = { ent-ComputerIFFSyndicate } + .suffix = Syndicate, Tabletop + .desc = { ent-ComputerIFFSyndicate.desc } +ent-ComputerTabletopPowerMonitoring = { ent-ComputerPowerMonitoring } + .desc = { ent-ComputerPowerMonitoring.desc } +ent-ComputerTabletopMedicalRecords = { ent-ComputerMedicalRecords } + .desc = { ent-ComputerMedicalRecords.desc } +ent-ComputerTabletopCriminalRecords = { ent-ComputerCriminalRecords } + .desc = { ent-ComputerCriminalRecords.desc } +ent-ComputerTabletopStationRecords = { ent-ComputerStationRecords } + .desc = { ent-ComputerStationRecords.desc } +ent-ComputerTabletopCrewMonitoring = { ent-ComputerCrewMonitoring } + .desc = { ent-ComputerCrewMonitoring.desc } +ent-ComputerTabletopResearchAndDevelopment = { ent-ComputerResearchAndDevelopment } + .desc = { ComputerResearchAndDevelopment.desc } +ent-ComputerTabletopAnalysisConsole = { ent-ComputerAnalysisConsole } + .desc = { ent-ComputerAnalysisConsole.desc } +ent-ComputerTabletopId = { ent-ComputerId } + .desc = { ent-ComputerId.desc } +ent-ComputerTabletopBodyScanner = { ent-computerBodyScanner } + .desc = { ent-computerBodyScanner.desc } +ent-ComputerTabletopComms = { ent-ComputerComms } + .desc = { ent-ComputerComms.desc } +ent-SyndicateComputerTabletopComms = { ent-SyndicateComputerComms } + .desc = { ent-SyndicateComputerComms.desc } +ent-ComputerTabletopSolarControl = { ent-ComputerSolarControl } + .desc = { ent-ComputerSolarControl.desc } +ent-ComputerTabletopRadar = { ent-ComputerRadar } + .desc = { ent-ComputerRadar.desc } +ent-ComputerTabletopCargoShuttle = { ent-ComputerCargoShuttle } + .desc = { ent-ComputerCargoShuttle.desc } +ent-ComputerTabletopCargoOrders = { ent-ComputerCargoOrders } + .desc = { ent-ComputerCargoOrders.desc } +ent-ComputerTabletopCargoBounty = { ent-ComputerCargoBounty } + .desc = { ent-ComputerCargoBounty.desc } +ent-ComputerTabletopCloningConsole = { ent-ComputerCloningConsole } + .desc = { ent-ComputerCloningConsole.desc } +ent-ComputerTabletopSalvageExpedition = { ent-BaseStructureComputerTabletop } + .desc = { ent-ComputerSalvageExpedition.desc } +ent-ComputerTabletopSurveillanceCameraMonitor = { ent-ComputerSurveillanceCameraMonitor } + .desc = { ent-ComputerSurveillanceCameraMonitor.desc } +ent-ComputerTabletopSurveillanceWirelessCameraMonitor = { ent-ComputerSurveillanceWirelessCameraMonitor } + .desc = { ent-ComputerSurveillanceWirelessCameraMonitor.desc } +ent-ComputerTabletopMassMedia = { ent-ComputerMassMedia } + .desc = { ent-ComputerMassMedia.desc } +ent-ComputerTabletopSensorMonitoring = { ent-ComputerSensorMonitoring } + .suffix = Tabletop, TESTING, DO NOT MAP + .desc = { ent-ComputerSensorMonitoring.desc } +ent-ComputerTabletopShipyard = { ent-ComputerShipyard } + .desc = { ent-ComputerShipyard.desc } +ent-BaseMothershipComputerTabletop = { ent-BaseMothershipComputer } + .desc = { ent-BaseMothershipComputer.desc } +ent-ComputerTabletopShipyardSecurity = { ent-ComputerShipyardSecurity } + .desc = { ent-ComputerShipyardSecurity.desc } +ent-ComputerTabletopShipyardBlackMarket = { ent-ComputerShipyardBlackMarket } + .desc = { ent-ComputerShipyardBlackMarket.desc } +ent-ComputerTabletopShipyardExpedition = { ent-ComputerShipyardExpedition } + .desc = { ent-ComputerShipyardExpedition.desc } +ent-ComputerTabletopShipyardScrap = { ent-ComputerShipyardScrap } + .desc = { ent-ComputerShipyardScrap.desc } +ent-ComputerTabletopPalletConsoleNFHighMarket = { ent-ComputerPalletConsoleNFHighMarket } + .suffix = High, Tabletop + .desc = { ent-ComputerPalletConsoleNFHighMarket.desc } +ent-ComputerTabletopPalletConsoleNFNormalMarket = { ent-ComputerPalletConsoleNFNormalMarket } + .suffix = Normal, Tabletop + .desc = { ent-ComputerPalletConsoleNFNormalMarket.desc } +ent-ComputerTabletopPalletConsoleNFLowMarket = { ent-ComputerPalletConsoleNFLowMarket } + .suffix = Low, Tabletop + .desc = { ent-ComputerPalletConsoleNFLowMarket.desc } +ent-ComputerTabletopPalletConsoleNFVeryLowMarket = { ent-ComputerPalletConsoleNFVeryLowMarket } + .suffix = VeryLow, Tabletop + .desc = { ent-ComputerPalletConsoleNFVeryLowMarket.desc } +ent-ComputerTabletopStationAdminBankATM = { ent-StationAdminBankATM } + .desc = { ent-StationAdminBankATM.desc } +ent-ComputerTabletopContrabandPalletConsole = { ent-ComputerContrabandPalletConsole } + .desc = { ent-ComputerContrabandPalletConsole.desc } +ent-ComputerTabletopAdvancedRadar = { ent-ComputerAdvancedRadar } + .desc = { ent-ComputerAdvancedRadar.desc } +ent-ComputerTabletopShipyardNFSD = { ent-ComputerShipyardNFSD } + .desc = { ent-ComputerShipyardNFSD.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_tabletop_shipyard.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_tabletop_shipyard.ftl deleted file mode 100644 index 73c570607e8..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/computers/computers_tabletop_shipyard.ftl +++ /dev/null @@ -1,21 +0,0 @@ -ent-ComputerTabletopShipyard = { ent-['BaseStructureComputerTabletop', 'ComputerShipyard'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerShipyard'].desc } -ent-BaseMothershipComputerTabletop = { ent-['BaseStructureComputerTabletop', 'BaseMothershipComputer'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'BaseMothershipComputer'].desc } -ent-ComputerTabletopShipyardSecurity = { ent-['BaseStructureComputerTabletop', 'ComputerShipyardSecurity'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerShipyardSecurity'].desc } -ent-ComputerTabletopShipyardNfsd = { ent-['BaseStructureComputerTabletop', 'ComputerShipyardNfsd'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerShipyardNfsd'].desc } -ent-ComputerTabletopShipyardBlackMarket = { ent-['BaseStructureComputerTabletop', 'ComputerShipyardBlackMarket'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerShipyardBlackMarket'].desc } -ent-ComputerTabletopShipyardExpedition = { ent-['BaseStructureComputerTabletop', 'ComputerShipyardExpedition'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerShipyardExpedition'].desc } -ent-ComputerTabletopShipyardScrap = { ent-['BaseStructureComputerTabletop', 'ComputerShipyardScrap'] } - - .desc = { ent-['BaseStructureComputerTabletop', 'ComputerShipyardScrap'].desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/cryopod.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/cryopod.ftl deleted file mode 100644 index b399b778886..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/cryopod.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-MachineCryoSleepPod = cryo sleep chamber - .desc = cold pillow guaranteed diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/fax_machine.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/fax_machine.ftl index f0e4d540363..c6fbd77f1e2 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/fax_machine.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/fax_machine.ftl @@ -1,6 +1,3 @@ ent-FaxMachineShip = { ent-FaxMachineBase } .suffix = Ship .desc = { ent-FaxMachineBase.desc } -ent-FaxMachineShipAntag = { ent-FaxMachineShip } - .suffix = Ship, Antag - .desc = { ent-FaxMachineShip.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/lathe.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/lathe.ftl index bb71fcbf508..a0d6235de08 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/lathe.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/lathe.ftl @@ -4,5 +4,5 @@ ent-TilePrinterNF = tile-meister 5000 .desc = Prints floor tiles. No mercy. ent-SalvageTechfabNF = salvage techfab .desc = Prints equipment for salvagers. -ent-NfsdTechFab = nfsd techfab +ent-NFSDTechFab = nfsd techfab .desc = Prints equipment for use by nfsd. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/vending_machines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/vending_machines.ftl index 563bcbb2958..5c7cd85ee3a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/machines/vending_machines.ftl @@ -4,8 +4,6 @@ ent-VendingMachineAstroVend = AstroVend .desc = Essential gear for the space-men on the go ent-VendingMachineFlatpackVend = FlatpackVend .desc = Essential tech for the space-men on the go -ent-VendingMachineExpeditionaryFlatpackVend = Expeditionary FlatpackVend - .desc = Essential tech for the space-men on an expedition ent-VendingMachineSyndieContraband = ContraVend .desc = Wanted across multiple sectors! ent-VendingMachineBountyVend = BountyVend @@ -18,11 +16,7 @@ ent-VendingMachineAutoTuneVend = AutoTune .desc = feeling BASSed? time to TUNE into AutoVend! Take NOTES and let your audience TREBLE ent-VendingMachinePottedPlantVend = Plant-O-Matic .desc = Sometimes potted plants are the best crewmates money can get. -ent-VendingMachineNfsdDrobe = NFSDDrobe +ent-VendingMachineNFSDDrobe = NFSDDrobe .desc = A vending machine for NFSD and NFSD clothing! -ent-VendingMachineNfsdTech = NFSDTech +ent-VendingMachineNFSDTec = NFSDTec .desc = A vending machine for NFSD and NFSD tech! -ent-VendingMachineCartNfsd = { ent-['BaseStructureIndestructible', 'BaseStructureAccessReaderImmuneToEmag', 'VendingMachineCart'] } - - .suffix = NFSD - .desc = { ent-['BaseStructureIndestructible', 'BaseStructureAccessReaderImmuneToEmag', 'VendingMachineCart'].desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters.ftl index 647b29b3b11..cb08782a6b8 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters.ftl @@ -1,10 +1,36 @@ +ent-BaseThrusterSecurity = { ent-BaseThruster } + .desc = { ent-BaseThruster.desc } +ent-ThrusterSecurity = thruster + .suffix = Security + .desc = { ent-BaseThrusterSecurity.desc } +ent-ThrusterSecurityUnanchored = { ent-ThrusterUnanchored } + .suffix = Unanchored, Security + .desc = { ent-ThrusterUnanchored.desc } +ent-DebugThrusterSecurity = thruster + .suffix = DEBUG, Security + .desc = { ent-DebugThruster.desc } ent-SmallThruster = small thruster .desc = { ent-Thruster.desc } ent-SmallThrusterUnanchored = { ent-SmallThruster } .suffix = Unanchored .desc = { ent-SmallThruster.desc } +ent-GyroscopeSecurity = { ent-Gyroscope } + .suffix = Security + .desc = { ent-Gyroscope.desc } +ent-GyroscopeSecurityUnanchored = { ent-GyroscopeSecurity } + .suffix = Unanchored, Security + .desc = { ent-GyroscopeSecurity.desc } +ent-DebugGyroscopeSecurity = gyroscope + .suffix = DEBUG, Security + .desc = { ent-DebugGyroscope.desc } +ent-SmallGyroscopeSecurity = small gyroscope + .suffix = Security + .desc = { ent-GyroscopeSecurity.desc } +ent-SmallGyroscopeSecurityUnanchored = { ent-SmallGyroscopeSecurity } + .suffix = Unanchored, Security + .desc = { ent-SmallGyroscopeSecurity.desc } ent-SmallGyroscope = small gyroscope .desc = { ent-Gyroscope.desc } ent-SmallGyroscopeUnanchored = { ent-SmallGyroscope } .suffix = Unanchored - .desc = { ent-SmallGyroscope.desc } + .desc = { ent-SmallGyroscope.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters_nfsd.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters_nfsd.ftl deleted file mode 100644 index 2ae894c0588..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters_nfsd.ftl +++ /dev/null @@ -1,26 +0,0 @@ -ent-ThrusterNfsd = { ent-['BaseStructureUnanchorable', 'ThrusterSecurity'] } - - .suffix = NFSD - .desc = { ent-['BaseStructureUnanchorable', 'ThrusterSecurity'].desc } -ent-ThrusterNfsdUnanchored = { ent-ThrusterSecurityUnanchored } - .suffix = Unanchored, NFSD - .desc = { ent-ThrusterSecurityUnanchored.desc } -ent-DebugThrusterNfsd = { ent-['BaseStructureDisableToolUse', 'DebugThrusterSecurity'] } - - .suffix = DEBUG, NFSD - .desc = { ent-['BaseStructureDisableToolUse', 'DebugThrusterSecurity'].desc } -ent-GyroscopeNfsd = { ent-GyroscopeSecurity } - .suffix = NFSD - .desc = { ent-GyroscopeSecurity.desc } -ent-GyroscopeNfsdUnanchored = { ent-GyroscopeSecurityUnanchored } - .suffix = Unanchored, NFSD - .desc = { ent-GyroscopeSecurityUnanchored.desc } -ent-DebugGyroscopeNfsd = { ent-DebugGyroscopeSecurity } - .suffix = DEBUG, NFSD - .desc = { ent-DebugGyroscopeSecurity.desc } -ent-SmallGyroscopeNfsd = small gyroscope - .suffix = NFSD - .desc = { ent-GyroscopeSecurity.desc } -ent-SmallGyroscopeNfsdUnanchored = { ent-SmallGyroscopeSecurityUnanchored } - .suffix = Unanchored, NFSD - .desc = { ent-SmallGyroscopeSecurityUnanchored.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters_security.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters_security.ftl deleted file mode 100644 index 1da15a12f87..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/shuttles/thrusters_security.ftl +++ /dev/null @@ -1,28 +0,0 @@ -ent-ThrusterSecurity = thruster - - .suffix = Security - .desc = { ent-['BaseStructureUnanchorable', 'Thruster'].desc } -ent-ThrusterSecurityUnanchored = { ent-ThrusterUnanchored } - .suffix = Unanchored, Security - .desc = { ent-ThrusterUnanchored.desc } -ent-DebugThrusterSecurity = thruster - - .suffix = DEBUG, Security - .desc = { ent-['BaseStructureDisableToolUse', 'DebugThruster'].desc } -ent-GyroscopeSecurity = { ent-['BaseStructureDisableToolUse', 'Gyroscope'] } - - .suffix = Security - .desc = { ent-['BaseStructureDisableToolUse', 'Gyroscope'].desc } -ent-GyroscopeSecurityUnanchored = { ent-GyroscopeSecurity } - .suffix = Unanchored, Security - .desc = { ent-GyroscopeSecurity.desc } -ent-DebugGyroscopeSecurity = gyroscope - - .suffix = DEBUG, Security - .desc = { ent-['BaseStructureDisableToolUse', 'DebugGyroscope'].desc } -ent-SmallGyroscopeSecurity = small gyroscope - .suffix = Security - .desc = { ent-GyroscopeSecurity.desc } -ent-SmallGyroscopeSecurityUnanchored = { ent-SmallGyroscopeSecurity } - .suffix = Unanchored, Security - .desc = { ent-SmallGyroscopeSecurity.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/specific/bloodcult.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/specific/bloodcult.ftl index 35c080c1f77..1e014b34416 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/specific/bloodcult.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/specific/bloodcult.ftl @@ -11,19 +11,18 @@ ent-BloodCultGlowingFloor = blood cult glowing floor ent-BloodCultHoleFloor = blood cult floor hole .desc = { ent-FlashRuneTimer.desc } ent-BloodCultGravityGeneratorMini = blood cult gravity generator - - .desc = { ent-['BaseStructureDisableToolUse', 'GravityGeneratorMini'].desc } + .desc = { ent-GravityGeneratorMini.desc } ent-BloodCultAlwaysPoweredLight = blood cult light .desc = How is this thing glowing? Why? .suffix = Always powered ent-BloodCultProp01 = curious object .desc = Huh, I wonder what this thing is and what does it do. -ent-BloodCultProp02 = blood cult forge - .desc = A forge for weapon and armor production. -ent-BloodCultProp03 = blood cult shrine - .desc = An occult shrine for imbuing objects with vile energies. -ent-BloodCultProp04 = blood cult workbench - .desc = An occult workbench with handy drawers. There is a severed hand in one. +ent-BloodCultProp02 = curious object + .desc = Huh, I wonder what this thing is and what does it do. +ent-BloodCultProp03 = curious object + .desc = Huh, I wonder what this thing is and what does it do. +ent-BloodCultProp04 = curious object + .desc = Huh, I wonder what this thing is and what does it do. ent-BloodCultProp05 = curious object .desc = Huh, I wonder what this thing is and what does it do. ent-BloodCultProp07 = curious object diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/closets/lockers/lockers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/closets/lockers/lockers.ftl index c93c0ab33e5..deede1b9bd0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/closets/lockers/lockers.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/closets/lockers/lockers.ftl @@ -8,20 +8,17 @@ ent-LockerPilot = pilot's locker .desc = { ent-LockerBaseSecure.desc } ent-LockerWoodenGeneric = wooden cabinet .desc = Dusty old wooden cabinet. Smells like grandparents. -ent-LockerNfsdEvidence = nfsd evidence locker +ent-LockernfsdEvidence = nfsd evidence locker .desc = { ent-LockerBaseSecure.desc } -ent-LockerNfsdCopper = nfsd cadet locker +ent-LockernfsdCopper = nfsd cadet locker .desc = { ent-LockerBaseSecure.desc } -ent-LockerNfsdSilver = nfsd deputy locker +ent-LockernfsdSilver = nfsd deputy locker .desc = { ent-LockerBaseSecure.desc } -ent-LockerNfsdBrigmedic = nfsd brigmedic locker +ent-LockernfsdBrigmedic = nfsd brigmedic locker .desc = { ent-LockerBaseSecure.desc } -ent-LockerNfsdSergeant = nfsd sergeant locker +ent-LockernfsdSergeant = nfsd sergeant locker .desc = { ent-LockerBaseSecure.desc } -ent-LockerNfsdBailiff = nfsd bailiff locker +ent-LockernfsdBailiff = nfsd bailiff locker .desc = { ent-LockerBaseSecure.desc } -ent-LockerNfsdSheriff = nfsd sheriff's locker +ent-LockernfsdSheriff = nfsd sheriff's locker .desc = { ent-LockerBaseSecure.desc } -ent-LockerStationRepresentative = station representative's locker - - .desc = { ent-['BaseStructureIndestructible', 'BaseStructureLockImmuneToEmag', 'BaseStructureAccessReaderImmuneToEmag', 'LockerHeadOfPersonnel'].desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/closets/suit_storage_wall.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/closets/suit_storage_wall.ftl index 088ffa21b9b..f2184c6a042 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/closets/suit_storage_wall.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/closets/suit_storage_wall.ftl @@ -1,3 +1,2 @@ ent-SuitStorageWallmount = suit wallstorage unit - - .desc = { ent-['BaseWallCloset', 'SuitStorageBase'].desc } \ No newline at end of file + .desc = { ent-SuitStorageBase.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/crates/base_structurecrates.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/crates/base_structurecrates.ftl index 61d6299f03b..2f659d9017c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/crates/base_structurecrates.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/crates/base_structurecrates.ftl @@ -1,3 +1,2 @@ -ent-CrateTradeBaseSecure = { ent-['BaseStructureLockImmuneToEmag', 'BaseStructureAccessReaderImmuneToEmag', 'CrateBaseWeldable'] } - - .desc = { ent-['BaseStructureLockImmuneToEmag', 'BaseStructureAccessReaderImmuneToEmag', 'CrateBaseWeldable'].desc } \ No newline at end of file +ent-CrateTradeBaseSecure = { ent-CrateBaseWeldable } + .desc = { ent-CrateBaseWeldable.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/crates/crates.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/crates/crates.ftl index 6bc46821287..b454b2a314b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/crates/crates.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/storage/crates/crates.ftl @@ -12,9 +12,9 @@ ent-CrateTradeContrabandSecureDonk = Donk Co. contraband crate .desc = { ent-CrateTradeBaseSecure.desc } ent-CrateTradeContrabandSecureCyberSun = Cybersun Industries contraband crate .desc = { ent-CrateTradeBaseSecure.desc } -ent-CrateNfsdBrigmedic = brigmedic crate +ent-CratenfsdBrigmedic = brigmedic crate .desc = { ent-CrateSecgear.desc } -ent-CrateNfsdSecure1 = nfsd crate +ent-CratenfsdSecure1 = nfsd crate .desc = { ent-CrateSecgear.desc } -ent-CrateNfsdSecure2 = nfsd crate +ent-CratenfsdSecure2 = nfsd crate .desc = { ent-CrateSecgear.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/wallmounts/intercom.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/wallmounts/intercom.ftl index 29fe1b1d57e..e52112df425 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/wallmounts/intercom.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/wallmounts/intercom.ftl @@ -1,3 +1,3 @@ -ent-IntercomNfsd = { ent-IntercomSecurity } +ent-IntercomNFSD = { ent-Intercom } .suffix = NFSD - .desc = { ent-IntercomSecurity.desc } + .desc = { ent-Intercom.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/wallmounts/signs/signs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/wallmounts/signs/signs.ftl deleted file mode 100644 index 6f99d53be17..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/wallmounts/signs/signs.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-BaseSignDirectionalNF = { ent-BaseSignDirectional } - .desc = { ent-BaseSignDirectional.desc } -ent-SignDirectionalSr = sr sign - .desc = A direction sign, pointing out which way the station representative's office is. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/walls/diagonal_walls.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/walls/diagonal_walls.ftl index 553fb5bff85..035b253581a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/walls/diagonal_walls.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/structures/walls/diagonal_walls.ftl @@ -2,11 +2,8 @@ ent-BaseWallDiagonal = basewall .suffix = diagonal .desc = { ent-BaseStructure.desc } ent-WallReinforcedDiagonal = reinforced wall - - .desc = { ent-['WallReinforced', 'BaseWallDiagonal'].desc } + .desc = { ent-WallReinforced.desc } ent-WallWoodDiagonal = wood wall - - .desc = { ent-['WallWood', 'BaseWallDiagonal'].desc } + .desc = { ent-WallWood.desc } ent-WallUraniumDiagonal = uranium wall - - .desc = { ent-['WallUranium', 'BaseWallDiagonal'].desc } \ No newline at end of file + .desc = { ent-WallUranium.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events.ftl index 3834ceb4f86..cf186cebcc0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events.ftl @@ -2,3 +2,23 @@ ent-BluespaceCargo = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-BluespaceSyndicateCrate = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } +ent-BluespaceCacheError = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-BluespaceVaultError = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-BluespaceVaultSmallError = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-BluespaceAsteroid = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-BluespaceAsteroidBunker = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-BluespaceCargoniaShip = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-BluespaceArcIndDataCarrier = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-BluespaceSyndicateFTLInterception = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-BluespaceWizardFederationScout = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } +ent-BluespaceBloodMoon = { ent-BaseGameRule } + .desc = { ent-BaseGameRule.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events_bluespace.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events_bluespace.ftl deleted file mode 100644 index 7341a83afe2..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/events/events_bluespace.ftl +++ /dev/null @@ -1,20 +0,0 @@ -ent-BluespaceCacheError = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-BluespaceVaultError = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-BluespaceVaultSmallError = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-BluespaceAsteroid = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-BluespaceAsteroidBunker = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-BluespaceCargoniaShip = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-BluespaceArcIndDataCarrier = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-BluespaceSyndicateFTLInterception = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-BluespaceWizardFederationScout = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-BluespaceBloodMoon = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/markers/spawners/jobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/markers/spawners/jobs.ftl index 706149595cb..c8f9ed8964e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/markers/spawners/jobs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/markers/spawners/jobs.ftl @@ -2,23 +2,9 @@ ent-SpawnPointMercenary = mercenary .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointPilot = pilot .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointPirate = pirate - .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointPirateCaptain = pirate captain - .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointPirateFirstMate = pirate first mate - .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointStc = stc .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointSecurityGuard = security guard .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointERTMailCarrier = ERTmailcarrier .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointStationRepresentative = station representative - .desc = { ent-SpawnPointHeadOfPersonnel.desc } -ent-SpawnPointSheriff = sheriff - .desc = { ent-SpawnPointHeadOfSecurity.desc } -ent-SpawnPointBailiff = bailiff - .desc = { ent-SpawnPointWarden.desc } -ent-SpawnPointDetectiveNF = detective nf - .desc = { ent-SpawnPointDetective.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/shipyard/base.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/shipyard/base.ftl index 0f1c8cd0b61..2277553c1f6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_nf/shipyard/base.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_nf/shipyard/base.ftl @@ -1,24 +1,17 @@ -ent-StandardFrontierStation = { ent-['BaseStation', 'BaseStationCargo', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationShuttles', 'BaseStationAlertLevels', 'BaseStationSiliconLawFrontierStation', 'BaseStationEmpImmune'] } - - .desc = { ent-['BaseStation', 'BaseStationCargo', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationShuttles', 'BaseStationAlertLevels', 'BaseStationSiliconLawFrontierStation', 'BaseStationEmpImmune'].desc } -ent-StandardFrontierOutpost = { ent-['BaseStation', 'BaseStationJobsSpawning', 'BaseStationCargo', 'BaseStationSiliconLawFrontierShips'] } - - .desc = { ent-['BaseStation', 'BaseStationJobsSpawning', 'BaseStationCargo', 'BaseStationSiliconLawFrontierShips'].desc } -ent-SecurityFrontierOutpost = { ent-['BaseStation', 'BaseStationCargo', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationShuttles', 'BaseStationAlertLevels', 'BaseStationSiliconLawFrontierStation'] } - - .desc = { ent-['BaseStation', 'BaseStationCargo', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationShuttles', 'BaseStationAlertLevels', 'BaseStationSiliconLawFrontierStation'].desc } -ent-StandardFrontierVessel = { ent-['BaseStation', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationAlertLevels', 'BaseStationAllEventsEligible', 'BaseStationRenameFaxes', 'BaseStationRenameWarpPoints', 'BaseStationSiliconLawFrontierShips'] } - - .desc = { ent-['BaseStation', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationAlertLevels', 'BaseStationAllEventsEligible', 'BaseStationRenameFaxes', 'BaseStationRenameWarpPoints', 'BaseStationSiliconLawFrontierShips'].desc } -ent-StandardFrontierSecurityVessel = { ent-['BaseStation', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationAlertLevels', 'BaseStationAllEventsEligible', 'BaseStationRenameFaxes', 'BaseStationRenameWarpPoints', 'BaseStationSiliconLawFrontierShips'] } - - .desc = { ent-['BaseStation', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationAlertLevels', 'BaseStationAllEventsEligible', 'BaseStationRenameFaxes', 'BaseStationRenameWarpPoints', 'BaseStationSiliconLawFrontierShips'].desc } -ent-StandardFrontierSecurityExpeditionVessel = { ent-['BaseStation', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationAlertLevels', 'BaseStationAllEventsEligible', 'BaseStationRenameFaxes', 'BaseStationRenameWarpPoints', 'BaseStationSiliconLawFrontierShips', 'BaseStationExpeditions'] } - - .desc = { ent-['BaseStation', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationAlertLevels', 'BaseStationAllEventsEligible', 'BaseStationRenameFaxes', 'BaseStationRenameWarpPoints', 'BaseStationSiliconLawFrontierShips', 'BaseStationExpeditions'].desc } -ent-StandardFrontierExpeditionVessel = { ent-['BaseStation', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationAlertLevels', 'BaseStationAllEventsEligible', 'BaseStationRenameFaxes', 'BaseStationRenameWarpPoints', 'BaseStationSiliconLawFrontierShips', 'BaseStationExpeditions'] } - - .desc = { ent-['BaseStation', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationAlertLevels', 'BaseStationAllEventsEligible', 'BaseStationRenameFaxes', 'BaseStationRenameWarpPoints', 'BaseStationSiliconLawFrontierShips', 'BaseStationExpeditions'].desc } +ent-StandardFrontierStation = { ent-BaseStation } + .desc = { ent-BaseStation.desc } +ent-StandardFrontierOutpost = { ent-BaseStation } + .desc = { ent-BaseStation.desc } +ent-SecurityFrontierOutpost = { ent-BaseStation } + .desc = { ent-BaseStation.desc } +ent-StandardFrontierVessel = { ent-BaseStation } + .desc = { ent-BaseStation.desc } +ent-StandardFrontierSecurityVessel = { ent-BaseStation } + .desc = { ent-BaseStation.desc } +ent-StandardFrontierSecurityExpeditionVessel = { ent-BaseStationExpeditions } + .desc = { ent-BaseStationExpeditions.desc } +ent-StandardFrontierExpeditionVessel = { ent-BaseStationExpeditions } + .desc = { ent-BaseStationExpeditions.desc } ent-BaseStationSiliconLawFrontierStation = { "" } .desc = { "" } ent-BaseStationSiliconLawFrontierShips = { "" } @@ -28,4 +21,4 @@ ent-BaseStationRenameFaxes = { "" } ent-BaseStationRenameWarpPoints = { "" } .desc = { "" } ent-BaseStationEmpImmune = { "" } - .desc = { "" } + .desc = { "" } \ No newline at end of file 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 806b05ff349..70d8858d267 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl @@ -1,5 +1,3 @@ -ent-BaseSuicideAction = { "" } - .desc = { "" } ent-ActionScream = Scream .desc = AAAAAAAAAAAAAAAAAAAAAAAAA ent-ActionTurnUndead = Turn Undead diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/alerts/alerts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/alerts/alerts.ftl deleted file mode 100644 index 8ef83838d76..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/alerts/alerts.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-AlertSpriteView = { "" } - .desc = { "" } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/alerts/revenant.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/alerts/revenant.ftl deleted file mode 100644 index f510cdc0397..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/alerts/revenant.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-AlertEssenceSpriteView = { "" } - .desc = { "" } 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 0cca3fba09a..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,3 +1,2 @@ -ent-OrganMothStomach = { ent-['OrganAnimalStomach', 'OrganHumanStomach'] } - - .desc = { ent-['OrganAnimalStomach', 'OrganHumanStomach'].desc } \ No newline at end of file +ent-OrganMothStomach = { ent-OrganAnimalStomach } + .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 078646796c5..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,33 +1,22 @@ ent-PartArachnid = arachnid body part - - .desc = { ent-['BaseItem', 'BasePart'].desc } + .desc = { ent-BasePart.desc } ent-TorsoArachnid = arachnid torso - - .desc = { ent-['PartArachnid', 'BaseTorso'].desc } + .desc = { ent-BaseTorso.desc } ent-HeadArachnid = arachnid head - - .desc = { ent-['PartArachnid', 'BaseHead'].desc } + .desc = { ent-BaseHead.desc } ent-LeftArmArachnid = left arachnid arm - - .desc = { ent-['PartArachnid', 'BaseLeftArm'].desc } + .desc = { ent-BaseLeftArm.desc } ent-RightArmArachnid = right arachnid arm - - .desc = { ent-['PartArachnid', 'BaseRightArm'].desc } + .desc = { ent-BaseRightArm.desc } ent-LeftHandArachnid = left arachnid hand - - .desc = { ent-['PartArachnid', 'BaseLeftHand'].desc } + .desc = { ent-BaseLeftHand.desc } ent-RightHandArachnid = right arachnid hand - - .desc = { ent-['PartArachnid', 'BaseRightHand'].desc } + .desc = { ent-BaseRightHand.desc } ent-LeftLegArachnid = left arachnid leg - - .desc = { ent-['PartArachnid', 'BaseLeftLeg'].desc } + .desc = { ent-BaseLeftLeg.desc } ent-RightLegArachnid = right arachnid leg - - .desc = { ent-['PartArachnid', 'BaseRightLeg'].desc } + .desc = { ent-BaseRightLeg.desc } ent-LeftFootArachnid = left arachnid foot - - .desc = { ent-['PartArachnid', 'BaseLeftFoot'].desc } + .desc = { ent-BaseLeftFoot.desc } ent-RightFootArachnid = right arachnid foot - - .desc = { ent-['PartArachnid', 'BaseRightFoot'].desc } \ No newline at end of file + .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 5b8e75fef9e..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,33 +1,22 @@ ent-PartDiona = diona body part - - .desc = { ent-['BaseItem', 'BasePart'].desc } + .desc = { ent-BasePart.desc } ent-TorsoDiona = diona torso - - .desc = { ent-['PartDiona', 'BaseTorso'].desc } + .desc = { ent-BaseTorso.desc } ent-HeadDiona = diona head - - .desc = { ent-['PartDiona', 'BaseHead'].desc } + .desc = { ent-BaseHead.desc } ent-LeftArmDiona = left diona arm - - .desc = { ent-['PartDiona', 'BaseLeftArm'].desc } + .desc = { ent-BaseLeftArm.desc } ent-RightArmDiona = right diona arm - - .desc = { ent-['PartDiona', 'BaseRightArm'].desc } + .desc = { ent-BaseRightArm.desc } ent-LeftHandDiona = left diona hand - - .desc = { ent-['PartDiona', 'BaseLeftHand'].desc } + .desc = { ent-BaseLeftHand.desc } ent-RightHandDiona = right diona hand - - .desc = { ent-['PartDiona', 'BaseRightHand'].desc } + .desc = { ent-BaseRightHand.desc } ent-LeftLegDiona = left diona leg - - .desc = { ent-['PartDiona', 'BaseLeftLeg'].desc } + .desc = { ent-BaseLeftLeg.desc } ent-RightLegDiona = right diona leg - - .desc = { ent-['PartDiona', 'BaseRightLeg'].desc } + .desc = { ent-BaseRightLeg.desc } ent-LeftFootDiona = left diona foot - - .desc = { ent-['PartDiona', 'BaseLeftFoot'].desc } + .desc = { ent-BaseLeftFoot.desc } ent-RightFootDiona = right diona foot - - .desc = { ent-['PartDiona', 'BaseRightFoot'].desc } \ No newline at end of file + .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 92451bd660e..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 @@ -1,33 +1,22 @@ ent-PartGingerbread = gingerbead body part - - .desc = { ent-['BaseItem', 'BasePart'].desc } + .desc = { ent-BasePart.desc } ent-TorsoGingerbread = gingerbread torso - - .desc = { ent-['PartGingerbread', 'BaseTorso'].desc } + .desc = { ent-BaseTorso.desc } ent-HeadGingerbread = gingerbread head - - .desc = { ent-['PartGingerbread', 'BaseHead'].desc } + .desc = { ent-BaseHead.desc } ent-LeftArmGingerbread = left gingerbread arm - - .desc = { ent-['PartGingerbread', 'BaseLeftArm'].desc } + .desc = { ent-BaseLeftArm.desc } ent-RightArmGingerbread = right gingerbread arm - - .desc = { ent-['PartGingerbread', 'BaseRightArm'].desc } + .desc = { ent-BaseRightArm.desc } ent-LeftHandGingerbread = left gingerbread hand - - .desc = { ent-['PartGingerbread', 'BaseLeftHand'].desc } + .desc = { ent-BaseLeftHand.desc } ent-RightHandGingerbread = right gingerbread hand - - .desc = { ent-['PartGingerbread', 'BaseRightHand'].desc } + .desc = { ent-BaseRightHand.desc } ent-LeftLegGingerbread = left gingerbread leg - - .desc = { ent-['PartGingerbread', 'BaseLeftLeg'].desc } + .desc = { ent-BaseLeftLeg.desc } ent-RightLegGingerbread = right gingerbread leg - - .desc = { ent-['PartGingerbread', 'BaseRightLeg'].desc } + .desc = { ent-BaseRightLeg.desc } ent-LeftFootGingerbread = left gingerbread foot - - .desc = { ent-['PartGingerbread', 'BaseLeftFoot'].desc } + .desc = { ent-BaseLeftFoot.desc } ent-RightFootGingerbread = right gingerbread foot - - .desc = { ent-['PartGingerbread', 'BaseRightFoot'].desc } \ No newline at end of file + .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 f14e3c39f64..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,33 +1,22 @@ ent-PartHuman = human body part - - .desc = { ent-['BaseItem', 'BasePart'].desc } + .desc = { ent-BasePart.desc } ent-TorsoHuman = human torso - - .desc = { ent-['PartHuman', 'BaseTorso'].desc } + .desc = { ent-BaseTorso.desc } ent-HeadHuman = human head - - .desc = { ent-['PartHuman', 'BaseHead'].desc } + .desc = { ent-BaseHead.desc } ent-LeftArmHuman = left human arm - - .desc = { ent-['PartHuman', 'BaseLeftArm'].desc } + .desc = { ent-BaseLeftArm.desc } ent-RightArmHuman = right human arm - - .desc = { ent-['PartHuman', 'BaseRightArm'].desc } + .desc = { ent-BaseRightArm.desc } ent-LeftHandHuman = left human hand - - .desc = { ent-['PartHuman', 'BaseLeftHand'].desc } + .desc = { ent-BaseLeftHand.desc } ent-RightHandHuman = right human hand - - .desc = { ent-['PartHuman', 'BaseRightHand'].desc } + .desc = { ent-BaseRightHand.desc } ent-LeftLegHuman = left human leg - - .desc = { ent-['PartHuman', 'BaseLeftLeg'].desc } + .desc = { ent-BaseLeftLeg.desc } ent-RightLegHuman = right human leg - - .desc = { ent-['PartHuman', 'BaseRightLeg'].desc } + .desc = { ent-BaseRightLeg.desc } ent-LeftFootHuman = left human foot - - .desc = { ent-['PartHuman', 'BaseLeftFoot'].desc } + .desc = { ent-BaseLeftFoot.desc } ent-RightFootHuman = right human foot - - .desc = { ent-['PartHuman', 'BaseRightFoot'].desc } \ No newline at end of file + .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 6a9ca4fb9a0..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-['BaseItem', 'BasePart'].desc } + .desc = { ent-BasePart.desc } ent-TorsoMoth = moth torso - - .desc = { ent-['PartMoth', 'BaseTorso'].desc } + .desc = { ent-BaseTorso.desc } ent-HeadMoth = moth head - - .desc = { ent-['PartMoth', 'BaseHead'].desc } + .desc = { ent-BaseHead.desc } ent-LeftArmMoth = left moth arm - - .desc = { ent-['PartMoth', 'BaseLeftArm'].desc } + .desc = { ent-BaseLeftArm.desc } ent-RightArmMoth = right moth arm - - .desc = { ent-['PartMoth', 'BaseRightArm'].desc } + .desc = { ent-BaseRightArm.desc } ent-LeftHandMoth = left moth hand - - .desc = { ent-['PartMoth', 'BaseLeftHand'].desc } + .desc = { ent-BaseLeftHand.desc } ent-RightHandMoth = right moth hand - - .desc = { ent-['PartMoth', 'BaseRightHand'].desc } + .desc = { ent-BaseRightHand.desc } ent-LeftLegMoth = left moth leg - - .desc = { ent-['PartMoth', 'BaseLeftLeg'].desc } + .desc = { ent-BaseLeftLeg.desc } ent-RightLegMoth = right moth leg - - .desc = { ent-['PartMoth', 'BaseRightLeg'].desc } + .desc = { ent-BaseRightLeg.desc } ent-LeftFootMoth = left moth foot - - .desc = { ent-['PartMoth', 'BaseLeftFoot'].desc } + .desc = { ent-BaseLeftFoot.desc } ent-RightFootMoth = right moth foot - - .desc = { ent-['PartMoth', 'BaseRightFoot'].desc } \ No newline at end of file + .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 66aeca99abc..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,33 +1,22 @@ ent-PartReptilian = reptilian body part - - .desc = { ent-['BaseItem', 'BasePart'].desc } + .desc = { ent-BasePart.desc } ent-TorsoReptilian = reptilian torso - - .desc = { ent-['PartReptilian', 'BaseTorso'].desc } + .desc = { ent-BaseTorso.desc } ent-HeadReptilian = reptilian head - - .desc = { ent-['PartReptilian', 'BaseHead'].desc } + .desc = { ent-BaseHead.desc } ent-LeftArmReptilian = left reptilian arm - - .desc = { ent-['PartReptilian', 'BaseLeftArm'].desc } + .desc = { ent-BaseLeftArm.desc } ent-RightArmReptilian = right reptilian arm - - .desc = { ent-['PartReptilian', 'BaseRightArm'].desc } + .desc = { ent-BaseRightArm.desc } ent-LeftHandReptilian = left reptilian hand - - .desc = { ent-['PartReptilian', 'BaseLeftHand'].desc } + .desc = { ent-BaseLeftHand.desc } ent-RightHandReptilian = right reptilian hand - - .desc = { ent-['PartReptilian', 'BaseRightHand'].desc } + .desc = { ent-BaseRightHand.desc } ent-LeftLegReptilian = left reptilian leg - - .desc = { ent-['PartReptilian', 'BaseLeftLeg'].desc } + .desc = { ent-BaseLeftLeg.desc } ent-RightLegReptilian = right reptilian leg - - .desc = { ent-['PartReptilian', 'BaseRightLeg'].desc } + .desc = { ent-BaseRightLeg.desc } ent-LeftFootReptilian = left reptilian foot - - .desc = { ent-['PartReptilian', 'BaseLeftFoot'].desc } + .desc = { ent-BaseLeftFoot.desc } ent-RightFootReptilian = right reptilian foot - - .desc = { ent-['PartReptilian', 'BaseRightFoot'].desc } \ No newline at end of file + .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 0cb6432f40b..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,33 +1,22 @@ ent-PartSlime = slime body part - - .desc = { ent-['BaseItem', 'BasePart'].desc } + .desc = { ent-BasePart.desc } ent-TorsoSlime = slime torso - - .desc = { ent-['PartSlime', 'BaseTorso'].desc } + .desc = { ent-BaseTorso.desc } ent-HeadSlime = slime head - - .desc = { ent-['PartSlime', 'BaseHead'].desc } + .desc = { ent-BaseHead.desc } ent-LeftArmSlime = left slime arm - - .desc = { ent-['PartSlime', 'BaseLeftArm'].desc } + .desc = { ent-BaseLeftArm.desc } ent-RightArmSlime = right slime arm - - .desc = { ent-['PartSlime', 'BaseRightArm'].desc } + .desc = { ent-BaseRightArm.desc } ent-LeftHandSlime = left slime hand - - .desc = { ent-['PartSlime', 'BaseLeftHand'].desc } + .desc = { ent-BaseLeftHand.desc } ent-RightHandSlime = right slime hand - - .desc = { ent-['PartSlime', 'BaseRightHand'].desc } + .desc = { ent-BaseRightHand.desc } ent-LeftLegSlime = left slime leg - - .desc = { ent-['PartSlime', 'BaseLeftLeg'].desc } + .desc = { ent-BaseLeftLeg.desc } ent-RightLegSlime = right slime leg - - .desc = { ent-['PartSlime', 'BaseRightLeg'].desc } + .desc = { ent-BaseRightLeg.desc } ent-LeftFootSlime = left slime foot - - .desc = { ent-['PartSlime', 'BaseLeftFoot'].desc } + .desc = { ent-BaseLeftFoot.desc } ent-RightFootSlime = right slime foot - - .desc = { ent-['PartSlime', 'BaseRightFoot'].desc } \ No newline at end of file + .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 dda9d4bf12d..f7241e97668 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 @@ -50,5 +50,3 @@ 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 - .desc = Contains distractions, both auditory and visual. Smell coming soon. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl index 5ed27ff4a78..4b622764dab 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl @@ -4,8 +4,8 @@ ent-ClothingBackpackClownFilled = { ent-ClothingBackpackClown } .desc = { ent-ClothingBackpackClown.desc } ent-ClothingBackpackSecurityFilled = { ent-ClothingBackpackSecurity } .desc = { ent-ClothingBackpackSecurity.desc } -ent-ClothingBackpackSecurityFilledDetective = { ent-ClothingBackpackSecurity } - .desc = { ent-ClothingBackpackSecurity.desc } +ent-ClothingBackpackFilledDetective = { ent-ClothingBackpack } + .desc = { ent-ClothingBackpack.desc } ent-ClothingBackpackMedicalFilled = { ent-ClothingBackpackMedical } .desc = { ent-ClothingBackpackMedical.desc } ent-ClothingBackpackParamedicFilled = { ent-ClothingBackpackMedical } @@ -38,8 +38,6 @@ ent-ClothingBackpackChemistryFilled = { ent-ClothingBackpackChemistry } .desc = { ent-ClothingBackpackChemistry.desc } ent-ClothingBackpackChaplainFilled = { ent-ClothingBackpack } .desc = { ent-ClothingBackpack.desc } -ent-ClothingBackpackLawyerFilled = { ent-ClothingBackpack } - .desc = { ent-ClothingBackpack.desc } ent-ClothingBackpackMusicianFilled = { ent-ClothingBackpack } .desc = { ent-ClothingBackpack.desc } ent-ClothingBackpackLibrarianFilled = { ent-ClothingBackpack } @@ -56,8 +54,6 @@ ent-ClothingBackpackERTEngineerFilled = { ent-ClothingBackpackERTEngineer } .desc = { ent-ClothingBackpackERTEngineer.desc } ent-ClothingBackpackERTJanitorFilled = { ent-ClothingBackpackERTJanitor } .desc = { ent-ClothingBackpackERTJanitor.desc } -ent-ClothingBackpackERTChaplainFilled = { ent-ClothingBackpackERTChaplain } - .desc = { ent-ClothingBackpackERTChaplain.desc } ent-ClothingBackpackDeathSquadFilled = death squad backpack .desc = Holds the kit of CentComm's most feared agents. ent-ClothingBackpackCargoFilled = { ent-ClothingBackpackCargo } @@ -67,3 +63,5 @@ ent-ClothingBackpackSalvageFilled = { ent-ClothingBackpackSalvage } ent-ClothingBackpackPirateFilled = { ent-ClothingBackpackSatchelLeather } .suffix = Filled, Pirate .desc = { ent-ClothingBackpackSatchelLeather.desc } +ent-ClothingBackpackBrigmedicFilled = { ent-ClothingBackpackBrigmedic } + .desc = { ent-ClothingBackpackBrigmedic.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/duffelbag.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/duffelbag.ftl index 90b8dccb45b..7e724fa9020 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/duffelbag.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/duffelbag.ftl @@ -4,8 +4,10 @@ ent-ClothingBackpackDuffelClownFilled = { ent-ClothingBackpackDuffelClown } .desc = { ent-ClothingBackpackDuffelClown.desc } ent-ClothingBackpackDuffelSecurityFilled = { ent-ClothingBackpackDuffelSecurity } .desc = { ent-ClothingBackpackDuffelSecurity.desc } -ent-ClothingBackpackDuffelSecurityFilledDetective = { ent-ClothingBackpackDuffelSecurity } - .desc = { ent-ClothingBackpackDuffelSecurity.desc } +ent-ClothingBackpackDuffelFilledDetective = { ent-ClothingBackpackDuffel } + .desc = { ent-ClothingBackpackDuffel.desc } +ent-ClothingBackpackDuffelBrigmedicFilled = { ent-ClothingBackpackDuffelBrigmedic } + .desc = { ent-ClothingBackpackDuffelBrigmedic.desc } ent-ClothingBackpackDuffelMedicalFilled = { ent-ClothingBackpackDuffelMedical } .desc = { ent-ClothingBackpackDuffelMedical.desc } ent-ClothingBackpackDuffelParamedicFilled = { ent-ClothingBackpackDuffelMedical } @@ -38,8 +40,6 @@ ent-ClothingBackpackDuffelChemistryFilled = { ent-ClothingBackpackDuffelChemistr .desc = { ent-ClothingBackpackDuffelChemistry.desc } ent-ClothingBackpackDuffelChaplainFilled = { ent-ClothingBackpackDuffel } .desc = { ent-ClothingBackpackDuffel.desc } -ent-ClothingBackpackDuffelLawyerFilled = { ent-ClothingBackpackDuffel } - .desc = { ent-ClothingBackpackDuffel.desc } ent-ClothingBackpackDuffelMusicianFilled = { ent-ClothingBackpackDuffel } .desc = { ent-ClothingBackpackDuffel.desc } ent-ClothingBackpackDuffelLibrarianFilled = { ent-ClothingBackpackDuffel } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl index 7ca2f340523..60aedc0f060 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl @@ -6,8 +6,10 @@ ent-ClothingBackpackSatchelClownFilled = { ent-ClothingBackpackSatchelClown } .desc = { ent-ClothingBackpackSatchelClown.desc } ent-ClothingBackpackSatchelSecurityFilled = { ent-ClothingBackpackSatchelSecurity } .desc = { ent-ClothingBackpackSatchelSecurity.desc } -ent-ClothingBackpackSatchelSecurityFilledDetective = { ent-ClothingBackpackSatchelSecurity } - .desc = { ent-ClothingBackpackSatchelSecurity.desc } +ent-ClothingBackpackSatchelFilledDetective = { ent-ClothingBackpackSatchel } + .desc = { ent-ClothingBackpackSatchel.desc } +ent-ClothingBackpackSatchelBrigmedicFilled = { ent-ClothingBackpackSatchelBrigmedic } + .desc = { ent-ClothingBackpackSatchelBrigmedic.desc } ent-ClothingBackpackSatchelMedicalFilled = { ent-ClothingBackpackSatchelMedical } .desc = { ent-ClothingBackpackSatchelMedical.desc } ent-ClothingBackpackSatchelParamedicFilled = { ent-ClothingBackpackSatchelMedical } @@ -38,8 +40,6 @@ ent-ClothingBackpackSatchelChemistryFilled = { ent-ClothingBackpackSatchelChemis .desc = { ent-ClothingBackpackSatchelChemistry.desc } ent-ClothingBackpackSatchelChaplainFilled = { ent-ClothingBackpackSatchel } .desc = { ent-ClothingBackpackSatchel.desc } -ent-ClothingBackpackSatchelLawyerFilled = { ent-ClothingBackpackSatchel } - .desc = { ent-ClothingBackpackSatchel.desc } ent-ClothingBackpackSatchelMusicianFilled = { ent-ClothingBackpackSatchel } .desc = { ent-ClothingBackpackSatchel.desc } ent-ClothingBackpackSatchelLibrarianFilled = { ent-ClothingBackpackSatchel } 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 927a69525ce..a37bf83c3db 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 @@ -3,13 +3,15 @@ ent-BoxSurvival = survival box 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. ent-BoxSurvivalSecurity = survival box - .desc = It's a box with basic internals inside. + .desc = It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. .suffix = Security +ent-BoxSurvivalBrigmedic = survival box + .desc = It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. + .suffix = MedSec ent-BoxSurvivalMedical = survival box .desc = It's a box with basic internals inside. .suffix = Medical ent-BoxHug = box of hugs .desc = A special box for sensitive people. - .suffix = Emergency ent-BoxSurvivalSyndicate = extended-capacity survival box .desc = It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/general.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/general.ftl index 01e78ecca32..74562991ed7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/general.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/general.ftl @@ -18,9 +18,8 @@ ent-BoxMesonScanners = meson box .desc = A box of spare meson goggles. ent-BoxMRE = M.R.E. .desc = A box of decades old military surplus rations. It is surprisingly not rotten. -ent-BoxHugHealing = { ent-BoxHug } - .suffix = Medical - .desc = { ent-BoxHug.desc } +ent-BoxHugHealing = box of hugs + .desc = A special box for sensitive people. ent-BoxInflatable = inflatable wall box .desc = Inflatable walls are not to be used as floatation devices. ent-BoxPerformer = hatsune miku day bag diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/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 1360537ab35..f1c897772ba 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,5 +3,3 @@ 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. 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 987bdffbccf..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,9 +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. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engines.ftl index fc213777970..67cfbf012d5 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engines.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/engines.ftl @@ -7,7 +7,7 @@ ent-CrateEngineeringAMEControl = antimatter control unit crate ent-CrateEngineeringSingularityEmitter = emitter crate .desc = An emitter, best used for singularity engines. ent-CrateEngineeringSingularityCollector = radiation collector crate - .desc = A radiation collector, best used for singularity engines. Plasma is included. + .desc = A radiation collector, best used for singularity engines. ent-CrateEngineeringSingularityContainment = containment field generator crate .desc = A containment field generator, keeps the singulo in submission. ent-CrateEngineeringSingularityGenerator = singularity generator crate diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/materials.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/materials.ftl index d40b18d575f..183968d14d7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/materials.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/materials.ftl @@ -8,8 +8,6 @@ ent-CrateMaterialPlastic = plastic sheet crate .desc = 90 sheets of plastic. ent-CrateMaterialWood = wood crate .desc = Bunch of wood planks. -ent-CrateMaterialBrass = brass crate - .desc = 90 sheets of brass. ent-CrateMaterialPlasteel = plasteel crate .desc = 90 sheets of plasteel. ent-CrateMaterialPlasma = solid plasma crate diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/vending.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/vending.ftl index 887bb193a75..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 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/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/space_ruin.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/space_ruin.ftl index fde48669cbc..d472c43299d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/space_ruin.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/space_ruin.ftl @@ -1,9 +1,3 @@ ent-LockerOldAISat = closet .suffix = NTSRA voidsuit locker .desc = { ent-LockerSyndicate.desc } -ent-LockerSyndicateShipGearBasic = { ent-LockerSyndicate } - .suffix = Basic ship gear, Random - .desc = { ent-LockerSyndicate.desc } -ent-LockerSyndicateShipGearBasicChameleonKit = { ent-LockerSyndicateShipGearBasic } - .suffix = Basic ship gear, Random, Chameleon Kit - .desc = { ent-LockerSyndicateShipGearBasic.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl index 680c22b2164..e6d10cb190b 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 @@ -40,14 +40,12 @@ ent-SuitStorageCMO = { ent-SuitStorageBase } ent-SuitStorageRD = { ent-SuitStorageBase } .suffix = Research Director .desc = { ent-SuitStorageBase.desc } -ent-SuitStorageHOS = { ent-['BaseStructureIndestructible', 'BaseStructureLockImmuneToEmag', 'BaseStructureAccessReaderImmuneToEmag', 'BaseStructureDisableToolUse', 'BaseStructureUnanchorable', 'SuitStorageBase'] } - +ent-SuitStorageHOS = { ent-SuitStorageBase } .suffix = Head of Security - .desc = { ent-['BaseStructureIndestructible', 'BaseStructureLockImmuneToEmag', 'BaseStructureAccessReaderImmuneToEmag', 'BaseStructureDisableToolUse', 'BaseStructureUnanchorable', 'SuitStorageBase'].desc } -ent-SuitStorageWarden = { ent-['BaseStructureIndestructible', 'BaseStructureLockImmuneToEmag', 'BaseStructureAccessReaderImmuneToEmag', 'BaseStructureDisableToolUse', 'BaseStructureUnanchorable', 'SuitStorageBase'] } - + .desc = { ent-SuitStorageBase.desc } +ent-SuitStorageWarden = { ent-SuitStorageBase } .suffix = Warden - .desc = { ent-['BaseStructureIndestructible', 'BaseStructureLockImmuneToEmag', 'BaseStructureAccessReaderImmuneToEmag', 'BaseStructureDisableToolUse', 'BaseStructureUnanchorable', 'SuitStorageBase'].desc } + .desc = { ent-SuitStorageBase.desc } ent-SuitStorageCaptain = { ent-SuitStorageBase } .suffix = Captain .desc = { ent-SuitStorageBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/parts/vulpkanin.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/parts/vulpkanin.ftl index 705003e57eb..ebcccb3df11 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/parts/vulpkanin.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/body/parts/vulpkanin.ftl @@ -1,33 +1,22 @@ ent-PartVulpkanin = vulpkanin body part - - .desc = { ent-['BaseItem', 'BasePart'].desc } + .desc = { ent-BasePart.desc } ent-TorsoVulpkanin = vulpkanin torso - - .desc = { ent-['PartVulpkanin', 'BaseTorso'].desc } + .desc = { ent-PartVulpkanin.desc } ent-HeadVulpkanin = vulpkanin head - - .desc = { ent-['PartVulpkanin', 'BaseHead'].desc } + .desc = { ent-PartVulpkanin.desc } ent-LeftArmVulpkanin = left vulpkanin arm - - .desc = { ent-['PartVulpkanin', 'BaseLeftArm'].desc } + .desc = { ent-PartVulpkanin.desc } ent-RightArmVulpkanin = right vulpkanin arm - - .desc = { ent-['PartVulpkanin', 'BaseRightArm'].desc } + .desc = { ent-PartVulpkanin.desc } ent-LeftHandVulpkanin = left vulpkanin hand - - .desc = { ent-['PartVulpkanin', 'BaseLeftHand'].desc } + .desc = { ent-PartVulpkanin.desc } ent-RightHandVulpkanin = right vulpkanin hand - - .desc = { ent-['PartVulpkanin', 'BaseRightHand'].desc } + .desc = { ent-PartVulpkanin.desc } ent-LeftLegVulpkanin = left vulpkanin leg - - .desc = { ent-['PartVulpkanin', 'BaseLeftLeg'].desc } + .desc = { ent-PartVulpkanin.desc } ent-RightLegVulpkanin = right vulpkanin leg - - .desc = { ent-['PartVulpkanin', 'BaseRightLeg'].desc } + .desc = { ent-PartVulpkanin.desc } ent-LeftFootVulpkanin = left vulpkanin foot - - .desc = { ent-['PartVulpkanin', 'BaseLeftFoot'].desc } + .desc = { ent-PartVulpkanin.desc } ent-RightFootVulpkanin = right vulpkanin foot - - .desc = { ent-['PartVulpkanin', 'BaseRightFoot'].desc } \ No newline at end of file + .desc = { ent-PartVulpkanin.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/player/vulpkanin.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/player/vulpkanin.ftl index 06724561b1b..ab6abae09b8 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/player/vulpkanin.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/player/vulpkanin.ftl @@ -1,3 +1,2 @@ ent-MobVulpkanin = Urist McVulp - - .desc = { ent-['BaseMobVulpkanin', 'BaseMob'].desc } \ No newline at end of file + .desc = { ent-BaseMobVulpkanin.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/clothing/shoes/winter-boots.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/clothing/shoes/winter-boots.ftl index a618d85c636..04a19bcc7ec 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/clothing/shoes/winter-boots.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/clothing/shoes/winter-boots.ftl @@ -16,7 +16,7 @@ ent-ClothingShoesBootsWinterCMO = chief medical officer winter boots .desc = { ent-ClothingShoesBaseWinterBoots.desc } ent-ClothingShoesBootsWinterGenetics = genetics winter boots .desc = { ent-ClothingShoesBaseWinterBoots.desc } -ent-ClothingShoesBootsWinterHoP = head of personnel's winter boots +ent-ClothingShoesBootsWinterHoP = station representative's winter boots .desc = { ent-ClothingShoesBaseWinterBoots.desc } ent-ClothingShoesBootsWinterHoS = sheriff's winter boots .desc = { ent-ClothingShoesBaseWinterBoots.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/weapons/bombs/plastic.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/weapons/bombs/plastic.ftl deleted file mode 100644 index 4f75f3176c9..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/weapons/bombs/plastic.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-BreachingCharge = breaching charge - .desc = A breaching explosive for security officers to break through walls. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/battery/battery_guns.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/battery/battery_guns.ftl index c9e9bd66880..c56a862ea14 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/battery/battery_guns.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/battery/battery_guns.ftl @@ -1,5 +1,5 @@ ent-WeaponEnergyGun = energy gun - .desc = A basic hybrid energy gun with two settings: disable and kill. On the handle is a label that says 'for authorized use only.' + .desc = A basic hybrid energy gun with two settings: disable and kill. ent-WeaponEnergyGunMultiphase = x-01 multiphase energy gun - .desc = This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time. On the handle is a label that says 'for authorized use only.' + .desc = This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time. .suffix = DO NOT MAP 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 39d110f3983..3afef2747a0 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 @@ -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-ClothingBackpackSyndicate = syndicate backpack - .desc = { ent-ClothingBackpack.desc } ent-ClothingBackpackHolding = bag of holding .desc = A backpack that opens into a localized pocket of bluespace. ent-ClothingBackpackCluwne = jiggles von jonkerton 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..73c24fc1831 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 @@ -28,8 +28,8 @@ ent-ClothingHeadsetRobotics = robotics headset .desc = Made specifically for the roboticists, who cannot decide between departments. ent-ClothingHeadsetRD = rd headset .desc = Lamarr used to love chewing on this... -ent-ClothingHeadsetSecurity = security headset - .desc = This is used by your elite security force. +ent-ClothingHeadsetSecurity = deputy headset + .desc = This is used by your elite sheriff's department force. ent-ClothingHeadsetBrigmedic = brigmedic headset .desc = A headset that helps to hear the death cries. ent-ClothingHeadsetService = service headset 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..1afb5975ec7 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 @@ -13,7 +13,7 @@ ent-ClothingHeadsetAltEngineering = chief engineer's over-ear headset .desc = { ent-ClothingHeadsetAlt.desc } ent-ClothingHeadsetAltMedical = chief medical officer's over-ear headset .desc = { ent-ClothingHeadsetAlt.desc } -ent-ClothingHeadsetAltSecurity = head of security's over-ear headset +ent-ClothingHeadsetAltSecurity = sheriff's over-ear headset .desc = { ent-ClothingHeadsetAlt.desc } ent-ClothingHeadsetAltScience = research director's over-ear headset .desc = { ent-ClothingHeadsetAlt.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl index 374604b7c70..037fd3dde7a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl @@ -14,8 +14,6 @@ ent-ClothingEyesGlassesJamjar = jamjar glasses .desc = Also known as Virginity Protectors. ent-ClothingEyesGlassesOutlawGlasses = outlaw glasses .desc = A must for every self-respecting undercover agent. -ent-ClothingEyesGlassesCheapSunglasses = cheap sunglasses - .desc = A pair of black sunglasses. Doesn't block light well, more of an accessory than something useful. ent-ClothingEyesGlassesSunglasses = sun glasses .desc = A pair of black sunglasses. ent-ClothingEyesGlassesSecurity = security glasses 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 9700aea8858..5d09c5f100e 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,33 +1,22 @@ -ent-ClothingHeadBandBase = { ent-['ClothingHeadBaseButcherable', 'BaseFoldable'] } - - .desc = { ent-['ClothingHeadBaseButcherable', 'BaseFoldable'].desc } +ent-ClothingHeadBandBase = { ent-BaseFoldable } + .desc = { ent-BaseFoldable.desc } ent-ClothingHeadBandBlack = black bandana - - .desc = { ent-['ClothingHeadBandBase', 'ClothingMaskBandBlack'].desc } + .desc = { ent-ClothingMaskBandBlack.desc } ent-ClothingHeadBandBlue = blue bandana - - .desc = { ent-['ClothingHeadBandBase', 'ClothingMaskBandBlue'].desc } + .desc = { ent-ClothingMaskBandBlue.desc } ent-ClothingHeadBandBotany = botany bandana - - .desc = { ent-['ClothingHeadBandBase', 'ClothingMaskBandBotany'].desc } + .desc = { ent-ClothingMaskBandBotany.desc } ent-ClothingHeadBandGold = gold bandana - - .desc = { ent-['ClothingHeadBandBase', 'ClothingMaskBandGold'].desc } + .desc = { ent-ClothingMaskBandGold.desc } ent-ClothingHeadBandGreen = green bandana - - .desc = { ent-['ClothingHeadBandBase', 'ClothingMaskBandGreen'].desc } + .desc = { ent-ClothingMaskBandGreen.desc } ent-ClothingHeadBandGrey = grey bandana - - .desc = { ent-['ClothingHeadBandBase', 'ClothingMaskBandGrey'].desc } + .desc = { ent-ClothingMaskBandGrey.desc } ent-ClothingHeadBandRed = red bandana - - .desc = { ent-['ClothingHeadBandBase', 'ClothingMaskBandRed'].desc } + .desc = { ent-ClothingMaskBandRed.desc } ent-ClothingHeadBandSkull = skull bandana - - .desc = { ent-['ClothingHeadBandBase', 'ClothingMaskBandSkull'].desc } + .desc = { ent-ClothingMaskBandSkull.desc } ent-ClothingHeadBandMercenary = mercenary bandana - - .desc = { ent-['ClothingHeadBandBase', 'ClothingMaskBandMerc'].desc } + .desc = { ent-ClothingMaskBandMerc.desc } ent-ClothingHeadBandBrown = brown bandana - - .desc = { ent-['ClothingHeadBandBase', 'ClothingMaskBandBrown'].desc } \ No newline at end of file + .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 569fae15157..14ad6558a30 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 @@ -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 551b709afac..9705147b0c1 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 @@ -40,8 +40,8 @@ ent-ClothingHeadHatFedoraGrey = grey fedora .desc = It's a grey fedora. ent-ClothingHeadHatFez = fez .desc = A red fez. -ent-ClothingHeadHatHopcap = head of personnel's cap - .desc = A grand, stylish head of personnel's cap. +ent-ClothingHeadHatHopcap = station representative's cap + .desc = A grand, stylish station representative's cap. ent-ClothingHeadHatHoshat = sheriff's hat .desc = There's a new sheriff in station. ent-ClothingHeadHatOutlawHat = outlaw's hat @@ -120,8 +120,8 @@ ent-ClothingHeadHatTacticalMaidHeadband = tactical maid headband .desc = A red headband - don't imagine yourself a Rambo and don't pick up a few machine guns. ent-ClothingHeadHatHetmanHat = hetman hat .desc = From the Zaporozhian Sich with love. -ent-ClothingHeadHatMagician = magician's tophat - .desc = A magician's tophat. +ent-ClothingHeadHatMagician = magician's top hat. + .desc = A magician's top hat. ent-ClothingHeadHatCapcap = cap cap .desc = A grand, stylish captain cap. ent-ClothingHeadHatCentcomcap = CentCom cap 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 6e819002679..226bfdd895e 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 fe350bfc598..47760775333 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 @@ -50,7 +50,7 @@ ent-ClothingHeadHatHoodWinterCMO = chief medical officer's winter coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } ent-ClothingHeadHatHoodWinterEngineer = engineer winter coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } -ent-ClothingHeadHatHoodWinterHOP = head of personnel's winter coat hood +ent-ClothingHeadHatHoodWinterHOP = station representative's winter coat hood .desc = { ent-ClothingHeadHatHoodWinterBase.desc } ent-ClothingHeadHatHoodWinterHOS = sheriff's winter 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 9de98b822fd..7e15d688efe 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,8 +4,10 @@ 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 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 804a44b7adb..f6a904a5e2e 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,81 +1,65 @@ -ent-ClothingHeadHeadHatBaseFlippable = { ent-['ClothingHeadBaseButcherable', 'BaseFoldable'] } - - .desc = { ent-['ClothingHeadBaseButcherable', 'BaseFoldable'].desc } +ent-ClothingHeadHeadHatBaseFlippable = { ent-BaseFoldable } + .desc = { ent-BaseFoldable.desc } ent-ClothingHeadHeadHatBaseFlipped = { ent-ClothingHeadHeadHatBaseFlippable } .suffix = flipped .desc = { ent-ClothingHeadHeadHatBaseFlippable.desc } ent-ClothingHeadHatBluesoft = blue cap .desc = It's a baseball hat in a tasteless blue colour. ent-ClothingHeadHatBluesoftFlipped = blue cap - - .desc = { ent-['ClothingHeadHeadHatBaseFlipped', 'ClothingHeadHatBluesoft'].desc } + .desc = { ent-ClothingHeadHatBluesoft.desc } ent-ClothingHeadHatCargosoft = cargo cap .desc = It's a baseball hat painted in Cargo colours. ent-ClothingHeadHatCargosoftFlipped = cargo cap - - .desc = { ent-['ClothingHeadHeadHatBaseFlipped', 'ClothingHeadHatCargosoft'].desc } + .desc = { ent-ClothingHeadHatCargosoft.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', 'ClothingHeadHatQMsoft'].desc } + .desc = { ent-ClothingHeadHatQMsoft.desc } ent-ClothingHeadHatCorpsoft = corporate cap .desc = A baseball bat in corporation colors. ent-ClothingHeadHatCorpsoftFlipped = corporate cap - - .desc = { ent-['ClothingHeadHeadHatBaseFlipped', 'ClothingHeadHatCorpsoft'].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', 'ClothingHeadHatGreensoft'].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', 'ClothingHeadHatBlacksoft'].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', 'ClothingHeadHatGreysoft'].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', 'ClothingHeadHatMimesoft'].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', 'ClothingHeadHatOrangesoft'].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', 'ClothingHeadHatPurplesoft'].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', 'ClothingHeadHatRedsoft'].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', 'ClothingHeadHatSecsoft'].desc } + .desc = { ent-ClothingHeadHatSecsoft.desc } ent-ClothingHeadHatYellowsoft = yellow cap .desc = A yellow baseball hat. ent-ClothingHeadHatYellowsoftFlipped = yellow cap - - .desc = { ent-['ClothingHeadHeadHatBaseFlipped', 'ClothingHeadHatYellowsoft'].desc } + .desc = { ent-ClothingHeadHatYellowsoft.desc } ent-ClothingHeadHatBizarreSoft = troublemaker's cap .desc = A truly.. bizarre accessory. ent-ClothingHeadHatBizarreSoftFlipped = troublemaker's cap - - .desc = { ent-['ClothingHeadHeadHatBaseFlipped', 'ClothingHeadHatBizarreSoft'].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', 'ClothingHeadHatParamedicsoft'].desc } \ No newline at end of file + .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 4ea988a4460..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,6 +1,5 @@ -ent-ClothingMaskBandanaBase = { ent-['ClothingMaskBaseButcherable', 'BaseFoldable'] } - - .desc = { ent-['ClothingMaskBaseButcherable', 'BaseFoldable'].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/masks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl index d03696c237b..3792e7066eb 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl @@ -61,8 +61,6 @@ ent-ClothingMaskBat = bat mask .desc = A bloodsucker by night, and a cute, blinded beast by day. ent-ClothingMaskNeckGaiter = neck gaiter .desc = Stylish neck gaiter for your neck, can protect from the cosmic wind?... -ent-ClothingMaskNeckGaiterRed = red neck gaiter - .desc = { ent-ClothingMaskNeckGaiter.desc } ent-ClothingMaskSexyClown = sexy clown mask .desc = Some naughty clowns think this is what the Honkmother looks like. ent-ClothingMaskSexyMime = sexy mime mask 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 ef87c2448cb..fa25f564613 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 @@ -12,7 +12,7 @@ ent-ClothingNeckCloakRd = research director's cloak .desc = A white cloak with violet stripes, showing your status as the arbiter of cutting-edge technology. ent-ClothingNeckCloakQm = quartermaster'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 +ent-ClothingNeckCloakHop = station representative's cloak .desc = A blue cloak with red shoulders and gold buttons, proving you are the gatekeeper to any airlock on the station. ent-ClothingNeckCloakHerald = herald's cloak .desc = An evil-looking red cloak with spikes on its shoulders. 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 f1606e04574..ffbf37c17ac 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 @@ -4,7 +4,7 @@ ent-ClothingNeckMantleCE = chief engineer's mantle .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 = 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 +ent-ClothingNeckMantleHOP = station representative's mantle .desc = A good SR knows that paper pushing is only half the job... petting your dog and looking fashionable is the other half. ent-ClothingNeckMantleHOS = sheriff's mantle .desc = Shootouts with nukies are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station. 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 f58c5f79b89..25038843707 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 captain's of luxury vessels. 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 bea8132af24..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,17 +4,10 @@ ent-ClothingOuterBaseLarge = { ent-ClothingOuterBase } .desc = { ent-ClothingOuterBase.desc } ent-ClothingOuterStorageBase = { ent-ClothingOuterBase } .desc = { ent-ClothingOuterBase.desc } -ent-ClothingOuterStorageFoldableBase = { ent-['ClothingOuterStorageBase', 'BaseFoldable'] } - - .desc = { ent-['ClothingOuterStorageBase', 'BaseFoldable'].desc } -ent-ClothingOuterStorageFoldableBaseOpened = { ent-ClothingOuterStorageFoldableBase } - .suffix = opened - .desc = { ent-ClothingOuterStorageFoldableBase.desc } ent-ClothingOuterStorageToggleableBase = { ent-ClothingOuterStorageBase } .desc = { ent-ClothingOuterStorageBase.desc } ent-ClothingOuterHardsuitBase = base hardsuit - - .desc = { ent-['ClothingOuterBase', 'GeigerCounterClothing'].desc } + .desc = { ent-ClothingOuterBase.desc } ent-ClothingOuterEVASuitBase = base EVA Suit .desc = { ent-ClothingOuterBase.desc } ent-ClothingOuterBaseToggleable = hoodie with hood 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 bbbc42fff0f..708a03cfb8f 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 @@ -14,44 +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-['ClothingOuterStorageFoldableBaseOpened', '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-['ClothingOuterStorageFoldableBaseOpened', '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-['ClothingOuterStorageFoldableBaseOpened', '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-['ClothingOuterStorageFoldableBaseOpened', '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-['ClothingOuterStorageFoldableBaseOpened', 'ClothingOuterCoatLabCmo'].desc } ent-ClothingOuterCoatRnd = scientist 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-['ClothingOuterStorageFoldableBaseOpened', '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-['ClothingOuterStorageFoldableBaseOpened', '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-['ClothingOuterStorageFoldableBaseOpened', 'ClothingOuterCoatRD'].desc } ent-ClothingOuterCoatPirate = pirate garb .desc = Yarr. ent-ClothingOuterCoatWarden = bailiff's armored jacket @@ -76,5 +52,3 @@ ent-ClothingOuterCoatLabSeniorPhysician = senior physician lab coat .desc = A suit that protects against minor chemical spills. Has light blue sleeves and an orange waist trim. ent-ClothingOuterCoatSpaceAsshole = the coat of space asshole .desc = And there he was... -ent-ClothingOuterCoatExpensive = expensive coat - .desc = Very fluffy pink coat, made out of very expensive fur (clearly). diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl index 3c007f4a1f6..c4544b913a1 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 @@ -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/wintercoats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl index 5ccabddfd98..334c54953dc 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 @@ -26,7 +26,7 @@ ent-ClothingOuterWinterEngi = engineering winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } ent-ClothingOuterWinterGen = genetics winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } -ent-ClothingOuterWinterHoP = head of personnel's winter coat +ent-ClothingOuterWinterHoP = station representative's winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } ent-ClothingOuterWinterHoS = sheriff's winter coat .desc = { ent-ClothingOuterWinterCoatToggleable.desc } 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 4b4721b768e..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 @@ -2,8 +2,7 @@ ent-ClothingShoesBase = { ent-Clothing } .desc = { ent-Clothing.desc } ent-ClothingShoesBaseButcherable = { ent-ClothingShoesBase } .desc = { ent-ClothingShoesBase.desc } -ent-ClothingShoesMilitaryBase = { ent-['ClothingShoesBase', 'ClothingSlotBase'] } - - .desc = { ent-['ClothingShoesBase', 'ClothingSlotBase'].desc } +ent-ClothingShoesMilitaryBase = { ent-ClothingShoesBase } + .desc = { ent-ClothingShoesBase.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/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/specific.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/specific.ftl index 2a600242c03..9940719addc 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/specific.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/specific.ftl @@ -1,8 +1,5 @@ ent-ClothingShoesChef = chef shoes .desc = Sturdy shoes that minimize injury from falling objects or knives. -ent-ClothingShoesClownBase = { ent-['ClothingShoesBaseButcherable', 'ClothingSlotBase'] } - - .desc = { ent-['ClothingShoesBaseButcherable', 'ClothingSlotBase'].desc } ent-ClothingShoesClown = clown shoes .desc = The prankster's standard-issue clowning shoes. Damn they're huge! ent-ClothingShoesClownBanana = banana clown shoes diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpskirts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpskirts.ftl deleted file mode 100644 index 037824dd463..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpskirts.ftl +++ /dev/null @@ -1,32 +0,0 @@ -ent-ClothingUniformJumpskirtColorWhite = white jumpskirt - .desc = A generic white jumpskirt with no rank markings. -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-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-ClothingUniformJumpskirtColorGreen = green jumpskirt - .desc = A generic green jumpskirt with no rank markings. -ent-ClothingUniformJumpskirtColorDarkGreen = dark green jumpskirt - .desc = A generic dark 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-ClothingUniformJumpskirtColorYellow = yellow jumpskirt - .desc = A generic yellow jumpskirt with no rank markings. -ent-ClothingUniformJumpskirtColorPurple = purple jumpskirt - .desc = A generic light purple 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. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpsuits.ftl deleted file mode 100644 index 02be453cd06..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpsuits.ftl +++ /dev/null @@ -1,34 +0,0 @@ -ent-ClothingUniformJumpsuitColorWhite = white jumpsuit - .desc = A generic white jumpsuit with no rank markings. -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-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-ClothingUniformJumpsuitColorGreen = green jumpsuit - .desc = A generic green jumpsuit with no rank markings. -ent-ClothingUniformJumpsuitColorDarkGreen = dark green jumpsuit - .desc = A generic dark 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-ClothingUniformJumpsuitColorYellow = yellow jumpsuit - .desc = A generic yellow jumpsuit with no rank markings. -ent-ClothingUniformJumpsuitColorPurple = purple jumpsuit - .desc = A generic light purple 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! 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 f509c9de47b..12db2f9a37d 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 @@ -26,7 +26,7 @@ ent-ClothingUniformJumpskirtDetectiveGrey = detective noir suit .desc = A hard-boiled private investigator's grey suit, complete with tie clip. ent-ClothingUniformJumpskirtEngineering = engineering jumpskirt .desc = If this suit was non-conductive, maybe engineers would actually do their damn job. -ent-ClothingUniformJumpskirtHoP = head of personnel's jumpskirt +ent-ClothingUniformJumpskirtHoP = station representative's jumpskirt .desc = Rather bland and inoffensive. Perfect for vanishing off the face of the universe. ent-ClothingUniformJumpskirtHoS = sheriff's jumpskirt .desc = It's bright red and rather crisp, much like the department's victims tend to be. Its sturdy fabric provides minor protection from slash and pierce damage. @@ -62,6 +62,38 @@ ent-ClothingUniformJumpskirtSec = deputy jumpskirt .desc = A jumpskirt made of strong material, providing robust protection. ent-ClothingUniformJumpskirtWarden = bailiff's jumpskirt .desc = A formal security suit for officers complete with Nanotrasen belt buckle. +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 green jumper fit for a curator of books. ent-ClothingUniformJumpskirtCurator = sensible skirt 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 eabfd2b4cd5..f26e1902bdd 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 @@ -52,7 +52,7 @@ ent-ClothingUniformJumpsuitEngineering = engineering jumpsuit .desc = If this suit was non-conductive, maybe engineers would actually do their damn job. ent-ClothingUniformJumpsuitEngineeringHazard = hazard jumpsuit .desc = Woven in a grungy, warm orange. Lets others around you know that you really mean business when it comes to work. -ent-ClothingUniformJumpsuitHoP = head of personnel's jumpsuit +ent-ClothingUniformJumpsuitHoP = station representative's jumpsuit .desc = Rather bland and inoffensive. Perfect for vanishing off the face of the universe. ent-ClothingUniformJumpsuitHoS = sheriff's jumpsuit .desc = It's bright red and rather crisp, much like the department's victims tend to be. @@ -102,6 +102,40 @@ ent-ClothingUniformJumpsuitSecGrey = grey deputy 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 = bailiff's jumpsuit .desc = A formal security suit for officers complete with Nanotrasen belt buckle. +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 = librarian jumpsuit @@ -162,8 +196,6 @@ ent-ClothingUniformJumpsuitMonasticRobeLight = light monastic robe .desc = It's a light robe, often worn by religious folk. ent-ClothingUniformJumpsuitMusician = musician's tuxedo .desc = A fancy tuxedo for the musically inclined. Perfect for any lounge act! -ent-ClothingUniformJumpsuitERTChaplain = ERT chaplain uniform - .desc = A special suit made for Central Command's elite chaplain corps. ent-ClothingUniformJumpsuitERTEngineer = ERT engineering uniform .desc = A special suit made for the elite engineers under CentCom. ent-ClothingUniformJumpsuitERTJanitor = ERT janitorial uniform 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/shuttle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/shuttle.ftl index 580e5467a65..20afb6ac4f1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/shuttle.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/shuttle.ftl @@ -1,4 +1,2 @@ ent-FTLPoint = FTL point .desc = { ent-MarkerBase.desc } -ent-FTLExclusion = FTL exclusion point - .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl index 33134932e6d..c8a5fff491e 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 @@ -81,8 +81,6 @@ ent-SpawnPointBrigmedic = brigmedic .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/mobs/npcs/argocyte.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/argocyte.ftl index 638a64afbd9..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,5 +1,4 @@ -ent-BaseMobArgocyte = { ent-['BaseSimpleMob', 'MobCombat'] } - +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 d719555d60d..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,8 +1,7 @@ ent-MobElementalBase = { "" } .desc = { "" } ent-MobOreCrab = ore crab - - .desc = { ent-['MobElementalBase', 'MobCombat'].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..682d2d6b289 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/human.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/human.ftl @@ -4,12 +4,8 @@ ent-MobSalvager = salvager .desc = { ent-BaseMobHuman.desc } ent-MobSpirate = spirate .desc = Yarr! -ent-MobSyndicateFootsoldier = syndicate footsoldier - .desc = { ent-BaseMobHuman.desc } -ent-MobSyndicateFootsoldierPilot = syndicate shuttle pilot - .desc = { ent-MobSyndicateFootsoldier.desc } ent-SalvageHumanCorpse = unidentified corpse - .desc = I think 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/shadows.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/shadows.ftl index 52958ce90ae..8164c16901e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/shadows.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/shadows.ftl @@ -1,5 +1,4 @@ -ent-BaseShadowMob = { ent-['BaseMob', 'BaseShadow'] } - - .desc = { ent-['BaseMob', 'BaseShadow'].desc } +ent-BaseShadowMob = { ent-BaseShadow } + .desc = { ent-BaseShadow.desc } ent-MobCatShadow = shadow cat .desc = A lovely piece of darkness. Hope he doesn't bring you a curse. 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 38e34cdebc0..103e936f6bd 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 @@ -1,8 +1,7 @@ ent-MobSiliconBase = { "" } .desc = { "" } -ent-MobSiliconBaseVehicle = { ent-['MobSiliconBase', 'BaseVehicle'] } - - .desc = { ent-['MobSiliconBase', 'BaseVehicle'].desc } +ent-MobSiliconBaseVehicle = { ent-MobSiliconBase } + .desc = { ent-MobSiliconBase.desc } ent-MobTaxiBot = taxibot .desc = Give a ride? ent-MobSupplyBot = supplybot 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 bde5ee1d268..b03588ddbec 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,12 +1,9 @@ -ent-BaseSimpleMob = { ent-['BaseMob', 'MobDamageable', 'MobAtmosExposed'] } - +ent-BaseSimpleMob = { ent-BaseMob } .suffix = AI - .desc = { ent-['BaseMob', 'MobDamageable', 'MobAtmosExposed'].desc } -ent-SimpleSpaceMobBase = { ent-['BaseSimpleMob', 'MobCombat', 'MobBloodstream', 'MobFlammable'] } - + .desc = { ent-BaseMob.desc } +ent-SimpleSpaceMobBase = { ent-SimpleSpaceMobBase } .suffix = AI - .desc = { ent-['BaseSimpleMob', 'MobCombat', 'MobBloodstream', 'MobFlammable'].desc } -ent-SimpleMobBase = { ent-['MobRespirator', 'MobAtmosStandard', 'SimpleSpaceMobBase'] } - + .desc = { ent-SimpleSpaceMobBase.desc } +ent-SimpleMobBase = { ent-BaseSimpleMob } .suffix = AI - .desc = { ent-['MobRespirator', 'MobAtmosStandard', 'SimpleSpaceMobBase'].desc } \ No newline at end of file + .desc = { ent-BaseSimpleMob.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/human.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/human.ftl index 0328e828b6e..c850c6219ff 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/human.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/human.ftl @@ -1,14 +1,11 @@ ent-MobHuman = Urist McHands .desc = { ent-BaseMobHuman.desc } -ent-MobHumanSyndicateAgentBase = syndicate agent - .suffix = Human, Base - .desc = { ent-MobHuman.desc } ent-MobHumanSyndicateAgent = syndicate agent - .suffix = Human, Traitor - .desc = { ent-MobHumanSyndicateAgentBase.desc } -ent-MobHumanSyndicateAgentNukeops = { ent-MobHumanSyndicateAgentBase } - .suffix = Human, NukeOps - .desc = { ent-MobHumanSyndicateAgentBase.desc } + .suffix = Human + .desc = { ent-MobHuman.desc } +ent-MobHumanSyndicateAgentNukeops = { ent-MobHumanSyndicateAgent } + .suffix = NukeOps + .desc = { ent-MobHumanSyndicateAgent.desc } ent-MobHumanNukeOp = Nuclear Operative .desc = { ent-MobHuman.desc } ent-MobHumanLoneNuclearOperative = Lone Operative 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 b6f71cd9946..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 } 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 495ceafde27..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 @@ -3,6 +3,5 @@ ent-MobNarsieBase = Nar'Sie ent-MobNarsieSpawn = { ent-MobNarsieBase } .suffix = Spawn .desc = { ent-MobNarsieBase.desc } -ent-MobNarsie = { ent-['MobNarsieBase', 'BaseMob'] } - - .desc = { ent-['MobNarsieBase', 'BaseMob'].desc } \ No newline at end of file +ent-MobNarsie = { ent-MobNarsieBase } + .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 d1af572f2ad..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 @@ -3,6 +3,5 @@ ent-MobRatvarBase = Ratvar ent-MobRatvarSpawn = { ent-MobRatvarBase } .suffix = Spawn .desc = { ent-MobRatvarBase.desc } -ent-MobRatvar = { ent-['MobRatvarBase', 'BaseMob'] } - - .desc = { ent-['MobRatvarBase', 'BaseMob'].desc } \ No newline at end of file +ent-MobRatvar = { ent-MobRatvarBase } + .desc = { ent-MobRatvarBase.desc } \ No newline at end of file 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 036187a2234..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,7 +1,6 @@ ent-MobTerminatorBase = { "" } .desc = { "" } ent-MobHumanTerminator = exterminator - - .desc = { ent-['MobHuman', 'MobTerminatorBase'].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/species/base.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/species/base.ftl index ce725eede93..8ab860c0c77 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/species/base.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/species/base.ftl @@ -1,8 +1,6 @@ -ent-BaseMobSpecies = { ent-['BaseMob', 'MobDamageable', 'MobCombat'] } - - .desc = { ent-['BaseMob', 'MobDamageable', 'MobCombat'].desc } -ent-BaseMobSpeciesOrganic = { ent-['MobBloodstream', 'MobRespirator', 'MobAtmosStandard', 'MobFlammable', 'BaseMobSpecies'] } - - .desc = { ent-['MobBloodstream', 'MobRespirator', 'MobAtmosStandard', 'MobFlammable', 'BaseMobSpecies'].desc } +ent-BaseMobSpecies = { ent-BaseMob } + .desc = { ent-BaseMob.desc } +ent-BaseMobSpeciesOrganic = { ent-BaseMobSpecies } + .desc = { ent-BaseMobSpecies.desc } ent-BaseSpeciesDummy = { "" } - .desc = { "" } + .desc = { "" } \ No newline at end of file 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 8d1eb583462..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,5 +1,4 @@ ent-BaseMobSkeletonPerson = Urist McSkelly - - .desc = { ent-['MobFlammable', 'BaseMobSpecies'].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 238ad595905..57a79d02638 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl @@ -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,9 +63,6 @@ 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 } @@ -81,21 +75,12 @@ ent-DrinkCarrotJuice = { ent-DrinkGlass } ent-DrinkChocolateGlass = { ent-DrinkGlass } .suffix = chocolate .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 } @@ -249,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 } @@ -282,9 +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 } @@ -309,18 +285,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 } 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 b952213bc69..59a46a427f4 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 } @@ -71,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/trash_drinks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl index f2f1ba62989..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,21 +1,15 @@ 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 @@ -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/donut.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/donut.ftl index b0e80e07a03..6d674f575f5 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/donut.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/donut.ftl @@ -1,5 +1,4 @@ -ent-FoodDonutBase = { ent-['VendPriceFoodBase100', 'FoodInjectableBase'] } - +ent-FoodDonutBase = { ent-VendPriceFoodBase100 } .desc = Goes great with robust coffee. ent-FoodDonutPlain = plain donut .desc = { ent-FoodDonutBase.desc } 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 47377439731..ad893e32d7e 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,4 @@ -ent-FoodEggBase = { ent-['FoodInjectableBase', 'ItemHeftyBase'] } - +ent-FoodEggBase = { ent-FoodInjectableBase } .desc = An egg! ent-Eggshells = eggshells .desc = You're walkin' on 'em bud. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/snacks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/snacks.ftl index 7e823a24f57..712bef5294c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/snacks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/snacks.ftl @@ -1,6 +1,5 @@ -ent-FoodSnackBase = { ent-['VendPriceFoodBase200', 'FoodBase'] } - - .desc = { ent-['VendPriceFoodBase200', 'FoodBase'].desc } +ent-FoodSnackBase = { ent-FoodBase } + .desc = { ent-FoodBase.desc } ent-FoodSnackBoritos = boritos .desc = Crunchy, salty tortilla chips. You could probably make nachos with these. ent-FoodSnackCnDs = C&Ds diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/cigarettes/packs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/cigarettes/packs.ftl index 21060bd0323..9d05dbb7d6f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/cigarettes/packs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/smokeables/cigarettes/packs.ftl @@ -1,9 +1,7 @@ ent-CigPackBase = cigarette pack - - .desc = { ent-['BaseStorageItem', 'BaseBagOpenClose'].desc } + .desc = { ent-BaseBagOpenClose.desc } ent-CigPackMixedBase = soaked cigarette pack - - .desc = { ent-['BaseStorageItem', 'BaseBagOpenClose'].desc } + .desc = { ent-BaseBagOpenClose.desc } ent-CigPackGreen = Spessman's Smokes packet .desc = A label on the packaging reads, Wouldn't a slow death make a change? ent-CigPackRed = DromedaryCo packet diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/flora.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/flora.ftl index 6049849a4dc..cb2fa851860 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/flora.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/flora.ftl @@ -26,18 +26,6 @@ ent-FloraStalagmite5 = { ent-FloraStalagmite1 } .desc = { ent-FloraStalagmite1.desc } ent-FloraStalagmite6 = { ent-FloraStalagmite1 } .desc = { ent-FloraStalagmite1.desc } -ent-FloraGreyStalagmite1 = { ent-FloraStalagmite1 } - .desc = { ent-FloraStalagmite1.desc } -ent-FloraGreyStalagmite2 = { ent-FloraGreyStalagmite1 } - .desc = { ent-FloraGreyStalagmite1.desc } -ent-FloraGreyStalagmite3 = { ent-FloraGreyStalagmite1 } - .desc = { ent-FloraGreyStalagmite1.desc } -ent-FloraGreyStalagmite4 = { ent-FloraGreyStalagmite1 } - .desc = { ent-FloraGreyStalagmite1.desc } -ent-FloraGreyStalagmite5 = { ent-FloraGreyStalagmite1 } - .desc = { ent-FloraGreyStalagmite1.desc } -ent-FloraGreyStalagmite6 = { ent-FloraGreyStalagmite1 } - .desc = { ent-FloraGreyStalagmite1.desc } ent-FloraTree01 = tree .desc = { ent-BaseTree.desc } ent-FloraTree02 = tree 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 ef524735f02..885c5cd227b 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 @@ -1,27 +1,22 @@ ent-PresentBase = present .desc = A little box with incredible surprises inside. -ent-Present = { ent-['PresentBase', 'BaseStorageItem'] } - +ent-Present = { ent-PresentBase } .suffix = Empty - .desc = { ent-['PresentBase', 'BaseStorageItem'].desc } -ent-PresentRandomUnsafe = { ent-['PresentBase', 'BaseItem'] } - + .desc = { ent-PresentBase.desc } +ent-PresentRandomUnsafe = { ent-PresentBase } .suffix = Filled, any item - .desc = { ent-['PresentBase', 'BaseItem'].desc } + .desc = { ent-PresentBase.desc } ent-PresentRandomInsane = { ent-PresentRandomUnsafe } .suffix = Filled, any entity .desc = { ent-PresentRandomUnsafe.desc } -ent-PresentRandom = { ent-['PresentBase', 'BaseItem'] } - +ent-PresentRandom = { ent-PresentBase } .suffix = Filled Safe - .desc = { ent-['PresentBase', 'BaseItem'].desc } -ent-PresentRandomAsh = { ent-['PresentBase', 'BaseItem'] } - + .desc = { ent-PresentBase.desc } +ent-PresentRandomAsh = { ent-PresentBase } .suffix = Filled Ash - .desc = { ent-['PresentBase', 'BaseItem'].desc } -ent-PresentRandomCash = { ent-['PresentBase', 'BaseItem'] } - + .desc = { ent-PresentBase.desc } +ent-PresentRandomCash = { ent-PresentBase } .suffix = Filled Cash - .desc = { ent-['PresentBase', 'BaseItem'].desc } + .desc = { ent-PresentBase.desc } ent-PresentTrash = Wrapping Paper - .desc = Carefully folded, taped, and tied with a bow. Then ceremoniously ripped apart and tossed on the floor. + .desc = Carefully folded, taped, and tied with a bow. Then ceremoniously ripped apart and tossed on the floor. \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/cartridges.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/cartridges.ftl index 69f73930df2..fcd161e0ac7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/cartridges.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/cartridges.ftl @@ -1,6 +1,6 @@ ent-NotekeeperCartridge = notekeeper cartridge .desc = A program for keeping notes -ent-NewsReaderCartridge = news cartridge +ent-NewsReadCartridge = news cartridge .desc = A program for reading news ent-CrewManifestCartridge = crew manifest cartridge .desc = A program for listing your fellow crewmembers 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 8613e679689..d7fe815797a 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 @@ -8,8 +8,6 @@ ent-MedicalRecordsComputerCircuitboard = medical records computer board .desc = A computer printed circuit board for a medical records computer. ent-CriminalRecordsComputerCircuitboard = criminal records computer board .desc = A computer printed circuit board for a criminal records computer. -ent-NFSDCriminalRecordsComputerCircuitboard = nfsd criminal records computer board - .desc = A computer printed circuit board for a criminal records computer. ent-StationRecordsComputerCircuitboard = station records computer board .desc = A computer printed circuit board for a station records computer. ent-CargoRequestComputerCircuitboard = cargo request computer board @@ -50,8 +48,6 @@ ent-RadarConsoleCircuitboard = radar console computer board .desc = { ent-BaseComputerCircuitboard.desc } ent-AdvancedRadarConsoleCircuitboard = advanced radar console computer board .desc = { ent-BaseComputerCircuitboard.desc } -ent-NFSDAdvancedRadarConsoleCircuitboard = nfsd advanced radar console computer board - .desc = { ent-BaseComputerCircuitboard.desc } ent-SolarControlComputerCircuitboard = solar control computer board .desc = A computer printed circuit board for a solar control console. ent-SpaceVillainArcadeComputerCircuitboard = space villain arcade board @@ -72,7 +68,7 @@ ent-ComputerIFFSyndicateCircuitboard = syndicate IFF console board .desc = Allows you to control the IFF and stealth characteristics of this vessel. ent-ShipyardComputerCircuitboard = shipyard computer board .desc = A computer printed circuit board for a shipyard computer. -ent-ComputerMassMediaCircuitboard = news manager console board +ent-ComputerMassMediaCircuitboard = mass-media 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. 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 f497d78f3e0..29c8892a2b0 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 @@ -51,9 +51,7 @@ ent-HellfireHeaterMachineCircuitBoard = hellfire heater machine board ent-CondenserMachineCircuitBoard = condenser machine board .desc = A machine printed circuit board for a condenser. ent-PortableScrubberMachineCircuitBoard = portable scrubber machine board - .desc = A machine printed circuit board for a portable scrubber. -ent-SpaceHeaterMachineCircuitBoard = space heater machine board - .desc = A machine printed circuit board for a space heater. + .desc = A PCB for a portable scrubber. ent-CloningPodMachineCircuitboard = cloning pod machine board .desc = A machine printed circuit board for a cloning pod. ent-MedicalScannerMachineCircuitboard = medical scanner machine board @@ -158,7 +156,5 @@ 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" -ent-ReagentGrinderIndustrialMachineCircuitboard = industrial reagent grinder machine board - .desc = { ent-BaseMachineCircuitboard.desc } ent-M_EmpMachineCircuitboard = M_EMP Generator machine board .desc = A machine printed circuit board for a mobile EMP generator. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl deleted file mode 100644 index 0f904fee474..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl +++ /dev/null @@ -1,111 +0,0 @@ -ent-DoorElectronicsService = { ent-DoorElectronics } - .suffix = Service, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsTheatre = { ent-DoorElectronics } - .suffix = Theatre, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsChapel = { ent-DoorElectronics } - .suffix = Chapel, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsJanitor = { ent-DoorElectronics } - .suffix = Janitor, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsKitchen = { ent-DoorElectronics } - .suffix = Kitchen, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsBar = { ent-DoorElectronics } - .suffix = Bar, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsHydroponics = { ent-DoorElectronics } - .suffix = Hydroponics, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsLawyer = { ent-DoorElectronics } - .suffix = Lawyer, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsCaptain = { ent-DoorElectronics } - .suffix = Captain, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsExternal = { ent-DoorElectronics } - .suffix = External, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsCargo = { ent-DoorElectronics } - .suffix = Cargo, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsEngineering = { ent-DoorElectronics } - .suffix = Engineering, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsAtmospherics = { ent-DoorElectronics } - .suffix = Atmospherics, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsFreezer = { ent-DoorElectronics } - .suffix = Freezer, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsSalvage = { ent-DoorElectronics } - .suffix = Salvage, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsMedical = { ent-DoorElectronics } - .suffix = Medical, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsChemistry = { ent-DoorElectronics } - .suffix = Chemistry, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsResearch = { ent-DoorElectronics } - .suffix = Research, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsScience = { ent-DoorElectronics } - .suffix = Science, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsCommand = { ent-DoorElectronics } - .suffix = Command, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsCentralCommand = { ent-DoorElectronics } - .suffix = CentralCommand, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsChiefMedicalOfficer = { ent-DoorElectronics } - .suffix = ChiefMedicalOfficer, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsChiefEngineer = { ent-DoorElectronics } - .suffix = ChiefEngineer, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsHeadOfSecurity = { ent-DoorElectronics } - .suffix = HeadOfSecurity, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsResearchDirector = { ent-DoorElectronics } - .suffix = ResearchDirector, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsHeadOfPersonnel = { ent-DoorElectronics } - .suffix = HeadOfPersonnel, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsQuartermaster = { ent-DoorElectronics } - .suffix = Quartermaster, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsSecurity = { ent-DoorElectronics } - .suffix = Security, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsSecurityLawyer = { ent-DoorElectronics } - .suffix = Security/Lawyer, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsDetective = { ent-DoorElectronics } - .suffix = Detective, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsBrig = { ent-DoorElectronics } - .suffix = Brig, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsArmory = { ent-DoorElectronics } - .suffix = Armory, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsVault = { ent-DoorElectronics } - .suffix = Vault, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsMaintenance = { ent-DoorElectronics } - .suffix = Maintenance, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsSyndicateAgent = { ent-DoorElectronics } - .suffix = SyndicateAgent, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsNukeop = { ent-DoorElectronics } - .suffix = Nukeop, Locked - .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsRnDMed = { ent-DoorElectronics } - .suffix = Medical/Science, Locked - .desc = { ent-DoorElectronics.desc } 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 7d9817d7bef..ccb89ad85c8 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 @@ -4,19 +4,3 @@ ent-SolarAssemblyFlatpack = solar assembly flatpack .desc = A flatpack used for constructing a solar assembly. ent-AmePartFlatpack = AME flatpack .desc = A flatpack used for constructing an antimatter engine reactor. -ent-SingularityGeneratorFlatpack = singularity generator flatpack - .desc = A flatpack used for constructing a singularity generator. -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-TeslaGeneratorFlatpack = tesla generator flatpack - .desc = A flatpack used for constructing a tesla generator. -ent-TeslaCoilFlatpack = tesla coil flatpack - .desc = A flatpack used for constructing a tesla coil. -ent-TeslaGroundingRodFlatpack = grounding rod flatpack - .desc = A flatpack used for constructing a grounding rod. -ent-GyroscopeFlatpack = gyroscope flatpack - .desc = A flatpack used for constructing a gyroscope. -ent-ThrusterFlatpack = thruster flatpack - .desc = A flatpack used for constructing a thruster. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/holoprojectors.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/holoprojectors.ftl index f783483d87e..07f3b2ce023 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/holoprojectors.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/holoprojectors.ftl @@ -1,21 +1,12 @@ ent-Holoprojector = holographic sign projector .desc = A handy-dandy holographic projector that displays a janitorial sign. -ent-HoloprojectorEmpty = { ent-Holoprojector } - .suffix = Empty - .desc = { ent-Holoprojector.desc } ent-HoloprojectorBorg = { ent-Holoprojector } .suffix = borg .desc = { ent-Holoprojector.desc } ent-HolofanProjector = holofan projector .desc = Stop suicidal passengers from killing everyone during atmos emergencies. -ent-HolofanProjectorEmpty = { ent-HolofanProjector } - .suffix = Empty - .desc = { ent-HolofanProjector.desc } ent-HoloprojectorField = force field projector .desc = Creates an impassable forcefield that won't let anything through. Close proximity may or may not cause cancer. -ent-HoloprojectorFieldEmpty = { ent-HoloprojectorField } - .suffix = Empty - .desc = { ent-HoloprojectorField.desc } ent-HoloprojectorSecurity = holobarrier projector .desc = Creates a solid but fragile holographic barrier. ent-HoloprojectorSecurityEmpty = { ent-HoloprojectorSecurity } 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 5e0f3333e56..45b4e0e7d3e 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 @@ -40,7 +40,7 @@ ent-JanitorPDA = janitor PDA .desc = Smells like bleach. ent-CaptainPDA = captain PDA .desc = Surprisingly no different from your PDA. -ent-HoPPDA = head of personnel PDA +ent-HoPPDA = station representative PDA .desc = Looks like it's been chewed on. ent-CEPDA = chief engineer PDA .desc = Looks like it's barely been used. @@ -82,24 +82,24 @@ ent-ClearPDA = clear PDA .desc = 99 and 44/100ths percent pure plastic. ent-SyndiPDA = syndicate PDA .desc = Ok, time to be a productive member of- oh cool I'm a bad guy time to kill people! -ent-ERTLeaderPDA = ERT Leader PDA +ent-ERTLeaderPDA = ERT PDA .desc = Red for firepower. .suffix = Leader -ent-ERTChaplainPDA = ERT Chaplain PDA - .desc = Red for firepower, it's blessed. +ent-ERTChaplainPDA = ERT PDA .suffix = Chaplain -ent-ERTEngineerPDA = ERT Engineer PDA - .desc = Red for firepower, it's well-worn. + .desc = { ent-ERTLeaderPDA.desc } +ent-ERTEngineerPDA = { ent-ERTLeaderPDA } .suffix = Engineer -ent-ERTJanitorPDA = ERT Janitor PDA - .desc = Red for firepower, it's squeaky clean. + .desc = { ent-ERTLeaderPDA.desc } +ent-ERTJanitorPDA = { ent-ERTLeaderPDA } .suffix = Janitor -ent-ERTMedicPDA = ERT Medic PDA - .desc = Red for firepower, it's shiny and sterile. Has a built-in rapid health analyzer. + .desc = { ent-ERTLeaderPDA.desc } +ent-ERTMedicPDA = { ent-ERTLeaderPDA } .suffix = Medic -ent-ERTSecurityPDA = ERT Security PDA - .desc = Red for firepower, it has tally marks etched on the side. + .desc = { ent-ERTLeaderPDA.desc } +ent-ERTSecurityPDA = { ent-ERTLeaderPDA } .suffix = Security + .desc = { ent-ERTLeaderPDA.desc } ent-CBURNPDA = CBURN PDA .desc = Smells like rotten flesh. ent-PsychologistPDA = psychologist PDA diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_map.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_map.ftl index 818b3590e34..4610941c965 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_map.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_map.ftl @@ -1,12 +1,8 @@ ent-BaseHandheldStationMap = station map .desc = Displays a readout of the current station. -ent-HandheldStationMap = { ent-['BaseHandheldStationMap', 'PowerCellSlotSmallItem'] } - +ent-HandheldStationMap = { ent-BaseHandheldStationMap } .suffix = Handheld, Powered - .desc = { ent-['BaseHandheldStationMap', 'PowerCellSlotSmallItem'].desc } -ent-HandheldStationMapEmpty = { ent-HandheldStationMap } - .suffix = Handheld, Empty - .desc = { ent-HandheldStationMap.desc } + .desc = { ent-BaseHandheldStationMap.desc } ent-HandheldStationMapUnpowered = { ent-BaseHandheldStationMap } .suffix = Handheld, Unpowered .desc = { ent-BaseHandheldStationMap.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/war_declarator.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/war_declarator.ftl index 712e36c0f64..dcfb8fc512f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/war_declarator.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/syndicate_gadgets/war_declarator.ftl @@ -1,2 +1,2 @@ -ent-NukeOpsDeclarationOfWar = war declarator +ent-NukeOpsDeclarationOfWar = declaration of war .desc = Use to send a declaration of hostilities to the target, delaying your shuttle departure while they prepare for your assault. Such a brazen move will attract the attention of powerful benefactors within the Syndicate, who will supply your team with a massive amount of bonus telecrystals. Must be used at start of mission, or your benefactors will lose interest. 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 320b38a677c..7ad03d91ef3 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 @@ -30,8 +30,8 @@ ent-ToyFigurineLawyer = lawyer figure .desc = A figurine depicting a Lawyer sporting a freshly tailored suit. 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-ToyFigurineSalvage = salvage technican figure + .desc = A figurine depicting a Salvage Technician holding a survival knife. ent-ToyFigurineQuartermaster = quartermaster figure .desc = A figurine depicting the glorious head of the Cargo department. ent-ToyFigurineChiefEngineer = chief engineer 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 8a931c93a6c..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,30 +1,11 @@ ent-ImmovableRod = immovable rod .desc = You can sense that it's hungry. That's usually a bad sign. -ent-ImmovableRodDespawn = { ent-ImmovableRod } - .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 cfbe4f0a2f8..df20fbdc1de 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,8 +3,7 @@ ent-SaxophoneInstrument = saxophone ent-AccordionInstrument = accordion .desc = { ent-BaseHandheldInstrument.desc } ent-HarmonicaInstrument = harmonica - - .desc = { ent-['BaseHandheldInstrument', 'Clothing'].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/toys.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl index a17e7eb0ca9..b3f905fbd0c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl @@ -39,12 +39,6 @@ ent-PlushieNar = nar'sie plushie .desc = A small stuffed doll of the elder goddess Nar'Sie. ent-PlushieCarp = carp plushie .desc = An adorable stuffed toy that resembles the monstrous space carp. -ent-PlushieMagicarp = magicarp plushie - .desc = An adorable stuffed toy resembling the exceedingly rare magicarp. -ent-PlushieRainbowCarp = rainbow carp plushie - .desc = An adorable stuffed toy resembling the legendary rainbow carp. -ent-PlushieHolocarp = holocarp plushie - .desc = A holographic stuffed toy resembling science's nemesis - the holocarp. ent-PlushieSlime = slime plushie .desc = An adorable stuffed toy that resembles a slime. It's basically a hacky sack. ent-PlushieSnake = snake plushie @@ -94,8 +88,6 @@ ent-BeachBall = beach ball .desc = The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen ent-BalloonSyn = syndie balloon .desc = Handed out to the bravest souls who survived the "atomic twister" ride at Syndieland. -ent-BalloonNT = nanotrasen balloon - .desc = Specially designed to inflict maximum psychological damage to Syndicate operatives. ent-BalloonCorgi = corgi balloon .desc = Just like owning a real dog - but a lot floatier. ent-SingularityToy = singuloth-brand toy @@ -106,7 +98,7 @@ ent-PonderingOrb = pondering orb .desc = Ponderous, man... Really ponderous. ent-ToySword = toy sword .desc = New Sandy-Cat plastic sword! Comes with realistic sound and full color! Looks almost like the real thing! -ent-ToyAmongPequeno = among pequeño +ent-ToyAmongPequeno = among pequeno .desc = sus! ent-FoamCutlass = foam cutlass .desc = Cosplay as a pirate and force your friends to walk the plank. 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 5d40be7d818..f02e169f7bc 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 @@ -2,5 +2,3 @@ ent-BaseWhistle = whistle .desc = Someone forgot to turn off kettle? ent-SecurityWhistle = { ent-BaseWhistle } .desc = Sound of it make you feel fear. -ent-SyndicateWhistle = trench whistle - .desc = A whistle used by Syndicate commanders to draw attention. Avanti! 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 1b567357148..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 @@ -76,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/materials/ore.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/ore.ftl index 261704b81e4..837f3d5f1bd 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/ore.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/ore.ftl @@ -48,9 +48,3 @@ ent-Coal = coal ent-Coal1 = { ent-Coal } .suffix = Single .desc = { ent-Coal.desc } -ent-SaltOre = salt - .suffix = Full - .desc = { ent-OreBase.desc } -ent-Salt1 = { ent-SaltOre } - .suffix = Single - .desc = { ent-SaltOre.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/shards.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/shards.ftl index 787b76f1f78..8d63c2b848a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/shards.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/shards.ftl @@ -8,5 +8,3 @@ ent-ShardGlassPlasma = plasma glass shard .desc = A small piece of plasma glass. ent-ShardGlassUranium = uranium glass shard .desc = A small piece of uranium glass. -ent-ShardGlassClockwork = clockwork glass shard - .desc = A small piece of brass-infused glass. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl index 82ec64f8e36..2010737e248 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/glass.ftl @@ -41,9 +41,3 @@ ent-SheetRUGlass = reinforced uranium glass ent-SheetRUGlass1 = reinforced uranium glass .suffix = Single .desc = { ent-SheetRUGlass.desc } -ent-SheetClockworkGlass = clockwork glass - .desc = A sheet of brass-hardened glass, primarily used by clockwork enthusiasts and remnants of Ratvarian cults. - .suffix = Full -ent-SheetClockworkGlass1 = clockwork glass - .suffix = Single - .desc = { ent-SheetClockworkGlass.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl index bfa6da7551b..d244db0dc62 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/metal.ftl @@ -12,15 +12,6 @@ ent-SheetSteel1 = steel ent-SheetSteelLingering0 = { ent-SheetSteel } .suffix = Lingering, 0 .desc = { ent-SheetSteel.desc } -ent-SheetBrass = brass - .desc = A sheet of brass, primarily used by clockwork enthusiasts and the remnants of Ratvarian cults. - .suffix = Full -ent-SheetBrass10 = brass - .suffix = 10 - .desc = { ent-SheetBrass.desc } -ent-SheetBrass1 = brass - .suffix = Single - .desc = { ent-SheetBrass.desc } ent-SheetPlasteel = plasteel .suffix = Full .desc = { ent-SheetMetalBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/other.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/other.ftl index 4be5ed6c165..b750e51b871 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/other.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/sheets/other.ftl @@ -22,9 +22,8 @@ ent-SheetPlastic1 = plastic .suffix = Single .desc = { ent-SheetPlastic.desc } ent-SheetUranium = uranium - .suffix = Full - .desc = { ent-['SheetOtherBase', 'FoodBase'].desc } + .desc = { ent-SheetOtherBase.desc } ent-SheetUranium1 = uranium .suffix = Single .desc = { ent-SheetUranium.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/books_author.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/books_author.ftl deleted file mode 100644 index dbd557ac5be..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/books_author.ftl +++ /dev/null @@ -1,62 +0,0 @@ -ent-BookNarsieLegend = the legend of nar'sie - .desc = The book is an old, leather-bound tome with intricate engravings on the cover. The pages are yellowed and fragile with age, with the ink of the text faded in some places. It appears to have been well-read and well-loved, with dog-eared pages and marginalia scrawled in the margins. Despite its aged appearance, the book still exudes a sense of mystical power and wonder, hinting at the secrets and knowledge contained within its pages. -ent-BookTruth = exploring different philosophical perspectives on truth and the complexity of lying - .desc = A book exploring the different philosophical perspectives on truth and lying has a worn cover, with creases and marks indicating frequent use and thoughtful contemplation. The spine shows signs of wear from being pulled off the shelf again and again. The pages themselves are filled with underlines, notes in the margins, and highlighted passages as readers grapple with the nuances and complexities of the topic. -ent-BookWorld = shaping the state of the world - interplay of forces and choices - .desc = The book is a well-preserved hardcover with a simple, elegant design on the cover, depicting the image of a world in motion. The pages are crisp and clean, with no signs of wear or tear, suggesting that it has been well-cared for and valued by its previous owner. The text is printed in a clear, legible font, and the chapters are organized in a logical and easy-to-follow manner, making it accessible to readers of all levels of expertise. -ent-BookIanAntarctica = adventures of robert & ian - exploring antarctica - .desc = The book is a small paperback in good condition, with an illustration of Ian the corgi and the colony of penguins on the cover. The title, "Ian and Robert's Antarctic Adventure", is written in bold white letters against a blue background. The back cover features a brief summary of the story, highlighting the themes of humility, resilience, and the beauty of nature. -ent-BookSlothClownSSS = the sloth and the clown - space station shenanigans - .desc = The book looks new, with a glossy cover featuring Chuckles the clown and Snuggles the sloth floating in space with a backdrop of stars and planets. Chuckles is dressed in his banana costume and Snuggles is sleeping on a hammock made of space ropes. The title "The Sloth and the Clown - Space Station Shenanigans" is written in bold and colorful letters. -ent-BookSlothClownPranks = the sloth and the clown - pranks on zorgs - .desc = The book is in excellent condition, with crisp pages and a bright cover. The cover of the book features Chuckles and Snuggles, surrounded by the different species they encountered during their adventures in space. In the background, the Zorgs can be seen peeking out from behind a spaceship. -ent-BookSlothClownMMD = the sloth and the clown - maze maze danger - .desc = The book looks new and vibrant, with an image of Chuckles and Snuggles standing in front of the changing maze on the cover. The title "The Sloth and the Clown - Maze Maze Danger" is written in bold, colorful letters that pop against a background of space and stars. -ent-BookStruck = the humbling and transformative experience of being struck by lightning - .desc = The cover of the book is an electrifying image of lightning striking the ground, with a silhouette of a person standing in the midst of it. The title is written in bold letters in white against a black background, conveying the power and intensity of the experience. The subtitle is written in smaller letters below the title, providing a hint of the philosophical and spiritual themes explored within. -ent-BookSun = reaching for the sun - a plant's quest for life - .desc = The book is new, with a bright and vibrant cover featuring a plant stretching its leaves towards the sun. The title, "Reaching for the Sun - A Plant's Quest for Life," is written in bold, green letters, with an image of the sun rising behind the plant. The cover evokes a sense of growth, energy, and the beauty of nature. -ent-BookPossum = fallen ambitions - the tragic tale of morty the possum - .desc = The book is in good condition, with a hardcover and a dark green forest background. In the center of the cover, there is a sad looking possum sitting on a branch, with a distant and lonely expression on its face. The title, "Fallen Ambitions - The Tragic Tale of Morty the Possum," is written in bold, gold letters above the possum. -ent-BookCafe = the cafe possum - .desc = The book is in new condition, with a vibrant and whimsical cover that features a charming illustration of a tiny possum peeking out from behind a coffee cup, with a colorful and bustling cafe scene in the background. The title "The Cafe Possum" is written in bold, playful lettering, and the author's name is printed in a smaller font below it. -ent-BookFeather = a feather of magic - the wandering bird's journey to belonging - .desc = The book would be in new condition, with a glossy cover depicting the wandering bird surrounded by a glowing forest, with the magical feather at the center. The title, "A Feather of Magic," would be written in bold, glittering letters, while the subtitle, "The Wandering Bird's Journey to Belonging," would be written in smaller print underneath. The back cover would feature a brief summary of the story, along with reviews from critics praising the book's themes of hope and renewal. -ent-BookIanLostWolfPup = the adventures of ian and renault - finding the lost wolf pup - .desc = The book is a new condition with a colorful cover, depicting Ian the corgi and Renault the fox on a journey through the forest, with the lost wolf pup to their feet. The title "The Adventures of Ian and Renault - Finding the Lost Wolf Pup" is prominently displayed at the top, with the author's name below. The cover has a whimsical and adventurous feel to it, attracting readers of all ages. -ent-BookIanRanch = the adventures of ian and renault - ranch expedition - .desc = The book appears to be new, with crisp pages and an unblemished cover. The cover features a colorful illustration of Ian and Renault, surrounded by various animals they encountered on the ranch, including horses, cows, and chickens. The title, "The Adventures of Ian and Renault - Ranch Expedition," is written in bold letters above the image, with the subtitle, "Helping Animals in Need," written below. -ent-BookIanOcean = the adventures of ian and renault - an ocean adventure - .desc = The book is new and in excellent condition. The cover shows Ian and Renault running and playing on the beach, with the blue ocean and golden sand in the background. The title is written in bold, playful letters, and the subtitle reads "An Ocean Adventure." -ent-BookIanMountain = the adventures of ian and renault - A mountain expedition - .desc = The book is in new condition. The cover is a stunning mountain landscape with Ian and Renault in the foreground, looking out over the vista of the surrounding peaks and valleys. The title is written in bold, block letters at the top, with the subtitle, "A Mountain Expedition," written underneath. -ent-BookIanCity = the adventures of ian and renault - exploring the city - .desc = The book is in new condition, with crisp pages and a glossy cover. The cover features a colorful illustration of Ian and Renault exploring the city, with tall buildings and bustling streets in the background. Ian is leading the way, with his tail wagging excitedly, while Renault follows close behind, her ears perked up and her eyes wide with wonder. The title, "The Adventures of Ian and Renault," is written in bold, playful letters, with the subtitle, "Exploring the City," written below in smaller font. -ent-BookIanArctic = the adventures of ian and renault - an arctic journey of courage and friendship - .desc = The book looks new and adventurous, with a picture of Ian and Renault standing in front of an icy landscape with snowflakes falling all around them. The title, "The Adventures of Ian and Renault," is written in bold letters at the top, with a subtitle that reads, "An Arctic Journey of Courage and Friendship." -ent-BookIanDesert = the adventures of ian and renault - exploring the mysterious desert - .desc = The book is in new condition and would have a colorful cover depicting Ian and Renault against a desert backdrop. The cover would feature images of various animals and plants that the two encountered on their adventure, such as a rattlesnake, coyotes, sand dunes, and an oasis. The title, "The Adventures of Ian and Renault" is prominently displayed on the cover in bold letters, while the subtitle "Exploring the Mysterious Desert" is written in smaller letters underneath. -ent-BookNames = the power of names - a philosophical exploration - .desc = The book is a gently used philosophy text, with a cover that features a close-up of a person's mouth, with the word "names" written on their lips. The title is "The Power of Names - A Philosophical Exploration," and the author's name is prominently displayed underneath. The overall design is simple and elegant, with the focus on the text rather than any flashy graphics or images. -ent-BookEarth = earthly longing - .desc = The book is in good condition, with a slightly faded cover due to exposure to sunlight. The cover of the book depicts a panoramic view of the Earth from space, with a bright blue ocean and green landmasses. In the foreground, a lone astronaut is seen sitting in front of a window, gazing wistfully at the Earth. The title of the book, "Earthly Longing," is written in bold white letters against a black background at the top of the cover. -ent-BookAurora = journey beyond - the starship aurora mission - .desc = The book is in excellent condition, with a shiny cover depicting a spaceship hovering above a planet, perhaps with the Earth in the background. The title "Journey Beyond - The Starship Aurora Mission" is written in bold, silver letters. The cover also features a quote from a review, "A breathtaking tale of human achievement and exploration" to entice potential readers. -ent-BookTemple = the nature of the divine - embracing the many gods - .desc = The book appears new with crisp pages and an uncreased spine. The cover features an image of a temple with a glowing, multicolored aura around it, symbolizing the various gods discussed in the book. The title is displayed prominently in gold lettering, with the author's name and a brief summary of the book written in smaller text below. -ent-BookWatched = watched - .desc = The book is in good condition, with a slightly worn cover that features a dark and ominous space station looming in the background. The title "Watched" is written in bold letters that seem to be staring back at the reader, conveying the feeling of being constantly observed. The blurb on the back cover hints at a thrilling and suspenseful tale of paranoia and danger in a confined setting. -ent-BookMedicalOfficer = horizon's battle - a medical officer's tale of trust and survival - .desc = The cover features Smith, the medical officer, in his uniform, looking determined and ready to face any challenge. The backdrop shows the SS Horizon under attack, with explosions and smoke filling the space station. In the foreground, a wizard with a staff can be seen, adding an element of mystery and intrigue to the scene. The title is prominently displayed in bold letters, with the author's name and a tagline indicating the book's action-packed and suspenseful nature. -ent-BookMorgue = the ghostly residents of the abandoned morgue - .desc = The book looks old and worn, with faded lettering on the cover. The cover depicts a dark and eerie morgue, with a full moon casting an ominous glow over the scene. In the foreground are Morty the possum and Morticia the raccoon, with mischievous expressions on their faces, peeking out from behind a metal shelf. The title is written in bold, spooky letters, with the subtitle "A Tale of Animal Spirits" written in smaller font below. -ent-BookRufus = rufus and the mischievous fairy - .desc = The book is in new condition, with vibrant colors and illustrations on the cover. The cover shows Rufus on his bicycle, with Blossom flying beside him in a playful manner. The title is written in bold, whimsical font, with the characters' names highlighted in a contrasting color. The overall aesthetic is charming and inviting, appealing to children and adults alike. -ent-BookMap = the map of adventure - .desc = The book is in a good condition, with a glossy cover depicting a jungle scene with vibrant colors and intricate details. The title "The Map of Adventure," is written in bold, gold lettering. The cover also features an image of a mysterious suitcase with the map spilling out of it. -ent-BookJourney = a journey of music, mountains, and self-discovery - .desc = The book is in excellent condition, with crisp pages and a glossy cover. The cover features a striking image of a mountain range, with a silhouette of a climber with a guitar on their back in the foreground. The title is bold and eye-catching, with the subtitle "A Journey of Music, Mountains, and Self-Discovery." -ent-BookInspiration = finding inspiration - a writer's journey through the woods - .desc = The book is in a new condition with a cover depicting a serene forest scene with a waterfall and colorful wildflowers. The title of the book "Finding Inspiration - A Writer's Journey Through the Woods" and the author's name are prominently displayed at the bottom. -ent-BookJanitorTale = the tales of a tired janitor - .desc = A clean looking book, smelling vaguely of soap and bleach. 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/carpets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/carpets.ftl index edf947a2ab4..c02894b5407 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/carpets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/carpets.ftl @@ -1,30 +1,16 @@ -ent-FloorCarpetItemRed = carpet - .suffix = Red - .desc = { ent-FloorTileItemBase.desc } -ent-FloorCarpetItemBlack = { ent-FloorCarpetItemRed } - .suffix = Black - .desc = { ent-FloorCarpetItemRed.desc } -ent-FloorCarpetItemBlue = { ent-FloorCarpetItemRed } - .suffix = Blue - .desc = { ent-FloorCarpetItemRed.desc } -ent-FloorCarpetItemGreen = { ent-FloorCarpetItemRed } - .suffix = Green - .desc = { ent-FloorCarpetItemRed.desc } -ent-FloorCarpetItemOrange = { ent-FloorCarpetItemRed } - .suffix = Orange - .desc = { ent-FloorCarpetItemRed.desc } -ent-FloorCarpetItemSkyBlue = { ent-FloorCarpetItemRed } - .suffix = Sky Blue - .desc = { ent-FloorCarpetItemRed.desc } -ent-FloorCarpetItemPurple = { ent-FloorCarpetItemRed } - .suffix = Purple - .desc = { ent-FloorCarpetItemRed.desc } -ent-FloorCarpetItemPink = { ent-FloorCarpetItemRed } - .suffix = Pink - .desc = { ent-FloorCarpetItemRed.desc } -ent-FloorCarpetItemCyan = { ent-FloorCarpetItemRed } - .suffix = Cyan - .desc = { ent-FloorCarpetItemRed.desc } -ent-FloorCarpetItemWhite = { ent-FloorCarpetItemRed } - .suffix = White - .desc = { ent-FloorCarpetItemRed.desc } +ent-FloorCarpetItemRed = red carpet + .desc = { ent-FloorTileItemBase.desc } +ent-FloorCarpetItemBlack = black carpet + .desc = { ent-FloorTileItemBase.desc } +ent-FloorCarpetItemBlue = blue carpet + .desc = { ent-FloorTileItemBase.desc } +ent-FloorCarpetItemGreen = green carpet + .desc = { ent-FloorTileItemBase.desc } +ent-FloorCarpetItemOrange = orange carpet + .desc = { ent-FloorTileItemBase.desc } +ent-FloorCarpetItemSkyBlue = sky blue carpet + .desc = { ent-FloorTileItemBase.desc } +ent-FloorCarpetItemPurple = purple carpet + .desc = { ent-FloorTileItemBase.desc } +ent-FloorCarpetItemPink = pink carpet + .desc = { ent-FloorTileItemBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/cds.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/cds.ftl deleted file mode 100644 index 23434de6c4a..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/cds.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-CoordinatesDisk = coordinates disk - .desc = A disk containing the coordinates to a location in space. Necessary for any FTL-traversing vessel to reach their destination. Fits inside shuttle consoles. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/diskcases.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/diskcases.ftl deleted file mode 100644 index e4000db46f5..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/diskcases.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-DiskCase = diskcase - .desc = Case for storing a coordinates disk. 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 f36c6bc4c2e..034984eeb3a 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 @@ -54,7 +54,7 @@ ent-LibrarianIDCard = librarian ID card .desc = { ent-IDCardStandard.desc } ent-LawyerIDCard = lawyer ID card .desc = { ent-IDCardStandard.desc } -ent-HoPIDCard = head of personnel ID card +ent-HoPIDCard = station representative ID card .desc = { ent-IDCardStandard.desc } ent-CEIDCard = chief engineer ID card .desc = { ent-IDCardStandard.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 e277f832936..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,7 +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', 'BaseShadow'].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/rubber_stamp.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl index eafc7e97b3b..42dd00fa8a4 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 } @@ -50,6 +47,3 @@ ent-RubberStampApproved = APPROVED rubber stamp .desc = { ent-RubberStampBaseAlt.desc } ent-RubberStampDenied = DENIED rubber stamp .desc = { ent-RubberStampBaseAlt.desc } -ent-RubberStampDetective = detective's rubber stamp - .suffix = DO NOT MAP - .desc = { ent-RubberStampBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl index 0ba39a65e69..c242ecd3520 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/tiles.ftl @@ -22,10 +22,6 @@ ent-FloorTileItemMono = mono tile .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemLino = linoleum floor .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemBrassFilled = filled brass plate - .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemBrassReebe = smooth brass plate - .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemDirty = dirty tile .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemElevatorShaft = elevator shaft tile @@ -126,13 +122,7 @@ ent-FloorTileItemWeb = web tile .desc = { ent-FloorTileItemBase.desc } ent-FloorTileItemAstroGrass = astro-grass .desc = Fake grass that covers up wires and even comes with realistic NanoTrimmings! -ent-FloorTileItemMowedAstroGrass = mowed astro-grass - .desc = Fake grass that covers up wires and even comes with realistic NanoTrimmings! -ent-FloorTileItemJungleAstroGrass = jungle astro-grass - .desc = Fake grass that covers up wires and even comes with realistic NanoTrimmings! ent-FloorTileItemAstroIce = astro-ice .desc = Fake ice that's as slippery as the real thing, while being easily removable! -ent-FloorTileItemAstroSnow = astro-snow - .desc = Fake snow that's as fluffy as the real thing, while being easily removable! ent-FloorTileItemWoodLarge = large wood floor .desc = { ent-FloorTileItemBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/power/lights.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/power/lights.ftl index ab826de9e0a..bddd9d40b4b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/power/lights.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/power/lights.ftl @@ -4,8 +4,6 @@ ent-BaseLightTube = { ent-BaseLightbulb } .desc = { ent-BaseLightbulb.desc } ent-LightBulb = incandescent light bulb .desc = A light bulb. -ent-LedLightBulb = led light bulb - .desc = A power efficient light bulb. ent-LightBulbOld = old incandescent light bulb .desc = An aging light bulb. ent-LightBulbBroken = incandescent light bulb 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 5fb9822f865..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 = Designates valid items to sell to CentCom when a shuttle is recalled. -ent-CargoPalletSell = cargo selling pallet - .desc = Designates valid items to sell with a selling computer, or to CentCom when a shuttle is recalled. -ent-CargoPalletBuy = cargo buying pallet - .desc = Designates where orders will appear when purchased. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/chemistry.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/chemistry.ftl index 0fad94dd9b1..0a07b40785e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/chemistry.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/chemistry.ftl @@ -20,8 +20,6 @@ ent-BaseSyringe = syringe .desc = Used to draw blood samples from mobs, or to inject them with reagents. ent-Syringe = { ent-BaseSyringe } .desc = { ent-BaseSyringe.desc } -ent-PrefilledSyringe = { ent-BaseSyringe } - .desc = { ent-BaseSyringe.desc } ent-SyringeBluespace = bluespace syringe .desc = Injecting with advanced bluespace technology. ent-SyringeCryostasis = cryostasis syringe 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/defib.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/defib.ftl index 5ce761e6492..427b209a6ca 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/defib.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/defib.ftl @@ -1,8 +1,7 @@ ent-BaseDefibrillator = defibrillator .desc = CLEAR! Zzzzat! -ent-Defibrillator = { ent-['BaseDefibrillator', 'PowerCellSlotMediumItem'] } - - .desc = { ent-['BaseDefibrillator', 'PowerCellSlotMediumItem'].desc } +ent-Defibrillator = { ent-BaseDefibrillator } + .desc = { ent-BaseDefibrillator.desc } ent-DefibrillatorEmpty = { ent-Defibrillator } .suffix = Empty .desc = { ent-Defibrillator.desc } 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/healing.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healing.ftl index 9ecb5c349c0..52d4663343b 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 @@ -114,30 +114,30 @@ ent-PillCanisterRandom = { ent-PillCanister } .suffix = Random .desc = { ent-PillCanister.desc } ent-SyringeEphedrine = ephedrine syringe - .desc = { ent-PrefilledSyringe.desc } + .desc = { ent-BaseSyringe.desc } ent-SyringeInaprovaline = inaprovaline syringe - .desc = { ent-PrefilledSyringe.desc } + .desc = { ent-BaseSyringe.desc } ent-SyringeTranexamicAcid = tranexamic acid syringe - .desc = { ent-PrefilledSyringe.desc } + .desc = { ent-BaseSyringe.desc } ent-SyringeBicaridine = bicaridine syringe - .desc = { ent-PrefilledSyringe.desc } + .desc = { ent-BaseSyringe.desc } ent-SyringeDermaline = dermaline syringe - .desc = { ent-PrefilledSyringe.desc } + .desc = { ent-BaseSyringe.desc } ent-SyringeHyronalin = hyronalin syringe - .desc = { ent-PrefilledSyringe.desc } + .desc = { ent-BaseSyringe.desc } ent-SyringeIpecac = ipecac syringe - .desc = { ent-PrefilledSyringe.desc } + .desc = { ent-BaseSyringe.desc } ent-SyringeAmbuzol = ambuzol syringe - .desc = { ent-PrefilledSyringe.desc } + .desc = { ent-BaseSyringe.desc } ent-SyringeSigynate = sigynate syringe - .desc = { ent-PrefilledSyringe.desc } + .desc = { ent-BaseSyringe.desc } ent-SyringeEthylredoxrazine = ethylredoxrazine syringe - .desc = { ent-PrefilledSyringe.desc } + .desc = { ent-BaseSyringe.desc } ent-SyringePhalanximine = phalanximine syringe - .desc = { ent-PrefilledSyringe.desc } + .desc = { ent-BaseSyringe.desc } ent-SyringeSaline = saline syringe - .desc = { ent-PrefilledSyringe.desc } + .desc = { ent-BaseSyringe.desc } ent-SyringeRomerol = romerol syringe - .desc = { ent-PrefilledSyringe.desc } + .desc = { ent-BaseSyringe.desc } ent-SyringeStimulants = stimulants syringe - .desc = { ent-PrefilledSyringe.desc } + .desc = { ent-BaseSyringe.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healthanalyzer.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healthanalyzer.ftl index 8069f29c046..96997df4dc4 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healthanalyzer.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/medical/healthanalyzer.ftl @@ -1,9 +1,8 @@ ent-HandheldHealthAnalyzerUnpowered = health analyzer .desc = A hand-held body scanner capable of distinguishing vital signs of the subject. -ent-HandheldHealthAnalyzer = { ent-['HandheldHealthAnalyzerUnpowered', 'PowerCellSlotSmallItem'] } - +ent-HandheldHealthAnalyzer = { ent-HandheldHealthAnalyzerUnpowered } .suffix = Powered - .desc = { ent-['HandheldHealthAnalyzerUnpowered', 'PowerCellSlotSmallItem'].desc } + .desc = { ent-HandheldHealthAnalyzerUnpowered.desc } ent-HandheldHealthAnalyzerEmpty = { ent-HandheldHealthAnalyzer } .suffix = Empty .desc = { ent-HandheldHealthAnalyzer.desc } 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/research/anomaly.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/research/anomaly.ftl index bb55ae0b598..8e2f2f97506 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/research/anomaly.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/research/anomaly.ftl @@ -3,20 +3,18 @@ ent-AnomalyScanner = anomaly scanner ent-AnomalyLocatorUnpowered = anomaly locator .desc = A device designed to aid in the locating of anomalies. Did you check the gas miners? .suffix = Unpowered -ent-AnomalyLocator = { ent-['AnomalyLocatorUnpowered', 'PowerCellSlotSmallItem'] } - +ent-AnomalyLocator = { ent-AnomalyLocatorUnpowered } .suffix = Powered - .desc = { ent-['AnomalyLocatorUnpowered', 'PowerCellSlotSmallItem'].desc } + .desc = { ent-AnomalyLocatorUnpowered.desc } ent-AnomalyLocatorEmpty = { ent-AnomalyLocator } .suffix = Empty .desc = { ent-AnomalyLocator.desc } ent-AnomalyLocatorWideUnpowered = wide-spectrum anomaly locator .desc = A device that looks for anomalies from an extended distance, but has no way to determine the distance to them. .suffix = Unpowered -ent-AnomalyLocatorWide = { ent-['AnomalyLocatorWideUnpowered', 'PowerCellSlotSmallItem'] } - +ent-AnomalyLocatorWide = { ent-AnomalyLocatorWideUnpowered } .suffix = Powered - .desc = { ent-['AnomalyLocatorWideUnpowered', 'PowerCellSlotSmallItem'].desc } + .desc = { ent-AnomalyLocatorWideUnpowered.desc } ent-AnomalyLocatorWideEmpty = { ent-AnomalyLocatorWide } .suffix = Empty .desc = { ent-AnomalyLocatorWide.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl index 43742fb6b7c..7795cb0f187 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl @@ -19,86 +19,60 @@ ent-BaseBorgModuleSyndicate = { ent-BaseBorgModule } ent-BaseBorgModuleSyndicateAssault = { ent-BaseBorgModule } .desc = { ent-BaseBorgModule.desc } ent-BorgModuleCable = cable cyborg module - - .desc = { ent-['BaseBorgModule', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModule.desc } ent-BorgModuleFireExtinguisher = fire extinguisher cyborg module - - .desc = { ent-['BaseBorgModule', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModule.desc } ent-BorgModuleGPS = GPS cyborg module - - .desc = { ent-['BaseBorgModule', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModule.desc } ent-BorgModuleRadiationDetection = radiation detection cyborg module - - .desc = { ent-['BaseBorgModule', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModule.desc } ent-BorgModuleTool = tool cyborg module - - .desc = { ent-['BaseBorgModule', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModule.desc } ent-BorgModuleAppraisal = appraisal cyborg module - - .desc = { ent-['BaseBorgModuleCargo', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleCargo.desc } ent-BorgModuleMining = mining cyborg module - - .desc = { ent-['BaseBorgModuleCargo', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleCargo.desc } ent-BorgModuleGrapplingGun = grappling gun cyborg module - - .desc = { ent-['BaseBorgModuleCargo', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleCargo.desc } ent-BorgModuleAdvancedTool = advanced tool cyborg module - - .desc = { ent-['BaseBorgModuleEngineering', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleEngineering.desc } ent-BorgModuleConstruction = construction cyborg module - - .desc = { ent-['BaseBorgModuleEngineering', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleEngineering.desc } ent-BorgModuleRCD = RCD cyborg module - - .desc = { ent-['BaseBorgModuleEngineering', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleEngineering.desc } ent-BorgModuleLightReplacer = light replacer cyborg module - - .desc = { ent-['BaseBorgModuleJanitor', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleJanitor.desc } ent-BorgModuleCleaning = cleaning cyborg module - - .desc = { ent-['BaseBorgModuleJanitor', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleJanitor.desc } ent-BorgModuleAdvancedCleaning = advanced cleaning cyborg module - - .desc = { ent-['BaseBorgModuleJanitor', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleJanitor.desc } ent-BorgModuleDiagnosis = diagnosis cyborg module - - .desc = { ent-['BaseBorgModuleMedical', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleMedical.desc } ent-BorgModuleTreatment = treatment cyborg module - - .desc = { ent-['BaseBorgModuleMedical', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleMedical.desc } ent-BorgModuleDefibrillator = defibrillator cyborg module - - .desc = { ent-['BaseBorgModuleMedical', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleMedical.desc } ent-BorgModuleAdvancedTreatment = advanced treatment cyborg module - - .desc = { ent-['BaseBorgModuleMedical', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleMedical.desc } ent-BorgModuleArtifact = artifact cyborg module - - .desc = { ent-['BaseBorgModule', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModule.desc } ent-BorgModuleAnomaly = anomaly cyborg module - - .desc = { ent-['BaseBorgModule', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModule.desc } ent-BorgModuleService = service cyborg module - - .desc = { ent-['BaseBorgModuleService', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleService.desc } ent-BorgModuleMusique = musique cyborg module - - .desc = { ent-['BaseBorgModuleService', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleService.desc } ent-BorgModuleGardening = gardening cyborg module - - .desc = { ent-['BaseBorgModuleService', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleService.desc } ent-BorgModuleHarvesting = harvesting cyborg module - - .desc = { ent-['BaseBorgModuleService', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleService.desc } ent-BorgModuleClowning = clowning cyborg module - - .desc = { ent-['BaseBorgModuleService', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModuleService.desc } ent-BorgModuleSyndicateWeapon = weapon cyborg module - - .desc = { ent-['BaseBorgModule', 'BaseProviderBorgModule'].desc } + .desc = { ent-BaseBorgModule.desc } ent-BorgModuleOperative = operative cyborg module .desc = A module that comes with a crowbar, an Emag and a syndicate pinpointer. ent-BorgModuleEsword = energy sword cyborg module .desc = A module that comes with a double energy sword. ent-BorgModuleL6C = L6C ROW cyborg module - .desc = A module that comes with a L6C. + .desc = A module that comes with a L6C. \ No newline at end of file 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/decoys.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/decoys.ftl index 8d8357da7db..da6779ef077 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/decoys.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/decoys.ftl @@ -1,6 +1,5 @@ -ent-BaseDecoy = { ent-['BaseItem', 'BaseFoldable'] } - - .desc = { ent-['BaseItem', 'BaseFoldable'].desc } +ent-BaseDecoy = { ent-BaseItem } + .desc = { ent-BaseItem.desc } ent-BalloonOperative = operative balloon .desc = Upon closer inspection, this Syndicate operative is actually a balloon. ent-BalloonAgent = agent balloon diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/handheld_mass_scanner.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/handheld_mass_scanner.ftl index 4e8339a8911..1e74f069b71 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/handheld_mass_scanner.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/handheld_mass_scanner.ftl @@ -1,3 +1,5 @@ +ent-HandHeldMassScanner = handheld mass scanner + .desc = A hand-held mass scanner. ent-HandHeldMassScannerEmpty = { ent-HandHeldMassScanner } .suffix = Empty .desc = { ent-HandHeldMassScanner.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/jammer.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/jammer.ftl index 8713d550956..4c822de1288 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/jammer.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/jammer.ftl @@ -1,2 +1,2 @@ ent-RadioJammer = radio jammer - .desc = This device will disrupt any nearby outgoing radio communication as well as suit sensors when activated. + .desc = This device will disrupt any nearby outgoing radio communication when activated. 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/cartridges/shotgun.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/shotgun.ftl index 9c3983ad331..6fcd2b5fb13 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/shotgun.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/shotgun.ftl @@ -15,6 +15,6 @@ ent-ShellShotgunPractice = shell (.50 practice) ent-ShellTranquilizer = shell (.50 tranquilizer) .desc = { ent-BaseShellShotgun.desc } ent-ShellShotgunImprovised = improvised shotgun shell - .desc = A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a barn. + .desc = A homemade shotgun shell that shoots painful metal shrapnel. The spread is so wide that it couldn't hit the broad side of a barn. ent-ShellShotgunUranium = uranium shotgun shell .desc = { ent-BaseShellShotgun.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 4be627fc894..6001551ef35 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 @@ -9,42 +9,42 @@ ent-BaseWeaponPowerCellSmall = { ent-BaseWeaponPowerCell } ent-WeaponLaserSvalinn = svalinn laser pistol .desc = A cheap and widely used laser pistol. ent-WeaponLaserGun = retro laser pistol - .desc = A civilian grade weapon using light amplified by the stimulated emission of radiation. + .desc = A weapon using light amplified by the stimulated emission of radiation. ent-WeaponMakeshiftLaser = makeshift laser pistol - .desc = Better pray it won't burn your hands off. At least it's legal. + .desc = Better pray it won't burn your hands off. ent-WeaponTeslaGun = tesla gun - .desc = The power of the primordial element of lightning in your hands. An experimental and illegal weapon. + .desc = The power of the primordial element of lightning in your hands. ent-WeaponLaserCarbine = laser rifle - .desc = A simple civilian grade laser carbine, the workhorse of many private security organizations. + .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. On the handle is a label that says 'for authorized use only.' + .desc = A state of the art energy pistol favoured as a sidearm by the NT operatives. ent-WeaponPulseCarbine = pulse carbine - .desc = A high tech energy carbine favoured by the NT-ERT operatives. On the handle is a label that says 'for authorized use only.' + .desc = A high tech energy carbine favoured by the NT-ERT operatives. ent-WeaponPulseRifle = pulse rifle - .desc = A weapon that is almost as infamous as its users. On the handle is a label that says 'for authorized use only.' + .desc = A weapon that is almost as infamous as its users. ent-WeaponLaserCannon = laser cannon - .desc = A heavy duty, high powered laser weapon. On the handle is a label that says 'for authorized use only.' + .desc = A heavy duty, high powered laser weapon. ent-WeaponParticleDecelerator = portable particle decelerator .desc = A portable particle decelerator capable of decomposing a tesla or singularity. ent-WeaponXrayCannon = x-ray cannon - .desc = An illegal and experimental weapon that uses concentrated x-ray energy against its target. + .desc = An experimental weapon that uses concentrated x-ray energy against its target. ent-WeaponDisabler = disabler - .desc = A civilian grade self-defense weapon that exhausts organic targets, weakening them until they collapse. + .desc = A self-defense weapon that exhausts organic targets, weakening them until they collapse. ent-WeaponDisablerSMG = disabler SMG - .desc = Advanced weapon that exhausts organic targets, weakening them until they collapse. On the handle is a label that says 'for authorized use only.' + .desc = Advanced weapon that exhausts organic targets, weakening them until they collapse. ent-WeaponDisablerPractice = practice disabler - .desc = A civilian-grade self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for firearm training. + .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. On the handle is a label that says 'for authorized use only.' + .desc = A low-capacity, energy-based stun gun used by security teams to subdue targets at range. ent-WeaponAntiqueLaser = antique laser pistol - .desc = This is a civilian grade antique laser pistol. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. + .desc = This is an antique laser pistol. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. ent-WeaponAdvancedLaser = advanced laser pistol - .desc = An experimental civilian grade high-energy laser pistol with a self-charging nuclear battery. + .desc = An experimental high-energy laser pistol with a self-charging nuclear battery. ent-WeaponPistolCHIMP = C.H.I.M.P. handcannon .desc = Just because it's a little C.H.I.M.P. doesn't mean it can't punch like an A.P.E. ent-WeaponPistolCHIMPUpgraded = experimental C.H.I.M.P. handcannon .desc = This C.H.I.M.P. seems to have a greater punch than is usual... ent-WeaponBehonkerLaser = eye of a behonker - .desc = The eye of a behonker, it fires a laser when squeezed. An illegal weapon often used by the cult of the Honkmother. + .desc = The eye of a behonker, it fires a laser when squeezed. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/hmgs/hmgs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/hmgs/hmgs.ftl index 2255108ff70..06c12b19b40 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/hmgs/hmgs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/hmgs/hmgs.ftl @@ -1,4 +1,4 @@ ent-BaseWeaponHeavyMachineGun = BaseWeaponHeavyMachineGun .desc = Spray and pray ent-WeaponMinigun = minigun - .desc = Vzzzzzt! Rahrahrahrah! Vrrrrr! Uses .10 rifle ammo. Illegal for use in the Frontier sector. + .desc = Vzzzzzt! Rahrahrahrah! Vrrrrr! Uses .10 rifle ammo. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/lmgs/lmgs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/lmgs/lmgs.ftl index 4df8d44dfb4..e3769e1c8fa 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/lmgs/lmgs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/lmgs/lmgs.ftl @@ -1,6 +1,6 @@ ent-BaseWeaponLightMachineGun = BaseWeaponLightMachineGun .desc = A rooty tooty point and shooty. ent-WeaponLightMachineGunL6 = L6 SAW - .desc = A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. Uses .30 rifle ammo. An illegal firearm often used by Syndicate agents. + .desc = A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. Uses .30 rifle ammo. ent-WeaponLightMachineGunL6C = L6C ROW - .desc = A L6 SAW for use by cyborgs. Creates .30 rifle ammo on the fly from an internal ammo fabricator, which slowly self-charges. An illegal firearm often used by Syndicate agents. + .desc = A L6 SAW for use by cyborgs. Creates .30 rifle ammo on the fly from an internal ammo fabricator, which slowly self-charges. 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 f0a01553fea..e8221a95739 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,16 +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. An illegal firearm often used by Syndicate agents. + .desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses .35 auto ammo. ent-WeaponPistolCobra = cobra - .desc = A rugged, robust operator handgun with inbuilt silencer. Uses .25 caseless ammo. An illegal firearm often used by Syndicate agents. + .desc = A rugged, robust operator handgun with inbuilt silencer. Uses .25 caseless ammo. ent-WeaponPistolMk58 = mk 58 - .desc = A cheap, civilian grade, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo. + .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. On the handle is a label that says 'for authorized use only.' + .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/projectiles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl index 8d841c5e3c7..787f7247b7f 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 @@ -46,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 diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl index 5e685dbbfe1..607cc1a518b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl @@ -1,15 +1,15 @@ ent-BaseWeaponRevolver = BaseWeaponRevolver .desc = A rooty tooty point and shooty. ent-WeaponRevolverDeckard = Deckard - .desc = A rare, civilian grade custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo. + .desc = A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo. ent-WeaponRevolverInspector = Inspector - .desc = A detective's best friend. Uses .45 magnum ammo. On the handle is a label that says 'for authorized use only.' + .desc = A detective's best friend. Uses .45 magnum ammo. ent-WeaponRevolverMateba = Mateba - .desc = The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. On the handle is a label that says 'for authorized use only.' + .desc = The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. ent-WeaponRevolverPython = Python - .desc = An illegal revolver favoured by Syndicate agents. Uses .45 magnum ammo. + .desc = A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo. ent-WeaponRevolverPythonAP = Python - .desc = An illegal revolver favoured by Syndicate agents. Uses .45 magnum ammo. + .desc = A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo. .suffix = armor-piercing ent-WeaponRevolverPirate = pirate revolver - .desc = An odd, illegal, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo. + .desc = An odd, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo. 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 a50fd290766..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 @@ -1,11 +1,11 @@ ent-BaseWeaponRifle = BaseWeaponRifle .desc = A rooty tooty point and shooty. ent-WeaponRifleAk = AKMS - .desc = An iconic weapon of war. Uses .30 rifle ammo. An illegal firearm often used by Syndicate agents. + .desc = An iconic weapon of war. Uses .30 rifle ammo. ent-WeaponRifleM90GrenadeLauncher = M-90gl - .desc = An older bullpup carbine model, with an attached underbarrel grenade launcher. Uses .20 rifle ammo. An illegal firearm often used by Syndicate agents. + .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. On the receiver is a label that says 'for authorized use only.' + .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 29945815f88..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 @@ -1,31 +1,31 @@ ent-BaseWeaponShotgun = BaseWeaponShotgun .desc = A rooty tooty point and shooty. ent-WeaponShotgunBulldog = Bulldog - .desc = It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells. An illegal firearm often used by Syndicate agents. + .desc = It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells. ent-WeaponShotgunDoubleBarreled = double-barreled shotgun - .desc = An immortal classic. A civilian grade shotgun. Uses .50 shotgun shells. + .desc = An immortal classic. Uses .50 shotgun shells. ent-WeaponShotgunDoubleBarreledRubber = double-barreled shotgun .desc = An immortal classic. Uses .50 shotgun shells. .suffix = Non-Lethal ent-WeaponShotgunEnforcer = Enforcer - .desc = A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells. On the receiver is a label that says 'for authorized use only.' + .desc = A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells. ent-WeaponShotgunEnforcerRubber = { ent-WeaponShotgunEnforcer } .suffix = Non-Lethal .desc = { ent-WeaponShotgunEnforcer.desc } ent-WeaponShotgunKammerer = Kammerer - .desc = When an old Remington design meets modern materials, this is the result. A civilian grade shotgun, favored by militia forces throughout many worlds. Uses .50 shotgun shells. + .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. A modified civilian grade shotgun. + .desc = Groovy! Uses .50 shotgun shells. ent-WeaponShotgunSawnEmpty = sawn-off shogun - .desc = Groovy! Uses .50 shotgun shells. A modified civilian grade shotgun. + .desc = Groovy! Uses .50 shotgun shells. .suffix = Empty ent-WeaponShotgunHandmade = handmade pistol - .desc = Looks unreliable, but legal. Uses .50 shotgun shells. + .desc = Looks unreliable. Uses .50 shotgun shells. ent-WeaponShotgunBlunderbuss = blunderbuss - .desc = Deadly at close range, an illegal shotgun often found at the side of a pirate. + .desc = Deadly at close range. .suffix = Pirate ent-WeaponShotgunImprovised = improvised shotgun - .desc = A shitty, but legal, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber. + .desc = A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber. ent-WeaponShotgunImprovisedLoaded = improvised shotgun .suffix = Loaded .desc = { ent-WeaponShotgunImprovised.desc } 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 63e9a0ad4d5..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 @@ -1,19 +1,19 @@ ent-BaseWeaponSubMachineGun = BaseSMG .desc = A rooty tooty point and shooty. ent-WeaponSubMachineGunAtreides = Atreides - .desc = Pla-ket-ket-ket-ket! Uses .35 auto ammo. An illegal firearm often used by Syndicate agents. + .desc = Pla-ket-ket-ket-ket! Uses .35 auto ammo. ent-WeaponSubMachineGunC20r = C-20r sub machine gun - .desc = An illegal firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo. + .desc = A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo. ent-WeaponSubMachineGunDrozd = Drozd - .desc = An excellent fully automatic Heavy SMG. An illegal firearm often used by Syndicate agents. + .desc = An excellent fully automatic Heavy SMG. ent-WeaponSubMachineGunVector = Vector - .desc = An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. An illegal firearm often used by Syndicate agents. + .desc = An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. .suffix = Deprecated use Drozd ent-WeaponSubMachineGunWt550 = WT550 - .desc = An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. On the receiver is a label that says 'for authorized use only.' + .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. An illegal firearm often used by Syndicate agents. + .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/guns/snipers/snipers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/snipers/snipers.ftl index f5085569382..3e46069f33b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/snipers/snipers.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/snipers/snipers.ftl @@ -1,10 +1,10 @@ ent-BaseWeaponSniper = BaseWeaponSniper .desc = A rooty tooty point and shooty. ent-WeaponSniperMosin = Kardashev-Mosin - .desc = A civilian grade weapon for hunting, or endless trench warfare. Uses .30 rifle ammo. + .desc = A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo. ent-WeaponSniperHristov = Hristov - .desc = A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo. On the receiver is a label that says 'for authorized use only.' + .desc = A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo. ent-Musket = musket .desc = This should've been in a museum long before you were born. Uses .60 anti-materiel ammo. ent-WeaponPistolFlintlock = flintlock pistol - .desc = A pirate's companion. Yarrr! Uses .60 anti-materiel ammo. An illegal weapon often used by pirates. + .desc = A pirate's companion. Yarrr! Uses .60 anti-materiel ammo. 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/knife.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/knife.ftl index 51999106b1c..bdfe742fc53 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/knife.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/knife.ftl @@ -10,11 +10,6 @@ ent-SurvivalKnife = survival knife .desc = Weapon of first and last resort for combatting space carp. ent-KukriKnife = kukri knife .desc = Professionals have standards. Be polite. Be efficient. Have a plan to kill everyone you meet. -ent-BladedFlatcapGrey = grey flatcap - .desc = Fashionable for both the working class and old man Jenkins. It has glass shards hidden in the brim. - .suffix = Bladed -ent-BladedFlatcapBrown = brown flatcap - .desc = Stupid clown! You made me look bad! It has glass shards hidden in the brim. ent-Shiv = shiv .desc = A crude weapon fashioned from a piece of cloth and a glass shard. ent-ReinforcedShiv = reinforced shiv @@ -23,5 +18,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/security.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/security.ftl index 0188378163b..dc924786cf2 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/security.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/security.ftl @@ -1,7 +1,7 @@ ent-Stunbaton = stun baton .desc = A stun baton for incapacitating people with. Actively harming with this is considered bad tone. ent-Truncheon = truncheon - .desc = A rigid, steel-studded baton, meant to harm. On the handle is a label that says 'for authorized use only.' + .desc = A rigid, steel-studded baton, meant to harm. ent-Flash = flash .desc = An ultrabright flashbulb with a trigger, which causes the victim to be dazed and lose their eyesight for a moment. Useless when burnt out. ent-SciFlash = flash 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 a3497dcac6d..19b93fd54eb 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 @@ -22,11 +22,5 @@ ent-HolyHandGrenade = holy hand grenade .desc = O Lord, bless this thy hand grenade, that with it thou mayst blow thine enemies to tiny bits, in thy mercy. ent-SmokeGrenade = smoke grenade .desc = A tactical grenade that releases a large, long-lasting cloud of smoke when used. -ent-CleanerGrenade = cleanade - .desc = Special grenade for janitors, releasing large cloud of space cleaner foam ent-TearGasGrenade = tear gas grenade .desc = A riot control tear gas grenade. Causes irritation, pain and makes you cry your eyes out. -ent-GrenadeDummy = trick grenade - .desc = All the grenade without any of the boom. -ent-SyndieTrickyBomb = syndicate trickybomb - .desc = A syndicate-manufactured explosive used to make an excellent distraction. 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..13ab4cf2924 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 = { "" } @@ -26,7 +24,5 @@ ent-BaseStationMagnet = { "" } .desc = { "" } ent-BaseStationSiliconLawCrewsimov = { "" } .desc = { "" } -ent-BaseStationNews = { "" } - .desc = { "" } ent-BaseStationAllEventsEligible = { "" } .desc = { "" } 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 e3c0075986f..fdbdf90c19f 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 @@ -1,11 +1,8 @@ ent-BaseStationNanotrasen = { "" } .desc = { "" } -ent-StandardNanotrasenStation = { ent-['BaseStation', 'BaseStationNews', 'BaseStationCargo', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationArrivals', 'BaseStationGateway', 'BaseStationShuttles', 'BaseStationCentcomm', 'BaseStationEvacuation', 'BaseStationAlertLevels', 'BaseStationMagnet', 'BaseStationExpeditions', 'BaseStationSiliconLawCrewsimov', 'BaseStationAllEventsEligible', 'BaseStationNanotrasen', 'BaseRandomStation'] } - - .desc = { ent-['BaseStation', 'BaseStationNews', 'BaseStationCargo', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationArrivals', 'BaseStationGateway', 'BaseStationShuttles', 'BaseStationCentcomm', 'BaseStationEvacuation', 'BaseStationAlertLevels', 'BaseStationMagnet', 'BaseStationExpeditions', 'BaseStationSiliconLawCrewsimov', 'BaseStationAllEventsEligible', 'BaseStationNanotrasen', 'BaseRandomStation'].desc } -ent-NanotrasenCentralCommand = { ent-['BaseStation', 'BaseStationAlertLevels', 'BaseStationNanotrasen'] } - - .desc = { ent-['BaseStation', 'BaseStationAlertLevels', 'BaseStationNanotrasen'].desc } -ent-StandardStationArena = { ent-['BaseStation', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationNanotrasen'] } - - .desc = { ent-['BaseStation', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationNanotrasen'].desc } \ No newline at end of file +ent-StandardNanotrasenStation = { ent-BaseStation } + .desc = { ent-BaseStation.desc } +ent-NanotrasenCentralCommand = { ent-BaseStation } + .desc = { ent-BaseStation.desc } +ent-StandardStationArena = { ent-BaseStation } + .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 0fa9c8e42e4..c254efea33a 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,5 +1,4 @@ ent-BaseStationSyndicate = { "" } .desc = { "" } -ent-StandardNukieOutpost = { ent-['BaseStation', 'BaseStationSyndicate'] } - - .desc = { ent-['BaseStation', 'BaseStationSyndicate'].desc } \ No newline at end of file +ent-StandardNukieOutpost = { ent-BaseStationSyndicate } + .desc = { ent-BaseStationSyndicate.desc } 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 1ecdfd66fcd..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,3 +1,2 @@ -ent-TestStation = { ent-['BaseStation', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationAlertLevels'] } - - .desc = { ent-['BaseStation', 'BaseStationJobsSpawning', 'BaseStationRecords', 'BaseStationAlertLevels'].desc } \ No newline at end of file +ent-TestStation = { ent-BaseStation } + .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/curtains.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl index 11db93d1afb..489e259ea51 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/decoration/curtains.ftl @@ -1,62 +1,5 @@ -ent-BaseCurtains = curtains - .desc = Hides what others shouldn't see. -ent-HospitalCurtains = { ent-BaseCurtains } +ent-HospitalCurtains = curtains .desc = Contains less than 1% mercury. - .suffix = Hospital ent-HospitalCurtainsOpen = { ent-HospitalCurtains } - .suffix = Open, Hospital + .suffix = Open .desc = { ent-HospitalCurtains.desc } -ent-CurtainsBlack = { ent-BaseCurtains } - .suffix = Fancy black - .desc = { ent-BaseCurtains.desc } -ent-CurtainsBlackOpen = { ent-CurtainsBlack } - .suffix = Open, Fancy black - .desc = { ent-CurtainsBlack.desc } -ent-CurtainsBlue = { ent-BaseCurtains } - .suffix = Fancy blue - .desc = { ent-BaseCurtains.desc } -ent-CurtainsBlueOpen = { ent-CurtainsBlue } - .suffix = Open, Fancy blue - .desc = { ent-CurtainsBlue.desc } -ent-CurtainsCyan = { ent-BaseCurtains } - .suffix = Fancy cyan - .desc = { ent-BaseCurtains.desc } -ent-CurtainsCyanOpen = { ent-CurtainsCyan } - .suffix = Open, Fancy cyan - .desc = { ent-CurtainsCyan.desc } -ent-CurtainsGreen = { ent-BaseCurtains } - .suffix = Fancy green - .desc = { ent-BaseCurtains.desc } -ent-CurtainsGreenOpen = { ent-CurtainsGreen } - .suffix = Open, Fancy green - .desc = { ent-CurtainsGreen.desc } -ent-CurtainsOrange = { ent-BaseCurtains } - .suffix = Fancy orange - .desc = { ent-BaseCurtains.desc } -ent-CurtainsOrangeOpen = { ent-CurtainsOrange } - .suffix = Open, Fancy orange - .desc = { ent-CurtainsOrange.desc } -ent-CurtainsPink = { ent-BaseCurtains } - .suffix = Fancy pink - .desc = { ent-BaseCurtains.desc } -ent-CurtainsPinkOpen = { ent-CurtainsPink } - .suffix = Open, Fancy pink - .desc = { ent-CurtainsPink.desc } -ent-CurtainsPurple = { ent-BaseCurtains } - .suffix = Fancy purple - .desc = { ent-BaseCurtains.desc } -ent-CurtainsPurpleOpen = { ent-CurtainsPurple } - .suffix = Open, Fancy purple - .desc = { ent-CurtainsPurple.desc } -ent-CurtainsRed = { ent-BaseCurtains } - .suffix = Fancy red - .desc = { ent-BaseCurtains.desc } -ent-CurtainsRedOpen = { ent-CurtainsRed } - .suffix = Open, Fancy red - .desc = { ent-CurtainsRed.desc } -ent-CurtainsWhite = { ent-BaseCurtains } - .suffix = Fancy white - .desc = { ent-BaseCurtains.desc } -ent-CurtainsWhiteOpen = { ent-CurtainsWhite } - .suffix = Open, Fancy white - .desc = { ent-CurtainsWhite.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl index d79121a4f39..12eccdd97c0 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,30 +1,30 @@ 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-Airlock } .suffix = Chapel, Locked - .desc = { ent-AirlockServiceLocked.desc } -ent-AirlockJanitorLocked = { ent-AirlockServiceLocked } + .desc = { ent-Airlock.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 } -ent-AirlockServiceCaptainLocked = { ent-AirlockCommandLocked } + .desc = { ent-Airlock.desc } +ent-AirlockServiceCaptainLocked = { ent-Airlock } .suffix = Captain, Locked - .desc = { ent-AirlockCommandLocked.desc } + .desc = { ent-Airlock.desc } ent-AirlockExternalLocked = { ent-AirlockExternal } .suffix = External, Locked .desc = { ent-AirlockExternal.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 } @@ -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-AirlockGlass } .suffix = Chapel, Locked - .desc = { ent-AirlockServiceGlassLocked.desc } + .desc = { ent-AirlockGlass.desc } ent-AirlockEngineeringGlassLocked = { ent-AirlockEngineeringGlass } .suffix = Engineering, Locked .desc = { ent-AirlockEngineeringGlass.desc } @@ -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 .desc = { ent-AirlockMaint.desc } -ent-AirlockMaintRnDMedLocked = { ent-AirlockMaintRnDLocked } +ent-AirlockMaintRnDMedLocked = { ent-AirlockMaint } .suffix = Medical/Science, Locked - .desc = { ent-AirlockMaintRnDLocked.desc } + .desc = { ent-AirlockMaint.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 } @@ -391,6 +388,3 @@ ent-HighSecCaptainLocked = { ent-HighSecDoor } ent-HighSecArmoryLocked = { ent-HighSecDoor } .suffix = Armory, Locked .desc = { ent-HighSecDoor.desc } -ent-AirlockHatchSyndicate = { ent-AirlockHatch } - .suffix = Syndicate, Locked - .desc = { ent-AirlockHatch.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl index 8a74f6731c0..23386679bb2 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 @@ -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 } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl index 79006936b3c..6f504d1ae74 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/assembly.ftl @@ -10,12 +10,6 @@ ent-AirlockAssemblyCargo = { ent-AirlockAssembly } ent-AirlockAssemblyCargoGlass = { ent-AirlockAssembly } .suffix = Cargo, Glass .desc = { ent-AirlockAssembly.desc } -ent-PinionAirlockAssembly = airlock assembly - .suffix = Pinion, Clockwork - .desc = { ent-AirlockAssembly.desc } -ent-PinionAirlockAssemblyGlass = { ent-PinionAirlockAssembly } - .suffix = Pinion, Clockwork, Glass - .desc = { ent-PinionAirlockAssembly.desc } ent-AirlockAssemblyCommand = { ent-AirlockAssembly } .suffix = Command .desc = { ent-AirlockAssembly.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/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/assembly.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl index 32688b7b8b0..dd66375a0a2 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/assembly.ftl @@ -2,13 +2,3 @@ ent-WindoorAssembly = windoor assembly .desc = It opens, it closes, and you can see through it! ent-WindoorAssemblySecure = secure windoor assembly .desc = It opens, it closes, and you can see through it! This one looks tough. -ent-WindoorAssemblyClockwork = clockwork windoor assembly - .desc = It opens, it closes, and you can see through it! This one looks tough. -ent-WindoorAssemblyPlasma = Plasma windoor assembly - .desc = It opens, it closes, and you can see through it! This one looks purp-, no, pink. Wait... -ent-WindoorAssemblySecurePlasma = Secure Plasma windoor assembly - .desc = It opens, it closes, and you can see through it! This one looks strong and pin-, no, purple. Hold on... -ent-WindoorAssemblyUranium = Uranium windoor assembly - .desc = It opens, it closes, and you can see through it! This one looks sickly green... -ent-WindoorAssemblySecureUranium = Secure Uranium windoor assembly - .desc = It opens, it closes, and you can see through it! This one looks strong and radioactive-lime-green! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/base_structurewindoors.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/base_structurewindoors.ftl index 8ac8ffb04d7..2f603687029 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/base_structurewindoors.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/base_structurewindoors.ftl @@ -2,11 +2,3 @@ ent-BaseWindoor = { ent-BaseStructure } .desc = { ent-BaseStructure.desc } ent-BaseSecureWindoor = { ent-BaseWindoor } .desc = { ent-BaseWindoor.desc } -ent-BasePlasmaWindoor = { ent-BaseWindoor } - .desc = { ent-BaseWindoor.desc } -ent-BaseSecurePlasmaWindoor = { ent-BaseWindoor } - .desc = { ent-BaseWindoor.desc } -ent-BaseUraniumWindoor = { ent-BaseWindoor } - .desc = { ent-BaseWindoor.desc } -ent-BaseSecureUraniumWindoor = { ent-BaseWindoor } - .desc = { ent-BaseWindoor.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl index 80dbc08e11f..506f57542be 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 @@ -1,17 +1,7 @@ -ent-Windoor = Windoor +ent-Windoor = windoor .desc = It's a window and a sliding door. Wow! -ent-WindoorSecure = Secure Windoor +ent-WindoorSecure = secure windoor .desc = It's a sturdy window and a sliding door. Wow! -ent-WindoorClockwork = clockwork windoor - .desc = It's a sturdy window and a sliding door. Wow! -ent-WindoorPlasma = Plasma Windoor - .desc = It's a pink window *and* a sliding door. Amazing! -ent-WindoorSecurePlasma = Secure Plasma Windoor - .desc = It's a sturdy purple window *and* a sliding door. Spectacular! -ent-WindoorUranium = Uranium Windoor - .desc = It's a window and a sliding door. Huh? Oh, and it's green! -ent-WindoorSecureUranium = Secure Uranium Windoor - .desc = It's a sturdy window and a sliding door. It's so neon green, it might even taste like limes! ent-WindoorBarLocked = { ent-Windoor } .suffix = Bar, Locked .desc = { ent-Windoor.desc } @@ -30,9 +20,6 @@ ent-WindoorHydroponicsLocked = { ent-Windoor } ent-WindoorJanitorLocked = { ent-Windoor } .suffix = Janitor, Locked .desc = { ent-Windoor.desc } -ent-PlasmaWindoorJanitorLocked = { ent-WindoorPlasma } - .suffix = Janitor, Locked, Plasma - .desc = { ent-WindoorPlasma.desc } ent-WindoorKitchenLocked = { ent-Windoor } .suffix = Kitchen, Locked .desc = { ent-Windoor.desc } @@ -66,18 +53,9 @@ ent-WindoorSecureChapelLocked = { ent-WindoorSecure } ent-WindoorSecureChemistryLocked = { ent-WindoorSecure } .suffix = Chemistry, Locked .desc = { ent-WindoorSecure.desc } -ent-PlasmaWindoorSecureChemistryLocked = { ent-WindoorSecurePlasma } - .suffix = Chemistry, Locked, Plasma - .desc = { ent-WindoorSecurePlasma.desc } ent-WindoorSecureCentralCommandLocked = { ent-WindoorSecure } .suffix = Central Command, Locked .desc = { ent-WindoorSecure.desc } -ent-PlasmaWindoorSecureCentralCommandLocked = { ent-WindoorSecurePlasma } - .suffix = Central Command, Locked, Plasma - .desc = { ent-WindoorSecurePlasma.desc } -ent-UraniumWindoorSecureCentralCommandLocked = { ent-WindoorSecureUranium } - .suffix = Central Command, Locked, Uranium - .desc = { ent-WindoorSecureUranium.desc } ent-WindoorSecureCommandLocked = { ent-WindoorSecure } .suffix = Command, Locked .desc = { ent-WindoorSecure.desc } @@ -87,21 +65,12 @@ ent-WindoorSecureDetectiveLocked = { ent-WindoorSecure } ent-WindoorSecureEngineeringLocked = { ent-WindoorSecure } .suffix = Engineering, Locked .desc = { ent-WindoorSecure.desc } -ent-PlasmaWindoorSecureEngineeringLocked = { ent-WindoorSecurePlasma } - .suffix = Engineering, Locked, Plasma - .desc = { ent-WindoorSecurePlasma.desc } -ent-UraniumWindoorSecureEngineeringLocked = { ent-WindoorSecureUranium } - .suffix = Engineering, Locked, Uranium - .desc = { ent-WindoorSecureUranium.desc } ent-WindoorSecureExternalLocked = { ent-WindoorSecure } .suffix = External, Locked .desc = { ent-WindoorSecure.desc } ent-WindoorSecureJanitorLocked = { ent-WindoorSecure } .suffix = Janitor, Locked .desc = { ent-WindoorSecure.desc } -ent-PlasmaWindoorSecureJanitorLocked = { ent-WindoorSecurePlasma } - .suffix = Janitor, Locked, Plasma - .desc = { ent-WindoorSecurePlasma.desc } ent-WindoorSecureKitchenLocked = { ent-WindoorSecure } .suffix = Kitchen, Locked .desc = { ent-WindoorSecure.desc } @@ -120,9 +89,6 @@ ent-WindoorSecureSecurityLocked = { ent-WindoorSecure } ent-WindoorSecureScienceLocked = { ent-WindoorSecure } .suffix = Science, Locked .desc = { ent-WindoorSecure.desc } -ent-PlasmaWindoorSecureScienceLocked = { ent-WindoorSecurePlasma } - .suffix = Science, Locked, Plasma - .desc = { ent-WindoorSecurePlasma.desc } ent-WindoorSecureServiceLocked = { ent-WindoorSecure } .suffix = Service, Locked .desc = { ent-WindoorSecure.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/carpets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/carpets.ftl index 071234044f7..4cc5f36a43c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/carpets.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/carpets.ftl @@ -1,34 +1,20 @@ -ent-CarpetBase = carpet +ent-CarpetBase = { ent-BaseStructure } .desc = Fancy walking surface. -ent-Carpet = { ent-CarpetBase } - .suffix = Red +ent-Carpet = red carpet .desc = { ent-CarpetBase.desc } -ent-CarpetBlack = { ent-CarpetBase } - .suffix = Black +ent-CarpetBlack = black carpet .desc = { ent-CarpetBase.desc } -ent-CarpetPink = { ent-CarpetBase } - .suffix = Pink +ent-CarpetPink = pink carpet .desc = { ent-CarpetBase.desc } -ent-CarpetBlue = { ent-CarpetBase } - .suffix = Blue +ent-CarpetBlue = blue carpet .desc = { ent-CarpetBase.desc } -ent-CarpetGreen = { ent-CarpetBase } - .suffix = Green +ent-CarpetGreen = green carpet .desc = { ent-CarpetBase.desc } -ent-CarpetOrange = { ent-CarpetBase } - .suffix = Orange +ent-CarpetOrange = orange carpet .desc = { ent-CarpetBase.desc } -ent-CarpetSBlue = { ent-CarpetBase } - .suffix = Sky Blue +ent-CarpetSBlue = skyblue carpet .desc = { ent-CarpetBase.desc } -ent-CarpetPurple = { ent-CarpetBase } - .suffix = Purple - .desc = { ent-CarpetBase.desc } -ent-CarpetCyan = { ent-CarpetBase } - .suffix = Cyan - .desc = { ent-CarpetBase.desc } -ent-CarpetWhite = { ent-CarpetBase } - .suffix = White +ent-CarpetPurple = purple carpet .desc = { ent-CarpetBase.desc } ent-CarpetChapel = chapel's carpet .desc = { ent-BaseStructure.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl index e301b8ea45a..53a70b965c6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/chairs.ftl @@ -1,26 +1,16 @@ ent-SeatBase = chair .desc = You sit in this. Either by will or force. -ent-UnanchoredChairBase = chair - .desc = { ent-SeatBase.desc } -ent-ChairBase = chair - .desc = { ent-UnanchoredChairBase.desc } -ent-OfficeChairBase = chair - .desc = { ent-UnanchoredChairBase.desc } -ent-StoolBase = stool - .desc = { ent-OfficeChairBase.desc } ent-Chair = chair - .desc = { ent-ChairBase.desc } + .desc = { ent-SeatBase.desc } ent-ChairGreyscale = chair .suffix = White .desc = { ent-Chair.desc } ent-Stool = stool .desc = Apply butt. ent-StoolBar = bar stool - .desc = { ent-StoolBase.desc } -ent-ChairBrass = brass chair - .desc = { ent-StoolBase.desc } + .desc = { ent-SeatBase.desc } ent-ChairOfficeLight = white office chair - .desc = { ent-OfficeChairBase.desc } + .desc = { ent-SeatBase.desc } ent-ChairOfficeDark = dark office chair .desc = { ent-ChairOfficeLight.desc } ent-ComfyChair = comfy chair @@ -28,7 +18,7 @@ ent-ComfyChair = comfy chair ent-ChairPilotSeat = pilot seat .desc = The pilot seat of a prestigious ship. ent-ChairWood = wooden chair - .desc = { ent-UnanchoredChairBase.desc } + .desc = { ent-SeatBase.desc } ent-ChairRitual = ritual chair .desc = Looks uncomfortable. ent-ChairMeat = meat chair @@ -44,5 +34,3 @@ ent-ChairFoldingSpawnFolded = { ent-ChairFolding } .desc = { ent-ChairFolding.desc } ent-SteelBench = steel bench .desc = A long chair made for a metro. Really standard design. -ent-WoodenBench = wooden bench - .desc = Did you get a splinter? Well, at least it’s eco friendly. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl index 62e1a17186a..13493bad67b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/tables/tables.ftl @@ -14,8 +14,6 @@ ent-TableReinforcedGlass = reinforced glass table .desc = A square piece of glass, standing on four metal legs. Extra robust. ent-TablePlasmaGlass = plasma glass table .desc = A square piece of plasma glass, standing on four metal legs. Pretty! -ent-TableBrass = brass table - .desc = A shiny, corrosion resistant brass table. Steampunk! ent-TableWood = wood table .desc = Do not apply fire to this. Rumour says it burns easily. ent-TableCarpet = gambling table @@ -24,35 +22,6 @@ ent-TableStone = stone table .desc = Literally the sturdiest thing you have ever seen. ent-TableWeb = web table .desc = Really smooth and surprisingly durable. -ent-TableFancyBase = fancy table - .desc = Expensive and rich. -ent-TableFancyBlue = { ent-TableFancyBase } - .suffix = Blue - .desc = { ent-TableFancyBase.desc } -ent-TableFancyCyan = { ent-TableFancyBase } - .suffix = Cyan - .desc = { ent-TableFancyBase.desc } -ent-TableFancyBlack = { ent-TableFancyBase } - .suffix = Black - .desc = { ent-TableFancyBase.desc } -ent-TableFancyRed = { ent-TableFancyBase } - .suffix = Red - .desc = { ent-TableFancyBase.desc } -ent-TableFancyPurple = { ent-TableFancyBase } - .suffix = Purple - .desc = { ent-TableFancyBase.desc } -ent-TableFancyPink = { ent-TableFancyBase } - .suffix = Pink - .desc = { ent-TableFancyBase.desc } -ent-TableFancyGreen = { ent-TableFancyBase } - .suffix = Green - .desc = { ent-TableFancyBase.desc } -ent-TableFancyOrange = { ent-TableFancyBase } - .suffix = Orange - .desc = { ent-TableFancyBase.desc } -ent-TableFancyWhite = { ent-TableFancyBase } - .suffix = White - .desc = { ent-TableFancyBase.desc } ent-TableDebug = table .desc = PUT ON THEM CODERSOCKS!! .suffix = DEBUG 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 71241f2630a..3573700e69a 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 @@ -30,9 +30,6 @@ ent-SmallLight = small light ent-PoweredSmallLightEmpty = small light .desc = A light fixture. Draws power and produces light when equipped with a light bulb. .suffix = Empty -ent-PoweredLEDSmallLight = { ent-PoweredSmallLightEmpty } - .suffix = LED - .desc = { ent-PoweredSmallLightEmpty.desc } ent-PoweredSmallLight = { ent-PoweredSmallLightEmpty } .desc = { ent-PoweredSmallLightEmpty.desc } ent-EmergencyLight = emergency light diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl index 48d6fe24073..eadfe948e08 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/ground_lighting.ftl @@ -1,3 +1,5 @@ +ent-BaseLightStructure = { ent-BaseStructure } + .desc = { ent-BaseStructure.desc } ent-LightPostSmall = post light .desc = An always powered light. .suffix = Always Powered @@ -6,6 +8,3 @@ ent-PoweredLightPostSmallEmpty = post light .suffix = Empty ent-PoweredLightPostSmall = post light .desc = A light fixture. Draws power and produces light when equipped with a light tube. -ent-PoweredLEDLightPostSmall = post light - .desc = A light fixture. Draws power and produces light when equipped with a light tube. - .suffix = LED diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/strobe_lighting.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/strobe_lighting.ftl deleted file mode 100644 index 37287a2d03a..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting/strobe_lighting.ftl +++ /dev/null @@ -1,15 +0,0 @@ -ent-AlwaysPoweredStrobeLight = strobe - .desc = UH?! Sorry, all I can hear is WEE-OOO-WEE-OOO! - .suffix = Always powered -ent-PoweredStrobeLightEmpty = strobe - .desc = UH?! Sorry, all I can hear is WEE-OOO-WEE-OOO! - .suffix = Empty -ent-PoweredStrobeLightPolice = { ent-PoweredStrobeLightEmpty } - .suffix = Empty, police - .desc = { ent-PoweredStrobeLightEmpty.desc } -ent-PoweredStrobeLightSiren = { ent-PoweredStrobeLightEmpty } - .suffix = Empty, siren - .desc = { ent-PoweredStrobeLightEmpty.desc } -ent-PoweredStrobeLightEpsilon = { ent-PoweredStrobeLightEmpty } - .suffix = Empty, epsilon - .desc = { ent-PoweredStrobeLightEmpty.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/bombs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/bombs.ftl index d60f5b425b2..4467506500d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/bombs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/bombs.ftl @@ -4,9 +4,6 @@ ent-TrainingBomb = training bomb .desc = A bomb for dummies, manual not included. ent-SyndicateBomb = syndicate bomb .desc = A bomb for Syndicate operatives and agents alike. The real deal, no more training, get to it! -ent-SyndicateBombFake = { ent-SyndicateBomb } - .suffix = fake - .desc = { ent-SyndicateBomb.desc } ent-DebugHardBomb = debug bomb .desc = Holy shit this is gonna explode .suffix = DEBUG 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 58e8342c3d5..f124a1b87ba 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 @@ -61,7 +61,7 @@ ent-ComputerSurveillanceWirelessCameraMonitor = wireless camera monitor .desc = A wireless surveillance camera monitor. You're watching them. Maybe. ent-ComputerPalletConsole = cargo sale computer .desc = Used to sell goods loaded onto cargo pallets -ent-ComputerMassMedia = news manager console +ent-ComputerMassMedia = mass-media console .desc = Write your message to the world! ent-ComputerSensorMonitoring = sensor monitoring computer .desc = A flexible console for monitoring all kinds of sensors. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/hotplate.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/hotplate.ftl index b17d802d9ab..949a45f68d2 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/hotplate.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/hotplate.ftl @@ -1,5 +1,4 @@ -ent-BaseHeaterMachine = { ent-['BaseMachinePowered', 'ConstructibleMachine'] } - - .desc = { ent-['BaseMachinePowered', 'ConstructibleMachine'].desc } +ent-BaseHeaterMachine = { ent-BaseMachinePowered } + .desc = { ent-BaseMachinePowered.desc } ent-ChemistryHotplate = hotplate - .desc = The descendent of the microwaves, our newest invention in beaker heating technology: the hotplate! + .desc = The descendent of the microwaves, our newest invention in beaker heating technology: the hotplate! \ No newline at end of file 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 161f9a5e5b6..a50044a5b72 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,6 +1,5 @@ ent-BaseLathe = lathe - - .desc = { ent-['BaseMachinePowered', 'ConstructibleMachine'].desc } + .desc = { ent-ConstructibleMachine.desc } ent-Autolathe = autolathe .desc = It produces items using metal and glass. ent-AutolatheHyperConvection = hyper convection autolathe diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/medical/chemistry_machines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/medical/chemistry_machines.ftl index 882c7de072f..468cab28e7e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/medical/chemistry_machines.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/medical/chemistry_machines.ftl @@ -1,6 +1,5 @@ -ent-BaseTabletopChemicalMachine = { ent-['BaseMachinePowered', 'ConstructibleMachine'] } - - .desc = { ent-['BaseMachinePowered', 'ConstructibleMachine'].desc } +ent-BaseTabletopChemicalMachine = { ent-BaseMachinePowered } + .desc = { ent-BaseMachinePowered.desc } ent-MachineElectrolysisUnit = electrolysis unit .desc = The latest in medicinal electrocution technology. ent-MachineCentrifuge = tabletop centrifuge diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/nuke.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/nuke.ftl deleted file mode 100644 index 1968816c7bc..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/nuke.ftl +++ /dev/null @@ -1,8 +0,0 @@ -ent-NuclearBomb = nuclear fission explosive - .desc = You probably shouldn't stick around to see if this is armed. -ent-NuclearBombUnanchored = { ent-NuclearBomb } - .suffix = unanchored - .desc = { ent-NuclearBomb.desc } -ent-NuclearBombKeg = nuclear fission explosive - .desc = You probably shouldn't stick around to see if this is armed. It has a tap on the side. - .suffix = keg 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/vending_machines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vending_machines.ftl index cd8a4a0d849..98711e23080 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 @@ -89,7 +89,7 @@ ent-VendingMachineGames = Good Clean Fun ent-VendingMachineChang = Mr. Chang .desc = A self-serving Chinese food machine, for all your Chinese food needs. ent-VendingMachineSalvage = Salvage Vendor - .desc = A dwarf's best friend! + .desc = A dwarves best friend! ent-VendingMachineDonut = Monkin' Donuts .desc = A donut vendor provided by Robust Industries, LLC. ent-VendingMachineWallmount = vending machine diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/portable.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/portable.ftl index 0c27158410e..55ee5629200 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/portable.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/portable.ftl @@ -1,11 +1,2 @@ ent-PortableScrubber = portable scrubber .desc = It scrubs, portably! -ent-SpaceHeater = space heater - .desc = A bluespace technology device that alters local temperature. Commonly referred to as a "Space Heater". - .suffix = Unanchored -ent-SpaceHeaterAnchored = { ent-SpaceHeater } - .suffix = Anchored - .desc = { ent-SpaceHeater.desc } -ent-SpaceHeaterEnabled = { ent-SpaceHeaterAnchored } - .suffix = Anchored, Enabled - .desc = { ent-SpaceHeaterAnchored.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/unary.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/unary.ftl index 0c1af3e3036..4c903c42722 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/unary.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/piping/atmospherics/unary.ftl @@ -9,8 +9,7 @@ ent-GasVentScrubber = air scrubber ent-GasOutletInjector = air injector .desc = Has a valve and pump attached to it. ent-BaseGasThermoMachine = thermomachine - - .desc = { ent-['BaseMachinePowered', 'ConstructibleMachine'].desc } + .desc = { ent-ConstructibleMachine.desc } ent-GasThermoMachineFreezer = freezer .desc = Cools gas in connected pipes. ent-GasThermoMachineFreezerEnabled = { ent-GasThermoMachineFreezer } 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 15bdef40b18..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 @@ -6,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/power/chargers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/chargers.ftl index be938f63073..eea3562f151 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/chargers.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/chargers.ftl @@ -1,13 +1,11 @@ -ent-BaseRecharger = { ent-['BaseMachinePowered', 'ConstructibleMachine'] } - - .desc = { ent-['BaseMachinePowered', 'ConstructibleMachine'].desc } +ent-BaseRecharger = { ent-BaseMachinePowered } + .desc = { ent-BaseMachinePowered.desc } ent-BaseItemRecharger = { ent-BaseRecharger } .desc = { ent-BaseRecharger.desc } ent-PowerCellRecharger = cell recharger .desc = { ent-BaseItemRecharger.desc } ent-PowerCageRecharger = cage recharger - - .desc = { ent-['BaseItemRecharger', 'ConstructibleMachine'].desc } + .desc = { ent-BaseItemRecharger.desc } ent-WeaponCapacitorRecharger = recharger .desc = { ent-BaseItemRecharger.desc } ent-TurboItemRecharger = turbo recharger diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/generators.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/generators.ftl index f23b03b9d2e..cdd0c71ea18 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/generators.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/generators.ftl @@ -7,10 +7,9 @@ ent-BaseGeneratorWallmountFrame = wallmount generator frame ent-GeneratorBasic = { ent-BaseGenerator } .suffix = Basic, 3kW .desc = { ent-BaseGenerator.desc } -ent-GeneratorBasic15kW = { ent-['BaseStructureDisableToolUse', 'BaseGenerator'] } - +ent-GeneratorBasic15kW = { ent-BaseGenerator } .suffix = Basic, 15kW, Anchored - .desc = { ent-['BaseStructureDisableToolUse', 'BaseGenerator'].desc } + .desc = { ent-BaseGenerator.desc } ent-GeneratorWallmountBasic = { ent-BaseGeneratorWallmount } .suffix = Basic, 3kW .desc = { ent-BaseGeneratorWallmount.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/portable_generator.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/portable_generator.ftl index 6eaf66f03ea..5c8106c64d2 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/portable_generator.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/portable_generator.ftl @@ -1,6 +1,5 @@ -ent-PortableGeneratorBase = { ent-['BaseMachine', 'ConstructibleMachine', 'StructureWheeled'] } - - .desc = { ent-['BaseMachine', 'ConstructibleMachine', 'StructureWheeled'].desc } +ent-PortableGeneratorBase = { ent-BaseMachine } + .desc = { ent-BaseMachine.desc } ent-PortableGeneratorSwitchableBase = { ent-PortableGeneratorBase } .desc = { ent-PortableGeneratorBase.desc } ent-PortableGeneratorPacman = P.A.C.M.A.N.-type portable generator diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/shuttles/thrusters.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/shuttles/thrusters.ftl index fd97cd983c1..79908bf787a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/shuttles/thrusters.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/shuttles/thrusters.ftl @@ -1,8 +1,7 @@ ent-BaseThruster = thruster .desc = A thruster that allows a shuttle to move. ent-Thruster = thruster - - .desc = { ent-['BaseThruster', 'ConstructibleMachine'].desc } + .desc = { ent-BaseThruster.desc } ent-ThrusterUnanchored = { ent-Thruster } .suffix = Unanchored .desc = { ent-Thruster.desc } 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 b0fa05fccf9..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 @@ -27,10 +27,9 @@ ent-AnomalyCoreElectricity = { ent-BaseAnomalyCore } ent-AnomalyCoreFlora = { ent-BaseAnomalyCore } .suffix = Flora .desc = { ent-BaseAnomalyCore.desc } -ent-AnomalyCoreShadow = { ent-['BaseAnomalyCore', 'BaseShadow'] } - +ent-AnomalyCoreShadow = { ent-BaseAnomalyCore } .suffix = Shadow - .desc = { ent-['BaseAnomalyCore', 'BaseShadow'].desc } + .desc = { ent-BaseAnomalyCore.desc } ent-BaseAnomalyInertCore = { ent-BaseAnomalyCore } .desc = { ent-BaseAnomalyCore.desc } ent-AnomalyCorePyroclasticInert = { ent-BaseAnomalyInertCore } @@ -60,7 +59,6 @@ ent-AnomalyCoreElectricityInert = { ent-BaseAnomalyInertCore } ent-AnomalyCoreFloraInert = { ent-BaseAnomalyInertCore } .suffix = Flora, Inert .desc = { ent-BaseAnomalyInertCore.desc } -ent-AnomalyCoreShadowInert = { ent-['BaseAnomalyInertCore', 'BaseShadow'] } - +ent-AnomalyCoreShadowInert = { ent-BaseAnomalyInertCore } .suffix = Shadow, Inert - .desc = { ent-['BaseAnomalyInertCore', 'BaseShadow'].desc } \ No newline at end of file + .desc = { ent-BaseAnomalyInertCore.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/janitor/drain.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/janitor/drain.ftl deleted file mode 100644 index e775fbcd086..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/janitor/drain.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-FloorDrain = drain - .desc = Drains puddles around it. Useful for dumping mop buckets or keeping certain rooms clean. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/janitor/janicart.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/janitor/janicart.ftl deleted file mode 100644 index 785a94d510a..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/janitor/janicart.ftl +++ /dev/null @@ -1,7 +0,0 @@ -ent-MopBucket = mop bucket - .desc = Holds water and the tears of the janitor. -ent-MopBucketFull = mop bucket - .suffix = full - .desc = { ent-MopBucket.desc } -ent-JanitorialTrolley = janitorial trolley - .desc = This is the alpha and omega of sanitation. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/stairs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/stairs.ftl index fd4b40a342a..09c55f44f65 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/stairs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/stairs.ftl @@ -1,24 +1,18 @@ ent-Stairs = stairs .desc = The greatest invention since rocket-propelled grenades. - .suffix = Steel + .suffix = steel ent-StairStage = { ent-Stairs } - .suffix = Steel, stage + .suffix = steel, stage .desc = { ent-Stairs.desc } ent-StairWhite = { ent-Stairs } - .suffix = White + .suffix = white .desc = { ent-Stairs.desc } ent-StairStageWhite = { ent-Stairs } - .suffix = White, stage + .suffix = white, stage .desc = { ent-Stairs.desc } ent-StairDark = { ent-Stairs } - .suffix = Dark + .suffix = dark .desc = { ent-Stairs.desc } ent-StairStageDark = { ent-Stairs } - .suffix = Dark, stage - .desc = { ent-Stairs.desc } -ent-StairWood = { ent-Stairs } - .suffix = Wood - .desc = { ent-Stairs.desc } -ent-StairStageWood = { ent-Stairs } - .suffix = Wood, stage + .suffix = dark, stage .desc = { ent-Stairs.desc } 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 6ff2ccd0917..95fd210c246 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 @@ -1,15 +1,13 @@ 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 .desc = { ent-LockerBaseSecure.desc } ent-LockerSalvageSpecialist = salvage specialist's equipment .desc = Nevermind the pickaxe. ent-LockerCaptain = captain's locker .desc = { ent-LockerBaseSecure.desc } -ent-LockerHeadOfPersonnel = head of personnel's locker - .desc = { ent-LockerBaseSecure.desc } +ent-LockerHeadOfPersonnel = station representative's locker + .desc = { ent-LockerBaseSecure.desc } ent-LockerChiefEngineer = chief engineer's locker .desc = { ent-LockerBaseSecure.desc } ent-LockerElectricalSupplies = electrical supplies locker @@ -43,11 +41,9 @@ ent-LockerResearchDirector = research director's locker ent-LockerScientist = scientist's locker .desc = { ent-LockerBase.desc } ent-LockerHeadOfSecurity = sheriff's locker - - .desc = { ent-['BaseStructureIndestructible', 'BaseStructureLockImmuneToEmag', 'BaseStructureAccessReaderImmuneToEmag', 'BaseStructureDisableToolUse', 'BaseStructureUnanchorable', 'LockerBaseSecure'].desc } + .desc = { ent-LockerBaseSecure.desc } ent-LockerWarden = bailiff's locker - - .desc = { ent-['BaseStructureIndestructible', 'BaseStructureLockImmuneToEmag', 'BaseStructureAccessReaderImmuneToEmag', 'BaseStructureDisableToolUse', 'BaseStructureUnanchorable', 'LockerBaseSecure'].desc } + .desc = { ent-LockerBaseSecure.desc } ent-LockerBrigmedic = brigmedic's locker .desc = { ent-LockerBaseSecure.desc } ent-LockerSecurity = deputy's locker diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/base_structurecrates.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/base_structurecrates.ftl index 6d4007e51ce..91ee923629e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/base_structurecrates.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/crates/base_structurecrates.ftl @@ -3,5 +3,4 @@ ent-CrateGeneric = crate ent-CrateBaseWeldable = { ent-CrateGeneric } .desc = { ent-CrateGeneric.desc } ent-CrateBaseSecure = { ent-CrateBaseWeldable } - .suffix = Secure .desc = { ent-CrateBaseWeldable.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 7377d0b6467..3b94e1ff590 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 @@ -42,9 +42,6 @@ ent-CrateHydroSecure = secure hydroponics crate .desc = { ent-CrateBaseSecure.desc } ent-CrateWeaponSecure = secure weapon crate .desc = { ent-CrateBaseSecure.desc } -ent-CrateContrabandStorageSecure = contraband storage crate - .desc = An armory access locked crate for storing contraband confiscated from suspects or prisoners. - .suffix = Armory, Secure ent-CrateCommandSecure = command crate .desc = { ent-CrateBaseSecure.desc } ent-CrateLivestock = livestock crate @@ -67,8 +64,7 @@ ent-CrateStoneGrave = grave ent-CrateSyndicate = Syndicate crate .desc = A dark steel crate with red bands and a letter S embossed on the front. ent-CrateTrashCart = trash cart - - .desc = { ent-['StructureWheeled', 'CrateBaseWeldable'].desc } + .desc = { ent-CrateBaseWeldable.desc } ent-CrateTrashCartJani = janitorial trash cart .desc = { ent-CrateBaseSecure.desc } ent-InvisibleCrate = { ent-CrateBaseWeldable } 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 d07c5599e52..3df6b95fde3 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,15 +9,12 @@ ent-filingCabinetDrawer = chest drawer .suffix = Empty ent-BaseBureaucraticStorageFill = { "" } .desc = { "" } -ent-filingCabinetRandom = { ent-['filingCabinet', 'BaseBureaucraticStorageFill'] } - +ent-filingCabinetRandom = { ent-BaseBureaucraticStorageFill } .suffix = Random - .desc = { ent-['filingCabinet', 'BaseBureaucraticStorageFill'].desc } -ent-filingCabinetTallRandom = { ent-['filingCabinetTall', 'BaseBureaucraticStorageFill'] } - + .desc = { ent-BaseBureaucraticStorageFill.desc } +ent-filingCabinetTallRandom = { ent-BaseBureaucraticStorageFill } .suffix = Random - .desc = { ent-['filingCabinetTall', 'BaseBureaucraticStorageFill'].desc } -ent-filingCabinetDrawerRandom = { ent-['filingCabinetDrawer', 'BaseBureaucraticStorageFill'] } - + .desc = { ent-BaseBureaucraticStorageFill.desc } +ent-filingCabinetDrawerRandom = { ent-BaseBureaucraticStorageFill } .suffix = Random - .desc = { ent-['filingCabinetDrawer', 'BaseBureaucraticStorageFill'].desc } \ No newline at end of file + .desc = { ent-BaseBureaucraticStorageFill.desc } \ No newline at end of file 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/storage/tanks/tanks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl index b52929438e1..078cd009485 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl @@ -18,7 +18,6 @@ ent-WaterCooler = water cooler ent-WaterTankHighCapacity = high-capacity water tank .desc = A highly pressurized water tank made to hold gargantuan amounts of water. .suffix = Full -ent-GenericTank = { ent-['StorageTank', 'StructureWheeled'] } - - .suffix = Empty - .desc = { ent-['StorageTank', 'StructureWheeled'].desc } \ No newline at end of file +ent-GenericTank = { ent-StorageTank } + .suffix = Empty + .desc = { ent-StorageTank.desc } 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 d138de12400..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 @@ -1,14 +1,11 @@ ent-ShotGunCabinet = shotgun cabinet .desc = There is a small label that reads "For Emergency use only" along with details for safe use of the shotgun. As if. -ent-ShotGunCabinetOpen = { ent-['ShotGunCabinet', 'FireAxeCabinetOpen'] } - +ent-ShotGunCabinetOpen = { ent-ShotGunCabinet } .suffix = Open - .desc = { ent-['ShotGunCabinet', 'FireAxeCabinetOpen'].desc } -ent-ShotGunCabinetFilled = { ent-['ShotGunCabinet', 'FireAxeCabinetFilled'] } - + .desc = { ent-ShotGunCabinet.desc } +ent-ShotGunCabinetFilled = { ent-ShotGunCabinet } .suffix = Filled - .desc = { ent-['ShotGunCabinet', 'FireAxeCabinetFilled'].desc } -ent-ShotGunCabinetFilledOpen = { ent-['ShotGunCabinetFilled', 'FireAxeCabinetFilledOpen'] } - + .desc = { ent-ShotGunCabinet.desc } +ent-ShotGunCabinetFilledOpen = { ent-ShotGunCabinetFilled } .suffix = Filled, Open - .desc = { ent-['ShotGunCabinetFilled', 'FireAxeCabinetFilledOpen'].desc } \ No newline at end of file + .desc = { ent-ShotGunCabinetFilled.desc } \ No newline at end of file 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 e394b28cc3e..06434131253 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl @@ -20,18 +20,14 @@ ent-SignDirectionalEng = engineering sign .desc = A direction sign, pointing out which way the Engineering department is. ent-SignDirectionalEvac = evac sign .desc = A direction sign, pointing out which way evac is. -ent-SignDirectionalExam = exam sign - .desc = A direction sign, pointing out which way the examination room(s) are. ent-SignDirectionalFood = food sign .desc = A direction sign, pointing out which way the kitchen is. ent-SignDirectionalGravity = gravity sign .desc = A direction sign, pointing out which way the gravity generator is. ent-SignDirectionalHop = hop sign - .desc = A direction sign, pointing out which way the head of personnel's office is. + .desc = A direction sign, pointing out which way the station representative's office is. ent-SignDirectionalHydro = hydro sign .desc = A direction sign, pointing out which way hydroponics is. -ent-SignDirectionalIcu = icu sign - .desc = A direction sign, pointing out which way the ICU is. ent-SignDirectionalJanitor = janitor sign .desc = A direction sign, pointing out which way the janitor's closet is. ent-SignDirectionalLibrary = library sign @@ -52,8 +48,6 @@ ent-SignDirectionalWash = washroom sign .desc = A direction sign, pointing to the way to a washroom. ent-SignAi = ai sign .desc = A sign, indicating an AI is present. -ent-SignArcade = arcade sign - .desc = A sign indicating the arcade. ent-SignArmory = armory sign .desc = A sign indicating the armory. ent-SignToolStorage = tool storage sign @@ -68,8 +62,6 @@ ent-SignAtmosMinsky = atmospherics sign .desc = A sign indicating the atmospherics area. ent-SignBar = bar sign .desc = A sign indicating the bar. -ent-SignBarbershop = barbershop sign - .desc = A sign indicating the barbershop. ent-SignBio = bio sign .desc = A sign indicating the biology lab. ent-SignBiohazard = biohazard sign @@ -130,8 +122,6 @@ ent-SignInterrogation = interrogation sign .desc = A sign indicating an interrogation room. ent-SignJanitor = janitor sign .desc = A sign labelling an area where the janitor works. -ent-SignLaundromat = laundromat sign - .desc = A sign indicating the laundromat. ent-SignLawyer = lawyer sign .desc = A sign labelling an area where the Lawyers work. ent-SignLibrary = library sign @@ -144,22 +134,16 @@ ent-SignMinerDock = miner dock sign .desc = A sign indicating the miner dock. ent-SignMorgue = morgue sign .desc = A sign indicating the morgue. -ent-SignNews = news sign - .desc = A sign indicating where the Reporter works. ent-SignNosmoking = nosmoking sign .desc = A sign indicating that smoking is not allowed in the vicinity. ent-SignPrison = prison sign .desc = A sign indicating the prison. ent-SignPsychology = psychology sign .desc = A sign labelling an area where the Psychologist works. -ent-SignReception = reception sign - .desc = A sign indicating the reception. ent-SignRND = research and development sign .desc = A sign indicating the research and development lab. ent-SignRobo = robo sign .desc = A sign indicating the robotics lab. -ent-SignSalvage = salvage sign - .desc = A sign indicating the salvage area. ent-SignScience = science sign .desc = A sign indicating the science area. ent-SignScience1 = science sign diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/switch.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/switch.ftl index 4ebc623ea1b..aa93a361569 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 @@ -15,112 +15,3 @@ ent-SignalButtonDirectional = signal button ent-ApcNetSwitchDirectional = apc net switch .suffix = directional .desc = { ent-ApcNetSwitch.desc } -ent-LockableButton = lockable button - .desc = { ent-SignalButtonDirectional.desc } -ent-LockableButtonCaptain = { ent-LockableButton } - .suffix = Captain - .desc = { ent-LockableButton.desc } -ent-LockableButtonHeadOfPersonnel = { ent-LockableButton } - .suffix = HeadOfPersonnel - .desc = { ent-LockableButton.desc } -ent-LockableButtonChiefEngineer = { ent-LockableButton } - .suffix = ChiefEngineer - .desc = { ent-LockableButton.desc } -ent-LockableButtonChiefMedicalOfficer = { ent-LockableButton } - .suffix = ChiefMedicalOfficer - .desc = { ent-LockableButton.desc } -ent-LockableButtonHeadOfSecurity = { ent-LockableButton } - .suffix = HeadOfSecurity - .desc = { ent-LockableButton.desc } -ent-LockableButtonResearchDirector = { ent-LockableButton } - .suffix = ResearchDirector - .desc = { ent-LockableButton.desc } -ent-LockableButtonCommand = { ent-LockableButton } - .suffix = Command - .desc = { ent-LockableButton.desc } -ent-LockableButtonCryogenics = { ent-LockableButton } - .suffix = Cryogenics - .desc = { ent-LockableButton.desc } -ent-LockableButtonSecurity = { ent-LockableButton } - .suffix = Security - .desc = { ent-LockableButton.desc } -ent-LockableButtonDetective = { ent-LockableButton } - .suffix = Detective - .desc = { ent-LockableButton.desc } -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 } -ent-LockableButtonEngineering = { ent-LockableButton } - .suffix = Engineering - .desc = { ent-LockableButton.desc } -ent-LockableButtonMedical = { ent-LockableButton } - .suffix = Medical - .desc = { ent-LockableButton.desc } -ent-LockableButtonQuartermaster = { ent-LockableButton } - .suffix = Quartermaster - .desc = { ent-LockableButton.desc } -ent-LockableButtonSalvage = { ent-LockableButton } - .suffix = Salvage - .desc = { ent-LockableButton.desc } -ent-LockableButtonCargo = { ent-LockableButton } - .suffix = Cargo - .desc = { ent-LockableButton.desc } -ent-LockableButtonResearch = { ent-LockableButton } - .suffix = Research - .desc = { ent-LockableButton.desc } -ent-LockableButtonService = { ent-LockableButton } - .suffix = Service - .desc = { ent-LockableButton.desc } -ent-LockableButtonMaintenance = { ent-LockableButton } - .suffix = Maintenance - .desc = { ent-LockableButton.desc } -ent-LockableButtonExternal = { ent-LockableButton } - .suffix = External - .desc = { ent-LockableButton.desc } -ent-LockableButtonJanitor = { ent-LockableButton } - .suffix = Janitor - .desc = { ent-LockableButton.desc } -ent-LockableButtonTheatre = { ent-LockableButton } - .suffix = Theatre - .desc = { ent-LockableButton.desc } -ent-LockableButtonBar = { ent-LockableButton } - .suffix = Bar - .desc = { ent-LockableButton.desc } -ent-LockableButtonChemistry = { ent-LockableButton } - .suffix = Chemistry - .desc = { ent-LockableButton.desc } -ent-LockableButtonKitchen = { ent-LockableButton } - .suffix = Kitchen - .desc = { ent-LockableButton.desc } -ent-LockableButtonChapel = { ent-LockableButton } - .suffix = Chapel - .desc = { ent-LockableButton.desc } -ent-LockableButtonHydroponics = { ent-LockableButton } - .suffix = Hydroponics - .desc = { ent-LockableButton.desc } -ent-LockableButtonAtmospherics = { ent-LockableButton } - .suffix = Atmospherics - .desc = { ent-LockableButton.desc } -ent-ButtonFrame = button frame - .desc = It's a frame to help distinguish switches visually. -ent-ButtonFrameGrey = { ent-ButtonFrame } - .suffix = grey - .desc = { ent-ButtonFrame.desc } -ent-ButtonFrameCaution = { ent-ButtonFrame } - .suffix = caution - .desc = { ent-ButtonFrame.desc } -ent-ButtonFrameCautionSecurity = { ent-ButtonFrame } - .suffix = caution - .desc = { ent-ButtonFrame.desc } -ent-ButtonFrameExit = { ent-ButtonFrame } - .suffix = exit - .desc = { ent-ButtonFrame.desc } -ent-ButtonFrameJanitor = { ent-ButtonFrame } - .suffix = janitor - .desc = { ent-ButtonFrame.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl index a6543f6de30..508de11c3bf 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl @@ -1,5 +1,6 @@ ent-AsteroidRock = asteroid rock .desc = A rocky asteroid. + .suffix = Low Ore Yield ent-AsteroidRockCoal = { ent-AsteroidRock } .desc = An ore vein rich with coal. .suffix = Coal @@ -25,7 +26,7 @@ ent-AsteroidRockTin = { ent-AsteroidRock } .desc = An ore vein rich with iron. .suffix = Iron ent-AsteroidRockTinCrab = { ent-AsteroidRockTin } - .suffix = Iron Crab + .suffix = Iron .desc = { ent-AsteroidRockTin.desc } ent-AsteroidRockUranium = { ent-AsteroidRock } .desc = An ore vein rich with uranium. @@ -41,19 +42,16 @@ ent-AsteroidRockArtifactFragment = { ent-AsteroidRock } .suffix = Artifact Fragment ent-AsteroidRockMining = asteroid rock .desc = An asteroid. - .suffix = higher ore yield .33 + .suffix = higher ore yield ent-IronRock = ironrock .desc = A rocky asteroid. .suffix = Low Ore Yield -ent-AsteroidRockSalt = { ent-AsteroidRock } - .desc = An ore vein rich with salt. - .suffix = Salt ent-IronRockMining = ironrock .desc = An asteroid. .suffix = higher ore yield ent-WallRock = rock .suffix = planetmap - .desc = { ent-BaseWall.desc } + .desc = { ent-BaseStructure.desc } ent-WallRockCoal = { ent-WallRock } .desc = An ore vein rich with coal. .suffix = Coal @@ -81,9 +79,6 @@ ent-WallRockBananium = { ent-WallRock } ent-WallRockArtifactFragment = { ent-WallRock } .desc = A rock wall. What's that sticking out of it? .suffix = Artifact Fragment -ent-WallRockSalt = { ent-WallRock } - .desc = An ore vein rich with salt. - .suffix = Salt ent-WallRockBasalt = basalt .desc = { ent-WallRock.desc } ent-WallRockBasaltCoal = { ent-WallRockBasalt } @@ -113,9 +108,6 @@ ent-WallRockBasaltBananium = { ent-WallRockBasalt } ent-WallRockBasaltArtifactFragment = { ent-WallRockBasalt } .desc = A rock wall. What's that sticking out of it? .suffix = Artifact Fragment -ent-WallRockBasaltSalt = { ent-WallRockBasalt } - .desc = An ore vein rich with salt. - .suffix = Salt ent-WallRockSnow = snowdrift .desc = { ent-WallRock.desc } ent-WallRockSnowCoal = { ent-WallRockSnow } @@ -145,9 +137,6 @@ ent-WallRockSnowBananium = { ent-WallRockSnow } ent-WallRockSnowArtifactFragment = { ent-WallRockSnow } .desc = A rock wall. What's that sticking out of it? .suffix = Artifact Fragment -ent-WallRockSnowSalt = { ent-WallRockSnow } - .desc = An ore vein rich with salt. - .suffix = Salt ent-WallRockSand = sandstone .desc = { ent-WallRock.desc } ent-WallRockSandCoal = { ent-WallRockSand } @@ -177,9 +166,6 @@ ent-WallRockSandBananium = { ent-WallRockSand } ent-WallRockSandArtifactFragment = { ent-WallRockSand } .desc = A rock wall. What's that sticking out of it? .suffix = Artifact Fragment -ent-WallRockSandSalt = { ent-WallRockSand } - .desc = An ore vein rich with salt. - .suffix = Salt ent-WallRockChromite = chromite .desc = { ent-WallRock.desc } ent-WallRockChromiteCoal = { ent-WallRockChromite } @@ -209,9 +195,6 @@ ent-WallRockChromiteBananium = { ent-WallRockChromite } ent-WallRockChromiteArtifactFragment = { ent-WallRockChromite } .desc = A rock wall. What's that sticking out of it? .suffix = Artifact Fragment -ent-WallRockChromiteSalt = { ent-WallRockChromite } - .desc = An ore vein rich with salt. - .suffix = Salt ent-WallRockAndesite = andesite .desc = { ent-WallRock.desc } ent-WallRockAndesiteCoal = { ent-WallRockAndesite } @@ -241,6 +224,3 @@ ent-WallRockAndesiteBananium = { ent-WallRockAndesite } ent-WallRockAndesiteArtifactFragment = { ent-WallRockAndesite } .desc = A rock wall. What's that sticking out of it? .suffix = Artifact Fragment -ent-WallRockAndesiteSalt = { ent-WallRockAndesite } - .desc = An ore vein rich with salt. - .suffix = Salt diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girders.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girders.ftl index 333d8950fdb..01ac3bb600c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girders.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girders.ftl @@ -2,5 +2,3 @@ ent-Girder = girder .desc = A large structural assembly made out of metal; It requires a layer of metal before it can be considered a wall. ent-ReinforcedGirder = reinforced girder .desc = A large structural assembly made out of metal and plasteel; It requires a layer of plasteel before it can be considered a reinforced wall. -ent-ClockworkGirder = wall gear - .desc = A large gear with mounting brackets for additional plating; This could be made into a wall with more brass plating. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/grille.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/grille.ftl index d39d7365b2a..3a515825e60 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/grille.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/grille.ftl @@ -1,12 +1,6 @@ ent-Grille = grille .desc = A flimsy framework of iron rods. -ent-ClockworkGrille = clockwork grille - .desc = a flimsy framework of iron rods assembled in traditional Ratvarian fashion. ent-GrilleBroken = grille .desc = A flimsy framework of iron rods. It has seen better days. -ent-ClockworkGrilleBroken = clockwork grille - .desc = A flimsy framework of iron rods assembled in traditional Ratvarian fashion. It has seen better days. ent-GrilleDiagonal = diagonal grille .desc = { ent-Grille.desc } -ent-ClockworkGrilleDiagonal = diagonal clockwork grille - .desc = { ent-ClockworkGrille.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/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/plastitanium.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl index 57216514981..89c3894e806 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl @@ -1,5 +1,2 @@ ent-PlastitaniumWindow = plastitanium window - .desc = { ent-Window.desc } -ent-PlastitaniumWindowDiagonal = { ent-ShuttleWindow } - .suffix = diagonal - .desc = { ent-ShuttleWindow.desc } + .desc = { ent-PlastitaniumWindowIndestructible.desc } 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..c566207703e 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,7 +1,5 @@ ent-ReinforcedUraniumWindow = reinforced uranium window - .desc = { ent-WindowRCDResistant.desc } -ent-UraniumReinforcedWindowDirectional = directional reinforced uranium window - .desc = Don't smudge up the glass down there. + .desc = { ent-Window.desc } ent-ReinforcedUraniumWindowDiagonal = { ent-ReinforcedUraniumWindow } .suffix = diagonal .desc = { ent-ReinforcedUraniumWindow.desc } 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..74a28c90733 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,7 +1,5 @@ ent-UraniumWindow = uranium window - .desc = { ent-WindowRCDResistant.desc } -ent-UraniumWindowDirectional = directional uranium window - .desc = Don't smudge up the glass down there. + .desc = { ent-Window.desc } ent-UraniumWindowDiagonal = { ent-UraniumWindow } .suffix = diagonal .desc = { ent-UraniumWindow.desc } 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/gamerules/events.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/events.ftl index b021e73e656..673496240b1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/events.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/events.ftl @@ -1,31 +1,13 @@ ent-AnomalySpawn = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } -ent-BluespaceArtifact = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } ent-BluespaceLocker = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-BreakerFlip = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } -ent-BureaucraticError = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-ClericalError = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-ClosetSkeleton = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-DragonSpawn = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-NinjaSpawn = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } -ent-RevenantSpawn = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.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 } @@ -36,25 +18,11 @@ ent-RandomSentience = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-SolarFlare = { ent-BaseGameRule } .desc = { ent-BaseGameRule.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-BaseGameRule } - .desc = { ent-BaseGameRule.desc } ent-MassHallucinations = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } -ent-ImmovableRodSpawn = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } ent-IonStorm = { 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 fabefd88585..91b85f9dee7 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-SubGamemodesRule = { ent-BaseGameRule } - .desc = { ent-BaseGameRule.desc } ent-DeathMatch31 = { ent-BaseGameRule } .desc = { ent-BaseGameRule.desc } ent-InactivityTimeRestart = { ent-BaseGameRule } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/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/nyanotrasen/entities/mobs/player/felinid.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/felinid.ftl index 980eb46d462..472b8d47325 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/felinid.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/felinid.ftl @@ -1,3 +1,2 @@ ent-MobFelinid = Urist McFelinid - - .desc = { ent-['MobFelinidBase', 'BaseMob'].desc } \ No newline at end of file + .desc = { ent-MobFelinidBase.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/oni.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/oni.ftl index ec3862ccb0d..df69f8c65e3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/oni.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/oni.ftl @@ -1,3 +1,2 @@ ent-MobOni = Urist McOni - - .desc = { ent-['MobOniBase', 'BaseMob'].desc } \ No newline at end of file + .desc = { ent-MobOniBase.desc } \ No newline at end of file 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 e4d55156d77..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', 'BaseKillObjective'] } - +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 5430454a87e..18aabddd7b1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/thief.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/thief.ftl @@ -1,17 +1,13 @@ ent-BaseThiefObjective = { ent-BaseObjective } .desc = { ent-BaseObjective.desc } -ent-BaseThiefStealObjective = { ent-['BaseThiefObjective', 'BaseStealObjective'] } - - .desc = { ent-['BaseThiefObjective', 'BaseStealObjective'].desc } -ent-BaseThiefStealCollectionObjective = { ent-['BaseThiefObjective', 'BaseStealObjective'] } - - .desc = { ent-['BaseThiefObjective', 'BaseStealObjective'].desc } -ent-BaseThiefStealStructureObjective = { ent-['BaseThiefObjective', 'BaseStealObjective'] } - - .desc = { ent-['BaseThiefObjective', 'BaseStealObjective'].desc } -ent-BaseThiefStealAnimalObjective = { ent-['BaseThiefObjective', 'BaseStealObjective'] } - - .desc = { ent-['BaseThiefObjective', 'BaseStealObjective'].desc } +ent-BaseThiefStealObjective = { ent-BaseThiefObjective } + .desc = { ent-BaseThiefObjective.desc } +ent-BaseThiefStealCollectionObjective = { ent-BaseThiefObjective } + .desc = { ent-BaseStealObjective.desc } +ent-BaseThiefStealStructureObjective = { ent-BaseThiefObjective } + .desc = { ent-BaseThiefObjective.desc } +ent-BaseThiefStealAnimalObjective = { ent-BaseThiefObjective } + .desc = { ent-BaseThiefObjective.desc } ent-FigurineStealCollectionObjective = { ent-BaseThiefStealCollectionObjective } .desc = { ent-BaseThiefStealCollectionObjective.desc } ent-HeadCloakStealCollectionObjective = { ent-BaseThiefStealCollectionObjective } @@ -26,6 +22,8 @@ ent-TechnologyDiskStealCollectionObjective = { ent-BaseThiefStealCollectionObjec .desc = { ent-BaseThiefStealCollectionObjective.desc } ent-IDCardsStealCollectionObjective = { ent-BaseThiefStealCollectionObjective } .desc = { ent-BaseThiefStealCollectionObjective.desc } +ent-CannabisStealCollectionObjective = { ent-BaseThiefStealCollectionObjective } + .desc = { ent-BaseThiefStealCollectionObjective.desc } ent-LAMPStealCollectionObjective = { ent-BaseThiefStealCollectionObjective } .desc = { ent-BaseThiefStealCollectionObjective.desc } ent-ForensicScannerStealObjective = { ent-BaseThiefStealObjective } @@ -90,9 +88,15 @@ ent-MortyStealObjective = { ent-BaseThiefStealAnimalObjective } .desc = { ent-BaseThiefStealAnimalObjective.desc } ent-RenaultStealObjective = { ent-BaseThiefStealAnimalObjective } .desc = { ent-BaseThiefStealAnimalObjective.desc } +ent-HamletStealObjective = { ent-BaseThiefStealAnimalObjective } + .desc = { ent-BaseThiefStealAnimalObjective.desc } ent-ShivaStealObjective = { ent-BaseThiefStealAnimalObjective } .desc = { ent-BaseThiefStealAnimalObjective.desc } +ent-SmileStealObjective = { ent-BaseThiefStealAnimalObjective } + .desc = { ent-BaseThiefStealAnimalObjective.desc } +ent-PunPunStealObjective = { ent-BaseThiefStealAnimalObjective } + .desc = { ent-BaseThiefStealAnimalObjective.desc } ent-TropicoStealObjective = { ent-BaseThiefStealAnimalObjective } .desc = { ent-BaseThiefStealAnimalObjective.desc } ent-EscapeThiefShuttleObjective = 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 b6e333b9bc3..3556689dc23 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/traitor.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/traitor.ftl @@ -1,26 +1,20 @@ ent-BaseTraitorObjective = { ent-BaseObjective } .desc = { ent-BaseObjective.desc } -ent-BaseTraitorSocialObjective = { ent-['BaseTraitorObjective', 'BaseSocialObjective'] } - - .desc = { ent-['BaseTraitorObjective', 'BaseSocialObjective'].desc } -ent-BaseTraitorStealObjective = { ent-['BaseTraitorObjective', 'BaseStealObjective'] } - - .desc = { ent-['BaseTraitorObjective', 'BaseStealObjective'].desc } +ent-BaseTraitorSocialObjective = { ent-BaseSocialObjective } + .desc = { ent-BaseSocialObjective.desc } +ent-BaseTraitorStealObjective = { ent-BaseStealObjective } + .desc = { ent-BaseStealObjective.desc } ent-EscapeShuttleObjective = Escape to centcom alive and unrestrained. .desc = One of our undercover agents will debrief you when you arrive. Don't show up in cuffs. ent-DieObjective = Die a glorious death .desc = Die. -ent-KillRandomPersonObjective = { ent-['BaseTraitorObjective', 'BaseKillObjective'] } - +ent-KillRandomPersonObjective = { ent-BaseKillObjective } .desc = Do it however you like, just make sure they don't make it to centcom. -ent-KillRandomHeadObjective = { ent-['BaseTraitorObjective', 'BaseKillObjective'] } - +ent-KillRandomHeadObjective = { ent-BaseKillObjective } .desc = We need this head gone and you probably know why. Good luck, agent. -ent-RandomTraitorAliveObjective = { ent-['BaseTraitorSocialObjective', 'BaseKeepAliveObjective'] } - +ent-RandomTraitorAliveObjective = { ent-BaseKeepAliveObjective } .desc = Identify yourself at your own risk. We just need them alive. -ent-RandomTraitorProgressObjective = { ent-['BaseTraitorSocialObjective', 'BaseHelpProgressObjective'] } - +ent-RandomTraitorProgressObjective = { ent-BaseHelpProgressObjective } .desc = Identify yourself at your own risk. We just need them to succeed. ent-BaseCMOStealObjective = { ent-BaseTraitorStealObjective } .desc = { ent-BaseTraitorStealObjective.desc } @@ -51,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/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl index 676094d0e52..310d7a21e03 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/procedural/salvage_mods.ftl @@ -1,2 +1,2 @@ -ent-SalvageShuttleMarker = Salvage shuttle marker +ent-SalvageShuttleMarker = { ent-FTLPoint } .desc = { ent-FTLPoint.desc }