Replace librarian jumpskirt resprite

space-syndicate · Oct 11, 2023 · f4e4f20 · f4e4f20
1 parent f4a02e9
commit f4e4f20
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 43 deletions.
diff --git 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
@@ -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/...s/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png b/...s/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png
diff --git 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/...res/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png b/...res/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png
diff --git a/...urces/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png b/...urces/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png
diff --git a/...rces/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png b/...rces/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png
diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json