Final fixes (finally)

Rxup · Feb 22, 2025 · c294f73 · c294f73
1 parent c2c2ed8
commit c294f73
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 20 deletions.
diff --git a/Content.Client/_DV/VendingMachines/UI/ShopVendorWindow.xaml b/Content.Client/_DV/VendingMachines/UI/ShopVendorWindow.xaml
@@ -2,7 +2,8 @@
         xmlns="https://spacestation14.io"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-        MinHeight="210">
+        MinHeight="310"
+        MinWidth="310">
     <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/ru-RU/_Lavaland/prototypes/Entities/Objects/Weapons/plasma_cutter.ftl b/Resources/Locale/ru-RU/_Lavaland/prototypes/Entities/Objects/Weapons/plasma_cutter.ftl
@@ -0,0 +1,2 @@
+ent-WeaponPlasmaCutter = плазменный резак
+    .desc = Продвинутое устройство для массовых раскопок, которое разогревает и разгоняет твёрдую плазму для разрушения камней.
diff --git a/Resources/Locale/ru-RU/_Lavaland/prototypes/Entities/Structures/vending.ftl b/Resources/Locale/ru-RU/_Lavaland/prototypes/Entities/Structures/vending.ftl
@@ -1,2 +1,2 @@
-ent-MiningDrobe = ШахтерШкаф
+ent-VendingMachineMiningDrobe = ШахтерШкаф
     .desc = Продвинутый автомат для выдачи шахтёрской одежды. Пожалуйста, не майните при помощи него Bitcoin.
diff --git a/Resources/Maps/_Lavaland/Lavaland/ruin_syndicate_base.yml b/Resources/Maps/_Lavaland/Lavaland/ruin_syndicate_base.yml
@@ -5803,13 +5803,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 27.5,-17.5
       parent: 2
-- proto: CardBoxBlack
-  entities:
-  - uid: 816
-    components:
-    - type: Transform
-      pos: 26.493616,1.5219853
-      parent: 2
 - proto: Catwalk
   entities:
   - uid: 817
@@ -6480,13 +6473,6 @@ entities:
       linearDamping: 0
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingOuterHardsuitSyndicateDurathread
-  entities:
-  - uid: 2267
-    components:
-    - type: Transform
-      pos: 5.4686418,-20.469305
-      parent: 2
 - proto: ClothingOuterStraightjacket
   entities:
   - uid: 199

diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml
@@ -6,8 +6,6 @@
     cost: 100
   - id: DrinkAbsintheBottleFull
     cost: 100
-  - id: LavalandEquipmentExplorerSuit
-    cost: 100
   - id: CigarGold
     cost: 150
   - id: Soap
@@ -43,6 +41,8 @@
     cost: 750
   - id: SurvivalMedipen
     cost: 800
+  - id: LavalandEquipmentExplorerSuit
+    cost: 850
   - id: Fulton
     cost: 1000
   - id: PKAUpgradeRange
@@ -53,8 +53,6 @@
     cost: 1100
   - id: PKAUpgradeDamage
     cost: 1200
-  - id: LavalandEquipmentExplorerSuit
-    cost: 1200
   # TODO: lazarus injector for 1k
   - id: LavalandWeaponKineticHammer
     cost: 1250
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-WeaponPlasmaCutter = плазменный резак
		.desc = Продвинутое устройство для массовых раскопок, которое разогревает и разгоняет твёрдую плазму для разрушения камней.