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

Fix translate 27.01 & 28.01 #1101

Merged
merged 2 commits into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion code/datums/quirks/_quirk.dm
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
dat += medical ? candidate.medical_record_text : candidate.name

if(!length(dat))
return medical ? "No issues have been declared." : "None"
return medical ? "Каких-либо проблем не зафиксировано." : "Пусто"
return medical ? dat.Join("<br>") : dat.Join(", ")

/mob/living/proc/cleanse_quirk_datums() //removes all trait datums
Expand Down
4 changes: 2 additions & 2 deletions code/datums/quirks/negative_quirks/addict.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
var/obj/item/drug_container_type //! If this is defined before pill generation, pill generation will be skipped. This is the type of the pill bottle.
var/where_accessory //! where the accessory spawned
var/obj/item/accessory_type //! If this is null, an accessory won't be spawned.
var/drug_flavour_text = "Better hope you don't run out... of what, exactly? You don't know."
var/drug_flavour_text = "Лучше надеяться, что у вас не закончится... что именно? Вы не знаете."
var/process_interval = 30 SECONDS //! how frequently the quirk processes
COOLDOWN_DECLARE(next_process) //! ticker for processing

Expand Down Expand Up @@ -75,7 +75,7 @@
if(deleted || missing_addiction)
if(deleted)
reagent_instance = new reagent_type()
to_chat(quirk_holder, span_danger("You thought you kicked it, but you feel like you're falling back onto bad habits.."))
to_chat(quirk_holder, span_danger("Вы думали, что завязали, но чувствуете, что возвращаетесь к вредным привычкам..."))
for(var/addiction in reagent_instance.addiction_types)
human_holder.last_mind?.add_addiction_points(addiction, 1000) ///Max that shit out

Expand Down
8 changes: 4 additions & 4 deletions code/modules/reagents/reagent_containers/condiment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
return ITEM_INTERACT_BLOCKING

var/trans = round(target.reagents.trans_to(src, amount_per_transfer_from_this, transferred_by = user), CHEMICAL_VOLUME_ROUNDING)
to_chat(user, span_notice("You fill [src] with [trans] units of the contents of [target]."))
to_chat(user, span_notice("Вы наполняете [declent_ru(ACCUSATIVE)] на [trans] [declension_ru(trans,"юнит","юнита","юнитов")] из [target.declent_ru(GENITIVE)]."))
return ITEM_INTERACT_SUCCESS

//Something like a glass or a food item. Player probably wants to transfer TO it.
Expand All @@ -89,7 +89,7 @@
to_chat(user, span_warning("Внутри [target.declent_ru(GENITIVE)] недостаточно места!"))
return ITEM_INTERACT_BLOCKING
var/trans = round(reagents.trans_to(target, amount_per_transfer_from_this, transferred_by = user), CHEMICAL_VOLUME_ROUNDING)
to_chat(user, span_notice("You transfer [trans] units of the condiment to [target]."))
to_chat(user, span_notice("Вы переносите [trans] [declension_ru(trans,"юнит","юнита","юнитов")] в [target.declent_ru(ACCUSATIVE)]."))
return ITEM_INTERACT_SUCCESS

return NONE
Expand Down Expand Up @@ -457,7 +457,7 @@
to_chat(user, span_warning("Вы вскрываете [declent_ru(ACCUSATIVE)], но [target.declent_ru(NOMINATIVE)] заполнен настолько, что всё просто стекает!"))
qdel(src)
return ITEM_INTERACT_BLOCKING
to_chat(user, span_notice("You tear open [src] above [target] and the condiments drip onto it."))
to_chat(user, span_notice("Вы вскрываете [declent_ru(ACCUSATIVE)] над [target.declent_ru(INSTRUMENTAL)] и добавляете содержимое в блюдо."))
reagents.trans_to(target, amount_per_transfer_from_this, transferred_by = user)
qdel(src)
return ITEM_INTERACT_SUCCESS
Expand All @@ -469,7 +469,7 @@

if(!reagents.total_volume)
icon_state = "condi_empty"
desc = "A small condiment pack. It is empty."
desc = "Небольшой пустой пакетик с приправами."
return
var/datum/reagent/main_reagent = reagents.get_master_reagent()

Expand Down
Loading