diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml index b720c007963..aedd43625e2 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml @@ -21,17 +21,6 @@ - type: Clothing sprite: Corvax/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi -- type: entity - parent: ClothingUniformSkirtBase - id: ClothingUniformJumpskirtLibrarian - name: sensible suitskirt - description: It's very... sensible. - components: - - type: Sprite - sprite: Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi - - type: Clothing - sprite: Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi - - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformColorJumpskirtRainbow diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index ea1c933b4c2..46b2d3e3aff 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -541,7 +541,7 @@ parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtLibrarian name: librarian jumpskirt - description: A cosy green jumper fit for a curator of books. + description: A cosy red jumper fit for a curator of books. # Corvax-Resprite components: - type: Sprite sprite: Clothing/Uniforms/Jumpskirt/librarian.rsi diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png index 56b96469654..8c772eee012 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png index 2400ac8d752..41a97c9d3fe 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png index 9feaebdb55a..dffffbc9889 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png index 6b8fccf1f47..aa45782ecdb 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json index 0a48ac3e373..cb66ac34016 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47718914e47c6fbf23d6dc97f073a9daa11b23cb and modified by potato1234x (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png deleted file mode 100644 index 8c772eee012..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png deleted file mode 100644 index 41a97c9d3fe..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png deleted file mode 100644 index dffffbc9889..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png deleted file mode 100644 index aa45782ecdb..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json deleted file mode 100644 index cb66ac34016..00000000000 --- a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -}