From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Sat, 9 Nov 2024 05:56:16 +0000 (-0600) Subject: The Jumpsuit Re-Detailening (#33096) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=40044203e6ae7d7d2958c02e0d5e98dacdcd23d8;p=space-station-14.git The Jumpsuit Re-Detailening (#33096) * jumpsuit detailening * jumpskirt stuff * meta.json * update meta.json * meta.json fix fix * meta.json fix fix fix --- diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png index 3faba7285f..4df4336458 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png index 64642a1158..f91b903f4e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png index 0b13123486..265b1f6f8b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png index ba6769d59d..8e272ea03a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json index 7e6832bd12..82edfe13a0 100644 --- 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 vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/993de554ecfc30cc45f8340819c5a60ef1eee7e1 and modified by Flareguy & P3MOIRA, with the lower half of the jumpskirt taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for SS14.", "size": { "x": 32, "y": 32 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 index f6ff6866ff..6b40ed5af0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-left.png differ 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 index 45393e81a6..e43a9b42db 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png index cee5a50d2c..bb9dd4f505 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png index 5c333dfc11..2d86990cb8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png index c0087d4d25..84a603429e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png index 0b13123486..29ed754ec1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png index ba6769d59d..3ea39f3463 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json index 7e6832bd12..797ea180d8 100644 --- 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 vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/993de554ecfc30cc45f8340819c5a60ef1eee7e1 and modified for SS14 by Flareguy & P3MOIRA", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png index 320db64b57..ef35d8c80c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png index faebe0e055..819e7ac9d9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png differ 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 index f6ff6866ff..e0191d45d5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png index e21afe8d4e..c97a78f047 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png index c9e8398b47..683e91de95 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png differ 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 index 9bbcac8268..b0e2998c0d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-left.png differ 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 index cfd7258315..ec1962dde4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-right.png differ