From 34f4c12e007294344436720c65edb3fa20c7eeec Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Wed, 20 Mar 2019 14:11:03 +0100 Subject: [PATCH] APCs now go click when breaker is switched. --- .../GameObjects/Components/Power/ApcComponent.cs | 13 ++++++++++++- Resources/Audio/machines/machine_switch.ogg | Bin 0 -> 7307 bytes 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 Resources/Audio/machines/machine_switch.ogg diff --git a/Content.Server/GameObjects/Components/Power/ApcComponent.cs b/Content.Server/GameObjects/Components/Power/ApcComponent.cs index 415ea9bce8..2cc349714c 100644 --- a/Content.Server/GameObjects/Components/Power/ApcComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcComponent.cs @@ -2,9 +2,12 @@ using Content.Shared.GameObjects.Components.Power; using SS14.Server.GameObjects; using SS14.Server.GameObjects.Components.UserInterface; +using SS14.Server.GameObjects.EntitySystems; using SS14.Server.Interfaces.GameObjects; +using SS14.Shared.Audio; using SS14.Shared.GameObjects.Components.UserInterface; using SS14.Shared.Interfaces.GameObjects; +using SS14.Shared.IoC; namespace Content.Server.GameObjects.Components.Power { @@ -36,6 +39,7 @@ namespace Content.Server.GameObjects.Components.Power { _provider.MainBreaker = !_provider.MainBreaker; _uiDirty = true; + _clickSound(); } } @@ -64,7 +68,8 @@ namespace Content.Server.GameObjects.Components.Power if (_uiDirty) { - _userInterface.SetState(new ApcBoundInterfaceState(_provider.MainBreaker, extPowerState, newCharge / Storage.Capacity)); + _userInterface.SetState(new ApcBoundInterfaceState(_provider.MainBreaker, extPowerState, + newCharge / Storage.Capacity)); _uiDirty = false; } } @@ -110,5 +115,11 @@ namespace Content.Server.GameObjects.Components.Power _userInterface.Open(actor.playerSession); return true; } + + private void _clickSound() + { + IoCManager.Resolve().GetEntitySystem() + .Play("/Audio/machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); + } } } diff --git a/Resources/Audio/machines/machine_switch.ogg b/Resources/Audio/machines/machine_switch.ogg new file mode 100644 index 0000000000000000000000000000000000000000..6305d8dd8370f3fb7a7682e6f45e8a9f1edd46b7 GIT binary patch literal 7307 zcmai12Ut@}(?0YT5vf6e8w7+|O?A7Q3~=3@`?y4i=be?&@k_C@8Ad|?Nq|xwGKHMaoRo1Tf;ge z_$gw6jL9Ac_$_&vL z|1c8=L0k~zCXVFHIcb6<;>)DY=HrcNqdxi6e0*vj-17>m|E~_A7g!%T+<}R4E5O7lYEES zB_@0fy$ zvQ|9G6N(1bHs(0+M7r2Tc~3`0PDjN$|`#X7VlIXy{o`Ih7kPyVxgkDdQUYdfkV z=%7+DbnYUu{NVobm*{ea#N>K<$cttY1Y7n&WOju~)k%M{Utx=HT}#jiMRtS&+gSo| zz(_j{RO&~l`akWYL$3FKZ`!_t(vUW=<-jSSfm7lJSn+`{S(Y6O4?@7F+F04XFeRgK zrGfBcpczHz58=%od^X$rmlJ4ihahc~P~Rz`Az%%x+@mmMyKs%^aPw(k3Yta!^K)Sb zFF+B|;*+`l@vMrO?mK3Q2W;VGta`9rNnk-r*((I$A>q>lG$-M8X$^1TqwZ9jLdo`; z{K6d%2960X0$(DB3;Ie69umUGOkf1!?&vIcAq%Ny63huM7jgCrx`TColLVHU8GEqT z;UQt^MmsMUrQ!=Eo7-)6`TYrtniEB1-RK3dBlT%vKs%cY82#`ndiQ{hHuvxF(FT5V ze**6>zKDp;VD{h@trE=(2H`1n5IiGQ^54?9xor(@@*(_ICU{~cI=M-BvnCUGYw@g7%D14RkPb=h_u{8!|h;vL8m8p;wk zrHGqP%0Bq0WbsL9g2%v0$=sUHWr8pA5x=*!ipwKq??*WA$5GxhE#6M8u?{VN2Fz~Q z%uh%DBXVdVauA)dXq?UXugEEt%6O@oA!d>-?vQ=xY_3l#p{Af@rKX(y-y+91tvWxg zIwfs6B||DT*DsY&+g=_xOkV5wukG*1F$xn04MdJXnD{>;rwb*d2cn50YyN3hM~w+! z&wnyx-wy=J9)$kEB6?y{1_{Tv(fm^5d)}?mCPS00mEK{AVCNc15QrlN(;-> z4c4${MJs+Qlg66bFrvm(qyO-4>wIK zuH^PiC4o&43wSxo9%k~4B26l?`r$2lvvI6G>rDWF=L z&+y@JEx4I4LAc!5g$SIBo%hT)oCANH({$3p*VqL(jq~*5NI-R`db_tq&P(|b{QS#r z)Dom>Yinv-f@;Ymr}8(o<+Z~UpIUPLFy&?)IdBb7$v0{#vbD9cb(H$8TG_Rh8?_yz zValySa@|_X21l>#T1RLtnOsL%r%^jdYyGFzI^<)jkRw%fs~t5R9l>iIr$$?Xgeq!R z?@EvK+#05AtaTh|iWIfNMb6<}7VUr@L9VAuoW3Pdg4FMkwuS+N$?xd#5TSOktugoj znCt%}qvfueLG&Sjlh%?7YwOl1!7{z|Yr0mrSeI+w^G97A1cK*}W;ji!m)EX#NRQkF zf>6);LxeizgOKtIMWW`Mw+rU+T4LTY&c!sshL}lpX zRp}sR(Pdt1F6ll*1Q&J{QE7u>77ag+=@Y_RV*Ew%Q_}qin+%h|q8x6FFA_hAWho-#B#7bUM zjGXN#0CL5oj&V&Tx3x)4Ghjum*V<3uJgbh>%rvj|9F@bXZ zj!tIHkz9@(JEtNw+XncP`hjo>BHR?y(99nYj9S`{@gvcM*Yxo_WdPyU0m@ZWe;UCl zNP|iU$B?K~*mOYf47&4}5WVr2<{tiX{ZtPUO}KQ!wQL}K>8axtG=90Xv)m z+pBW@0fB(M+`RNOJW%=Tlw&#gDCDtfV{&jNQ5Umgje!7dby@kq zF~GlS6b(8qT|fZ!UReU@i1Ff=0k&*&#?e6jVgFth~Z6W|e}RNe`W+ z__0Uu|OP9sU{2tY}aQ?Bj6p^5da#2%28YZR{f587*d~o09lks^{7{# z1|V);A_QOnA>ctf1U+M7fo?GzFi??%vq>v??I;nC0A{>`O6K)QLoFBSu_F8OL5))d zr<0w&vJkB+3eWggVe+pL+yA3P4XCsB*@C}yKl}jeZdGo`z4PfA z_-B!xzx(-*n*CqZ`+pia1&{#b{@Fp=_t;sWZI%PJMykmD9I`YWxi~?g*P9Pc%q*Ok zjC@m>2;5Vqhe1n80F)q+06rk1@s5~+a4c3@f|yH79aD}NIl!Amf=I>s11V~(#HJ~l zs3$tcNFvqovK$CG4EXf8qMVEcOZuL8)T1gVu^>L-p7kJr90S171LTm+RF5mo!2TdZ zP(3ayQyn>=7r~)Wyz#A5$=50ydnR7&_*xVc+qyf}rd+qJkJJ4b+19M1W05YkakpvjA?G|u5U`*r&r5qk`-krm9 z0~tHz9Ue$$(S{4?2BVI9lFi>fshr!Z!5Cg@- zAn4Q+|1~6a5YbnZm}{Dt8OG&tcpo+mZPegxEZ7Hsj7Jf9t+4@biaf4ZSrmI>P`&kd zTZ~lJ#mTVx=BQC{3q`O(@?4^d7qsbk;e$X>A|nziz18&)<;=+Vid%sl#y*f3KIz8* zaU~AIvQq3}+&r}x%01K|duO*nmUvitdedc&Hws-$F3%zni3mo~ls-D%%=iSJ;4?4x zShRJssTmMCcQ4I!kO%~2??D_qNI++BUfr9?m9;OMJBJ4k;0qr5_`OiPI8#bW%E^q1 z-bDs+eXqpI`>z-!cFCY;W!=51Fz$?ZF4c_R|0L5c)ig2Nb#FvP_0*549n;d(RNoff z=2uWuP&}+4uc>xSU2A*a_n+I0KNetR>}*Gorv*Kwx(!`x+{8Y-n9Hip-6MS5++4Wr zTNi_?M#MMm`Jn2rCR^LTw~tn5D94tZu0B#7wYpy|Z&HTS3`q}bCS%S<6bN1VJk@Hd zu-|X*`h&P<*Y7WOFRiK=;WoE>%7k)B&Mc3AY30J+92)sv?NX8-8<+CI<|piD=7}8H zPeWV-hL(S@T$|X?dhpKHJc#^mKc{y!=E+;*fX``~Z30;Vx)}>`eN~P>7>`lFWx#^g|n2+Z&}MKa~kE>LyJa!Ze#_X z<9_>Ts#N*Iz35-xxVDys)*oN~&4BklUzw0R$C*dfsR%iO+^dn_@eHk^Ty*Z?{PF6= z+l?#1`zr6eJ6}DtxLtQOw%D+(S1k0y{rTe>Ywzd7s~GBC&clrpBqVrx4CfV)g`R|& zXaQpp+=|vO>1QGqDn_aqXO;NwVZ)ggoL;WR+?HbAcSJ1E{`%YIT(Tb{R4?k9;JZhI zu7iqUy1_Xi*?awF)&5T&jV(_K1uqvD)){pkTrF6Gq2yXk{K6i`6i3$+>FcEQ29bR@cGV4@W=LFu@UDR9BiI#to|&!z){%ZHLQw`({c3N<2&&B^B%K= z?bCIa{Jt1`d&FgL^J`py*xT1_5Z}l1>zuHpgvVJ$yAbk((4&h;+()|{1fr8e>l?h| z*T**I(iJBXb5ozqgbpF>B9&0Gv8cBg!wk=Fd3M_1_Q2Z3Prvuo)~Z;DY@p5mER9lB%k z�zzKNQAoJqz8KZ)GFki1i>SQR1%H0oRM7SQEv=5>%afSsYF0sZ~bBUaZKy9Q~<-na;7z-x#;BSwSa50 z{$tO5=arrwAed#Ao~^Unz%^u41n_@h{Pn=fHk`10+Usj`hp{ z`|Ue>6fHnl$rY$7+Y5w_rk?L zqoPhb1*{(tVyppIpIO`P55@+ptmO_+b9P07D-3O7nE%fU{!Mc!>WUF^)+8{Ii^?NDaaK z!9b!ojF(7$t($zTDWCgTx*Z)#{;6-Bt-X(7;8&j~Y%YiFURjlG-!e4K&P!Mp>z!ZK zwI5ed;VpC2E&?}~h?|G*4u5Si90L9yXcFGwSw{lkIb#}(Wy<~Wy4%3)0m3u806 z`!-{OxmL#A6+I}V=~31OX&uk=igM%|6xBTFR0 zoEZ-TFVoEnoA!G~4r!~b94=*_-{a%+NMr`*_h?0Sb4qM<&;Z>OrUo;c#kV-b{QmO% z^hM#080|8ok4J_p9VIY$WD4FBQYk^M zsT}>LVVUIGH=343Z8)AcnwwTSb7|+BX z`V<^^STN3yqJM$ij`*Xp+~#EpI~4zXJctOU9}zij%O%e_7tRNz3&zx7?F_VX4wx{zDH=u2wX zxy+g3J6c|vurfbX$)5SQ;s-xtSJ&JmxW5!Xg! z=2Vi(g~8h~w@Zaz3p}~WN@!Z8PcLb)49>fu0rNO~*z^N~R7+7lxI{M`=jXn!$~kkb zi%c)l-(CG6cIbs06N=^TFR#rbrfiHo+0gKKA!S{;l3rVS^u)@$%Rh#uTs(ofqC&ci zr!EzY&#WYD39g=Uon4x!U?bV2EviU&Tgh42obd0im^~2RdcHfmenC~;Uy$o$|12G)Jn#G6S0zs`1(OPTxqB`yZ#-R7x0NYujWn&ZA}}ay&D1y~eo*B?VR@hX zd6g=}*Xkc7VQdH9gy_}JSX4bXc&~XjR{JN+PkHZRpiUM1!J9jV2hb6PTkCA=N8fq| z=V*PmycBE3#4aYY^ke`QYMVw74ND}v^i_4n?k7m;k}QNX2J0z54<8O?`W-3S${zi( z+qQ4ikDZy**C(0mB=L|#GVV$EUA~faMJUC`_PTfR(D||AZl}>pUvh$;M)hgNX1>Yp zuH7Jr+mehZN=YFNNA3Il_e@@Ol)TO2G{#a$@t~0A0 zx3;$7o(D6VpQNlqM|syP1D{{J(eX}4R7oVx7U5tU7AnI#S37){2X;duboQMaxA4Bp zy~_6Yl6ntET)FK=I5T!lCr7`dqWyOkv$0DWzX`8x^NCGo^PlvWnM9(>s)vhHy*Q*< zRZBP1CuLh1jT5?Iudm^+vrfWCpsu?&59xL0M(3SE2Dg}<7`->YG`|t2<*0mDg6DEx zoz-Lvw=tz7GFt8ItKOp9)*ftrFBi>RV>PqsetskyKz9-yMh5NNSImR?x)R3y%a)zI zD@|0UynoMWYDP{=u=<`}etRzGwc~+ww^OxsE_(#reBbG}Q>~WQv)$r-a&QSQ#I zL(#gcv%w5kJ`y=P+Yu_fe1tWpNIgrvn6LECcBTH!_9Iz?)C&J~JXKx9@KkH2WFA`` zu{xVh_5Iwl`ks#pBt$Cv_q+H*6+G z_&l;bJ42adG`!zB-4uf9H4UK~ zbHx>sPaE^31Sa~wX=xmPoulrc)Ap`SzJ-yRk{+qoJsT?EDiyb7b)8w3Qez>8Y8J&d zcF%p^d((dD3}VeG#?Z91RR6q>NZI?O8FR%KtrVBRu@+_#!**x6;H*fj4+*z*!m2;I zYxRks3G!MXA1@bdY|r0qYL_`7)4tW*+|c25{{{q2b=<6_8cAdZ z5c1q@NuKyYi)u8fBq>@+-M65*pZi5Oo$bB+yme;{?c?1q75DrWu)J|EdJ_g=4)Hsd zx*AAK%{PqOPF_1MY z9{xknx+}C((z?@0kW;%*Rw1tb<$$8O_CUjOp!&k2)xt`H(ojXGGa|iWK0Plsd2qf1 HScd-rAA+Hx literal 0 HcmV?d00001