Merge branch 'master220' into anomalies

ss220-space · Nov 21, 2024 · df01504 · df01504
2 parents 2784e77 + 9466401
commit df01504
Show file tree

Hide file tree

Showing 57 changed files with 713 additions and 429 deletions.
diff --git a/_maps/map_files/nova/nova.dmm b/_maps/map_files/nova/nova.dmm
diff --git a/code/game/area/ss13_areas.dm b/code/game/area/ss13_areas.dm
@@ -1491,6 +1491,12 @@ This applies to all STANDARD station areas
 	name = "Chapel Office"
 	icon_state = "chapeloffice"
 
+/area/chapel/morgue
+	name = "Chapel Morgue"
+
+/area/chapel/massdriver
+	name = "Chapel Mass Driver"
+
 /area/escapepodbay
 	name = "Escape Shuttle Hallway Podbay"
 	icon_state = "escape"

diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
@@ -1,6 +1,6 @@
 /obj/machinery/computer/HolodeckControl
 	name = "holodeck control computer"
-	desc = "A computer used to control a nearby holodeck."
+	desc = "Компьютер, используемый для управления ближайшим голодеком."
 	icon_keyboard = "tech_key"
 	icon_screen = "holocontrol"
 	var/area/linkedholodeck = null

diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
@@ -49,7 +49,7 @@
 
 /obj/machinery/computer/arcade/battle
 	name = "arcade machine"
-	desc = "Does not support Pinball."
+	desc = "Не поддерживает пинбол."
 	icon = 'icons/obj/machines/computer.dmi'
 	icon_state = "arcade"
 	circuit = /obj/item/circuitboard/arcade/battle
@@ -277,7 +277,7 @@
 
 /obj/machinery/computer/arcade/orion_trail
 	name = "The Orion Trail"
-	desc = "Learn how our ancestors got to Orion, and have fun in the process!"
+	desc = "Узнайте, как наши предки добрались до Ориона, и повеселитесь в процессе!"
 	icon_state = "arcade"
 	circuit = /obj/item/circuitboard/arcade/orion_trail
 	var/busy = 0 //prevent clickspam that allowed people to ~speedrun~ the game.
@@ -382,7 +382,7 @@
 			emagged = 0 //removes the emagged status after you lose
 			playing = 0 //also a new game
 			name = "The Orion Trail"
-			desc = "Learn how our ancestors got to Orion, and have fun in the process!"
+			desc = "Узнайте, как наши предки добрались до Ориона, и повеселитесь в процессе!"
 
 	else if(event)
 		dat = eventdat
@@ -955,15 +955,15 @@
 		prizevend(score)
 	emagged = 0
 	name = "The Orion Trail"
-	desc = "Learn how our ancestors got to Orion, and have fun in the process!"
+	desc = "Узнайте, как наши предки добрались до Ориона, и повеселитесь в процессе!"
 
 /obj/machinery/computer/arcade/orion_trail/emag_act(mob/user)
 	if(!emagged)
 		add_attack_logs(user, src, "emagged")
 		if(user)
 			to_chat(user, span_notice("You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode."))
 		name = "The Orion Trail: Realism Edition"
-		desc = "Learn how our ancestors got to Orion, and try not to die in the process!"
+		desc = "Узнайте, как наши предки добрались до Ориона, и постарайтесь не сдохнуть в процессе!"
 		newgame()
 		emagged = 1
 
@@ -1015,7 +1015,7 @@
 
 /obj/machinery/computer/arcade/orion_trail/pc_frame
 	name = "special purpose computer"
-	desc = "It will be difficult to perform calculations on this computer..."
+	desc = "Выполнять вычисления на этом компьютере будет сложно..."
 	icon = 'icons/obj/machines/computer.dmi'
 	icon_state = "aimainframe"
 
@@ -1026,7 +1026,7 @@
 
 /obj/machinery/computer/arcade/battle/pc_frame
 	name = "special purpose computer"
-	desc = "It will be difficult to perform calculations on this computer..."
+	desc = "Выполнять вычисления на этом компьютере будет сложно..."
 	icon = 'icons/obj/machines/computer.dmi'
 	icon_state = "aimainframe"
 

diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm
@@ -1,6 +1,6 @@
 /obj/machinery/computer/atmos_alert
 	name = "atmospheric alert computer"
-	desc = "Used to access the station's atmospheric sensors."
+	desc = "Используется для мониторинга атмосферных датчиков станции."
 	circuit = /obj/item/circuitboard/atmos_alert
 	var/ui_x = 350
 	var/ui_y = 300

diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm
@@ -14,7 +14,7 @@
 
 /obj/machinery/computer/atmoscontrol/laptop
 	name = "atmospherics laptop"
-	desc = "Cheap Nanotrasen laptop."
+	desc = "Дешёвый ноутбук корпорации Nanotrasen."
 	icon_state = "medlaptop"
 	density = FALSE
 

diff --git a/code/game/machinery/computer/brigcells.dm b/code/game/machinery/computer/brigcells.dm
@@ -1,6 +1,6 @@
 /obj/machinery/computer/brigcells
     name = "cell management computer"
-    desc = "Used to manage prison cells."
+    desc = "Используется для управления тюремными камерами."
     icon_keyboard = "security_key"
     icon_screen = "cell_monitor"
     use_power = IDLE_POWER_USE

diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
@@ -2,7 +2,7 @@
 
 /obj/machinery/computer/security
 	name = "security camera console"
-	desc = "Used to access the various cameras networks on the station."
+	desc = "Используется для доступа к сетям камер на станции."
 
 	icon_keyboard = "security_key"
 	icon_screen = "cameras"
@@ -198,7 +198,7 @@
 // Other computer monitors.
 /obj/machinery/computer/security/telescreen
 	name = "telescreen"
-	desc = "Used for watching camera networks."
+	desc = "Используется для просмотра сети камер."
 	icon_state = "telescreen_console"
 	icon_screen = "telescreen"
 	icon_keyboard = null
@@ -228,7 +228,7 @@
 
 /obj/machinery/computer/security/telescreen/entertainment
 	name = "entertainment monitor"
-	desc = "Damn, they better have Paradise TV on these things."
+	desc = "Чёрт возьми, лучше бы они показывали Paradise TV."
 	icon_state = "entertainment_console"
 	icon_screen = "entertainment_off"
 	light_color = "#FFEEDB"
@@ -281,33 +281,33 @@
 
 /obj/machinery/computer/security/telescreen/singularity
 	name = "Singularity Engine Telescreen"
-	desc = "Used for watching the singularity chamber."
+	desc = "Используется для наблюдения за зоной содержания сингулярности."
 	network = list("Singularity")
 	circuit = /obj/item/circuitboard/camera/telescreen/singularity
 
 /obj/machinery/computer/security/telescreen/toxin_chamber
 	name = "Toxins Telescreen"
-	desc = "Used for watching the test chamber."
+	desc = "Используется для наблюдения за полигоном."
 	network = list("Toxins")
 
 /obj/machinery/computer/security/telescreen/test_chamber
 	name = "Test Chamber Telescreen"
-	desc = "Used for watching the test chamber."
+	desc = "Используется для наблюдения за полигоном."
 	network = list("TestChamber")
 
 /obj/machinery/computer/security/telescreen/research
 	name = "Research Monitor"
-	desc = "Used for watching the RD's goons from the safety of his office."
+	desc = "С помощью этого монитора Директор Исследований может наблюдать за своими подхалимами из безопасного места."
 	network = list("Research","Research Outpost","RD")
 
 /obj/machinery/computer/security/telescreen/prison
 	name = "Prison Monitor"
-	desc = "Used for watching Prison Wing holding areas."
+	desc = "Используется для мониторинга помещений тюремного блока."
 	network = list("Prison")
 
 /obj/machinery/computer/security/wooden_tv
 	name = "security camera monitor"
-	desc = "An old TV hooked into the station's camera network."
+	desc = "Старый телевизор, подключенный к сети камер станции."
 	icon_state = "television"
 	icon_keyboard = null
 	icon_screen = "detective_tv"
@@ -318,7 +318,7 @@
 
 /obj/machinery/computer/security/mining
 	name = "outpost camera monitor"
-	desc = "Used to access the various cameras on the outpost."
+	desc = "Используется для доступа к различным камерам на аванпосте."
 	icon_keyboard = "mining_key"
 	icon_screen = "mining"
 	light_color = "#F9BBFC"
@@ -327,7 +327,7 @@
 
 /obj/machinery/computer/security/engineering
 	name = "engineering camera monitor"
-	desc = "Used to monitor fires and breaches."
+	desc = "Используется для отслеживания возникающих пожаров и аварий."
 	icon_keyboard = "power_key"
 	icon_screen = "engie_cams"
 	light_color = "#FAC54B"

diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
@@ -1,6 +1,6 @@
 /obj/machinery/computer/camera_advanced
 	name = "advanced camera console"
-	desc = "Used to access the various cameras on the station."
+	desc = "Используется для доступа к различным камерам, установленным на станции."
 	icon_screen = "cameras"
 	icon_keyboard = "security_key"
 	var/mob/camera/aiEye/remote/eyeobj

diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
@@ -10,7 +10,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 
 /obj/machinery/computer/card
 	name = "identification computer"
-	desc = "Terminal for programming Nanotrasen employee ID cards to access parts of the station."
+	desc = "Терминал, используемый для изменения уровня доступа ID-карт сотрудников Nanotrasen."
 	icon_keyboard = "id_key"
 	icon_screen = "id"
 	req_access = list(ACCESS_CHANGE_IDS)
@@ -772,7 +772,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 /obj/machinery/computer/card/minor
 	name = "department management console"
 	target_dept = TARGET_DEPT_GENERIC
-	desc = "You can use this to change ID's for specific departments."
+	desc = "Вы можете использовать это, чтобы изменить ID-карту для определенного отдела."
 	icon_screen = "idminor"
 	circuit = /obj/item/circuitboard/card/minor
 

diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
@@ -12,7 +12,7 @@
 // The communications computer
 /obj/machinery/computer/communications
 	name = "communications console"
-	desc = "This allows the Captain to contact Central Command, or change the alert level. It also allows the command staff to call the Escape Shuttle."
+	desc = "Консоль, с помощью которой Капитан может связаться с Центральным Командованием или изменить уровень угрозы. Она так же позволяет командному составу вызвать эвакуационный шаттл."
 	icon_keyboard = "tech_key"
 	icon_screen = "comm"
 	req_access = list(ACCESS_HEADS)

diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
@@ -1,6 +1,6 @@
 /obj/machinery/computer/crew
 	name = "crew monitoring computer"
-	desc = "Used to monitor active health sensors built into most of the crew's uniforms."
+	desc = "Используется для контроля активных датчиков состояния здоровья, встроенных в униформу большинства членов экипажа."
 	icon_keyboard = "med_key"
 	icon_screen = "crew"
 	use_power = IDLE_POWER_USE

diff --git a/code/game/machinery/computer/depot.dm b/code/game/machinery/computer/depot.dm
@@ -390,7 +390,7 @@
 
 /obj/machinery/computer/syndicate_depot/teleporter
 	name = "Syndicate Redspace Teleporter Console"
-	desc = "This suspicious high-tech machine creates a Bi-Directional teleporter that is capable to ignore any bluespace interference!"
+	desc = "Эта подозрительная высокотехнологичная машина создает двунаправленный телепорт, способный игнорировать любые BlueSpace-помехи!"
 	icon_screen = "telesci"
 	icon_keyboard = "teleport_key"
 	window_height = 320

diff --git a/code/game/machinery/computer/honkputer.dm b/code/game/machinery/computer/honkputer.dm
@@ -1,6 +1,6 @@
 /obj/machinery/computer/HONKputer
 	name = "\improper HONKputer Mark I"
-	desc = "A yellow computer used in case of critically low levels of HONK."
+	desc = "Яркий жёлтый компьютер. Воспользуйтесь им, если уровень ХОНКА упал до критически низкого уровня!"
 	icon = 'icons/obj/machines/HONKputer.dmi'
 	icon_state = "honkputer"
 	icon_keyboard = "key_honk"

diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm
@@ -1,6 +1,6 @@
 /obj/machinery/computer/aiupload
 	name = "\improper AI upload console"
-	desc = "Used to upload laws to the AI."
+	desc = "Используется для манипуляций с законами ИИ."
 	icon_screen = "command"
 	icon_keyboard = "med_key"
 	circuit = /obj/item/circuitboard/aiupload
@@ -59,7 +59,7 @@
 // Why is this not a subtype
 /obj/machinery/computer/borgupload
 	name = "cyborg upload console"
-	desc = "Used to upload laws to Cyborgs."
+	desc = "Используется для манипуляций с законами киборгов."
 	icon_screen = "command"
 	icon_keyboard = "med_key"
 	circuit = /obj/item/circuitboard/borgupload

diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
@@ -9,7 +9,7 @@
 
 /obj/machinery/computer/med_data //TODO:SANITY
 	name = "medical records console"
-	desc = "This can be used to check medical records."
+	desc = "Используется для проверки медицинских записей."
 	icon_keyboard = "med_key"
 	icon_screen = "medcomp"
 	req_access = list(ACCESS_MEDICAL, ACCESS_FORENSICS_LOCKERS)
@@ -461,7 +461,7 @@
 
 /obj/machinery/computer/med_data/laptop
 	name = "medical laptop"
-	desc = "Cheap Nanotrasen laptop."
+	desc = "Дешёвый ноутбук корпорации Nanotrasen."
 	icon_state = "laptop"
 	icon_keyboard = "laptop_key"
 	icon_screen = "medlaptop"

diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
@@ -1,7 +1,7 @@
 // Allows you to monitor messages that passes the server.
 /obj/machinery/computer/message_monitor
 	name = "message monitoring console"
-	desc = "Used to monitor the crew's messages that are sent via PDA. It can also be used to view Request Console messages."
+	desc = "Используется для отслеживания сообщений экипажа, отправляемых через КПК. Его также можно использовать для просмотра сообщений Консоли Запросов."
 	icon_screen = "comm_logs"
 	light_color = LIGHT_COLOR_GREEN
 	var/hack_icon = "tcboss"

diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
@@ -1,6 +1,6 @@
 /obj/machinery/computer/pod
 	name = "mass drivers and pod doors control"
-	desc = "A control for launching pods. Some people prefer firing Mechas."
+	desc = "Элемент управления для запуска капсул. Некоторые предпочитают запускать из них мехов."
 	icon_screen = "mass_driver"
 	light_color = "#555555"
 	circuit = /obj/item/circuitboard/pod
@@ -279,7 +279,7 @@
 
 /obj/machinery/computer/pod/old/syndicate
 	name = "external airlock controls"
-	desc = "The Syndicate operate on a tight budget. Operates external airlocks."
+	desc = "Синдикат работает в условиях ограниченного бюджета. Управляет внешними шлюзами."
 	req_access = list(ACCESS_SYNDICATE)
 	circuit = /obj/item/circuitboard/syndicatedoor
 	light_color = "#00FFFF"
@@ -294,7 +294,7 @@
 
 /obj/machinery/computer/pod/old/swf
 	name = "\improper Magix System IV"
-	desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition"
+	desc = "Таинственный артефакт, в котором сконцентрировано огромное количество магической энергии."
 	circuit = /obj/item/circuitboard/swfdoor
 
 

diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm
@@ -1,6 +1,6 @@
 /obj/machinery/computer/monitor
 	name = "power monitoring console"
-	desc = "Used to monitor power levels across the station."
+	desc = "Используется для мониторинга уровня энергопотребления на всей станции."
 	icon_screen = "power"
 	icon_keyboard = "power_key"
 	use_power = ACTIVE_POWER_USE
@@ -23,7 +23,7 @@
 
 /obj/machinery/computer/monitor/secret //Hides the power monitor (such as ones on ruins & CentCom) from PDA's to prevent metagaming.
 	name = "outdated power monitoring console"
-	desc = "It monitors power levels across the local powernet."
+	desc = "Используется для отслеживания уровня энергопотребления в локальной сети."
 	circuit = /obj/item/circuitboard/powermonitor/secret
 	is_secret_monitor = TRUE
 

diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
@@ -1,6 +1,6 @@
 /obj/machinery/computer/robotics
 	name = "robotics control console"
-	desc = "Used to remotely lockdown or detonate linked Cyborgs."
+	desc = "Используется для дистанционной блокировки или подрыва привязанных киборгов."
 	icon = 'icons/obj/machines/computer.dmi'
 	icon_keyboard = "tech_key"
 	icon_screen = "robot"

diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
@@ -6,7 +6,7 @@
 
 /obj/machinery/computer/secure_data
 	name = "security records"
-	desc = "Used to view and edit personnel's security records."
+	desc = "Используется для просмотра и редактирования записей службы безопасности о персонале."
 	icon_keyboard = "security_key"
 	icon_screen = "security"
 	circuit = /obj/item/circuitboard/secure_data
@@ -518,7 +518,7 @@
 
 /obj/machinery/computer/secure_data/laptop
 	name = "security laptop"
-	desc = "Nanotrasen Security laptop. Bringing modern compact computing to this century!"
+	desc = "Ноутбук службы безопасности Nanotrasen. Привносим современные компактные компьютеры в наше столетие!"
 	icon_state = "laptop"
 	icon_keyboard = "seclaptop_key"
 	icon_screen = "seclaptop"

diff --git a/code/game/machinery/computer/sm_monitor.dm b/code/game/machinery/computer/sm_monitor.dm
@@ -1,6 +1,6 @@
 /obj/machinery/computer/sm_monitor
 	name = "supermatter monitoring console"
-	desc = "Used to monitor supermatter shards."
+	desc = "Используется для мониторинга состояния осколка суперматерии."
 	icon_keyboard = "power_key"
 	icon_screen = "smmon_0"
 	circuit = /obj/item/circuitboard/sm_monitor

diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm
@@ -1,7 +1,7 @@
 
 /obj/machinery/computer/station_alert
 	name = "station alert console"
-	desc = "Used to access the station's automated alert system."
+	desc = "Используется для доступа к автоматизированной системе тревог станции."
 	icon_keyboard = "tech_key"
 	icon_screen = "alert:0"
 	light_color = LIGHT_COLOR_CYAN