diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index cf8849fd6bf..5f86857f882 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -795,6 +795,8 @@ - ClothingUniformJumpskirtBrigmedic - ClothingUniformJumpsuitWarden - ClothingUniformJumpskirtWarden + - ClothingUniformJumpsuitSecStationGuard #Frontier + - ClothingUniformJumpskirtSecStationGuard #Frontier - ClothingOuterWinterCap - ClothingOuterWinterCE - ClothingOuterWinterCMO diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml index c7ed9db151b..33eef9f62f4 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml @@ -37,3 +37,13 @@ - type: Clothing sprite: _NF/Clothing/Uniforms/Jumpskirt/mercenary.rsi +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtSecStationGuard + name: station guard jumpskirt + description: A specialized uniform for a Frontier Outpost guard. Crisp and official to let dock loiterers know you mean business. + components: + - type: Sprite + sprite: _NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi + - type: Clothing + sprite: _NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml index 25aefa42b6d..4cd882060e9 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml @@ -36,3 +36,14 @@ sprite: _NF/Clothing/Uniforms/Jumpsuit/chaplain-pilgrim.rsi - type: Clothing sprite: _NF/Clothing/Uniforms/Jumpsuit/chaplain-pilgrim.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSecStationGuard + name: station guard jumpsuit + description: A specialized uniform for a Frontier Outpost guard. Crisp and official to let dock loiterers know you mean business. + components: + - type: Sprite + sprite: _NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi + - type: Clothing + sprite: _NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi diff --git a/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml b/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml index 87096359b75..d0b1ad095d6 100644 --- a/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml @@ -8,3 +8,17 @@ description: A quiver to hold crossbow bolts. icon: { sprite: _NF/Objects/Clothing/Belt/crossbow_quiver.rsi, state: icon } objectType: Item + +- type: latheRecipe + id: ClothingUniformJumpskirtSecStationGuard + result: ClothingUniformJumpskirtSecStationGuard + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpsuitSecStationGuard + result: ClothingUniformJumpsuitSecStationGuard + completetime: 4 + materials: + Cloth: 300 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..b962d5c9626 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..49da1087fad Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/icon.png new file mode 100644 index 00000000000..5ec4252aa38 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-left.png new file mode 100644 index 00000000000..9bc90b4e20a Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-right.png new file mode 100644 index 00000000000..9e6d77fce39 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/meta.json new file mode 100644 index 00000000000..ffecc9fc1bb --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by @mureixlol, for monkey @hem0mancer, recolored by MagnusCrowe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..f5bbb0366e3 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..cc83f03e1bb Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/icon.png new file mode 100644 index 00000000000..fe9aea69e94 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-left.png new file mode 100644 index 00000000000..9bc90b4e20a Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-right.png new file mode 100644 index 00000000000..9e6d77fce39 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/meta.json new file mode 100644 index 00000000000..f22d6d800a5 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, recolored by MagnusCrowe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}