Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Тут просто много чего #286

Merged
merged 2 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Content.Server/Chat/Systems/ChatSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ public sealed partial class ChatSystem : SharedChatSystem
public const int VoiceRange = 10; // how far voice goes in world units
public const int WhisperClearRange = 2; // how far whisper goes while still being understandable, in world units
public const int WhisperMuffledRange = 5; // how far whisper goes at all, in world units
public const string DefaultAnnouncementSound = "/Audio/Announcements/announce.ogg";
public const string DefaultAnnouncementSound = "/Audio/Corvax/Announcements/announce.ogg"; // Corvax-Announcements
public const string CentComAnnouncementSound = "/Audio/Corvax/Announcements/centcomm.ogg"; // Corvax-Announcements

private bool _loocEnabled = true;
private bool _deadLoocEnabled;
Expand Down Expand Up @@ -340,7 +341,8 @@ public void DispatchGlobalAnnouncement(
_chatManager.ChatMessageToAll(ChatChannel.Radio, message, wrappedMessage, default, false, true, colorOverride);
if (playSound)
{
_audio.PlayGlobal(announcementSound?.GetSound() ?? DefaultAnnouncementSound, Filter.Broadcast(), true, AudioParams.Default.WithVolume(-2f));
if (sender == Loc.GetString("admin-announce-announcer-default")) announcementSound = new SoundPathSpecifier(CentComAnnouncementSound); // Corvax-Announcements: Support custom alert sound from admin panel
_audio.PlayGlobal(announcementSound?.GetSound() ?? DefaultAnnouncementSound, Filter.Broadcast(), true, announcementSound?.Params ?? AudioParams.Default.WithVolume(-2f));
}
_adminLogger.Add(LogType.Chat, LogImpact.Low, $"Global station announcement from {sender}: {message}");
}
Expand Down
Binary file modified Resources/Audio/Announcements/attention.ogg
Binary file not shown.
Binary file added Resources/Audio/Announcements/gasleak_end.ogg
Binary file not shown.
Binary file added Resources/Audio/Announcements/gasleak_start.ogg
Binary file not shown.
Binary file removed Resources/Audio/Announcements/meteors.ogg
Binary file not shown.
Binary file added Resources/Audio/Announcements/meteors_end.ogg
Binary file not shown.
Binary file added Resources/Audio/Announcements/meteors_start.ogg
Binary file not shown.
Binary file modified Resources/Audio/Announcements/outbreak7.ogg
Binary file not shown.
Binary file modified Resources/Audio/Announcements/power_off.ogg
Binary file not shown.
Binary file modified Resources/Audio/Announcements/power_on.ogg
Binary file not shown.
Binary file modified Resources/Audio/Announcements/radiation.ogg
Binary file not shown.
Binary file added Resources/Audio/Announcements/sentience.ogg
Binary file not shown.
Binary file modified Resources/Audio/Announcements/shuttle_dock.ogg
Binary file not shown.
Binary file modified Resources/Audio/Announcements/shuttlecalled.ogg
Binary file not shown.
Binary file modified Resources/Audio/Announcements/shuttlerecalled.ogg
Binary file not shown.
Binary file added Resources/Audio/Announcements/ventclog.ogg
Binary file not shown.
Binary file modified Resources/Audio/Announcements/welcome.ogg
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/Corvax/Announcements/centcomm.ogg
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions Resources/Audio/Corvax/Announcements/licenses.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
All sounds in directory are taken from TauCeti github (licensed under CC-BY-SA by 3.0) at commit https://github.com/TauCetiStation/TauCetiClassic/commit/92d2767dbb39f28540f78d5055e7be1eb7acee98
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/_NF/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ job-name-detective-nf = детектив
job-name-ertmailcarrier = ОБР почтальон
job-name-mercenary = наёмник
job-name-pilot = пилот
job-name-pirate = Pirate
job-name-pirate = пират
job-name-pirate-captain = пиратский капитан
job-name-pirate-first-mate = пиратский боцман
job-name-security-guard = охранник аванпоста
Expand Down
6 changes: 5 additions & 1 deletion Resources/Locale/ru-RU/corvax/_NF/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,8 @@ uplink-security-vector-magazines-desc = Заводские магазины со
uplink-security-vector-name = Вектор (.45)
uplink-security-vector-desc = Гражданская версия уже легендарного и забытого пистолета-пулемёта. Использует патроны калибра .45ACP. Автоматический огонь в комплект не входит.
uplink-security-magazine-magnum-name = Магазин для N1984
uplink-security-magazine-magnum-desc = Пистолетный магазин калибра .45 магнум.
uplink-security-magazine-magnum-desc = Пистолетный магазин калибра .45 магнум.
uplink-combat-hypospray-name = боевой гипоспрей
uplink-combat-hypospray-desc = Боевой гипоспрей предназначен для введения лекарственных препаратов в боевой обстановке.
uplink-FAK-Combat-name = боевой FAK
uplink-FAK-Combat-desc = Улучшенный боевой набор для лечения ран.
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ ent-ClothingDeathSquadronBackpack = рюкзак эскадрона смерти
.desc = Вместительный рюкзак использующий технологию БлюСпейс.
ent-ClothingBackpackCE = рюкзак старшего инженера
.desc = Технически продвинутый рюкзак.
ent-ClothingBackpackHoldingExtended = { ent-ClothingBackpackHolding }
.desc = { ent-ClothingBackpackHolding.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ ent-ClothingBackpackDuffelMilitary = армейский вещмешок
.desc = Большой вещмешок для хранения любого армейского снаряжения.
ent-ClothingBackpackDuffelCE = вещмешок старшего инженера
.desc = Большой вещмешок, который может хранить все инструменты для создания сингулярности.
ent-ClothingBackpackDuffelHoldingExtended = { ent-ClothingBackpackDuffelHolding }
.desc = { ent-ClothingBackpackDuffelHolding.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-ClothingMilitaryMessenger = армейский мессенджер
.desc = Тактический мессенджер для армейских нужд.
ent-ClothingBackpackMessengerHoldingExtended = { ent-ClothingBackpackMessengerHolding }
.desc = { ent-ClothingBackpackMessengerHolding.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ ent-ClothingBackpackMilitarySatchel = армейский ранец
.desc = Тактический ранец для армейских нужд.
ent-ClothingBackpackSatchelCE = сумка старшего инженера
.desc = Инновационная сумка с укреплённой лямкой.
ent-ClothingBackpackSatchelHoldingExtended = { ent-ClothingBackpackSatchelHolding }
.desc = { ent-ClothingBackpackSatchelHolding.desc }
Loading
Loading