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

Перевод консоли коммуникаций и связанных с ней вещей #13113

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
7ea0ed5
based
maleyvich May 24, 2024
e1d8b4a
Merge branch 'master' into com
AzzyDreemurr13 May 24, 2024
b048ed7
sus
maleyvich May 24, 2024
6d37d1e
Merge branch 'com' of https://github.com/TauCetiStation-TranslationDe…
maleyvich May 24, 2024
0bbba85
Update communications.dm
maleyvich May 24, 2024
5443dbb
Update security_levels.dm
maleyvich May 24, 2024
f550902
Update communications.dm
maleyvich May 24, 2024
2ca04b8
Update communications.dm
maleyvich May 24, 2024
3ef832e
Update communications.dm
maleyvich May 24, 2024
e090c01
Update alarm.dm
maleyvich May 24, 2024
9533565
Update code/game/machinery/computer/communications.dm
maleyvich May 24, 2024
13ef05a
Update code/game/machinery/computer/communications.dm
maleyvich May 24, 2024
eac196d
Update code/game/machinery/computer/communications.dm
maleyvich May 24, 2024
876bea9
Update code/game/machinery/computer/communications.dm
maleyvich May 24, 2024
25b12ca
Update code/game/machinery/computer/communications.dm
maleyvich May 24, 2024
df78d9d
Update communications.dm
maleyvich May 24, 2024
f31b2ca
Merge branch 'com' of https://github.com/TauCetiStation-TranslationDe…
maleyvich May 24, 2024
bce9ebf
Update code/game/machinery/alarm.dm
maleyvich May 25, 2024
23e2642
Update alarm.dm
maleyvich May 25, 2024
27d3173
Update code/game/machinery/computer/communications.dm
maleyvich May 25, 2024
d7fbfd3
Merge branch 'com' of https://github.com/TauCetiStation-TranslationDe…
maleyvich May 28, 2024
7bbc743
Update code/game/machinery/computer/communications.dm
maleyvich May 28, 2024
adcf591
Update code/game/machinery/computer/communications.dm
Kiromaka May 28, 2024
0430215
Update code/game/machinery/computer/communications.dm
maleyvich May 30, 2024
1f86c67
Update communications.dm
maleyvich May 30, 2024
dd5b064
Update communications.dm
maleyvich May 30, 2024
4a2fd01
Merge branch 'com' of https://github.com/TauCetiStation-TranslationDe…
maleyvich May 30, 2024
354f1db
Update code/game/machinery/computer/communications.dm
maleyvich Jun 3, 2024
933e99b
Update code/game/machinery/computer/communications.dm
maleyvich Jun 3, 2024
fde565b
Update code/game/machinery/computer/communications.dm
maleyvich Jun 3, 2024
d1c1b5b
Update code/game/machinery/alarm.dm
maleyvich Jun 3, 2024
98353c0
Merge branch 'master' into com
maleyvich Jun 17, 2024
bba3379
Update code/game/machinery/computer/communications.dm
AzzyDreemurr13 Jun 17, 2024
998cecb
Update code/game/machinery/computer/communications.dm
AzzyDreemurr13 Jun 17, 2024
75d609e
Update code/game/machinery/computer/communications.dm
AzzyDreemurr13 Jun 18, 2024
3afb06b
Update code/game/machinery/computer/communications.dm
maleyvich Jun 20, 2024
f71ff65
Update code/game/machinery/computer/communications.dm
maleyvich Jun 20, 2024
19280ba
Update code/game/machinery/computer/communications.dm
maleyvich Jun 20, 2024
ed61b50
Update code/game/machinery/computer/communications.dm
maleyvich Jun 20, 2024
7668bd8
Update code/game/machinery/computer/communications.dm
maleyvich Jun 20, 2024
898b0b0
Update code/game/machinery/computer/communications.dm
maleyvich Jun 20, 2024
8c0e31e
Update code/datums/announcements/events.dm
maleyvich Jun 22, 2024
fbc1cad
Update code/game/machinery/computer/communications.dm
maleyvich Jun 22, 2024
ebd053d
Update code/game/machinery/computer/communications.dm
maleyvich Jun 22, 2024
94d1290
Update code/game/machinery/computer/communications.dm
maleyvich Jun 22, 2024
af8cd4a
Update code/game/machinery/computer/communications.dm
maleyvich Jun 22, 2024
6584d65
Update code/game/machinery/computer/communications.dm
maleyvich Jun 22, 2024
6796e60
Update code/game/machinery/computer/communications.dm
maleyvich Jun 22, 2024
07a93c8
Update code/game/machinery/computer/communications.dm
maleyvich Jun 22, 2024
dd216f1
Update code/game/machinery/computer/communications.dm
maleyvich Jun 22, 2024
16a3cfc
Update code/game/machinery/computer/communications.dm
maleyvich Jun 22, 2024
172131b
Update code/game/machinery/computer/communications.dm
maleyvich Jun 22, 2024
89781e9
Update code/game/machinery/computer/communications.dm
maleyvich Jun 22, 2024
253f28f
Update code/game/machinery/computer/communications.dm
maleyvich Jun 22, 2024
294252c
Update code/game/machinery/computer/communications.dm
maleyvich Jun 22, 2024
a67d7b6
Update code/game/machinery/computer/communications.dm
maleyvich Jun 22, 2024
b614a6f
Update code/game/machinery/computer/communications.dm
maleyvich Jun 22, 2024
aaa45d4
Merge branch 'master' into com
AzzyDreemurr13 Jul 14, 2024
4da2a8a
Last Fix
AzzyDreemurr13 Jul 14, 2024
caaed84
Update response_team.dm
maleyvich Jul 15, 2024
8875476
asdsa
maleyvich Jul 15, 2024
aa59b5c
Merge branch 'master' into com
AzzyDreemurr13 Jul 20, 2024
0bf8ab0
Update code/game/machinery/computer/communications.dm
AzzyDreemurr13 Jul 21, 2024
cdde9a6
Update code/game/machinery/computer/communications.dm
AzzyDreemurr13 Jul 21, 2024
16fe688
Update code/game/machinery/computer/communications.dm
AzzyDreemurr13 Jul 21, 2024
40c3e6d
Update code/game/machinery/computer/communications.dm
AzzyDreemurr13 Jul 21, 2024
af0d9dd
Update code/game/machinery/computer/communications.dm
AzzyDreemurr13 Jul 21, 2024
fea4aba
Update code/game/machinery/computer/communications.dm
AzzyDreemurr13 Jul 21, 2024
6d0c0ea
Update code/game/machinery/computer/communications.dm
maleyvich Jul 21, 2024
c3f63a2
Update code/game/machinery/computer/communications.dm
AzzyDreemurr13 Jul 21, 2024
5549040
Update code/game/machinery/alarm.dm
AzzyDreemurr13 Jul 21, 2024
dfb6d63
Update code/game/machinery/computer/communications.dm
AzzyDreemurr13 Jul 21, 2024
148e2da
Update code/game/machinery/alarm.dm
AzzyDreemurr13 Jul 21, 2024
0ef6d8f
Update code/game/machinery/computer/communications.dm
maleyvich Jul 21, 2024
64e1e31
Merge branch 'master' into com
AzzyDreemurr13 Jul 30, 2024
683feb7
Фиксим цвет, спасибо Пикачушке за помощь
AzzyDreemurr13 Jul 31, 2024
16dec7a
Merge branch 'master' into com
AzzyDreemurr13 Aug 31, 2024
21a2c2b
Merge branch 'master' into com
AzzyDreemurr13 Sep 11, 2024
4fbd22c
Update code/game/machinery/computer/communications.dm
AzzyDreemurr13 Sep 11, 2024
426e667
Apply suggestions from code review
AzzyDreemurr13 Sep 11, 2024
a052285
Update code/game/machinery/alarm.dm
AzzyDreemurr13 Sep 24, 2024
c1bf7fd
Update code/game/machinery/computer/communications.dm
maleyvich Sep 24, 2024
84a6b38
Update code/game/machinery/computer/communications.dm
maleyvich Sep 24, 2024
f5ae6ba
Update communications.dm
maleyvich Sep 24, 2024
95ee89d
Merge branch 'com' of https://github.com/TauCetiStation-TranslationDe…
maleyvich Sep 24, 2024
dbef0a8
Update communications.dm
maleyvich Sep 24, 2024
2cb0bc0
Update communications.dm
maleyvich Sep 24, 2024
60bd029
Merge branch 'master' into com
AzzyDreemurr13 Oct 8, 2024
d6241bd
Merge branch 'master' into com
AzzyDreemurr13 Oct 18, 2024
af6cec9
Merge branch 'master' into com
AzzyDreemurr13 Oct 19, 2024
18076f4
Apply suggestions from code review
AzzyDreemurr13 Oct 20, 2024
b5caa8d
Apply suggestions from code review
AzzyDreemurr13 Oct 20, 2024
3542162
Apply suggestions from code review
AzzyDreemurr13 Oct 20, 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
8 changes: 4 additions & 4 deletions code/__DEFINES/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
#define GAME_STATE_FINISHED 4

//Security levels
#define SEC_LEVEL_GREEN 0
#define SEC_LEVEL_BLUE 1
#define SEC_LEVEL_RED 2
#define SEC_LEVEL_DELTA 3
#define SEC_LEVEL_GREEN 1
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

Choose a reason for hiding this comment

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

Это из-за Алерт кодов и чтобы в переводе был цвет, там всё нормально.

#define SEC_LEVEL_BLUE 2
#define SEC_LEVEL_RED 3
#define SEC_LEVEL_DELTA 4

#define ROUNDSTART_LOGOUT_REPORT_TIME 6000 //Amount of time (in deciseconds) after the rounds starts, that the player disconnect report is issued.

Expand Down
2 changes: 1 addition & 1 deletion code/datums/wires/nuclearbomb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var/global/const/NUKE_WIRE_SAFETY = 4
N.timing = 0
if(istype(N, /obj/machinery/nuclearbomb/fake))
return
if(get_security_level() == "delta")
if(code_name_eng[security_level] == "delta")
set_security_level("red")

if(NUKE_WIRE_SAFETY)
Expand Down
22 changes: 13 additions & 9 deletions code/game/machinery/alarm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1134,7 +1134,7 @@ FIRE ALARM
d2 = text("<A href='?src=\ref[];time=1'>Initiate Time Lock</A>", src)
var/second = round(time) % 60
var/minute = (round(time) - second) / 60
var/dat = "[d1]\n<HR><b>The current alert level is: [get_security_level()]</b><br><br>\nTimer System: [d2]<BR>\nTime Left: [(minute ? "[minute]:" : null)][second] <A href='?src=\ref[src];tp=-30'>-</A> <A href='?src=\ref[src];tp=-1'>-</A> <A href='?src=\ref[src];tp=1'>+</A> <A href='?src=\ref[src];tp=30'>+</A>\n"
var/dat = "[d1]\n<HR><b>The current alert level is: [code_name_eng[security_level]]</b><br><br>\nTimer System: [d2]<BR>\nTime Left: [(minute ? "[minute]:" : null)][second] <A href='?src=\ref[src];tp=-30'>-</A> <A href='?src=\ref[src];tp=-1'>-</A> <A href='?src=\ref[src];tp=1'>+</A> <A href='?src=\ref[src];tp=30'>+</A>\n"

var/datum/browser/popup = new(user, "window=firealarm", src.name)
popup.set_content(dat)
Expand All @@ -1151,7 +1151,7 @@ FIRE ALARM
d2 = text("<A href='?src=\ref[];time=1'>[]</A>", src, stars("Initiate Time Lock"))
var/second = round(time) % 60
var/minute = (round(time) - second) / 60
var/dat = "[d1]\n<HR><b>The current alert level is: [stars(get_security_level())]</b><br><br>\nTimer System: [d2]<BR>\nTime Left: [(minute ? text("[]:", minute) : null)][second] <A href='?src=\ref[src];tp=-30'>-</A> <A href='?src=\ref[src];tp=-1'>-</A> <A href='?src=\ref[src];tp=1'>+</A> <A href='?src=\ref[src];tp=30'>+</A>\n"
var/dat = "[d1]\n<HR><b>The current alert level is: [stars(code_name_eng[security_level])]</b><br><br>\nTimer System: [d2]<BR>\nTime Left: [(minute ? text("[]:", minute) : null)][second] <A href='?src=\ref[src];tp=-30'>-</A> <A href='?src=\ref[src];tp=-1'>-</A> <A href='?src=\ref[src];tp=1'>+</A> <A href='?src=\ref[src];tp=30'>+</A>\n"

var/datum/browser/popup = new(user, "window=firealarm", stars(src.name))
popup.set_content(dat)
Expand Down Expand Up @@ -1216,16 +1216,20 @@ FIRE ALARM
/obj/machinery/firealarm/examine(mob/user)
. = ..()
var/msg
switch(get_security_level())
switch(code_name_eng[security_level])
if("green")
msg = "<font color='green'><b>Green</b></font>"
msg = "<font color='green'><b>зелёный</b></font>"
to_chat(user, "Маленький индикатор указывает на [msg] уровень тревоги.")
if("blue")
msg = "<font color='blue'><b>Blue</b></font>"
msg = "<font color='blue'><b>синий</b></font>"
to_chat(user, "Маленький индикатор указывает на [msg] уровень тревоги.")
if("red")
msg = "<font color='red'><b>Red</b></font>"
msg = "<font color='red'><b>красный</b></font>"
to_chat(user, "Маленький индикатор указывает на [msg] уровень тревоги.")
if("delta")
msg = "<font color='purple'><b>Delta</b></font>"
to_chat(user, "The small light indicates [msg] security level.")
msg = "<font color='purple'><b>дельта</b></font>"
to_chat(user, "Маленький индикатор указывает об активированном коде [msg].")


/obj/machinery/firealarm/atom_init(mapload, dir, building)
. = ..()
Expand All @@ -1246,7 +1250,7 @@ FIRE ALARM

if(is_station_level(z) || is_mining_level(z))
if(security_level)
add_overlay(image('icons/obj/monitors.dmi', "overlay_[get_security_level()]"))
add_overlay(image('icons/obj/monitors.dmi', "overlay_[code_name_eng[security_level]]"))
else
add_overlay(image('icons/obj/monitors.dmi', "overlay_green"))

Expand Down
181 changes: 93 additions & 88 deletions code/game/machinery/computer/communications.dm

Large diffs are not rendered by default.

19 changes: 9 additions & 10 deletions code/game/machinery/computer/shop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,15 @@
var/data[0]

data["stationTime"] = worldtime2text()
var/secLevelStr
switch(get_security_level())
if("green")
secLevelStr = "<font color='green'><b>&#9899;</b></font>"
maleyvich marked this conversation as resolved.
Show resolved Hide resolved
if("blue")
secLevelStr = "<font color='blue'><b>&#9899;</b></font>"
if("red")
secLevelStr = "<font color='red'><b>&#9899;</b></font>"
if("delta")
secLevelStr = "<font color='purple'><b>&Delta;</b></font>"
var/secLevelStr = code_name_eng[security_level]
if(security_level == SEC_LEVEL_GREEN)
secLevelStr = "<font color='green'><b>&#9899;</b></font>"
if(security_level == SEC_LEVEL_BLUE)
secLevelStr = "<font color='blue'><b>&#9899;</b></font>"
if(security_level == SEC_LEVEL_RED)
secLevelStr = "<font color='red'><b>&#9899;</b></font>"
if(security_level == SEC_LEVEL_DELTA)
secLevelStr = "<font color='purple'><b>&Delta;</b></font>"
data["securityLevel"] = secLevelStr

data["mode"] = mode
Expand Down
19 changes: 9 additions & 10 deletions code/game/objects/items/devices/PDA/PDA.dm
Original file line number Diff line number Diff line change
Expand Up @@ -658,16 +658,15 @@

data["stationTime"] = worldtime2text()

var/secLevelStr
switch(get_security_level())
if("green")
secLevelStr = "<font color='green'><b>&#9899;</b></font>"
maleyvich marked this conversation as resolved.
Show resolved Hide resolved
if("blue")
secLevelStr = "<font color='blue'><b>&#9899;</b></font>"
if("red")
secLevelStr = "<font color='red'><b>&#9899;</b></font>"
if("delta")
secLevelStr = "<font color='purple'><b>&Delta;</b></font>"
var/secLevelStr = code_name_eng[security_level]
if(security_level == SEC_LEVEL_GREEN)
secLevelStr = "<font color='green'><b>&#9899;</b></font>"
if(security_level == SEC_LEVEL_BLUE)
secLevelStr = "<font color='blue'><b>&#9899;</b></font>"
if(security_level == SEC_LEVEL_RED)
secLevelStr = "<font color='red'><b>&#9899;</b></font>"
if(security_level == SEC_LEVEL_DELTA)
secLevelStr = "<font color='purple'><b>&Delta;</b></font>"
data["securityLevel"] = secLevelStr

data["new_Message"] = newmessage
Expand Down
2 changes: 1 addition & 1 deletion code/game/response_team/response_team.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var/global/can_call_ert
return
if(tgui_alert(usr, "Вы хотите отправить отряд быстрого реагирования?",, list("Да","Нет")) != "Да")
return
if(get_security_level() != "red") // Allow admins to reconsider if the alert level isn't Red
if(code_name_eng[security_level] != "red") // Allow admins to reconsider if the alert level isn't Red

if(tgui_alert(usr, "На станции не введён красный код. Вы всё ещё хотите отправить отряд быстрого реагирования?",, list("Да","Нет")) != "Да")
return
Expand Down
8 changes: 4 additions & 4 deletions code/modules/admin/secrets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -476,16 +476,16 @@
message_admins("[key_name_admin(usr)] has triggered a battle to the death (only one)")
// Security levels
if("securitylevel0")
set_security_level(0)
set_security_level(SEC_LEVEL_GREEN)
message_admins("<span class='notice'>[key_name_admin(usr)] change security level to Green.</span>", 1)
if("securitylevel1")
set_security_level(1)
set_security_level(SEC_LEVEL_BLUE)
message_admins("<span class='notice'>[key_name_admin(usr)] change security level to Blue.</span>", 1)
if("securitylevel2")
set_security_level(2)
set_security_level(SEC_LEVEL_RED)
message_admins("<span class='notice'>[key_name_admin(usr)] change security level to Red.</span>", 1)
if("securitylevel3")
set_security_level(3)
set_security_level(SEC_LEVEL_DELTA)
message_admins("<span class='notice'>[key_name_admin(usr)] change security level to Delta.</span>", 1)
// Drop asteroid
if("drop_asteroid")
Expand Down
37 changes: 3 additions & 34 deletions code/modules/security_levels/security_levels.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/var/security_level = 0
/var/security_level = SEC_LEVEL_GREEN
/var/delta_timer_id = 0
var/global/list/code_name_eng = list("green", "blue", "red", "delta")
var/global/list/code_name_ru = list("зелёный", "синий", "красный", "дельта")
maleyvich marked this conversation as resolved.
Show resolved Hide resolved

/proc/set_security_level(level)
switch(level)
Expand Down Expand Up @@ -93,36 +95,3 @@ var/global/list/quiet_alarm_areas = typecacheof(typesof(/area/station/maintenanc
else if (is_type_in_typecache(A, loud_alarm_areas))
M.playsound_local(get_turf(M), 'sound/machines/alarm_delta.ogg', VOL_EFFECTS_MASTER, null, FALSE)
return

/proc/get_security_level()
switch(security_level)
if(SEC_LEVEL_GREEN)
return "green"
if(SEC_LEVEL_BLUE)
return "blue"
if(SEC_LEVEL_RED)
return "red"
if(SEC_LEVEL_DELTA)
return "delta"

/proc/num2seclevel(num)
switch(num)
if(SEC_LEVEL_GREEN)
return "green"
if(SEC_LEVEL_BLUE)
return "blue"
if(SEC_LEVEL_RED)
return "red"
if(SEC_LEVEL_DELTA)
return "delta"

/proc/seclevel2num(seclevel)
switch( lowertext(seclevel) )
if("green")
return SEC_LEVEL_GREEN
if("blue")
return SEC_LEVEL_BLUE
if("red")
return SEC_LEVEL_RED
if("delta")
return SEC_LEVEL_DELTA
Loading