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

Доперевод сообщений ботов игрокам (не админам) #13709

Merged
merged 4 commits into from
Jan 10, 2025
Merged

Доперевод сообщений ботов игрокам (не админам) #13709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a5ad9c
фцф
KIBORG04 Jan 8, 2025
9911714
Присоединиться сейчас
KIBORG04 Jan 8, 2025
531f201
Кукурузная кишка охотника, ПивоВкус
KIBORG04 Jan 9, 2025
b811dc5
Мяумур
KIBORG04 Jan 9, 2025
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
1 change: 1 addition & 0 deletions code/__DEFINES/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@

#define BYOND_JOIN_LINK "byond://[BYOND_SERVER_ADDRESS]"
#define BYOND_SERVER_ADDRESS config.server ? "[config.server]" : "[world.address]:[world.port]"
#define BRIDGE_JOIN_LINKS "Присоединиться: [BYOND_JOIN_LINK]"

#define DELAY2GLIDESIZE(delay) (world.icon_size / max(CEIL(delay / world.tick_lag), 1))

Expand Down
4 changes: 2 additions & 2 deletions code/controllers/subsystem/events.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,8 @@ SUBSYSTEM_DEF(events)
if(config.chat_bridge && custom_event_msg)
world.send2bridge(
type = list(BRIDGE_ANNOUNCE),
attachment_title = "Custom Event",
attachment_msg = custom_event_msg + "\nJoin now: <[BYOND_JOIN_LINK]>",
attachment_title = "Ивент от администрации",
attachment_msg = "[custom_event_msg]\n[BRIDGE_JOIN_LINKS]",
attachment_color = BRIDGE_COLOR_ANNOUNCE,
mention = BRIDGE_MENTION_EVENT,
)
4 changes: 2 additions & 2 deletions code/controllers/subsystem/shuttles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ SUBSYSTEM_DEF(shuttle)

world.send2bridge(
type = list(BRIDGE_ROUNDSTAT),
attachment_title = "The shuttle docked to the station",
attachment_msg = "Join now: <[BYOND_JOIN_LINK]>",
attachment_title = "Шаттл пристыковался к станции",
attachment_msg = BRIDGE_JOIN_LINKS,
attachment_color = BRIDGE_COLOR_ROUNDSTAT,
)

Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/ticker.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ SUBSYSTEM_DEF(ticker)
world.send2bridge(
type = list(BRIDGE_ROUNDSTAT),
attachment_title = "Раунд начался, игровой режим - **[master_mode]**",
attachment_msg = "Раунд #[global.round_id]; Присоединиться сейчас: <[BYOND_JOIN_LINK]>",
attachment_msg = "Раунд #[global.round_id]; [BRIDGE_JOIN_LINKS]",
attachment_color = BRIDGE_COLOR_ANNOUNCE,
)

Expand Down
4 changes: 2 additions & 2 deletions code/game/world.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ var/global/it_is_a_snow_day = FALSE

world.send2bridge(
type = list(BRIDGE_ROUNDSTAT),
attachment_title = "Server starting up, new round will start soon",
attachment_msg = "Join now: <[BYOND_JOIN_LINK]>",
attachment_title = "Сервер запущен, скоро начнется новый раунд",
attachment_msg = BRIDGE_JOIN_LINKS,
attachment_color = BRIDGE_COLOR_ANNOUNCE,
mention = BRIDGE_MENTION_ROUNDSTART,
)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/admin/admin.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,15 +774,15 @@ var/global/BSACooldown = 0
log_admin("[key_name(usr)] delayed the round start.")
world.send2bridge(
type = list(BRIDGE_ROUNDSTAT),
attachment_msg = "**[key_name(usr)]** delayed the round start",
attachment_msg = "**[key_name(usr)]** приостановил начало раунда",
attachment_color = BRIDGE_COLOR_ROUNDSTAT,
)
else
to_chat(world, "<b>The game will start in [newtime] seconds.</b>")
log_admin("[key_name(usr)] set the pre-game delay to [newtime] seconds.")
world.send2bridge(
type = list(BRIDGE_ROUNDSTAT),
attachment_msg = "**[key_name(usr)]** set the pre-game delay to [newtime] seconds.",
attachment_msg = "**[key_name(usr)]** установил задержку перед началом раунда на [PLUR_SECONDS_IN(newtime)].",
attachment_color = BRIDGE_COLOR_ROUNDSTAT,
)
feedback_add_details("admin_verb","DELAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
Expand All @@ -799,7 +799,7 @@ var/global/BSACooldown = 0
message_admins("<span class='adminnotice'>[key_name(usr)] [SSticker.admin_delayed ? "delayed the round end" : "has made the round end normally"].</span>")
world.send2bridge(
type = list(BRIDGE_ROUNDSTAT),
attachment_msg = "**[key_name(usr)]** [SSticker.admin_delayed ? "delayed the round end" : "has made the round end normally"].",
attachment_msg = "[SSticker.admin_delayed ? "**[key_name(usr)]** приостановил конец раунда" : "Теперь раунд закончится нормально"].",
attachment_color = BRIDGE_COLOR_ROUNDSTAT,
)
else
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/topic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
message_admins("[key_name(usr)] [SSticker.admin_delayed ? "delayed the round end" : "has made the round end normally"].")
world.send2bridge(
type = list(BRIDGE_ROUNDSTAT),
attachment_msg = "**[key_name(usr)]** [SSticker.admin_delayed ? "delayed the round end" : "has made the round end normally"].",
attachment_msg = "[SSticker.admin_delayed ? "**[key_name(usr)]** приостановил конец раунда" : "Теперь раунд закончится нормально"].",
attachment_color = BRIDGE_COLOR_ROUNDSTAT,
)

Expand Down
Loading