From 51d2c98e33e2c993413ef14c29021ac23ba171f0 Mon Sep 17 00:00:00 2001 From: Amy Date: Mon, 20 Jul 2020 00:49:05 -0500 Subject: [PATCH] Adds dragon language, gao emote w/ sound --- code/__defines/species_languages_vr.dm | 1 + .../objects/items/robot/robot_upgrades_vr.dm | 3 ++- code/modules/mob/language/station_vr.dm | 15 +++++++++++++++ code/modules/mob/living/carbon/human/emote_vr.dm | 4 ++++ code/modules/mob/living/silicon/ai/ai_vr.dm | 4 +++- .../silicon/robot/robot_modules/station_vr.dm | 6 ++++-- code/modules/vchat/css/ss13styles.css | 1 + sound/voice/gao.ogg | Bin 0 -> 8950 bytes 8 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 sound/voice/gao.ogg diff --git a/code/__defines/species_languages_vr.dm b/code/__defines/species_languages_vr.dm index 831df5253dd..54362278d4d 100644 --- a/code/__defines/species_languages_vr.dm +++ b/code/__defines/species_languages_vr.dm @@ -1,5 +1,6 @@ #define SPECIES_WHITELIST_SELECTABLE 0x20 // Can select and customize, but not join as +#define LANGUAGE_DRUDAKAR "D'Rudak'Ar" #define LANGUAGE_SLAVIC "Pan-Slavic" #define LANGUAGE_BIRDSONG "Birdsong" #define LANGUAGE_SAGARU "Sagaru" diff --git a/code/game/objects/items/robot/robot_upgrades_vr.dm b/code/game/objects/items/robot/robot_upgrades_vr.dm index 13f09a980d6..2bc402b355e 100644 --- a/code/game/objects/items/robot/robot_upgrades_vr.dm +++ b/code/game/objects/items/robot/robot_upgrades_vr.dm @@ -6,7 +6,8 @@ R.add_language(LANGUAGE_ECUREUILIAN, 1) R.add_language(LANGUAGE_DAEMON, 1) R.add_language(LANGUAGE_ENOCHIAN, 1) - R.add_language(LANGUAGE_SLAVIC, 1) + R.add_language(LANGUAGE_SLAVIC, 1) + R.add_language(LANGUAGE_DRUDAKAR, 1) return 1 else return 0 diff --git a/code/modules/mob/language/station_vr.dm b/code/modules/mob/language/station_vr.dm index 1e2dac1a8b5..3d8028ca30d 100644 --- a/code/modules/mob/language/station_vr.dm +++ b/code/modules/mob/language/station_vr.dm @@ -110,6 +110,21 @@ "ver", "stv", "pro", "ski" ) +/datum/language/drudakar + name = LANGUAGE_DRUDAKAR + desc = "The native language of the D'Rudak'Ar, a loosely tied together community of dragons and demi-dragons based in the Diul system. Features include many hard consonants and rolling 'r's." + speech_verb = "gaos" + ask_verb = "gaos" + exclaim_verb = "GAOS" + whisper_verb = "gaos" + colour = "drudakar" + key = "K" + syllables = list( + "gok", "rha", "rou", "gao", "do", "ra", "bo", "lah", "draz", "khi", "zah", "lah", "ora", "ille", + "ghlas", "ghlai", "tyur", "vah", "bao", "raag", "drag", "zhi", "dahl", "tiyr", "vahl", "nyem", + "roar", "hyaa", "ma", "ha", "ya", "shi", "yo", "go" + ) + /datum/language/unathi flags = 0 /datum/language/tajaran diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 7df6e169fa8..6e2fec9233f 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -146,6 +146,10 @@ message = "rumbles their throat, puffs their cheeks and croaks." m_type = 2 playsound(src, 'sound/voice/Croak.ogg', 50, 0, preference = /datum/client_preference/emote_noises) + if("gao") + message = "lets out a gao." + m_type = 2 + playsound(src, 'sound/voice/gao.ogg', 50, 0, preference = /datum/client_preference/emote_noises) if("nsay") nsay() return TRUE diff --git a/code/modules/mob/living/silicon/ai/ai_vr.dm b/code/modules/mob/living/silicon/ai/ai_vr.dm index 2f22d0e7886..3234d7269e4 100644 --- a/code/modules/mob/living/silicon/ai/ai_vr.dm +++ b/code/modules/mob/living/silicon/ai/ai_vr.dm @@ -6,6 +6,7 @@ add_language(LANGUAGE_ECUREUILIAN, 1) add_language(LANGUAGE_DAEMON, 1) add_language(LANGUAGE_ENOCHIAN, 1) + add_language(LANGUAGE_DRUDAKAR, 1) /mob/AIize(var/move = TRUE) . = ..() @@ -14,4 +15,5 @@ add_language(LANGUAGE_CANILUNZT, 1) add_language(LANGUAGE_ECUREUILIAN, 1) add_language(LANGUAGE_DAEMON, 1) - add_language(LANGUAGE_ENOCHIAN, 1) \ No newline at end of file + add_language(LANGUAGE_ENOCHIAN, 1) + add_language(LANGUAGE_DRUDAKAR, 1) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index 524f54655c1..62fdea00616 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -12,7 +12,8 @@ LANGUAGE_CANILUNZT = 0, LANGUAGE_ECUREUILIAN= 0, LANGUAGE_DAEMON = 0, - LANGUAGE_ENOCHIAN = 0 + LANGUAGE_ENOCHIAN = 0, + LANGUAGE_DRUDAKAR = 0 ) var/vr_sprites = list() var/pto_type = null @@ -34,7 +35,8 @@ LANGUAGE_CANILUNZT = 1, LANGUAGE_ECUREUILIAN= 1, LANGUAGE_DAEMON = 1, - LANGUAGE_ENOCHIAN = 1 + LANGUAGE_ENOCHIAN = 1, + LANGUAGE_DRUDAKAR = 1 ) /hook/startup/proc/robot_modules_vr() diff --git a/code/modules/vchat/css/ss13styles.css b/code/modules/vchat/css/ss13styles.css index 372c3ecf22a..8a0eb3298f4 100644 --- a/code/modules/vchat/css/ss13styles.css +++ b/code/modules/vchat/css/ss13styles.css @@ -162,6 +162,7 @@ h1.alert, h2.alert {color: #000000;} .vulpkanin {color: #B97A57;} .enochian {color: #848A33; letter-spacing:-1pt; word-spacing:4pt; font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;} .daemon {color: #5E339E; letter-spacing:-1pt; word-spacing:0pt; font-family: "Courier New", Courier, monospace;} +.drudakar {color: #9b0945; word-spacing:0pt; font-family: "High Tower Text", monospace;} .bug {color: #9e9e39;} .vox {color: #AA00AA;} .promethean {color: #5A5A5A; font-family:"Comic Sans MS","Comic Sans",cursive;} diff --git a/sound/voice/gao.ogg b/sound/voice/gao.ogg new file mode 100644 index 0000000000000000000000000000000000000000..49d0a296c3681235e5d87526d5269e2a77c59ac9 GIT binary patch literal 8950 zcmeHMcU05QmY*b)&@@0mK)?_KBq06>0s?}D2$+N(ilCxY=?Vl;1T{cFh=3SEktV$f z7DNP8#6nSN(xr)_pn_OX5ex1&=-Yj}XV1Q~=e_-J=S;qtxpTkw&i%~Hojdcj_V%^| zaPTKNhyE_O+W9bGim>p*A@05m9tmzz{fFh-@BapvHSf)TPrNr_P|ba$ss?58>p!JC zh~I+Lp>`+VAfL_FA>Nn(Uw6k<@fa#bOOvRjsinCEgSQSmruI z&L$&e?UD$sTsn;`s2sY+U`F09g@!k7$Yor(mXYCcx-yhQo5gurkST;X4o$Gs&WcRY z$rz#&6c}{6pYbb5CAl8M5{v0gb>Q{0g@lr;6$Ul{pxA{nY&a{v8V-aC}hL!Qo4o%P=ovv^}MGQc0BZbER^a zyP}>lNHJ%AfPwHb!{0?A{ss?l$LlAk)XhXOQeqG4`>3_fga%;;XQ+qNW@d63-TJCI zj5fX5Tn0PjAkhcn%VkK!9whuO<=>w%_OIg6+Vsm~gUw_hzU;agV?W&?h$dZErti18 z6)It0&QJq44??AGeTZfCQMIm|5oE=aT=ZpT&mrgoZ!lc@HYy?Sx8+CxlvrpwMJevjBS9%% z#=V13o*N^qR#{TS)_S<EH~sKp`rl33MbUaTPcPQ7$&#$h5`>{1U_9l{&zV{Vbw$m0Iw)1B@}iEC1qNVgM$?+T>wCqH=FS6 zV!f1U3I|8cD52)RbS^sRSLS`Jssg^sLgKOT5$Sy}g;wwyx8_CYYH^D%oxK`ai&DdXi;H~{m7 zFH?mL<=<6+@s%q`#6tN`{h#`SwB!@u+4w&`ny1L8idm8UM<}EPQ-#H3tNl|-{=5w7 zf)wTdy{?LECcf(5b*Vs#FjXr53SIv%YMoq16Gcd;T?$H`Mi^ZCYdF(?J6mVbD^5ha7yqAmn6hS!KT2cyhnCHM-C@ zTZN4>?b%{^v}pF6iiI88QZk{)R~Yi5K>#2x8{4@DGa=^&2TCv?uqWyJNz;CN z2cPWO#3DSq%(qHSyK8aP*=svUWzR(Lh?P}U!j_AMwrC!wLmZDY8{({*yZblJ!7wFu zkxw>{bFPU5?G)OOdvsX`>CP^zYPz@yVXF=89uC9lUar|yP?~G16}7R1cpwV1stKw? zJoXMyu#xU1I|aG+hqVD?VBc_<*OPk4d&=uUp^J>Ms;q;wTd~kOMV<|Oz!n-Zq6MLh z>t;d5D`~T-NCL}(MypJ>H>N0;($$caCH6G4QfR+@h~d)dYEmqFnp!CUml1-{k2lT` z?21q@kU&o&w&il^gtlCU6|EBO0YxgMo=L>n+%&pYTNb063dLDa6j8!W;)NV^+GBS-eEAzrK6UI z|3j^SF>R>oC0kKd^$>z^cok6?m=an8Nc_6hDM55?X{XgWg8)nnpHeBBOe3(kbR?k^ zB>`=1Q&0%vN|wcIdzu0i)O!rBG{%aiT*!-2Rs)rP>XG)plEV21+|++TkN!1w{a;HF z2EEBap!c|Dp(t9eRsv9CL$|a9hL59F(mf**N_v4v$#60druYvMf26D&nLEH zxSTzwZ*jY+)S7EDk!lLX9J)F2%cMC$xpc&R{#JP^IYpywB(jHCD!uo@m8Jb2v@3%$ z9`9}~$#`72GBg?aj#%&LpTZAZb@c!VH*(qFF7>gKD-?&om{1gTSB4ib@)m#&IuJN2P639kgL5kUp0Rj8E9AK9>B7of=(WNU z4m3}pZXgRw?CENiTnRE#nZ=>e20ikM)SO^cqqr#OI$ZQ=ot)}>%U_%SwRJE z#(HLI$iSXc@+|aTk+VBR_ax{x@v#D@BEWkft|Sg{D)_$5n+qO+b)mt-(Wn>{3nMLP zLxQidYIv5o)$o~s>ML}*0dx?7To^w%3IGYuOh`C*@$Pf@#+@Fq#rLKWCcH*)8B8Gn z5Q1T`*^R=dMUq65#ZuOsSqlvZiMKI8tCs}e@ZaGYuMUU*J}HwRf6q(2lQOS$^x#Y( zeuIh{UJbheqo|14h^shtHaEK}FDEJQTt?c-NXC)y6Gx96i-?E_i@4brU2)*G>%hk~ zhD=N)i-qoDkLRZ!pa0%$btC)^=X6_29dl%-po zHF;JbG@{g*A$qm!YM_U$+H>hA7N@4~yxkEpraNx7b^b|U=)L^PM?NM6vBVhnPa2My zm8_YY;{nuSD^3>ZG`mCz);(q_{Lx5Jv?w|~;f=w8a=Exj#X#fR)iPkfY@Kg`ZW9Gj z<;bV$s+nQ0PayXS+g*5ar9@jR_o1mM^^B1|&ge^tv}p~}PzGi?P_g(d=kqbaM;$^( z)Ns_UG%9_uWRERktw1a0+4tSqD+_hU&fnHh=SO`v&CAtxdOO z3{GWh2sb96M;qIs)NQ2O zxR(*mk3I!#sCmUAxP^f=N@>)LTe!R0Ui^T>Ik-lTv=X(}Qq*<5Iii!@9|{19z?X>)Rc}a}duHAG5DD%nBrkyjr*A4B_m_THNAfmC=ndQ|WAkLU8Cwvuz7Y>MTO z2DdHaQZ~FdnaW<7^!bI8b)Ax?QS{|u`5j#?Id#U0qiq$pNi@nHP1Ehzxp(51 zLHUeGnnRtWlXvEM@gmf-7bctJ#9%-YB%NN&y$_bP_^6yf=21!ACUIH(X#KXh_HX4f z@5Vfqix(zS#<#4qEeSl=_h}dxxW8*&Zfv1FxNl)fU_!7j$B8VuStv>o2q3Q4ZV`X& z`QedIw6HjpDAE<;yzWGYL!#ZsQkR!cy;eeBAGqZm?|W)rx}NfZQHK?m8SBiI!N`MI z2c_!yhcdmbof1%z!gndCwvBN4M1(=7$fA9bI1-z)zVyJx59f|Cek_7Nn(_BmOu zP%*#OEvwmXCHG;@fcaf=$lRRJyTf%#|o6y%)azg(J*IMH$KnbK>z;?l4Al?%Ry;Yng9QGZCYC&PaY)@_Bg31H)g zMx^D*L5(K5Zc1c}HDnu^#5xmC6xT>wtgzs0+F@b9fBV~tK*E8aYx~?3-Q~yV`tSFk zr!Pdhtn=UI*KynB{oPxOkqg6fO%gaf~cWO~JhVBZR`jXdQCv{?BBPB~NahK9}RmYk(U2%X7 zY;1AgBHNvsms(oA(bb*lvzJ-MD4o8nDON}kc&)kC4j@UXFG|JrXnk(^TSQ^<<3C({ z6k9E4w=C_;-xg+GFUwj|A4t%!ZX2}>x?_gk&!*oKesjw@JEzkAzV`KppF&S97?zto zHhR`Q+h*RZNoId&7+W}TU19k9;enya*EG;f5D3W(nUL?P%|22yhuv;0p5rx+Ml_l? z9!l|c?z%A)CVsvkp-XFz4!l4DxDcER=lkv0Yv9!~SU5NxAK~OA|2cQ|XJo>R6k7dR zyTYA(YJ>5zg>B-JLE}sReZ}!bduP}jDW~WXE4be;by{qHM2uryU5%@sKi@a8qTt$AYk zKqGQ8Y~izU$0Mz#7MQw)R+~*i`bnA_22^KYV4$}{R`X;GH#?rlpDcrCo;b}wrm@j$x{NeVbs3x(|qaZYtXc;zu+MRi)HTsz0^;DC2>&$|p%iH(Qctn2p zWReJ;JO8rUao1UFnTFr8bDj8T+KJ1LHm@MfTscu)^6g$xl|nX(caT<`OXob=AAO}u z7JOw|_NuCOW{6l$6QSJ@Z;upUYF27`1D}<8e(eYAm^nLVK!Nj#sm!GNft)1O{b7&a z6-iLeZvIk}^_S{aoe$O8GZeS53FopmaXmRoHoM+5D2mkzI0VO~Ykc!E%p5+VZ~k@c zjix_bDz19JtoZ(pmmSXcNuhb;{>k^yMd*--5OJc7%dW%PWvEvE`Yw(Jdc}IGR{-qe z2Glm93OrxT92E6*;G5P<=CA0cp4N^k3%x~l#yxFI%8`BAbSE^ju73w3>EdwabimD_ z1PKWNQvAbxrAB4_I5o4}O=CyI-UjS!VH=rTu0HWW$71cp`z3E(WVU{;Pa7}qHrk%K0}6#KHtonD97JzwAeJ=J!iJ_JvW<8VxHj zcZi7jdFmWle@D~EZkwd!y@E~l>8c|qvk2*o=8@e&qK^Ee(!KtNTrP0X{dLP z*#ZSSXWdFfV=y_HOg{q+=@vaPKq`JJ4My_zi_3VC&nZ#(U*L+94uuU58F@=|Znm-w zzZo$eS>eI5B_K*>ierhPlqbelJ$D2>*=8hRUvbF6?7ENO2c@lG|8igeH{jIgr4O&` zdfOA-=b{MHPX7%JsQ^+f*(jzG#)h6o&&Zbtpc-i=S|&+);e}&fpco)-&cMGBB=&39 z%s214d6B{Drc@95?~QGo9#4@52fBtL*l$-q(hB9@%Dt)G_m z?GOx{LTRG0_GC$08!a+h2s$r2&~f+2m;z^0rsZ+kM8bQyB$d;?+8`x(KQ?Q@1gS>f zIYYJM=ktwHzl7+!bjgQ;`|3SWSDp36N+Q8T-Zfw&H!u};f-rd{EnxGRlV{!-?mZuI ztZhDuFj<)v@Yk8!yTkHpdJK&`!sDd@HhVyvNkU7YJtgdN&7g}_6@hjp82tgyUUxH` z0KTb%k1CFRG`)j&s(NtWGt-i$7swXH59bX6B@+%|uWcwA3^R^YIA%or>v>1a-PXKO zLwT5@P(F2|>Aw6aIfddAT+LcLgtmlXni;#n@Q#jw*-yNiXSo1A6pkb*`H*a22oqT) zB^XIc1__uGV%LP#P#<;pOY;x~Vz~?$a@r6{0fh?NOb=(Lm z3mfwn(7AdTGMtnFV5GqysjccLXCKfBQW0Cx82;vz+$2#-d}qI*_W1F)KShqVohYji zI<&u)a+z%YSGBUu0gH3r!~DJN>6wF?pApR?6Z)!&Z$&k@jTbypM-9*t8sSH}sqWi$ zig>+yBZI4F@5K7R3LJe|fDgohH03rtTW#tNoOGCxii^b?hpjVkwgix|jX2YN;Xy*9dJg^S z2gJ!6ZV7HEWnU1}xFd7*1Q!oc3Z+1=8Ke|1Pof@VHedi3bO?ilA!FW&g458{1#j5K zzYt7gP}#x*dgg_;>ET36&X4X~H9To$)-0P1m%`3{I=x=@WZ7=zfbOS_a?!)X4rlTn zK~Ni^|B5>;_Ssmyr)rsCyS!H7%;e4w^oCdOxBI-j*mcR|E{=t!X}mc6BJQ<>|LKlvXbtd6??~T6K>=Kei&Ih8 zzUk)MrzUDIwW;2C{;?AdVIBCF!=;`I`P|Um?s_7(Ma9?Mxbe31&1c#4*t7+jsQ0r> zC2Sq=d{W0@Uc~T}dz$FMAah$nJouP5IB7cw;Igu#M)F}TebtM<XBOq#yMetz!I6R_~GTzIaXym%JjyWV(G;n|w9#cC(I4 zPsPCap{`x&!CaqD3*njB5JBq?fw_iRq=YCq3`10|9%_CV#(jK|B5XuC`tnUQUZ?hhmDhsH9OO zAx(G|)C&Z_$u=U&;Gp*%+%a6?o!*g8x+A%+Vx;2qq^ozboF&Ef_0mEXZZ=8FmZv1} zvtNq}HQcWIr69if$e6`#_~eLDtV-a`s;Q`^#qPo`?~K!w`r7DMiH zhMYz2Aq_pk!g8Q*P$m{+BvxW0(1e+6ii7OUJ}B7P1@}`UeS5j1=3veBUq-b({Bd%@ z$wy}%7cYEn?xEmRbY``TajsDa#ixB)CVDMK_N=T#zUB&}w+;m=t_wzAl@|T!A8W

{@KQrNc%4#aP_ z7>M(Y9#o5dQGfkm;mPr)r(t|1tn|nsM!t|ZOiEfr&(lhTZ$;|zY1MiJ7P5B!G|7@Q z9T3y^e zf+pc!cdM;lGVs;KLjs`0yJUcFDS+|VTS!jw%A3}@}PPzp;q zAr_qrLj;>msQv|XKBG#uq?fL2%(4P&d*cCNLz|d~2UB$29%q)Ke_MD`M2tHTy;dxko*3b1S(VSRf z@Rvemvj^1`;WmjV$*U*t;cP-QRl2uFi7Q_%8Z}lX^Yl^x9|VW6xI`)+5a@tzL-7e| z34-v3-N7LtVYOK3YQ|G5{z60Jct>!A`^qs@>G8v`iN@A&Gc*(fe@E?sCS1 z=4O4jmX|4=NU8jeTNUNp(5_9hCgJ)tLB|H7JMG2(0Xtfg)+7DG&AVQ=uno*CdWEK- zd!&sj$c@mo4?v&+iE+|)-PT=1DL$axHPd4u1Pr?4W4^?nR24- zt`(D-`8`f$mquU+(bO zb&rw5YrJo>q9Li_I#`A|8yU!n17_IL3;3@rY4548n literal 0 HcmV?d00001