From 5046ad74b465ee75dda842beb4a35aef2c2f43d6 Mon Sep 17 00:00:00 2001
From: Roudenn <romabond091@gmail.com>
Date: Sat, 22 Feb 2025 15:40:36 +0300
Subject: [PATCH] gotovo

---
 Content.Client/_DV/VendingMachines/UI/ShopVendorWindow.xaml  | 2 +-
 .../Locale/en-US/_Lavaland/pressure/markups_pressure.ftl     | 2 +-
 .../Locale/ru-RU/_Lavaland/pressure/markups_pressure.ftl     | 5 ++++-
 .../ru-RU/_Lavaland/prototypes/Entities/Clothing/kits.ftl    | 4 ++++
 .../Catalog/VendingMachines/Inventories/salvage_points.yml   | 4 ++--
 .../_Lavaland/Entities/Objects/Weapons/crushers.yml          | 3 ++-
 6 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 Resources/Locale/ru-RU/_Lavaland/prototypes/Entities/Clothing/kits.ftl

diff --git a/Content.Client/_DV/VendingMachines/UI/ShopVendorWindow.xaml b/Content.Client/_DV/VendingMachines/UI/ShopVendorWindow.xaml
index f3160234880..9fd9a8dccea 100644
--- a/Content.Client/_DV/VendingMachines/UI/ShopVendorWindow.xaml
+++ b/Content.Client/_DV/VendingMachines/UI/ShopVendorWindow.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
         MinHeight="310"
-        MinWidth="310">
+        MinWidth="460">
     <BoxContainer Name="MainContainer" Orientation="Vertical">
     	<BoxContainer Orientation="Horizontal">
     	    <LineEdit Name="SearchBar" PlaceHolder="{Loc 'vending-machine-component-search-filter'}" HorizontalExpand="True" Margin="4 4"/>
diff --git a/Resources/Locale/en-US/_Lavaland/pressure/markups_pressure.ftl b/Resources/Locale/en-US/_Lavaland/pressure/markups_pressure.ftl
index ffe3c509524..11c77a1476b 100644
--- a/Resources/Locale/en-US/_Lavaland/pressure/markups_pressure.ftl
+++ b/Resources/Locale/en-US/_Lavaland/pressure/markups_pressure.ftl
@@ -1,4 +1,4 @@
 lavaland-examine-pressure-in-range-buff = This piece of equipment reaches maximum capability between [color=yellow]{$min} - {$max} kPa[/color], allowing it to deal [color=yellow]{$modifier} times[/color] the damage!
 lavaland-examine-pressure-in-range-debuff = This piece of equipment is weakened between [color=yellow]{$min} - {$max} kPa[/color], causing it to deal [color=yellow]{$modifier} times[/color] the damage!
 lavaland-examine-pressure-out-range-buff = This piece of equipment performs better outside [color=yellow]{$min} - {$max} kPa[/color], allowing it to deal [color=yellow]{$modifier} times[/color] the damage!
-lavaland-examine-pressure-out-range-debuff = This piece of equipment is weakened outside [color=yellow]{$min} - {$max} kPa[/color], causing it to deal [color=yellow]{$modifier} times[/color] the damage!
\ No newline at end of file
+lavaland-examine-pressure-out-range-debuff = This piece of equipment is weakened outside [color=yellow]{$min} - {$max} kPa[/color], causing it to deal [color=yellow]{$modifier} times[/color] the damage!
diff --git a/Resources/Locale/ru-RU/_Lavaland/pressure/markups_pressure.ftl b/Resources/Locale/ru-RU/_Lavaland/pressure/markups_pressure.ftl
index 4b26328d7fa..269a075dd02 100644
--- a/Resources/Locale/ru-RU/_Lavaland/pressure/markups_pressure.ftl
+++ b/Resources/Locale/ru-RU/_Lavaland/pressure/markups_pressure.ftl
@@ -1 +1,4 @@
-lavaland-examine-pressure-buff = Это оружие достигает максимальной эффективности при давлении в [color=yellow]{$min} - {$max} кПа[/color], позволяя ему наносить в [color=yellow]{$buff} раза[/color] больше урона!
+lavaland-examine-pressure-in-range-buff = Это оружие достигает максимальной эффективности при давлении в [color=yellow]{$min} - {$max} кПа[/color], позволяя ему наносить в [color=yellow]{$modifier} раза[/color] больше урона!
+lavaland-examine-pressure-in-range-debuff = Это оружие теряет эффективность при давлении в [color=yellow]{$min} - {$max} кПа[/color], заставляя его наносить в [color=yellow]{$modifier} раза[/color] меньше урона!
+lavaland-examine-pressure-out-range-buff = Это оружие достигает максимальной эффективности при давлении не равному [color=yellow]{$min} - {$max} кПа[/color], позволяя ему наносить в [color=yellow]{$modifier} раза[/color] больше урона!
+lavaland-examine-pressure-out-range-debuff = Это оружие теряет эффективность при давлении не равному [color=yellow]{$min} - {$max} кПа[/color], заставляя его наносить в [color=yellow]{$modifier} раза[/color] меньше урона!
diff --git a/Resources/Locale/ru-RU/_Lavaland/prototypes/Entities/Clothing/kits.ftl b/Resources/Locale/ru-RU/_Lavaland/prototypes/Entities/Clothing/kits.ftl
new file mode 100644
index 00000000000..7cb31bddf48
--- /dev/null
+++ b/Resources/Locale/ru-RU/_Lavaland/prototypes/Entities/Clothing/kits.ftl
@@ -0,0 +1,4 @@
+ent-ClothingBackpackDuffelSalvageConscription = { ent-ClothingBackpackDuffelSalvage }
+    .desc = { ent-ClothingBackpackDuffelSalvage.desc }
+ent-MiningVoucher = шахтёрская карта
+    .desc = Специальный талон на получение любого базового утилизаторского набора из Утильмага.
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml
index ea89be8a2ca..ae94e603408 100644
--- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml
@@ -68,8 +68,8 @@
     cost: 1250
   - id: WeaponProtoKineticPistol
     cost: 1250
-  - id: ClothingBackpackDuffelSalvageConscription
-    cost: 1250
+  - id: ClothingShoesBootsMoon
+    cost: 1400
   - id: AdvancedMineralScanner
     cost: 1550
   - id: WeaponPlasmaCutter
diff --git a/Resources/Prototypes/_Lavaland/Entities/Objects/Weapons/crushers.yml b/Resources/Prototypes/_Lavaland/Entities/Objects/Weapons/crushers.yml
index 57b9f055778..1a9fe9400ef 100644
--- a/Resources/Prototypes/_Lavaland/Entities/Objects/Weapons/crushers.yml
+++ b/Resources/Prototypes/_Lavaland/Entities/Objects/Weapons/crushers.yml
@@ -114,7 +114,8 @@
     size: Ginormous
     sprite: _Lavaland/Objects/Weapons/Crushers/crusher_hammer-inhands.rsi
   - type: MeleeThrowOnHit
-    speed: 5
+    speed: 6
+    distance: 2.5
   #- type: FlipOnHit # TODO: портировать кувырки...
   - type: GunRequiresWield
   - type: Wieldable