From 2e0d16accb978feff55126a4aea932dc53cc8275 Mon Sep 17 00:00:00 2001 From: KageIIte Date: Fri, 12 Jul 2024 15:15:00 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D1=80=D0=B5=D0=B2=D1=8C=D1=8E=20=D0=B8=20=D1=87=D0=B8?= =?UTF-8?q?=D1=81=D1=82=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/datums/components/bakeable.dm | 15 ++++++++------- code/modules/food_and_drinks/machinery/griddle.dm | 2 +- .../food_and_drinks/machinery/icecream_vat.dm | 2 +- .../food_and_drinks/machinery/microwave.dm | 14 +++++++------- code/modules/food_and_drinks/machinery/oven.dm | 2 +- .../food_and_drinks/machinery/processor.dm | 2 +- .../food_and_drinks/machinery/smartfridge.dm | 2 +- code/modules/food_and_drinks/machinery/stove.dm | 2 +- .../food_and_drinks/machinery/stove_component.dm | 2 +- 9 files changed, 22 insertions(+), 21 deletions(-) diff --git a/code/datums/components/bakeable.dm b/code/datums/components/bakeable.dm index a4c6a578e1743..77b78ebe2f5c6 100644 --- a/code/datums/components/bakeable.dm +++ b/code/datums/components/bakeable.dm @@ -97,14 +97,14 @@ if(positive_result) used_oven.visible_message( - span_notice("Вы чувствует как [used_oven.name] источает приятный запах."), + span_notice("Вы чувствуете как [used_oven.name] источает приятный запах."), blind_message = span_notice("Вы чувствуете приятный запах..."), ignored_mobs = asomnia_hadders, ) BLACKBOX_LOG_FOOD_MADE(baked_result.type) else used_oven.visible_message( - span_warning("Вы чувствует как [used_oven.name] испускает горелое зловоние."), + span_warning("Вы чувствуете как [used_oven.name] испускает горелое зловоние."), blind_message = span_warning("Вы чувствуете запах горелого..."), ignored_mobs = asomnia_hadders, ) @@ -115,18 +115,19 @@ /datum/component/bakeable/proc/on_examine(atom/source, mob/user, list/examine_list) SIGNAL_HANDLER + var/obj/sourceobj = parent if(!current_bake_time) //Not baked yet if(positive_result) if(initial(bake_result.gender) == PLURAL) - examine_list += span_notice("Это [parent.name]. [initial(bake_result.name)] могут [span_bold("готовиться")] из нее.") + examine_list += span_notice("Это [sourceobj.name]. [initial(bake_result.name)] могут [span_bold("готовиться")] из нее.") else - examine_list += span_notice("Это [parent.name]. [span_bold("Готовится")] в [initial(bake_result.name)].") + examine_list += span_notice("Это [sourceobj.name]. [span_bold("Готовится")] в [initial(bake_result.name)].") return if(positive_result) if(current_bake_time <= required_bake_time * 0.75) - examine_list += span_notice("Наверное, [parent.name] нужно выпекать немного дольше!") + examine_list += span_notice("Наверное, [sourceobj.name] нужно выпекать немного дольше!") else if(current_bake_time <= required_bake_time) - examine_list += span_notice("Кажется, что [parent.name] почти готов!") + examine_list += span_notice("Кажется, что [sourceobj.name] почти готов!") else - examine_list += span_danger("[parent.name] не стоит засовывать в духовку.") + examine_list += span_danger("[sourceobj.name] не стоит засовывать в духовку.") diff --git a/code/modules/food_and_drinks/machinery/griddle.dm b/code/modules/food_and_drinks/machinery/griddle.dm index 109f0133e89eb..3e2d3a7f21dc9 100644 --- a/code/modules/food_and_drinks/machinery/griddle.dm +++ b/code/modules/food_and_drinks/machinery/griddle.dm @@ -112,7 +112,7 @@ loaded++ AddToGrill(tray_item, user) if(loaded) - to_chat(user, span_notice("Вы вываливаете [loaded.name] на [src.name].")) + to_chat(user, span_notice("Вы вываливаете [loaded] на [src.name].")) update_appearance() return ITEM_INTERACT_SUCCESS return ITEM_INTERACT_BLOCKING diff --git a/code/modules/food_and_drinks/machinery/icecream_vat.dm b/code/modules/food_and_drinks/machinery/icecream_vat.dm index 9e0c7840e00ea..30c9039545b56 100644 --- a/code/modules/food_and_drinks/machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/machinery/icecream_vat.dm @@ -268,7 +268,7 @@ if(flavor.add_flavour(source, should_use_custom_ingredients ? custom_ice_cream_beaker.reagents : null)) for(var/reagents_used in flavor.ingredients) reagents.remove_reagent(reagents_used, CONE_REAGENET_NEEDED) - balloon_alert_to_viewers("делается шарик [selected_flavour.name]", "делает шарик [selected_flavour.name]") + balloon_alert_to_viewers("набирает шарик, где содержится[selected_flavour]", "набирает шарик, где содержится [selected_flavour]") if(istype(cone)) if(isnull(cone.crafted_food_buff)) diff --git a/code/modules/food_and_drinks/machinery/microwave.dm b/code/modules/food_and_drinks/machinery/microwave.dm index 6c09cc2772f04..6e711b9e87445 100644 --- a/code/modules/food_and_drinks/machinery/microwave.dm +++ b/code/modules/food_and_drinks/machinery/microwave.dm @@ -383,8 +383,8 @@ return NONE if(broken > NOT_BROKEN) - balloon_alert(user, "он сломан!") - return ITEM_INTERACT_BLOCKING + balloon_alert(user, "он сломан!") + return ITEM_INTERACT_BLOCKING if(istype(item, /obj/item/stock_parts/power_store/cell) && cell_powered) var/swapped = FALSE @@ -403,12 +403,12 @@ return ITEM_INTERACT_SUCCESS if(!anchored) - balloon_alert(user, "не прикручено!") - return ITEM_INTERACT_BLOCKING + balloon_alert(user, "не прикручено!") + return ITEM_INTERACT_BLOCKING if(dirty >= MAX_MICROWAVE_DIRTINESS) // The microwave is all dirty so can't be used! - balloon_alert(user, "cлишком грязно!") - return TRUE + balloon_alert(user, "cлишком грязно!") + return TRUE if(vampire_charging_capable && istype(item, /obj/item/modular_computer) && ingredients.len > 0) balloon_alert(user, "максимум 1 устройство!") @@ -435,7 +435,7 @@ ingredients += tray_item if(loaded) open(autoclose = 0.6 SECONDS) - to_chat(user, span_notice("Вы вставляете [loaded.name] в [src.name].")) + to_chat(user, span_notice("Вы вставляете [loaded] в [src.name].")) update_appearance() return ITEM_INTERACT_SUCCESS diff --git a/code/modules/food_and_drinks/machinery/oven.dm b/code/modules/food_and_drinks/machinery/oven.dm index 6c241f94b4909..a8f585296228a 100644 --- a/code/modules/food_and_drinks/machinery/oven.dm +++ b/code/modules/food_and_drinks/machinery/oven.dm @@ -284,7 +284,7 @@ loaded++ AddToPlate(tray_item, user) if(loaded) - to_chat(user, span_notice("Вы вставляете [loaded.name] в [src.name].")) + to_chat(user, span_notice("Вы вставляете [loaded] в [src.name].")) update_appearance() return ITEM_INTERACT_SUCCESS return ITEM_INTERACT_BLOCKING diff --git a/code/modules/food_and_drinks/machinery/processor.dm b/code/modules/food_and_drinks/machinery/processor.dm index f24ed0c943b9c..6511e68e0dac0 100644 --- a/code/modules/food_and_drinks/machinery/processor.dm +++ b/code/modules/food_and_drinks/machinery/processor.dm @@ -108,7 +108,7 @@ loaded++ if(loaded) - to_chat(user, span_notice("Вы вставляете [loaded.name] в [src.name].")) + to_chat(user, span_notice("Вы вставляете [loaded] в [src.name].")) return var/datum/food_processor_process/recipe = PROCESSOR_SELECT_RECIPE(attacking_item) diff --git a/code/modules/food_and_drinks/machinery/smartfridge.dm b/code/modules/food_and_drinks/machinery/smartfridge.dm index cc829831dc197..923b85e845273 100644 --- a/code/modules/food_and_drinks/machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/machinery/smartfridge.dm @@ -54,7 +54,7 @@ return ITEM_INTERACT_BLOCKING user.visible_message( - span_notice("[user.name] начинает срезать [name.name] от пола."), + span_notice("[user] начинает срезать [name] от пола."), span_notice("Вы начинаете срезать [src.name] от пола..."), span_hear("Вы слышите сварку."), ) diff --git a/code/modules/food_and_drinks/machinery/stove.dm b/code/modules/food_and_drinks/machinery/stove.dm index 22f71af5e2e62..6b5ab54e49174 100644 --- a/code/modules/food_and_drinks/machinery/stove.dm +++ b/code/modules/food_and_drinks/machinery/stove.dm @@ -139,7 +139,7 @@ loaded++ LAZYADD(added_ingredients, tray_item) if(loaded) - to_chat(user, span_notice("Вы добавляете [loaded.name] в [src.name].")) + to_chat(user, span_notice("Вы добавляете [loaded] в [src.name].")) update_appearance(UPDATE_OVERLAYS) return TRUE diff --git a/code/modules/food_and_drinks/machinery/stove_component.dm b/code/modules/food_and_drinks/machinery/stove_component.dm index 575eebc83c25c..90820915ff980 100644 --- a/code/modules/food_and_drinks/machinery/stove_component.dm +++ b/code/modules/food_and_drinks/machinery/stove_component.dm @@ -154,7 +154,7 @@ if(user.transferItemToLoc(attacking_item, parent)) add_container(attacking_item, user) - to_chat(user, span_notice("Вы положили [attacking_item.name] в [parent.name].")) + to_chat(user, span_notice("Вы положили [attacking_item.name] в [parent].")) return COMPONENT_NO_AFTERATTACK /datum/component/stove/proc/on_exited(obj/machinery/source, atom/movable/gone, direction)