From 02c1273ae3f0e6e2242558ab0c4464295d0d8f4e Mon Sep 17 00:00:00 2001 From: Yosif Date: Mon, 9 Mar 2026 17:59:27 +0200 Subject: [PATCH 1/2] omegacringe --- .../entities/clothing/underwear/socks.ftl | 2 ++ .../Inventories/clothesmate.yml | 2 ++ .../VendingMachines/Clothing_catalog.yml | 22 ++++++++++++++++++ .../Entities/Clothing/Underwear/socks.yml | 9 +++++++ .../stockingsblack.rsi/equipped-SOCKS.png | Bin 0 -> 519 bytes .../Under/Socks/stockingsblack.rsi/icon.png | Bin 0 -> 246 bytes .../Under/Socks/stockingsblack.rsi/meta.json | 20 ++++++++++++++++ .../Shaders/colored_circle_mask.swsl | 2 +- 8 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/equipped-SOCKS.png create mode 100644 Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/meta.json 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 0000000000000000000000000000000000000000..c6769f282e38c339d57ee5b0f372a011deb0cd98 GIT binary patch literal 519 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z_j|fHhE&A8 zjoP@X)qrQ~?B=GX)&Kt|u4`)I%d=DZqO>&W^6Y!=CknS@PMSAI#rcuesp zW^(@4VK`Q3^Lp35d*w3jroNMbqO1;_zZn{Y*9r;#$p4+-;K!oz|FDwB)`Qns`~3RW zq%T~#77~GKj?PbBd=c}!kzEGK|a`1vhY|Qnox3-<# znp<5KTYmGiY}4x_vp0YL_B=KD+h0j_4o`*)%E^9J4D-(2lbco*cd1T@VP#*|6lMmg z#cD5&B@{ZBxy2?l99!Y}i-*l)(aJz^i3NsPlkA!qCuL+^VP(tcnYHA6LW9aIsnSM9 z3@vkxHvBedne)+^%k%iXlGejQ=M0{#v*u=)b#daPg761tGf#dl2=d*P8Q+-QT-(UQ zz+iBog6od^( t1I?l>#uJ3EUa|Jy%~WE4{G0q8>$U*1e_oe?@yg)o>gTe~DWQph0RZQ!+NA&h literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..12fbe4f31eacd3de64679547c00241fca352e38b GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>pfi@Ln7SY zPT9!CtjN=L_Su334_^JYpRszug67$(PF5oPMee5yRsAMqeER&;J-}Rl$Iksij7|<5 z9F6IMAMW`lpZR4|{eIOHrrkGY-v27nDDn78)cRk^JX3?3VtrWt*fZAr_ZMDdenQ+{ z(IIcSn>&-nInjf&m~!NtDt618Zw6>1?eq{8EX&30iDj^>FVdQ&MBdZ0RV7`Tx9?N literal 0 HcmV?d00001 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..681a84b6b8896 --- /dev/null +++ b/Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by sastr. (discord) for Space Station 14 server Мёртвый Космос", + "license": "CC-BY-SA-4.0", + "copyright": "Made by pyfya (discord), recolored by andrew_fenriz (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; } From 2b146930872eeb659dbd6141108916e409fc7441 Mon Sep 17 00:00:00 2001 From: Yosif Date: Mon, 9 Mar 2026 18:23:58 +0200 Subject: [PATCH 2/2] remove license fenriz kakashka plohoi Upstream bug --- .../Textures/Clothing/Under/Socks/stockingsblack.rsi/meta.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/meta.json b/Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/meta.json index 681a84b6b8896..8091ef2809b99 100644 --- a/Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/meta.json +++ b/Resources/Textures/Clothing/Under/Socks/stockingsblack.rsi/meta.json @@ -2,8 +2,6 @@ "version": 1, "license": "CC-BY-SA-3.0", "copyright": "made by sastr. (discord) for Space Station 14 server Мёртвый Космос", - "license": "CC-BY-SA-4.0", - "copyright": "Made by pyfya (discord), recolored by andrew_fenriz (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32