From 8da0901b8ee44b6dec383e1acef1face8376f043 Mon Sep 17 00:00:00 2001 From: Swept Date: Tue, 17 Aug 2021 19:42:43 -0700 Subject: [PATCH] Adds inhands for radio/walkietalkie (#4483) * Adds inhands for radio/walkietalkie and separates layers * License thingy * Fixes test --- .../Objects/{Tools => Devices}/radio.yml | 7 ++-- .../Devices/communication.rsi/meta.json | 31 ++++++++++++++++-- .../off-walkietalkie-inhand-left.png | Bin 0 -> 338 bytes .../off-walkietalkie-inhand-right.png | Bin 0 -> 1722 bytes .../communication.rsi/radio-inhand-left.png | Bin 0 -> 311 bytes .../communication.rsi/radio-inhand-right.png | Bin 0 -> 263 bytes .../communication.rsi/walkietalkie-active.png | Bin 0 -> 119 bytes .../walkietalkie-inhand-left.png | Bin 0 -> 333 bytes .../walkietalkie-inhand-right.png | Bin 0 -> 1719 bytes .../communication.rsi/walkietalkie-on.png | Bin 0 -> 116 bytes 10 files changed, 34 insertions(+), 4 deletions(-) rename Resources/Prototypes/Entities/Objects/{Tools => Devices}/radio.yml (76%) create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-left.png create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-right.png create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-left.png create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-right.png create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-active.png create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-inhand-left.png create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-inhand-right.png create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png diff --git a/Resources/Prototypes/Entities/Objects/Tools/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml similarity index 76% rename from Resources/Prototypes/Entities/Objects/Tools/radio.yml rename to Resources/Prototypes/Entities/Objects/Devices/radio.yml index 567f356004..3dbe515d07 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/radio.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml @@ -13,7 +13,10 @@ - type: Radio - type: Sprite sprite: Objects/Devices/communication.rsi + layers: + - state: walkietalkie + - state: walkietalkie-on state: walkietalkie - - type: Icon + - type: Item sprite: Objects/Devices/communication.rsi - state: walkietalkie + HeldPrefix: walkietalkie diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json index e9012ab3c6..bf44d0c05b 100644 --- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6", + "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6", "size": { "x": 32, "y": 32 @@ -33,11 +33,38 @@ { "name": "radio" }, + { + "name": "radio-inhand-right", + "directions": 4 + }, + { + "name": "radio-inhand-left", + "directions": 4 + }, { "name": "walkietalkie" }, { - "name": "walkietalkie-off" + "name": "walkietalkie-on" + }, + { + "name": "walkietalkie-active" + }, + { + "name": "walkietalkie-inhand-right", + "directions": 4 + }, + { + "name": "walkietalkie-inhand-left", + "directions": 4 + }, + { + "name": "off-walkietalkie-inhand-right", + "directions": 4 + }, + { + "name": "off-walkietalkie-inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-left.png b/Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..7aefcd07ef6f245717fef7ebb95b6942737f1bb8 GIT binary patch literal 338 zcmV-Y0j>UtP)O}X3ExDA7a*Z9Ua4a-}${Us;?|F)o2M)-OlQ4nxAjEY8GSG-^ciO z1w7b zr^mRm?C_H&7~-yWapjtN6CC_@+6nf_{(k@f000000D!!x9>IQcbMx<0-#*!&3Mah* zVIIL+J19o>6_9ifXwM^0T(JOTg!0J0<^FUJCXBrGJW_W%F@07*qoM6N<$f)+TGx&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-right.png b/Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..de13046469104b2a024b62a1dab6a49041febbab GIT binary patch literal 1722 zcmbVNZD<>19KR%FxVEFhbm*9PToG2;y*9lpN6$1(vNdDr(k|HQVC-`DBsqF_&-L!o zr1fQE&P~xO%06saVMW*n6{lc73<|EIpdU&t44EH%!7&uZUfAjeTOIYeyxFb{njUh7k~;+%>Xf9w44_K7iO?9<6)u^QJPaH>19GY%64z$V61b{}#9(KVNt#iR zS9`}TuzS2OEsqb&A%zG(hj*0(q(BFbgqL*9u!WLHRP+jH?TTpvuRxq(k%+j2_)s#1 zN1+99o?=LuVK_V(qF6o<;F&Er$8ZeIbkZzGvb?|q1U87*egtB(l&mli+g9U3JCVpc zjw#S|u~?*v9Tc>3G#d(qXojOXjzkF39y1)NL>hKmT|*4mvZb1i3Ju)VC}m*55eZ~z z)dk&bs5R_bm{7pzl4Q~>#kek2fQsC}nFUL$kSj6`G@t{+u@RPSV9h*qpq+>RqPlT> z4*?2oGTGo*)fQcEP}oj<6uD6g$f{^NJ!S%W0NAi#$sj(8%xrVLF@>lFBnMh)2(@~m zQgxGYj-@z!^Pp-duxPihxBz0314II4jU}0_BpXb#L4gek4B7?-hN(i6P*JmEt3f%G zWBwi}Dj7v`qz8f(S;#_5mypA%F697i8aV=Qgi(k>4O)m8S=X^ro`^0-a=tQ#cZ2 zvKfivIiBaZ`u!M`3vLP2?<@cF{w_;JEhuRZt;cOlw|0bH)kawztF_KCx~Rfzn01Ph1tK{Vtq0Z}jf|(=hOPQR|I@|F z*^1__!_mZWmyJ<{HjQBi3^d^^G|DFSKmHSjd3GdXk#uSDN}28Zs{7G+jyOI0rT)}26Ro}zgcW(?gZJ7Nr)QQEA6~d{dn`D5@%qvCzn?q2VX7Z{ z@xV4u-m}p^<+N!Ge$n+*>+j9Wf81Hj z`7iFw`!}^3Pya#>&)|o=mydiRhOcU2?fk9V#hyJ=*Iw%QT*>n9$gk|#_uJhoHre|2 zg8tdp>rbxLJ;m?t?A`y?rIWsur1x2IpP)SBo7PXizDzG~n!={B3Gae8(A3?$ euo)w}ZSVXyJ6=8auE*zoT@vxW*y)~q2mb&o)>ESYTiB# z(${JKy4bQm0vg*oTY{VEcepvK`x^^~Zar)z(?rsUKVeuQP6V;a(ui&|SxJJ-xxzzUeiO#ya_h z@0*t$UA#=D^k9VQONz!`drvarC?%Mg^R5}jH|P1H31NvK6gRvnCm5(@wT z005vsMl)q=tq(D~u8WT0y`TKt7}ZCXoociUsV?W^YWlD5SoIfU>fd9eu7JI2G!Z%6 zck-0i@NPPp&2i58rfGb*I_IL&3l%W+(xzHZA@Sk1kK49w)B;RdbrZatZ<^tf_)8NE zajR2Yx#r#k7eAeLf^&-h9{>OV00000pe(9eu-}~Aq~7(NQ~a)Q)(a5k5v;X~ViaEi zS@(ePJc6m?a#5cTNbNI^u!32HxwC!k^ZoHWLTrqze*)uqgqT@`AnPWmF^{l`Cb(oC f0RR91MG}!W+UtQq(&;J>00000NkvXXu0mjf#IcZ3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-inhand-right.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..05981c1d8ac989719f4ac1ce1f442bd25b920886 GIT binary patch literal 1719 zcmbVNe`phT6u(+pf7PiIrR&t5S2x#7M-^<IjWtdwe-vl!k$Y$3arjyu_Vz7YJODy~IFgmAkDmHi8)d;+bR|Uz?2L{w-l)1wnZ@xM=URa zJS~Nw>Q%FvSxys57@ZS!nxz;!q#{t3syKbbNEgXvi3Vw)0?jfJmaSs-6ttk3g8yQ= zy8Sl-l-h8(%CW33s#>Kmt>8fvMmZtNqRm)d2XqveaKw;6@E~%t&5lMF{00y$Xv82) zR}LytaT(`Wio@Fn6itR%v!g}<1VjsX33O^K$+$_@6=Pij>l7Fl$+!fDDM7>|-~b5{ola76I7QOU zyIdq6cY*}R@GQs0EBXN_jo2kn(UbjNZ>7bn@iOHA{=3$2+I z)WrDNFK2_z&&|d%E2k&$%>{Y&2W-9EzDjPm(su9noBWNXw---**7nKAlV^`Lq_&Q2 zIhMg*AN!&%RoAkzM(`as|I)^fjw?Gmt}bnD_09e2yYgeQOP-newD+s~_imqt{f8Vw zE&hRPpsz6X>f-v{+u-&yzMp0nm*!>i@btpYj?fLJ={NH5kq754oB1L6kEVkAmm^cp zY`Cl3{4jF$$@Y!4bPw@ABzSgV=$l=I-SzLC_qp$1&NWUQVz#}1{O-4|0~_{V8;kzj zG_}3EBip#Y_1(|aT{Ck}egEM6t+2k(Gk?-`@znY^cHAipUQECF^q)JP=vsT-jgehn hV`s2;>aVYGo<7k1;-%YjV6**e2?hHC(|d>B`U~Z?I8*=t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png new file mode 100644 index 0000000000000000000000000000000000000000..0bf04a782db0e0813899de8605f0cd665fea2f42 GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzYfl%)kcif|7ZkY|6hxXIb~d?x zH>z{v1n?-MzL=zHeZ_r00>NGy4WF9SnE`x0imR@N7q|4;n~ P8pGh}>gTe~DWM4f(yb`U literal 0 HcmV?d00001