From cf8213e6ef91f430ae6dbc4d08b360dbe77b3304 Mon Sep 17 00:00:00 2001
From: Aviu00 <aviu00@protonmail.com>
Date: Fri, 26 Jan 2024 14:52:14 +0300
Subject: [PATCH] Fix stuff

---
 Resources/Locale/ru-RU/hands/hands-system.ftl |  5 +-
 .../Locale/ru-RU/lathe/ui/lathe-menu.ftl      |  6 +-
 .../storage/canisters/gas_canisters.ftl       |  3 +
 .../Inventories/clothesmate.yml               | 68 +++++++++++++++++++
 4 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/ru-RU/hands/hands-system.ftl b/Resources/Locale/ru-RU/hands/hands-system.ftl
index 575b728ea0..eea248cbb5 100644
--- a/Resources/Locale/ru-RU/hands/hands-system.ftl
+++ b/Resources/Locale/ru-RU/hands/hands-system.ftl
@@ -3,5 +3,8 @@
 hands-system-missing-equipment-slot = У вас нет { $slotName }, из которого можно что-то взять!
 hands-system-empty-equipment-slot = В вашем { $slotName } нет ничего, что можно было бы вынуть!
 # Examine text after when they're holding something (in-hand)
-comp-hands-examine = { CAPITALIZE(SUBJECT($user)) } удерживает { $item }.
+comp-hands-examine-empty = { CAPITALIZE(SUBJECT($user)) } ничего не удерживает.
+comp-hands-examine-wrapper = [color=paleturquoise]{$item}[/color]
+comp-hands-examine = { CAPITALIZE(SUBJECT($user)) } удерживает { $items }.
 hands-system-blocked-by = Руки заблокированы этим:
+
diff --git a/Resources/Locale/ru-RU/lathe/ui/lathe-menu.ftl b/Resources/Locale/ru-RU/lathe/ui/lathe-menu.ftl
index 14fc78be79..a9f3fb282c 100644
--- a/Resources/Locale/ru-RU/lathe/ui/lathe-menu.ftl
+++ b/Resources/Locale/ru-RU/lathe/ui/lathe-menu.ftl
@@ -5,5 +5,9 @@ lathe-menu-sync = Синхр.
 lathe-menu-search-designs = Поиск проектов
 lathe-menu-search-filter = Фильтр
 lathe-menu-amount = Кол-во:
-lathe-menu-material-display = { $material } { $amount } см³
+lathe-menu-material-display = { $material } ({ $amount })
 lathe-menu-no-materials-message = Материалы не загружены
+lathe-menu-material-amount = { $amount ->
+    [1] {NATURALFIXED($amount, 2)} {$unit}
+    *[other] {NATURALFIXED($amount, 2)} {$unit}
+}
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/canisters/gas_canisters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/canisters/gas_canisters.ftl
index 27436cc523..69fb7c2c03 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/canisters/gas_canisters.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/canisters/gas_canisters.ftl
@@ -97,6 +97,9 @@ ent-WaterVaporCanisterBroken = разбитая канистра водяног
 ent-MiasmaCanisterBroken = разбитая канистра миазм
     .desc = { ent-GasCanisterBrokenBase.desc }
     .suffix = { "" }
+ent-AmmoniaCanisterBroken = разбитая канистра аммиака
+    .desc = { ent-GasCanisterBrokenBase.desc }
+    .suffix = { "" }
 ent-NitrousOxideCanisterBroken = разбитая канистра оксида азота
     .desc = { ent-GasCanisterBrokenBase.desc }
     .suffix = { "" }
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index be5cfaeac4..ef6d8813a5 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -80,6 +80,74 @@
     ClothingHandsGlovesColorGreen: 2
     ClothingHandsGlovesColorOrange: 2
     ClothingHandsGlovesColorPurple: 2
+    #White bra start
+    ClothingUnderwearTopBraWhite: 5
+    ClothingUnderwearTopBraSports: 5
+    ClothingUnderwearTopBraSportsAlternative: 5
+    ClothingUnderwearTopBraBeeKini: 2
+    ClothingUnderwearTopBraBinder: 2
+    ClothingUnderwearTopBraBinderStrapless: 2
+    ClothingUnderwearTopBraKinky: 2
+    ClothingUnderwearTopBraNeko: 2
+    ClothingUnderwearTopBraStrapless: 2
+    ClothingUnderwearTopBraStraplessAlt: 2
+    ClothingUnderwearTopBraSwimming: 2
+    ClothingUnderwearTopBraSwimmingAlt: 2
+    ClothingUnderwearTopBraThin: 2
+    ClothingUnderwearTopFishnetBody: 1
+    ClothingUnderwearTopFishnetBodyGloves: 1
+    ClothingUnderwearTopFishnetBodySleeves: 1
+    ClothingUnderwearTopBraHalterneck: 3
+    ClothingUnderwearTopBraShibari: 1
+    ClothingUnderwearTopBraShibariSleeves: 1
+    ClothingUnderwearTopBraStriped: 1
+    ClothingUnderwearTopBraTubetop: 2
+    ClothingUnderwearTopCow: 1
+    #white end
+    #White panties start
+    ClothingUnderwearBottomBeeShorts: 2
+    ClothingUnderwearBottomBoxersHeart: 2
+    ClothingUnderwearBottomBoxersStriped: 2
+    ClothingUnderwearBottomBriefs: 2
+    ClothingUnderwearBottomFishnetLower: 1
+    ClothingUnderwearBottomJockstrap: 2
+    ClothingUnderwearBottomMankini: 2
+    ClothingUnderwearBottomPantiesBeeKini: 2
+    ClothingUnderwearBottomPantiesKinky: 1
+    ClothingUnderwearBottomPantiesNeko: 2
+    ClothingUnderwearBottomPantiesSlim: 2
+    ClothingUnderwearBottomPantiesSwimming: 2
+    ClothingUnderwearBottomPantiesThin: 1
+    ClothingUnderwearBottomPantiesStripped: 2
+    ClothingUnderwearBottomPantiesThong: 3
+    #white end
+    #white socks start
+    ClothingUnderwearSocksBeeKnee: 2
+    ClothingUnderwearSocksBeeNorm: 2
+    ClothingUnderwearSocksBeeThigh: 2
+    ClothingUnderwearSocksFishnet: 1
+    ClothingUnderwearSocksGarter: 1
+    ClothingUnderwearSocksPantyhose: 1
+    ClothingUnderwearSocksPantyhoseRipped: 1
+    ClothingUnderwearSocksRainbowKnee: 2
+    ClothingUnderwearSocksRainbowThigh: 2
+    ClothingUnderwearSocksHigh: 5
+    ClothingUnderwearSocksNormal: 5
+    ClothingUnderwearSocksShort: 5
+    ClothingUnderwearSocksThigh: 5
+    ClothingUnderwearStockingsBlue: 2
+    ClothingUnderwearStockingsCyan: 2
+    ClothingUnderwearStockingsPink: 2
+    ClothingUnderwearStockingsGreen: 2
+    ClothingUnderwearStockingsLightPink: 2
+    ClothingUnderwearStockingsLightOrange: 2
+    ClothingUnderwearStockingsLightPurple: 2
+    ClothingUnderwearStockingsLightYellow: 2
+    ClothingUnderwearSocksStripedKnee: 2
+    ClothingUnderwearSocksStripedThigh: 2
+    ClothingUnderwearSocksThinKnee: 1
+    ClothingUnderwearSocksThinThigh: 1
+    # white end
   contrabandInventory:
     ClothingUniformJumpsuitTacticool: 1
     ClothingUniformJumpskirtTacticool: 1