From: kosticia Date: Mon, 27 Jan 2025 09:08:59 +0000 (+0300) Subject: Hi-viz vest now actually hi-viz (#34087) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=276ec745fea9ab3c840cd2cc51556ac73602442d;p=space-station-14.git 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 accd24dd3c..16debab47b 100644 --- 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 index 0000000000..13086e7854 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 index 0000000000..4cbdf1262f 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 6d9f6dbead..1c537dac9d 100644 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 17e322a695..3183446dad 100644 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 index 0000000000..e386869e3f 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 57fe7a1def..c8e89820e7 100644 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 4c56c355a4..f228d235f7 100644 --- 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