Merge pull request #681 from fospas/new_song_alert

new code song

Content.Server/Backmen/GameTicking/Rules/BlobRuleSystem.cs

@@ -103,7 +103,7 @@ private bool CheckBlobInStation(EntityUid blobCore, TransformComponent? xform, [
     }
 
     private const string StationGamma = "gamma";
-    private const string StationSigma = "sigma";
+    private const string StationSierra = "sierra";
 
     private void CheckChangeStage(
         Entity<StationBlobConfigComponent?> stationUid,
@@ -138,7 +138,7 @@ private void CheckChangeStage(
                     BlobDetectAudio,
                     Color.Red);
 
-                _alertLevelSystem.SetLevel(stationUid, StationSigma, true, true, true, true);
+                _alertLevelSystem.SetLevel(stationUid, StationSierra, true, true, true, true);
 
                 RaiseLocalEvent(stationUid,
                     new BlobChangeLevelEvent

Resources/Audio/_Cats/AlertLevels/attributions.yml

@@ -0,0 +1,3 @@
+- files: ["blue.ogg, delta.ogg, enigma.ogg, epsilon.ogg, gamma.ogg, green.ogg, red.ogg, sierra.ogg, violet.ogg, yellow.ogg"]
+  license: "CC-BY-NC-ND-4.0"
+  copyright: "Owner boich9585 (discord) and head developer mynicknamewastaken (discord) of Space Station 14 server Dead Space"

Resources/Audio/_Cats/StationEvents/attributions.yml

@@ -0,0 +1,3 @@
+- files: ["spawn.ogg"]
+  license: "CC-BY-NC-ND-4.0"
+  copyright: "Owner boich9585 (discord) and head developer mynicknamewastaken (discord) of Space Station 14 server Dead Space"

Resources/Locale/ru-RU/backmen/SpecForces.ftl

@@ -4,7 +4,7 @@ spec-forces-system-ertAlpha-title = Alpha-1
 spec-forces-system-ertTay-title = Tay-39
 spec-forces-system-ertEpsilon-title = Epsilon-11
 spec-forces-system-RXBZZ-title = Объединенное Правительство Земли
-spec-forces-system-RXBZZ-annonce = ВНИМАНИЕ! Силы РХБЗЗ ОПЗ прибыли в сектор, всему гражданскому персоналу собраться на месте эвакуации и ожидать распроряженний.
+spec-forces-system-RXBZZ-annonce = Отряд быстрого реагирования отправляется к станции.
 spec-forces-system-ert-name = ОБР Theta-9
 spec-forces-system-alpha-name = СОБР Alpha-1
 spec-forces-system-tay-name = ОБР Tay-39

Resources/Prototypes/AlertLevels/alert_levels.yml

@@ -1,69 +1,69 @@
----
 - type: alertLevels
   id: stationAlerts
   defaultLevel: green
   levels:
     green:
       announcement: alert-level-green-announcement
-      sound:
-        path: /Audio/Misc/greenalert.ogg
-        params:
-            volume: -4
+      sound: /Audio/_Cats/AlertLevels/green.ogg # Cats edit
       color: Green
       emergencyLightColor: LawnGreen
       shuttleTime: 600
     blue:
       announcement: alert-level-blue-announcement
-      sound:
-        path: /Audio/Misc/bluealert.ogg
-        params:
-            volume: -4
+      sound: /Audio/_Cats/AlertLevels/blue.ogg # Cats edit
       color: DodgerBlue
       forceEnableEmergencyLights: true
       emergencyLightColor: DodgerBlue
       shuttleTime: 600
     violet:
       announcement: alert-level-violet-announcement
-      sound: /Audio/Misc/notice1.ogg
+      sound: /Audio/_Cats/AlertLevels/violet.ogg # Cats edit
       color: Violet
       emergencyLightColor: Violet
       forceEnableEmergencyLights: true
       shuttleTime: 600
     yellow:
       announcement: alert-level-yellow-announcement
-      sound: /Audio/Backmen/Misc/yellow_code2.ogg #Backmen-Edit
+      sound: /Audio/_Cats/AlertLevels/yellow.ogg # Cats edit
       color: Yellow
       emergencyLightColor: Goldenrod
       forceEnableEmergencyLights: true
       shuttleTime: 600
     red:
       announcement: alert-level-red-announcement
-      sound:
-        path: /Audio/Misc/redalert.ogg
-        params:
-          volume: -4
+      sound: /Audio/_Cats/AlertLevels/red.ogg # Cats edit
       color: Red
       emergencyLightColor: Red
       forceEnableEmergencyLights: true
       shuttleTime: 600 #No reduction in time as we don't have swiping for red alert like in /tg/. Shuttle times are intended to create friction, so having a way to brainlessly bypass that would be dumb.
     gamma:
       announcement: alert-level-gamma-announcement
       selectable: false
-      sound:
-        path: /Audio/Corvax/Misc/siren.ogg # Corvax: Return of the old siren sound
-        params:
-          volume: -4
+      sound: /Audio/_Cats/AlertLevels/gamma.ogg # Cats edit
       disableSelection: true
       color: PaleVioletRed
       emergencyLightColor: PaleVioletRed
       forceEnableEmergencyLights: true
+    sierra:
+      announcement: alert-level-sierra-announcement
+      selectable: false
+      sound: /Audio/_Cats/AlertLevels/sierra.ogg # Cats edit
+      disableSelection: true
+      color: LightSeaGreen
+      emergencyLightColor: LightSeaGreen
+      forceEnableEmergencyLights: true
+    enigma:
+      announcement: alert-level-enigma-announcement
+      selectable: false
+      sound: /Audio/_Cats/AlertLevels/enigma.ogg # Cats edit
+      disableSelection: true
+      color: '#EF7200'
+      emergencyLightColor: '#EF7200'
+      forceEnableEmergencyLights: true
     delta:
       announcement: alert-level-delta-announcement
       selectable: false
-      sound:
-        path: /Audio/Misc/delta.ogg
-        params:
-          volume: -6 # Corvax: Reduce sound volume
+      sound: /Audio/_Cats/AlertLevels/delta.ogg # Cats edit
       disableSelection: true
       color: DarkRed
       emergencyLightColor: Orange
@@ -72,42 +72,9 @@
     epsilon:
       announcement: alert-level-epsilon-announcement
       selectable: false
-      sound:
-        path: /Audio/Misc/epsilon.ogg
-        params:
-          volume: -4
+      sound: /Audio/_Cats/AlertLevels/epsilon.ogg # Cats edit
       disableSelection: true
       color: DarkViolet
       emergencyLightColor: DarkViolet
       forceEnableEmergencyLights: true
       shuttleTime: 1200
-    sintwave:
-      announcement: alert-level-sintwave-announcement
-      selectable: false
-      sound:
-        path: /Audio/Misc/sintwave.ogg
-        params:
-          volume: -4
-      disableSelection: false
-      color: Violet
-      emergencyLightColor: Violet
-      forceEnableEmergencyLights: false
-      shuttleTime: 400
-    sigma:
-      announcement: alert-level-sigma-announcement
-      selectable: false
-      sound:
-        path: /Audio/Misc/sigma.ogg
-        params:
-          volume: -4
-      disableSelection: true
-      color: Pink
-      emergencyLightColor: Violet
-      forceEnableEmergencyLights: true
-      shuttleTime: 1200
-    white:
-      announcement: alert-level-white-announcement
-      sound: /Audio/Misc/white.ogg
-      color: White
-      emergencyLightColor: PaleVioletRed
-      shuttleTime: 600

Resources/Prototypes/SoundCollections/NukeMusic.yml

@@ -1,12 +1,15 @@
 - type: soundCollection
   id: NukeMusic
   files:
-    - /Audio/StationEvents/running_out.ogg
-    - /Audio/StationEvents/countdown.ogg
-    - /Audio/StationEvents/clearly_nuclear.ogg
-    - /Audio/Corvax/StationEvents/level.ogg # Corvax-NukeMusic
-    - /Audio/Backmen/Adminbuse/Invader-303.ogg # Backmen-NukeMusic
-    - /Audio/StationEvents/sound_station_14.ogg
-    - /Audio/Corvax/StationEvents/level.ogg # Corvax-NukeMusic
-    - /Audio/StationEvents/sound_station_14.ogg
-    - /Audio/StationEvents/nukemass.ogg
+  #  - /Audio/StationEvents/running_out.ogg
+  #  - /Audio/StationEvents/countdown.ogg
+  #  - /Audio/StationEvents/clearly_nuclear.ogg
+  #  - /Audio/Corvax/StationEvents/level.ogg # Corvax-NukeMusic
+  #  - /Audio/Backmen/Adminbuse/Invader-303.ogg # Backmen-NukeMusic
+  #  - /Audio/StationEvents/sound_station_14.ogg
+  #  - /Audio/Corvax/StationEvents/level.ogg # Corvax-NukeMusic
+  #  - /Audio/StationEvents/sound_station_14.ogg
+  #  - /Audio/StationEvents/nukemass.ogg
+    - /Audio/_Cats/StationEvents/Warhead_voice_upd1.ogg # Cats edit
+    - /Audio/_Cats/StationEvents/Warhead_voice_upd2.ogg # Cats edit
+    - /Audio/_Cats/StationEvents/Warhead_voice_upd3.ogg # Cats edit

Resources/Prototypes/_Backmen/specforces.yml

@@ -17,7 +17,7 @@
   spawnMarker: MarkerSpecforce
   announcementText: spec-forces-system-ertcall-annonce
   announcementTitle: spec-forces-system-ertcall-title
-  announcementSoundPath: /Audio/Corvax/Adminbuse/Yesert.ogg
+  announcementSoundPath: /Audio/_Cats/StationEvents/spawn.ogg
   maxRolesAmount: 8
   raffleConfig:
     settings: short
@@ -38,6 +38,7 @@
   spawnMarker: MarkerSpecforce
   announcementText: spec-forces-system-RXBZZ-annonce
   announcementTitle: spec-forces-system-RXBZZ-title
+  announcementSoundPath: /Audio/_Cats/StationEvents/spawn.ogg
   maxRolesAmount: 8
   raffleConfig:
     settings: short
@@ -65,7 +66,7 @@
   spawnMarker: MarkerSpecforce
   announcementText: spec-forces-system-ertcall-annonce
   announcementTitle: spec-forces-system-ertAlpha-title
-  announcementSoundPath: /Audio/Corvax/Adminbuse/Yesert.ogg
+  announcementSoundPath: /Audio/_Cats/StationEvents/spawn.ogg
   maxRolesAmount: 4
   raffleConfig:
     settings: short
@@ -84,7 +85,7 @@
   spawnMarker: MarkerSpecforce
   announcementText: spec-forces-system-ertcall-annonce
   announcementTitle: spec-forces-system-ertEpsilon-title
-  announcementSoundPath: /Audio/Corvax/Adminbuse/Yesert.ogg
+  announcementSoundPath: /Audio/_Cats/StationEvents/spawn.ogg
   maxRolesAmount: 10
   spawnPerPlayers: 5
   raffleConfig:
@@ -105,7 +106,7 @@
   spawnMarker: MarkerSpecforce
   announcementText: spec-forces-system-ertcall-annonce
   announcementTitle: spec-forces-system-ertTay-title
-  announcementSoundPath: /Audio/Corvax/Adminbuse/Yesert.ogg
+  announcementSoundPath: /Audio/_Cats/StationEvents/spawn.ogg
   maxRolesAmount: 2
   raffleConfig:
     settings: short