From b1c89d059c95eb1fcc0e35bd49d37061d37ea070 Mon Sep 17 00:00:00 2001 From: Tiniest Shark Date: Wed, 19 Mar 2025 19:14:17 -0400 Subject: [PATCH] snake can now be seen inhand and worn on neck like friend (#35323) * snake can now be seen inhand and worn like friend * Roomba's additions Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * Update Resources/Textures/Objects/Fun/toys.rsi/meta.json Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * Spacing adjustment Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --------- Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --- .../Prototypes/Entities/Objects/Fun/toys.yml | 9 +++++++++ Resources/Textures/Objects/Fun/toys.rsi/meta.json | 14 +++++++++++++- .../Fun/toys.rsi/plushiesnake-equipped-NECK.png | Bin 0 -> 565 bytes .../Fun/toys.rsi/plushiesnake-inhand-left.png | Bin 0 -> 527 bytes .../Fun/toys.rsi/plushiesnake-inhand-right.png | Bin 0 -> 526 bytes 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-equipped-NECK.png create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-left.png create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-right.png diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 5dc2c0713c..0c037d93a6 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -791,6 +791,8 @@ components: - type: Sprite state: plushie_snake + - type: Item + heldPrefix: plushiesnake - type: EmitSoundOnUse sound: path: /Audio/Items/Toys/rattle.ogg @@ -814,6 +816,13 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Items/Toys/rattle.ogg + - type: Clothing + quickEquip: false + equippedPrefix: plushiesnake + slots: + - NECK + - type: Speech + speechVerb: Reptilian # for pais (In the secret stash) - type: entity parent: BasePlushie diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 4bfa1f10d9..837f7e921c 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, spacelizard-inhand-(left/right) by SeamLesss (GitHub)", + "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), plushiesnake inhands+neck by TiniestShark (GitHub)", "size": { "x": 32, "y": 32 @@ -141,6 +141,18 @@ { "name": "plushie_snake" }, + { + "name": "plushiesnake-equipped-NECK", + "directions": 4 + }, + { + "name": "plushiesnake-inhand-left", + "directions": 4 + }, + { + "name": "plushiesnake-inhand-right", + "directions": 4 + }, { "name": "plushie_vox" }, diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-equipped-NECK.png b/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..0d33d70972e9f38c011f11ce7e1ace96a9999580 GIT binary patch literal 565 zcmV-50?Pe~P)Px$?@2^KRCt{2+CNLfKo|z_r`kBg6CJc7h$x-9I6I4rtKbLd-bIjZQc5?Mf@IGJ zD7bbh9h^FMaVmm~{|a_Ev&3=^l8S9w@6x1Ne14Fn@AdAz%Vm0BfQX2QNJG8jsA=NU zy1tz}|4;ES3%UdA9Y@JGA6GZ$p^IGIoGba}M@m9>{l4$RX%s`}cUu+J_kH7+kk%de z`0@&23v6%fhQ?QxR!!E8Y%{YJddPj>k2Ih54FG^e%NiTYA6%rQCnF`H<2YML$!-t8 z=Vpf=0Fd1tjB-Tj+e7}aY_xd*F#3brswiO# zELs*$a^FvSQtU4?x&gs8AO7Cvb@P#_U-|@+U~~hBh=_=Yh=_=Yh=^#e8C7wdMp0$= zc1C_TEl9>CtQ6k4yGP;ZQac~*fli~SHZxnHF|lmT{1AeEg)mRg588*IHOOt2lvrQG zp#1Hww#nEQK00000NkvXXu0mjf D6~O*h literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..677e37a2d68caeb9944f588a68c0dd57a51de0c2 GIT binary patch literal 527 zcmV+q0`UEbP)Px$$w@>(RCt{2+OdklKoADt@gx=!@gb~y1FP$8eFJ;B%GS#E;6S$b0S;`_TUlRY zApsjfun56mAVKyDO~`4~-LRvc{9k24@+Xcl24{!>0000000000peV-`(s6}6T~{>A zM9wX5rh<|aT&$LV)-P5|?UQ$0A@g!L7%Kn~Q5X@`D)n@EH0{e;rA}d_{s}s+kV(#H z+E4e%=9*-*0H;3QKTD6?Uxo1k*j4-L^1X9zVZ8$W0~CP!0KqP}>wdb77NFDYB`?qJ z`0Ykd>4tV;JC4*wwQ9Gk5(wBC4ZMQ~gp z*PHxaL$;rwf~5epN}a8no3N|)*~~zZc?6aM*j1a#mcw8$lK8|x|2<|mkaMQ7)tM!|#;+S`_13jJ%)w>2nnU5>#npl)lB`z9}~e;CuV0+>B8>=z<$&aeDG RNzVWP002ovPDHLkV1k|u=xqQ1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/plushiesnake-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1b56d34389f12ca8006ef562e1af7895763b3e53 GIT binary patch literal 526 zcmV+p0`dKcP)Px$$Vo&&RCt{2+OcZFP!tB>-%1=L;zM-u4V=1n^$pymldF?!p&;3PfP!oGPR?B% zN}x+YaFAe7NRZpXCaAeLCU|d5@&6`o)SKhs7(&hgh=_=Yh=_=YhzI~&&k^VA^J7&c zi#zM{52{VRe!fqR#p|jkK^Avb%&7#po+EZ4&}y_X`4}c&Y&F{0g*rnuqt$39uO}Zv z5y!1cg0uo+FHf&E&GD5gPyEUR*iAcgT~$Tn&a8lYzyzq?2)03)aTs&yccc>V{5X(Z zI0OLnIs-jXnU}iaD}I-}0(^gsP3R}<>3j?Tm@ORTMpY8W3jmwYhwrbi-cZaI)xH5b zHl2_4#wsKwMMOkIL_|bHL`3(gtZuQX^W^Rfxt=3rPg^gwpLLM6>vbvA8awV499yo| z#**NAj##d)e6F7%R{~Ts1Hj>!>CUm;v`_l}I_0i_eG~ym_uTEKjk;xN4(n9ivWz7; zR|4Y6kpD6xPz2lKw+`Ue3MD|+YY(