From: KingFroozy <140668342+KingFroozy@users.noreply.github.com> Date: Sat, 12 Oct 2024 19:13:39 +0000 (+0300) Subject: Changes to CE's suits (#29850) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=214a20da8e87262b964b5cc69935fba30d09bef7;p=space-station-14.git Changes to CE's suits (#29850) * Changes to ce sprites * Adjustments * More changes i guess * Love life, get skirt * Bitlessdark * fkingforcepush * upd №? --- diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING-monkey.png index c0258cf199..a7646e1511 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png index 3263c54ec9..63a2b78ddf 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png index 5f662e0280..5b18b310ee 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-left.png index 94d9ed8605..be8f306df1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-right.png index 560879a0f2..d453655831 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/meta.json index bbcef071e2..41d39d9bf4 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.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. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github), modified by KingFroozy (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png index 4cb7704e2c..54312098fb 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png index 93477d07f5..b7877ab176 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png index 06c845ef84..59f190fb99 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png index bdbd3ea488..ff454fb5db 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png index 7822bf686c..bb33c2d6c1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json index 425a857f02..d0a3b5db80 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by KingFroozy (github) for space station 14", + "copyright": "Modified from https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi by KingFroozy (github) for space station 14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png index e0881f66bb..b5cda54ed2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png index e9165f29cc..e935d8977d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png index e2c37a0c2c..e8703104a6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-left.png index 94d9ed8605..be8f306df1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-right.png index 560879a0f2..d453655831 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json index 1d012747b8..425e6eaae2 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.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. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github), modified by KingFroozy (github) for ss14", "size": { "x": 32, "y": 32 @@ -10,17 +10,10 @@ { "name": "icon" }, - { - "name": "s" - }, { "name": "equipped-INNERCLOTHING", "directions": 4 }, - { - "name": "s-equipped-INNERCLOTHING", - "directions": 4 - }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s-equipped-INNERCLOTHING.png deleted file mode 100644 index 213562cf97..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s-equipped-INNERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s.png deleted file mode 100644 index 7282eb27f6..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png index 7c9e3cfc92..05cbff092d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png index 171598455f..876758ad1c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png index 50def373e3..6db1c12d98 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png index bdbd3ea488..ff454fb5db 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png index 7822bf686c..bb33c2d6c1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json index f61c82ce0e..b70dde70e4 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi and modified by KingFroozy (github) for space station 14", + "copyright": "Modified from https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi by KingFroozy (github) for space station 14", "size": { "x": 32, "y": 32