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

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

Closed
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
2 changes: 1 addition & 1 deletion _maps/barrenquilla_mining.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"map_name": "Barrenquilla Mining Facility",
"map_path": "map_files/Barrenquilla_Mining",
"map_file": "Barrenquilla_Mining_Facility.dmm",
"announce_text": "Наши сканеры зафиксировали слабый сигнал бедствия, который привёл нас к LO145. Благодаря блюспейс технологиям, мы оказались рядом с аванпостом. Товарищи, приготовьтесь к битве!",
"announce_text": "A faint distress signal has been picked up by our scanners, which have tracked the source to LO145. Through use of emergency bluespace drive tech, the ###SHIPNAME### has jumped within range of the outpost. Senior officers are present and will need to be evacuated in order to completely finish your mission. TGMC, gear up and get ready to respond!",
"disk_sets": {
"basic": 1
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/bigred_v2.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"basic": 1
},
"quickbuilds": 1800,
"announce_text": "На колонии 2-ого поколения был активирован аварийный маяк, безостановочно передающий один и тот же сигнал. Попытки связаться оказались тщетными. Поскольку ваш корабль находился в близлежащих доках, вас отправляют выяснить, что за чертовщина там творится. Товарищи, приготовиться к высадке!",
"announce_text": "A second generation colony has had a beacon transmitting the same signal, nonstop. Attempts to hail the colony over comms have proved futile. Because the ship was at a nearby drydock, it has been dispatched to figure out what's wrong. TGMC, prepare to deploy!",
"traits":[{
"weather_sandstorm": true
}]
Expand Down
2 changes: 1 addition & 1 deletion _maps/deltastation.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"disk_sets": {
"basic": 1
},
"announce_text": "Корабельная система связи засекла сигнал о срочной эвакуации с исследовательской станции класса «Дельта», принадлежащей частной корпорации 'Вейланд-Ютани'. В сообщении говорилось, что станция столкнулась с крупным астероидом и захвачена враждебными формами жизни. В рамках миротворческих операций корабль приближается к станции, чтобы начать очистку. Товарищи, экипируйтесь и приготовьтесь к высадке!",
"announce_text": "The ship's comms array detected an emergency evacuation signal from a Delta class research station owned by a private corporation. The message indicated that the station had collided with a large asteroid and was overrun with hostile lifeforms. As part of peacekeeping operations the ship is nearing the station to begin clearing operations. TGMC, get equipped and prepare for boarding action!",
"armor": "prison"
}
2 changes: 1 addition & 1 deletion _maps/desparity.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"basic": 1
},
"armor": "jungle",
"announce_text": "Наши сканеры засекли экстренное сообщение, которое было триангулировано на аванпосте в джунглях возле LV624, известном как Деспарити. Товарищи, снаряжайтесь и готовьтесь к высадке!",
"announce_text": "An emergency broadcast has been picked up by our scanners, triangulated to a jungle outpost near LV624, known as Desparity. Through use of bluespace drive tech, the ship has jumped within range of the colony. TGMC, gear up and get ready to respond!",
"traits":[{
"weather_acidrain": false
}]
Expand Down
2 changes: 1 addition & 1 deletion _maps/gelida_iv.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"armor": "ice",
"quickbuilds": 1600,
"announce_text": "Наша система связи засекла автоматический аварийный сигнал, передаваемый на частоте, предназначенной для чрезвычайных ситуаций уровня биологических заражений. Сообщение было отслежено до северных районов исследовательской колонии Гелида IV. Корабль движется в сектор на максимальном ходу. Товарищи, пройдите инструктаж и выдвигайтесь!",
"announce_text": "Our comms array has detected an automated emergency signal broadcasting over a frequency reserved for the highest level of emergencies. The message was traced to the northern reaches of the research colony Gelida IV. The ship is moving into the sector with thrusters at max throttle. TGMC, get briefed and then move out!",
"traits":[{
"weather_snowstorm": true
}]
Expand Down
2 changes: 1 addition & 1 deletion _maps/ice_colony_v2.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"armor": "ice",
"quickbuilds": 1600,
"announce_text": "На общей частоте было передано запутанное, неразборчивое сообщение, которое принял наш ретранслятор. Судя по всему, сообщение пришло из поселения второго поколения, расположенного на ледяной планете. Корабль движется в сектор на максимальном ходу. Товарищи, пройдите инструктаж и выдвигайтесь!",
"announce_text": "A garbled, unintelligible communications message was broadcasted over a general frequency, and picked up by our comms relay. The message appears to have come from a second generation settlement, located on an ice cold planet. The ship is moving into the sector with thrusters at max throttle. TGMC, get briefed and then move out!",
"traits":[{
"weather_snowstorm": true
}]
Expand Down
2 changes: 1 addition & 1 deletion _maps/icy_caves.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"armor": "ice",
"quickbuilds": 1200,
"announce_text": "На общей частоте было передано запутанное, неразборчивое сообщение, которое принял наш ретранслятор. Судя по всему, сообщение поступило с шахтерского форпоста, расположенного на ледяной планете. Корабль движется в сектор на максимальном ходу. Товарищи, пройдите инструктаж и выдвигайтесь!",
"announce_text": "A garbled, unintelligible communications message was broadcasted over a general frequency, and picked up by our comms relay. The message appears to have come from a mining outpost, located on an ice cold planet. The ship is moving into the sector with thrusters at max throttle. TGMC, get briefed and then move out!",
"traits":[{
"weather_snowstorm": true
}]
Expand Down
2 changes: 1 addition & 1 deletion _maps/kutjevo.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"basic": 1
},
"quickbuilds": 1800,
"announce_text": "С нефтеперерабатывающего завода колонии НаноТрейзен в Кутьево, известного своими ботаническими исследованиями, экспортом и переработкой сырья, был получен автоматический сигнал бедствия. Для расследования было отправлено наше судно."
"announce_text": "An automated distress signal has been received from Nanotrasen colony Kutjevo Refinery, known for botanical research, export, and raw materials processing and refinement. The ###SHIPNAME### has been dispatched to investigate."
}
2 changes: 1 addition & 1 deletion _maps/last_stand.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"map_name": "Last Stand",
"map_path": "map_files/Last_Stand",
"map_file": "Last_Stand.dmm",
"announce_text": "Наши сканеры засекли слабый сигнал бедствия и отследили его источник до Высшего командного центра батальона 140. Используя блюспейс технологии, корабль прыгнул в пределы досягаемости аванпоста. Там находятся старшие офицеры, которых необходимо эвакуировать, чтобы полностью завершить вашу миссию. Товарищи, снарядитесь и приготовьтесь к высадке!"
"announce_text": "A faint distress signal has been picked up by our scanners, which have tracked the source to Batallion 140's Supreme Command Center. Through use of emergency bluespace drive tech, the ship has jumped within range of the outpost. Senior officers are present and will need to be evacuated in order to completely finish your mission. TGMC, gear up and get ready to respond!"
}
2 changes: 1 addition & 1 deletion _maps/lawanka.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"basic": 1
},
"quickbuilds": 1800,
"announce_text": "ИИ из исследовательской колонии, спонсируемой НаноТрейзен, безостановочно посылает сигнал бедствия. Нанотрайзен нанял нас, чтобы мы вернули колонию в любом виде. Товарищи, приготовиться к высадке!"
"announce_text": "An AI from a Nanotrasen sponsored Research Colony has been sending a distress signal, nonstop. Nanotrasen has hired us to reclaim the Colony in any form. TGMC, prepare to deploy!"
}
2 changes: 1 addition & 1 deletion _maps/lv624.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"armor": "jungle",
"quickbuilds": 1400,
"announce_text": "Наши сканеры засекли слабый сигнал бедствия и определили, что его источником является колония третьего поколения, известная как LV-624. Используя блюспейс технологии, корабль прыгнул в зону досягаемости колонии. Товарищи, экипируйтесь и приготовьтесь к атаке!",
"announce_text": "A faint distress signal has been picked up by our scanners, which have tracked the source to a third generation colony, known as LV-624. Through use of bluespace drive tech, the ship has jumped within range of the colony. TGMC, gear up and get ready to respond!",
"traits":[{
"weather_acidrain": true
}]
Expand Down
2 changes: 1 addition & 1 deletion _maps/magmoor_digsite_iv.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"basic": 1
},
"quickbuilds": 1800,
"announce_text": "Наши сканеры засекли слабый сигнал бедствия и определили, что его источник находится в месте добычи полезных ископаемых и археологических раскопок, известном как Точка Раскопок Магмура IV. Используя блюспейс технологии, корабль прыгнул в зону досягаемости колонии. Товарищи, приготовьтесь к высадке!"
"announce_text": "A faint distress signal has been picked up by our scanners, which have tracked the source to a mining and archaeological site, known as Magmoor Digsite IV. Through use of bluespace drive tech, the ship has jumped within range of the colony. TGMC, gear up and get ready to respond!"
}
2 changes: 1 addition & 1 deletion _maps/orion_outpost.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
},
"armor": "jungle",
"quickbuilds": 1000,
"announce_text": "На военном форпосте Ориона на луне Тривонус IV сработал автоматический аварийный маяк, вероятно нашествие ксеноморфов. Товарищи, приготовиться к бою!"
"announce_text": "The automatic emergency beacon has activated at the Orion Military Outpost on the moon of Trivonus IV, a xenomorph infestation is likely. TGMC, get prepared and ready for a fight!"
}
2 changes: 1 addition & 1 deletion _maps/oscar_outpost.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"map_name": "Oscar Outpost",
"map_path": "map_files/oscar_outpost",
"map_file": "oscar_outpost.dmm",
"announce_text": "Наши сканеры засекли слабый сигнал бедствия и отследили его источник до Высшего командного центра батальона 167. Используя блюспейс технологии, корабль прыгнул в пределы досягаемости аванпоста. Там находятся старшие офицеры, которых необходимо эвакуировать, чтобы полностью завершить вашу миссию. Товарищи, снарядитесь и приготовьтесь к высадке!"
"announce_text": "A faint distress signal has been picked up by our scanners, which have tracked the source to Batallion 167's Supreme Command Center. Through use of emergency bluespace drive tech, the ship has jumped within range of the outpost. Senior officers are present and will need to be evacuated in order to completely finish your mission. TGMC, gear up and get ready to respond!"
}
2 changes: 1 addition & 1 deletion _maps/prison_station_fop.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
},
"armor": "prison",
"quickbuilds": 1200,
"announce_text": "Тюрьма строгого режима НаноТрейзен активировала сигнал бедствия. Корабль стремительно несется по космосу и приближается к тюремной станции. Товарищи, выдвигаемся!"
"announce_text": "A Nanotrasen maximum security prison has activated its distress signal. The ship is swiftly cruising through space, and nearing the vicinity of the prison station. TGMC, get moving!"
}
2 changes: 1 addition & 1 deletion _maps/research_outpost.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"basic": 1
},
"quickbuilds": 1000,
"announce_text": "На исследовательском форпосте появился маяк, безостановочно передающий один и тот же сигнал. Попытки связаться с колонией по связи оказались тщетными. Поскольку ваш корабль находился ближе всего, мы отправили вас выяснить в чем дело. Товарищи, приготовиться к высадке!"
"announce_text": "A research outpost has had a beacon transmitting the same signal, nonstop. Attempts to hail the colony over comms have proved futile. Because the ship was at a nearby drydock, it has been dispatched to figure out what's wrong. TGMC, prepare to deploy!"
}
2 changes: 1 addition & 1 deletion _maps/slumbridge.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"basic": 1
},
"quickbuilds": 2000,
"announce_text": "Мы получили не один, а сразу четыре сигнала бедствия из одного и того же места. Наземные сканеры и сенсоры показывают необычное расположение сегментированного астероида с включенной искусственной гравитацией. Мало того, четыре сегмента совершенно не похожи друг на друга. Товарищи, приготовьтесь к высадке и ожидайте худшего."
"announce_text": "We've received not one, but four distress signals at once coming from the same location. Ground-penetrating scanners and sensors show an unusual arrangement of a segmented asteroid with artificial gravity online. Not only that, but the four segments look nothing alike. TGMC, prepare for deployment and expect the worst."
}
2 changes: 1 addition & 1 deletion _maps/vapor_processing.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"disk_sets": {
"basic": 1
},
"announce_text": "Наши сканеры засекли слабый сигнал бедствия и определили, что его источником является колония по парообработке, известная как LV-984. Используя блюспейс технологии, корабль прыгнул в пределы досягаемости аванпоста. Товарищи, снарядитесь и приготовьтесь к высадке!"
"announce_text": "A faint distress signal has been picked up by our scanners, which have tracked the source to a Vapor Processing colony, known as LV-984. Through use of bluespace drive tech, the ship has jumped within range of the colony. TGMC, gear up and get ready to respond!"
}
2 changes: 1 addition & 1 deletion _maps/whiskey_outpost_v2.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"map_name": "Whiskey Outpost",
"map_path": "map_files/Whiskey_Outpost",
"map_file": "Whiskey_Outpost_v2.dmm",
"announce_text": "Наши сканеры засекли слабый сигнал бедствия и отследили его источник до Высшего командного центра батальона 140. Используя блюспейс технологии, корабль прыгнул в пределы досягаемости колонии. Товарищи, снаряжайтесь и готовьтесь к высадке!"
"announce_text": "A faint distress signal has been picked up by our scanners, which have tracked the source to Batallion 140's Supreme Command Center. Through use of emergency bluespace drive tech, the ship has jumped within range of the outpost. Senior officers are present and will need to be evacuated in order to completely finish your mission. TGMC, gear up and get ready to respond!"
}
11 changes: 6 additions & 5 deletions code/__HELPERS/announce.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
/proc/assemble_alert(title, subtitle, message, color_override, minor = FALSE)
if(!title || !message)
return

var/list/alert_strings = list()
var/header
var/finalized_alert
Expand Down Expand Up @@ -69,7 +70,7 @@
*/
/proc/priority_announce(
message,
title = "Оповещение",
title = "Announcement",
subtitle = "",
type = ANNOUNCEMENT_REGULAR,
sound = 'sound/misc/notice2.ogg',
Expand All @@ -90,12 +91,12 @@
assembly_header = title

if(ANNOUNCEMENT_PRIORITY)
assembly_header = "Приоритетное Оповещение"
assembly_header = "Priority Announcement"
if(length(title) > 0)
assembly_subtitle = title

if(ANNOUNCEMENT_COMMAND)
assembly_header = "Оповещение Экипажу"
assembly_header = "Command Announcement"

if(subtitle && type != ANNOUNCEMENT_PRIORITY)
assembly_subtitle = subtitle
Expand Down Expand Up @@ -124,7 +125,7 @@
SEND_SOUND(M, s)


/proc/print_command_report(papermessage, papertitle = "paper", announcemessage = "Отчет был загружен и распечатан на всех консолях связи.", announcetitle = "Входящее зашифрованное сообщение", announce = TRUE)
/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)
if(announce)
priority_announce(announcemessage, announcetitle, sound = 'sound/AI/commandreport.ogg')

Expand All @@ -146,7 +147,7 @@
* * alert - optional, alert or notice?
* * receivers - a list of all players to send the message to
*/
/proc/minor_announce(message, title = "Внимание:", alert, list/receivers = GLOB.alive_human_list)
/proc/minor_announce(message, title = "Attention:", alert, list/receivers = GLOB.alive_human_list)
if(!message)
return

Expand Down
18 changes: 0 additions & 18 deletions code/__HELPERS/type2type.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,24 +116,6 @@
if(SOUTHWEST)
return "southwest"

/proc/dir2rutext(direction)
switch(direction)
if(NORTH)
return "север"
if(SOUTH)
return "юг"
if(EAST)
return "восток"
if(WEST)
return "запад"
if(NORTHEAST)
return "северо-восток"
if(SOUTHEAST)
return "юго-восток"
if(NORTHWEST)
return "северо-запад"
if(SOUTHWEST)
return "юго-запад"

//Turns a direction into text
/proc/dir2text_short(direction)
Expand Down
3 changes: 3 additions & 0 deletions code/controllers/configuration/entries/game_options.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
/datum/config_entry/keyed_list/min_pop/ValidateListEntry(key_name, key_value)
return key_name in config.modes

/datum/config_entry/string/alert_delta
config_entry_value = "Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill."

/datum/config_entry/number/revival_brain_life
config_entry_value = -1
integer = FALSE
Expand Down
Loading
Loading