Перевод кухонной машинерии #292
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -16,8 +16,8 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( | |||||
| ))) | ||||||
|
|
||||||
| /obj/machinery/deepfryer | ||||||
| name = "фритюрница" | ||||||
| desc = "Жарит <i>всё</i>." | ||||||
| icon = 'icons/obj/machines/kitchen.dmi' | ||||||
| icon_state = "fryer_off" | ||||||
| density = TRUE | ||||||
|
|
@@ -78,9 +78,9 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( | |||||
| /obj/machinery/deepfryer/examine(mob/user) | ||||||
| . = ..() | ||||||
| if(frying) | ||||||
| . += "Вы сможете разглядеть [frying] в масле." | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| if(in_range(user, src) || isobserver(user)) | ||||||
| . += span_notice("На дисплее состояния отображается: Жарка на <b>[fry_speed*100]%</b> скорости.<br>Используется <b>[oil_use]</b> юнитов масла в секунду.") | ||||||
|
|
||||||
| /obj/machinery/deepfryer/wrench_act(mob/living/user, obj/item/tool) | ||||||
| . = ..() | ||||||
|
|
@@ -91,23 +91,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("Не в чем растворять [weapon]!")) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| return | ||||||
| user.visible_message(span_notice("[user] бросает [weapon.name] в [src.name]."), span_notice("Ты растворяешь [weapon.name] в [src.name].")) | ||||||
| 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.name] нет жира или масла для жарки!")) | ||||||
| return | ||||||
| // Don't deep fry indestructible things, for sanity reasons | ||||||
| if(weapon.resistance_flags & INDESTRUCTIBLE) | ||||||
| to_chat(user, span_warning("Вы думаете, что не стоит жарить [weapon.name]...")) | ||||||
| return | ||||||
| // No fractal frying | ||||||
| if(HAS_TRAIT(weapon, TRAIT_FOOD_FRIED)) | ||||||
| to_chat(user, span_userdanger("Ваши кулинарные способности не дотягивают до легендарной техники Doublefry.")) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| 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?! | ||||||
|
|
@@ -144,14 +144,14 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( | |||||
| 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.name] звенит!")) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| 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.name] источает едкий запах!"), ignored_mobs = asomnia_hadders) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
|
|
||||||
| use_energy(active_power_usage) | ||||||
|
|
||||||
|
|
@@ -172,10 +172,10 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( | |||||
| icon_state = "fryer_off" | ||||||
|
|
||||||
| /obj/machinery/deepfryer/proc/start_fry(obj/item/frying_item, mob/user) | ||||||
| to_chat(user, span_notice("Вы кладете [frying_item] в [src].")) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| if(istype(frying_item, /obj/item/freeze_cube)) | ||||||
| log_bomber(user, "put a freeze cube in a", src) | ||||||
| visible_message(span_userdanger("[src.name] начинает пылать... О нет...")) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| 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) | ||||||
|
|
@@ -192,7 +192,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( | |||||
| fry_loop.start() | ||||||
|
|
||||||
| /obj/machinery/deepfryer/proc/blow_up() | ||||||
| visible_message(span_userdanger("[src.name] взрывается в результате энтропийной реакции!")) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| explosion(src, devastation_range = 1, heavy_impact_range = 3, light_impact_range = 5, flame_range = 7) | ||||||
| deconstruct(FALSE) | ||||||
|
|
||||||
|
|
@@ -201,28 +201,28 @@ 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("Вы вытаскиваете [frying.name] из [src.name].")) | ||||||
| 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("Тебе нужно получше схватить для этого!")) | ||||||
| return | ||||||
| var/mob/living/carbon/dunking_target = user.pulling | ||||||
| log_combat(user, dunking_target, "dunked", null, "into [src.name]") | ||||||
| user.visible_message(span_danger("[user] макает лицо [dunking_target.name] в [src.name]!")) | ||||||
| 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.name] взрывается от энтропийной разницы! Блять!")) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| dunking_target.investigate_log("has been gibbed by entropic difference (being dunked into [src.name]).", INVESTIGATE_DEATHS) | ||||||
|
There was a problem hiding this comment.
Suggested change
не трогаем логи |
||||||
| dunking_target.gib(DROP_ALL_REMAINS) | ||||||
| log_combat(user, dunking_target, "blew up", null, "by dunking them into [src.name]") | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| return | ||||||
|
|
||||||
| else if(target_temp < T0C) | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,7 +1,7 @@ | ||||||
|
|
||||||
| /obj/machinery/food_cart | ||||||
| name = "тележка с едой" | ||||||
| desc = "Компактная мобильная стойка для кулинарных работ с возможностью распаковки. Вот это да! В распакованном виде она напоминает те жирные геймерские установки, которые есть у некоторых людей в NTNet." | ||||||
| icon = 'icons/obj/service/kitchen.dmi' | ||||||
| icon_state = "foodcart" | ||||||
| density = TRUE | ||||||
|
|
@@ -44,16 +44,16 @@ | |||||
| . = ..() | ||||||
| if(!(machine_stat & BROKEN)) | ||||||
| if(cart_griddle.machine_stat & BROKEN) | ||||||
| . += span_warning("<b>Гриль</b> стойки сломан!") | ||||||
| else | ||||||
| . += 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.name] втягивает все свои распакованные части.")) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| for(var/o in packed_things) | ||||||
| var/obj/object = o | ||||||
| UnregisterSignal(object, COMSIG_MOVABLE_MOVED) | ||||||
|
|
@@ -65,9 +65,9 @@ | |||||
| if(unpacked) | ||||||
| return | ||||||
| if(!check_setup_place()) | ||||||
| to_chat(user, span_warning("Здесь не хватит места, чтобы все распаковать! Плохие места отмечены красным цветом.")) | ||||||
| return | ||||||
| visible_message(span_notice("[src.name] расширяется, превращаясь в полноценную стойку.")) | ||||||
| set_anchored(TRUE) | ||||||
| var/iteration = 1 | ||||||
| var/turf/grabbed_turf = get_step(get_turf(src), EAST) | ||||||
|
|
@@ -82,15 +82,15 @@ | |||||
| /obj/machinery/food_cart/attack_hand(mob/living/user, list/modifiers) | ||||||
| . = ..() | ||||||
| if(machine_stat & BROKEN) | ||||||
| to_chat(user, span_warning("[src.name] полностью разрушена.")) | ||||||
| return | ||||||
| var/obj/item/card/id/id_card = user.get_idcard(hand_first = TRUE) | ||||||
| if(!check_access(id_card)) | ||||||
| playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) | ||||||
| return | ||||||
| to_chat(user, span_notice("Вы пытаетесь [unpacked ? "распаковать" :"разобрать"] [src.name]...")) | ||||||
| if(!do_after(user, 5 SECONDS, src)) | ||||||
| to_chat(user, span_warning("Ваша [unpacked ? "распаковка" :"разборка"] [src.name] была прервана!")) | ||||||
| return | ||||||
| if(unpacked) | ||||||
| pack_up() | ||||||
|
|
@@ -132,8 +132,8 @@ | |||||
| QDEL_NULL(cart_tent) | ||||||
|
|
||||||
| /obj/effect/food_cart_stand | ||||||
| name = "палатка тележки с едой" | ||||||
| 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 | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| /obj/machinery/gibber | ||
| name = "мясорубка" | ||
| desc = "Название недостаточно информативное?" | ||
| icon = 'icons/obj/machines/kitchen.dmi' | ||
| icon_state = "grinder" | ||
| density = TRUE | ||
|
|
@@ -18,11 +18,11 @@ | |
| . = ..() | ||
| RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_cleaned)) | ||
| if(prob(5)) | ||
| name = "мясорубка" | ||
| desc = "Ладно, если я... если я измельчу тебя в мясорубке, и единственное, что от тебя останется, - это глазное яблоко, \ | ||
| то ты... ты ТОЧНО УМРЕШЬ! Ты, наверное, - не ты, я просто говорю, что если бы ты... если бы кто-то, типа, \ | ||
| если тебя заталкивают в мясорубку, и, к примеру, одна из косточек твоего пальца все еще цела, они не станут ее поднимать и уходить, \ | ||
| видите ли, да, это не было смертельно опасно, это не было мгновенным убийством! У тебя еще осталась часть пальца!" | ||
| dirty = TRUE | ||
| update_appearance(UPDATE_OVERLAYS) | ||
|
|
||
|
|
@@ -40,10 +40,10 @@ | |
| /obj/machinery/gibber/examine(mob/user) | ||
| . = ..() | ||
| if(in_range(user, src) || isobserver(user)) | ||
| . += span_notice("на дисплее состояния отображается: Вывод <b>[meat_produced]</b> мясных кусков через <b>[gibtime*0.1]</b> секунд работы.") | ||
| for(var/datum/stock_part/servo/servo in component_parts) | ||
| if(servo.tier >= 2) | ||
| . += span_notice("[src.name] была модернизирована для обработки неорганических материалов.") | ||
|
|
||
| /obj/machinery/gibber/update_overlays() | ||
| . = ..() | ||
|
|
@@ -82,36 +82,36 @@ | |
| if(machine_stat & (NOPOWER|BROKEN)) | ||
| return | ||
| if(operating) | ||
| to_chat(user, span_danger("он заблокирован и работает.")) | ||
| return | ||
|
|
||
| if(!anchored) | ||
| to_chat(user, span_warning("нельзя использовать мясорубку, пока она не прикручена к полу!")) | ||
| return | ||
|
|
||
| if(user.pulling && isliving(user.pulling)) | ||
| var/mob/living/L = user.pulling | ||
| if(!iscarbon(L)) | ||
| to_chat(user, span_warning("этот предмет не подходит для [src.name]!")) | ||
| return | ||
| var/mob/living/carbon/C = L | ||
| if(C.buckled || C.has_buckled_mobs()) | ||
| to_chat(user, span_warning("[C.name] к чему-то прикреплен!")) | ||
| return | ||
|
|
||
| if(!ignore_clothing) | ||
| for(var/obj/item/I in C.held_items + C.get_equipped_items()) | ||
| if(!HAS_TRAIT(I, TRAIT_NODROP)) | ||
| to_chat(user, span_warning("На объекте не должно быть абиотических предметов!")) | ||
| return | ||
|
|
||
| user.visible_message(span_danger("[user] начинает засовывать [C.name] в мясорубку!")) | ||
|
|
||
| add_fingerprint(user) | ||
|
|
||
| if(do_after(user, gibtime, target = src)) | ||
| if(C && user.pulling == C && !C.buckled && !C.has_buckled_mobs() && !occupant) | ||
| user.visible_message(span_danger("[user] набивает [C.name] в [src.name]!")) | ||
| C.forceMove(src) | ||
| set_occupant(C) | ||
| update_appearance() | ||
|
|
@@ -155,17 +155,17 @@ | |
| if(operating) | ||
| return | ||
| if(!occupant) | ||
| audible_message(span_hear("Вы слышите громкий металлический скрежет..")) | ||
| return | ||
| if(occupant.flags_1 & HOLOGRAM_1) | ||
| audible_message(span_hear("Вы слышите очень короткий металлический скрежет.")) | ||
| playsound(loc, 'sound/machines/hiss.ogg', 20, TRUE) | ||
| qdel(occupant) | ||
| set_occupant(null) | ||
| return | ||
|
|
||
| use_energy(active_power_usage) | ||
| audible_message(span_hear("Вы слышите громкий хлюпающий скрежещущий звук.")) | ||
| playsound(loc, 'sound/machines/juicer.ogg', 50, TRUE) | ||
| operating = TRUE | ||
| update_appearance() | ||
|
|
@@ -222,7 +222,7 @@ | |
| skin = new typeofskin | ||
|
|
||
| log_combat(user, occupant, "gibbed") | ||
| mob_occupant.investigate_log("has been gibbed by [src.name].", INVESTIGATE_DEATHS) | ||
| mob_occupant.death(TRUE) | ||
| mob_occupant.ghostize() | ||
| set_occupant(null) | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.