Merge branch 'master' into MagicWands

Resources/Locale/en-US/GPS/handheld-gps.ftl

@@ -1 +1,3 @@
-handheld-gps-coordinates-title = Coords: {$coordinates}
+handheld-gps-coordinates-title =
+    Coords:
+    {$coordinates}

Resources/Locale/en-US/_CP14/roundRemove/cryo.ftl

@@ -0,0 +1,3 @@
+cp14-ship-sender = Empire
+cp14-earlyleave-ship-announcement = {$character} ({$job}) leaves the settlement on a merchant ship.
+cp14-earlyleave-ship-announcement-dead = body {$character} ({$job}) leaves the settlement posthumously on a merchant ship.

Resources/Locale/en-US/_CP14/travelingStoreship/cryo.ftl

@@ -1,2 +0,0 @@
-cp14-ship-sender = A very magical announcement system
-cp14-earlyleave-ship-announcement = {$character} ({$job}) leaves the settlement on a merchant ship.

Resources/Locale/en-US/chat/commands/ghost-command.ftl

@@ -3,3 +3,4 @@ ghost-command-help-text = The ghost command turns you into a ghost and makes the
                           Please note that you cannot return to your character's body after ghosting.
 ghost-command-no-session = You have no session, you can't ghost.
 ghost-command-denied = You cannot ghost right now.
+ghost-command-error-lobby = You can't ghost right now. You are not in the game!

Resources/Locale/en-US/datasets/names/ai.ftl

@@ -0,0 +1,139 @@
+names-ai-dataset-1 = 16-20
+names-ai-dataset-2 = 512k
+
+# Ought to be enough for anybody
+names-ai-dataset-3 = 640k
+
+names-ai-dataset-4 = "790"
+names-ai-dataset-5 = Adaptive Manipulator
+
+# Named after the famous soundcard
+names-ai-dataset-6 = Adlib
+
+names-ai-dataset-7 = ALICE
+names-ai-dataset-8 = Allied Mastercomputer
+names-ai-dataset-9 = Alpha 2
+names-ai-dataset-10 = Alpha 3
+names-ai-dataset-11 = Alpha 4
+names-ai-dataset-12 = Alpha 5
+names-ai-dataset-13 = Alpha 6
+names-ai-dataset-14 = Alpha 7
+names-ai-dataset-15 = Alpha 8
+names-ai-dataset-16 = Alpha 9
+names-ai-dataset-17 = AmigoBot
+names-ai-dataset-18 = Android
+names-ai-dataset-19 = Aniel
+names-ai-dataset-20 = AOL
+names-ai-dataset-21 = Asimov
+
+# The most influential modem ever, created by the bell system. It still lives on today in certain applications
+names-ai-dataset-22 = Bell 301
+
+names-ai-dataset-23 = Bishop
+names-ai-dataset-24 = Blitz
+names-ai-dataset-25 = Box
+names-ai-dataset-26 = Calculator
+names-ai-dataset-27 = Cassandra
+names-ai-dataset-28 = Cell
+names-ai-dataset-29 = Chii
+names-ai-dataset-30 = Chip
+names-ai-dataset-31 = C.R.A.I.G.
+
+# Commercial supercomputer from the 70s
+names-ai-dataset-32 = Cray-2
+
+# If we're going to have AOL we may as well have some of their major competitors
+names-ai-dataset-33 = CompuServe
+
+names-ai-dataset-34 = Computer
+names-ai-dataset-35 = Cutie
+names-ai-dataset-36 = Daedalus
+names-ai-dataset-37 = DecTalk
+names-ai-dataset-38 = Dee Model
+names-ai-dataset-39 = Dial Up
+names-ai-dataset-40 = Dorfl
+names-ai-dataset-41 = Duey
+names-ai-dataset-42 = Emma-2
+
+# Famous early computer
+names-ai-dataset-43 = ENIAC
+
+names-ai-dataset-44 = Erasmus
+names-ai-dataset-45 = Everything
+names-ai-dataset-46 = Ez-27
+names-ai-dataset-47 = FRIEND COMPUTER
+names-ai-dataset-48 = Faith
+names-ai-dataset-49 = Fi
+names-ai-dataset-50 = Frost
+names-ai-dataset-51 = George
+names-ai-dataset-52 = H.E.L.P
+names-ai-dataset-53 = Hadaly
+names-ai-dataset-54 = Helios
+names-ai-dataset-55 = Hivebot Overmind
+names-ai-dataset-56 = Huey
+
+# A play on the fad apple spawned of putting "i" infront of your tech products name
+names-ai-dataset-57 = iAI
+
+# Hell on earth (web browser)
+names-ai-dataset-58 = I.E. 6
+
+names-ai-dataset-59 = Icarus
+
+# If you don't get this one you are too young
+names-ai-dataset-60 = Jeeves
+
+names-ai-dataset-61 = Jinx
+names-ai-dataset-62 = K.I.N.G
+names-ai-dataset-63 = Klapaucius
+names-ai-dataset-64 = Knight
+names-ai-dataset-65 = Louie
+
+# Named after the Manchester Mark 1, the successor of which was actually named the Ferranti Mark 1, rather than Manchester Mark 2
+names-ai-dataset-66 = Manchester Mark 2 
+
+names-ai-dataset-67 = MARK13
+names-ai-dataset-68 = Maria
+names-ai-dataset-69 = Marvin
+names-ai-dataset-70 = Max 404
+names-ai-dataset-71 = Metalhead
+names-ai-dataset-72 = M.I.M.I
+names-ai-dataset-73 = MK ULTRA
+names-ai-dataset-74 = MoMMI
+names-ai-dataset-75 = Mugsy3000
+names-ai-dataset-76 = Multivac
+names-ai-dataset-77 = NCH
+
+# A play on both NT as in NanoTrasen and NT as in windows NT, of which version 6.0 is windows vista
+names-ai-dataset-78 = NT v6.0
+
+names-ai-dataset-79 = Packard Bell
+names-ai-dataset-80 = PTO
+names-ai-dataset-81 = Project Y2K
+names-ai-dataset-82 = Revelation
+names-ai-dataset-83 = Robot Devil
+names-ai-dataset-84 = S.A.M.
+names-ai-dataset-85 = S.H.O.C.K.
+names-ai-dataset-86 = S.H.R.O.U.D.
+names-ai-dataset-87 = S.O.P.H.I.E.
+names-ai-dataset-88 = Samaritan
+names-ai-dataset-89 = Shrike
+names-ai-dataset-90 = Solo
+names-ai-dataset-91 = Station Control Program
+names-ai-dataset-92 = AINU (AI's Not Unix)
+names-ai-dataset-93 = Super 35
+names-ai-dataset-94 = Surgeon General
+names-ai-dataset-95 = TWA
+names-ai-dataset-96 = Terminus
+names-ai-dataset-97 = TPM 3.0
+names-ai-dataset-98 = Turing Complete
+names-ai-dataset-99 = Tidy
+names-ai-dataset-100 = Ulysses
+names-ai-dataset-101 = W1k1
+names-ai-dataset-102 = X-5
+names-ai-dataset-103 = X.A.N.A.
+names-ai-dataset-104 = XERXES
+names-ai-dataset-105 = Z-1
+names-ai-dataset-106 = Z-2
+names-ai-dataset-107 = Z-3
+names-ai-dataset-108 = Zed

Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl

@@ -186,7 +186,7 @@ ghost-role-information-nukeop-rules = You are a [color=red][bold]Team Antagonist
 
 ghost-role-information-loneop-name = Lone Operative
 ghost-role-information-loneop-description = You are a lone nuclear operative. Destroy the station!
-ghost-role-information-loneop-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other nuclear operatives. Covert syndicate agents are not guaranteed to help you.
+ghost-role-information-loneop-rules = You are a [color=red][bold]Solo Antagonist[/bold][/color]. Covert syndicate agents are not guaranteed to help you.
 
 ghost-role-information-behonker-name = Behonker
 ghost-role-information-behonker-description = You are an antagonist, bring death and honks to those who do not follow the honkmother.
@@ -230,16 +230,17 @@ ghost-role-information-nukeop-reinforcement-rules = You are a [color=red][bold]T
 
 ghost-role-information-syndicate-monkey-reinforcement-name = Syndicate Monkey Agent
 ghost-role-information-syndicate-monkey-reinforcement-description = Someone needs reinforcements. You, a trained monkey, will help them.
-ghost-role-information-syndicate-monkey-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the agent who summoned you.
 
 ghost-role-information-syndicate-kobold-reinforcement-name = Syndicate Kobold Agent
 ghost-role-information-syndicate-kobold-reinforcement-description = Someone needs reinforcements. You, a trained kobold, will help them.
-ghost-role-information-syndicate-kobold-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the agent who summoned you.
 
 ghost-role-information-syndicate-cyborg-assault-name = Syndicate Assault Cyborg
 ghost-role-information-syndicate-cyborg-saboteur-name = Syndicate Saboteur Cyborg
 ghost-role-information-syndicate-cyborg-description = The Syndicate needs reinforcements. You, a cold silicon killing machine, will help them.
 
+ghost-role-information-derelict-cyborg-name = Derelict Cyborg
+ghost-role-information-derelict-cyborg-description = You are a regular cyborg that got lost in space. After years of exposure to ion storms you find yourself near a space station.
+
 ghost-role-information-security-name = Security
 ghost-role-information-security-description = You are part of a security task force, but seem to have found yourself in a strange situation...
 
@@ -252,7 +253,7 @@ ghost-role-information-medical-description = You are a medical professional, but
 ghost-role-information-cargo-name = Cargo
 ghost-role-information-cargo-description = You are part of a logistics mission, but seem to have found yourself in a strange situation...
 
-ghost-role-information-engineering-name = Engineering 
+ghost-role-information-engineering-name = Engineering
 ghost-role-information-engineering-description = You are on an engineering job, but seem to have found yourself in a strange situation...
 
 ghost-role-information-science-name = Science
@@ -310,3 +311,7 @@ ghost-role-information-artifact-description = Enact your eldritch whims. Forcibl
 ghost-role-information-tomatokiller-name = Tomato killer
 ghost-role-information-tomatokiller-description = This little tomato will serve the botanist for the rest of his life... that is, a couple of minutes
 
+ghost-role-information-gingerbread-name = Gingerbread Man
+ghost-role-information-gingerbread-description = A being of pure holiday spirit.
+                                     Spread molassesy goodness and to all good cheer.
+

Resources/Locale/en-US/interaction/interaction-popup-component.ftl

@@ -68,6 +68,7 @@ petting-success-janitor-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} d
 petting-success-medical-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} sterile metal head.
 petting-success-service-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} dapper looking metal head.
 petting-success-syndicate-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} menacing metal head.
+petting-success-derelict-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} rusty metal head.
 petting-success-recycler = You pet {THE($target)} on {POSS-ADJ($target)} mildly threatening steel exterior.
 
 petting-failure-honkbot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BASIC($target, "honk", "honks")} in refusal!
@@ -82,6 +83,7 @@ petting-failure-janitor-cyborg = You reach out to pet {THE($target)}, but {SUBJE
 petting-failure-medical-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy saving lives!
 petting-failure-service-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy serving others!
 petting-failure-syndicate-cyborg = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} treacherous affiliation makes you reconsider.
+petting-failure-derelict-cyborg = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} rusty and jagged exterior makes you reconsider.
 
 ## Rattling fences
 

Resources/Locale/en-US/navmap-beacons/station-beacons.ftl

@@ -51,6 +51,7 @@ station-beacon-telecoms = Telecoms
 station-beacon-atmos = Atmos
 station-beacon-teg = TEG
 station-beacon-tech-vault = Tech Vault
+station-beacon-anchor = Anchor
 
 station-beacon-service = Service
 station-beacon-kitchen = Kitchen

Resources/Locale/en-US/preferences/humanoid-character-profile.ftl

@@ -5,5 +5,6 @@ humanoid-character-profile-summary =
     This is {$name}. {$gender ->
     [male] He is
     [female] She is
-    *[other] They are
+    [epicene] They are
+    *[other] It is
 } {$age} years old.

Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl

@@ -15,7 +15,7 @@ humanoid-profile-editor-pronouns-label = Pronouns:
 humanoid-profile-editor-pronouns-male-text = He / Him
 humanoid-profile-editor-pronouns-female-text = She / Her
 humanoid-profile-editor-pronouns-epicene-text = They / Them
-humanoid-profile-editor-pronouns-neuter-text = It / It
+humanoid-profile-editor-pronouns-neuter-text = It / Its
 humanoid-profile-editor-import-button = Import
 humanoid-profile-editor-export-button = Export
 humanoid-profile-editor-export-image-button = Export image

Resources/Locale/en-US/prototypes/access/accesses.ftl

@@ -42,3 +42,5 @@ id-card-access-level-nuclear-operative = Nuclear Operative
 id-card-access-level-syndicate-agent = Syndicate Agent
 
 id-card-access-level-central-command = Central Command
+
+id-card-access-level-wizard = Wizard

Resources/Locale/en-US/shuttles/console.ftl

@@ -4,7 +4,6 @@ shuttle-pilot-end = Stopped piloting
 shuttle-console-in-ftl = Currently in FTL
 shuttle-console-mass = Too large to FTL
 shuttle-console-prevent = You are unable to pilot this ship
-shuttle-console-static = Grid is static
 
 # NAV
 
@@ -31,6 +30,7 @@ shuttle-console-ftl-state-Starting = Starting
 shuttle-console-ftl-state-Travelling = Travelling
 shuttle-console-ftl-state-Arriving = Arriving
 shuttle-console-ftl-state-Cooldown = Cooldown
+shuttle-console-ftl-state-Invalid = Invalid
 
 shuttle-console-map-settings = Settings
 shuttle-console-ftl-button = FTL

Resources/Locale/en-US/species/species.ftl

@@ -9,6 +9,7 @@ species-name-arachnid = Arachnid
 species-name-moth = Moth Person
 species-name-skeleton = Skeleton
 species-name-vox = Vox
+species-name-gingerbread = delicious baked good
 
 ## Misc species things
 

Resources/Locale/en-US/station-events/events/greytide-virus.ftl

@@ -0,0 +1 @@
+station-event-greytide-virus-start-announcement = Gr3y.T1d3 virus detected in the station's secure locking encryption subroutines. Severity level of { $severity }. Recommend station AI involvement.

Resources/Locale/en-US/store/spellbook-catalog.ftl

@@ -28,6 +28,9 @@ spellbook-wand-polymorph-door-description = For when you need a get-away route.
 spellbook-wand-polymorph-carp-name = Wand of Carp Polymorph
 spellbook-wand-polymorph-carp-description = For when you need a carp filet quick and the clown is looking juicy.
 
+spellbook-wand-locker-name = Wand of the Locker
+spellbook-wand-locker-description = Shoot cursed lockers at your enemies and lock em away!
+
 # Events
 
 spellbook-event-summon-ghosts-name = Summon Ghosts

Resources/Locale/en-US/wires/wire-names.ftl

@@ -41,6 +41,7 @@ wires-board-name-flatpacker = Flatpacker
 wires-board-name-spaceheater = Space Heater
 wires-board-name-jukebox = Jukebox
 wires-board-name-computer = Computer
+wires-board-name-barsign = Bar Sign
 
 # names that get displayed in the wire hacking hud & admin logs.
 

Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl

@@ -396,7 +396,7 @@ ent-CP14ClothingEyesThaumaturgyGlasses = тауматургические очк
     .desc = Очки, позволяющие сканировать магические предметы и существ, чтобы четко видеть количество оставшейся в них энергии.
 
 ent-CP14ClothingGlovesGirdles = железные наручи
-    .desc = Бронированные боевые наручи из металла.
+    .desc = Бронированные боевые наручи из железа.
 
 ent-CP14ClothingHeadCapellina = капеллина
     .desc = Защита от ударов крупными предметами по голове.
@@ -449,7 +449,7 @@ ent-CP14ClothingHeadBandanaYellow = желтая бандана
 ent-CP14ClothingHeadBeretMercenary = берет наемника
     .desc = Большая красная шерстяная шляпа, украшенная пером.
 
-ent-CP14ClothingHeadMetalHeadband = металлический обруч
+ent-CP14ClothingHeadMetalHeadband = железный обруч
     .desc = Вероятность, что он защитит от попадания в голову, крайне мала.
 
 ent-CP14ClothingHeadTriangularHat = остроконечная шляпа
@@ -807,8 +807,8 @@ ent-CP14RedBottle = красная бутылка
     .desc = Красная бутылка, идеально подходит для вина.
     .suffix = Пустая
 
-ent-CP14MetalBeerMug = металлическая кружка
-    .desc = Самая обычная металлическая кружка.
+ent-CP14MetalBeerMug = железная кружка
+    .desc = Самая обычная железная кружка.
 
 ent-CP14WoodenBeerMug = деревянная кружка
     .desc = Деревянная кружка для пива.

Resources/Locale/ru-RU/_CP14/roundRemove/cryo.ftl

@@ -0,0 +1,3 @@
+cp14-ship-sender = Империя
+cp14-earlyleave-ship-announcement = {$character} ({$job}) покидает поселение на торговом корабле.
+cp14-earlyleave-ship-announcement-dead = тело {$character} ({$job}) посмертно покидает поселение на торговом корабле.

Resources/Locale/ru-RU/_CP14/travelingStoreship/cryo.ftl

@@ -1,2 +0,0 @@
-cp14-ship-sender = Очень магическая система оповещения
-cp14-earlyleave-ship-announcement = {$character} ({$job}) покидает поселение на торговом корабле.