diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index fdc23487d5..885f487a85 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -128,6 +128,8 @@ contents: - id: ClothingOuterHardsuitEngineeringWhite - id: ClothingMaskBreath + - id: ClothingUniformJumpsuitChiefEngineerTurtle + - id: ClothingUniformJumpskirtChiefEngineerTurtle - id: OxygenTankFilled - id: NitrogenTankFilled - id: ClothingNeckCloakCe @@ -157,6 +159,8 @@ - id: ClothingBeltChiefEngineerFilled - id: ClothingHeadHatBeretEngineering - id: ClothingHandsGlovesColorYellow + - id: ClothingUniformJumpsuitChiefEngineerTurtle + - id: ClothingUniformJumpskirtChiefEngineerTurtle - id: CigarCase prob: 0.15 - id: DoorRemoteEngineering diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index e5c7c97a01..636c2f8093 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -42,6 +42,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/ce.rsi +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtChiefEngineerTurtle + name: chief engineer's turtleneck + description: A yellow turtleneck designed specifically for work in conditions of the engineering department. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi + - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtChaplain diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 40c62cd3cb..56f5efabbb 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -104,6 +104,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/ce.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitChiefEngineerTurtle + name: chief engineer's turtleneck + description: A yellow turtleneck designed specifically for work in conditions of the engineering department. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/ceturtle.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/ceturtle.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitChaplain diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 7832999464..ec0fc8caff 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -705,6 +705,8 @@ - ClothingUniformJumpsuitSalvageSpecialist - ClothingUniformJumpsuitChiefEngineer - ClothingUniformJumpskirtChiefEngineer + - ClothingUniformJumpsuitChiefEngineerTurtle + - ClothingUniformJumpskirtChiefEngineerTurtle - ClothingUniformJumpsuitChaplain - ClothingUniformJumpskirtChaplain - ClothingUniformJumpsuitChef diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 6549640456..fea18760b7 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -81,6 +81,20 @@ Cloth: 300 Durathread: 100 +- type: latheRecipe + id: ClothingUniformJumpsuitChiefEngineerTurtle + result: ClothingUniformJumpsuitChiefEngineerTurtle + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpskirtChiefEngineerTurtle + result: ClothingUniformJumpskirtChiefEngineerTurtle + completetime: 4 + materials: + Cloth: 300 + - type: latheRecipe id: ClothingUniformJumpsuitChaplain result: ClothingUniformJumpsuitChaplain diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..f142d6efc0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..71587c5878 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/icon.png new file mode 100644 index 0000000000..0d92af9ee1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/inhand-left.png new file mode 100644 index 0000000000..1b40db931c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/inhand-right.png new file mode 100644 index 0000000000..5ba096c23a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/meta.json new file mode 100644 index 0000000000..425a857f02 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ceturtleskirt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by KingFroozy (github) for space station 14", + "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/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..afa10c94d4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..d5dc5cd0a7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/icon.png new file mode 100644 index 0000000000..2d5cfefade Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/inhand-left.png new file mode 100644 index 0000000000..1b40db931c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/inhand-right.png new file mode 100644 index 0000000000..5ba096c23a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/meta.json new file mode 100644 index 0000000000..f61c82ce0e --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ceturtle.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi and modified by KingFroozy (github) for space station 14", + "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 + } + ] +}