Hi-viz vest now actually hi-viz (#34087)

* 27-12-2024-light-hi-viz

* 28-12-2024-meta-fix

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
index accd24dd3cc0d7d88c59cdcf99e932f4378d675e..16debab47bf0afbeed142bd23d87e7fe36cb16fd 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
@@ -61,8 +61,17 @@
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Vests/hazard.rsi
+    layers:
+    - state: icon
+    - state: icon-unshaded
+      shader: unshaded
   - type: Clothing
     sprite: Clothing/OuterClothing/Vests/hazard.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-OUTERCLOTHING
+      - state: equipped-OUTERCLOTHING-unshaded
+        shader: unshaded
   - type: Tag
     tags:
     - HiViz

diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-unshaded-vox.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-unshaded-vox.png
new file mode 100644 (file)
index 0000000..13086e7
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-unshaded-vox.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-unshaded.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-unshaded.png
new file mode 100644 (file)
index 0000000..4cbdf12
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-unshaded.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-vox.png
index 6d9f6dbead9af27e8755b750820b723b14558e12..1c537dac9d67e3567a9316ca84303ded6ed48bc3 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-vox.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
index 17e322a6956675baa4699d41cd411f2926325562..3183446dadfc9e2a0fd7846f55e595119a70c7e6 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon-unshaded.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon-unshaded.png
new file mode 100644 (file)
index 0000000..e386869
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon-unshaded.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
index 57fe7a1def94229c0dae6652e92aed62f9eb91bc..c8e89820e71551186428b9c5c0c003809054da80 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
index 4c56c355a4945b67d0db53b1080356be3462a244..f228d235f7191674f1f7b15825672ae7817e62a8 100644 (file)
--- a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.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. Vox state made by Flareguy for Space Station 14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. Vox state made by Flareguy for Space Station 14. Modified and splited into shaded-unshaded states by kosticia.",
   "size": {
     "x": 32,
     "y": 32
@@ -10,14 +10,25 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon-unshaded"
+    },
     {
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-unshaded",
+      "directions": 4
+    },
     {
       "name": "equipped-OUTERCLOTHING-vox",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-unshaded-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4