Fixed traitors, new synth sounds, Urist update

Simple-Station · Apr 26, 2024 · 4c3724d · 4c3724d
1 parent 55794de
commit 4c3724d
Show file tree

Hide file tree

Showing 22 changed files with 192 additions and 92 deletions.
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/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

diff --git a/Resources/Audio/Announcements/RoundEnd/Imhim.ogg b/Resources/Audio/Announcements/RoundEnd/Imhim.ogg
diff --git a/Resources/Audio/Announcements/RoundEnd/Jew.ogg b/Resources/Audio/Announcements/RoundEnd/Jew.ogg
diff --git a/Resources/Audio/Announcements/RoundEnd/UristMc.ogg b/Resources/Audio/Announcements/RoundEnd/UristMc.ogg
diff --git a/Resources/Audio/Voice/Talk/syndieborg.ogg b/Resources/Audio/Voice/Talk/syndieborg.ogg
diff --git a/Resources/Audio/Voice/Talk/syndieborg_ask.ogg b/Resources/Audio/Voice/Talk/syndieborg_ask.ogg
diff --git a/Resources/Audio/Voice/Talk/syndieborg_exclaim.ogg b/Resources/Audio/Voice/Talk/syndieborg_exclaim.ogg
diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/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
diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-nukeops.ftl b/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
diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl b/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}.

diff --git a/Resources/Maps/Shuttles/Syndicate-Transporter.yml b/Resources/Maps/Shuttles/Syndicate-Transporter.yml
@@ -13,10 +13,8 @@ entities:
   - uid: 1
     components:
     - type: MetaData
-      name: grid
     - type: Transform
-      pos: -1.1116635,0.37235177
-      parent: 6
+      parent: invalid
     - type: MapGrid
       chunks:
         0,0:
@@ -164,18 +162,6 @@ entities:
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
-  - uid: 6
-    components:
-    - type: MetaData
-      name: map 2
-    - type: Transform
-    - type: Map
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-    - type: LoadedMap
 - proto: AirlockHatchSyndicate
   entities:
   - uid: 42

diff --git a/Resources/Prototypes/Datasets/Names/synth_first.yml b/Resources/Prototypes/Datasets/Names/synth_first.yml
@@ -1,54 +1,54 @@
 - type: dataset
   id: names_synth_first
   values:
-  - Sweeper
-  - Welder
-  - Grinder
-  - Mover
-  - Drainer
-  - Sorter
-  - Cutter
-  - Plumber
-  - Packer
-  - Loader
-  - Fixer
-  - Digger
-  - Assembler
-  - Cleaner
-  - Picker
-  - Installer
-  - Shifter
-  - Refiner
-  - Matcher
-  - Scooper
-  - Smoother
-  - Tidier
-  - Adjuster
-  - Organiser
-  - Tester
-  - Fitter
-  - Aligner
-  - Handler
-  - Stacker
-  - Separator
-  - Joiner
-  - Lifter
-  - Balancer
-  - Arranger
-  - Marker
-  - Dispenser
-  - Threader
-  - Slicer
-  - Coiler
-  - Setter
-  - Sealer
-  - Riveter
-  - Spinner
-  - Connector
-  - Scaler
-  - Greaser
-  - Scraper
-  - Harvester
-  - Strainer
-  - Loader
+  - Sweeper -
+  - Welder -
+  - Grinder -
+  - Mover -
+  - Drainer -
+  - Sorter -
+  - Cutter -
+  - Plumber -
+  - Packer -
+  - Loader -
+  - Fixer -
+  - Digger -
+  - Assembler -
+  - Cleaner -
+  - Picker -
+  - Installer -
+  - Shifter -
+  - Refiner -
+  - Matcher -
+  - Scooper -
+  - Smoother -
+  - Tidier -
+  - Adjuster -
+  - Organiser -
+  - Tester -
+  - Fitter -
+  - Aligner -
+  - Handler -
+  - Stacker -
+  - Separator -
+  - Joiner -
+  - Lifter -
+  - Balancer -
+  - Arranger -
+  - Marker -
+  - Dispenser -
+  - Threader -
+  - Slicer -
+  - Coiler -
+  - Setter -
+  - Sealer -
+  - Riveter -
+  - Spinner -
+  - Connector -
+  - Scaler -
+  - Greaser -
+  - Scraper -
+  - Harvester -
+  - Strainer -
+  - Loader -
 
diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -87,3 +87,17 @@
     nameSegments:
     - names_ninja_title
     - names_ninja
+
+- type: entity
+  save: false
+  name: Urist McHands
+  parent: BaseMobHuman
+  id: MobUristAgent
+  components:
+    - type: Loadout
+      prototypes:
+        - SyndicateFootsoldierGearRuin
+    - type: GhostRole
+      name: Syndicate Clone Soldier
+      description: Urist Squad has been activated, work with your brothers and complete your objective.
+    - type: GhostTakeoverAvailable
diff --git a/Resources/Prototypes/Entities/Mobs/Species/ipc.yml b/Resources/Prototypes/Entities/Mobs/Species/ipc.yml
@@ -125,6 +125,7 @@
       - Binary
       - Common
     - type: Speech
+      speechVerb: IPC
       speechSounds: IPC
     - type: Vocal
       sounds:

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -499,3 +499,26 @@
     sprite: Objects/Consumable/Drinks/wine_can.rsi
   - type: Item
     sprite: Objects/Consumable/Drinks/wine_can.rsi
+
+- type: entity
+  parent: DrinkCanBaseFull
+  id: DrinkRussianCan
+  name: Canned Black Russian
+  description: Sweet, sweet alcoholic coffee in a can. An Urist's favorite drink.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: BlackRussian
+          Quantity: 30
+  - type: Tag
+    tags:
+    - Cola
+    - DrinkCan
+    - Recyclable
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/beer_can.rsi
+  - type: Item
+    sprite: Objects/Consumable/Drinks/beer_can.rsi
diff --git a/Resources/Prototypes/Maps/Pools/default.yml b/Resources/Prototypes/Maps/Pools/default.yml
@@ -9,5 +9,6 @@
   - Pebble
   - Shoukou
   - Tortuga
+  - Saltern
   - TheHive
   #- Submarine
diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml
@@ -0,0 +1,60 @@
+- type: gameMap
+  id: Saltern
+  mapName: 'Saltern'
+  mapPath: /Maps/saltern.yml
+  minPlayers: 0
+  maxPlayers: 35
+  fallback: true
+  stations:
+    Saltern:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: '{0} Saltern {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          overflowJobs:
+          - Passenger
+          availableJobs:
+            #service
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+            Bartender: [ 1, 1 ]
+            Botanist: [ 2, 2 ]
+            Chef: [ 1, 1 ]
+            Janitor: [ 1, 1 ]
+            Chaplain: [ 1, 1 ]
+            Librarian: [ 1, 1 ]
+            ServiceWorker: [ 2, 2 ]
+            #engineering
+            ChiefEngineer: [ 1, 1 ]
+            AtmosphericTechnician: [ 2, 2 ]
+            StationEngineer: [ 4, 4 ]
+            TechnicalAssistant: [ 4, 4 ]
+            #medical
+            ChiefMedicalOfficer: [ 1, 1 ]
+            Chemist: [ 2, 2 ]
+            MedicalDoctor: [ 3, 3 ]
+            MedicalIntern: [ 4, 4 ]
+            #science
+            ResearchDirector: [ 1, 1 ]
+            Scientist: [ 4, 4 ]
+            ResearchAssistant: [ 2, 2 ]
+            Borg: [ 2, 2 ]
+            #security
+            HeadOfSecurity: [ 1, 1 ]
+            Warden: [ 1, 1 ]
+            SecurityOfficer: [ 4, 4 ]
+            SecurityCadet: [ 4, 4 ]
+            #supply
+            Quartermaster: [ 1, 1 ]
+            SalvageSpecialist: [ 1, 3 ]
+            CargoTechnician: [ 2, 2 ]
+            #civillian
+            Passenger: [ -1, -1 ]
+            Clown: [ 1, 1 ]
+            Mime: [ 1, 1 ]
+            Musician: [ 1, 1 ]
+
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -42,7 +42,7 @@
 - type: entity
   parent: ClothingHeadHelmetHardsuitERTLeader
   id: ClothingHeadHelmetHardsuitERTCentcomm
-  name: CentCom hardsuit helmet
+  name: Terragov hardsuit helmet
   components:
   - type: Sprite
     sprite: Nyanotrasen/Clothing/Head/Hardsuits/ERThelmets/ertcentcomm.rsi

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -39,9 +39,10 @@
     newItem: null
 
 - type: entity
-  parent: ClothingOuterHardsuitERTLeader
+  parent: ClothingOuterHardsuitSyndie
   id: ClothingOuterHardsuitERTCentcomm
-  name: CentCom hardsuit
+  name: Terragov Hardsuit
+  description: Standard issue Marine combat hardsuit. Smells like freedom.
   components:
   - type: Sprite
     sprite: Nyanotrasen/Clothing/OuterClothing/Hardsuits/ERTSuits/ertcentcomm.rsi

diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
@@ -39,7 +39,7 @@
   noSpawn: true
   parent: [BaseTraitorObjective, BaseLivingObjective]
   id: EscapeShuttleObjective
-  name: Escape to centcom alive and unrestrained.
+  name: Escape to highcom alive and unrestrained.
   description: One of our undercover agents will debrief you when you arrive. Don't show up in cuffs.
   components:
   - type: Objective
@@ -88,7 +88,7 @@
   noSpawn: true
   parent: [BaseTraitorObjective, BaseKillObjective]
   id: KillRandomPersonObjective
-  description: Do it however you like, just make sure they don't make it to centcom.
+  description: Do it however you like, just make sure they don't make it to highcom.
   components:
   - type: Objective
     difficulty: 1.75

diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml
@@ -127,8 +127,8 @@
 - type: speechSounds
   id: IPC
   saySound:
-    path: /Audio/Voice/Talk/pai.ogg
+    path: /Audio/Voice/Talk/syndieborg.ogg
   askSound:
-    path: /Audio/Voice/Talk/pai_ask.ogg
+    path: /Audio/Voice/Talk/syndieborg_ask.ogg
   exclaimSound:
-    path: /Audio/Voice/Talk/pai_exclaim.ogg
+    path: /Audio/Voice/Talk/syndieborg_exclaim.ogg