From d0550290e705296c67ff4849f176f56475c6f281 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Mon, 5 Oct 2026 01:17:00 +0000 Subject: [PATCH] Handheld radio now lights up when on. (#45984) * walkie talkie feedback * update copyright the fewer pixels the more legitimate the copyright claim * simpler walkietalkie visuals, no walkietalkie-off * per-RSI states * active/on order in json, remove radio off inhands * Remove unused states from meta.json whoops * muh seccie copyright --- .../Entities/Objects/Devices/radio.yml | 30 ++++++++--- .../Devices/communication.rsi/meta.json | 13 +---- .../off-walkietalkie-inhand-left.png | Bin 338 -> 0 bytes .../off-walkietalkie-inhand-right.png | Bin 1722 -> 0 bytes .../communication.rsi/walkietalkie-active.png | Bin 119 -> 108 bytes .../communication.rsi/walkietalkie-off.png | Bin 290 -> 0 bytes .../communication.rsi/walkietalkie-on.png | Bin 116 -> 127 bytes .../communication.rsi/walkietalkie.png | Bin 299 -> 316 bytes .../Devices/securityhandy.rsi/meta.json | 50 +++++++++--------- .../securityhandy.rsi/walkietalkie-active.png | Bin 0 -> 108 bytes .../securityhandy.rsi/walkietalkie-off.png | Bin 357 -> 0 bytes .../securityhandy.rsi/walkietalkie-on.png | Bin 156 -> 127 bytes .../securityhandy.rsi/walkietalkie.png | Bin 348 -> 282 bytes 13 files changed, 49 insertions(+), 44 deletions(-) delete mode 100644 Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-left.png delete mode 100644 Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-right.png delete mode 100644 Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png create mode 100644 Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-active.png delete mode 100644 Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-off.png diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml index adf094d12e..5551412745 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml @@ -1,8 +1,8 @@ - type: entity - name: handheld radio - description: A handy handheld radio. parent: BaseItem id: RadioHandheld + name: handheld radio + description: A handy handheld radio. components: - type: TelecomExempt - type: RadioMicrophone @@ -16,8 +16,25 @@ sprite: Objects/Devices/communication.rsi layers: - state: walkietalkie - - state: walkietalkie-on - state: walkietalkie + - map: [enum.RadioDeviceVisualLayers.Broadcasting] + state: walkietalkie-on + shader: unshaded + visible: false + - map: [enum.RadioDeviceVisualLayers.Speaker] + state: walkietalkie-active + shader: unshaded + visible: false + - type: Appearance + - type: GenericVisualizer + visuals: + enum.RadioDeviceVisuals.Broadcasting: + enum.RadioDeviceVisualLayers.Broadcasting: + True: { visible: true } + False: { visible: false } + enum.RadioDeviceVisuals.Speaker: + enum.RadioDeviceVisualLayers.Speaker: + True: { visible: true } + False: { visible: false } - type: Item sprite: Objects/Devices/communication.rsi heldPrefix: walkietalkie @@ -26,10 +43,10 @@ - Radio - type: entity - name: security radio - description: A handy security radio. parent: [ RadioHandheld, BaseSecurityContraband ] id: RadioHandheldSecurity + name: security radio + description: A handy security radio. components: - type: RadioMicrophone broadcastChannel: Security @@ -41,4 +58,3 @@ sprite: Objects/Devices/securityhandy.rsi - type: Item sprite: Objects/Devices/securityhandy.rsi - heldPrefix: walkietalkie diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json index 7aa33b0489..7c69dcca12 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 and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Uplink radio sprites by Vermidia, derivative of other lisenced sprites in the repo", + "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Uplink radio sprites by Vermidia, derivative of other licensed sprites in the repo. walkietalkie/-on/-active edited by whatston3.", "size": { "x": 32, "y": 32 @@ -33,9 +33,6 @@ { "name": "walkietalkie-on" }, - { - "name": "walkietalkie-off" - }, { "name": "walkietalkie-active" }, @@ -47,14 +44,6 @@ "name": "walkietalkie-inhand-left", "directions": 4 }, - { - "name": "off-walkietalkie-inhand-right", - "directions": 4 - }, - { - "name": "off-walkietalkie-inhand-left", - "directions": 4 - }, { "name": "old-radio" }, 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 deleted file mode 100644 index 7aefcd07ef6f245717fef7ebb95b6942737f1bb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 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 deleted file mode 100644 index de13046469104b2a024b62a1dab6a49041febbab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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)~q2mbBDx91!M85md?3_QQ^FX5M+V?AH@pi%?# h)SLI&85kP2GFF^o5}1CRO&h3#!PC{xWt~$(69CH37@7b8 delta 88 zcmc~PpP&+K=jq}Y649D0!MZp>q^Bv+fXmG$K}DTmn{CqH_cmYUW8UA(S@u7!X#Yv0 kY^eM}4UpmlMrLMahRqW=m=yNLd|&_qPgg&ebxsLQ0G^#66951J diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png deleted file mode 100644 index 70e2b3a2a56ff9d446ed8f379c3fad5ab524ab40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmV+-0p0$IP)KM1d5P6KuDIB^t`V1tJO^@kA8t zJZTD#^zE-1+d!dEn1L80z1ojCjT8g_$3TpcIgK}Fkt0@B0)Uy#;pO?FJc70l!{HIU zo0&?OD(JR>RZXlB?>UY=`P^feQbOCd zNGW+!_)t~a{_zFwu_vFa2Y!BUqt`Ue5PQkmgd&n7_Zir%4ybBEL||qR5mYs?Ssk*? oJjL9L$ZcXgelIOvC=}j~KhM{5)L%+=$p8QV07*qoM6N<$f;!{AQXe)iGoM=4Bqu+!62Fh^Q!-sR<{6fQO_5K7|G7DgVm<00000NkvXXu0mjfSL-D^ diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png index 0799b3f9c8bb605924e5f0bd7fb4164075fa1f03..6834e594bc8244bd50610f997f9ee2e6e1f33e31 100644 GIT binary patch delta 289 zcmV++0p9+r0=xo{B!2;OQb$4nuFf3k0002?Nkl15QX1{I{1Qwx|`hGCGUt%;}Ff_-n`oI_cbaL!@h2UlJX zGmCG`RRtzn6Hhe*f0uFfilUfpEm4<{h+^Dz0_v(omJ5go-g^)cvRqJCZM2x1So;vE nMKH7U+j02rni@QjNIV?>m?3waOaHZ@00000NkvXXu0mjf0Y!p? delta 272 zcmV+r0q_320;>X$B!BWrL_t(|ob8k`4#F@DMSp<{_yEjV=7DA zt~~$}8>klmF~E?G1%w$;t9EOhiUIPZ3_p^cpTss02m}Ve7$e%)(U3-hf&VdJj1iy0 zYclZ(W@Z5Z=iCrpx*sZgh|8mT$sSUf=}Xi%;E+Xfnols_ynpJwVm-pNcp_d(?|iB+ zSX>{t+{Z0_?0**>%q)j25@wdNETyS6`P6M_twoxqu-0l*=wN1XdHV$_t;wgVf%EOt zdP$PhT8q~tBqE=1oq_FYhgmEjA~@$jM3}{b?P}+3rV~RCBDINT`+fEBKp^mQyaC~7 Wcnq&YI#>Vz00{s|MNUMnLSTa9?0b#? diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json b/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json index 2ff702f252..84ad1775ae 100644 --- a/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json @@ -1,28 +1,28 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "walkietalkie" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Minor edits, unshaded separation by whatston3.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "walkietalkie-inhand-left", - "directions": 4 - }, - { - "name": "walkietalkie-inhand-right", - "directions": 4 - }, - { - "name": "walkietalkie-off" - }, - { - "name": "walkietalkie-on" - } - ] + "states": [ + { + "name": "walkietalkie" + }, + { + "name": "walkietalkie-on" + }, + { + "name": "walkietalkie-active" + }, + { + "name": "walkietalkie-inhand-left", + "directions": 4 + }, + { + "name": "walkietalkie-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-active.png b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-active.png new file mode 100644 index 0000000000000000000000000000000000000000..95cf3d8ccd5e4d1af060c55596b0203cdb21201f GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}YMw5RArY-_ z&p8S*Ft9Kfcz)qu!Y@0=dcN*Kr3U7yH}A7EFf?pstT@FaF#R~2Hc$tHr>mdKI;Vst E05CWlK>z>% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-off.png b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-off.png deleted file mode 100644 index 2afdf8d962fcb45b45e43332cb70909d2f71539a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmV-r0h<1aP)Px$9Z5t%R9Hvtl`(F@KomsB1uc?APrElj8<9FGD0~NV14s&=zy(QefbZaf0%{N| zZm@0o$P#S|N8_*-qRLw6yU4n+SMvHl&;K(Uq30{=xjq6wP~a{KD5Yv^ZKrQ_+H~uj z0Pz15_yB6o!2-WQCawSrvTz*7%{*3B1u++Bt?Q#PI9yp_3gAI&7-PI$<-K7K)aTCu zPP)-TPv%817Hp?14IF6L+5)ICxpudF&Fe2 zL~J~rz`L^_pSuho_jw1APs;t}-2f022nzJBzz?yujUfgX)K>ri002ovPDHLkV1fVu D=x>X5 diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-on.png b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-on.png index dfd79a644160d79f8d519a00ff5bc7abfe1244f7..af20e880abd95f1cdeba46474b0c5aaf86027379 100644 GIT binary patch delta 84 zcmV-a0IUC;0e_G&PB}?LK~z|U?aZMO03i?r!J~=*k%ah?2*`yCn?PU1fH&bF6*2Univ=WGC(H@ diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie.png b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie.png index 12aaa3f2f091110ff2933e4599e6faf13b60ba5e..4e694002dabaf796da2fe2e36dc10f78f3ee59d7 100644 GIT binary patch delta 242 zcmVOyB$i0W z06}7cYmjJY=x&5Z!<|xcz9^%7oa2%%qB0{V0vaA#r@Gk;dfGuEdyquNA z=_CRG&=3d!eczYR@*S#50!-NFCgFjo@Z)-0BTZ_m zfb(X9EX$ClDY}zM1tbQ*A>`0G1>9N;fRay@dJe(bT3H1g0CRvDAPPVmI^VN6AzUtq zxuDS?V&mxq-Y%W}_*`cIxz9U@d{XY4cLP9BASlqd0ykx{j3IkATx9?N002ovPDHLk HV1fVuqwRy3