Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ ent-ClothingUnderwearSocksShort = короткие носки
.desc = Короткие носки Nanotrasen для персонала станции. Покрашены в белый.
ent-ClothingUnderwearSocksThigh = чулки
.desc = Стандартные чулки Nanotrasen для персонала станции. Покрашены в белый.
ent-ClothingUnderwearStockingsBlack = чёрные чулки
.desc = Стандартные чулки Nanotrasen для персонала станции. Покрашены в чёрный.
ent-ClothingUnderwearSocksQuartermaster = носки квартирмейстера
.desc = Стандартные носки квартирмейстера.
ent-ClothingUnderwearSocksCargoTech = носки грузчика
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Loading