]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Add an in-hand sprite for the lizard plushie (#32583)
authorKieueCaprie <103897346+KieueCaprie@users.noreply.github.com>
Mon, 16 Dec 2024 14:14:51 +0000 (14:14 +0000)
committerGitHub <noreply@github.com>
Mon, 16 Dec 2024 14:14:51 +0000 (17:14 +0300)
* add hold sprites for lizard plushie

* make the lizard plushie sprites slightly chonkier for those who are not wearing winter clothes.

* me when i hit the noise button and pretend it's shading.

* lizard plushie is not legally-distinct green dinosaur with a long tongue™ (front sprite tongue has been shortened)

* update meta.json

Resources/Prototypes/Entities/Objects/Fun/toys.yml
Resources/Textures/Objects/Fun/toys.rsi/meta.json
Resources/Textures/Objects/Fun/toys.rsi/plushielizard-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/toys.rsi/plushielizard-inhand-right.png [new file with mode: 0644]

index eddf92c5aec0ac5f8c3c838c65ad58a9b77723ed..60420bb9d9342d42a379f0889ececf9eab023ab9 100644 (file)
   description: An adorable stuffed toy that resembles a lizardperson. Made by CentComm as a token initiative to combat speciesism in work environments. "Welcome your new colleagues as you do this plush, with open arms!"
   components:
   - type: Sprite
+    sprite: Objects/Fun/toys.rsi
     state: plushie_lizard
+  - type: Item
+    heldPrefix: plushielizard
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/weh.ogg
   - type: PhysicalComposition
     materialComposition:
       Plastic: 25
+      
\ No newline at end of file
index 45f429f3e69fb7b3a7f670e69155633616176467..b4db18defcc2a0e3831b8d870d32d3fee1c83216 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/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github). Lizard hat sprite made by Cinder, rubber_chicken by xprospero",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github). Lizard hat sprite made by Cinder, rubber_chicken by xprospero, in-hand lizard plushie sprites by KieueCaprie",
   "size": {
     "x": 32,
     "y": 32
       "name": "plushie_rouny",
       "directions": 4
     },
+    {
+      "name": "plushie_lizard"
+    },
+    {
+      "name": "plushielizard-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "plushielizard-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "lizard-equipped-HELMET",
+      "directions": 4
+    },
     {
       "name": "plushie_spacelizard"
     },
     {
       "name": "plushie_arachnid"
     },
-    {
-      "name": "plushie_lizard"
-    },
     {
       "name": "plushie_lizard_mirrored"
     },
-    {
-      "name": "lizard-equipped-HELMET",
-      "directions": 4
-    },
     {
       "name": "plushie_lamp"
     },
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushielizard-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/plushielizard-inhand-left.png
new file mode 100644 (file)
index 0000000..90e6214
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushielizard-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushielizard-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/plushielizard-inhand-right.png
new file mode 100644 (file)
index 0000000..abc547c
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushielizard-inhand-right.png differ