From 82af30be97a2fea030bc2616e5e140be2c7d6724 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 2 May 2020 07:08:05 +1000 Subject: [PATCH 1/2] Adds a *myarp emote. --- .../modules/mob/living/carbon/human/emote_vr.dm | 8 ++++++-- sound/voice/myarp.ogg | Bin 0 -> 14516 bytes 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 sound/voice/myarp.ogg diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index b644b59d62e..863f388e916 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -47,6 +47,10 @@ message = "lets out a merp." m_type = 2 playsound(loc, 'sound/voice/merp.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) + if("myarp") + message = "lets out a myarp." + m_type = 2 + playsound(loc, 'sound/voice/myarp.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) if("bark") message = "lets out a bark." m_type = 2 @@ -90,10 +94,10 @@ /mob/living/carbon/human/proc/handle_flip_vr() var/original_density = density var/original_passflags = pass_flags - + //Briefly un-dense to dodge projectiles density = FALSE - + //Parkour! var/parkour_chance = 20 //Default if(species) diff --git a/sound/voice/myarp.ogg b/sound/voice/myarp.ogg new file mode 100644 index 0000000000000000000000000000000000000000..bc57408449fb58426bd04e74ee623ffba9421a5b GIT binary patch literal 14516 zcmeHuXIPUb&NVhBM9Z3ChvAw;@#0*HoCq*@TLZMPv5Lns0QA~p!c z5I_L|k!=A4L_kF;B5oUYEZe@-UAQm0zwdnayXQIQKF@jXzdO$`%&b{6>z&nR&Ae~c zY}nur;Nb5x5%axbf8@kh*kV}Prety4)_D+|-}pDmmhZ@&ur>1||C#1T!l2d#McWsx z<#Yd*iV)wYGJ`OLahqe8tx4WMO^g!&*v7@}ib-vbbnNwbp(@%-a zV-NhJpxQ*~0DuG%2DYI3iCg?thYgga1<92Tao+aFscLfH`wrONk0y~D>)PrPHeNL~ z#%P3~pmhU|D=mxUH(!Wlv}_7g>@`Rpq#Zw;jAJS*r8uiWYKEuP^P2tMj?b0V1&*_f zwo#tCdD{(lPxeGm}Bgcf4MgRAi6FbNR9Eg{fwisO6V&vjy zbSaso_Km}X0Fo)kkJX=SvwEw|rL9g-UY)|fT;h4X>CQK43UO9+h(8LfDtJVSzNIVFddwx0?3KHuMJQNQl+)gFfj z(1@JrLkVZF;ZW^M)Zy1xu=B8gS04@}w}>gqz!52RcL7>VqSev%FHYH~xxbPRwD=#zH&ysZoVowC*<}$u3VGGCdAi#lH&f zjnOsYqU-;Xue~+!)iQ?ibt`j!>lJ|kfx&4>AqP@#pUw)OO1*b;_r06>>lbGKyJG#* zasXsBncr-(M4ZRIbU4GChy5<#e^|~I(xoDU%SA>WtwvrqSXbWJta)#9UE9Ui#>-zP z{JKu+7&+SCE_}>3dMq${A}#t>M|9Zf-60)+8_ajJxpy=5Uo2!UE(`xv0049s;yu3k5nn&^ z2|wEjKl8wV75}xxK)n+-USl>8V@m

jLl-S|#TEpeek4mTF#)@RVa*75n_>a}@$ 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⋙2h%;Gq z%=R6 zk}P>=@63HLIdh}`Mc3q}cJh19q8EzOfr+0hkN$lA% zmRkx?-~+Q`in1suygC-N2g|+3Sl{oAvyuCJ9|Bm6=vrqeq@tqAj{3?!L8P1To-U$nOU9r>4V#W3iEtwIh z??2^0#_fcnEGW%iH$ZR5K=hwWlhx;(=lFA8b9Qs9T#oL#BX6?ODqh)sbT<3Qw+6j< zWof}|&5jE+KS8ZtNWF&eUGMb$`(YND8J!AmzV|FO)6Aq>6FN^ruUX^sRKmz4jj-ID z2;#29zDZ41$0u1t3%gIO(x{VBv&+drO$X~_XWb_k=br4ig>IvBic^&`u}?sMhe)j< z$x>9G=YwbZ6h-HS`<81KaZgcOhBS?=+qwr~k$sewvC-*b=OD1Hw}H;CzqAaw!ti?X z1zJU{pg|n?a-7fUp^lDF)dplAkI`PWRYo864(F$g?MtjPSg=Svx{ zmy!ZV2&sAOG0Cxt{0b9zxyj^zu0=R9?ke^$mucu(1uGE#@h~0`#&*V zI_31kPo}!Z=LE~EZ}MR#UkGE;S|F>6OLnm8nhyc24I0@QJatJ{XW&1nn{xR8~5ho{x%+ z@zw1Twa@)1^wc~5{}WS=s^=yq*4 z?mP+J928|#-f{4u>#emACKYr)?Av{E$&Jkyw8j(iPnoVC8fet43go22RtDR+!^78W zbSrxA2}tqug)f@0!hp~BbSobTcewAMS1p-*P|4oC!FINfVG=`*jFIcgxD(WC&5!LK z9_%=MQ7mn;e;BD}@AtD-Dqi*GoaXY+^(YumH~W_s!*7(@$vxw4y|pM1ObQQr>TO(un2A4 z2c??QUP@vj4T@cmgma>l42&{~Yl(qg1!Q`~!iSp+G3^!Cur4C(FXnJUdSyeQOQ(-}Lrjan5WcvN|%vwSfJwt=J9r^Bay5`AEK_l_% zZ^v|NhGGs^CWaZDTdZlGJoa|Qnj+=;<;MZa)JdE|ZAF$dt_eO4YT-k{al}&_S4J>h=V_p+DZt4r`YkaWXrC-ES19 zn!ZiXo=UvZ8C~>9jcO*n Date: Sat, 2 May 2020 07:11:57 +1000 Subject: [PATCH 2/2] Forgot to add it into vhelp. --- code/modules/mob/living/carbon/human/emote_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 863f388e916..478ce4da510 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -81,7 +81,7 @@ message = "does a flip!" m_type = 1 if("vhelp") //Help for Virgo-specific emotes. - to_chat(src, "vwag, vflap, mlem, awoo, nya, peep, chirp, weh, merp, bark, hiss, squeak, nsay, nme, flip") + to_chat(src, "vwag, vflap, mlem, awoo, nya, peep, chirp, weh, merp, myarp, bark, hiss, squeak, nsay, nme, flip") return TRUE if(message)