From 0639a493908025ddee13a33ebbaf7c127bbe2ecc Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Sat, 4 Jan 2025 17:34:51 -0800 Subject: [PATCH] Fix rainbow lizard plushie inhands (#34128) * fix rainbow plushie inhands * address requested changes * attribute sprites --- .../Prototypes/Entities/Objects/Fun/toys.yml | 10 ++++++++++ .../Textures/Objects/Fun/toys.rsi/meta.json | 13 ++++++++++++- .../toys.rsi/rainbowlizardplush-inhand-left.png | Bin 0 -> 1153 bytes .../toys.rsi/rainbowlizardplush-inhand-right.png | Bin 0 -> 1116 bytes .../Objects/Fun/toys.rsi/rainbowlizardplush.png | Bin 0 -> 433 bytes 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-left.png create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-right.png create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush.png diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 0eeb92e02f..2db5cf8335 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -354,6 +354,8 @@ description: An adorable stuffed toy that resembles a lizardperson of every color. You just might trip while staring at it... name: rainbow lizard plushie components: + - type: Sprite + state: rainbowlizardplush - type: PointLight radius: 1.5 energy: 2 @@ -364,6 +366,14 @@ head: - state: lizard-equipped-HELMET shader: unshaded + - type: Item + inhandVisuals: + left: + - state: rainbowlizardplush-inhand-left + shader: unshaded + right: + - state: rainbowlizardplush-inhand-right + shader: unshaded - type: entity parent: PlushieLizard diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index d39b47ab50..61fcdd96fd 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", + "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", "size": { "x": 32, "y": 32 @@ -76,6 +76,17 @@ "name": "rainbowcarpplush-inhand-right", "directions": 4 }, + { + "name": "rainbowlizardplush" + }, + { + "name": "rainbowlizardplush-inhand-left", + "directions": 4 + }, + { + "name": "rainbowlizardplush-inhand-right", + "directions": 4 + }, { "name": "narplush" }, diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1b0867355b93ec99ed081193ab3fb3b93b422b77 GIT binary patch literal 1153 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>V6paeaSW-5 zdmD9DdrP2*egDZHVT)=~j-Cth+_d#0zl7>yNy9fax+lUjXH2c}Jv>?RXH>wOsZ-bX ziu9^@ZE^_Q$NTQ~`)emYRJ9kbw|ReOdCSb|^S1l%|D0Pq-^zWlM*S9z0I&gnle7#dDA@m1b^ zSFUK=?YC(gH*REEbm`Ki6`M8%&7L(YDgSyc>z(v#UdjyZ-@kv~yk?EgsFK#;`}X7ZuV22L_-wh!VTOlAJ0r@= z%^Bw$fBf(#KhwJP>rbW_?VV$5Xn2r8V!raN4l9wuk`kAfFJA`qnAk6sWMiB>c{0xf zVIiT6^z`<={{EFqmbCc!`>))--TcX$hYu6mGL-+HO*6iG?_QB;NJxms*T7YU6AaAF zk8^Qx?O1dC*s&EWR&=;uds@^w$JW5$z^2WcE1v{ve_(c66Sg`;eyJ3DhRBXTe`@Mj z^YZfcJ^B9nRi9~x1w*oI*Zs3+d9Pl-?)}~W7o)?Q@4siBOnJ05AvwAE|GxeEm$$XC z@m`lNl6#<7S<@$CVPo?o^TO4us#o1t9%HO4DVZ{L+BBi$p0M!nm5UcUf3Dj5=je;l z7It>_o8P{fiHeJVR;nl{IKZ709X%W52ze=~B!+vJE*(1WIM4Z(-*V$8F?;kMbg?j| zrl#)6h|&>Txo_|8Zu`&IRFZfPl$Dj$aje_3XU@Z2F)=ZJ>^TJ-7kNnAAKK*6?s_|j zr6cW1#TnI|m|^)w!S$kDC;hUsF@=}qQF zMu#qVa`8njINFvu<<+ZK^+|t>7&DU1O-*Yn=j%Lh+&#nH>Aaw=hs_LUhy8{E9383- z*Gs=iW}amGbIq=5LWdp4hN!hQQmna_$7Vz@)g={Z3VnL^{JCV*>lsFwd3n!b)6PiG zJeyX?@?gT&t)@P8e|Cv5WR~ro`}FD4!k3HXwrtzh_SN`JQ-aB{3jeV}J$-#mW##7849ex&+S*&TZ23~lY9YfH77^j``t|EMvFoq@e$DaX_3LCy zOUpUCH*Yqs<6Xp-lbd_-)2C1E|JqoSHsAd5wdtd&h*<3P!|ys(n(p6h&NN|Jws-H` z-)u$($t}^0UN`RERh@tSd-(o(*%|KzK3|41=eu KpUXO@geCxJz9cmO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..462867a245b0a9b6baeccbe8c897d3b116f82176 GIT binary patch literal 1116 zcmV-i1f%Px(7D+@wRCr$Pn%ygGeH6#n#&}m0lB7s7QF7zfm2yvU;Vm=MW@3=5VNytLyxol< zGZ`u4A8_MVl5**eD|snW-i^lZ^j$UQoas5wv-f^dXZD`olw_>EXTG2HUF)}NErnA2 zrKGrik^rOwQk;M+ffP4@Y=W``WC^4=0a*emZUA`-$P$nxkm3Yn38c6IG)ipIW^z!n;ZzI8Y&t|hF0*J+8A}=qG0iX}K-EIz=o0}uA*K4Zm#{u~L zesO<)PZbpvoN>4Tu7FMe85|t^<$#%)8BtPFLPtkOR9;?Ab#-<0_V&gQTrQU>0RY6_ z-kyNioSYnrMx%s200)eXjV1N~uh%O;>g42vMn*;$;@R05_4M?ZRy;I>!(lE1^fmmz z3D?)xG&wn$2mswOUMG!>jeHcIpPzG`nEhdCeSKZz=H_zqgDwDpBYrl)wY4>om6gSI zZ)$4d-?3PX>~_29#V;%@2z36+%1SN)=tQCc0X=~Qf)LI}r_-t6g4WhnQWS*_4-d)X z@t7LI;^HD7hgDToEcp2NnCk26X<}mHAI|~g^ZD2+@%mU^UKRi`K0a=02uN}y5)o+X z2L}fX07w1Q)KtQA0L{zngA3<;qe$oN#Ssq0bt6S zj59-&s;a7*ntq3)861s9dAf=cSXo)&?Fx*TySuwJuhpA{?~40B4O*9orKKgFu%Z+$ zE-ok-4C=b>yM*bzkIUr}EiEmElA|f4qoYH#wYBkT8M1$OcSi*U1xdL!CwX z(EN`78sKm^L~U&?XC7T2`!x`a1quMc2PNb7n5wD*4IArlDBDmd^q&y^_|LAcE+!d? iL^KJ0N9O+KJ$?XdKc@@GQVKx;0000Px$Ye_^wR9Hvtmc0#xFbsu5#Q@O208}i(8e|E28WO6OHlJ@{fTuO;>WC&`YJgXeaHmXM_sClm)5JK$V+qC}Y09WDw0Jd|^f71gL0E9pS z&N+FrKdfKr=#haU3(fdL5vy>(hUCUju;bVHh&c^L7ZRd|4JYO_LIb zNf?HKTs^r7aU8(~=y?5rI0)lGfUC;)u|D