From a89ab006c17ef36febf05f12d49d39eb7c78d5bb Mon Sep 17 00:00:00 2001 From: nik707 <38332985+nik707@users.noreply.github.com> Date: Tue, 5 Mar 2019 15:03:08 -0600 Subject: [PATCH] Adds new and immersive sound for combat Dink! --- code/_onclick/item_attack.dm | 3 +++ code/modules/projectiles/gun.dm | 2 ++ code/modules/projectiles/guns/ballistic.dm | 1 + code/modules/projectiles/guns/energy.dm | 1 + code/modules/projectiles/projectile.dm | 2 ++ sound/weapons/dink.ogg | Bin 0 -> 8287 bytes 6 files changed, 9 insertions(+) create mode 100644 sound/weapons/dink.ogg diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index e8f718e590..d23d0905e9 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -167,4 +167,7 @@ attack_message = "[user] has [message_verb] [src][message_hit_area] with [I]!" visible_message("[attack_message]",\ "[attack_message]", null, COMBAT_MESSAGE_RANGE) + if(hit_area == BODY_ZONE_HEAD) + if(prob(2)) + playsound(src, 'sound/weapons/dink.ogg', 30, 1) return 1 diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index ae6e309507..a7474fd8cb 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -451,6 +451,8 @@ target.visible_message("[user] pulls the trigger!", "[user] pulls the trigger!") + playsound('sound/weapons/dink.ogg', 30, 1) + if(chambered && chambered.BB) chambered.BB.damage *= 5 diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index b9a509f33f..157cf1f03f 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -161,6 +161,7 @@ var/turf/T = get_turf(user) process_fire(user, user, FALSE, null, BODY_ZONE_HEAD) user.visible_message("[user] blows [user.p_their()] brain[user.p_s()] out with [src]!") + playsound(src, 'sound/weapons/dink.ogg', 30, 1) var/turf/target = get_ranged_target_turf(user, turn(user.dir, 180), BRAINS_BLOWN_THROW_RANGE) B.Remove(user) B.forceMove(T) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 5e3432a149..6060ceba99 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -184,6 +184,7 @@ if(user.is_holding(src)) user.visible_message("[user] melts [user.p_their()] face off with [src]!") playsound(loc, fire_sound, 50, 1, -1) + playsound(src, 'sound/weapons/dink.ogg', 30, 1) var/obj/item/ammo_casing/energy/shot = ammo_type[select] cell.use(shot.e_cost) update_icon() diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 267770eb22..1391e9ce42 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -185,6 +185,8 @@ playsound(loc, hitsound, volume, 1, -1) L.visible_message("[L] is hit by \a [src][organ_hit_text]!", \ "[L] is hit by \a [src][organ_hit_text]!", null, COMBAT_MESSAGE_RANGE) + if(def_zone == BODY_ZONE_HEAD) + playsound(src, 'sound/weapons/dink.ogg', 30, 1) L.on_hit(src) var/reagent_note diff --git a/sound/weapons/dink.ogg b/sound/weapons/dink.ogg new file mode 100644 index 0000000000000000000000000000000000000000..54f3678f79bfc5695dad8f910cd93ac34bb60084 GIT binary patch literal 8287 zcmeHsc~n!$*6#@f45J|g45I-OBpB!*0Rhp5Ko|mH2n3mBCP7eUK^!6k4FPF}Kw|`C z2nYd`85Ok=0TECc!~q&b5m3Z-p4#aClay;^nZ?Ap7kcGYj!*=N@| z?$Oa+fCTU(tuqXMDI%i_zaE5WLsEAqhB1>w3<>*Y(G37tT@dm848&d3^Iu8SQzYpO zE+|v7`S$N=jpX-{6u<_qp{Y@37RH;*jZFvyQIGZD6}c;XcSL03R!|rY3W-FK5FN`5 z``!;C_5F?|+4(>K8vwv0p$r}Bl2qAnb&`kLf+p$u&Q&#%t5T-sCf9&bY*K-apo+u^ zFgP?`KnFw}j@YIl*<4$g4ja4GwRYf;^^(2PgeikS!UY)E1`2ULaV=XDwQM z&}5S>ec>SQF`B)WbcUbRYza2Tm^pc5Nn1YFWcT9@xS0clGpcN;nL%FWBf{{_EIAT~ zpXF@!L7g3Ko2L3*2gcT^AWPbI7{zw51!o{_c?QWIwQW#m8(PBFv(dx|6`%kBs%i|l zH3qV9^>$fc7y#flp2#Z+npX=oueNE*!4&+Y0008Oz;;etfm8k?ry`7B5mua+a)kKN zc5&V$?(PHt9-i{#1mqfVzX$+;RatQBe7SWD?lLDI#y;FE0k8l73aTO6d09L1>~DC} zZ+FMd{v!vJMyiRsgBZdmnNf|>9D<~pwAc>dG+0Vp!T{?pkXa~-VvS6T<^A%7DnCU& zrOi^S+^H+Q=s5SR<#Kt_^{Y$eCf7l#rrb}S54Kw_AE@$^{Z4IYOCRSOig*dvpM;bv z4S|$?OL_tSXctIHwJ`JfE^Q#?bT*xK+(pDo5)CCTRtBGFmMe>@4HwRq9v>eBDfgi# z_sZe_Y9ekY1{qwh4gB!Y(BE;e$z=xGK`Bgq(-YhGj|npBS>>daiN_29&kBYuNuW_S zdGg&+{vm;ieY0zP2Q$ae8-r$uv%^IP~0MKG61*R*fK!# ziZi?AyYmmrWqwwtkN?h=E*b?_$D_%L@k4{ylcd!m3Oq$4hjDNx%M)b{8@|Jd7MTVB z++S%!;n&Q{9Kj2Pw(EI&!VE&L2>RTG=_iy?8 z(!u8(4Q}@D3&9PclEy3_V|ehtmI)dZh(|h#_nUJ&#$^(7Z4&SPn&_^))e}jcBGM;R zf;>0Jd74K~nFV>72hn}vwwJ~Qbf?Vz8aexZ|NVdDpf%zpA^^auNDo(}iz`~N$j3O_ zFoq2Q8)?xK$$e;$zhF^>aW29#i=xv@8;+()~9hB)3^<3`Hwk8 zjANw@jr@%x^{eMjJ^fEvPQ1Y}0FaDvOvE_SFk~7?h|y)qi_q1)Y=R*t;zuWm-`6;y zycGm=d-8Xu@xuTBAb+(LIXa<9MPR3CMszQuX&QOji~gSyb&5z;27#3U3LroM+{?&l zh%b|i37d>*stT8g~D!M;VBBLSSTypw}dwN~Ne-^_Pf{qDb4RDkg#YHx?LBU^|88 z0?wddoXFArTT}!Js+e#xO8^QO>i>F%z!o=%I$SupOux^R%F(q~s+ak@*FP!HGo#|c z7dW9>{$F#l;6_3K)`CST7!%|#_^JYcZz+}w03m*S1JKd`cj@01A^?sA5N`k~ywZlB z2Q^}@wgaV7B`(Im&mR-Z(!^xgRYFRx~Xh@*aRls;QhMbE zZha&F`zYiIBGrrTTvVT42?k3{e!Z|APkn7IdPRBD>DfQnLg5Oi$Q=o`rcb9l5RCw8 z6t0{TE1mMD(o=%a+%Q6h0l< zWJ3o>3ff)@5p{Wbu3g@PejAjRMgpQ5eiTGqQ4@@n^QwyT40Bs2*m7%as&zI>unYj8 z4^@x!8X@TG2;k~N7&elmkFA@e3DE)?4X48PrWj&td9)ZD9ZthF@?=Sd*b*85+&Lr( zUfCXuVG4j=3$O?dqL;Rtt^gT+-ExBxjcc-8UQ97r0>dC@oErExUl#DhArFlr;#uPA z#BmRgMgb!wHwq5RzHYmrjyDO$N6G-;Ek?U`cnPX!D~6i}0p#<;MR0>im14x!GT_(i zJAXHT@akW9mVjmyK`%7CtpdgcR60GV9WTam@2S<9b^v$*T?14}X!tl<;MC>t#0aeDeQATrDgZy~)&C>P2n^1|5!ycrDd11K1@PhLJFQmz z&J(^NphY1paJ%=R>QG7YBwU?0475P9w|{OMiDR;i5#02T9Zb4zYoJqdD-2(mq)5Wy z27SUkacmlmV$|)MOR26cqET9=ee+Bj1-JZjTZY2&oN=8u{c}xJ^l3Ox-792PBEwxAb*^g8U;KNMI(W$1q~%`hZTSku80S#28~C-WrN-7 zc;J$8bqIxgT;K>qDM-705wvXc2Una$;dC0(( zydXAVnIvPt+c!`U6ln7+#Q5>UQ<6GR9hfa%v5E!NERVmeygRL5!EGF8n1Tk!1po!$ z1vtS#KuKw0EHr`<8=suEkHzNX6@U&BOlrVB@Z^fMv9~8Cq14nhG_|zXqjhxkFrXX% zegsFe04Vf(L?!azP^kEf4Q(ci`vamgwupaZ=W|P~EjAY0z5(B)aCY0iX?|0jx;OLi z(dzQ>nU3DxA%eZ5>nQKE^TOVqqV5)Ag~N?X1mB}1U!S^FGC7Ex`QlWQlhQ?HCMrrcIi4`)y{f)m z!)tBi9;cFSH)CoKH2Q?{6z|imQYO*Q%3*0XuBoF-ao>(m#}}Vuw`6YYnTjCjoMb&@ z%$Q9)G>9q=HEZphrAt;!nvS@HsO2v97TvpVYZW(@I@5Wyo|@v{600V)*I#>x{HMbP z!^W(4oz{6SZ#-R-1==&a{Te)5G^Qz~WF4{~@0=$rO{>~J3yv<+&pdYA*Kf?EDX`5@ zxYgU|b_-&o?IvArjxD}s-nTgKQlTL8PCG*|LDYKIEK4F5pzu#*Z-05|Y>(HK$WVdF z0edpPtSK7m%LLthUw=4`@orM!c>HcQx&S5<`MYcp#USYtfYabwQQ0j`4C}X)ax*_Ev+_-BooBep8L= zd%vCD0Ufqsx-wY=j=d&SR!O(DExdq}G+Qg2z4n$kt+Kdnq(VUgu4~_Hw31>VaVTQ5 zoOEBBOkrOL1Y$l8dlAzL$j9aI&O#3)q`ah6P-^|L>K}a;PVC{7J2^ebG+DXm(2%KLT=suE`OcFpQ|08Q-Q&$Y6mGe!^E~T#ZI;A*VJJfZ@UBjxJi|spXde^f2^z%`^vL2W7 zCF?If=NbHYhBF$vZ@~6Wp_`EJ({qX#*M)DQ=n@hp+}|3TsZ%#xt0-Eyxyv=QD*#s3 zAJYSGz1Yne9^>JwT~%9~FLAi2suvaZVensg~(c=cqRqf48x;vhEz!j3V?B zmdIG;Y9VEPO;9vZ<(ClVb6us$ zN(c4)=#!2H)D1p<3!XkjH z7WoP=&NBsv=I+(=#r!*q7_4^8-sd+j=joN$MkG88irbAo8K<^~@E&>k!};K(i!YwN z@5mW=l@s41|1452aTsd&z*#ZbPR>I8^h%@?pgkv*FM$MJoW~NSI{{WlMig&rTl1Ju z7!#`zx_EQZCu4H|FWW6lwBvUdhCUdtdgi}YW>2oyn9bZ(#y*QcRPj!eX&?2OXV>c! zTf!5B)Qst1E3HPpp6(@I+19)g4;cHUKVj1pGeh1-Q)ktFMJZA_z+OOAEtB}EBZL?E zq}Om`{p?v^LO)TS;G1c&(a=&(!R(gf?t{OSVf%vF9eN9c3VcNzeEhPZjNjpkg{Nzy zdK;auY24I7mbb){kKqrGF5Q|Ym{O~*kWhMr0?ey;#lpAFpC9t~_Dr6J{bc=qbl_P* z*|8?${&>7_|vNVS5_&sWX8Hqa?E?~8zA^b67YhJ*eU-Gw9Ob56CjN*l_8=>h%RD+J+ggyd2IXPZjP>&fR$D!kRt5CTUq= zPv~ANKdiicbs$~S5!(7f6)sUg3Z{7&tBh>4?2b6?1yFC}UIn(Dc-q7nC2GW;c~R!F z_bm>OgIo-hMoS@DFS&OAMWovOa+i8*gr4trizO7+^HXy@qf)N|pEk~HY~Vh+ zr*e8rIJvqBLBF-s`aEQh^{mM?ru)lxugGaIb!IW9;@g-nXKno{;jirj?sh#i)IR5j zOD?&=RDExU)1KKod3LiCaY*l*sw`D?oWX;=-O3uI@p9blTXCs#iXEF<=8Z1PpQI{N zpJqKs)0jDW$P`>zU$#MkCSjp;6gUHyDw2%){VslYVro%Rp5NFS8eK(3FURWo`~W+2 zUnbkag=?`WWDgz>lXX_F?o6t+J!i-PRm4{6P=R4 zSYbC@O^lx1>x)AC=9$#X%Wj2f)qY?@+0wfn?-ZsxDi;=iQFck#J_&6O`C@j@zPlRk zR-=V(x}jxs2-u}bNeM_W=d)K!Bvh@;;;eJ>Yn*26>9cX!LPIt5X<)V>YLRf!UTDD0(9KjGW8!M+*?xr4h zbIzrdcq{jAOPI`|@yxLbLjSra4oF?D4awG(1li^_bUm@l!$j@g zHg|*hTIK9>trrR(ZZ;ur7DD=|zG(;*EYW#`%0j9mW=>nHFhpYWK@5!g~)UIbqrqR*ek{4a2`yx+W zdCc6gco!Ir00Nix=2gC>y1^-*I_W!_5%g&+mN$5_?eVv~Q|;phE~_rT=GUJ5 zQ_q`|9#Z1cC9qIz3aHSo=$!MZX~8rP!P+MS8-2RUwk)RvDyF^A^Lc#%n}285a&pEB z)Wcr((5|;HI$?y*v1QJ@Jb$Q-P(vJd7~?BAsY4zYn*H`cm-v zf{b(9MRR?NnCnrdHxK=JRbMkivKq22a45oc%fXPBM5i&OgJ<%tmZg5}d&n#()B9?v z2dg@YKk*2!ud)`3rt5eav8q&and>+?IY$lh>@)2Vhq><7w!~1^u$oX*Lae5Vy(fkv z9okR^g{UTm^g%3G9|qtv<|WXTf1i;D zN_lWU|Q>Xho38E^9HX*x(W#6SD2gtgasr|j;AvMqyCS=|l1K2s?*AlNlEe#CnH zlj2w2aZ2iBWBn}_k(Ix^aZVR@!;b3yEQwnae`p}|c=`63+_<%Z>w zoZmoJXlhWe54|)|e>jUvzS#)~5Yyh-PTRYY>aNzM;QxREhAT&AfEz6x8El(Ean6wq z;WHK&Z>Bq4@ffdt*Uowq&=ezl_NKvn#^4&^bLR0?+{bfr%yZRTTF9dLPruzUM!RpT zgxrX%%$Sc7TqNAJdtF!T>)cz{oDqCfzAZCvxYstjp%Su9v(m%m^pWg0k`Bzv4`jOD z?Dci}IfR#bJ!B9cU=pR0Bt90|=(g$TdxO4HH*}wFAp^ZpT?26ln(xrhfZOPLa_&G8 zB*^ekLbf4erqbI3TEUgo(KUAe{q)l}L%*(zs`(AkRJr(h)VLxddDX?M(|U{VFOsp! zn|@A~i^EARy6KNjT-?%oU$5Xdl69YU)+~;x`b=lLSZn4W5`U77( zmOP@o1l{Vg62RA|K_SjfYcfx&)v^y>ki#?I+Pol!^IqI7hTxa+xt2cQcR4UYWf#Jf zEimTt3pFM=Iqs;U0>aQ?0%_if6pG7}Q}MKMV){FE1xe_Id%)NFGn#XycpT}y`f<9= zPbW^PBd~#2V&3CW6?^y1;wfSSJ7n`g`q$0l@Tf%If!cTbF1{5)7K z8>rZz@N~L~M>XQvWuwLHXUy4SU!wGD3f_q#n!UTZDFe7|GXCb!*iXvWQEHyNi2J19fWfg0|iG6_z&p9RMs0J z{5QUAPbR@MQ5*H|)u*g?ey}}QPgpGQq(Z8UFL$nl?AMOl&|xPh#Mo4yt26Y(p)Vw; zP-B1F(HKlLUwO26B0|$7iC1qpXUKr{ADuiJ;!%5HQ{LHB-xI@jgBkKa&n4~n2Ai)f zNzLx?x+WYo04mdsy2})Q9&NNhgd#0p`^TDS9Vqom!1NouI)7VIe<#p!CQLOPA0_^C zzzSM5Kb}+OBY$(80bidpV3?-|ML450a(;aF9F`w&$;W^3;Vjd@v>d)ztp znQrCBHI8MIq{p70t!{7GKQYPCYc?&>BK@h&s71c*pN%Z;R`CSxo%vm6X5YITuP}$h zV6}ZmM=PqXMSsJ)hZ!6u$Xf5-&?;%oGKoH0mg@)pRz(BAN=QT5VZLe;nJTAPW71|) zt?6s8?AgyD9YdSz576i*XUEOsrecJTw)=C1$y?^?sf|cR^=u5!v7-rbiw(Gw)kI( SmA;L-_06}B2V^DS!2bYT_#e*z literal 0 HcmV?d00001