]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix Animal Versions of Captain Uniform (#36804)
authorGhagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Tue, 22 Apr 2025 01:03:36 +0000 (21:03 -0400)
committerGitHub <noreply@github.com>
Tue, 22 Apr 2025 01:03:36 +0000 (21:03 -0400)
* scienceevasuit

* update money uniforms

* update meta.json files and hamster hats

* revert scienceevasuit

* revert accidental prisoner eva change

12 files changed:
Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET-hamster.png
Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png
Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING-monkey.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json

index e997023f3023c238335308c546b1dbd5a2b84f51..d65bcb4a766d6ad076962e8484a9e01478343bf5 100644 (file)
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
index 2a334f52b7e0ee6f999fde271f514e7a20024c2a..213c954df1b8139d9d53d51134e2a8abac2a7f47 100644 (file)
@@ -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
index 81ed7934ce49b89ef0f600b61790221efb7af93b..d27481309b99b1ccd5859893ad98ed6fcb3910b4 100644 (file)
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
index ae83b3a1d48feaed98262667aae45f8f50ebb18d..a37d024058ccada7135494a4e48d42510a994997 100644 (file)
@@ -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
index 01587136da77fb05d931839c129e8a0c34470c43..55c01ba665f835ce051b1bf50bb112143babecbd 100644 (file)
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
index 781a55f15bd29188e6780d939c1a451f755a03f4..d4d7c3905f8abda71ffc167ddc26c6f4818ffe27 100644 (file)
@@ -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
index f7e8abd58d4b14261df308e958f5193891a7ed13..a49fbd18d0f60795672073cc7dabfdbcee0d3792 100644 (file)
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
index 6eb08f0f320f52c640a8e7bbc4a5e81a87228124..a4286dcf550689727ea4d42ce1a54e16ef5977a4 100644 (file)
@@ -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
index f7bd08b91d7a7f942208f79187dcf07a092433a5..4f53b6934e9c02d4d4a49f79f625fa46c65615ac 100644 (file)
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
index b3cb02b2814d6a25fc97667096b3b5d8c08536b4..bcde42c95ad8d88c07d441bf0b8b174bdaf0e59f 100644 (file)
@@ -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
index 368d24a333193e5d6275c28b6b4599a3d292dfb1..c79f3a75ac27fb4720971e2dc52e9d8d9e1d1a61 100644 (file)
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
index 6eb08f0f320f52c640a8e7bbc4a5e81a87228124..a4286dcf550689727ea4d42ce1a54e16ef5977a4 100644 (file)
@@ -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