From 2759662f3b630d634e3e1f865e613a7754a8c42c Mon Sep 17 00:00:00 2001
From: Tamioki <fazer1blade2@gmail.com>
Date: Tue, 12 Sep 2023 16:08:35 +0300
Subject: [PATCH] Socks

---
 .../ss14-ru/prototypes/entities/clothing/under/under.ftl      | 4 ++--
 .../Catalog/VendingMachines/Inventories/theater.yml           | 2 +-
 .../Catalog/VendingMachines/Inventories/winterdrobe.yml       | 2 +-
 Resources/Prototypes/Entities/Clothing/Socks/socks.yml        | 4 ++--
 Resources/migration.yml                                       | 4 ----
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/under/under.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/under/under.ftl
index e05918a67cff0a..2aaeabec7a78f6 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/under/under.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/under/under.ftl
@@ -1,4 +1,4 @@
-ent-ClothingUnderSocksBeeStockings = Чулки с пчёлками
+ent-ClothingUnderSocksBee = Чулки с пчёлками
     .desc = Тёплые и приятные, медовых оттенков чулки с патерном сот и пчёлками. Заставь их гудеть длинее! Бззз!
     .suffix = { "" }
 ent-ClothingUnderSocksBeeKneeSocks = Гольфы с пчёлками
@@ -10,7 +10,7 @@ ent-ClothingUnderSocksBeeSocks = Носки с пчёлками
 ent-ClothingUnderSocksPinkKillerStockings = Убийственные носки
     .desc = Приятные на ощупь носки. Что если ударить?
     .suffix = { "" }
-ent-ClothingUnderSocksPinkStockings = Розовые чулки
+ent-ClothingUnderSocksCoder = Розовые чулки
     .desc = Длинные розовые чулки в белую полоску, приятно греющие ножки. Пришло время кодить, сёстры!!11!
     .suffix = { "" }
 ent-ClothingUnderSocksPinkKneeSocks = Розовые гольфы
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index d0ef272b937f20..199c48f15f999e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -51,7 +51,7 @@
     ClothingUnderSocksPatriotStockings: 1
     ClothingUnderSocksPatriotKneeSocks: 1
     ClothingUnderSocksPatriotSocks: 1
-    ClothingUnderSocksBeeStockings: 1
+    ClothingUnderSocksBee: 1
     ClothingUnderSocksBeeKneeSocks: 1
     ClothingUnderSocksBeeSocks: 1
     ClothingUnderSocksCreepyStockings: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
index 84f64195ed5bfb..665e8f60ac05c9 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
@@ -42,7 +42,7 @@
     ClothingUnderSocksHotpinkStockings: 2
     ClothingUnderSocksHotpinkKneeSocks: 2
     ClothingUnderSocksHotpinkSocks: 2
-    ClothingUnderSocksPinkStockings: 2
+    ClothingUnderSocksCoder: 2
     ClothingUnderSocksPinkKneeSocks: 2
     ClothingUnderSocksPinkSocks: 2
     ClothingUnderSocksGreyStockings: 2
diff --git a/Resources/Prototypes/Entities/Clothing/Socks/socks.yml b/Resources/Prototypes/Entities/Clothing/Socks/socks.yml
index b11271bcdc673f..36deefdbb14a33 100644
--- a/Resources/Prototypes/Entities/Clothing/Socks/socks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Socks/socks.yml
@@ -1,6 +1,6 @@
 - type: entity
   parent: ClothingSocksBase
-  id: ClothingUnderSocksBeeStockings
+  id: ClothingUnderSocksBee
   name: Bee stockings
   description: Make them loins buzz longer!
   components:
@@ -87,7 +87,7 @@
 
 - type: entity
   parent: ClothingSocksBase
-  id: ClothingUnderSocksPinkStockings
+  id: ClothingUnderSocksCoder
   name: Pink stockings
   description: It's time to code sisters!!11!
   components:
diff --git a/Resources/migration.yml b/Resources/migration.yml
index fa237a6b498c10..cb542c6620b425 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -90,7 +90,3 @@ GeneratorUraniumMachineCircuitboard: PortableGeneratorSuperPacmanMachineCircuitb
 
 # 07-09-2023 Starshine
 PlushieMoff: PlushieMoth
-
-# 11-09-2023 Starshine
-ClothingUnderSocksPinkStockings: ClothingUnderSocksCoder
-ClothingUnderSocksBeeStockings: ClothingUnderSocksBee
\ No newline at end of file