New Shuttle

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -50,6 +50,7 @@ public sealed class PostMapInitTest
             "MeteorArena",
             "NukieOutpost",
             "Pebble", //DeltaV
+            "Saltern", //Syndicate Station
             "Edge", //DeltaV
             "Shoukou", //DeltaV
             "Tortuga", //DeltaV

Resources/Locale/en-US/chat/managers/chat-manager.ftl

@@ -121,3 +121,8 @@ chat-speech-verb-ghost-4 = mutters
 chat-speech-verb-electricity-1 = crackles
 chat-speech-verb-electricity-2 = buzzes
 chat-speech-verb-electricity-3 = screeches
+
+chat-speech-verb-ipc-1 = states
+chat-speech-verb-ipc-2 = utters
+chat-speech-verb-ipc-3 = cogitates
+chat-speech-verb-ipc-4 = beeps

Resources/Locale/en-US/communications/communications-console-component.ftl

@@ -16,5 +16,5 @@ comms-console-announcement-unknown-sender = Unknown
 
 # Comms console variant titles
 comms-console-announcement-title-station = Communications Console
-comms-console-announcement-title-centcom = Central Command
-comms-console-announcement-title-nukie = Syndicate Nuclear Operative
+comms-console-announcement-title-centcom = High Command
+comms-console-announcement-title-nukie = Terragov Nuclear Operative

Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl

@@ -1,3 +1,3 @@
 advertisement-pride-1 = Be gay do crime!
 advertisement-pride-2 = Full of colors!
-advertisement-pride-3 = You are valid!
+advertisement-pride-3 = You are valid!

Resources/Locale/en-US/deltav/job/department.ftl

@@ -1,2 +1,2 @@
-department-Epistemics = Epistemics
-department-Logistics = Logistics
+department-Epistemics = Waffle Co.
+department-Logistics = Cybersun Industries

Resources/Locale/en-US/game-ticking/game-presets/preset-nukeops.ftl

@@ -3,32 +3,32 @@ nukeops-description = Nuclear operatives have targeted the station. Try to keep
 
 nukeops-welcome =
     You are a nuclear operative. Your goal is to blow up {$station}, and ensure that it is nothing but a pile of rubble. Your bosses, the Syndicate, have provided you with the tools you'll need for the task.
-    Operation {$name} is a go ! Death to Nanotrasen!
+    Operation {$name} is a go ! Glory to Terragov!
 
-nukeops-opsmajor = [color=crimson]Syndicate major victory![/color]
-nukeops-opsminor = [color=crimson]Syndicate minor victory![/color]
+nukeops-opsmajor = [color=darkgreen]Terragov major victory![/color]
+nukeops-opsminor = [color=darkgreen]Terragov minor victory![/color]
 nukeops-neutral = [color=yellow]Neutral outcome![/color]
-nukeops-crewminor = [color=green]Crew minor victory![/color]
-nukeops-crewmajor = [color=green]Crew major victory![/color]
+nukeops-crewminor = [color=crimson]Syndicate minor victory![/color]
+nukeops-crewmajor = [color=crimson]Syndicate major victory![/color]
 
-nukeops-cond-nukeexplodedoncorrectstation = The nuclear operatives managed to blow up the station.
-nukeops-cond-nukeexplodedonnukieoutpost = The nuclear operative outpost was destroyed by a nuclear blast.
+nukeops-cond-nukeexplodedoncorrectstation = The Terragov Marines managed to blow up the station.
+nukeops-cond-nukeexplodedonnukieoutpost = The Terragov Marine outpost was destroyed by a nuclear blast.
 nukeops-cond-nukeexplodedonincorrectlocation = The nuclear bomb was detonated off-station.
 nukeops-cond-nukeactiveinstation = The nuclear bomb was left armed on-station.
-nukeops-cond-nukeactiveatcentcom = The nuclear bomb was delivered to Central Command!
+nukeops-cond-nukeactiveatcentcom = The nuclear bomb was delivered to High Command!
 nukeops-cond-nukediskoncentcom = The crew escaped with the nuclear authentication disk.
 nukeops-cond-nukedisknotoncentcom = The crew left the nuclear authentication disk behind.
-nukeops-cond-nukiesabandoned = The nuclear operatives were abandoned.
-nukeops-cond-allnukiesdead = All nuclear operatives have died.
-nukeops-cond-somenukiesalive = Some nuclear operatives died.
-nukeops-cond-allnukiesalive = No nuclear operatives died.
+nukeops-cond-nukiesabandoned = The Terragov Marines were abandoned.
+nukeops-cond-allnukiesdead = All Terragov Marines have died.
+nukeops-cond-somenukiesalive = Some Terragov Marines died.
+nukeops-cond-allnukiesalive = No Terragov Marines died.
 
-nukeops-list-start = The operatives were:
+nukeops-list-start = The Marines were:
 nukeops-list-name = - [color=White]{$name}[/color]
 nukeops-list-name-user = - [color=White]{$name}[/color] ([color=gray]{$user}[/color])
 nukeops-not-enough-ready-players = Not enough players readied up for the game! There were {$readyPlayersCount} players readied up out of {$minimumPlayers} needed. Can't start Nukeops.
 nukeops-no-one-ready = No players readied up! Can't start Nukeops.
 
 nukeops-role-commander = Commander
-nukeops-role-agent = Agent
-nukeops-role-operator = Operator
+nukeops-role-agent = Marine
+nukeops-role-operator = Medic

Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

@@ -1,9 +1,9 @@
 ## Traitor
 
 traitor-round-end-codewords = The codewords were: [color=White]{$codewords}[/color]
-traitor-round-end-agent-name = traitor
+traitor-round-end-agent-name = Terragov Agent
 
-objective-issuer-syndicate = [color=crimson]The Syndicate[/color]
+objective-issuer-syndicate = [color=darkgreen]Terragov[/color]
 
 # Shown at the end of a round of Traitor
 
@@ -23,10 +23,10 @@ traitor-death-match-end-round-description-entry = {$originalName}'s PDA, with {$
 
 # TraitorRole
 traitor-role-greeting =
-    You are a syndicate agent.
+    You are a terragov agent.
     Your objectives and codewords are listed in the character menu.
     Use the uplink loaded into your PDA to buy the tools you'll need for this mission.
-    Death to Nanotrasen!
+    Glory to Terragov!
 traitor-role-codewords =
     The codewords are:
     {$codewords}.

Resources/Locale/en-US/job/department.ftl

@@ -1,8 +1,8 @@
-department-Cargo = Cargo
-department-Civilian = Civilian
-department-Command = Command
-department-Engineering = Engineering
-department-Medical = Medical
-department-Security = Security
-department-Science = Science
+department-Cargo = Cybersun Industries
+department-Civilian = Donk Company
+department-Command = Syndicate
+department-Engineering = Weathermaker Inc.
+department-Medical = Interdyne Pharmaceutics
+department-Security = Gorlex Marauders
+department-Science = Waffle Corporation
 department-Specific = Station specific

Resources/Locale/en-US/job/job-names.ftl

@@ -1,27 +1,27 @@
-job-name-warden = Warden
-job-name-security = Security Officer
-job-name-cadet = Security Cadet
-job-name-hos = Head of Security
+job-name-warden = Interrogator
+job-name-security = Gorlex Trooper
+job-name-cadet = Gorlex Private
+job-name-hos = Gorlex Commander
 job-name-detective = Detective
 job-name-brigmedic = Corpsman
 job-name-borg = Cyborg
-job-name-scientist = Scientist
-job-name-research-assistant = Research Assistant
-job-name-rd = Mystagogue
+job-name-scientist = Waffle Scientist
+job-name-research-assistant = Waffle Assistant
+job-name-rd = Waffle Director
 job-name-psychologist = Psychologist
-job-name-intern = Medical Intern
-job-name-doctor = Medical Doctor
+job-name-intern = Interdyne Intern
+job-name-doctor = Interdyne Doctor
 job-name-paramedic = Paramedic
-job-name-cmo = Chief Medical Officer
+job-name-cmo = Interdyne Director
 job-name-chemist = Chemist
 job-name-technical-assistant = Technical Assistant
 job-name-engineer = Station Engineer
 job-name-atmostech = Atmospheric Technician
 job-name-hop = Head of Personnel
-job-name-captain = Captain
+job-name-captain = Station Administrator
 job-name-serviceworker = Service Worker
-job-name-centcomoff = CentCom Official
-job-name-reporter = Reporter
+job-name-centcomoff = High Command Official
+job-name-reporter = Propogandist
 job-name-musician = Musician
 job-name-librarian = Librarian
 job-name-lawyer = Lawyer
@@ -32,9 +32,9 @@ job-name-chaplain = Chaplain
 job-name-botanist = Botanist
 job-name-bartender = Bartender
 job-name-passenger = Passenger
-job-name-salvagespec = Salvage specialist
-job-name-qm = Logistics Officer
-job-name-cargotech = Cargo Technician
+job-name-salvagespec = Operator
+job-name-qm = Cybersun Manager
+job-name-cargotech = Cybersun Technician
 job-name-chef = Chef
 job-name-clown = Clown
 job-name-ertleader = ERT Leader
@@ -69,7 +69,7 @@ JobERTLeader = ERT Leader
 JobERTMedical = ERT Medical
 JobERTSecurity = ERT Security
 JobHeadOfPersonnel = Head of Personnel
-JobHeadOfSecurity = Head of Security
+JobHeadOfSecurity = Gorlex Commander
 JobJanitor = Janitor
 JobLawyer = Lawyer
 JobLibrarian = Librarian
@@ -80,14 +80,14 @@ JobMusician = Musician
 JobParamedic = Paramedic
 JobPassenger = Passenger
 JobPsychologist = Psychologist
-JobQuartermaster = Logistics Officer
-JobReporter = Reporter
-JobResearchAssistant = Research Assistant
-JobResearchDirector = Mystagogue
-JobSalvageSpecialist = Salvage Specialist
-JobScientist = Scientist
-JobSecurityCadet = Security Cadet
-JobSecurityOfficer = Security Officer
+JobQuartermaster = Cybersun Manager
+JobReporter = Propogandist
+JobResearchAssistant = Waffle Assistant
+JobResearchDirector = Waffle Director
+JobSalvageSpecialist = Operator
+JobScientist = Waffle Scientist
+JobSecurityCadet = Gorlex Private
+JobSecurityOfficer = Gorlex Trooper
 JobSeniorEngineer = Senior Engineer
 JobSeniorOfficer = Senior Officer
 JobSeniorPhysician = Senior Physician
@@ -96,5 +96,5 @@ JobServiceWorker = Service Worker
 JobStationEngineer = Station Engineer
 JobTechnicalAssistant = Technical Assistant
 JobVisitor = Visitor
-JobWarden = Warden
+JobWarden = Interrogator
 JobZookeeper = Zookeeper

Resources/Locale/en-US/job/job-supervisors.ftl

@@ -1,15 +1,15 @@
-job-supervisors-centcom = CentCom official
-job-supervisors-captain = the captain
+job-supervisors-centcom = High Command
+job-supervisors-captain = The Administrator
 job-supervisors-hop = the head of personnel
-job-supervisors-hos = the head of security
+job-supervisors-hos = the Gorlex Commander
 job-supervisors-ce = the chief engineer
-job-supervisors-cmo = the chief medical officer
-job-supervisors-rd = the mystagogue
-job-supervisors-qm = the logistics officer
+job-supervisors-cmo = the Interdyne Director
+job-supervisors-rd = the Waffle Director
+job-supervisors-qm = the Cybersun Manager
 job-supervisors-service = chefs, botanists, the bartender, and the head of personnel
 job-supervisors-engineering = station engineers, atmospheric technicians, and the chief engineer
-job-supervisors-medicine = medical doctors, chemists, and the chief medical officer
-job-supervisors-security = security officers, the warden, and the head of security
-job-supervisors-science = scientists, and the mystagogue
+job-supervisors-medicine = Interdyne doctors, chemists, and the Interdyne director
+job-supervisors-security = Gorlex troopers, the Interrogator, and the Gorlex Commander
+job-supervisors-science = scientists, and the Waffle Director
 job-supervisors-hire = whoever hires you
 job-supervisors-everyone = absolutely everyone