diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 27e84278ad..64cd197c69 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -693,17 +693,6 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/senior_physician.rsi -- type: entity - parent: ClothingUniformSkirtBase - id: ClothingUniformJumpskirtSeniorPhysicianNew - name: senior physician jumpskirt - description: A sign of skill and prestige within the medical department. - components: - - type: Sprite - sprite: Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi - - type: entity parent: [ClothingUniformSkirtBase, BaseSecurityContraband] id: ClothingUniformJumpskirtSeniorOfficer diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 303d15ef0b..294c1d51f4 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1270,17 +1270,6 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/senior_physician.rsi -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitSeniorPhysicianNew - name: senior physician jumpsuit - description: A sign of skill and prestige within the medical department. - components: - - type: Sprite - sprite: Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi - - type: entity parent: [ClothingUniformBase, BaseSecurityContraband] id: ClothingUniformJumpsuitSeniorOfficer diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml index 5e212b27e3..c33978ba57 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml @@ -291,6 +291,8 @@ - ClothingHeadHatParamedicsoft - ClothingBeltMedical - ClothingNeckStethoscope + - ClothingUniformJumpsuitParamedicNew + - ClothingUniformJumpskirtParamedicNew - ClothingUniformJumpsuitCoroner - type: latheRecipePack diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 4edfad596f..8c6e3b2c8b 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -436,11 +436,6 @@ id: ClothingOuterCoatLabSeniorPhysician result: ClothingOuterCoatLabSeniorPhysician -- type: latheRecipe - parent: BaseCoatRecipe - id: ClothingOuterCoatLabSeniorPhysicianNew - result: ClothingOuterCoatLabSeniorPhysicianNew - - type: latheRecipe parent: BaseCoatRecipe id: ClothingOuterCoatRnd @@ -825,21 +820,11 @@ id: ClothingUniformJumpsuitSeniorPhysician result: ClothingUniformJumpsuitSeniorPhysician -- type: latheRecipe - parent: BaseJumpsuitRecipe - id: ClothingUniformJumpsuitSeniorPhysicianNew - result: ClothingUniformJumpsuitSeniorPhysicianNew - - type: latheRecipe parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtSeniorPhysician result: ClothingUniformJumpskirtSeniorPhysician -- type: latheRecipe - parent: BaseJumpsuitRecipe - id: ClothingUniformJumpskirtSeniorPhysicianNew - result: ClothingUniformJumpskirtSeniorPhysicianNew - - type: latheRecipe parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitPsychologist @@ -1676,11 +1661,6 @@ id: ClothingHeadHatBeretSeniorPhysician result: ClothingHeadHatBeretSeniorPhysician -- type: latheRecipe - parent: BaseHatRecipe - id: ClothingHeadHatBeretSeniorPhysicianNew - result: ClothingHeadHatBeretSeniorPhysicianNew - - type: latheRecipe parent: BaseHatRecipe id: ClothingHeadHatSyndie diff --git a/Resources/Prototypes/_Persistence14/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_Persistence14/Entities/Clothing/Uniforms/jumpskirts.yml index e2438005c8..d75ebfe544 100644 --- a/Resources/Prototypes/_Persistence14/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_Persistence14/Entities/Clothing/Uniforms/jumpskirts.yml @@ -129,3 +129,25 @@ sprite: _Persistence14/Clothing/Uniforms/Jumpskirt/cos_turtle.rsi - type: Clothing sprite: _Persistence14/Clothing/Uniforms/Jumpskirt/cos_turtle.rsi + +- type: entity + parent: [ClothingUniformBase, ClothingUniformFoldableBase] + id: ClothingUniformJumpskirtParamedicNew + name: paramedic jumpskirt + description: It's got a plus on it, that's a good thing right? + components: + - type: Sprite + sprite: _Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi + - type: Clothing + sprite: _Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi + +- type: entity + parent: [ClothingUniformBase, ClothingUniformFoldableBase] + id: ClothingUniformJumpskirtSeniorPhysicianNew + name: senior physician jumpskirt + description: A sign of skill and prestige within the medical department. + components: + - type: Sprite + sprite: _Persistence14/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi + - type: Clothing + sprite: _Persistence14/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_Persistence14/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Persistence14/Entities/Clothing/Uniforms/jumpsuits.yml index dff02b0b9b..82cbe22b5f 100644 --- a/Resources/Prototypes/_Persistence14/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_Persistence14/Entities/Clothing/Uniforms/jumpsuits.yml @@ -150,4 +150,26 @@ - type: Sprite sprite: _Persistence14/Clothing/Uniforms/Jumpsuit/cos.rsi - type: Clothing - sprite: _Persistence14/Clothing/Uniforms/Jumpsuit/cos.rsi \ No newline at end of file + sprite: _Persistence14/Clothing/Uniforms/Jumpsuit/cos.rsi + +- type: entity + parent: [ClothingUniformBase, ClothingUniformFoldableBase] + id: ClothingUniformJumpsuitParamedicNew + name: paramedic jumpsuit + description: It's got a plus on it, that's a good thing right? + components: + - type: Sprite + sprite: _Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi + - type: Clothing + sprite: _Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSeniorPhysicianNew + name: senior physician jumpsuit + description: A sign of skill and prestige within the medical department. + components: + - type: Sprite + sprite: _Persistence14/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi + - type: Clothing + sprite: _Persistence14/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_Persistence14/Recipes/Lathe/clothing.yml b/Resources/Prototypes/_Persistence14/Recipes/Lathe/clothing.yml new file mode 100644 index 0000000000..7210495905 --- /dev/null +++ b/Resources/Prototypes/_Persistence14/Recipes/Lathe/clothing.yml @@ -0,0 +1,29 @@ +- type: latheRecipe + parent: BaseCoatRecipe + id: ClothingOuterCoatLabSeniorPhysicianNew + result: ClothingOuterCoatLabSeniorPhysicianNew + +- type: latheRecipe + parent: BaseJumpsuitRecipe + id: ClothingUniformJumpsuitSeniorPhysicianNew + result: ClothingUniformJumpsuitSeniorPhysicianNew + +- type: latheRecipe + parent: BaseJumpsuitRecipe + id: ClothingUniformJumpskirtSeniorPhysicianNew + result: ClothingUniformJumpskirtSeniorPhysicianNew + +- type: latheRecipe + parent: BaseJumpsuitRecipe + id: ClothingUniformJumpsuitParamedicNew + result: ClothingUniformJumpsuitParamedicNew + +- type: latheRecipe + parent: BaseJumpsuitRecipe + id: ClothingUniformJumpskirtParamedicNew + result: ClothingUniformJumpskirtParamedicNew + +- type: latheRecipe + parent: BaseHatRecipe + id: ClothingHeadHatBeretSeniorPhysicianNew + result: ClothingHeadHatBeretSeniorPhysicianNew \ No newline at end of file diff --git a/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..3db9f2eea5 Binary files /dev/null and b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..6d6dd3c059 Binary files /dev/null and b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/icon.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/icon.png new file mode 100644 index 0000000000..275d039340 Binary files /dev/null and b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/icon.png differ diff --git a/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/inhand-left.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/inhand-left.png new file mode 100644 index 0000000000..ff8b53500b Binary files /dev/null and b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/inhand-right.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/inhand-right.png new file mode 100644 index 0000000000..247ef233cb Binary files /dev/null and b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/meta.json b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.rsi/meta.json new file mode 100644 index 0000000000..0bff9d3ebd --- /dev/null +++ b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newparamedic.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 derivative made by brainfood1183 (github) for ss14, modified by KingFroozy (github)- Edits made by bnnuy for Persistence 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/Jumpskirt/newsenior_physician.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/equipped-INNERCLOTHING-monkey.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/equipped-INNERCLOTHING-monkey.png rename to Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/equipped-INNERCLOTHING-monkey.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/icon.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/icon.png rename to Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/icon.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/inhand-left.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/inhand-left.png rename to Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/inhand-right.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/inhand-right.png rename to Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/meta.json b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/meta.json rename to Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpskirt/newsenior_physician.rsi/meta.json diff --git a/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..2030f24603 Binary files /dev/null and b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..ad1670c934 Binary files /dev/null and b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..7db310c5aa Binary files /dev/null and b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/icon.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/icon.png new file mode 100644 index 0000000000..b9ae0e2d5a Binary files /dev/null and b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/icon.png differ diff --git a/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/inhand-left.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/inhand-left.png new file mode 100644 index 0000000000..3879ae84be Binary files /dev/null and b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/inhand-right.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/inhand-right.png new file mode 100644 index 0000000000..677ef7a834 Binary files /dev/null and b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/meta.json b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/meta.json new file mode 100644 index 0000000000..827ded197d --- /dev/null +++ b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newparamedic.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "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, modified by KingFroozy (github) - Edits made by bnnuy for Persistence 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-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/newsenior_physician.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/equipped-INNERCLOTHING-monkey.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/equipped-INNERCLOTHING-monkey.png rename to Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/equipped-INNERCLOTHING-monkey.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/icon.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/icon.png rename to Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/icon.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/inhand-left.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/inhand-left.png rename to Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/inhand-right.png b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/inhand-right.png rename to Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/meta.json b/Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/meta.json rename to Resources/Textures/_Persistence14/Clothing/Uniforms/Jumpsuit/newsenior_physician.rsi/meta.json