diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 1a4eae885e..8221c7c02c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -7,6 +7,8 @@ contents: - id: ClothingNeckCloakQm - id: ClothingHeadsetCargo + - id: ClothingUniformJumpsuitQMTurtleneck + - id: ClothingUniformJumpskirtQMTurtleneck - id: ClothingHandsGlovesColorBrown - id: ClothingShoesColorBrown - id: ClothingHeadHatQMsoft diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 821760ae52..e5c7c97a01 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -281,6 +281,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/qm.rsi +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtQMTurtleneck + name: quartermasters's turtleneck + description: A sharp turtleneck made for the hardy work environment of supply. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi + - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtResearchDirector diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index a869f596ac..40c62cd3cb 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -442,6 +442,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/qm.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitQMTurtleneck + name: quartermasters's turtleneck + description: A sharp turtleneck made for the hardy work environment of supply. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/qmturtle.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/qmturtle.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitResearchDirector diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 012e2b5cba..526f4a209b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -675,6 +675,8 @@ - ClothingUniformJumpskirtPrisoner - ClothingUniformJumpsuitQM - ClothingUniformJumpskirtQM + - ClothingUniformJumpsuitQMTurtleneck + - ClothingUniformJumpskirtQMTurtleneck - ClothingUniformJumpsuitResearchDirector - ClothingUniformJumpskirtResearchDirector - ClothingUniformJumpsuitScientist diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 9898142a91..6549640456 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -348,6 +348,20 @@ materials: Cloth: 300 +- type: latheRecipe + id: ClothingUniformJumpsuitQMTurtleneck + result: ClothingUniformJumpsuitQMTurtleneck + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpskirtQMTurtleneck + result: ClothingUniformJumpskirtQMTurtleneck + completetime: 4 + materials: + Cloth: 300 + - type: latheRecipe id: ClothingUniformJumpsuitResearchDirector result: ClothingUniformJumpsuitResearchDirector diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..1b58594e9e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/icon.png new file mode 100644 index 0000000000..7868175f99 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-left.png new file mode 100644 index 0000000000..ee12b32d15 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-right.png new file mode 100644 index 0000000000..f927e8a343 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/meta.json new file mode 100644 index 0000000000..cb8a2af087 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Derived from beestation qmturtleneck sprite from beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/a11e7468ca552cfc97c9164c69ccdafff09e794c and modified by Emisse for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..ca28756915 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/icon.png new file mode 100644 index 0000000000..bd7bf4f678 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-left.png new file mode 100644 index 0000000000..090ddae8dc Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-right.png new file mode 100644 index 0000000000..4443d9f5d0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/meta.json new file mode 100644 index 0000000000..f92fbbeffd --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Derived from qmturtleneck sprite from beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/a11e7468ca552cfc97c9164c69ccdafff09e794c and modified by Emisse for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}