]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Resprite rodent inhands + add hamlet inhands (#28955)
authorVerm <32827189+Vermidia@users.noreply.github.com>
Fri, 14 Jun 2024 13:45:01 +0000 (08:45 -0500)
committerGitHub <noreply@github.com>
Fri, 14 Jun 2024 13:45:01 +0000 (09:45 -0400)
* Resprite rodent inhands + add hamlet inhands

* Small ham adjustment

16 files changed:
Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-left.png [deleted file]
Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-right.png [deleted file]
Resources/Textures/Mobs/Animals/hamster.rsi/icon-0.png
Resources/Textures/Mobs/Animals/hamster.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Animals/hamster.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Animals/hamster.rsi/meta.json
Resources/Textures/Mobs/Animals/mouse.rsi/0-inhand-left.png
Resources/Textures/Mobs/Animals/mouse.rsi/0-inhand-right.png
Resources/Textures/Mobs/Animals/mouse.rsi/1-inhand-left.png
Resources/Textures/Mobs/Animals/mouse.rsi/1-inhand-right.png
Resources/Textures/Mobs/Animals/mouse.rsi/2-inhand-left.png
Resources/Textures/Mobs/Animals/mouse.rsi/2-inhand-right.png
Resources/Textures/Mobs/Animals/mouse.rsi/meta.json
Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json

diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-left.png b/Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-left.png
deleted file mode 100644 (file)
index c8a6e78..0000000
Binary files a/Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-right.png b/Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-right.png
deleted file mode 100644 (file)
index 18e5157..0000000
Binary files a/Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-right.png and /dev/null differ
index de09d6311da69d5aecdb2ba7213ba49a66a7effe..5c5c8a891b3c8bc945caefbeb740a3600ab24de9 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/hamster.rsi/icon-0.png and b/Resources/Textures/Mobs/Animals/hamster.rsi/icon-0.png differ
diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/inhand-left.png b/Resources/Textures/Mobs/Animals/hamster.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..4ea3a33
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/hamster.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/inhand-right.png b/Resources/Textures/Mobs/Animals/hamster.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..9494fc1
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/hamster.rsi/inhand-right.png differ
index 85616627cecacda0475671daa57e69379baa357e..4a59c01d0963eb9d96c694807ca8e218c12ef562 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Created by brainfood# 7460, hamster-0 resprite by RamZ (discord)",
+  "copyright": "Created by brainfood# 7460, hamster-0 resprite by RamZ (discord), inhands resprited by Vermidia.",
   "size": {
     "x": 32,
     "y": 32
       "name": "splat-0"
     },
     {
-      "name": "0-inhand-left",
+      "name": "inhand-left",
       "directions": 4
     },
     {
-      "name": "0-inhand-right",
+      "name": "inhand-right",
       "directions": 4
     }
   ]
index 4e5244ab3a66091c99b8e85fd8f25807670d93a0..63b009dffdd33dc751169ec6169978d8cfdef085 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/mouse.rsi/0-inhand-left.png and b/Resources/Textures/Mobs/Animals/mouse.rsi/0-inhand-left.png differ
index 54edb0052838bd9a029d20be315106a111120d13..22f53f89a12125c16031e077bfaba42533341a93 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/mouse.rsi/0-inhand-right.png and b/Resources/Textures/Mobs/Animals/mouse.rsi/0-inhand-right.png differ
index 634ba7254cb1e0bfb1541839d5dc1c8794b78284..55d5e5f39cdbd5baee38aa1fa5e109cc8c979c88 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/mouse.rsi/1-inhand-left.png and b/Resources/Textures/Mobs/Animals/mouse.rsi/1-inhand-left.png differ
index 2af0144edb4326ba5a4131b3a63ac0879899edc0..44386b1d5fb515ebf1a39a4d587bbfa97fd33963 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/mouse.rsi/1-inhand-right.png and b/Resources/Textures/Mobs/Animals/mouse.rsi/1-inhand-right.png differ
index d7dd6672041e6ec4d060594161eacaa84c227b8c..68da6f38d7bcda1cac24c5b52dc815654b1fc3ee 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/mouse.rsi/2-inhand-left.png and b/Resources/Textures/Mobs/Animals/mouse.rsi/2-inhand-left.png differ
index 23b4e08a3ec4f7a33c7f6f4ef5f31d1e04abf693..0cdf92945956755f84208b5caaccdc83072ab636 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/mouse.rsi/2-inhand-right.png and b/Resources/Textures/Mobs/Animals/mouse.rsi/2-inhand-right.png differ
index 8fcbe50997a3b87976ff0784029b85eda25b8846..87c0bd4d3477ef4b587e76fbd5230c2e66b7606e 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/e15c63d100db65eaaa5231133b8a2662ff439131#diff-8dd94e19fdb2ff341b57e31bce101298",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/e15c63d100db65eaaa5231133b8a2662ff439131#diff-8dd94e19fdb2ff341b57e31bce101298, modified by Vermidia.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-left.png b/Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..ea3393a
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-right.png b/Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..2ca84a7
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-right.png differ
index 7fa6edb9ece64da39ae6f0451df3d6d5dbd23d79..3eb8229d247c814c2ae790a7b6de10ed5d675047 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Created by brainfood# 7460, hamlet resprite by RamZ (discord)",
+  "copyright": "Created by brainfood# 7460, hamlet resprite by RamZ (discord), inhands made by Vermidia",
   "size": {
     "x": 32,
     "y": 32
     },
     {
       "name": "splat-0"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
     }
   ]
 }