Merge branch 'translation-fix' into translation-fix-fix

ss220club · Jan 10, 2025 · e6492a6 · e6492a6
2 parents 7f4cd26 + f67a4a9
commit e6492a6
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm b/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm
@@ -23,10 +23,10 @@
 /datum/ai_behavior/vendor_crush/proc/tiltonmob(datum/ai_controller/controller, turf/target_turf)
 	var/obj/machinery/vending/vendor_pawn = controller.pawn
 	if(vendor_pawn.tilt(target_turf, 0) & SUCCESSFULLY_CRUSHED_MOB) //We hit something
-		vendor_pawn.say(pick("Supersize this!", "Eat my shiny metal ass!", "Want to consume some of my products?", "SMASH!", "Don't you love these smashing prices!"))
+		vendor_pawn.say(pick("Как тебе размерчик?!", "Поцелуй мой блестящий металлический зад!", "Хочешь попробовать мои товары?", "В ЛЕПЕШКУ!", "Разве вам не нравятся эти сногсшибательные цены?!"))
 		controller.set_blackboard_key(BB_VENDING_LAST_HIT_SUCCESSFUL, TRUE)
 	else
-		vendor_pawn.say(pick("Get back here!", "Don't you want my well priced love?"))
+		vendor_pawn.say(pick("А ну вернись!", "Разве тебе не хочется моей хорошо оцененной любви?"))
 		controller.set_blackboard_key(BB_VENDING_LAST_HIT_SUCCESSFUL, FALSE)
 	finish_action(controller, TRUE)
 

diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm
@@ -36,7 +36,7 @@
 
 /obj/structure/ladder/examine(mob/user)
 	. = ..()
-	. += span_info("[EXAMINE_HINT("Left-click")] it to start moving up; [EXAMINE_HINT("Right-click")] to start moving down.")
+	. += span_info("[EXAMINE_HINT("ЛКМ")] для подъема наверх; [EXAMINE_HINT("ПКМ")] для спуска вниз.")
 
 /obj/structure/ladder/Destroy(force)
 	GLOB.ladders -= src

diff --git a/code/modules/antagonists/heretic/magic/mansus_grasp.dm b/code/modules/antagonists/heretic/magic/mansus_grasp.dm
@@ -107,7 +107,7 @@
 	remove_hand_with_no_refund(user)
 
 /obj/item/melee/touch_attack/mansus_fist/ignition_effect(atom/to_light, mob/user)
-	. = span_rose("[user] effortlessly snaps [user.p_their()] fingers near [to_light], igniting it with eldritch energies. Fucking badass!")
+	. = span_rose("[capitalize(user.declent_ru(NOMINATIVE))] без труда щелкает своими пальцами возле [to_light.declent_ru(GENITIVE)], зажигая мистической энергией. Чертовски круто!")
 	remove_hand_with_no_refund(user)
 
 /obj/item/melee/touch_attack/mansus_fist/suicide_act(mob/living/user)

diff --git a/code/modules/antagonists/heretic/magic/star_touch.dm b/code/modules/antagonists/heretic/magic/star_touch.dm
@@ -92,7 +92,7 @@
 	remove_hand_with_no_refund(user)
 
 /obj/item/melee/touch_attack/star_touch/ignition_effect(atom/to_light, mob/user)
-	. = span_rose("[user] effortlessly snaps [user.p_their()] fingers near [to_light], igniting it with cosmic energies. Fucking badass!")
+	. = span_rose("[capitalize(user.declent_ru(NOMINATIVE))] без труда щелкает своими пальцами возле [to_light.declent_ru(GENITIVE)], зажигая мистической энергией. Чертовски круто!")
 	remove_hand_with_no_refund(user)
 
 /obj/item/melee/touch_attack/star_touch/attack_self(mob/living/user)

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
@@ -415,7 +415,7 @@
 	if(chambered?.loaded_projectile)
 		if(HAS_TRAIT(user, TRAIT_PACIFISM)) // If the user has the pacifist trait, then they won't be able to fire [src] if the round chambered inside of [src] is lethal.
 			if(chambered.harmful) // Is the bullet chambered harmful?
-				to_chat(user, span_warning("[src] is lethally chambered! You don't want to risk harming anyone..."))
+				to_chat(user, span_warning("Летальный снаряд заряжен в [declent_ru(PREPOSITIONAL)]! Вы не хотите рисковать причинить кому-то вред..."))
 				firing_burst = FALSE
 				return FALSE
 		var/sprd

diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
@@ -574,7 +574,7 @@
 /obj/item/gun/ballistic/examine(mob/user)
 	. = ..()
 	var/count_chambered = !(bolt_type == BOLT_TYPE_NO_BOLT || bolt_type == BOLT_TYPE_OPEN)
-	. += "It has <b>[get_ammo(count_chambered)]</b> round\s remaining."
+	. += "Внутри имеется <b>[get_ammo(count_chambered)]</b> патрон[declension_ru(get_ammo(count_chambered), "", "а", "ов")]."
 
 	if (!chambered && !hidden_chambered)
 		. += "Похоже, что нет заряженного патрона."

diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
@@ -336,7 +336,7 @@
 			playsound(user, E.fire_sound, 50, TRUE)
 			playsound(user, loaded_projectile.hitsound, 50, TRUE)
 			cell.use(E.e_cost)
-			. = span_rose("[user] casually lights [A.loc == user ? "[user.p_their()] [A.name]" : A] with [src]. Damn.")
+			. = span_rose("[capitalize(user.declent_ru(NOMINATIVE))] непринужденно зажигает [A.declent_ru(ACCUSATIVE)][A.loc == user ? " у себя" : ""] с помощью [declent_ru(GENITIVE)]. Емае.")
 
 /obj/item/gun/energy/proc/instant_recharge()
 	SIGNAL_HANDLER

diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
@@ -464,8 +464,8 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
 */
 /obj/machinery/vending/proc/build_inventories(start_empty)
 	build_inventory(products, product_records, product_categories, start_empty)
-	build_inventory(contraband, hidden_records, create_categories_from("Contraband", "mask", contraband), start_empty, premium = TRUE)
-	build_inventory(premium, coin_records, create_categories_from("Premium", "coins", premium), start_empty, premium = TRUE)
+	build_inventory(contraband, hidden_records, create_categories_from("Контрабанда", "mask", contraband), start_empty, premium = TRUE)
+	build_inventory(premium, coin_records, create_categories_from("Премиум", "coins", premium), start_empty, premium = TRUE)
 
 /**
  * Returns a list of data about the category