]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Inhand sprites for figurines (#36017)
authorTheProNoob678 <147959703+TheProNoob678@users.noreply.github.com>
Tue, 15 Apr 2025 04:15:49 +0000 (23:15 -0500)
committerGitHub <noreply@github.com>
Tue, 15 Apr 2025 04:15:49 +0000 (21:15 -0700)
* figurine sprite update

* Updated meta.json to credit inhand sprites

* Update meta.json to credit inhand sprites

* Updated meta.json because crlf check

* potentially fixing CRLF issues in meta.json + consistent spacing

* Fix CRLF, maybe?

* properly credited myself for all my amazing work in the community

* Reformat meta.json as per the newly merged "fix as you go" procedure.

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Resources/Textures/Objects/Fun/figurines.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/figurines.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/figurines.rsi/meta.json

diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/figurines.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..06e9967
Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/figurines.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..074285d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/inhand-right.png differ
index ebbb50e7961832ec6c1324b4421508c4e3a1c12c..31208a764a35c65b060a7e2ecb96edbbc74f7596 100644 (file)
@@ -1,12 +1,20 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Sprites made by Flareguy for Space Station 14. Griffinprize, skeletonprize, thiefcharacter and owlprize taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Figurine_spawner sprite made using parts found in spawner_icons.dmi from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37. Head sprites excluding Captain, Medical exluding doctor, non-human excluding queen and slime, and service jobs excluding librarian done by tacobeller and holoclown done by brainfood1183.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites made by Flareguy for Space Station 14. Griffinprize, skeletonprize, thiefcharacter and owlprize taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Figurine_spawner sprite made using parts found in spawner_icons.dmi from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37. Head sprites excluding Captain, Medical exluding doctor, non-human excluding queen and slime, and service jobs excluding librarian done by tacobeller and holoclown done by brainfood1183. inhand-left and inhand-right sprites made by the_pro_noob678 for SS14.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
     "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
         {
             "name": "ce"
         },