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

Продолжение перевода кухни #504

Merged
merged 85 commits into from
Oct 12, 2024
Merged
Show file tree
Hide file tree
Changes from 78 commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
0ee3f41
blya
Kar4es Jun 5, 2024
1c19997
починил штуки
Kar4es Jun 5, 2024
d5dcb30
мэ
Kar4es Jun 5, 2024
d7c3b22
еще куча всего
Kar4es Jun 5, 2024
ad41cb6
еще штуки
Kar4es Jun 17, 2024
a15a958
Merge branch 'translate' into kitchen-translate
Kar4es Jun 17, 2024
f806095
ставе
Kar4es Jun 17, 2024
b9de23f
закончил
Kar4es Jun 17, 2024
81e663d
приятные запахи не прекрасные для слепых(
Kar4es Jun 19, 2024
af67a38
несколько
Kar4es Jun 19, 2024
7baa54a
справедливо
Kar4es Jun 19, 2024
0193f18
оно что так выпечка, что название... Разницы по факту - ноль, но окей
Kar4es Jun 19, 2024
270c094
стронг
Kar4es Jun 19, 2024
ac68ea7
без базароу
Kar4es Jun 19, 2024
e7feb12
избегал этого слова, но ладно
Kar4es Jun 19, 2024
8fbb99f
1
Kar4es Jun 19, 2024
5d96859
2
Kar4es Jun 19, 2024
175bd31
3
Kar4es Jun 19, 2024
027470d
м
Kar4es Jun 19, 2024
3ce8d9c
Merge branch 'kitchen-translate' of https://github.com/Kar4es/Bandast…
Kar4es Jun 19, 2024
f6e6ec1
Merge branch 'translate' into kitchen-translate
Kar4es Jun 19, 2024
37d8cf3
Merge branch 'translate' into kitchen-translate
Kar4es Jul 4, 2024
4a73c1e
Первый доперевод
msw7007 Jul 11, 2024
3fd0a99
Машина для мороженного
msw7007 Jul 11, 2024
da0793a
Правка русского языка 2
msw7007 Jul 11, 2024
783c058
Хим, Приправ мастера и гриндер
msw7007 Jul 12, 2024
5f247cf
Merge branch 'translate' into kitchen-translate
msw7007 Jul 12, 2024
18f72a4
Правка артиклизации в выпечке
msw7007 Jul 12, 2024
ee79a1b
Merge branch 'kitchen-translate' of https://github.com/Kar4es/Bandast…
msw7007 Jul 12, 2024
058b984
Убираем артикли
msw7007 Jul 12, 2024
2e0d16a
Правка по ревью и чистка
msw7007 Jul 12, 2024
442259a
Слегка улучшаем перевод
msw7007 Jul 12, 2024
176aa42
Merge branch 'translate' into kitchen-translate
msw7007 Jul 15, 2024
04f3681
Отработка по ревью + приправы
msw7007 Jul 19, 2024
79cc275
Merge branch 'translate' into kitchen-translate
msw7007 Aug 1, 2024
d63a1d4
Фикс после мерджа
msw7007 Aug 1, 2024
ffc14a3
Merge branch 'translate' into kitchen-translate
msw7007 Sep 15, 2024
49e1413
Фикс после анмерджа мерджа 2
msw7007 Sep 15, 2024
d59c898
Правки по прошлому ПРу
msw7007 Oct 4, 2024
55d4450
Merge branch 'translate' into kitchen-translate-kage
msw7007 Oct 5, 2024
6b9a6a2
Отгрузка после падежей (начало)
msw7007 Oct 5, 2024
baa0149
Правки для тестов
msw7007 Oct 5, 2024
dd3e6e0
RU_NAMES_LIST_INIT
msw7007 Oct 6, 2024
7526055
Merge branch 'translate' into kitchen-translate-kage
msw7007 Oct 6, 2024
0a2c1a1
Чистка ру_неймов
msw7007 Oct 6, 2024
646ebc5
Правка по ревью
msw7007 Oct 7, 2024
5e7faf3
Merge branch 'translate' into kitchen-translate-kage
larentoun Oct 7, 2024
ecc87f4
Отряботка
msw7007 Oct 7, 2024
3404d0a
Фикс инишала
msw7007 Oct 7, 2024
3022df9
Отработка по ревью
msw7007 Oct 7, 2024
088f577
Допереводы
msw7007 Oct 8, 2024
fc6ca94
Имена картриджей
msw7007 Oct 8, 2024
e7af506
Доработка по именам
msw7007 Oct 8, 2024
6ce0464
Лишние апострофы, убираем
msw7007 Oct 8, 2024
5d446ec
Точки не нужны
msw7007 Oct 9, 2024
a7463df
Merge branch 'translate' into kitchen-translate-kage
msw7007 Oct 10, 2024
7d00091
Merge branch 'translate' into kitchen-translate-kage
msw7007 Oct 10, 2024
d66cc43
После мерджа
msw7007 Oct 10, 2024
a3ab6a2
Отработка
msw7007 Oct 10, 2024
7565252
Merge branch 'translate' into kitchen-translate-kage
msw7007 Oct 10, 2024
4a06edd
Отработка по ревью (без химии)
msw7007 Oct 10, 2024
5a6dd89
До-отработка
msw7007 Oct 10, 2024
9be072c
Кнопки микроволонки и холодса
msw7007 Oct 10, 2024
225bca1
Доработа
msw7007 Oct 11, 2024
db9cb62
Чистикики
msw7007 Oct 11, 2024
fdbe235
Merge branch 'translate' into kitchen-translate-kage
msw7007 Oct 11, 2024
686553a
Подготвока перед кондитеркой
msw7007 Oct 11, 2024
cfea0ab
Merge branch 'kitchen-translate-kage' of https://github.com/msw7007/B…
msw7007 Oct 11, 2024
daf9bd3
Отработка и начало изменения кондимента
msw7007 Oct 11, 2024
0aa8309
Правки по кондименту
msw7007 Oct 11, 2024
3fb393a
Фикс по ревью
msw7007 Oct 11, 2024
1b1a8ca
Фикс косяка
msw7007 Oct 11, 2024
3c27101
Отработка по ревью (кроме роскомнадзора)
msw7007 Oct 11, 2024
b21a00a
Догонка надзора
msw7007 Oct 11, 2024
3675b7d
Кетчуп и не кетчуп
msw7007 Oct 11, 2024
8387b31
Правка перевода
msw7007 Oct 12, 2024
77b2fc7
Доработка
msw7007 Oct 12, 2024
8d55425
Снос лишнего
msw7007 Oct 12, 2024
625b25c
Ревью
msw7007 Oct 12, 2024
9fb382b
По ревью
msw7007 Oct 12, 2024
8d9bbd1
Ревью
msw7007 Oct 12, 2024
4ce5d4a
Досохранение по ревью (втф?)
msw7007 Oct 12, 2024
789e4af
Обнаружена ошибка
msw7007 Oct 12, 2024
a5502a1
Доотработка
msw7007 Oct 12, 2024
02a6f07
Какого черта
msw7007 Oct 12, 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
18 changes: 9 additions & 9 deletions code/datums/components/bakeable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@

if(positive_result)
used_oven.visible_message(
span_notice("You smell something great coming from [used_oven]."),
blind_message = span_notice("You smell something great..."),
span_notice("Вы чувствуете, как [used_oven.declent_ru(NOMINATIVE)] источает приятный запах."),
blind_message = span_notice("Вы чувствуете приятный запах..."),
ignored_mobs = asomnia_hadders,
)
BLACKBOX_LOG_FOOD_MADE(baked_result.type)
else
used_oven.visible_message(
span_warning("You smell a burnt smell coming from [used_oven]."),
blind_message = span_warning("You smell a burnt smell..."),
span_warning("Вы чувствуете, как [used_oven.declent_ru(NOMINATIVE)] испускает горелое зловоние."),
blind_message = span_warning("Вы чувствуете запах горелого..."),
ignored_mobs = asomnia_hadders,
)
SEND_SIGNAL(parent, COMSIG_ITEM_BAKED, baked_result)
Expand All @@ -118,15 +118,15 @@
if(!current_bake_time) //Not baked yet
if(positive_result)
if(initial(bake_result.gender) == PLURAL)
examine_list += span_notice("[parent] can be [span_bold("baked")] into some [initial(bake_result.name)].")
examine_list += span_notice("[capitalize(parent.declent_ru(NOMINATIVE))] [span_bold("запекается")] в [initial(bake_result.ru_name_accusative) || initial(bake_result.name)].")
else
examine_list += span_notice("[parent] can be [span_bold("baked")] into \a [initial(bake_result.name)].")
examine_list += span_notice("[capitalize(parent.declent_ru(NOMINATIVE))] [span_bold("запекается")] в [initial(bake_result.ru_name_accusative) || initial(bake_result.name)].")
return

if(positive_result)
if(current_bake_time <= required_bake_time * 0.75)
examine_list += span_notice("[parent] probably needs to be baked a bit longer!")
examine_list += span_notice("Наверное, [parent.declent_ru(ACCUSATIVE)] нужно выпекать немного дольше!")
else if(current_bake_time <= required_bake_time)
examine_list += span_notice("[parent] seems to be almost finished baking!")
examine_list += span_notice("Кажется, что [parent.declent_ru(NOMINATIVE)] вот-вот запечется!")
else
examine_list += span_danger("[parent] should probably not be put in the oven.")
examine_list += span_danger("[capitalize(parent.declent_ru(NOMINATIVE))] не стоит засовывать в духовку.")
138 changes: 69 additions & 69 deletions code/modules/food_and_drinks/machinery/coffeemaker.dm

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions code/modules/food_and_drinks/machinery/deep_fryer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
/obj/machinery/deepfryer
name = "deep fryer"
RU_NAMES_LIST_INIT("deep fryer", "фритюрница", "фритюрницы", "фритюрнице", "фритюрницу", "фритюрницей", "фритюрнице")
desc = "Deep fried <i>everything</i>."
desc = "Жарит <i>всё</i>."
icon = 'icons/obj/machines/kitchen.dmi'
icon_state = "fryer_off"
density = TRUE
Expand Down Expand Up @@ -93,9 +93,9 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
/obj/machinery/deepfryer/examine(mob/user)
. = ..()
if(frying)
. += "You can make out \a [frying] in the oil."
. += "Вы разглядываете [frying.declent_ru(ACCUSATIVE)] в масле."
if(in_range(user, src) || isobserver(user))
. += span_notice("The status display reads: Frying at <b>[fry_speed*100]%</b> speed.<br>Using <b>[oil_use]</b> units of oil per second.")
. += span_notice("На дисплее состояния отображается: Скорость жарки - <b>[fry_speed*100]%</b>.<br>Используется <b>[oil_use]</b> [declension_ru(oil_use,"юнит","юнита","юнитов")] масла в секунду.")

/obj/machinery/deepfryer/wrench_act(mob/living/user, obj/item/tool)
. = ..()
Expand All @@ -106,23 +106,23 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
// Dissolving pills into the frier
if(istype(weapon, /obj/item/reagent_containers/pill))
if(!reagents.total_volume)
to_chat(user, span_warning("There's nothing to dissolve [weapon] in!"))
to_chat(user, span_warning("Не в чем растворять [weapon.declent_ru(ACCUSATIVE)]!"))
return
user.visible_message(span_notice("[user] drops [weapon] into [src]."), span_notice("You dissolve [weapon] in [src]."))
user.visible_message(span_notice("[capitalize(user.declent_ru(NOMINATIVE))] бросает [weapon.declent_ru(ACCUSATIVE)] в [declent_ru(ACCUSATIVE)]."), span_notice("Вы растворяете [weapon.declent_ru(ACCUSATIVE)] в [declent_ru(PREPOSITIONAL)]."))
weapon.reagents.trans_to(src, weapon.reagents.total_volume, transferred_by = user)
qdel(weapon)
return
// Make sure we have cooking oil
if(!reagents.has_reagent(/datum/reagent/consumable/nutriment/fat, check_subtypes = TRUE))
to_chat(user, span_warning("[src] has no fat or oil to fry with!"))
to_chat(user, span_warning("[capitalize(declent_ru(NOMINATIVE))] не имеет жира или масла для жарки!"))
return
// Don't deep fry indestructible things, for sanity reasons
if(weapon.resistance_flags & INDESTRUCTIBLE)
to_chat(user, span_warning("You don't feel it would be wise to fry [weapon]..."))
to_chat(user, span_warning("Вы полагате, что жарить [weapon.declent_ru(ACCUSATIVE)] может плохо кончиться..."))
return
// No fractal frying
if(HAS_TRAIT(weapon, TRAIT_FOOD_FRIED))
to_chat(user, span_userdanger("Your cooking skills are not up to the legendary Doublefry technique."))
to_chat(user, span_userdanger("Ваши кулинарные способности не дотягивают до легендарной техники Двойножарки."))
return
// Handle opening up the fryer with tools
if(default_deconstruction_screwdriver(user, "fryer_off", "fryer_off", weapon)) //where's the open maint panel icon?!
Expand Down Expand Up @@ -160,15 +160,15 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
cook_time += fry_speed * seconds_per_tick SECONDS
if(cook_time >= DEEPFRYER_COOKTIME && !frying_fried)
frying_fried = TRUE //frying... frying... fried
playsound(src.loc, 'sound/machines/ding.ogg', 50, TRUE)
audible_message(span_notice("[src] dings!"))
playsound(loc, 'sound/machines/ding.ogg', 50, TRUE)
msw7007 marked this conversation as resolved.
Show resolved Hide resolved
audible_message(span_notice("[capitalize(declent_ru(NOMINATIVE))] звенит!"))
else if (cook_time >= DEEPFRYER_BURNTIME && !frying_burnt)
frying_burnt = TRUE
var/list/asomnia_hadders = list()
for(var/mob/smeller in get_hearers_in_view(DEFAULT_MESSAGE_RANGE, src))
if(HAS_TRAIT(smeller, TRAIT_ANOSMIA))
asomnia_hadders += smeller
visible_message(span_warning("[src] emits an acrid smell!"), ignored_mobs = asomnia_hadders)
visible_message(span_warning("[capitalize(declent_ru(NOMINATIVE))] источает едкий запах!"), ignored_mobs = asomnia_hadders)

use_energy(active_power_usage)

Expand All @@ -191,10 +191,10 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
update_appearance(UPDATE_OVERLAYS)

/obj/machinery/deepfryer/proc/start_fry(obj/item/frying_item, mob/user)
to_chat(user, span_notice("You put [frying_item] into [src]."))
to_chat(user, span_notice("Вы помещаете [frying_item.declent_ru(ACCUSATIVE)] в [declent_ru(ACCUSATIVE)]."))
if(istype(frying_item, /obj/item/freeze_cube))
log_bomber(user, "put a freeze cube in a", src)
visible_message(span_userdanger("[src] starts glowing... Oh no..."))
visible_message(span_userdanger("[capitalize(declent_ru(NOMINATIVE))] начинает светиться... О нет..."))
playsound(src, 'sound/effects/pray_chaplain.ogg', 100)
add_filter("entropic_ray", 10, list("type" = "rays", "size" = 35, "color" = COLOR_VIVID_YELLOW))
addtimer(CALLBACK(src, PROC_REF(blow_up)), 5 SECONDS)
Expand All @@ -212,7 +212,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
fry_loop.start()

/obj/machinery/deepfryer/proc/blow_up()
visible_message(span_userdanger("[src] blows up from the entropic reaction!"))
visible_message(span_userdanger("[capitalize(declent_ru(NOMINATIVE))] взрывается в результате энтропийной реакции!"))
explosion(src, devastation_range = 1, heavy_impact_range = 3, light_impact_range = 5, flame_range = 7)
deconstruct(FALSE)

Expand All @@ -221,25 +221,25 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(

/obj/machinery/deepfryer/attack_hand(mob/living/user, list/modifiers)
if(frying)
to_chat(user, span_notice("You eject [frying] from [src]."))
to_chat(user, span_notice("Вы вытаскиваете [frying.declent_ru(ACCUSATIVE)] из [declent_ru(GENITIVE)]]."))
frying.forceMove(drop_location())
if(Adjacent(user) && !issilicon(user))
user.put_in_hands(frying)
return

else if(user.pulling && iscarbon(user.pulling) && reagents.total_volume)
if(user.grab_state < GRAB_AGGRESSIVE)
to_chat(user, span_warning("You need a better grip to do that!"))
to_chat(user, span_warning("Для этого нужно усилить захват!"))
return
var/mob/living/carbon/dunking_target = user.pulling
log_combat(user, dunking_target, "dunked", null, "into [src]")
user.visible_message(span_danger("[user] dunks [dunking_target]'s face in [src]!"))
user.visible_message(span_danger("[capitalize(user.declent_ru(NOMINATIVE))] макает лицо [dunking_target.declent_ru(GENITIVE)] в [declent_ru(ACCUSATIVE)]!"))
reagents.expose(dunking_target, TOUCH)
var/bio_multiplier = dunking_target.getarmor(BODY_ZONE_HEAD, BIO) * 0.01
var/target_temp = dunking_target.bodytemperature
var/cold_multiplier = 1
if(target_temp < TCMB + 10) // a tiny bit of leeway
dunking_target.visible_message(span_userdanger("[dunking_target] explodes from the entropic difference! Holy fuck!"))
dunking_target.visible_message(span_userdanger("[capitalize(dunking_target.declent_ru(NOMINATIVE))] взрывается от энтропийной разницы! Блять!"))
dunking_target.investigate_log("has been gibbed by entropic difference (being dunked into [src]).", INVESTIGATE_DEATHS)
dunking_target.gib(DROP_ALL_REMAINS)
log_combat(user, dunking_target, "blew up", null, "by dunking them into [src]")
Expand Down
24 changes: 12 additions & 12 deletions code/modules/food_and_drinks/machinery/food_cart.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/obj/machinery/food_cart
name = "food cart"
RU_NAMES_LIST_INIT("food cart", "тележка с едой", "тележки с едой", "тележке с едой", "тележку с едой", "тележкой с едой", "тележке с едой")
desc = "A compact unpackable mobile cooking stand. Wow! When unpacked, it reminds you of those greasy gamer setups some people on NTNet have."
desc = "Компактная мобильная стойка для кулинарных работ с возможностью распаковки. Вот это да! В распакованном виде она напоминает те жирные геймерские установки, которые есть у некоторых людей в NTNet."
icon = 'icons/obj/service/kitchen.dmi'
icon_state = "foodcart"
density = TRUE
Expand Down Expand Up @@ -45,16 +45,16 @@
. = ..()
if(!(machine_stat & BROKEN))
if(cart_griddle.machine_stat & BROKEN)
. += span_warning("The stand's <b>griddle</b> is completely broken!")
. += span_warning("<b>Гриль</b> стойки сломан!")
else
. += span_notice("The stand's <b>griddle</b> is intact.")
. += span_notice("The stand's <b>fridge</b> seems fine.") //weirdly enough, these fridges don't break
. += span_notice("The stand's <b>table</b> seems fine.")
. += span_notice("<b>Гриль</b> стойки целый.")
. += span_notice("<b>Холодильник</b> стойки целый.") //weirdly enough, these fridges don't break
. += span_notice("<b>Стол</b> стойки целый.")

/obj/machinery/food_cart/proc/pack_up()
if(!unpacked)
return
visible_message(span_notice("[src] retracts all of it's unpacked components."))
visible_message(span_notice("[capitalize(declent_ru(NOMINATIVE))] втягивает все свои распакованные части."))
for(var/o in packed_things)
var/obj/object = o
UnregisterSignal(object, COMSIG_MOVABLE_MOVED)
Expand All @@ -66,9 +66,9 @@
if(unpacked)
return
if(!check_setup_place())
to_chat(user, span_warning("There isn't enough room to unpack here! Bad spaces were marked in red."))
to_chat(user, span_warning("Здесь не хватит места, чтобы все распаковать! Плохие места отмечены красным цветом."))
return
visible_message(span_notice("[src] expands into a full stand."))
visible_message(span_notice("[capitalize(declent_ru(NOMINATIVE))] расширяется, превращаясь в полноценную стойку."))
set_anchored(TRUE)
var/iteration = 1
var/turf/grabbed_turf = get_step(get_turf(src), EAST)
Expand All @@ -83,15 +83,15 @@
/obj/machinery/food_cart/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(machine_stat & BROKEN)
to_chat(user, span_warning("[src] is completely busted."))
to_chat(user, span_warning("[capitalize(declent_ru(NOMINATIVE))] полностью разрушена."))
return
var/obj/item/card/id/id_card = user.get_idcard(hand_first = TRUE)
if(!check_access(id_card))
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE)
return
to_chat(user, span_notice("You attempt to [unpacked ? "pack up" :"unpack"] [src]..."))
to_chat(user, span_notice("Вы пытаетесь [unpacked ? "распаковать" :"разобрать"] [declent_ru(ACCUSATIVE)]..."))
if(!do_after(user, 5 SECONDS, src))
to_chat(user, span_warning("Your [unpacked ? "" :"un"]packing of [src] was interrupted!"))
to_chat(user, span_warning("Ваша [unpacked ? "распаковка" :"разборка"] [declent_ru(ACCUSATIVE)] была прервана!"))
msw7007 marked this conversation as resolved.
Show resolved Hide resolved
return
if(unpacked)
pack_up()
Expand Down Expand Up @@ -135,7 +135,7 @@
/obj/effect/food_cart_stand
name = "food cart tent"
RU_NAMES_LIST_INIT("food cart tent", "палатка для тележки с едой", "палатки для тележки с едой", "палатке для тележки с едой", "палатку для тележки с едой", "палаткой для тележки с едой", "палатке для тележки с едой")
desc = "Something to battle the sun, for there are no breaks for the burger flippers."
desc = "Что-то для борьбы с солнцем, ведь перерывов у работников бургерной нет."
icon = 'icons/obj/fluff/3x3.dmi'
icon_state = "stand"
layer = ABOVE_MOB_LAYER//big mobs will still go over the tent, this is fine and cool
Loading
Loading