tweak: displasment gloves

WWhiteDreamProject · Dec 23, 2024 · c70c190 · c70c190
1 parent 67f2dab
commit c70c190
Show file tree

Hide file tree

Showing 32 changed files with 21 additions and 116 deletions.
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
@@ -28,11 +28,6 @@
       gloves:
       - state: equipped-HAND
         color: "#9C0DE1"
-      # WD EDIT START
-      gloves-body-slim:
-      - state: equipped-HAND-body-slim
-        color: "#9C0DE1"
-      # WD EDIT END
   - type: Fiber
     fiberColor: fibers-purple
 
@@ -62,11 +57,6 @@
       gloves:
       - state: equipped-HAND
         color: "#940000"
-      # WD EDIT START
-      gloves-body-slim:
-      - state: equipped-HAND-body-slim
-        color: "#940000"
-      # WD EDIT END
   - type: Fiber
     fiberColor: fibers-red
 
@@ -96,11 +86,6 @@
       gloves:
       - state: equipped-HAND
         color: "#0089EF"
-      # WD EDIT START
-      gloves-body-slim:
-      - state: equipped-HAND-body-slim
-        color: "#0089EF"
-      # WD EDIT END
   - type: Fiber
     fiberColor: fibers-blue
 
@@ -130,11 +115,6 @@
       gloves:
       - state: equipped-HAND
         color: "#723A02"
-      # WD EDIT START
-      gloves-body-slim:
-      - state: equipped-HAND-body-slim
-        color: "#723A02"
-      # WD EDIT END
   - type: Fiber
     fiberColor: fibers-brown
 
@@ -164,11 +144,6 @@
       gloves:
       - state: equipped-HAND
         color: "#999999"
-      # WD EDIT START
-      gloves-body-slim:
-      - state: equipped-HAND-body-slim
-        color: "#999999"
-      # WD EDIT END
   - type: Fiber
     fiberColor: fibers-grey
 
@@ -198,11 +173,6 @@
       gloves:
       - state: equipped-HAND
         color: "#5ABF2F"
-      # WD EDIT START
-      gloves-body-slim:
-      - state: equipped-HAND-body-slim
-        color: "#5ABF2F"
-      # WD EDIT END
   - type: Fiber
     fiberColor: fibers-green
 
@@ -232,11 +202,6 @@
       gloves:
       - state: equipped-HAND
         color: "#C09F72"
-      # WD EDIT START
-      gloves-body-slim:
-      - state: equipped-HAND-body-slim
-        color: "#C09F72"
-      # WD EDIT END
   - type: Fiber
     fiberColor: fibers-brown
 
@@ -266,11 +231,6 @@
       gloves:
       - state: equipped-HAND
         color: "#EF8100"
-      # WD EDIT START
-      gloves-body-slim:
-      - state: equipped-HAND-body-slim
-        color: "#EF8100"
-      # WD EDIT END
   - type: Fiber
     fiberColor: fibers-orange
 
@@ -300,11 +260,6 @@
       gloves:
       - state: equipped-HAND
         color: "#EAE8E8"
-      # WD EDIT START
-      gloves-body-slim:
-      - state: equipped-HAND-body-slim
-        color: "#EAE8E8"
-      # WD EDIT END
   - type: Fiber
     fiberColor: fibers-white
 

diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -47,6 +47,11 @@
           32:
             sprite: _White/Mobs/Species/Human/displacement.rsi
             state: shoes
+      gloves-body-slim:
+        sizeMaps:
+          32:
+            sprite: _White/Mobs/Species/Human/displacement.rsi
+            state: gloves
       # WD EDIT END
 
 - type: entity
@@ -72,4 +77,9 @@
           32:
             sprite: _White/Mobs/Species/Human/displacement.rsi
             state: shoes
+      gloves-body-slim:
+        sizeMaps:
+          32:
+            sprite: _White/Mobs/Species/Human/displacement.rsi
+            state: gloves
       # WD EDIT END
diff --git a/...extures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/equipped-HAND-body-slim.png b/...extures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/equipped-HAND-body-slim.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.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/4f6190e2895e09116663ef282d3ce1d8b35c032e. Slim by WWDP TEAM",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
   "size": {
     "x": 32,
     "y": 32
@@ -14,10 +14,6 @@
       "name": "equipped-HAND",
       "directions": 4
     },
-    {
-      "name": "equipped-HAND-body-slim",
-      "directions": 4
-    },
     {
       "name": "equipped-HAND-kangaroo",
       "directions": 4

diff --git a/...xtures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/equipped-HAND-body-slim.png b/...xtures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/equipped-HAND-body-slim.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.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/4f6190e2895e09116663ef282d3ce1d8b35c032e. Slim by WWDP TEAM",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
   "size": {
     "x": 32,
     "y": 32
@@ -14,10 +14,6 @@
       "name": "equipped-HAND",
       "directions": 4
     },
-    {
-      "name": "equipped-HAND-body-slim",
-      "directions": 4
-    },
     {
       "name": "equipped-HAND-kangaroo",
       "directions": 4

diff --git a/...Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/equipped-HAND-body-slim.png b/...Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/equipped-HAND-body-slim.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.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/4f6190e2895e09116663ef282d3ce1d8b35c032e. Slim by WWDP TEAM",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
   "size": {
     "x": 32,
     "y": 32
@@ -14,10 +14,6 @@
       "name": "equipped-HAND",
       "directions": 4
     },
-    {
-      "name": "equipped-HAND-body-slim",
-      "directions": 4
-    },
     {
       "name": "equipped-HAND-kangaroo",
       "directions": 4

diff --git a/...tures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/equipped-HAND-body-slim.png b/...tures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/equipped-HAND-body-slim.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.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/4f6190e2895e09116663ef282d3ce1d8b35c032e. Slim by WWDP TEAM",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
   "size": {
     "x": 32,
     "y": 32
@@ -14,10 +14,6 @@
       "name": "equipped-HAND",
       "directions": 4
     },
-    {
-      "name": "equipped-HAND-body-slim",
-      "directions": 4
-    },
     {
       "name": "equipped-HAND-kangaroo",
       "directions": 4

diff --git a/...rces/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND-body-slim.png b/...rces/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND-body-slim.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
@@ -14,10 +14,6 @@
       "name": "equipped-HAND",
       "directions": 4
     },
-    {
-      "name": "equipped-HAND-body-slim",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4

diff --git a/...ces/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND-body-slim.png b/...ces/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND-body-slim.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
@@ -14,10 +14,6 @@
         "name": "equipped-HAND",
         "directions": 4
       },
-      {
-        "name": "equipped-HAND-body-slim",
-        "directions": 4
-      },
       {
         "name": "equipped-HAND-vox",
         "directions": 4

diff --git a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND-body-slim.png b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND-body-slim.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json
@@ -14,10 +14,6 @@
       "name": "equipped-HAND",
       "directions": 4
     },
-    {
-      "name": "equipped-HAND-body-slim",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4

diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND-body-slim.png b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND-body-slim.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json
@@ -14,10 +14,6 @@
       "name": "equipped-HAND",
       "directions": 4
     },
-    {
-      "name": "equipped-HAND-body-slim",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4

diff --git a/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/equipped-HAND-body-slim.png b/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/equipped-HAND-body-slim.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/leather.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/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by potato1234x (github) for SS14. Slim by WWDP TEAM",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by potato1234x (github) for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,10 +14,6 @@
       "name": "equipped-HAND",
       "directions": 4
     },
-    {
-      "name": "equipped-HAND-body-slim",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4

diff --git a/...urces/Textures/Clothing/Hands/Gloves/powerglove.rsi/equipped-HAND-body-slim.png b/...urces/Textures/Clothing/Hands/Gloves/powerglove.rsi/equipped-HAND-body-slim.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/55d823b97dda098a1b2ee9edfca7155c753e456e. Slim by WWDP TEAM",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/55d823b97dda098a1b2ee9edfca7155c753e456e",
   "size": {
     "x": 32,
     "y": 32
@@ -17,18 +17,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
-    {
-      "name": "equipped-HAND-body-slim",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HAND",
       "directions": 4
     },
-    {
-      "name": "on-equipped-HAND-body-slim",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4

diff --git a/...es/Textures/Clothing/Hands/Gloves/powerglove.rsi/on-equipped-HAND-body-slim.png b/...es/Textures/Clothing/Hands/Gloves/powerglove.rsi/on-equipped-HAND-body-slim.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/equipped-HAND-body-slim.png b/Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/equipped-HAND-body-slim.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/robohands.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/4f6190e2895e09116663ef282d3ce1d8b35c032e. Slim by WWDP TEAM",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
   "size": {
     "x": 32,
     "y": 32
@@ -14,10 +14,6 @@
       "name": "equipped-HAND",
       "directions": 4
     },
-    {
-      "name": "equipped-HAND-body-slim",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4

diff --git a/...urces/Textures/Clothing/Hands/Gloves/spaceninja.rsi/equipped-HAND-body-slim.png b/...urces/Textures/Clothing/Hands/Gloves/spaceninja.rsi/equipped-HAND-body-slim.png
diff --git a/...Textures/Clothing/Hands/Gloves/spaceninja.rsi/green-equipped-HAND-body-slim.png b/...Textures/Clothing/Hands/Gloves/spaceninja.rsi/green-equipped-HAND-body-slim.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/meta.json
@@ -20,26 +20,14 @@
       "name": "equipped-HAND",
       "directions": 4
     },
-    {
-      "name": "equipped-HAND-body-slim",
-      "directions": 4
-    },
     {
       "name": "red-equipped-HAND",
       "directions": 4
     },
-    {
-      "name": "red-equipped-HAND-body-slim",
-      "directions": 4
-    },
     {
       "name": "green-equipped-HAND",
       "directions": 4
     },
-    {
-      "name": "green-equipped-HAND-body-slim",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4

diff --git a/...s/Textures/Clothing/Hands/Gloves/spaceninja.rsi/red-equipped-HAND-body-slim.png b/...s/Textures/Clothing/Hands/Gloves/spaceninja.rsi/red-equipped-HAND-body-slim.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/meta.json
@@ -14,10 +14,6 @@
       "name": "equipped-FEET",
       "directions": 4
     },
-    {
-      "name": "equipped-FEET-body-slim",
-      "directions": 4
-    },
     {
       "name": "equipped-FEET-vox",
       "directions": 4

diff --git a/Resources/Textures/_White/Mobs/Species/Human/displacement.rsi/gloves.png b/Resources/Textures/_White/Mobs/Species/Human/displacement.rsi/gloves.png
diff --git a/Resources/Textures/_White/Mobs/Species/Human/displacement.rsi/meta.json b/Resources/Textures/_White/Mobs/Species/Human/displacement.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "jumpsuit",
       "directions": 4
     },
+    {
+      "name": "gloves",
+      "directions": 4
+    },
     {
       "name": "shoes",
       "directions" : 4