diff --git a/Resources/Locale/ru-RU/_deadspace/prototypes/entities/clothing/underwear/socks.ftl b/Resources/Locale/ru-RU/_deadspace/prototypes/entities/clothing/underwear/socks.ftl index 76de86c3f15d6..6cae9fa13f708 100644 --- a/Resources/Locale/ru-RU/_deadspace/prototypes/entities/clothing/underwear/socks.ftl +++ b/Resources/Locale/ru-RU/_deadspace/prototypes/entities/clothing/underwear/socks.ftl @@ -12,6 +12,8 @@ ent-ClothingUnderwearSocksShort = короткие носки .desc = Короткие носки Nanotrasen для персонала станции. Покрашены в белый. ent-ClothingUnderwearSocksThigh = чулки .desc = Стандартные чулки Nanotrasen для персонала станции. Покрашены в белый. +ent-ClothingUnderwearStockingsBlack = чёрные чулки + .desc = Стандартные чулки Nanotrasen для персонала станции. Покрашены в чёрный. ent-ClothingUnderwearSocksQuartermaster = носки квартирмейстера .desc = Стандартные носки квартирмейстера. ent-ClothingUnderwearSocksCargoTech = носки грузчика diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index c5db2d79cb2ff..52a0328b196ad 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -83,6 +83,8 @@ ADTClothingFootWrapsHighBlack: 4 # ADT ClothingHeadHatGreysoft: 4 # DS14-value ClothingHeadHatMimesoft: 4 # DS14-value + ClothingUnderwearStockingsBlack: 4 # DS14 + ClothingUnderwearSocksThigh: 4 # DS14 ClothingHeadHatBluesoft: 2 ClothingHeadHatYellowsoft: 2 ClothingHeadHatGreensoft: 2 diff --git a/Resources/Prototypes/_Backmen/Catalog/VendingMachines/Clothing_catalog.yml b/Resources/Prototypes/_Backmen/Catalog/VendingMachines/Clothing_catalog.yml index 63f71fcad734b..80d7bf2940875 100644 --- a/Resources/Prototypes/_Backmen/Catalog/VendingMachines/Clothing_catalog.yml +++ b/Resources/Prototypes/_Backmen/Catalog/VendingMachines/Clothing_catalog.yml @@ -1788,6 +1788,28 @@ - !type:ListingLimitedStockCondition stock: 2 +- type: listing + id: ClothingShoesMachineInventory20 + productEntity: ClothingUnderwearStockingsBlack + cost: + SpaceCash: 70 + categories: + - ClothingShoesMachineInventory + conditions: + - !type:ListingLimitedStockCondition + stock: 4 + +- type: listing + id: ClothingShoesMachineInventory21 + productEntity: ClothingUnderwearSocksThigh + cost: + SpaceCash: 70 + categories: + - ClothingShoesMachineInventory + conditions: + - !type:ListingLimitedStockCondition + stock: 4 + # Neck - type: listing id: ClothingNeckMachineInventory1 diff --git a/Resources/Prototypes/_DeadSpace/Entities/Clothing/Underwear/socks.yml b/Resources/Prototypes/_DeadSpace/Entities/Clothing/Underwear/socks.yml index 4569bf23b9b84..58376367e8b3a 100644 --- a/Resources/Prototypes/_DeadSpace/Entities/Clothing/Underwear/socks.yml +++ b/Resources/Prototypes/_DeadSpace/Entities/Clothing/Underwear/socks.yml @@ -84,6 +84,15 @@ - type: Sprite sprite: _Sirena/Clothing/Underwear/Socks/socksthigh.rsi +- type: entity + parent: ClothingUnderwearSocksBase + id: ClothingUnderwearStockingsBlack + name: black stockings + description: Standard Nanotrasen stockings for station employees. Dyed black. + components: + - type: Sprite + sprite: Clothing/Under/Socks/stockingsblack.rsi + # DS14 socks ## Cargo - type: entity diff --git a/Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/equipped-SOCKS.png b/Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/equipped-SOCKS.png new file mode 100644 index 0000000000000..c6769f282e38c Binary files /dev/null and b/Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/equipped-SOCKS.png differ diff --git a/Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/icon.png b/Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/icon.png new file mode 100644 index 0000000000000..12fbe4f31eacd Binary files /dev/null and b/Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/meta.json b/Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/meta.json new file mode 100644 index 0000000000000..8091ef2809b99 --- /dev/null +++ b/Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by sastr. (discord) for Space Station 14 server Мёртвый Космос", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SOCKS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DeadSpace/Shaders/colored_circle_mask.swsl b/Resources/Textures/_DeadSpace/Shaders/colored_circle_mask.swsl index d777888d266d8..a7fc6456bc250 100644 --- a/Resources/Textures/_DeadSpace/Shaders/colored_circle_mask.swsl +++ b/Resources/Textures/_DeadSpace/Shaders/colored_circle_mask.swsl @@ -33,7 +33,7 @@ void fragment() highp vec4 blv = vec4(0.0, 0.0, 0.0, 1.0); - vec4 baseColor = mix(Color, blv, clamp(circle, 0.0, 1.0)); + highp vec4 baseColor = mix(Color, blv, clamp(circle, 0.0, 1.0)); COLOR = baseColor; }