Merge branch 'master-banda' into material-names

ss220club · Oct 16, 2024 · 88cfbc8 · 88cfbc8
2 parents 5ba92bd + 9539ea8
commit 88cfbc8
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 2 deletions.
diff --git a/code/datums/components/tactical.dm b/code/datums/components/tactical.dm
@@ -79,8 +79,8 @@
 		identity[VISIBLE_NAME_FORCED] = tactical_disguise_power
 
 	var/obj/item/flawless_disguise = parent
-	identity[VISIBLE_NAME_FACE] = flawless_disguise.name
-	identity[VISIBLE_NAME_ID] = flawless_disguise.name // for Unknown (as 'potted plant') says
+	identity[VISIBLE_NAME_FACE] = flawless_disguise.declent_ru(NOMINATIVE) // BANDASTATION EDIT - Declent
+	identity[VISIBLE_NAME_ID] = flawless_disguise.declent_ru(NOMINATIVE) // for Unknown (as 'potted plant') says // BANDASTATION EDIT - Declent
 
 
 /datum/component/tactical/proc/unmodify(obj/item/source, mob/user)

diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
@@ -1,5 +1,6 @@
 /obj/machinery/recharge_station
 	name = "recharging station"
+	RU_NAMES_LIST_INIT("recharging station", "зарядная станция", "зарядной станции", "зарядной станции", "зарядную станцию", "зарядной станцией", "зарядной станции")
 	desc = "This device recharges energy dependent lifeforms, like cyborgs, ethereals and MODsuit users."
 	icon = 'icons/obj/machines/borg_charger.dmi'
 	icon_state = "borgcharger0"

diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
@@ -4,6 +4,7 @@
 
 /obj/item/defibrillator
 	name = "defibrillator"
+	RU_NAMES_LIST_INIT("defibrillator", "дефибриллятор", "дефибриллятора", "дефибриллятору", "дефибриллятор", "дефибриллятором", "дефибрилляторе")
 	desc = "A device that delivers powerful shocks to detachable paddles that resuscitate incapacitated patients. \
 	Has a rear bracket for attachments to wall mounts and medical cyborgs."
 	icon = 'icons/obj/medical/defib.dmi'

diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
@@ -1,5 +1,6 @@
 /obj/item/chameleon
 	name = "chameleon projector"
+	RU_NAMES_LIST_INIT("chameleon projector", "маскировочный проектор", "маскировочного проектора", "маскировочному проектору", "маскировочный проектор", "маскировочным проектором", "маскировочном проекторе")
 	icon = 'icons/obj/devices/syndie_gadget.dmi'
 	icon_state = "shield0"
 	obj_flags = CONDUCTS_ELECTRICITY

diff --git a/code/game/objects/items/devices/scanners/gas_analyzer.dm b/code/game/objects/items/devices/scanners/gas_analyzer.dm
@@ -1,6 +1,7 @@
 /obj/item/analyzer
 	desc = "A hand-held environmental scanner which reports current gas levels."
 	name = "gas analyzer"
+	RU_NAMES_LIST_INIT("gas analyzer", "газоанализатор", "газоанализатора", "газоанализатору", "газоанализатор", "газоанализатором", "газоанализаторе")
 	custom_price = PAYCHECK_LOWER * 0.9
 	icon = 'icons/obj/devices/scanner.dmi'
 	icon_state = "analyzer"

diff --git a/code/game/objects/items/kirby_plants/kirbyplants.dm b/code/game/objects/items/kirby_plants/kirbyplants.dm
@@ -1,5 +1,6 @@
 /obj/item/kirbyplants
 	name = "potted plant"
+	RU_NAMES_LIST_INIT("potted plant", "комнатное растение", "комнатного растения", "комнатному растению", "комнатное растение", "комнатным растением", "комнатном растении")
 	icon = 'icons/obj/fluff/flora/plants.dmi'
 	icon_state = "plant-01"
 	base_icon_state = "plant-01"
@@ -113,6 +114,7 @@
 
 /obj/item/kirbyplants/random/fullysynthetic
 	name = "plastic potted plant"
+	RU_NAMES_LIST_INIT("plastic potted plant", "пластиковое растение", "пластикового растения", "пластиковому растению", "пластиковое растение", "пластиковым растением", "пластиковом растении")
 	desc = "A fake, cheap looking, plastic tree. Perfect for people who kill every plant they touch."
 	icon_state = "plant-26"
 	custom_materials = (list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 4))

diff --git a/code/game/objects/items/kirby_plants/synthetic_plants.dm b/code/game/objects/items/kirby_plants/synthetic_plants.dm
@@ -1,5 +1,6 @@
 /obj/item/kirbyplants/synthetic
 	name = "plastic potted plant"
+	RU_NAMES_LIST_INIT("plastic potted plant", "пластиковое растение", "пластикового растения", "пластиковому растению", "пластиковое растение", "пластиковым растением", "пластиковом растении")
 	desc = "A fake, cheap looking, plastic tree. Perfect for people who kill every plant they touch."
 	custom_materials = (list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 4))
 	trimmable = FALSE

diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
@@ -637,6 +637,7 @@
 
 /obj/structure/flora/bush
 	name = "bush"
+	RU_NAMES_LIST_INIT("bush", "куст", "куста", "кусту", "куст", "кустом", "кусте")
 	desc = "Some type of shrubbery. Known for causing considerable economic stress on designers."
 	icon = 'icons/obj/fluff/flora/ausflora.dmi'
 	icon_state = "firstbush_1"

diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm
@@ -116,6 +116,7 @@
 ///A wearable tool that lets you empty plumbing machinery and some other stuff
 /obj/item/plunger
 	name = "plunger"
+	RU_NAMES_LIST_INIT("plunger", "вантуз", "вантуза", "вантузу", "вантуз", "вантузом", "вантузе")
 	desc = "It's a plunger for plunging."
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "plunger"
@@ -177,6 +178,7 @@
 ///A faster reinforced plunger
 /obj/item/plunger/reinforced
 	name = "reinforced plunger"
+	RU_NAMES_LIST_INIT("reinforced plunger", "усиленный вантуз", "усиленного вантуза", "усиленному вантузу", "усиленный вантуз", "усиленным вантузом", "усиленном вантузе")
 	desc = "It's an M. 7 Reinforced Plunger© for heavy duty plunging."
 	icon_state = "reinforced_plunger"
 	worn_icon_state = "reinforced_plunger"

diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
@@ -622,6 +622,7 @@
  */
 /obj/structure/table/reinforced
 	name = "reinforced table"
+	RU_NAMES_LIST_INIT("reinforced table", "укреплённый стол", "укреплённого стола", "укреплённому столу", "укреплённый стол", "укреплённым столом", "укреплённом столе")
 	desc = "A reinforced version of the four legged table."
 	icon = 'icons/obj/smooth_structures/reinforced_table.dmi'
 	icon_state = "reinforced_table-0"
@@ -778,6 +779,7 @@
 
 /obj/structure/table/optable
 	name = "operating table"
+	RU_NAMES_LIST_INIT("operating table", "операционный стол", "операционного стола", "операционному столу", "операционный стол", "операционным столом", "операционном столе")
 	desc = "Used for advanced medical procedures."
 	icon = 'icons/obj/medical/surgery_table.dmi'
 	icon_state = "surgery_table"

diff --git a/code/game/objects/structures/water_structures/sink.dm b/code/game/objects/structures/water_structures/sink.dm
@@ -1,5 +1,6 @@
 /obj/structure/sink
 	name = "sink"
+	RU_NAMES_LIST_INIT("sink", "раковина", "раковины", "раковине", "раковину", "раковиной", "раковине")
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "sink"
 	desc = "A sink used for washing one's hands and face. Passively reclaims water over time."
@@ -244,6 +245,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
 
 /obj/structure/sink/kitchen
 	name = "kitchen sink"
+	RU_NAMES_LIST_INIT("kitchen sink", "кухонная раковина", "кухонной раковины", "кухонной раковине", "кухонную раковину", "кухонной раковиной", "кухонной раковине")
 	icon_state = "sink_alt"
 	pixel_z = 4
 	pixel_shift = 16
@@ -264,6 +266,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink/kitchen, (-16))
 
 /obj/structure/sinkframe
 	name = "sink frame"
+	RU_NAMES_LIST_INIT("sink frame", "каркас раковины", "каркаса раковины", "каркасу раковины", "каркас раковины", "каркасом раковины", "каркасе раковины")
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "sink_frame"
 	desc = "A sink frame, that needs a water recycler to finish construction."

diff --git a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm
@@ -3,6 +3,7 @@
 
 /obj/item/borg_chameleon
 	name = "cyborg chameleon projector"
+	RU_NAMES_LIST_INIT("cyborg chameleon projector", "маскировочный проектор киборга", "маскировочного проектора киборга", "маскировочному проектору киборга", "маскировочный проектор киборга", "маскировочным проектором киборга", "маскировочном проекторе киборга")
 	icon = 'icons/obj/devices/syndie_gadget.dmi'
 	icon_state = "shield0"
 	obj_flags = CONDUCTS_ELECTRICITY

diff --git a/code/modules/mob/living/basic/pets/dog/corgi.dm b/code/modules/mob/living/basic/pets/dog/corgi.dm
@@ -330,6 +330,7 @@
 //IAN! SQUEEEEEEEEE~
 /mob/living/basic/pet/dog/corgi/ian
 	name = "Ian"
+	RU_NAMES_LIST_INIT("Ian", "Иан", "Иана", "Иану", "Иана", "Ианом", "Иане")
 	real_name = "Ian" //Intended to hold the name without altering it.
 	gender = MALE
 	desc = "He's the HoP's beloved corgi."

diff --git a/code/modules/pai/card.dm b/code/modules/pai/card.dm
@@ -6,6 +6,7 @@
 	inhand_icon_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
 	name = "personal AI device"
+	RU_NAMES_LIST_INIT("personal AI device", "устройство ПИИ", "устройства ПИИ", "устройству ПИИ", "устройство ПИИ", "устройством ПИИ", "устройстве ПИИ")
 	resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE
 	righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
 	slot_flags = ITEM_SLOT_BELT

diff --git a/code/modules/projectiles/guns/special/syringe_gun.dm b/code/modules/projectiles/guns/special/syringe_gun.dm
@@ -1,5 +1,6 @@
 /obj/item/gun/syringe
 	name = "medical syringe gun"
+	RU_NAMES_LIST_INIT("medical syringe gun", "медицинский шприцемёт", "медицинского шприцимёта", "медицинскому шприцемёту", "медицинский шприцемёт", "медицинским шприцемётом", "медицинском шприцемёте")
 	desc = "A spring loaded gun designed to fit syringes, used to incapacitate unruly patients from a distance."
 	icon = 'icons/obj/weapons/guns/syringegun.dmi'
 	icon_state = "medicalsyringegun"