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.

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

Jump to bottom

Перевод слипера и названий реагентов (и немного бутылочек) #12584

Closed
wants to merge 32 commits into from
Closed

Перевод слипера и названий реагентов (и немного бутылочек) #12584

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
10fbb78
first based
maleyvich Dec 7, 2023
2a1cd41
Update Sleeper.dm
maleyvich Dec 7, 2023
c087425
Update Sleeper.dm
maleyvich Dec 7, 2023
60e58a1
Update Sleeper.dm
maleyvich Dec 7, 2023
ffca67a
Update Chemistry-Drinks.dm
maleyvich Dec 7, 2023
ec2609d
Update Sleeper.dm
maleyvich Dec 7, 2023
865f5f3
Update code/game/machinery/Sleeper.dm
maleyvich Dec 7, 2023
eba5808
Update code/game/machinery/Sleeper.dm
maleyvich Dec 7, 2023
d2b3e6d
Update code/game/machinery/Sleeper.dm
maleyvich Dec 7, 2023
d6fd7f7
Update code/game/machinery/Sleeper.dm
maleyvich Dec 7, 2023
8ee085f
Update code/game/machinery/Sleeper.dm
maleyvich Dec 7, 2023
60261ee
Update code/game/machinery/Sleeper.dm
maleyvich Dec 7, 2023
03a20bb
Update code/game/machinery/Sleeper.dm
maleyvich Dec 7, 2023
4bc9a1a
Update Sleeper.dm
maleyvich Dec 7, 2023
a7c4577
Update code/modules/reagents/reagent_types/Chemistry-Drinks.dm
maleyvich Dec 7, 2023
630b694
Update code/game/machinery/Sleeper.dm
maleyvich Dec 7, 2023
33e252f
Update code/game/machinery/Sleeper.dm
maleyvich Dec 7, 2023
8a68e1c
Merge branch 'scanner' of https://github.com/maleyvich/TauCetiClassic…
maleyvich Dec 8, 2023
654544a
bigfixxd
maleyvich Dec 8, 2023
642febf
Update Chemistry-Drinks.dm
maleyvich Dec 8, 2023
a73f388
Update Sleeper.dm
maleyvich Dec 8, 2023
90a692e
Update Chemistry-Drinks.dm
maleyvich Dec 8, 2023
47b4fd0
Update Sleeper.dm
maleyvich Dec 8, 2023
a738861
pillstranslate
maleyvich Dec 8, 2023
8fd6dc3
Update Sleeper.dm
maleyvich Dec 8, 2023
3b52ee9
Update code/modules/reagents/reagent_types/Chemistry-Drinks.dm
maleyvich Dec 15, 2023
dac0d65
Update code/modules/reagents/reagent_types/Chemistry-Drinks.dm
maleyvich Dec 20, 2023
8ff4225
Update Sleeper.dm
maleyvich Dec 20, 2023
501e7c8
Merge branch 'scanner' of https://github.com/maleyvich/TauCetiClassic…
maleyvich Dec 20, 2023
db76bbe
Update Chemistry-Drinks.dm
maleyvich Dec 20, 2023
7e84525
Update Sleeper.dm
maleyvich Dec 21, 2023
bf5bb6b
Merge branch 'master' into scanner
AzzyDreemurr13 Jan 13, 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
70 changes: 36 additions & 34 deletions code/game/machinery/Sleeper.dm
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

Может быть стоит это просто назвать медицинской капсулой, так как по сути в ней много функционала, введение в стазис, диализ, а также ввод медикаментов различного назначения. В той же научной фантастика название вписывается довольно органично.

Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

/obj/machinery/sleep_console
name = "Sleeper Console"
cases = list("консоль капсулы диализа", "консоли капсулы диализа", "консоли капсулы диализа", "консоль капсулы диализа", "консолью капсулы диализа", "консоли капсулы диализа")
icon = 'icons/obj/Cryogenic3.dmi'
icon_state = "sleeperconsole"
anchored = TRUE //About time someone fixed this.
Expand All @@ -12,7 +13,8 @@

/obj/machinery/sleeper
name = "Sleeper"
desc = "Used for the rapid introduction of chemicals from the internal storage."
cases = list("капсула диализа", "капсулы диализа", "капсуле диализа", "капсулу диализа", "капсулой диализа", "капсуле диализа")
desc = "Используется для быстрого вывода или ввода различных веществ путём диализа."
icon = 'icons/obj/Cryogenic3.dmi'
icon_state = "sleeper-open"
layer = BELOW_CONTAINERS_LAYER
Expand Down Expand Up @@ -78,15 +80,15 @@
if(user.incapacitated() || !iscarbon(target) || target.buckled)
return
if(!user.IsAdvancedToolUser())
to_chat(user, "<span class='warning'>You can not comprehend what to do with this.</span>")
to_chat(user, "<span class='warning'>Вы не можете понять, как работает это устройство.</span>")
return
close_machine(target)

/obj/machinery/sleeper/AltClick(mob/user)
if(user.incapacitated() || !Adjacent(user))
return
if(!user.IsAdvancedToolUser())
to_chat(user, "<span class='warning'>You can not comprehend what to do with this.</span>")
to_chat(user, "<span class='warning'>Вы не можете понять, как работает это устройство.</span>")
return
if(occupant && is_operational())
open_machine()
Expand Down Expand Up @@ -116,7 +118,7 @@
/obj/machinery/sleeper/attack_animal(mob/living/simple_animal/M)//Stop putting hostile mobs in things guise
..()
if(M.environment_smash)
visible_message("<span class='danger'>[M.name] smashes [src] apart!</span>")
visible_message("<span class='danger'>[M.name] ломает [CASE(src, NOMINATIVE_CASE)] на части!</span>")
qdel(src)
return

Expand All @@ -125,11 +127,11 @@
if(!beaker)
beaker = I
user.drop_from_inventory(I, src)
user.visible_message("[user] adds \a [I] to \the [src]!", "You add \a [I] to \the [src]!")
user.visible_message("[user] вставил [I] в [CASE(src, ACCUSATIVE_CASE)]!", "Вы вставили [I] в [CASE(src, ACCUSATIVE_CASE)]!")
updateUsrDialog()
return
else
to_chat(user, "<span class='warning'>The sleeper has a beaker already.</span>")
to_chat(user, "<span class='warning'>Внутри капсулы уже находится сосуд.</span>")
return

if(!state_open && !occupant)
Expand Down Expand Up @@ -216,28 +218,28 @@
return

/obj/machinery/sleeper/ui_interact(mob/user)
var/dat = "<div class='Section__title'>Sleeper Status</div>"
var/dat = "<div class='Section__title'>Статус капсулы диализа</div>"

dat += "<div class='Section'>"
if(!occupant)
dat += "Sleeper Unoccupied"
dat += "Капсула не занята"
else
dat += "[occupant.name] => "
switch(occupant.stat) //obvious, see what their status is
if(0)
dat += "<span class='good'>Conscious</span>"
dat += "<span class='good'>В сознании</span>"
if(1)
dat += "<span class='average'>Unconscious</span>"
dat += "<span class='average'>Не в сознании</span>"
maleyvich marked this conversation as resolved.
Show resolved Hide resolved
else
dat += "<span class='bad'>DEAD</span>"
dat += "<span class='bad'>МЁРТВ</span>"
maleyvich marked this conversation as resolved.
Show resolved Hide resolved

dat += "<br />"

dat += "<div class='line'><div class='statusLabel'>Health:</div><div class='progressBar'><div style='width: [occupant.health]%;' class='progressFill bggood'></div></div><div class='statusValue'>[occupant.health]%</div></div>"
dat += "<div class='line'><div class='statusLabel'>\> Brute Damage:</div><div class='progressBar'><div style='width: [occupant.getBruteLoss()]%;' class='progressFill bgbad'></div></div><div class='statusValue'>[occupant.getBruteLoss()]%</div></div>"
dat += "<div class='line'><div class='statusLabel'>\> Resp. Damage:</div><div class='progressBar'><div style='width: [occupant.getOxyLoss()]%;' class='progressFill bgbad'></div></div><div class='statusValue'>[occupant.getOxyLoss()]%</div></div>"
dat += "<div class='line'><div class='statusLabel'>\> Toxin Content:</div><div class='progressBar'><div style='width: [occupant.getToxLoss()]%;' class='progressFill bgbad'></div></div><div class='statusValue'>[occupant.getToxLoss()]%</div></div>"
dat += "<div class='line'><div class='statusLabel'>\> Burn Severity:</div><div class='progressBar'><div style='width: [occupant.getFireLoss()]%;' class='progressFill bgbad'></div></div><div class='statusValue'>[occupant.getFireLoss()]%</div></div>"
dat += "<div class='line'><div class='statusLabel'>\> Механические повреждения:</div><div class='progressBar'><div style='width: [occupant.getBruteLoss()]%;' class='progressFill bgbad'></div></div><div class='statusValue'>[occupant.getBruteLoss()]%</div></div>"
dat += "<div class='line'><div class='statusLabel'>\> Статус асфиксии:</div><div class='progressBar'><div style='width: [occupant.getOxyLoss()]%;' class='progressFill bgbad'></div></div><div class='statusValue'>[occupant.getOxyLoss()]%</div></div>"
maleyvich marked this conversation as resolved.
Show resolved Hide resolved
dat += "<div class='line'><div class='statusLabel'>\> Статус интоксикации:</div><div class='progressBar'><div style='width: [occupant.getToxLoss()]%;' class='progressFill bgbad'></div></div><div class='statusValue'>[occupant.getToxLoss()]%</div></div>"
maleyvich marked this conversation as resolved.
Show resolved Hide resolved
dat += "<div class='line'><div class='statusLabel'>\> Термические повреждения:</div><div class='progressBar'><div style='width: [occupant.getFireLoss()]%;' class='progressFill bgbad'></div></div><div class='statusValue'>[occupant.getFireLoss()]%</div></div>"

var/occupant_paralysis = occupant.AmountParalyzed()
dat += "<HR><div class='line'><div class='statusLabel'>Paralysis Summary:</div><div class='statusValue'>[round(occupant_paralysis)]% [occupant_paralysis ? "([round(occupant_paralysis / 4)] seconds left)" : ""]</div></div>"
Expand All @@ -247,41 +249,41 @@

dat += "</div>"

dat += "<A href='?src=\ref[src];refresh=1'>Scan</A>"
dat += "<A href='?src=\ref[src];refresh=1'>Начать сканирование</A>"

dat += "<A href='?src=\ref[src];[state_open ? "close=1'>Close</A>" : "open=1'>Open</A>"]"
dat += "<A href='?src=\ref[src];[state_open ? "close=1'>Закрыть</A>" : "open=1'>Открыть</A>"]"

dat += "<h3>Beaker</h3>"
dat += "<h3>Сосуд</h3>"

if(src.beaker)
dat += "<A href='?src=\ref[src];removebeaker=1'>Remove Beaker</A>"
dat += "<A href='?src=\ref[src];removebeaker=1'>Убрать сосуд</A>"
maleyvich marked this conversation as resolved.
Show resolved Hide resolved
if(filtering)
dat += "<A href='?src=\ref[src];togglefilter=1'>Stop Dialysis</A>"
dat += text("<BR>Output Beaker has [] units of free space remaining<BR><HR>", src.beaker.reagents.maximum_volume - src.beaker.reagents.total_volume)
dat += "<A href='?src=\ref[src];togglefilter=1'>Остановить диализ</A>"
dat += text("<BR>В выходном сосуде осталось [] юнитов свободного места<BR><HR>", src.beaker.reagents.maximum_volume - src.beaker.reagents.total_volume)
maleyvich marked this conversation as resolved.
Show resolved Hide resolved
else
dat += "<A href='?src=\ref[src];togglefilter=1'>Start Dialysis</A>"
dat += text("<BR>Output Beaker has [] units of free space remaining", src.beaker.reagents.maximum_volume - src.beaker.reagents.total_volume)
dat += "<A href='?src=\ref[src];togglefilter=1'>Начать диализ</A>"
dat += text("<BR>В выходном сосуде осталось [] юнитов свободного места", src.beaker.reagents.maximum_volume - src.beaker.reagents.total_volume)
maleyvich marked this conversation as resolved.
Show resolved Hide resolved
else
dat += "<BR>No Dialysis Output Beaker is present."
dat += "<BR>Сосуд для проведения диализа не вставлен"
maleyvich marked this conversation as resolved.
Show resolved Hide resolved

dat += "<h3>Injector</h3>"
dat += "<h3>Введение препаратов</h3>"

if(src.occupant)
dat += "<A href='?src=\ref[src];inject=inaprovaline'>Inject Inaprovaline</A>"
dat += "<A href='?src=\ref[src];inject=inaprovaline'>Ввести Инапровалин</A>"
else
dat += "<span class='disabled'>Inject Inaprovaline</span>"
dat += "<span class='disabled'>Ввести Инапровалин</span>"
if(occupant && occupant.health > min_health)
for(var/re in available_chems)
var/datum/reagent/C = chemical_reagents_list[re]
if(C)
dat += "<BR><A href='?src=\ref[src];inject=[C.id]'>Inject [C.name]</A>"
dat += "<BR><A href='?src=\ref[src];inject=[C.id]'>Ввести [C.name]</A>"
else
for(var/re in available_chems)
var/datum/reagent/C = chemical_reagents_list[re]
if(C)
dat += "<BR><span class='disabled'>Inject [C.name]</span>"
dat += "<BR><span class='disabled'>Ввести [C.name]</span>"

var/datum/browser/popup = new(user, "sleeper", "Sleeper Console", 520, 605) //Set up the popup browser window
var/datum/browser/popup = new(user, "капсула диализа", "консоль капсулы диализа", 520, 605) //Set up the popup browser window
Copy link
Contributor

Choose a reason for hiding this comment

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

а зачем айдишник окна переводить? и почему название окошка с маленькой

Copy link
Contributor Author

Choose a reason for hiding this comment

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

айдишник переведен чтобы прям точно всё было на русском? а маленькие буквы исправил, да.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

оно ничего не ломает а название окошечка исправлено

Copy link
Contributor

Choose a reason for hiding this comment

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

айдишник переводить не стоит
это не то, что показывает юзеру

Copy link
Contributor Author

Choose a reason for hiding this comment

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

хм хорошо перевод айдишника уберу

popup.set_content(dat)
popup.open()

Expand All @@ -304,9 +306,9 @@
if(href_list["inject"] == "inaprovaline" || (occupant.health > min_health && (href_list["inject"] in available_chems)))
inject_chem(usr, href_list["inject"])
else
to_chat(usr, "<span class='notice'>ERROR: Subject is not in stable condition for auto-injection.</span>")
to_chat(usr, "<span class='notice'>ОШИБКА: ПАЦИЕНТ НЕ НАХОДИТСЯ В СТАБИЛЬНОМ СОСТОЯНИИ ДЛЯ ВВЕДЕНИЯ ПРЕПАРАТОВ.</span>")
maleyvich marked this conversation as resolved.
Show resolved Hide resolved
else
to_chat(usr, "<span class='notice'>ERROR: Subject cannot metabolise chemicals.</span>")
to_chat(usr, "<span class='notice'>ОШИБКА: У ПАЦИЕНТА ОБНАРУЖЕНО СЕРЬЕЗНОЕ НАРУШЕНИЕ МЕТАБОЛИЗМА.</span>")
updateUsrDialog()

/obj/machinery/sleeper/open_machine()
Expand All @@ -317,15 +319,15 @@

/obj/machinery/sleeper/close_machine(mob/target)
if(state_open && !panel_open)
to_chat(target, "<span class='notice'><b>You feel cool air surround you. You go numb as your senses turn inward.</b></span>")
to_chat(target, "<span class='notice'><b>Вы чувствуете охлаждение воздуха в капсуле, а затем медленную остановку жизненных процессов.</b></span>")
maleyvich marked this conversation as resolved.
Show resolved Hide resolved
..(target)

/obj/machinery/sleeper/proc/inject_chem(mob/user, chem)
if(occupant && occupant.reagents)
if(occupant.reagents.get_reagent_amount(chem) + 10 <= 20 * efficiency)
occupant.reagents.add_reagent(chem, 10)
var/units = round(occupant.reagents.get_reagent_amount(chem))
to_chat(user, "<span class='notice'>Occupant now has [units] unit\s of [chem] in their bloodstream.</span>")
to_chat(user, "<span class='notice'>Пациенту было введено [units] юнит(ов) [chem] в организм.</span>")
Copy link
Contributor

Choose a reason for hiding this comment

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

Пациенту было введено 10 юнит(ов) anti_toxin в организм)))

Copy link
Contributor

Choose a reason for hiding this comment

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

Из-за того что там айдишник применяется, поэтому пока оставим только так, может кто-то придумает, что с этим сделать

Copy link
Contributor Author

Choose a reason for hiding this comment

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

хм я подумал как можно было бы решить эту проблему

Copy link
Contributor Author

Choose a reason for hiding this comment

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

хм идея не сработала

Copy link
Contributor

Choose a reason for hiding this comment

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

chem.name ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ne rabotaer

Copy link
Contributor

@Chip11-n Chip11-n Dec 15, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Тайп пропиши химикатам и окончание юнитам сделай нормальное, есть инструмент для этого


/obj/machinery/sleeper/update_icon()
if(state_open)
Expand Down
Loading
Loading