reSpriteColorUniformsRemake (#968)

SerbiaStrong-220 · May 4, 2024 · 6d90890 · 6d90890
1 parent a14bec9
commit 6d90890
Show file tree

Hide file tree

Showing 36 changed files with 162 additions and 130 deletions.
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml
diff --git a/...urces/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png b/...urces/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.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/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for Space Station 14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for Space Station 14, resprited by Estkemran (GitHub) for SS220",
   "size": {
     "x": 32,
     "y": 32
@@ -22,6 +22,22 @@
       "name": "inhand-right",
       "directions": 4
     },
+    {
+      "name": "trinkets-alt-icon"
+    },
+    {
+      "name": "trinkets-alt-equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "trinkets-alt-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "trinkets-alt-inhand-right",
+      "directions": 4
+    },
+
     {
       "name": "trinkets-icon"
     },

diff --git a/...tures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-equipped-INNERCLOTHING.png b/...tures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-right.png
diff --git a/...s/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-alt-equipped-INNERCLOTHING.png b/...s/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-alt-equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-alt-icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-alt-icon.png
diff --git a/...ces/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-alt-inhand-left.png b/...ces/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-alt-inhand-left.png
diff --git a/...es/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-alt-inhand-right.png b/...es/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-alt-inhand-right.png
diff --git a/...tures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png b/...tures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.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/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for Space Station 14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for Space Station 14, resprited by Estkemran (GitHub) for SS220",
   "size": {
     "x": 32,
     "y": 32
@@ -22,6 +22,22 @@
       "name": "inhand-right",
       "directions": 4
     },
+    {
+      "name": "trinkets-alt-icon"
+    },
+    {
+      "name": "trinkets-alt-equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "trinkets-alt-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "trinkets-alt-inhand-right",
+      "directions": 4
+    },
+
     {
       "name": "trinkets-icon"
     },

diff --git a/...xtures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png b/...xtures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-right.png
diff --git a/...es/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-alt-equipped-INNERCLOTHING.png b/...es/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-alt-equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-alt-icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-alt-icon.png
diff --git a/...rces/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-alt-inhand-left.png b/...rces/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-alt-inhand-left.png
diff --git a/...ces/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-alt-inhand-right.png b/...ces/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-alt-inhand-right.png
diff --git a/...xtures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png b/...xtures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-right.png