]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
The Jumpsuit Re-Detailening (#33096)
authorFlareguy <78941145+Flareguy@users.noreply.github.com>
Sat, 9 Nov 2024 05:56:16 +0000 (23:56 -0600)
committerGitHub <noreply@github.com>
Sat, 9 Nov 2024 05:56:16 +0000 (16:56 +1100)
* jumpsuit detailening

* jumpskirt stuff

* meta.json

* update meta.json

* meta.json fix fix

* meta.json fix fix fix

20 files changed:
Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-left.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-right.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-left.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-left.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-right.png

index 3faba7285ff1b3898e47a23c7299d33e20a05c0c..4df4336458d688a519f10685058a3b070ab2c6a3 100644 (file)
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
index 64642a11589e4ee7d66ac750216c4f7ed0c4d69c..f91b903f4ee6b7e876003b9b36bc1333dbdb3154 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png differ
index 0b1312348654cdba461670aa3a307575528fb402..265b1f6f8bdcfaf60f625d4e7d7035aafc28e666 100644 (file)
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
index ba6769d59d58969984f1b3428bb52d8d3f63ca0c..8e272ea03a86fd9e07f875a2323e10cd8bf1ec55 100644 (file)
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
index 7e6832bd12c0836aa528258a6b345946434c917a..82edfe13a027bc8e4131741ac326905a38339f55 100644 (file)
@@ -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
index f6ff6866ffc359196192cec6c75f0631f2a399a3..6b40ed5af0ec63d3f482b5c3e6a081aa1a2c7e7a 100644 (file)
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
index 45393e81a66103898d2e33673dc0c227824b4f29..e43a9b42dbcce7413e0191765e4d201a3f8cf80e 100644 (file)
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
index cee5a50d2caea42b0fc53599a92a1cc8be1a8d72..bb9dd4f505ee4ad6cf2969435ae4333f48849290 100644 (file)
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
index 5c333dfc11811bc991f2cd4e82637351c4ead25c..2d86990cb8bf89056064b448cdff4458e5caa870 100644 (file)
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
index c0087d4d2505fd8d7c362df3d838feb8d39a3d87..84a603429e8ef4d3121f4188fdb30296b75b7d78 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png differ
index 0b1312348654cdba461670aa3a307575528fb402..29ed754ec1d2ea78ae94669041146268497daeec 100644 (file)
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
index ba6769d59d58969984f1b3428bb52d8d3f63ca0c..3ea39f3463e9a5b4f388d7c5ba747293672a518e 100644 (file)
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
index 7e6832bd12c0836aa528258a6b345946434c917a..797ea180d8ee674b9bf01b95b6530893210ee696 100644 (file)
@@ -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
index 320db64b5794a279427cd43b16b4839490b43800..ef35d8c80c579f45bbf65b60c2d209d5fd24af5b 100644 (file)
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
index faebe0e0550c4a7a41276f787c0f1496dbd6276e..819e7ac9d9c978d7fd87bba47ffbd86bb505a79b 100644 (file)
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
index f6ff6866ffc359196192cec6c75f0631f2a399a3..e0191d45d521c86f0765c49d25a0413259f0c1e6 100644 (file)
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
index e21afe8d4eb1d95295728d41429e90b26765ade0..c97a78f047727a2fd76b4e841b0bbf7a7dc86edc 100644 (file)
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
index c9e8398b47d94679bfbec574bbdd8c639bb7064b..683e91de958724384d033fbd3ada13b6aed64281 100644 (file)
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
index 9bbcac8268ab5a6466b66447666b6542c66ca9bc..b0e2998c0d42d5c7316397736533bb4c7ba9a464 100644 (file)
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
index cfd725831525040c80289ad5c787cadc64f573c4..ec1962dde48680be042df398a89787a6dcfa40dc 100644 (file)
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