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

Add emote translations to [translate] #953

Merged
merged 23 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7c4f428
Human emote translations
m-dzianishchyts Jan 27, 2024
b774dc1
Mod emote translations
m-dzianishchyts Jan 27, 2024
7ca03f3
Brain emote translations
m-dzianishchyts Jan 27, 2024
3d02968
Living emote translations
m-dzianishchyts Jan 27, 2024
b312795
Carbon emote translations
m-dzianishchyts Jan 27, 2024
bd0502a
Silicon emote translations
m-dzianishchyts Jan 28, 2024
7b8332b
Gorilla emote translation
m-dzianishchyts Jan 28, 2024
b4dc8a0
Alien emote translations
m-dzianishchyts Jan 28, 2024
c033a40
Animal emote translations
m-dzianishchyts Jan 28, 2024
a59c80a
Slime emote translations
m-dzianishchyts Jan 28, 2024
2295780
Handshake translations
m-dzianishchyts Jan 28, 2024
c00f642
Hand item translations
m-dzianishchyts Jan 28, 2024
42c889c
Polishing
m-dzianishchyts Jan 28, 2024
fe78fa5
More polishing
m-dzianishchyts Jan 28, 2024
c5e0c9c
Fix typo
m-dzianishchyts Jan 28, 2024
6c82d22
Update code/datums/status_effects/neutral.dm
m-dzianishchyts Jan 28, 2024
f00b895
Update code/datums/status_effects/neutral.dm
m-dzianishchyts Jan 28, 2024
3a07d7f
Update code/datums/status_effects/neutral.dm
m-dzianishchyts Jan 28, 2024
b2ba0e2
Update code/game/objects/items/hand_item.dm
m-dzianishchyts Jan 28, 2024
a525888
Apply suggestions from code review
m-dzianishchyts Jan 28, 2024
b171ee0
Update code/datums/status_effects/neutral.dm
m-dzianishchyts Jan 28, 2024
4e095ef
Apply suggestions from code review
m-dzianishchyts Jan 28, 2024
a5ffea9
Shining reference, okay
m-dzianishchyts Jan 28, 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/datums/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/// Message to display if the user is a spooky observer ghost.
var/message_observer = ""
/// Sounds emitted when the user is muzzled. Generally used like "[user] makes a pick(muzzled_noises) noise!"
var/muzzled_noises = list("strong", "weak")
var/muzzled_noises = list("громкий", "тихий")
/// Message with %t at the end to allow adding params to the message, like for mobs doing an emote relatively to something else.
/// Set this to EMOTE_PARAM_USE_POSTFIX to just use the postfix.
var/message_param = ""
Expand Down Expand Up @@ -185,7 +185,7 @@
if(!can_vocalize_emotes(user) && (emote_type & (EMOTE_MOUTH | EMOTE_AUDIBLE)))
var/noise_emitted = pick(muzzled_noises)
suppressed = TRUE
msg = "makes \a [noise_emitted] noise."
msg = "издает [noise_emitted] звук."

var/tmp_sound = get_sound(user)
var/sound_volume = get_volume(user)
Expand Down Expand Up @@ -216,9 +216,9 @@
ghost.show_message("<span class=deadsay>[displayed_msg]</span>", EMOTE_VISIBLE)

else if((emote_type & EMOTE_AUDIBLE) && !user.mind?.miming)
user.audible_message(displayed_msg, deaf_message = "<span class='emote'>You see how <b>[user]</b> [msg]</span>")
user.audible_message(displayed_msg, deaf_message = "<span class='emote'>Вы видите, как <b>[user]</b> [msg]</span>")
else
user.visible_message(displayed_msg, blind_message = "<span class='emote'>You hear how someone [msg]</span>")
user.visible_message(displayed_msg, blind_message = "<span class='emote'>Вы слышите, как кто-то [msg]</span>")

if(!((emote_type & EMOTE_FORCE_NO_RUNECHAT) || suppressed) && !isobserver(user))
runechat_emote(user, msg)
Expand Down
42 changes: 21 additions & 21 deletions code/datums/status_effects/neutral.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@
alert_type = null
status_type = STATUS_EFFECT_REFRESH
/// Message displayed when wizards perform this together
var/critical_success = "high-five EPICALLY!"
var/critical_success = "ЭПИЧНО дают пять!"
/// Message displayed when normal people perform this together
var/success = "high-five!"
var/success = "дают пять!"
/// Message displayed when this status effect is applied.
var/request = "requests a high-five."
var/request = "ожидает пятюню."
/// Item to be shown in the pop-up balloon.
var/obj/item/item_path = /obj/item/latexballon
/// Sound effect played when this emote is completed.
Expand All @@ -80,7 +80,7 @@
if(!C.has_status_effect(type) || C == user)
continue
if(is_wiz && iswizard(C))
user.visible_message("<span class='biggerdanger'><b>[user.name]</b> and <b>[C.name]</b> [critical_success]</span>")
user.visible_message("<span class='biggerdanger'><b>[user.name]</b> и <b>[C.name]</b> [critical_success]</span>")
user.status_flags |= GODMODE
C.status_flags |= GODMODE
explosion(get_turf(user), 5, 2, 1, 3, cause = id)
Expand All @@ -92,7 +92,7 @@
C.do_attack_animation(user, no_effect = TRUE)
playsound(user, sound_effect, 80)
if(!both_wiz)
user.visible_message("<span class='notice'><b>[user.name]</b> and <b>[C.name]</b> [success]</span>")
user.visible_message("<span class='notice'><b>[user.name]</b> и <b>[C.name]</b> [success]</span>")
user.remove_status_effect(type)
C.remove_status_effect(type)
return FALSE
Expand All @@ -106,39 +106,39 @@

/datum/status_effect/high_five/proc/get_missed_message()
var/list/missed_highfive_messages = list(
"lowers [owner.p_their()] hand, it looks like [owner.p_they()] [owner.p_were()] left hanging...",
"seems to awkwardly wave at nobody in particular.",
"moves [owner.p_their()] hand directly to [owner.p_their()] forehead in shame.",
"fully commits and high-fives empty space.",
"high-fives [owner.p_their()] other hand shamefully before wiping away a tear.",
"goes for a handshake, then a fistbump, before pulling [owner.p_their()] hand back...? <i>What [owner.p_are()] [owner.p_they()] doing?</i>"
"опускает руку, неловкая ситуация...",
"неловко машет непонятно кому.",
"от стыда прикладывает руку прямо себе на лоб.",
"от души дает пять в воздух.",
"стыдливо даёт пять самому себе перед тем, как смахнуть слезу.",
"пытается совершить рукопожатие, потом удар кулаками прежде чем одёрнуть свою руку...? <i>Что происходит?</i>"
dj-34 marked this conversation as resolved.
Show resolved Hide resolved
)

return pick(missed_highfive_messages)

/datum/status_effect/high_five/dap
id = "dap"
critical_success = "dap each other up EPICALLY!"
success = "dap each other up!"
request = "requests someone to dap them up!"
critical_success = "совершают ЭПИЧЕСКИ крутое рукопожатие!"
success = "совершают крутое рукопожатие!"
request = "ожидает особое рукопожатие!"
dj-34 marked this conversation as resolved.
Show resolved Hide resolved
sound_effect = 'sound/effects/snap.ogg'
item_path = /obj/item/melee/touch_attack/fake_disintegrate // EI-NATH!

/datum/status_effect/high_five/dap/get_missed_message()
return "sadly can't find anybody to give daps to, and daps [owner.p_themselves()]. Shameful."
return "не находит никого, кто мог бы совершить крутое рукопожатие и, к сожалению, жмет руку лишь себе. Позорище."

/datum/status_effect/high_five/handshake
id = "handshake"
critical_success = "give each other an EPIC handshake!"
success = "give each other a handshake!"
request = "requests a handshake!"
critical_success = "ЭПИЧНО пожимают друг другу руки!"
success = "пожимают друг другу руки!"
request = "ожидает рукопожатие!"
sound_effect = "sound/weapons/thudswoosh.ogg"

/datum/status_effect/high_five/handshake/get_missed_message()
var/list/missed_messages = list(
"drops [owner.p_their()] hand, shamefully.",
"grabs [owner.p_their()] outstretched hand with [owner.p_their()] other hand and gives [owner.p_themselves()] a handshake.",
"balls [owner.p_their()] hand into a fist, slowly bringing it back in."
"стыдливо опускает руку.",
"хватает протянутую руку другой рукой и обменивается рукопожатием только с собой.",
dj-34 marked this conversation as resolved.
Show resolved Hide resolved
"сжимает ладонь в кулак и медленно убирает руку обратно."
)

return pick(missed_messages)
Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/items/hand_item.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/obj/item/slapper/attack(mob/M, mob/living/carbon/human/user)
user.do_attack_animation(M)
playsound(M, hitsound, 50, TRUE, -1)
user.visible_message("<span class='danger'>[user] slaps [M]!</span>", "<span class='notice'>You slap [M]!</span>", "<span class='hear'>You hear a slap.</span>")
user.visible_message("<span class='danger'>[user] даёт пощёчину [M]!</span>", "<span class='notice'>Вы даёте пощёчину [M]!</span>", "<span class='hear'>Вы слышите шлепок.</span>")
if(iscarbon(M))
var/mob/living/carbon/C = M
if(C.IsSleeping())
Expand Down Expand Up @@ -46,12 +46,12 @@
if(istype(human_user.shoes, /obj/item/clothing/shoes/cowboy))
human_user.say(pick("Hot damn!", "Hoo-wee!", "Got-dang!"))
playsound(get_turf(the_table), 'sound/effects/tableslam.ogg', 110, TRUE)
user.visible_message("<b><span class='danger'>[user] slams [user.p_their()] fist down on [the_table]!</span></b>", "<b><span class='danger'>You slam your fist down on [the_table]!</span></b>")
user.visible_message("<b><span class='danger'>[user] бьёт кулаком по [the_table]!</span></b>", "<b><span class='danger'>Вы бьёте кулаком по [the_table]!</span></b>")
qdel(src)
else
user.do_attack_animation(the_table)
playsound(get_turf(the_table), 'sound/effects/tableslam.ogg', 40, TRUE)
user.visible_message("<span class='notice'>[user] slaps [user.p_their()] hand on [the_table].</span>", "<span class='notice'>You slap your hand on [the_table].</span>")
user.visible_message("<span class='notice'>[user] бьёт [user.p_their()] ладонью по [the_table].</span>", "<span class='notice'>Вы бьёте ладонью по [the_table].</span>")
table_smacks_left--
if(table_smacks_left <= 0)
qdel(src)
Expand All @@ -60,9 +60,9 @@
return 0

/obj/item/slapper/parry
desc = "This is how real men win fights."
desc = "Именно так настоящие мужчины побеждают в боях."
force = 5
attack_verb = list("slapped", "backhanded", "smacked", "discombobulated")
attack_verb = list("даёт пощёчину", "бьёт тыльной стороной ладони", "шлепает", "дезориентирует")
table_smacks_left = 10 //Much more smackitude

/obj/item/slapper/parry/Initialize(mapload)
Expand Down
26 changes: 13 additions & 13 deletions code/modules/mob/living/brain/brain_emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,38 +30,38 @@
/datum/emote/living/brain/alarm
key = "alarm"
key_third_person = "alarms"
message = "sounds an alarm."
self_message = "You sound an alarm."
message = "подаёт сигнал тревоги."
self_message = "Вы подаёте сигнал тревоги."

/datum/emote/living/brain/alert
key = "alert"
key_third_person = "alerts"
message = "lets out a distressed noise."
self_message = "You let out a distressed noise."
message = "издаёт страдальческий звук."
self_message = "Вы издаёте страдальческий звук."

/datum/emote/living/brain/notice
key = "notice"
message = "plays a loud tone."
self_message = "You play a loud tone."
message = "воспроизводит громкий звук."
self_message = "Вы воспроизводите громкий звук."

/datum/emote/living/brain/flash
key = "flash"
message = "starts flashing its lights quickly!"
message = "начинает быстро мигать лампочками!"

/datum/emote/living/brain/whistle
key = "whistle"
key_third_person = "whistles"
message = "whistles."
self_message = "You whistle."
message = "свистит."
self_message = "Вы свистите."

/datum/emote/living/brain/beep
key = "beep"
key_third_person = "beeps"
message = "beeps."
self_message = "You beep."
message = "бипает."
self_message = "Вы бипаете."

/datum/emote/living/brain/boop
key = "boop"
key_third_person = "boops"
message = "boops."
self_message = "You boop."
message = "бупает."
self_message = "Вы бупаете."
12 changes: 6 additions & 6 deletions code/modules/mob/living/carbon/alien/humanoid/humanoid_emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@
/datum/emote/living/carbon/alien/humanoid/roar
key = "roar"
key_third_person = "roars"
message = "roars!"
message_param = "roars at %t!"
message = "рычит!"
message_param = "рычит на %t!"
emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH
sound = "sound/voice/hiss5.ogg"
volume = 80

/datum/emote/living/carbon/alien/humanoid/hiss
key = "hiss"
key_third_person = "hisses"
message = "hisses!"
message_param = "hisses at %t!"
message = "шипит!"
message_param = "шипит на %t!"
emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH
sound = "sound/voice/hiss1.ogg"
volume = 30

/datum/emote/living/carbon/alien/humanoid/gnarl
key = "gnarl"
key_third_person = "gnarls"
message = "gnarls and shows its teeth."
message_param = "gnarls and flashes its teeth at %t."
message = "оскаливается и показывает зубы."
message_param = "оскаливается на %t и показывает зубы."
sound = "sound/voice/hiss4.ogg"
emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH
volume = 30
Loading
Loading