Skip to content

Commit

Permalink
qol: attack messages translation (#6327)
Browse files Browse the repository at this point in the history
* Сообщения об атаке

* Ещё чёто

* Атак_вербы

* Тык

* Фикс

* Фикс

* Фикс
  • Loading branch information
PlayerUnknown14 authored Jan 19, 2025
1 parent 00f2d4b commit 37c6464
Show file tree
Hide file tree
Showing 93 changed files with 295 additions and 299 deletions.
30 changes: 15 additions & 15 deletions code/__HELPERS/unsorted.dm
Original file line number Diff line number Diff line change
Expand Up @@ -902,35 +902,35 @@ Returns 1 if the chain up to the area contains the given typepath
/proc/parse_zone(zone)
switch(zone)
if(BODY_ZONE_HEAD)
return "head"
return "голова"
if(BODY_ZONE_CHEST)
return "chest"
return "грудь"
if(BODY_ZONE_L_ARM)
return "left arm"
return "левая рука"
if(BODY_ZONE_R_ARM)
return "right arm"
return "правая рука"
if(BODY_ZONE_L_LEG)
return "left leg"
return "левая нога"
if(BODY_ZONE_R_LEG)
return "right leg"
return "правая нога"
if(BODY_ZONE_TAIL)
return "tail"
return "хвост"
if(BODY_ZONE_WING)
return "wings"
return "крылья"
if(BODY_ZONE_PRECISE_EYES)
return "eyes"
return "глаза"
if(BODY_ZONE_PRECISE_MOUTH)
return "mouth"
return "рот"
if(BODY_ZONE_PRECISE_GROIN)
return "groin"
return "живот"
if(BODY_ZONE_PRECISE_L_HAND)
return "left hand"
return "левая ладонь"
if(BODY_ZONE_PRECISE_R_HAND)
return "right hand"
return "правая ладонь"
if(BODY_ZONE_PRECISE_L_FOOT)
return "left foot"
return "левая ступня"
if(BODY_ZONE_PRECISE_R_FOOT)
return "right foot"
return "правая ступня"
else
stack_trace("Wrong zone input.")

Expand Down
28 changes: 14 additions & 14 deletions code/_onclick/item_attack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@
. |= ATTACK_CHAIN_NO_AFTERATTACK
if(signal_out & COMPONENT_CANCEL_ATTACK_CHAIN)
return .|ATTACK_CHAIN_BLOCKED

var/temperature = get_heat()
if(temperature && target.reagents && !ismob(target) && !istype(target, /obj/item/clothing/mask/cigarette))
to_chat(user, span_notice("You heat [target] with [src]."))
to_chat(user, span_notice("Вы нагрели [target.declent_ru(ACCUSATIVE)] с помощью [declent_ru(GENITIVE)]."))
target.reagents.temperature_reagents(temperature)


/**
* Called on an object being hit by an item
*
Expand Down Expand Up @@ -186,7 +186,7 @@
return .

if(force && (HAS_TRAIT(user, TRAIT_PACIFISM) || GLOB.pacifism_after_gt))
to_chat(user, span_warning("You don't want to harm other living beings!"))
to_chat(user, span_warning("Вы не хотите причинять кому-либо вред!"))
return .

SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, target, params, def_zone)
Expand Down Expand Up @@ -249,13 +249,13 @@
. = ATTACK_CHAIN_PROCEED_SUCCESS
if(!I.force)
user.visible_message(
span_warning("[user] gently pokes [src] with [I]."),
span_warning("You gently poke [src] with [I]."),
span_warning("[user] аккуратно тыкнул[genderize_ru(user.gender, "", "а", "о", "и")] [declent_ru(ACCUSATIVE)] [I.declent_ru(INSTRUMENTAL)]."),
span_warning("Вы аккуратно тыкнули [declent_ru(ACCUSATIVE)] [I.declent_ru(INSTRUMENTAL)]."),
)
return .
user.visible_message(
span_danger("[user] has hit [src] with [I]!"),
span_danger("You have hit [src] with [I]!"),
span_danger("[user] ударил[genderize_ru(user.gender, "", "а", "о", "и")] [declent_ru(ACCUSATIVE)] [I.declent_ru(INSTRUMENTAL)]!"),
span_danger("Вы ударили [declent_ru(ACCUSATIVE)] [I.declent_ru(INSTRUMENTAL)]!"),
)
take_damage(I.force, I.damtype, MELEE, TRUE, get_dir(user, src), I.armour_penetration)
if(QDELETED(src)) // thats a pretty common behavior with objects, when they take damage
Expand Down Expand Up @@ -299,20 +299,20 @@

if(!I.force)
visible_message(
span_warning("[user] gently taps [src] with [I]."),
span_warning("[user] gently taps you with [I]."),
span_warning("[user] аккуратно тыкнул[genderize_ru(user.gender, "", "а", "о", "и")] [declent_ru(ACCUSATIVE)] [I.declent_ru(INSTRUMENTAL)]."),
span_warning("[user] аккуратно тыкнул[genderize_ru(user.gender, "", "а", "о", "и")] вас [I.declent_ru(INSTRUMENTAL)]."),
ignored_mobs = user,
)
to_chat(user, span_warning("You gently tap [src] with [I]."))
to_chat(user, span_warning("Вы аккуратно тыкнули [declent_ru(ACCUSATIVE)] [I.declent_ru(INSTRUMENTAL)]."))
return

var/message_verb = "attacked"
var/message_verb = "атаковал"
if(length(I.attack_verb))
message_verb = "[pick(I.attack_verb)]"

visible_message(
span_danger("[user] has [message_verb] [src] with [I]!"),
span_userdanger("[user] has [message_verb] you with [I]!"),
span_danger("[user] [message_verb][genderize_ru(user.gender, "", "а", "о", "и")] [declent_ru(ACCUSATIVE)] [I.declent_ru(INSTRUMENTAL)]!"),
span_userdanger("[user] [message_verb][genderize_ru(user.gender, "", "а", "о", "и")] вас [I.declent_ru(INSTRUMENTAL)]!"),
ignored_mobs = user,
)
to_chat(user, span_danger("You have [message_verb] [src] with [I]!"))
to_chat(user, span_danger("Вы [message_verb]и [declent_ru(ACCUSATIVE)] [I.declent_ru(INSTRUMENTAL)]!"))
2 changes: 1 addition & 1 deletion code/datums/components/transforming.dm
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
return FALSE

var/obj/item/item_parent = parent
var/hurt_verb = LAZYLEN(attack_verb_on) ? pick(attack_verb_on) : "hit"
var/hurt_verb = LAZYLEN(attack_verb_on) ? pick(attack_verb_on) : "ударил"
user.visible_message(
span_warning("[user] triggers [item_parent] while holding it backwards and [hurt_verb] themself, like a doofus!"),
span_warning("You trigger [item_parent] while holding it backwards and accidentally [hurt_verb] yourself!"),
Expand Down
8 changes: 4 additions & 4 deletions code/game/gamemodes/clockwork/clockwork_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
to_chat(user, "<span class='notice'>You disguise your tool as some little toy.</span>")
playsound(user, 'sound/magic/cult_spell.ogg', 15, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
plushy = pick(plush_colors)
attack_verb = list("poofed", "bopped", "whapped","cuddled","fluffed")
attack_verb = list("тыкнул", "ударил", "шлёпнул")
enchant_type = CASTING_SPELL
update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC)

Expand Down Expand Up @@ -233,7 +233,7 @@
sharp = TRUE
embed_chance = 70
embedded_ignore_throwspeed_threshold = TRUE
attack_verb = list("stabbed", "poked", "slashed")
attack_verb = list("уколол", "ткнул", "полоснул")
hitsound = 'sound/weapons/bladeslice.ogg'
w_class = WEIGHT_CLASS_HUGE
needs_permit = TRUE
Expand Down Expand Up @@ -480,7 +480,7 @@
w_class = WEIGHT_CLASS_BULKY
armour_penetration = 10
sharp = TRUE
attack_verb = list("lunged at", "stabbed")
attack_verb = list("полоснул", "уколол")
resistance_flags = FIRE_PROOF | ACID_PROOF
var/swordsman = FALSE

Expand Down Expand Up @@ -585,7 +585,7 @@
throwforce = 10
throw_speed = 1
throw_range = 3
attack_verb = list("bumped", "prodded", "shoved", "bashed")
attack_verb = list("стукнул", "толкнул", "долбанул", "ударил")
hitsound = 'sound/weapons/smash.ogg'
block_chance = 30

Expand Down
2 changes: 1 addition & 1 deletion code/game/gamemodes/clockwork/clockwork_mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
obj_damage = 40
speed = 0
friendly = "pokes"
attacktext = "slashes"
attacktext = "порезал"
attack_sound = 'sound/weapons/bladeslice.ogg'
tts_seed = "Earth"
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
Expand Down
6 changes: 3 additions & 3 deletions code/game/gamemodes/cult/cult_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
throwforce = 10
sharp = TRUE
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
attack_verb = list("атаковал", "полоснул", "уколол", "поранил", "порезал")
sprite_sheets_inhand = list(SPECIES_SKRELL = 'icons/mob/clothing/species/skrell/held.dmi') // To stop skrell stabbing themselves in the head


Expand Down Expand Up @@ -504,7 +504,7 @@
throwforce = 15
throw_speed = 1
throw_range = 3
attack_verb = list("bumped", "prodded")
attack_verb = list("стукнул", "толкнул")
hitsound = 'sound/weapons/smash.ogg'
/// Chance that energy projectiles will be reflected
var/reflect_chance = 70
Expand Down Expand Up @@ -631,7 +631,7 @@
throw_speed = 2
armour_penetration = 30
block_chance = 30
attack_verb = list("attacked", "impaled", "stabbed", "torn", "gored")
attack_verb = list("атаковал", "пронзил", "уколол", "поранил", "пронзил")
sharp = TRUE
no_spin_thrown = TRUE
hitsound = 'sound/weapons/bladeslice.ogg'
Expand Down
2 changes: 1 addition & 1 deletion code/game/gamemodes/wizard/artefact.dm
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ GLOBAL_LIST_EMPTY(multiverse)
throwforce = 10
sharp = 1
w_class = WEIGHT_CLASS_SMALL
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
attack_verb = list("атаковал", "полоснул", "уколол", "поранил", "порезал")
var/faction = list("unassigned")
var/cooldown = 0
var/cooldown_between_uses = 400 //time in deciseconds between uses--default of 40 seconds.
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/HolodeckControl.dm
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@
force = 40
throwforce = 10
w_class = WEIGHT_CLASS_BULKY
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
attack_verb = list("атаковал", "полоснул", "уколол", "поранил", "порезал")
block_chance = 50

/obj/item/holo/claymore/blue
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -515,12 +515,12 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/g
return ..()


/obj/item/proc/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = ITEM_ATTACK)
/obj/item/proc/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "атаку", final_block_chance = 0, damage = 0, attack_type = ITEM_ATTACK)
if (!block_type || !(block_type & attack_type))
final_block_chance = 0
var/signal_result = (SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, owner, hitby, damage, attack_type) & COMPONENT_BLOCK_SUCCESSFUL) + prob(final_block_chance)
if(signal_result != 0)
owner.visible_message(span_danger("[owner] blocks [attack_text] with [src]!"))
owner.visible_message(span_danger("[owner] блокиру[pluralize_ru(owner.gender, "ет", "ют")] [attack_text] с помощью [declent_ru(GENITIVE)]!"))
return signal_result
return FALSE

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/blueprints.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
name = "area modification item"
icon = 'icons/obj/items.dmi'
icon_state = "blueprints"
attack_verb = list("attacked", "bapped", "hit")
attack_verb = list("атаковал", "стукнул", "ударил")
/// Whether someone is currently using us
var/currently_used = FALSE
/// Fluff name for station in interaction window
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/crayons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
icon_state = "crayonred"
w_class = WEIGHT_CLASS_TINY
slot_flags = ITEM_SLOT_BELT|ITEM_SLOT_EARS
attack_verb = list("attacked", "coloured")
attack_verb = list("атаковал", "тыкнул")
toolspeed = 1
var/colour = COLOR_RED
var/drawtype = "rune"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/decorations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@
desc = "A bouquet of beautiful flowers, looks a little withered."
icon = 'icons/obj/weapons/bouquet.dmi'
icon_state = "mixedbouquet"
attack_verb = list("attacked", "slashed", "torn", "ripped", "cut", "smashed")
attack_verb = list("атаковал", "полоснул", "поранил", "порезал")
max_integrity = 20
force = 2
throwforce = 1
Expand Down
3 changes: 1 addition & 2 deletions code/game/objects/items/hand_item.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
force = 0
throwforce = 0
item_flags = DROPDEL|ABSTRACT
attack_verb = list("slapped")
attack_verb = list("шлёпнул")
hitsound = 'sound/weapons/slap.ogg'
/// How many smaller table smacks we can do before we're out
var/table_smacks_left = 3
Expand Down Expand Up @@ -80,7 +80,6 @@
/obj/item/slapper/parry
desc = "This is how real men win fights."
force = 5
attack_verb = list("slapped", "backhanded", "smacked", "discombobulated")
table_smacks_left = 10 //Much more smackitude
/obj/item/slapper/parry/Initialize(mapload)
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/stacks/rods.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
throw_range = 7
materials = list(MAT_METAL=1000)
max_amount = 50
attack_verb = list("hit", "bludgeoned", "whacked")
attack_verb = list("ударил", "огрел")
hitsound = 'sound/weapons/grenadelaunch.ogg'
toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
Expand Down Expand Up @@ -102,7 +102,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
throw_speed = 3
throw_range = 7
max_amount = 50
attack_verb = list("hit", "bludgeoned", "whacked")
attack_verb = list("ударил", "огрел")
materials = list(MAT_METAL=800, MAT_PLASMA=200, MAT_TITANIUM=400)
hitsound = 'sound/weapons/grenadelaunch.ogg'
toolspeed = 1
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/sheets/sheets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
max_amount = 50
throw_speed = 1
throw_range = 3
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
attack_verb = list("ударил")
var/perunit = MINERAL_MATERIAL_AMOUNT
var/sheettype = null //this is used for girders in the creation of walls/false walls
var/point_value = 0 //turn-in value for the gulag stacker - loosely relative to its rarity.
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/tiles/tile_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
icon_state = "tile_light blue"
force = 3
throwforce = 5
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
attack_verb = list("ударил", "долбанул")
turf_type = /turf/simulated/floor/light

// FAKESPACE
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/tools/crowbar.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
drop_sound = 'sound/items/handling/crowbar_drop.ogg'
pickup_sound = 'sound/items/handling/crowbar_pickup.ogg'
origin_tech = "engineering=1;combat=1"
attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
attack_verb = list("атаковал", "ударил", "огрел")
toolspeed = 1

armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/tools/holotool.dm
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ Holotool. All instruments in one object
..()
H.sharp = TRUE
H.force = 17
H.attack_verb = list("sliced", "torn", "cut")
H.attack_verb = list("поранил", "порезал")
H.armour_penetration = 45
H.embed_chance = 40
H.embedded_fall_chance = 0
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/tools/screwdriver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
drop_sound = 'sound/items/handling/screwdriver_drop.ogg'
pickup_sound = 'sound/items/handling/screwdriver_pickup.ogg'
materials = list(MAT_METAL=75)
attack_verb = list("stabbed")
attack_verb = list("уколол", "тыкнул")
hitsound = 'sound/weapons/bladeslice.ogg'
usesound = 'sound/items/screwdriver.ogg'
toolspeed = 1
Expand Down Expand Up @@ -93,7 +93,7 @@
throwforce = 8
throw_speed = 2
throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far
attack_verb = list("drilled", "screwed", "jabbed","whacked")
attack_verb = list("продырявил", "уколол", "огрел")
hitsound = 'sound/items/drill_hit.ogg'
usesound = 'sound/items/drill_use.ogg'
toolspeed = 0.25
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/tools/wirecutters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL=80)
origin_tech = "materials=1;engineering=1"
attack_verb = list("pinched", "nipped")
attack_verb = list("ущипнул", "тяпнул")
hitsound = 'sound/items/wirecutter.ogg'
usesound = 'sound/items/wirecutter.ogg'
drop_sound = 'sound/items/handling/wirecutter_drop.ogg'
Expand Down
5 changes: 2 additions & 3 deletions code/game/objects/items/tools/wrench.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL=150)
origin_tech = "materials=1;engineering=1"
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
attack_verb = list("ударил", "огрел")
toolspeed = 1
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
tool_behaviour = TOOL_WRENCH
Expand Down Expand Up @@ -65,7 +65,7 @@
origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get
force = 8 //might or might not be too high, subject to change
throwforce = 8
attack_verb = list("drilled", "screwed", "jabbed")
attack_verb = list("продырявил", "уколол")
toolspeed = 0.25

/obj/item/wrench/power/attack_self(mob/user)
Expand All @@ -86,7 +86,6 @@
force = 2 //MEDICAL
throwforce = 4
origin_tech = "materials=1;engineering=1;biotech=3"
attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked")

/obj/item/wrench/medical/suicide_act(mob/living/user)
user.visible_message("<span class='suicide'>[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!</span>")
Expand Down
Loading

0 comments on commit 37c6464

Please sign in to comment.