From: SeamLesss <kai.julian.watson@gmail.com>
Date: Wed, 19 Feb 2025 19:27:57 +0000 (-0800)
Subject: Space Lizard Plushie In-hands (#35295)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=33b9149a56a449a470b95403f1a79f2e18719931;p=space-station-14.git

Space Lizard Plushie In-hands (#35295)

* space lizard

* attributions

* attribution fix
---

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index eeb0fa6bff..585e3b31f1 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -391,6 +391,8 @@
   name: space lizard plushie
   description: An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentComm as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!"
   components:
+  - type: Item
+    heldPrefix: spacelizard
   - type: Sprite
     state: plushie_spacelizard
   - type: EmitSoundOnUse
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index 4a0cb492eb..4bfa1f10d9 100644
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.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/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, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba, rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba, spacelizard-equipped-HELMET by miamioni",
+  "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, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba, rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba, spacelizard-equipped-HELMET by miamioni, spacelizard-inhand-(left/right) by SeamLesss (GitHub)",
   "size": {
     "x": 32,
     "y": 32
@@ -201,6 +201,14 @@
       "name": "spacelizard-equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "spacelizard-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "spacelizard-inhand-left",
+      "directions": 4
+    },
     {
       "name": "spbox"
     },
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-left.png
new file mode 100644
index 0000000000..25ba6f710b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-right.png
new file mode 100644
index 0000000000..1ab7c53ed7
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-right.png differ