A slot and a small socks system. Including 31 new types of their colo…

…rs. (#241) Co-authored-by: AruMoon <[email protected]>
Workbench-Team · Sep 16, 2023 · d994b53 · d994b53
1 parent 558ca9c
commit d994b53
Show file tree

Hide file tree

Showing 356 changed files with 4,356 additions and 41 deletions.
diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -39,6 +39,7 @@ public sealed class ClientClothingSystem : ClothingSystem
         {"belt", "BELT"},
         {"gloves", "HAND"},
         {"shoes", "FEET"},
+        {"socks", "SOCKS"},
         {"id", "IDCARD"},
         {"pocket1", "POCKET1"},
         {"pocket2", "POCKET2"},

diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs
@@ -171,6 +171,7 @@ private float GetZombieInfectionChance(EntityUid uid, ZombieComponent component)
             var enumerator =
                 new InventorySystem.ContainerSlotEnumerator(uid, inventoryComponent.TemplateId, _protoManager, _inv,
                     SlotFlags.FEET |
+                    SlotFlags.SOCKS |
                     SlotFlags.HEAD |
                     SlotFlags.EYES |
                     SlotFlags.GLOVES |

diff --git a/Content.Shared/Inventory/SlotFlags.cs b/Content.Shared/Inventory/SlotFlags.cs
@@ -26,5 +26,6 @@ public enum SlotFlags
     LEGS = 1 << 13,
     FEET = 1 << 14,
     SUITSTORAGE = 1 << 15,
+    SOCKS = 1 << 16,
     All = ~NONE,
 }
diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs
@@ -17,6 +17,9 @@ public sealed class StartingGearPrototype : IPrototype
         [DataField("innerclothingskirt", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
         private string? _innerClothingSkirt;
 
+        [DataField("femaleSocks", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
+        private string? _femaleSocks;
+
         [DataField("satchel", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
         private string? _satchel;
 
@@ -40,6 +43,8 @@ public string GetGear(string slot, HumanoidCharacterProfile? profile)
             {
                 if (slot == "jumpsuit" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(_innerClothingSkirt))
                     return _innerClothingSkirt;
+                if (slot == "socks" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(_femaleSocks))
+                    return _femaleSocks;
                 if (slot == "back" && profile.Backpack == BackpackPreference.Satchel && !string.IsNullOrEmpty(_satchel))
                     return _satchel;
                 if (slot == "back" && profile.Backpack == BackpackPreference.Duffelbag && !string.IsNullOrEmpty(_duffelbag))

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/under/specific.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/under/specific.ftl
@@ -0,0 +1,3 @@
+ent-ClothingUnderSocksChameleonSocks = Розовые чулки
+    .desc = Пришло время кодить, сёстры!!11!
+    .suffix = { "Хамелеон" }
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
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -281,3 +281,4 @@
       - id: WeaponTechFabCircuitboard
       - id: HoloprojectorSecurity
       - id: BookSecretDocuments
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
@@ -13,3 +13,7 @@
     ClothingOuterSuitFire: 2
     ClothingOuterWinterAtmos: 2
     ClothingNeckScarfStripedLightBlue: 3
+    ClothingUnderSocksCyanStockings: 2
+    ClothingUnderSocksCyanKneeSocks: 2
+    ClothingUnderSocksCyanSocks: 2
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
@@ -15,4 +15,6 @@
     ClothingOuterVest: 2
     ClothingBeltBandolier: 2
     ClothingEyesGlassesSunglasses: 2
-
+    ClothingUnderSocksBlackStockings: 2
+    ClothingUnderSocksBlackKneeSocks: 2
+    ClothingUnderSocksBlackSocks: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
@@ -14,3 +14,7 @@
     ClothingOuterWinterCargo: 2
     ClothingOuterWinterMiner: 2
     ClothingNeckScarfStripedBrown: 3
+    ClothingUnderSocksWhiteStockings: 2
+    ClothingUnderSocksWhiteKneeSocks: 2
+    ClothingUnderSocksWhiteSocks: 2
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml
@@ -14,4 +14,7 @@
     ClothingHeadsetCentCom: 3
     ClothingOuterWinterCentcom: 3
     ClothingNeckScarfStripedCentcom: 3
+    ClothingUnderSocksCentCommStockings: 2
+    ClothingUnderSocksCentCommKneeSocks: 2
+    ClothingUnderSocksCentCommSocks: 2
 
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
@@ -10,3 +10,6 @@
     ClothingUniformJumpskirtChef:  2
     ClothingHeadHatChef: 2
     ClothingShoesColorBlack: 2
+    ClothingUnderSocksWhiteStockings: 2
+    ClothingUnderSocksWhiteKneeSocks: 2
+    ClothingUnderSocksWhiteSocks: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
@@ -13,3 +13,7 @@
     ClothingHandsGlovesLatex: 2
     ClothingHeadsetMedical: 2
     ClothingOuterWinterChem: 2
+    ClothingUnderSocksOrangeStockings: 2
+    ClothingUnderSocksOrangeKneeSocks: 2
+    ClothingUnderSocksOrangeSocks: 2
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -59,6 +59,19 @@
     ClothingHeadRastaHat: 2
     ClothingBeltStorageWaistbag: 3
     ClothingUniformJumpsuitCitizen: 3
+    ClothingUnderSocksWhiteStockings: 2
+    ClothingUnderSocksWhiteKneeSocks: 2
+    ClothingUnderSocksWhiteSocks: 2
+    ClothingUnderSocksBlackStockings: 2
+    ClothingUnderSocksBlackKneeSocks: 2
+    ClothingUnderSocksBlackSocks: 2
+    ClothingUnderSocksPantyhose: 1
+    ClothingUnderSocksThinStockings: 2
+    ClothingUnderSocksThinKneeSocks: 2
+    ClothingUnderSocksFishnetPantyhose: 1
+    ClothingUnderSocksFishnetStockings: 2
+    ClothingUnderSocksFishnetKneeSocks: 2
+
   contrabandInventory:
     ClothingUniformJumpsuitTacticool: 1
     ClothingUniformJumpskirtTacticool: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml
@@ -17,4 +17,5 @@
     SpoonPlastic: 10
     KnifePlastic: 10
     FoodPlatePlastic: 10
-    FoodPlateSmallPlastic: 10
+    FoodPlateSmallPlastic: 10
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
@@ -14,3 +14,7 @@
     ClothingHandsGlovesColorBlack: 2
     ClothingHandsGlovesLatex: 2
     ClothingHeadsetSecurity: 2
+    ClothingUnderSocksBlackStockings: 2
+    ClothingUnderSocksBlackKneeSocks: 2
+    ClothingUnderSocksBlackSocks: 2
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
@@ -15,3 +15,10 @@
     ClothingHeadsetEngineering: 3
     ClothingOuterWinterEngi: 2
     ClothingNeckScarfStripedOrange: 3
+    ClothingUnderSocksOrangeStockings: 2
+    ClothingUnderSocksOrangeKneeSocks: 2
+    ClothingUnderSocksOrangeSocks: 2
+    ClothingUnderSocksYellowStockings: 2
+    ClothingUnderSocksYellowKneeSocks: 2
+    ClothingUnderSocksYellowSocks: 2
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml
@@ -9,3 +9,7 @@
     ClothingBackpackGenetics: 2
     ClothingBackpackSatchelGenetics: 2
     ClothingBackpackDuffelGenetics: 2
+    ClothingUnderSocksCyanStockings: 2
+    ClothingUnderSocksCyanKneeSocks: 2
+    ClothingUnderSocksCyanSocks: 2
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
@@ -11,3 +11,7 @@
     ClothingHeadBandBotany: 3
     ClothingHeadsetService: 2
     ClothingOuterWinterHydro: 2
+    ClothingUnderSocksGreenStockings: 2
+    ClothingUnderSocksGreenKneeSocks: 2
+    ClothingUnderSocksGreenSocks: 2
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
@@ -9,7 +9,12 @@
     ClothingHeadsetService: 2
     ClothingOuterWinterJani: 2
     ClothingNeckScarfStripedPurple: 3
+    ClothingUnderSocksPurpleStockings: 2
+    ClothingUnderSocksPurpleKneeSocks: 2
+    ClothingUnderSocksPurpleSocks: 2
 
   emaggedInventory:
     ClothingUniformJumpskirtJanimaid: 2
     ClothingUniformJumpskirtJanimaidmini: 1
+    ClothingUnderSocksWhiteStockings: 3
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -14,5 +14,8 @@
     ClothingShoesBootsLaceup: 2
     ClothingHeadsetService: 2
     ClothingNeckLawyerbadge: 2
+    ClothingUnderSocksBlackStockings: 2
+    ClothingUnderSocksBlackKneeSocks: 2
+    ClothingUnderSocksBlackSocks: 2
   emaggedInventory:
     CyberPen: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
@@ -21,3 +21,10 @@
     UniformScrubsColorGreen: 4
     UniformScrubsColorBlue: 4
     UniformScrubsColorPurple: 4
+    ClothingUnderSocksCyanStockings: 2
+    ClothingUnderSocksCyanKneeSocks: 2
+    ClothingUnderSocksCyanSocks: 2
+    ClothingUnderSocksAzureStockings: 2
+    ClothingUnderSocksAzureKneeSocks: 2
+    ClothingUnderSocksAzureSocks: 2
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml
@@ -10,3 +10,7 @@
     ClothingHeadBandSkull: 2
     ClothingHeadsetRobotics: 2
     ClothingOuterWinterRobo: 2
+    ClothingUnderSocksBlackStockings: 2
+    ClothingUnderSocksBlackKneeSocks: 2
+    ClothingUnderSocksBlackSocks: 2
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
@@ -14,3 +14,10 @@
     ClothingMaskGas: 3
     ClothingOuterWinterSci: 2
     ClothingNeckScarfStripedPurple: 3
+    ClothingUnderSocksPurpleStockings: 2
+    ClothingUnderSocksPurpleKneeSocks: 2
+    ClothingUnderSocksPurpleSocks: 2
+    ClothingUnderSocksWhiteStockings: 2
+    ClothingUnderSocksWhiteKneeSocks: 2
+    ClothingUnderSocksWhiteSocks: 2
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -22,3 +22,9 @@
     ClothingEyesBlindfold: 1
     ClothingShoesBootsCombat: 1
     ClothingUniformHECU: 1
+    ClothingUnderSocksBlackStockings: 2
+    ClothingUnderSocksBlackKneeSocks: 2
+    ClothingUnderSocksBlackSocks: 2
+    ClothingUnderSocksRedStockings: 2
+    ClothingUnderSocksRedKneeSocks: 2
+    ClothingUnderSocksRedSocks: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml
@@ -14,9 +14,17 @@
     ClothingUniformJumpskirtOperative: 5
     ClothingNeckScarfStripedSyndieGreen: 2
     ClothingNeckScarfStripedSyndieRed: 2
+    ClothingUnderSocksGreenSyndieStockings: 2
+    ClothingUnderSocksGreenSyndieKneeSocks: 2
+    ClothingUnderSocksGreenSyndieSocks: 2
+    ClothingUnderSocksRedSyndieStockings: 2
+    ClothingUnderSocksRedSyndieKneeSocks: 2
+    ClothingUnderSocksRedSyndieSocks: 2
   emaggedInventory:
     ClothingOuterCoatSyndieCapArmored: 1
     ClothingOuterWinterSyndieCapArmored: 1
     ClothingHeadHatTacticalMaidHeadband: 5
     ClothingUniformJumpskirtTacticalMaid: 5
     ClothingHandsTacticalMaidGloves: 5 
+    ClothingUnderSocksWhiteStockings: 4
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -42,6 +42,30 @@
     ClothingUniformJumpsuitKimono: 1
     ClothingHeadHatCasa: 1
     ClothingHeadHatHairflower: 1
+    ClothingUnderSocksMonochromeStockings: 1
+    ClothingUnderSocksMonochromeKneeSocks: 1
+    ClothingUnderSocksMonochromeSocks: 1
+    ClothingUnderSocksRedStockings: 1
+    ClothingUnderSocksRedKneeSocks: 1
+    ClothingUnderSocksRedSocks: 1
+    ClothingUnderSocksPatriotStockings: 1
+    ClothingUnderSocksPatriotKneeSocks: 1
+    ClothingUnderSocksPatriotSocks: 1
+    ClothingUnderSocksBee: 1
+    ClothingUnderSocksBeeKneeSocks: 1
+    ClothingUnderSocksBeeSocks: 1
+    ClothingUnderSocksCreepyStockings: 1
+    ClothingUnderSocksCreepyKneeSocks: 1
+    ClothingUnderSocksFurrStockings: 1
+    ClothingUnderSocksFurrKneeSocks: 1
+    ClothingUnderSocksFurrSocks: 1
+    ClothingUnderSocksRainbowStockings: 1
+    ClothingUnderSocksRainbowKneeSocks: 1
+    ClothingUnderSocksAceStockings: 1
+    ClothingUnderSocksAceKneeSocks: 1
+    ClothingUnderSocksAceSocks: 1 
+    ClothingUnderSocksVampireStockings: 1
+    ClothingUnderSocksVampireKneeSocks: 1
   emaggedInventory:
     ClothingShoesBling: 1
     ClothingOuterDogi: 1

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml
@@ -8,4 +8,5 @@
     PowerCellSmallPrinted: 3
     MatterBinStockPart: 4
     CapacitorStockPart: 4
-    MicroManipulatorStockPart: 4
+    MicroManipulatorStockPart: 4
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml
@@ -10,3 +10,7 @@
     ClothingBackpackVirology: 2
     ClothingBackpackSatchelVirology: 2
     ClothingBackpackDuffelVirology: 2
+    ClothingUnderSocksGreenStockings: 2
+    ClothingUnderSocksGreenKneeSocks: 2
+    ClothingUnderSocksGreenSocks: 2
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
@@ -13,8 +13,50 @@
     ClothingOuterCoatBomber: 3
     ClothingHeadHatSantahat: 2
     ClothingHeadHatXmasCrown: 2
+    ClothingUnderSocksHolydayStockings: 4
+    ClothingUnderSocksHolydayKneeSocks: 2
+    ClothingUnderSocksRedStockings: 2
+    ClothingUnderSocksRedKneeSocks: 2
+    ClothingUnderSocksRedSocks: 2
+    ClothingUnderSocksOrangeStockings: 2
+    ClothingUnderSocksOrangeKneeSocks: 2
+    ClothingUnderSocksOrangeSocks: 2
+    ClothingUnderSocksYellowStockings: 2
+    ClothingUnderSocksYellowKneeSocks: 2
+    ClothingUnderSocksYellowSocks: 2
+    ClothingUnderSocksGreenStockings: 2
+    ClothingUnderSocksGreenKneeSocks: 2
+    ClothingUnderSocksGreenSocks: 2
+    ClothingUnderSocksCyanStockings: 2
+    ClothingUnderSocksCyanKneeSocks: 2
+    ClothingUnderSocksCyanSocks: 2
+    ClothingUnderSocksBlueStockings: 2
+    ClothingUnderSocksBlueKneeSocks: 2
+    ClothingUnderSocksBlueSocks: 2
+    ClothingUnderSocksAzureStockings: 2
+    ClothingUnderSocksAzureKneeSocks: 2
+    ClothingUnderSocksAzureSocks: 2
+    ClothingUnderSocksPurpleStockings: 2
+    ClothingUnderSocksPurpleKneeSocks: 2
+    ClothingUnderSocksPurpleSocks: 2
+    ClothingUnderSocksHotpinkStockings: 2
+    ClothingUnderSocksHotpinkKneeSocks: 2
+    ClothingUnderSocksHotpinkSocks: 2
+    ClothingUnderSocksCoder: 2
+    ClothingUnderSocksPinkKneeSocks: 2
+    ClothingUnderSocksPinkSocks: 2
+    ClothingUnderSocksGreyStockings: 2
+    ClothingUnderSocksGreyKneeSocks: 2
+    ClothingUnderSocksGreySocks: 2
 
   emaggedInventory:
     ClothingNeckScarfStripedSyndieGreen: 3
     ClothingNeckScarfStripedSyndieRed: 3
     ClothingNeckScarfStripedCentcom: 3
+    ClothingUnderSocksGreenSyndieStockings: 1
+    ClothingUnderSocksGreenSyndieKneeSocks: 1
+    ClothingUnderSocksGreenSyndieSocks: 1
+    ClothingUnderSocksRedSyndieStockings: 1
+    ClothingUnderSocksRedSyndieKneeSocks: 1
+    ClothingUnderSocksRedSyndieSocks: 1
+