Skip to content

Янтарный Код и звуки анонсов Ориона #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devnopay wants to merge 3 commits into
base: arcane-dev
Choose a base branch
from
Open

Янтарный Код и звуки анонсов Ориона #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c4b1a9
Перенос Янтарного Кода + Звуки анонсов Ориона
devnopay Jul 19, 2026
69d4055
Изменение очередности кодов в консоли
devnopay Jul 19, 2026
77446ba
Делитнул неиспользуемые
devnopay Jul 19, 2026
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
Binary file added Resources/Audio/_Orion/Announcements/alien.ogg
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions Resources/Audio/_Orion/Announcements/licenses.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
All sounds in this folder are taken from TauCeti GitHub (licensed under CC-BY-SA by 3.0) at commit https://github.com/TauCetiStation/TauCetiClassic/commit/92d2767dbb39f28540f78d5055e7be1eb7acee98

@coderabbitai coderabbitai Bot Jul 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win

Add a final newline.

Both EditorConfig checks fail because this file does not end with a newline.

Proposed fix 
 All sounds in this folder are taken from TauCeti GitHub (licensed under CC-BY-SA by 3.0) at commit https://github.com/TauCetiStation/TauCetiClassic/commit/92d2767dbb39f28540f78d5055e7be1eb7acee98
+
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
All sounds in this folder are taken from TauCeti GitHub (licensed under CC-BY-SA by 3.0) at commit https://github.com/TauCetiStation/TauCetiClassic/commit/92d2767dbb39f28540f78d5055e7be1eb7acee98
All sounds in this folder are taken from TauCeti GitHub (licensed under CC-BY-SA by 3.0) at commit https://github.com/TauCetiStation/TauCetiClassic/commit/92d2767dbb39f28540f78d5055e7be1eb7acee98
🧰 Tools
🪛 GitHub Actions: EditorConfig Check / 0_EditorConfig Check.txt

[error] 1-1: check_crlf.py failed: The file does not end with a newline. Please add a final newline.

🪛 GitHub Actions: EditorConfig Check / EditorConfig Check

[error] 1-1: CRLF check failed: The file does not end with a newline. Please add a final newline.

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Resources/Audio/_Orion/Announcements/licenses.txt` at line 1, Add a trailing
newline to the end of the license attribution in licenses.txt, without changing
its existing text.

Source: Pipeline failures

6 changes: 6 additions & 0 deletions Resources/Locale/ru-RU/alert-levels/alert-levels.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ alert-level-blue = Синий
alert-level-blue-announcement = На станции зафиксирована угроза безопасности I уровня. Членам экипажа рекомендуется выполнять указания, отданные должностными лицами. Экипаж обязан информировать службу безопасности о любой подозрительной активности. Дополнительные инструкции указаны в КПК.
alert-level-blue-instructions = Выполняйте свою работу, если вы находитесь в безопасности. Носите свою ID-карту на поясе. Проявляйте бдительность и сообщайте службе безопасности о любой подозрительной активности.

#Arcane-start
alert-level-amber = Янтарный
alert-level-amber-announcement = Объявлено положение Код Янтарь. Командование объявляет о значительных враждебных угрозах в расположении объекта. Сотрудники отдела СБ должны беспрекословно следовать процедурам усиления для дальнейшей ликвидации угрозы. Авторизованный персонал обязан выполнять инструкции сотрудников СБ.
alert-level-amber-instructions = Выполняйте свою работу, если вы находитесь в безопасности. Носите свою ID-карту в визуальной доступности. Включите режим координат на комбинезоне. Проявляйте бдительность и сообщайте службе безопасности о любой подозрительной активности. Подчиняйтесь правомерным приказам должностных лиц. Соблюдайте бюрократические нормы, если это предусмотрено вашими должностными обязанностями.
#Arcane-end

alert-level-red = Красный
alert-level-red-announcement = На станции подтверждена угроза безопасности II уровня. Служба безопасности уполномочена проводить досмотр членов экипажа и обыск рабочих отсеков. Может быть введён комендантский час, часть экипажа может быть мобилизована. Дополнительные инструкции указаны в КПК.
alert-level-red-instructions = Выполняйте свою работу, если вы находитесь в безопасности. Носите свою ID-карту на поясе. Включите режим «координат» на комбинезоне. Проявляйте бдительность и сообщайте службе безопасности о любой подозрительной активности. Подчиняйтесь правомерным приказам должностных лиц.
Expand Down
30 changes: 20 additions & 10 deletions Resources/Prototypes/AlertLevels/alert_levels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: alertLevels
id: stationAlerts
defaultLevel: green
levels:
levels: #Arcane - очередность кодов изменена для улучшения UI консоли
green:
announcement: alert-level-green-announcement
color: Green
Expand All @@ -14,6 +14,22 @@
forceEnableEmergencyLights: true
emergencyLightColor: DodgerBlue
shuttleTime: 600
#Arcane-start
amber:
announcement: alert-level-amber-announcement
sound: /Audio/_Orion/Announcements/alien.ogg
color: "#ff8119"
emergencyLightColor: "#ff8119"
forceEnableEmergencyLights: true
shuttleTime: 600
#Arcane-end
red:
announcement: alert-level-red-announcement
sound: /Audio/_Starlight/Announcements/redalert.ogg
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.
violet:
announcement: alert-level-violet-announcement
selectable: false
Expand All @@ -30,13 +46,6 @@
emergencyLightColor: Goldenrod
forceEnableEmergencyLights: true
shuttleTime: 600
red:
announcement: alert-level-red-announcement
sound: /Audio/_Starlight/Announcements/redalert.ogg
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
Expand Down Expand Up @@ -119,8 +128,9 @@
path: /Audio/_Starlight/Announcements/orange.ogg
params:
volume: -2
color: "#ff8119"
emergencyLightColor: "#ff8119"
color: "#ffa361" #Arcane-Edit
emergencyLightColor: "#ffa361" #Arcane-Edit
forceEnableEmergencyLights: true
shuttleTime: 600
# end starlight

Binary file added Resources/Textures/Structures/Wallmounts/screen.rsi/amber.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions Resources/Textures/Structures/Wallmounts/screen.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,15 @@
0.3
]
]
},
{
"name": "amber",
"delays": [
[
0.3,
0.3
]
]
}
]
}
Loading