From 5e784f40b70d7af57bccaff3e9e905f46dc9aef7 Mon Sep 17 00:00:00 2001 From: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com> Date: Sun, 15 Jan 2023 16:51:04 -0500 Subject: [PATCH] thibgies yeee --- .../code/game/objects/items/plushes.dm | 8 ++++++++ .../code/modules/mob/splurt_emotes.dm | 18 ++++++++++++++++++ modular_splurt/icons/obj/plushes.dmi | Bin 2262 -> 2507 bytes modular_splurt/sound/misc/dog_toy.ogg | Bin 0 -> 6880 bytes 4 files changed, 26 insertions(+) create mode 100644 modular_splurt/sound/misc/dog_toy.ogg diff --git a/modular_splurt/code/game/objects/items/plushes.dm b/modular_splurt/code/game/objects/items/plushes.dm index 33a6a2f1f1..588e204edb 100644 --- a/modular_splurt/code/game/objects/items/plushes.dm +++ b/modular_splurt/code/game/objects/items/plushes.dm @@ -20,3 +20,11 @@ icon = 'modular_splurt/icons/obj/plushes.dmi' icon_state = "plushie_mal0" item_state = "plushie_mal0" + +/obj/item/toy/plush/nobl + name = "Nobl plushie" + desc = "It seems to be a small canine, not necessarily latex like you would suspect for some reason, but extremely squishy." + icon = 'modular_splurt/icons/obj/plushes.dmi' + icon_state = "nobl_plush" + item_state = "nobl_plush" + squeak_override = list('modular_splurt/sound/misc/dog_toy.ogg' = 1) diff --git a/modular_splurt/code/modules/mob/splurt_emotes.dm b/modular_splurt/code/modules/mob/splurt_emotes.dm index e7984093f1..3f96222e75 100644 --- a/modular_splurt/code/modules/mob/splurt_emotes.dm +++ b/modular_splurt/code/modules/mob/splurt_emotes.dm @@ -911,3 +911,21 @@ key = "facehoof" // For horse enthusiasts key_third_person = "facehoofs" metacarpus_type = "hoof" + +/datum/emote/living/poyo + key = "poyo" + key_third_person = "poyos" + message = "%SAYS, \"Poyo!\"" + emote_type = EMOTE_AUDIBLE + +/datum/emote/living/poyo/run_emote(mob/user, params, type_override, intentional) + var/datum/dna/D = user.has_dna() + var/say_mod = (D ? D.species.say_mod : "says") + message = replacetextEx(message, "%SAYS", say_mod) + . = ..() + if(!.) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 1 SECONDS + playsound(user, 'modular_splurt/sound/voice/barks/poyo.ogg', 50, 1, -1) diff --git a/modular_splurt/icons/obj/plushes.dmi b/modular_splurt/icons/obj/plushes.dmi index fce9b888047bd16806251648ba4a73987586bf77..a8ce5f21fd5e1969216503472053ab8bcaf87d48 100644 GIT binary patch delta 2310 zcmV+h3HkQc5z7;hBmv=(C6{9(BO|!DxE~)Mq7(%M1qCcADNh9j09F6$B^u+{)BrO8 z<^TZLe=qr{IA#C<7Z@^R0080J*dZiX0CE2w9v&AJ6%-T{R3;226$pcagRLf0ApigX z0d!JMQvg8b*k%9#0I-t>0V{uNyPAbGkz}>>?~M_>NGW@n8Q#vq=IT_Rn^skqM!wJo za#kHxxhhQrtX@m~OtA|08XQyKv4gy&6r>SwEU>u%lt{~xsP zJrJ6ZbGc(T3~?r}_Uic1_;4Xy zWEc5C!4IB1;Sbmijw645>-Tq&7Z(6{|M&hOccJbK?;o-Ubj@)DVhjwy*?YZf-ZzZH zKL*2rad`OWpS{fk3T`U6rQoX9x262(Xo%nius-c=9&mJIA`ryNa|?kWR-UU~-$o#a zmE)TB%yFKHS9pqW2M8__xsDH?C(*(zYM;*&83mgj`bu4#X z@aNBU*L7KL+u&I6sAIV{LXPqK*l~vaej_&(+){8?!R>!dj0mmv(7O#aEqo0Zq+%)2JX@n!QDE?*uZU?BDh`WxG!`M8%(PP!TM)zlZd(GW}RC^ ztR=VV+$G{Jxm)Kp5qrt)jnDkL=iv-!1;+&SMs6y&rQoiD+jYJc2OHhUvC)kj8{NpU z(TyA%-Q0gL;Ay?ne4l-~Oy~WditqcueLvVe-}i(2ez4?PTArQpM^B933R(U@t44e8pVc5ilVG|dIOyP3LYtVEaASdkB+h6QOEXkK>&^gk2;ozAvhL1>R28{;8^geV|g5dW5J_N z*$?`P{w`4PP{AVwk2g8S=HdN?rs!ynU+?EIHt>L^2p-fq#s(hJ6v4wf$JoFlnj&~q z=NKD!Oj87pH~K-JnmK>j&-wMw+yRkb$%B774~c|J9@cq8BwF&Q&SN6+lE+j_J8B?_{C|1VAuWMIC=SU{Nm)a!LZx@4}QY%^z?rP z!ub{bT&n2rvbH$+3B$3(@8~E+Ac&Rk?=l4c0oE3{kaO^rj3;AWkoq}c*wo*N|DhFL z_z6QH$oh5L|Glh&d-+r%sA*~Hq(&<5=d#SnjI0e_>@NwPlHVEYM?cx8(ta)@p0&Zt z{e|Co;WuIZilmZ$E-QJ~1}D37L%dm`?N8Zyqa{%-+6z zo3v_qG0pS;;WvZZTOqkssg-|R(EQlTa6T7H(>Dvh8PcMkmQV9H`~c^R#T-k6p^ziN z7B?8TNB;UXFPI3yq`{D`J>l1yo;DT15IF|7#eA_YIA61!71L``a4LSBD9O1SF zi#@)+zW(y%IUGh~dmzS5T-wU(C?gm-D-ORTCK=~pvg<-kPtA^!Gy!iS} z_~rS!AUUoH&bBWIr7uOU^9{kPVsuyJx48UkT~LJFZf|T@7CC0 z7=A4@zhQuzhU9j8`yJ~|;kSK3nqYAO)}AJ~0RPth5jO|?a0P$nwLON+4a9EX_Z@$d z-`$pXScr*!t`Ou7$je*g$G<<4^_zq~Ba{TKSb8i-Q8?f z2#R+>T!nW?ThC;PUsDpHQwY+vch{!hV?u)W_xCsV_oUYDk0p;t@-VPnn_Za)sT~zu g$*%kDvvc_mRx}c(k~v~gHUIzs07*qoM6N<$f-2OJW&i*H delta 2063 zcmZA2dr%VC9tUs?3oVv3Uzm&NYI?~+OEYy*Q!6w}Y<*xi$_MGTWr@(FtOf z@pE?+_`~7w2ZkHh*DeGCvvK42j_ses?*Wd0Q2;R*&g}hx9@PHeDKjkwXY|sPig*JLs|=G&$QoM6&;ve3K{~ zHBiJXZAAb8Adufdui(Uzslx9_j4(sGWqgfg<^dz`k*DeU?=By4dJ~ukGS!zab=x|nehz(_$t+7dyvUEU)5QNx_3U?O7DD>Zb1LUsoC7@5NMutFw87}F!1B`rT{AU~X51|i$@`?9gOeRz7B})nksG|KoYs3j>p@1J{-_Sm z#3rT&f^?8z3ELs|lXPN>53F5(Z}sUE%v;CLg;upwl6?2?18fXt0PWOin4pu?Gk;3Z zJ!_!?+WnU#nspa+k&^bd!F3?E!v>OEX(tg�r3X;BK|G`h~PKIM>P=LO7>5%RWiM z@=}UG+ZEl?E<%!9-p>wqTkg03(eY`+EE$pyYy;j-%1AP-69yi00IRnWD1xbXO zTH%s{rL@teF35JkXt8XCsWLJ+g7NdtB0vQUMC zG&=D$A&!ZUwd@ZcHcaN#wP#s5P@M_r0Db8%#GBtq^MbS!ioeGLw+QJNqn5rkz-1C0oK#-v>3Yt zsA4ZFg55KWk>Sfux;i)H{jW&OHldzjiqvCW(QZnOOFvbelI$sVS1xm#;gf9m&B8Tg zOk#`b&d>>ePpG9{>k)Orp0BfBYJE5aCEo^@Eo9>Cu9VBfInTmGj8;t5K~dLx%(GxoO^2xJsK{!uIJtaE9>vG+##m!spz=`N zGt{FqM+IdKX6a6=INWR)k5Od1z4QaBTU9ms8y#KA%zV3s3`N+F_6_mPNr$811dW4 z&0LCpmQl_>;o;EnGXbLKgU6}p1yVdXdt;8A|D>GoaWJ)HL*lfwyd=O zj(~o>Iw6e7s=)h5%}18iF9yAJkPZ8A=@B;!Q>c=dCh|_U#~)KiR%&fwx;J(oF4Zwl z=G{-Q`z~G0O}!Bq9569I%BJ~`sh{sP)TqS7=dZi#**+gU=dzX9iYiu1J05psrvNk3 zC*MX3ac*C5Y~IBQrm+26b(m7SC`vRLOKCQUQmfV8O0h}ANZr3L)O9yC{_4iXv;;0u z{n~}?Wt;(D&eY{))$hBDX~Z1CIC61kzCK_fu)Xm{@ThFH`wg4SB}%I=Gh zFGHJm{V2v;+AP%{x#f1RDlS*4xf1SpDW35j<07mHYc$P}Xj2!F#G^HbohZpmb7Qlf aLe5e%?rF^RFJtTfHNfvsz(JOG1nn>SB^S#8 diff --git a/modular_splurt/sound/misc/dog_toy.ogg b/modular_splurt/sound/misc/dog_toy.ogg new file mode 100644 index 0000000000000000000000000000000000000000..de295dc148adbdae11fa247af366ab1cc8b2fa0d GIT binary patch literal 6880 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 V-wAyMi`I|20YwK`>qxK?{1+;Bb?^WH literal 0 HcmV?d00001