From 26c1aa1e29d00a97986bf705d236235316c7b580 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 16 Jul 2024 15:57:55 -0400 Subject: [PATCH] Revert "Random Announcer System (#415)" This reverts commit e3bc8d4c0e6cf7c4a514fe21411ce38d74d1df6f. --- .../Announcements/Systems/AnnouncerSystem.cs | 69 ------- Content.Client/Audio/ContentAudioSystem.cs | 3 +- Content.Client/Options/UI/Tabs/AudioTab.xaml | 13 -- .../Options/UI/Tabs/AudioTab.xaml.cs | 18 +- .../Tests/Announcers/AnnouncerFallbackTest.cs | 41 ---- .../Announcers/AnnouncerLocalizationTest.cs | 66 ------ .../Administration/UI/AdminAnnounceEui.cs | 8 +- Content.Server/AlertLevel/AlertLevelSystem.cs | 57 +++++- .../Announcements/AnnounceCommand.cs | 83 ++------ .../Systems/AnnouncerSystem.Announce.cs | 96 --------- .../Systems/AnnouncerSystem.Announcer.cs | 68 ------- .../Announcements/Systems/AnnouncerSystem.cs | 33 --- .../Chat/Systems/AnnounceOnSpawnSystem.cs | 7 +- .../Communications/CommsHackerSystem.cs | 6 +- .../CommunicationsConsoleSystem.cs | 12 +- Content.Server/Dragon/DragonRiftSystem.cs | 5 +- .../GameTicking/GameTicker.RoundFlow.cs | 9 +- .../GameTicking/Rules/ZombieRuleSystem.cs | 10 +- Content.Server/Nuke/NukeCodePaperSystem.cs | 11 +- Content.Server/Nuke/NukeSystem.cs | 27 +-- Content.Server/NukeOps/WarDeclaratorSystem.cs | 5 +- Content.Server/PowerSink/PowerSinkSystem.cs | 11 +- Content.Server/RoundEnd/RoundEndSystem.cs | 36 ++-- .../Systems/EmergencyShuttleSystem.Console.cs | 48 ++--- .../Systems/EmergencyShuttleSystem.cs | 28 +-- .../Components/StationEventComponent.cs | 10 +- .../StationEvents/Events/AnomalySpawnRule.cs | 15 +- .../Events/BluespaceArtifactRule.cs | 16 +- .../StationEvents/Events/BreakerFlipRule.cs | 14 +- .../StationEvents/Events/CargoGiftsRule.cs | 17 +- .../StationEvents/Events/FalseAlarmRule.cs | 15 +- .../Events/PowerGridCheckRule.cs | 7 + .../Events/RandomSentienceRule.cs | 20 +- .../Events/StationEventSystem.cs | 30 +-- .../Events/AnnouncementSendEvent.cs | 23 --- .../Prototypes/AnnouncerPrototype.cs | 71 ------- .../Systems/SharedAnnouncerSystem.cs | 152 -------------- Content.Shared/CCVar/CCVars.cs | 34 +--- .../Announcers/Intern/comms/announce.ogg | Bin 35822 -> 0 bytes .../Announcers/Intern/comms/announce/1.ogg | Bin 102468 -> 0 bytes .../Announcers/Intern/comms/announce/10.ogg | Bin 160863 -> 0 bytes .../Announcers/Intern/comms/announce/11.ogg | Bin 150097 -> 0 bytes .../Announcers/Intern/comms/announce/12.ogg | Bin 92146 -> 0 bytes .../Announcers/Intern/comms/announce/13.ogg | Bin 98939 -> 0 bytes .../Announcers/Intern/comms/announce/14.ogg | Bin 148701 -> 0 bytes .../Announcers/Intern/comms/announce/2.ogg | Bin 140028 -> 0 bytes .../Announcers/Intern/comms/announce/3.ogg | Bin 133182 -> 0 bytes .../Announcers/Intern/comms/announce/4.ogg | Bin 200349 -> 0 bytes .../Announcers/Intern/comms/announce/5.ogg | Bin 170026 -> 0 bytes .../Announcers/Intern/comms/announce/6.ogg | Bin 145638 -> 0 bytes .../Announcers/Intern/comms/announce/7.ogg | Bin 105220 -> 0 bytes .../Announcers/Intern/comms/announce/8.ogg | Bin 117420 -> 0 bytes .../Announcers/Intern/comms/announce/9.ogg | Bin 110613 -> 0 bytes .../Intern/comms/commandReport/1.ogg | Bin 156473 -> 0 bytes .../Intern/comms/commandReport/2.ogg | Bin 126487 -> 0 bytes .../Intern/comms/commandReport/3.ogg | Bin 133089 -> 0 bytes .../Announcers/Intern/comms/welcome/1.ogg | Bin 216587 -> 0 bytes .../Announcers/Intern/comms/welcome/2.ogg | Bin 134721 -> 0 bytes .../Announcers/Intern/comms/welcome/3.ogg | Bin 176941 -> 0 bytes .../Announcers/Intern/comms/welcome/4.ogg | Bin 195618 -> 0 bytes .../Announcers/Intern/comms/welcome/5.ogg | Bin 128972 -> 0 bytes .../Announcers/Intern/comms/welcome/6.ogg | Bin 252877 -> 0 bytes .../Audio/Announcers/Intern/events/aliens.ogg | Bin 218140 -> 0 bytes .../Announcers/Intern/events/anomaly.ogg | Bin 143965 -> 0 bytes .../Announcers/Intern/events/ion_storm.ogg | Bin 110276 -> 0 bytes .../Announcers/Intern/events/meteors.ogg | Bin 185302 -> 0 bytes .../events/power_grid_check-complete.ogg | Bin 193831 -> 0 bytes .../Intern/events/power_grid_check.ogg | Bin 306936 -> 0 bytes .../Intern/shuttle/shuttlecalled.ogg | Bin 150216 -> 0 bytes .../Announcers/Intern/shuttle/shuttledock.ogg | Bin 210641 -> 0 bytes .../Intern/shuttle/shuttlerecalled.ogg | Bin 172744 -> 0 bytes .../Audio/Announcers/Intern/unused/animes.ogg | Bin 81891 -> 0 bytes .../Announcers/Intern/unused/intercept.ogg | Bin 207046 -> 0 bytes .../Audio/Announcers/Intern/unused/newai.ogg | Bin 80678 -> 0 bytes .../Announcers/Intern/unused/outbreak7.ogg | Bin 190394 -> 0 bytes .../Announcers/Intern/unused/radiation.ogg | Bin 178705 -> 0 bytes .../Announcers/MedBot/comms/announce.ogg | Bin 35822 -> 0 bytes .../Announcers/MedBot/comms/attention.ogg | Bin 19483 -> 0 bytes .../MedBot/comms/command_report.ogg | Bin 70972 -> 0 bytes .../Audio/Announcers/MedBot/comms/welcome.ogg | Bin 65861 -> 0 bytes .../Audio/Announcers/MedBot/events/aliens.ogg | Bin 151880 -> 0 bytes .../Announcers/MedBot/events/anomaly.ogg | Bin 107505 -> 0 bytes .../Announcers/MedBot/events/ion_storm.ogg | Bin 135328 -> 0 bytes .../Announcers/MedBot/events/meteors.ogg | Bin 86390 -> 0 bytes .../events/power_grid_check-complete.ogg | Bin 112764 -> 0 bytes .../MedBot/events/power_grid_check.ogg | Bin 214285 -> 0 bytes .../Audio/Announcers/MedBot/fallback.ogg | Bin 19483 -> 0 bytes .../MedBot/shuttle/shuttlecalled.ogg | Bin 47449 -> 0 bytes .../Announcers/MedBot/shuttle/shuttledock.ogg | Bin 62951 -> 0 bytes .../MedBot/shuttle/shuttlerecalled.ogg | Bin 51039 -> 0 bytes .../Audio/Announcers/MedBot/unused/animes.ogg | Bin 63440 -> 0 bytes .../Announcers/MedBot/unused/intercept.ogg | Bin 121798 -> 0 bytes .../Audio/Announcers/MedBot/unused/newai.ogg | Bin 80678 -> 0 bytes .../Announcers/MedBot/unused/outbreak7.ogg | Bin 142209 -> 0 bytes .../Announcers/MedBot/unused/radiation.ogg | Bin 138306 -> 0 bytes .../Audio/Announcers/Michael/alerts/blue.ogg | Bin 115712 -> 0 bytes .../Announcers/Michael/alerts/epsilon.ogg | Bin 294411 -> 0 bytes .../Audio/Announcers/Michael/alerts/gamma.ogg | Bin 170270 -> 0 bytes .../Audio/Announcers/Michael/alerts/green.ogg | Bin 77151 -> 0 bytes .../Audio/Announcers/Michael/alerts/red.ogg | Bin 146376 -> 0 bytes .../Audio/Announcers/Michael/alerts/rename.js | 191 ------------------ .../Announcers/Michael/alerts/violet.ogg | Bin 118235 -> 0 bytes .../Audio/Announcers/Michael/alerts/white.ogg | Bin 162770 -> 0 bytes .../Announcers/Michael/alerts/yellow.ogg | Bin 98098 -> 0 bytes .../Announcers/Michael/comms/attention.ogg | Bin 15392 -> 0 bytes .../Announcers/Michael/comms/welcome.ogg | Bin 50665 -> 0 bytes .../Announcers/Michael/events/aliens.ogg | Bin 120608 -> 0 bytes .../Michael/events/bureaucratic_error.ogg | Bin 75957 -> 0 bytes .../Announcers/Michael/events/gas_leak.ogg | Bin 76964 -> 0 bytes .../Michael/events/kudzu_growth.ogg | Bin 88727 -> 0 bytes .../Announcers/Michael/events/meteors.ogg | Bin 78851 -> 0 bytes .../Michael/events/noospheric_storm.ogg | Bin 86626 -> 0 bytes .../events/power_grid_check-complete.ogg | Bin 80103 -> 0 bytes .../Michael/events/power_grid_check.ogg | Bin 105164 -> 0 bytes .../Announcers/Michael/events/vent_clog.ogg | Bin 85088 -> 0 bytes .../Audio/Announcers/Michael/fallback.ogg | Bin 15392 -> 0 bytes .../Michael/shuttle/shuttle_called.ogg | Bin 38997 -> 0 bytes .../Michael/shuttle/shuttle_dock.ogg | Bin 41514 -> 0 bytes .../Michael/shuttle/shuttle_recalled.ogg | Bin 38917 -> 0 bytes .../Announcers/Michael/unused/outbreak7.ogg | Bin 136445 -> 0 bytes .../Announcers/Michael/unused/radiation.ogg | Bin 91714 -> 0 bytes .../Announcers/NEIL/alerts/code_blue.ogg | Bin 354605 -> 0 bytes .../Announcers/NEIL/alerts/code_delta.ogg | Bin 306898 -> 0 bytes .../Announcers/NEIL/alerts/code_epsilon.ogg | Bin 402415 -> 0 bytes .../Announcers/NEIL/alerts/code_gamma.ogg | Bin 567799 -> 0 bytes .../Announcers/NEIL/alerts/code_green.ogg | Bin 179235 -> 0 bytes .../Audio/Announcers/NEIL/alerts/code_red.ogg | Bin 400865 -> 0 bytes .../Announcers/NEIL/alerts/code_violet.ogg | Bin 522190 -> 0 bytes .../Announcers/NEIL/alerts/code_white.ogg | Bin 442916 -> 0 bytes .../Announcers/NEIL/alerts/code_yellow.ogg | Bin 500482 -> 0 bytes .../Audio/Announcers/NEIL/comms/announce.ogg | Bin 35822 -> 0 bytes .../Audio/Announcers/NEIL/comms/attention.ogg | Bin 37665 -> 0 bytes .../Audio/Announcers/NEIL/comms/welcome.ogg | Bin 96571 -> 0 bytes .../NEIL/events/bureaucraticerror.ogg | Bin 206582 -> 0 bytes .../Audio/Announcers/NEIL/events/gasleak.ogg | Bin 213235 -> 0 bytes .../Audio/Announcers/NEIL/events/kudzu.ogg | Bin 280824 -> 0 bytes .../Audio/Announcers/NEIL/events/meteors.ogg | Bin 119462 -> 0 bytes .../NEIL/events/noosphericstorm.ogg | Bin 165475 -> 0 bytes .../NEIL/events/power_grid_check-complete.ogg | Bin 126312 -> 0 bytes .../NEIL/events/power_grid_check.ogg | Bin 230238 -> 0 bytes .../Audio/Announcers/NEIL/events/ventclog.ogg | Bin 221682 -> 0 bytes Resources/Audio/Announcers/NEIL/fallback.ogg | Bin 37665 -> 0 bytes .../Announcers/NEIL/shuttle/shuttlecalled.ogg | Bin 98909 -> 0 bytes .../Announcers/NEIL/shuttle/shuttledock.ogg | Bin 107700 -> 0 bytes .../NEIL/shuttle/shuttlerecalled.ogg | Bin 99302 -> 0 bytes .../Announcers/NEIL/unused/outbreak7.ogg | Bin 176909 -> 0 bytes .../Announcers/NEIL/unused/radiation.ogg | Bin 230557 -> 0 bytes .../Announcers/VoxFem/comms/announce.ogg | Bin 35822 -> 0 bytes .../Announcers/VoxFem/comms/attention.ogg | Bin 15909 -> 0 bytes .../VoxFem/comms/command_report.ogg | Bin 26575 -> 0 bytes .../Audio/Announcers/VoxFem/comms/welcome.ogg | Bin 30253 -> 0 bytes .../Audio/Announcers/VoxFem/events/aliens.ogg | Bin 64985 -> 0 bytes .../Announcers/VoxFem/events/anomaly.ogg | Bin 40469 -> 0 bytes .../Announcers/VoxFem/events/ion_storm.ogg | Bin 50216 -> 0 bytes .../Announcers/VoxFem/events/meteors.ogg | Bin 33801 -> 0 bytes .../events/power_grid_check-complete.ogg | Bin 44327 -> 0 bytes .../VoxFem/events/power_grid_check.ogg | Bin 76821 -> 0 bytes .../Audio/Announcers/VoxFem/fallback.ogg | Bin 15909 -> 0 bytes .../VoxFem/shuttle/shuttlecalled.ogg | Bin 25597 -> 0 bytes .../Announcers/VoxFem/shuttle/shuttledock.ogg | Bin 25806 -> 0 bytes .../VoxFem/shuttle/shuttlerecalled.ogg | Bin 25943 -> 0 bytes .../Audio/Announcers/VoxFem/unused/newai.ogg | Bin 71923 -> 0 bytes .../Announcers/VoxFem/unused/outbreak7.ogg | Bin 57305 -> 0 bytes .../Announcers/VoxFem/unused/radiation.ogg | Bin 58436 -> 0 bytes .../announcements/announcers/announcers.ftl | 5 - .../station-events/events/xeno-vent.ftl | 2 +- .../en-US/escape-menu/ui/options-menu.ftl | 1 - .../Locale/en-US/game-ticking/game-ticker.ftl | 3 +- .../station-events/events/anomaly-spawn.ftl | 4 +- .../events/bluespace-artifact.ftl | 2 +- .../station-events/events/cargo-gifts.ftl | 20 +- .../en-US/station-events/events/gas-leak.ftl | 4 +- .../station-events/events/immovable-rod.ftl | 2 +- .../en-US/station-events/events/ion-storm.ftl | 2 +- .../station-events/events/kudzu-growth.ftl | 2 +- .../station-events/events/meteor-swarm.ftl | 4 +- .../events/power-grid-check.ftl | 4 +- .../station-events/events/radiation-storm.ftl | 4 +- .../station-events/events/solar-flare.ftl | 4 +- .../en-US/station-events/events/vent-clog.ftl | 2 +- .../station-events/events/vent-critters.ftl | 5 +- .../Announcers/!randomAnnouncers.yml | 8 - Resources/Prototypes/Announcers/intern.yml | 134 ------------ Resources/Prototypes/Announcers/medbot.yml | 132 ------------ Resources/Prototypes/Announcers/michael.yml | 134 ------------ Resources/Prototypes/Announcers/neil.yml | 134 ------------ Resources/Prototypes/Announcers/template | 158 --------------- Resources/Prototypes/Announcers/voxfem.yml | 132 ------------ .../Prototypes/DeltaV/GameRules/events.yml | 4 +- Resources/Prototypes/GameRules/events.yml | 66 ++++-- .../Nyanotrasen/GameRules/events.yml | 4 +- .../SoundCollections/Announcers/intern.yml | 34 ---- 192 files changed, 272 insertions(+), 2123 deletions(-) delete mode 100644 Content.Client/Announcements/Systems/AnnouncerSystem.cs delete mode 100644 Content.IntegrationTests/Tests/Announcers/AnnouncerFallbackTest.cs delete mode 100644 Content.IntegrationTests/Tests/Announcers/AnnouncerLocalizationTest.cs delete mode 100644 Content.Server/Announcements/Systems/AnnouncerSystem.Announce.cs delete mode 100644 Content.Server/Announcements/Systems/AnnouncerSystem.Announcer.cs delete mode 100644 Content.Server/Announcements/Systems/AnnouncerSystem.cs delete mode 100644 Content.Shared/Announcements/Events/AnnouncementSendEvent.cs delete mode 100644 Content.Shared/Announcements/Prototypes/AnnouncerPrototype.cs delete mode 100644 Content.Shared/Announcements/Systems/SharedAnnouncerSystem.cs delete mode 100644 Resources/Audio/Announcers/Intern/comms/announce.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/announce/1.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/announce/10.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/announce/11.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/announce/12.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/announce/13.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/announce/14.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/announce/2.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/announce/3.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/announce/4.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/announce/5.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/announce/6.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/announce/7.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/announce/8.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/announce/9.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/commandReport/1.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/commandReport/2.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/commandReport/3.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/welcome/1.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/welcome/2.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/welcome/3.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/welcome/4.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/welcome/5.ogg delete mode 100644 Resources/Audio/Announcers/Intern/comms/welcome/6.ogg delete mode 100644 Resources/Audio/Announcers/Intern/events/aliens.ogg delete mode 100644 Resources/Audio/Announcers/Intern/events/anomaly.ogg delete mode 100644 Resources/Audio/Announcers/Intern/events/ion_storm.ogg delete mode 100644 Resources/Audio/Announcers/Intern/events/meteors.ogg delete mode 100644 Resources/Audio/Announcers/Intern/events/power_grid_check-complete.ogg delete mode 100644 Resources/Audio/Announcers/Intern/events/power_grid_check.ogg delete mode 100644 Resources/Audio/Announcers/Intern/shuttle/shuttlecalled.ogg delete mode 100644 Resources/Audio/Announcers/Intern/shuttle/shuttledock.ogg delete mode 100644 Resources/Audio/Announcers/Intern/shuttle/shuttlerecalled.ogg delete mode 100644 Resources/Audio/Announcers/Intern/unused/animes.ogg delete mode 100644 Resources/Audio/Announcers/Intern/unused/intercept.ogg delete mode 100644 Resources/Audio/Announcers/Intern/unused/newai.ogg delete mode 100644 Resources/Audio/Announcers/Intern/unused/outbreak7.ogg delete mode 100644 Resources/Audio/Announcers/Intern/unused/radiation.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/comms/announce.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/comms/attention.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/comms/command_report.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/comms/welcome.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/events/aliens.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/events/anomaly.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/events/ion_storm.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/events/meteors.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/events/power_grid_check-complete.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/events/power_grid_check.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/fallback.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/shuttle/shuttlecalled.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/shuttle/shuttledock.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/shuttle/shuttlerecalled.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/unused/animes.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/unused/intercept.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/unused/newai.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/unused/outbreak7.ogg delete mode 100644 Resources/Audio/Announcers/MedBot/unused/radiation.ogg delete mode 100644 Resources/Audio/Announcers/Michael/alerts/blue.ogg delete mode 100644 Resources/Audio/Announcers/Michael/alerts/epsilon.ogg delete mode 100644 Resources/Audio/Announcers/Michael/alerts/gamma.ogg delete mode 100644 Resources/Audio/Announcers/Michael/alerts/green.ogg delete mode 100644 Resources/Audio/Announcers/Michael/alerts/red.ogg delete mode 100644 Resources/Audio/Announcers/Michael/alerts/rename.js delete mode 100644 Resources/Audio/Announcers/Michael/alerts/violet.ogg delete mode 100644 Resources/Audio/Announcers/Michael/alerts/white.ogg delete mode 100644 Resources/Audio/Announcers/Michael/alerts/yellow.ogg delete mode 100644 Resources/Audio/Announcers/Michael/comms/attention.ogg delete mode 100644 Resources/Audio/Announcers/Michael/comms/welcome.ogg delete mode 100644 Resources/Audio/Announcers/Michael/events/aliens.ogg delete mode 100644 Resources/Audio/Announcers/Michael/events/bureaucratic_error.ogg delete mode 100644 Resources/Audio/Announcers/Michael/events/gas_leak.ogg delete mode 100644 Resources/Audio/Announcers/Michael/events/kudzu_growth.ogg delete mode 100644 Resources/Audio/Announcers/Michael/events/meteors.ogg delete mode 100644 Resources/Audio/Announcers/Michael/events/noospheric_storm.ogg delete mode 100644 Resources/Audio/Announcers/Michael/events/power_grid_check-complete.ogg delete mode 100644 Resources/Audio/Announcers/Michael/events/power_grid_check.ogg delete mode 100644 Resources/Audio/Announcers/Michael/events/vent_clog.ogg delete mode 100644 Resources/Audio/Announcers/Michael/fallback.ogg delete mode 100644 Resources/Audio/Announcers/Michael/shuttle/shuttle_called.ogg delete mode 100644 Resources/Audio/Announcers/Michael/shuttle/shuttle_dock.ogg delete mode 100644 Resources/Audio/Announcers/Michael/shuttle/shuttle_recalled.ogg delete mode 100644 Resources/Audio/Announcers/Michael/unused/outbreak7.ogg delete mode 100644 Resources/Audio/Announcers/Michael/unused/radiation.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/alerts/code_blue.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/alerts/code_delta.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/alerts/code_epsilon.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/alerts/code_gamma.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/alerts/code_green.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/alerts/code_red.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/alerts/code_violet.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/alerts/code_white.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/alerts/code_yellow.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/comms/announce.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/comms/attention.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/comms/welcome.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/events/bureaucraticerror.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/events/gasleak.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/events/kudzu.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/events/meteors.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/events/noosphericstorm.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/events/power_grid_check-complete.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/events/power_grid_check.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/events/ventclog.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/fallback.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/shuttle/shuttlecalled.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/shuttle/shuttledock.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/shuttle/shuttlerecalled.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/unused/outbreak7.ogg delete mode 100644 Resources/Audio/Announcers/NEIL/unused/radiation.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/comms/announce.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/comms/attention.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/comms/command_report.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/comms/welcome.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/events/aliens.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/events/anomaly.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/events/ion_storm.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/events/meteors.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/events/power_grid_check-complete.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/events/power_grid_check.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/fallback.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/shuttle/shuttlecalled.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/shuttle/shuttledock.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/shuttle/shuttlerecalled.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/unused/newai.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/unused/outbreak7.ogg delete mode 100644 Resources/Audio/Announcers/VoxFem/unused/radiation.ogg delete mode 100644 Resources/Locale/en-US/announcements/announcers/announcers.ftl delete mode 100644 Resources/Prototypes/Announcers/!randomAnnouncers.yml delete mode 100644 Resources/Prototypes/Announcers/intern.yml delete mode 100644 Resources/Prototypes/Announcers/medbot.yml delete mode 100644 Resources/Prototypes/Announcers/michael.yml delete mode 100644 Resources/Prototypes/Announcers/neil.yml delete mode 100644 Resources/Prototypes/Announcers/template delete mode 100644 Resources/Prototypes/Announcers/voxfem.yml delete mode 100644 Resources/Prototypes/SoundCollections/Announcers/intern.yml diff --git a/Content.Client/Announcements/Systems/AnnouncerSystem.cs b/Content.Client/Announcements/Systems/AnnouncerSystem.cs deleted file mode 100644 index de76396f705..00000000000 --- a/Content.Client/Announcements/Systems/AnnouncerSystem.cs +++ /dev/null @@ -1,69 +0,0 @@ -using Content.Client.Audio; -using Content.Shared.Announcements.Events; -using Content.Shared.Announcements.Systems; -using Content.Shared.CCVar; -using Robust.Client.Audio; -using Robust.Client.Player; -using Robust.Client.ResourceManagement; -using Robust.Shared.Audio.Sources; -using Robust.Shared.Audio.Systems; -using Robust.Shared.Configuration; - -namespace Content.Client.Announcements.Systems; - -public sealed class AnnouncerSystem : SharedAnnouncerSystem -{ - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly IResourceCache _cache = default!; - [Dependency] private readonly IAudioManager _audioManager = default!; - - private IAudioSource? AnnouncerSource { get; set; } - private float AnnouncerVolume { get; set; } - - - public override void Initialize() - { - base.Initialize(); - - AnnouncerVolume = _config.GetCVar(CCVars.AnnouncerVolume) * 100f / ContentAudioSystem.AnnouncerMultiplier; - - SubscribeNetworkEvent(OnAnnouncementReceived); - _config.OnValueChanged(CCVars.AnnouncerVolume, OnAnnouncerVolumeChanged); - } - - public override void Shutdown() - { - base.Shutdown(); - - _config.UnsubValueChanged(CCVars.AnnouncerVolume, OnAnnouncerVolumeChanged); - } - - - private void OnAnnouncerVolumeChanged(float value) - { - AnnouncerVolume = value; - - if (AnnouncerSource != null) - AnnouncerSource.Gain = AnnouncerVolume; - } - - private void OnAnnouncementReceived(AnnouncementSendEvent ev) - { - if (!ev.Recipients.Contains(_player.LocalSession!.UserId) - || !_cache.TryGetResource(GetAnnouncementPath(ev.AnnouncementId, ev.AnnouncerId), - out var resource)) - return; - - var source = _audioManager.CreateAudioSource(resource); - if (source != null) - { - source.Gain = AnnouncerVolume * SharedAudioSystem.VolumeToGain(ev.AudioParams.Volume); - source.Global = true; - } - - AnnouncerSource?.Dispose(); - AnnouncerSource = source; - AnnouncerSource?.StartPlaying(); - } -} diff --git a/Content.Client/Audio/ContentAudioSystem.cs b/Content.Client/Audio/ContentAudioSystem.cs index a79ff74e797..f62b34b492c 100644 --- a/Content.Client/Audio/ContentAudioSystem.cs +++ b/Content.Client/Audio/ContentAudioSystem.cs @@ -29,8 +29,7 @@ public sealed partial class ContentAudioSystem : SharedContentAudioSystem public const float AmbientMusicMultiplier = 3f; public const float LobbyMultiplier = 3f; public const float InterfaceMultiplier = 2f; - public const float AnnouncerMultiplier = 3f; - + public override void Initialize() { base.Initialize(); diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml b/Content.Client/Options/UI/Tabs/AudioTab.xaml index 8dd723d446d..e54b0dc34ee 100644 --- a/Content.Client/Options/UI/Tabs/AudioTab.xaml +++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml @@ -100,19 +100,6 @@