From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Tue, 22 Apr 2025 01:03:36 +0000 (-0400) Subject: Fix Animal Versions of Captain Uniform (#36804) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=5b18f99b8db8ea4c926b8f1afeaea45c1faf6f87;p=space-station-14.git Fix Animal Versions of Captain Uniform (#36804) * scienceevasuit * update money uniforms * update meta.json files and hamster hats * revert scienceevasuit * revert accidental prisoner eva change --- diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET-hamster.png index e997023f30..d65bcb4a76 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json index 2a334f52b7..213c954df1 100644 --- a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0671297bb1c1b31d5885f2768aecbe9dc51d39e7 , edited by Skarletto (github), edited by Emisse for ss14, inhand sprites by SeamLesss (GitHub)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0671297bb1c1b31d5885f2768aecbe9dc51d39e7 , edited by Skarletto (github), edited by Emisse for ss14, inhand sprites by SeamLesss (GitHub), hamster version edited by Ghagliiarghii (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png index 81ed7934ce..d27481309b 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json index ae83b3a1d4..a37d024058 100644 --- a/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github), edited by Emisse for ss14", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github), edited by Emisse for ss14, hamster version edited by Ghagliiarghii (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING-monkey.png index 01587136da..55c01ba665 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json index 781a55f15b..d4d7c3905f 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, edited by emisse for ss14, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, edited by emisse for ss14, monkey derivative made by brainfood1183 (github) for ss14 and edited by Ghagliiarghii (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png index f7e8abd58d..a49fbd18d0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json index 6eb08f0f32..a4286dcf55 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github), edited by Emisse for ss14", + "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github) and Ghagliiarghii (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github), edited by Emisse for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png index f7bd08b91d..4f53b6934e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json index b3cb02b281..bcde42c95a 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7,edited by Emisse for ss14, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7,edited by Emisse for ss14, monkey made by brainfood1183 (github) for ss14 and edited by Ghagliiarghii (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png index 368d24a333..c79f3a75ac 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json index 6eb08f0f32..a4286dcf55 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github), edited by Emisse for ss14", + "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github) and Ghagliiarghii (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github), edited by Emisse for ss14", "size": { "x": 32, "y": 32