MergeFixes

Content.Server/Telephone/TelephoneSystem.cs

@@ -6,6 +6,7 @@
 using Content.Server.Speech;
 using Content.Server.Speech.Components;
 using Content.Shared.Chat;
+using Content.Shared.Corvax.TTS;
 using Content.Shared.Database;
 using Content.Shared.Mind.Components;
 using Content.Shared.Power;
@@ -109,6 +110,18 @@ private void OnTelephoneMessageReceived(Entity<TelephoneComponent> entity, ref T
             ("originalName", nameEv.VoiceName));
 
         var volume = entity.Comp.SpeakerVolume == TelephoneVolume.Speak ? InGameICChatType.Speak : InGameICChatType.Whisper;
+        // Corvax-TTS-Start
+        // If speaker entity has TTS, the telephone will speak with the same voice
+        if(TryComp<TTSComponent>(args.MessageSource, out var ttsSpeaker))
+        {
+            EntityManager.EnsureComponent<TTSComponent>(entity, out var ttsTelephone);
+            ttsTelephone.VoicePrototypeId = ttsSpeaker.VoicePrototypeId;
+        }
+        else // Remove TTS if the speaker has no TTS
+        {
+            EntityManager.RemoveComponent<TTSComponent>(entity);
+        }
+        // Corvax-TTS-End
         _chat.TrySendInGameICMessage(entity, args.Message, volume, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false);
     }
 

Resources/Changelog/ChangelogSyndie.yml

@@ -1,27 +1,4 @@
 Entries:
-- author: lapatison
-  changes:
-  - message: "\u041F\u043E\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\
-      \u0440\u0435\u0432\u043E\u0434\u044B"
-    type: Tweak
-  id: 237
-  time: '2022-09-10T12:43:18.0000000+00:00'
-- author: lapatison
-  changes:
-  - message: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u044B \u0438\u043C\
-      \u0435\u043D\u0430 \u0432\u043E\u043B\u0448\u0435\u0431\u043D\u0438\u043A\u043E\
-      \u0432"
-    type: Add
-  id: 238
-  time: '2022-09-10T12:42:58.0000000+00:00'
-- author: Morty
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u043E\u0441\
-      \u043B\u0435\u0434\u043D\u0438\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\
-      \u043D\u0438\u044F"
-    type: Add
-  id: 239
-  time: '2022-09-11T11:57:56.0000000+00:00'
 - author: lapatison
   changes:
   - message: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u043E \u043F\u043E\
@@ -4570,3 +4547,39 @@
   id: 736
   time: '2024-12-16T12:44:59.0000000+00:00'
   url: https://github.com/space-syndicate/space-station-14/pull/2652
+- author: Rinidclown
+  changes:
+  - message: "Peal \u0432\u043E\u0437\u0432\u0440\u0430\u0449\u0435\u043D \u0432 \u043C\
+      \u0430\u043F\u043F\u0443\u043B \u043F\u043E\u0441\u043B\u0435 \u0440\u0435\u0432\
+      \u043E\u0440\u043A\u0430."
+    type: Add
+  id: 737
+  time: '2024-12-31T15:50:27.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2895
+- author: SonicHDC
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0441\u0435\u0437\
+      \u043E\u043D\u043D\u0430\u044F \u043C\u0430\u0441\u043A\u0430 \u043B\u0430\u043C\
+      \u043F\u044B-\u0451\u043B\u043A\u0438!"
+    type: Add
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0451\u043D \u0441\u043F\u0440\u0430\u0439\
+      \u0442 \u043B\u0430\u043C\u043F\u044B-\u043B\u0435\u0434\u0435\u043D\u0446\u0430\
+      !"
+    type: Tweak
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0451\u043D \u0441\u043F\u0440\u0430\u0439\
+      \u0442 \u043B\u0430\u043C\u043F\u044B \u0434\u043E\u0437\u043D\u0430\u0432\u0430\
+      \u0442\u0435\u043B\u044F!"
+    type: Tweak
+  id: 738
+  time: '2024-12-21T05:35:17.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2876
+- author: Zekins3366
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0437\u0432\u0443\u043A\
+      \ \u0443\u0432\u0435\u0434\u043E\u043C\u043B\u0435\u043D\u0438\u044F \u0434\u043B\
+      \u044F \u0441\u0442\u0430\u043D\u0446\u0438\u043E\u043D\u043D\u043E\u0433\u043E\
+      \ \u0418\u0418"
+    type: Add
+  id: 739
+  time: '2025-01-02T19:37:04.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2742

Resources/Prototypes/Corvax/Maps/Pools/default.yml

@@ -7,11 +7,18 @@
   - CorvaxAstra
   - CorvaxPilgrim
   - CorvaxGlacier
+  - Bagel
+  - Box
   # Midpop
   - CorvaxPaper
   - CorvaxOutpost
   - CorvaxAwesome
+  - CorvaxPearl
+  - Amber
+  - Marathon
   # Lowpop
   - CorvaxSilly
   - CorvaxMaus
   - CorvaxTushkan
+  - Omega
+  - Packed

Resources/Prototypes/Corvax/Maps/awesome.yml

@@ -1,9 +1,9 @@
 - type: gameMap
   id: CorvaxAwesome
   mapName: 'Awesome Station'
-  mapPath: /Maps/corvax_awesome.yml
-  minPlayers: 20
-  maxPlayers: 50
+  mapPath: /Maps/corvax_awesome.yml 
+  minPlayers: 25
+  maxPlayers: 55
   stations:
     Awesome:
       stationProto: StandardNanotrasenStation

Resources/Prototypes/Corvax/Maps/glacier.yml

@@ -18,7 +18,7 @@
           emergencyShuttlePath: /Maps/Shuttles/emergency_corvaxglacier.yml
         - type: StationBiome
           biome: GlacierPlanet
-          mapLightColor: "#090917FF"
+          mapLightColor: "#130D20FF"
         - type: GridSpawn
           groups:
             trade: !type:GridSpawnGroup

Resources/Prototypes/Corvax/Maps/outpost.yml

@@ -4,8 +4,8 @@
   mapPath: /Maps/corvax_outpost.yml
   maxRandomOffset: 0
   randomRotation: false
-  minPlayers: 20
-  maxPlayers: 50
+  minPlayers: 25
+  maxPlayers: 55
   stations:
     Outpost:
       stationProto: StandardNanotrasenStation

Resources/Prototypes/Corvax/Maps/paper.yml

@@ -4,8 +4,8 @@
   mapPath: /Maps/corvax_paper.yml
   maxRandomOffset: 0
   randomRotation: false
-  minPlayers: 20
-  maxPlayers: 50
+  minPlayers: 25
+  maxPlayers: 55
   stations:
     CorvaxPaper:
       stationProto: StandardNanotrasenStation

Resources/Prototypes/Corvax/Maps/pearl.yml

@@ -4,8 +4,8 @@
   mapPath: /Maps/corvax_pearl.yml
   maxRandomOffset: 0
   randomRotation: false
-  minPlayers: 20
-  maxPlayers: 50
+  minPlayers: 25
+  maxPlayers: 55
   stations:
     Pearl:
       stationProto: StandardNanotrasenStation
@@ -14,7 +14,7 @@
           mapNameTemplate: '{0} Pearl island {1}'
           nameGenerator:
             !type:NanotrasenNameGenerator
-            prefixCreator: 'SS'
+            prefixCreator: 'SR'
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/corvax_emergency.yml
         - type: StationJobs
@@ -28,7 +28,7 @@
             CargoTechnician: [ 3, 3 ]
             # engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 2, 2 ]
+            AtmosphericTechnician: [ 1, 1 ]
             StationEngineer: [ 3, 3 ]
             TechnicalAssistant: [ 3, 3 ]
             # medical
@@ -37,24 +37,24 @@
             MedicalIntern: [ 2, 2 ]
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
-            Chemist: [ 2, 2 ]
+            Chemist: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 2, 2 ]
             ResearchAssistant: [ 2, 2 ]
             # security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SecurityOfficer: [ 2, 2 ]
-            SecurityCadet: [ 1, 1 ]
+            SecurityOfficer: [ 3, 3 ]
+            SecurityCadet: [ 2, 2 ]
             Detective: [ 1, 1 ]
             Pilot: [ 2, 2 ]
             Brigmedic: [ 1, 1 ] # Corvax-Next-Brigmedic
             # service
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 2, 2 ]
             Botanist: [ 2, 2 ]
-            Boxer: [ 2, 2 ]
+            Boxer: [ 1, 1 ]
             Chaplain: [ 1, 1 ]
             Chef: [ 2, 2 ]
             Clown: [ 1, 1 ]
@@ -64,19 +64,28 @@
             Musician: [ 2, 2 ]
             ServiceWorker: [ 2, 2 ]
             Passenger: [ -1, -1 ]
+            Reporter: [ 1, 1 ]
             # silicon
             Borg: [ 1, 1 ]
+            StationAi: [ 1, 1 ]
         - type: StationGoal
           goals:
-          - Singularity
           - SolarPanels
           - Artifacts
           - Bank
           - Zoo
           - MiningOutpost
           - Tesla
           - SecurityTraining
+          - ShuttleMed
+          - ShuttleSec
+          - ShuttleRnd
+          - ShuttleSrv
+          - ShuttleEmergency
           - Theatre
+          - CellAI
           - Botany
           - Bunker
-          - BluespaceHarvest
+          - Survive
+          - BluespaceHarvest # Corvax-Next-BluespaceHarvest
+

Resources/Prototypes/Corvax/Maps/silly.yml

@@ -5,7 +5,7 @@
   maxRandomOffset: 0
   randomRotation: false
   minPlayers: 0
-  maxPlayers: 30
+  maxPlayers: 25
   stations:
     Silly:
       stationProto: StandardNanotrasenStation

Resources/Prototypes/Corvax/Maps/tushkan.yml

@@ -5,7 +5,7 @@
   maxRandomOffset: 0
   randomRotation: false
   minPlayers: 0
-  maxPlayers: 30
+  maxPlayers: 25
   stations:
     Tushkan:
       stationProto: StandardNanotrasenStation

Resources/Prototypes/Entities/Mobs/Player/silicon.yml

@@ -70,6 +70,8 @@
     canShuttle: false
     title: comms-console-announcement-title-station-ai
     color: "#5ed7aa"
+    global: true # Corvax-Announcements
+    sound: /Audio/Corvax/Announcements/aiannounce.ogg # Corvax-Announcements
   - type: HolographicAvatar
     layerData:
     - sprite: Mobs/Silicon/station_ai.rsi

Resources/Prototypes/Maps/bagel.yml

@@ -2,8 +2,7 @@
   id: Bagel
   mapName: 'Bagel Station'
   mapPath: /Maps/bagel.yml
-  minPlayers: 20 # Corvax-Mapping
-  maxPlayers: 50 # Corvax-Mapping
+  minPlayers: 55 # Corvax-Mapping
   stations:
     Bagel:
       stationProto: StandardNanotrasenStation

Resources/Textures/Clothing/Head/Hardhats/armored.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Discord: belay5",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Discord: belay5",
   "size": {
     "x": 32,
     "y": 32