From e5991546b3497758befeef2496810f009d5534ab Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Sun, 13 Oct 2024 22:38:20 +0300 Subject: [PATCH] Ru names 456 (#571) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## About The Pull Request Добавляет саггестеты с прошло раунда Добавляет поддержку ренейма дизайнов, если есть перевод --- code/game/objects/items/food/meatdish.dm | 1 + code/game/objects/items/mop.dm | 1 + code/game/objects/structures/false_walls.dm | 4 ++++ code/game/turfs/closed/indestructible.dm | 2 ++ code/game/turfs/closed/wall/material_walls.dm | 1 + code/game/turfs/closed/wall/mineral_walls.dm | 2 ++ code/game/turfs/closed/walls.dm | 1 + code/modules/clothing/shoes/clown.dm | 1 + code/modules/hydroponics/hydroitemdefines.dm | 1 + .../translations/_translations.dme | 1 + .../translations/code/design.dm | 19 +++++++++++++++++++ .../code/translate_suggest_ru_names.dm | 2 +- 12 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 modular_bandastation/translations/code/design.dm diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm index 770b6f8bf3124..a62c059f0094a 100644 --- a/code/game/objects/items/food/meatdish.dm +++ b/code/game/objects/items/food/meatdish.dm @@ -909,6 +909,7 @@ /obj/item/food/kebab/rat/double name = "double rat-kebab" + RU_NAMES_LIST_INIT("double rat-kebab", "двойной крышлык", "двойного крышлыка", "двойному крышлыку", "двойной крышлык", "двойным крышлыком", "двойном крышлыке") icon_state = "doubleratkebab" tastes = list("rat meat" = 2, "metal" = 1) food_reagents = list( diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm index b2bd6d55d5cee..036d7f8225708 100644 --- a/code/game/objects/items/mop.dm +++ b/code/game/objects/items/mop.dm @@ -1,6 +1,7 @@ /obj/item/mop desc = "The world of janitalia wouldn't be complete without a mop." name = "mop" + RU_NAMES_LIST_INIT("mop", "швабра", "швабры", "швабре", "швабру", "шваброй", "швабре") icon = 'icons/obj/service/janitor.dmi' icon_state = "mop" inhand_icon_state = "mop" diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 5c2f1972c33ef..f3ec0084a3547 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -3,6 +3,7 @@ */ /obj/structure/falsewall name = "wall" + RU_NAMES_LIST_INIT("wall", "стена", "стены", "стене", "стену", "стеной", "стене") desc = "A huge chunk of metal used to separate rooms." anchored = TRUE icon = 'icons/turf/walls/false_walls.dmi' @@ -351,6 +352,7 @@ /obj/structure/falsewall/titanium name = "wall" + RU_NAMES_LIST_INIT("wall", "стена", "стены", "стене", "стену", "стеной", "стене") desc = "A light-weight titanium wall used in shuttles." fake_icon = 'icons/turf/walls/shuttle_wall.dmi' icon_state = "shuttle_wall-open" @@ -363,6 +365,7 @@ /obj/structure/falsewall/plastitanium name = "wall" + RU_NAMES_LIST_INIT("wall", "стена", "стены", "стене", "стену", "стеной", "стене") desc = "An evil wall of plasma and titanium." fake_icon = 'icons/turf/walls/plastitanium_wall.dmi' icon_state = "plastitanium_wall-open" @@ -375,6 +378,7 @@ /obj/structure/falsewall/material name = "wall" + RU_NAMES_LIST_INIT("wall", "стена", "стены", "стене", "стену", "стеной", "стене") desc = "A huge chunk of material used to separate rooms." fake_icon = 'icons/turf/walls/material_wall.dmi' icon_state = "material_wall-open" diff --git a/code/game/turfs/closed/indestructible.dm b/code/game/turfs/closed/indestructible.dm index 9e2a1ea10666e..e7c038b22317f 100644 --- a/code/game/turfs/closed/indestructible.dm +++ b/code/game/turfs/closed/indestructible.dm @@ -1,5 +1,6 @@ /turf/closed/indestructible name = "wall" + RU_NAMES_LIST_INIT("wall", "стена", "стены", "стене", "стену", "стеной", "стене") desc = "Effectively impervious to conventional methods of destruction." icon = 'icons/turf/walls.dmi' explosive_resistance = 50 @@ -328,6 +329,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen) /turf/closed/indestructible/riveted/hierophant name = "wall" + RU_NAMES_LIST_INIT("wall", "стена", "стены", "стене", "стену", "стеной", "стене") desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern." icon = 'icons/turf/walls/hierophant_wall.dmi' icon_state = "wall" diff --git a/code/game/turfs/closed/wall/material_walls.dm b/code/game/turfs/closed/wall/material_walls.dm index f8f9d58c220fb..c30cc03dfcb88 100644 --- a/code/game/turfs/closed/wall/material_walls.dm +++ b/code/game/turfs/closed/wall/material_walls.dm @@ -1,5 +1,6 @@ /turf/closed/wall/material name = "wall" + RU_NAMES_LIST_INIT("wall", "стена", "стены", "стене", "стену", "стеной", "стене") desc = "A huge chunk of material used to separate rooms." icon = 'icons/turf/walls/material_wall.dmi' icon_state = "material_wall-0" diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm index 347e9af8f0d24..5f957f86b6dd0 100644 --- a/code/game/turfs/closed/wall/mineral_walls.dm +++ b/code/game/turfs/closed/wall/mineral_walls.dm @@ -259,6 +259,7 @@ /turf/closed/wall/mineral/titanium //has to use this path due to how building walls works name = "wall" + RU_NAMES_LIST_INIT("wall", "стена", "стены", "стене", "стену", "стеной", "стене") desc = "A light-weight titanium wall used in shuttles." icon = 'icons/turf/walls/shuttle_wall.dmi' icon_state = "shuttle_wall-0" @@ -331,6 +332,7 @@ /turf/closed/wall/mineral/plastitanium name = "wall" + RU_NAMES_LIST_INIT("wall", "стена", "стены", "стене", "стену", "стеной", "стене") desc = "A durable wall made of an alloy of plasma and titanium." icon = 'icons/turf/walls/plastitanium_wall.dmi' icon_state = "plastitanium_wall-0" diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index f1297e4a02258..6ac5dc1649600 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -2,6 +2,7 @@ /turf/closed/wall name = "wall" + RU_NAMES_LIST_INIT("wall", "стена", "стены", "стене", "стену", "стеной", "стене") desc = "A huge chunk of iron used to separate rooms." icon = 'icons/turf/walls/wall.dmi' icon_state = "wall-0" diff --git a/code/modules/clothing/shoes/clown.dm b/code/modules/clothing/shoes/clown.dm index c999a242a190f..a17da088cfdbc 100644 --- a/code/modules/clothing/shoes/clown.dm +++ b/code/modules/clothing/shoes/clown.dm @@ -58,6 +58,7 @@ /obj/item/clothing/shoes/clown_shoes/moffers name = "moffers" + RU_NAMES_LIST_INIT("moffers", "мофферсы", "мофферсов", "мофферсам", "мофферсы", "мофферсами", "мофферсах") desc = "No moths were harmed in the making of these slippers." icon_state = "moffers" squeak_sound = list('sound/effects/footstep/moffstep01.ogg'=1) //like sweet music to my ears diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 1251cb54d32b9..b950bfc4ad993 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -1,6 +1,7 @@ // Plant analyzer /obj/item/plant_analyzer name = "plant analyzer" + RU_NAMES_LIST_INIT("plant analyzer", "анализатор растений", "анализатора растений", "анализатору растений", "анализатор растений", "анализатором растений", "анализаторе растений") desc = "A scanner used to evaluate a plant's various areas of growth, and genetic traits. Comes with a growth scanning mode and a chemical scanning mode." icon = 'icons/obj/devices/scanner.dmi' icon_state = "hydro" diff --git a/modular_bandastation/translations/_translations.dme b/modular_bandastation/translations/_translations.dme index 6d83ba51fad5b..ee3f2bf83bb79 100644 --- a/modular_bandastation/translations/_translations.dme +++ b/modular_bandastation/translations/_translations.dme @@ -1,6 +1,7 @@ #include "_translations.dm" #include "code/bodyparts.dm" +#include "code/design.dm" #include "code/moustache.dm" #include "code/pronouns.dm" #include "code/restaurant_customer.dm" diff --git a/modular_bandastation/translations/code/design.dm b/modular_bandastation/translations/code/design.dm new file mode 100644 index 0000000000000..8ebfc434d4ae9 --- /dev/null +++ b/modular_bandastation/translations/code/design.dm @@ -0,0 +1,19 @@ +/datum/design + var/use_declented_name = TRUE + +/datum/design/New() + . = ..() + if(!use_declented_name || !build_path) + return + var/atom/design_result = build_path + name = capitalize(design_result::ru_name_nominative) || name + +/datum/crafting_recipe + var/use_declented_name = TRUE + +/datum/crafting_recipe/New() + . = ..() + if(!use_declented_name || !result) + return + var/atom/crafting_result = result + name = capitalize(crafting_result::ru_name_nominative) || name diff --git a/modular_bandastation/translations/code/translate_suggest_ru_names.dm b/modular_bandastation/translations/code/translate_suggest_ru_names.dm index 467ff27911af6..e446fb3860901 100644 --- a/modular_bandastation/translations/code/translate_suggest_ru_names.dm +++ b/modular_bandastation/translations/code/translate_suggest_ru_names.dm @@ -21,7 +21,7 @@ if(!ru_name_suggest[declent]) to_chat(src, span_notice("Вы отменили предложение перевода.")) return TRUE - var/message = "suggests RU_NAMES_INIT_LIST(\"[atom_type::name]\", \"[ru_name_suggest[NOMINATIVE]]\", \"[ru_name_suggest[GENITIVE]]\", \"[ru_name_suggest[DATIVE]]\", \"[ru_name_suggest[ACCUSATIVE]]\", \"[ru_name_suggest[INSTRUMENTAL]]\", \"[ru_name_suggest[PREPOSITIONAL]]\") for [atom_type::type]" + var/message = "suggests RU_NAMES_LIST_INIT(\"[atom_type::name]\", \"[ru_name_suggest[NOMINATIVE]]\", \"[ru_name_suggest[GENITIVE]]\", \"[ru_name_suggest[DATIVE]]\", \"[ru_name_suggest[ACCUSATIVE]]\", \"[ru_name_suggest[INSTRUMENTAL]]\", \"[ru_name_suggest[PREPOSITIONAL]]\") for [atom_type::type]" var/log_text = "[key_name_and_tag(src)] [message]" logger.Log(LOG_CATEGORY_RU_NAMES_SUGGEST, log_text) to_chat(src, span_notice("Ваше предложение перевода успешно записано."))