Skip to content

Commit

Permalink
Правки. Я слишком не внимательный.
Browse files Browse the repository at this point in the history
  • Loading branch information
@don-pardon42
don-pardon42 committed Nov 4, 2024
1 parent b70e30c commit 2381f1a
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion code/game/mecha/equipment/mecha_equipment.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
chassis.selected = null
update_chassis_page()
remove_targeted_action()
chassis.log_message("[capitalize(declent_ru(NOMINATIVE))] removed from equipment.")
chassis.log_message("[capitalize(declent_ru(NOMINATIVE))] снят с оборудования.")
chassis = null
set_ready_state(1)

Expand Down
4 changes: 2 additions & 2 deletions code/game/mecha/equipment/tools/mecha_mining_tools.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@
return FALSE

/obj/item/mecha_parts/mecha_equipment/drill/proc/drill_mob(mob/living/target, mob/user)
target.visible_message("<span class='danger'>[chassis.declent_ru(NOMINATIVE)] бурит [target.declent_ru(ACCUSATIVE)] с помощью [declent_ru(GENITIVE)]!</span>",
"<span class='userdanger'>[chassis.declent_ru(NOMINATIVE)] бурит вас с помощью [declent_ru(GENITIVE)]!</span>")
target.visible_message("<span class='danger'>[capitalize(chassis.declent_ru(NOMINATIVE))] бурит [target.declent_ru(ACCUSATIVE)] с помощью [declent_ru(GENITIVE)]!</span>",
"<span class='userdanger'>[capitalize(chassis.declent_ru(NOMINATIVE))] бурит вас с помощью [declent_ru(GENITIVE)]!</span>")
add_attack_logs(user, target, "ПРОБУРЕН с помощью [declent_ru(GENITIVE)] ([uppertext(user.a_intent)]) ([uppertext(damtype)])")
if(target.stat == DEAD && target.getBruteLoss() >= 200)
add_attack_logs(user, target, "gibbed")
Expand Down
10 changes: 5 additions & 5 deletions code/game/mecha/equipment/tools/medical_tools.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@
var/mob/living/carbon/M = safepick(mobs)
if(M)
var/R
mechsyringe.visible_message("<span class='attack'> [M] был поражён шприцем!</span>")
mechsyringe.visible_message("<span class='attack'> [capitalize(M.declent_ru(ACCUSATIVE))] был поражён шприцем!</span>")
if(M.can_inject(originaloccupant, TRUE, original_target_zone))
if(mechsyringe.reagents)
for(var/datum/reagent/A in mechsyringe.reagents.reagent_list)
Expand Down Expand Up @@ -536,12 +536,12 @@
if(isliving(target)) //interact with living beings
var/mob/living/M = target
if(chassis.occupant.a_intent == INTENT_HARM)//the patented, medical rescue claw is incapable of doing harm. Worry not.
target.visible_message("<span class='notice'>[chassis.declent_ru(NOMINATIVE)] аккуратно тыкает [declent_ru(NOMINATIVE)] в нос. В последний момент гидравлика шипит и предохранители смягчают жёсткий удар.</span>", \
"<span class='notice'[chassis.declent_ru(NOMINATIVE)] аккуратно тыкает [target.declent_ru(ACCUSATIVE)] в нос. В последний момент гидравлика шипит и предохранители смягчают жёсткий удар.</span>")
target.visible_message("<span class='notice'>[capitalize(chassis.declent_ru(NOMINATIVE))] аккуратно тыкает [target.declent_ru(ACCUSATIVE)] в нос. В последний момент гидравлика шипит и предохранители смягчают жёсткий удар.</span>", \
"<span class='notice'[capitalize(chassis.declent_ru(NOMINATIVE))] аккуратно тыкает [target.declent_ru(ACCUSATIVE)] в нос. В последний момент гидравлика шипит и предохранители смягчают жёсткий удар.</span>")
else
push_aside(chassis, M)//out of the way, I have people to save!
occupant_message("<span class='notice'>Вы аккуратно отодвигаете [declent_ru(NOMINATIVE)] с дороги.</span>")
chassis.visible_message("<span class='notice'>[chassis.declent_ru(NOMINATIVE)] аккуратно отодвигает [declent_ru(NOMINATIVE)] с дороги.</span>")
occupant_message("<span class='notice'>Вы аккуратно отодвигаете [target.declent_ru(ACCUSATIVE)] с дороги.</span>")
chassis.visible_message("<span class='notice'>[capitalize(chassis.declent_ru(NOMINATIVE))] аккуратно отодвигает [target.declent_ru(ACCUSATIVE)] с дороги.</span>")

/obj/item/mecha_parts/mecha_equipment/medical/rescue_jaw/proc/push_aside(obj/mecha/M, mob/living/L)
switch(get_dir(M, L))
Expand Down
2 changes: 1 addition & 1 deletion code/game/mecha/equipment/tools/other_tools.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
if(!action_checks(target))
return
if(cooldown_timer > world.time)
occupant_message("<span class='warning'>[declent_ru(NOMINATIVE)] всё еще заряжается.</span>")
occupant_message("<span class='warning'>[capitalize(declent_ru(NOMINATIVE))] всё еще заряжается.</span>")
return
switch(mode)
if(MECH_GRAVCAT_MODE_GRAVSLING)
Expand Down
34 changes: 17 additions & 17 deletions code/game/mecha/equipment/tools/work_tools.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@
if(istype(target, /obj/machinery/atmospherics/supermatter_crystal)) //No, you can't pick up the SM with this you moron, did you think you were clever?
var/obj/mecha/working/ripley/R = chassis
QDEL_LIST_CONTENTS(R.cargo) //We don't want to drop cargo that just spam hits the SM, let's delete it
occupant_message("<span class='userdanger'>Вы с ужасом осознаёте, что вы сделали, когда [chassis] начинает искривляться вокруг вас!</span>")
occupant_message("<span class='userdanger'>Вы с ужасом осознаёте, что вы сделали, когда [chassis.declent_ru(NOMINATIVE)] начинает искривляться вокруг вас!</span>")
chassis.occupant.dust()
target.Bumped(chassis)
return
if(O.anchored)
occupant_message("<span class='warning'>[target] надёжно зафиксирован!</span>")
occupant_message("<span class='warning'>[capitalize(target.declent_ru(NOMINATIVE))] надёжно зафиксирован!</span>")
return
if(length(cargo_holder.cargo) >= cargo_holder.cargo_capacity)
occupant_message("<span class='warning'>Недостаточно места в грузовом отсеке!</span>")
return
chassis.visible_message("<span class='notice'>[chassis] поднимает [target] и начинает помещать в грузовой отсек.</span>")
chassis.visible_message("<span class='notice'>[capitalize(chassis.declent_ru(NOMINATIVE))] поднимает [target.declent_ru(ACCUSATIVE)] и начинает помещать в грузовой отсек.</span>")
var/anchor_state_before_load = O.anchored
O.anchored = TRUE
if(!do_after_cooldown(target))
Expand All @@ -58,7 +58,7 @@
cargo_holder.cargo += O
O.forceMove(chassis)
O.anchored = FALSE
occupant_message("<span class='notice'>[target] успешно загружен.</span>")
occupant_message("<span class='notice'>[capitalize(target.declent_ru(NOMINATIVE))] успешно загружен.</span>")
log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - length(cargo_holder.cargo)]")
return

Expand All @@ -71,15 +71,15 @@
if(!M)
return
M.adjustOxyLoss(round(dam_force/2))
target.visible_message("<span class='danger'>[chassis] сжимает [target].</span>", \
"<span class='userdanger'>[chassis] сжимает [target].</span>",\
target.visible_message("<span class='danger'>[capitalize(chassis.declent_ru(NOMINATIVE))] сжимает [target.declent_ru(ACCUSATIVE)].</span>", \
"<span class='userdanger'>[capitalize(chassis.declent_ru(NOMINATIVE))] сжимает [target.declent_ru(ACCUSATIVE)].</span>",\
"<span class='italics'>Вы слышите, как что-то хрустит.</span>")
add_attack_logs(chassis.occupant, M, "Squeezed with [src] ([uppertext(chassis.occupant.a_intent)]) ([uppertext(damtype)])")
start_cooldown()
return
step_away(M, chassis)
occupant_message("<span class='notice'>Ты толкаешь [target] с дороги.</span>")
chassis.visible_message("<span class='notice'>[chassis] толкает [target] с дороги.</span>")
occupant_message("<span class='notice'>Вы толкаете [target.declent_ru(ACCUSATIVE)] с дороги.</span>")
chassis.visible_message("<span class='notice'>[capitalize(chassis.declent_ru(NOMINATIVE))] толкает [target.declent_ru(ACCUSATIVE)] с дороги.</span>")


//This is pretty much just for the death-ripley
Expand All @@ -95,34 +95,34 @@
var/obj/O = target
if(!O.anchored)
if(length(cargo_holder.cargo) < cargo_holder.cargo_capacity)
chassis.visible_message("[chassis] поднимает [target] и начинает помещать в грузовой отсек.")
chassis.visible_message("[capitalize(chassis.declent_ru(NOMINATIVE))] поднимает [target.declent_ru(ACCUSATIVE)] и начинает помещать в грузовой отсек.")
O.anchored = TRUE
if(do_after_cooldown(target))
cargo_holder.cargo += O
O.forceMove(chassis)
O.anchored = FALSE
occupant_message("<span class='notice'>[target] успешно загружен.</span>")
occupant_message("<span class='notice'>[capitalize(target.declent_ru(NOMINATIVE))] успешно загружен.</span>")
log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - length(cargo_holder.cargo)]")
else
O.anchored = initial(O.anchored)
else
occupant_message("<span class='warning'>Недостаточно места в грузовом отсеке!</span>")
else
occupant_message("<span class='warning'>[target] надёжно зафиксирован!</span>")
occupant_message("<span class='warning'>[capitalize(target.declent_ru(NOMINATIVE))] надёжно зафиксирован!</span>")

else if(isliving(target))
var/mob/living/M = target
if(M.stat == DEAD) return
if(chassis.occupant.a_intent == INTENT_HARM)
target.visible_message("<span class='danger'>[chassis] уничтожает [target] в нечестивой ярости.</span>",
"<span class='userdanger'>[chassis] уничтожает [target] в нечестивой ярости.</span>")
target.visible_message("<span class='danger'>[capitalize(chassis.declent_ru(NOMINATIVE))] уничтожает [target.declent_ru(ACCUSATIVE)] в нечестивой ярости.</span>",
"<span class='userdanger'>[capitalize(chassis.declent_ru(NOMINATIVE))] уничтожает [target.declent_ru(ACCUSATIVE)] в нечестивой ярости.</span>")
M.gib()
/*if(chassis.occupant.a_intent == INTENT_DISARM)
target.visible_message("<span class='danger'>[chassis] rips [target]'s arms off.</span>",
"<span class='userdanger'>[chassis] rips [target]'s arms off.</span>")*/
else
step_away(M,chassis)
target.visible_message("[chassis] бросает [target], словно комок бумаги.")
target.visible_message("[capitalize(chassis.declent_ru(NOMINATIVE))] бросает [target.declent_ru(ACCUSATIVE)], словно комок бумаги.")
return


Expand Down Expand Up @@ -234,21 +234,21 @@
if((isreinforcedwallturf(target) && !canRwall) || istype(target, /turf/simulated/wall/indestructible))
return 0
var/turf/simulated/wall/W = target
occupant_message("Деконструкция [target]...")
occupant_message("Деконструкция [target.declent_ru(ACCUSATIVE)]...")
if(do_after_cooldown(W))
chassis.spark_system.start()
W.ChangeTurf(/turf/simulated/floor/plating)
playsound(W, usesound, 50, 1)
else if(isfloorturf(target))
var/turf/simulated/floor/F = target
occupant_message("Деконструкция [target]...")
occupant_message("Деконструкция [target.declent_ru(ACCUSATIVE)]...")
if(do_after_cooldown(F))
chassis.spark_system.start()
F.ChangeTurf(F.baseturf)
F.recalculate_atmos_connectivity()
playsound(F, usesound, 50, 1)
else if(istype(target, /obj/machinery/door/airlock))
occupant_message("Деконструкция [target]...")
occupant_message("Деконструкция [target.declent_ru(ACCUSATIVE)]...")
if(do_after_cooldown(target))
chassis.spark_system.start()
qdel(target)
Expand Down
2 changes: 1 addition & 1 deletion code/game/mecha/mech_bay.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@

/obj/machinery/computer/mech_bay_power_console
name = "mech bay power control console"
desc = "Консоль управления станции зарядки для мехов."
desc = "Консоль управления станции зарядки для экзокостюмов."
density = TRUE
anchored = TRUE
icon = 'icons/obj/computer.dmi'
Expand Down
2 changes: 1 addition & 1 deletion code/game/mecha/mech_fabricator.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
to_chat(user, "<span class='warning'>В [declent_ru(ACCUSATIVE)] не может быть загружены новые материалы, пока панель открыта!</span>")
return FALSE
if(being_built)
to_chat(user, "<span class='warning'>[declent_ru(NOMINATIVE)] в данный момент печатает деталь! Пожалуйста, дождитесь завершения.</span>")
to_chat(user, "<span class='warning'>[capitalize(declent_ru(NOMINATIVE))] в данный момент печатает деталь! Пожалуйста, дождитесь завершения.</span>")
return FALSE
return TRUE

Expand Down

0 comments on commit 2381f1a

Please sign in to comment.