Skip to content
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.

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

Перевод анонсов, запуск ОБ и по мелочи. #270

Merged
merged 32 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
2898426
Вроде пока что всё...
BasiaBelov Sep 9, 2024
7d90c6e
Merge branch 'master' into rus-announcements
Helg2 Sep 11, 2024
80ca671
Ееееееееее
BasiaBelov Sep 11, 2024
79c9bf7
Merge branch 'rus-announcements' of https://github.com/BasiaBelov/RuT…
BasiaBelov Sep 11, 2024
8186f1b
Так проще + описание к планетам
BasiaBelov Sep 15, 2024
efdd60a
ЕЕЕЕЕЕЕЕЕЕ
BasiaBelov Sep 22, 2024
61ef4a7
Сильное решение
BasiaBelov Oct 2, 2024
8128e60
Merge branch 'master' into rus-announcements
Helg2 Oct 2, 2024
23be38e
Merge branch 'master' into rus-announcements
BasiaBelov Oct 2, 2024
93f1998
Починил!
BasiaBelov Oct 2, 2024
184a5d7
Приказ отряду
BasiaBelov Oct 7, 2024
f94758c
Перевод приказов
BasiaBelov Oct 7, 2024
ba81e34
Merge branch 'master' into rus-announcements
Helg2 Oct 10, 2024
9dece7a
Прикоооооооол
BasiaBelov Oct 21, 2024
6e62096
Update marine_main_ship.dm
BasiaBelov Oct 23, 2024
2083b99
ААААААААа
BasiaBelov Oct 24, 2024
7a71633
Ок
BasiaBelov Oct 30, 2024
b48b61c
Update code/datums/gamemodes/crash.dm
BasiaBelov Oct 30, 2024
e85df2f
Ну примерно...
BasiaBelov Nov 1, 2024
031d943
Я дибил
BasiaBelov Nov 1, 2024
7064ff0
Update _maps/vapor_processing.json
BasiaBelov Nov 7, 2024
96dd4d8
Update _maps/slumbridge.json
BasiaBelov Nov 7, 2024
614567a
Update _maps/research_outpost.json
BasiaBelov Nov 7, 2024
785b728
Update _maps/lawanka.json
BasiaBelov Nov 7, 2024
5ca5594
Update _maps/desparity.json
BasiaBelov Nov 7, 2024
b4ede0a
Update _maps/bigred_v2.json
BasiaBelov Nov 7, 2024
9cb6ac9
Update _maps/barrenquilla_mining.json
BasiaBelov Nov 7, 2024
df6e6fb
Merge branch 'master' into rus-announcements
Helg2 Nov 7, 2024
62401ab
Merge branch 'master' into rus-announcements
BasiaBelov Nov 16, 2024
c8f4a48
Merge branch 'master' into rus-announcements
Helg2 Nov 22, 2024
a4bd425
Ок
BasiaBelov Nov 29, 2024
2e1bae2
Update command_alert.dm
Helg2 Nov 29, 2024
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
12 changes: 6 additions & 6 deletions code/__HELPERS/announce.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define ANNOUNCEMENT_COMMAND 3


/proc/priority_announce(message, title = "Announcement", type = ANNOUNCEMENT_REGULAR, sound = 'sound/misc/notice2.ogg', list/receivers = (GLOB.alive_human_list + GLOB.ai_list + GLOB.observer_list))
/proc/priority_announce(message, title = "Оповещение", type = ANNOUNCEMENT_REGULAR, sound = 'sound/misc/notice2.ogg', list/receivers = (GLOB.alive_human_list + GLOB.ai_list + GLOB.observer_list))
if(!message)
return

Expand All @@ -14,12 +14,12 @@
announcement += "<meta charset='UTF-8'><br><h2 class='alert'>[html_encode(title)]</h2>"

if(ANNOUNCEMENT_PRIORITY)
announcement += "<meta charset='UTF-8'><h1 class='alert'>Priority Announcement</h1>"
if(title && title != "Announcement")
announcement += "<meta charset='UTF-8'><h1 class='alert'>Важное Оповещение</h1>"
if(title && title != "Оповещение")
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved
announcement += "<meta charset='UTF-8'><br><h2 class='alert'>[html_encode(title)]</h2>"

if(ANNOUNCEMENT_COMMAND)
announcement += "<meta charset='UTF-8'><h1 class='alert'>Command Announcement</h1>"
announcement += "<meta charset='UTF-8'><h1 class='alert'>Оповещение</h1>"
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved


announcement += "<meta charset='UTF-8'><br>[span_alert("[html_encode(message)]")]<br>"
Expand All @@ -33,7 +33,7 @@
SEND_SOUND(M, s)


/proc/print_command_report(papermessage, papertitle = "paper", announcemessage = "A report has been downloaded and printed out at all communications consoles.", announcetitle = "Incoming Classified Message", announce = TRUE)
/proc/print_command_report(papermessage, papertitle = "paper", announcemessage = "Отчет загружен и распечатан на всех консолях связи.", announcetitle = "Входящее сообщение", announce = TRUE)
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved
if(announce)
priority_announce(announcemessage, announcetitle, sound = 'sound/AI/commandreport.ogg')

Expand All @@ -47,7 +47,7 @@
P.update_icon()


/proc/minor_announce(message, title = "Attention:", alert, list/receivers = GLOB.alive_human_list)
/proc/minor_announce(message, title = "Внимание:", alert, list/receivers = GLOB.alive_human_list)
if(!message)
return

Expand Down
14 changes: 7 additions & 7 deletions code/controllers/subsystem/evacuation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ SUBSYSTEM_DEF(evacuation)
evac_time = world.time
evac_status = EVACUATION_STATUS_INITIATING
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_EVACUATION_STARTED)
priority_announce("Emergency evacuation has been triggered. Please proceed to the escape pods. Evacuation in [EVACUATION_AUTOMATIC_DEPARTURE/600] minutes.", "Priority Alert", sound = 'sound/AI/evacuate.ogg')
xeno_message("A wave of adrenaline ripples through the hive. The fleshy creatures are trying to escape!")
priority_announce("Аварийная эвакуация запущена. Пожалуйста, проследуйте к спасательным капсулам. Запуск капсул через [EVACUATION_AUTOMATIC_DEPARTURE/600] минут.", "Эвакуация", sound = 'sound/AI/evacuate.ogg')
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved
xeno_message("По улью прокатывается волна адреналина. Эти слабые существа пытаются сбежать!")
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved
pod_list = SSshuttle.escape_pods.Copy()
for(var/obj/docking_port/mobile/escape_pod/pod AS in pod_list)
pod.prep_for_launch()
Expand All @@ -98,7 +98,7 @@ SUBSYSTEM_DEF(evacuation)
if(evac_status != EVACUATION_STATUS_INITIATING)
return FALSE
evac_status = EVACUATION_STATUS_IN_PROGRESS
priority_announce("WARNING: Evacuation order confirmed. Launching escape pods.", "Priority Alert", sound = 'sound/AI/evacuation_confirmed.ogg')
priority_announce("Приказ об эвакуации подтвержден. Запуск спасательных капсул.", "Запуск Капсул", sound = 'sound/AI/evacuation_confirmed.ogg')
return TRUE


Expand All @@ -108,7 +108,7 @@ SUBSYSTEM_DEF(evacuation)
GLOB.enter_allowed = TRUE
evac_time = null
evac_status = EVACUATION_STATUS_STANDING_BY
priority_announce("Evacuation has been cancelled.", "Priority Alert", sound = 'sound/AI/evacuate_cancelled.ogg')
priority_announce("Эвакуация отменена. Восстановление систем...", "Эвакуация", sound = 'sound/AI/evacuate_cancelled.ogg')
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved
for(var/obj/docking_port/mobile/escape_pod/pod AS in pod_list)
pod.unprep_for_launch()
return TRUE
Expand All @@ -123,7 +123,7 @@ SUBSYSTEM_DEF(evacuation)
. = "NOW"

/datum/controller/subsystem/evacuation/proc/announce_evac_completion()
priority_announce("ATTENTION: Evacuation complete.", "Priority Alert", sound = 'sound/AI/evacuation_complete.ogg')
priority_announce("Эвакуация завершена. Оставшемуся экипажу требуется завершить миссию.", "Эвакуация Проведена", sound = 'sound/AI/evacuation_complete.ogg')
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved
evac_status = EVACUATION_STATUS_COMPLETE


Expand Down Expand Up @@ -158,7 +158,7 @@ SUBSYSTEM_DEF(evacuation)
I.toggle(TRUE)
dest_master.toggle(TRUE)
dest_index = 1
priority_announce("The emergency destruct system has been deactivated.", "Priority Alert", sound = 'sound/AI/selfdestruct_deactivated.ogg')
priority_announce("Протокол самоуничтожения деактивирован. Перезапуск систем.", "Простокол Самоуничтожения", sound = 'sound/AI/selfdestruct_deactivated.ogg')
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved
if(evac_status == EVACUATION_STATUS_STANDING_BY)
GLOB.marine_main_ship.set_security_level(SEC_LEVEL_RED, TRUE)
for(var/obj/machinery/floor_warn_light/self_destruct/light AS in alarm_lights)
Expand All @@ -177,7 +177,7 @@ SUBSYSTEM_DEF(evacuation)
dest_master.visible_message(span_warning("WARNING: Unable to trigger detonation. Please arm all control rods."))
return FALSE

priority_announce("DANGER. DANGER. Self destruct system activated. DANGER. DANGER. Self destruct in progress. DANGER. DANGER.", "Priority Alert")
priority_announce("ТРЕВОГА. ТРЕВОГА. ПРОТОКОЛ САМОУНИЧТОЖЕНИЯ ЗАВЕРШЕН. ТРЕВОГА. ТРЕВОГА. ДЕТОНАЦИЯ.", "Детонация")
GLOB.enter_allowed = FALSE
dest_status = NUKE_EXPLOSION_IN_PROGRESS
playsound(dest_master, 'sound/machines/alarm.ogg', 75, 0, 30)
Expand Down
32 changes: 16 additions & 16 deletions code/datums/emergency_calls/emergency_call.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
var/name = ""
var/mob_max = 10
var/mob_min = 1
var/dispatch_message = "An encrypted signal has been received from a nearby vessel. Stand by." //Message displayed to marines once the signal is finalized.
var/dispatch_message = "Получен зашифрованный сигнал с ближайшего судна. Ожидайте подмогу." //Message displayed to marines once the signal is finalized.
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved
var/objectives = "" //Objectives to display to the members.
var/list/datum/mind/members = list() //Currently-joined members.
var/list/datum/mind/candidates = list() //Potential candidates for enlisting.
Expand Down Expand Up @@ -36,7 +36,7 @@

var/list/total_calls = typesof(/datum/emergency_call)
if(!length(total_calls))
CRASH("No distress Datums found.")
CRASH("Данные о бедствии не найдены.")
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved

for(var/x in total_calls)
var/datum/emergency_call/D = new x()
Expand Down Expand Up @@ -78,8 +78,8 @@

for(var/i in GLOB.observer_list)
var/mob/dead/observer/M = i
to_chat(M, "<br><font size='3'>[span_attack("An emergency beacon has been activated. Use the <B>Ghost > <a href='byond://?src=[REF(M)];join_ert=1'>Join Response Team</a></b> verb to join!")]</font><br>")
to_chat(M, "[span_attack("You cannot join if you have Ghosted before this message.")]<br>")
to_chat(M, "<br><font size='3'>[span_attack("Запущен сигнал бедствия. Используйте <B>Ghost > <a href='byond://?src=[REF(M)];join_ert=1'>Join Response Team</a></b> чтобы учавствовать в операции!")]</font><br>")
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved
to_chat(M, "[span_attack("Вы не можете присоединиться, если вы были Призраком до появления этого сообщения.")]<br>")
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved


/datum/game_mode/proc/activate_distress(datum/emergency_call/chosen_call)
Expand All @@ -101,27 +101,27 @@
var/datum/emergency_call/distress = SSticker?.mode?.picked_call //Just to simplify things a bit

if(is_banned_from(usr.ckey, ROLE_ERT))
to_chat(usr, span_danger("You are jobbanned from the emergency reponse team!"))
to_chat(usr, span_danger("Не выйдет! Вы забанены из этой роли!"))
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved
return

if(!istype(distress) || !SSticker.mode.waiting_for_candidates || distress.mob_max < 1)
to_chat(usr, span_warning("No distress beacons that need candidates are active. You will be notified if that changes."))
to_chat(usr, span_warning("Пока что никто не пускал сигналов бедствия. Вы будете оповещены, если что-то появится."))
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved
return

var/deathtime = world.time - GLOB.key_to_time_of_role_death[key]

if(deathtime < 600 && !check_other_rights(usr.client, R_ADMIN, FALSE)) //They have ghosted after the announcement.
to_chat(usr, span_warning("You ghosted too recently. Try again later."))
to_chat(usr, span_warning("Вы слишком недавно стали призраком. Попробуйте еще раз позже."))
return

if(usr.mind in distress.candidates)
to_chat(usr, span_warning("You are already a candidate for this emergency response team."))
to_chat(usr, span_warning("Вы уже один из кандидатов. Ждите высадки."))
return

if(distress.add_candidate(usr))
to_chat(usr, span_boldnotice("You are now a candidate in the emergency response team! If there are enough candidates, you may be picked to be part of the team."))
to_chat(usr, span_boldnotice("Теперь вы кандидат в команду экстренного реагирования! Если кандидатов будет достаточно, вас могут выбрать в команду."))
else
to_chat(usr, span_warning("Something went wrong while adding you into the candidate list!"))
to_chat(usr, span_warning("Что-то пошло не так при добавлении вас в список кандидатов!"))

/datum/emergency_call/proc/reset()
if(candidate_timer)
Expand Down Expand Up @@ -152,7 +152,7 @@
message_admins("Distress beacon: '[name]' activated. Looking for candidates.")

if(announce)
priority_announce("A distress beacon has been launched from the [SSmapping.configs[SHIP_MAP].map_name].", "Priority Alert", sound = 'sound/AI/distressbeacon.ogg')
priority_announce("Сигнал бедствия запущен. Ожидание ответа...", "Сигнал Бедствия", sound = 'sound/AI/distressbeacon.ogg')

SSticker.mode.on_distress_cooldown = TRUE

Expand All @@ -170,11 +170,11 @@
continue
if(M.current) //If they still have a body
if(!isaghost(M.current) && M.current.stat != DEAD) // and not dead or admin ghosting,
to_chat(M.current, span_warning("You didn't get selected to join the distress team because you aren't dead."))
to_chat(M.current, span_warning("Вас не выбрали в команду, потому что вы не мертвы."))
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved
continue
if(name == "Xenomorphs" && is_banned_from(ckey(M.key), ROLE_XENOMORPH))
if(M.current)
to_chat(M, span_warning("You didn't get selected to join the distress team because you are jobbanned from Xenomorph."))
to_chat(M, span_warning("Вас не выбрали для участия в операции бедствия, потому что вас забанили в Xenomorph."))
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved
continue
valid_candidates += M

Expand All @@ -187,7 +187,7 @@
candidates.Cut()

if(announce)
priority_announce("The distress signal has not received a response, the launch tubes are now recalibrating.", "Distress Beacon")
priority_announce("Ответа на сигнал бедствия не поступило. Повторите попытку позже.", "Сигнал Бедствия", sound = 'sound/AI/distressbeacon_none.ogg')
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved

SSticker.mode.picked_call = null
SSticker.mode.on_distress_cooldown = TRUE
Expand All @@ -204,14 +204,14 @@

for(var/datum/mind/M in valid_candidates)
if(M.current)
to_chat(M.current, span_warning("You didn't get selected to join the distress team. Better luck next time!"))
to_chat(M.current, span_warning("Вас не выбрали в команду. Повезет в следующий раз!"))
message_admins("Distress beacon: [length(valid_candidates)] valid candidates were not selected.")
else
picked_candidates = valid_candidates // save some time
message_admins("Distress beacon: All valid candidates were selected.")

if(announce)
priority_announce(dispatch_message, "Distress Beacon", sound = 'sound/AI/distressreceived.ogg')
priority_announce(dispatch_message, "Сигнал Бедствия", sound = 'sound/AI/distressreceived.ogg')

message_admins("Distress beacon: [name] finalized, starting spawns.")

Expand Down
4 changes: 2 additions & 2 deletions code/datums/gamemodes/crash.dm
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@

/datum/game_mode/infestation/crash/announce()
to_chat(world, span_round_header("The current map is - [SSmapping.configs[GROUND_MAP].map_name]!"))
priority_announce("Scheduled for landing in T-10 Minutes. Prepare for landing. Known hostiles near LZ. Detonation Protocol Active, planet disposable. Marines disposable.", type = ANNOUNCEMENT_PRIORITY)
playsound(shuttle, 'sound/machines/warning-buzzer.ogg', 75, 0, 30)
priority_announce("Планируется посадка через 10 минут. Приготовьтесь к посадке. На месте посадки вас ожидают противники. Найти диски для ядерной боеголовки. Найти ядерную боеголовку. Активировать протокол самоуничтожения. Уничтожить планету.", type = ANNOUNCEMENT_PRIORITY)
BasiaBelov marked this conversation as resolved.
Show resolved Hide resolved
playsound(shuttle, 'sound/AI/crash_start.ogg', 75, 0, 30)


/datum/game_mode/infestation/crash/process()
Expand Down
Loading
Loading