From c46d8193508875cc193f6e0580cc579b8889e8b6 Mon Sep 17 00:00:00 2001 From: MaxxOrion <48482272+bryan-hub@users.noreply.github.com> Date: Sun, 10 Nov 2024 17:23:02 -0500 Subject: [PATCH 01/10] Add files via upload --- .../Audio/_Nuclear14/Effects/button_press.ogg | Bin 0 -> 6197 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Audio/_Nuclear14/Effects/button_press.ogg diff --git a/Resources/Audio/_Nuclear14/Effects/button_press.ogg b/Resources/Audio/_Nuclear14/Effects/button_press.ogg new file mode 100644 index 0000000000000000000000000000000000000000..52d29fae19b4ec1b371ef61322db536fe6c44687 GIT binary patch literal 6197 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 Ju>%dX{|;W)tgZk6 literal 0 HcmV?d00001 From 741dde9a44425a0cba24fe6ea89237f52153c5ec Mon Sep 17 00:00:00 2001 From: bryanhubbard Date: Sun, 10 Nov 2024 17:56:23 -0500 Subject: [PATCH 02/10] radio station edits and additions --- .../Radio/Components/RadioSpeakerComponent.cs | 4 + .../Radio/EntitySystems/RadioDeviceSystem.cs | 14 +- .../Entities/Structures/Misc/radio.yml | 138 +++++++++++++++++- .../Prototypes/_Nuclear14/radio_channels.yml | 8 + .../radiostation/microphones.rsi/meta.json | 18 +++ .../microphones.rsi/radiomicrophone.png | Bin 0 -> 288 bytes .../microphones.rsi/radiomicrophonestand.png | Bin 0 -> 541 bytes .../Misc/radiostation/radioonair.rsi/base.png | Bin 0 -> 164 bytes .../radiostation/radioonair.rsi/meta.json | 20 +++ .../Misc/radiostation/radioonair.rsi/off.png | Bin 0 -> 236 bytes .../Misc/radiostation/radioonair.rsi/on.png | Bin 0 -> 228 bytes .../Misc/radiostation/tableradio.rsi/base.png | Bin 0 -> 391 bytes .../Misc/radiostation/tableradio.rsi/icon.png | Bin 0 -> 421 bytes .../radiostation/tableradio.rsi/meta.json | 20 +++ .../Misc/radiostation/tableradio.rsi/off.png | Bin 0 -> 171 bytes .../Misc/radiostation/tableradio.rsi/on.png | Bin 0 -> 173 bytes .../radiostation/tableradio.rsi/radioon.png | Bin 0 -> 423 bytes 17 files changed, 218 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/meta.json create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/radiomicrophone.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/radiomicrophonestand.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/radioonair.rsi/base.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/radioonair.rsi/meta.json create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/radioonair.rsi/off.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/radioonair.rsi/on.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/base.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/icon.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/meta.json create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/off.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/on.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/radioon.png diff --git a/Content.Server/Radio/Components/RadioSpeakerComponent.cs b/Content.Server/Radio/Components/RadioSpeakerComponent.cs index 150e903e527..09002e09b64 100644 --- a/Content.Server/Radio/Components/RadioSpeakerComponent.cs +++ b/Content.Server/Radio/Components/RadioSpeakerComponent.cs @@ -24,4 +24,8 @@ public sealed partial class RadioSpeakerComponent : Component [DataField("enabled")] public bool Enabled; + + [DataField("IsSpeaker")] + public bool IsSpeaker; + } diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs index 4bd4215416f..2edb0fc51ed 100644 --- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs +++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs @@ -216,9 +216,17 @@ private void OnReceiveRadio(EntityUid uid, RadioSpeakerComponent component, ref var name = Loc.GetString("speech-name-relay", ("speaker", Name(uid)), ("originalName", nameEv.Name)); - // log to chat so people can identity the speaker/source, but avoid clogging ghost chat if there are many radios - var message = args.OriginalChatMsg.Message; // The chat system will handle the rest and re-obfuscate if needed. - _chat.TrySendInGameICMessage(uid, message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false, languageOverride: args.Language); + { + // log to chat so people can identity the speaker/source, but avoid clogging ghost chat if there are many radios + var message = args.OriginalChatMsg.Message; // The chat system will handle the rest and re-obfuscate if needed. + var chatType = component.IsSpeaker ? InGameICChatType.Speak : InGameICChatType.Whisper; + _chat.TrySendInGameICMessage(uid, message, chatType, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false, languageOverride: args.Language); + } + } + + private string ToString(RadioChannelPrototype channel) + { + throw new NotImplementedException(); } private void OnBeforeIntercomUiOpen(EntityUid uid, IntercomComponent component, BeforeActivatableUIOpenEvent args) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml index a968d448ca7..342c01eb9b9 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml @@ -18,4 +18,140 @@ mask: - MachineMask layer: - - LowImpassable \ No newline at end of file + - LowImpassable + +- type: entity #prototype for radio station microphone + parent: BaseStructure + id: RadioDJMicrophone + name: radio microphone + description: An decent quality professional microphone for use in DJ booths. + components: + - type: Sprite + sprite: _Nuclear14/Structures/Misc/radiostation/microphones.rsi + state: radiomicrophone + - type: RadioMicrophone + broadcastChannel: PBS + toggleOnInteract: false # Nuclear-14 + frequency: 1667 # Nuclear-14 + listenRange: 2 + - type: Clickable + - type: InteractionOutline + - type: Appearance + - type: WiresVisuals + - type: Transform + noRot: false + anchored: true + - type: ActiveRadio + channels: + - PBS + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.20 + density: 1000 + mask: + - MachineMask + layer: + - MachineLayer + # Nuclear-14-Start + - type: ActivatableUI + key: enum.HandheldRadioUiKey.Key + - type: UserInterface + interfaces: + - key: enum.HandheldRadioUiKey.Key + type: HandheldRadioBoundUserInterface + # Nuclear-14-End + +- type: entity # Prototype for radio receivers + name: table radio + description: A simple tabletop radio + parent: BaseStructure + id: N14RadioTable + components: + - type: Sprite #states aren't quite working, will need to address, would like to have it toggle state when you turn on and off the radio + sprite: _Nuclear14/Structures/Misc/radiostation/tableradio.rsi + offset: 0,0.25 + drawdepth: SmallObjects + layers: + - sprite: _Nuclear14/Structures/Misc/radiostation/tableradio.rsi + state: base + map: [ "base" ] + - state: on + map: [ "enabled" ] + - state: off + map: [ "disabled" ] + - type: RadioSpeaker + channels: + - PBS + enabled: true + toggleOnInteract: true # Nuclear-14 + IsSpeaker: true + - type: Tag + tags: + - Radio + - type: Speech + speechVerb: Robotic + - type: ActiveRadio + channels: + - PBS + # Nuclear-14-Start + - type: RadioMicrophone + broadcastChannel: PBS + toggleOnInteract: false # Nuclear-14 + frequency: 1667 # Nuclear-14 + listenRange: 0 + +- type: entity # Prototype for radio receivers + name: standing microphone + description: A microphone stand and microphone + parent: BaseStructure + id: N14MicrophoneStand + components: + - type: Sprite + sprite: _Nuclear14/Structures/Misc/radiostation/microphones.rsi + state: radiomicrophonestand + - type: RadioMicrophone + broadcastChannel: PBS + toggleOnInteract: false # Nuclear-14 + frequency: 1667 # Nuclear-14 + listenRange: 2 + - type: ActiveRadio + channels: + - PBS + listenRange: 2 + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25,0.5,0,-0.5" + layer: + - LowImpassable + # Nuclear-14-Start + - type: ActivatableUI + key: enum.HandheldRadioUiKey.Key + - type: UserInterface + interfaces: + - key: enum.HandheldRadioUiKey.Key + type: HandheldRadioBoundUserInterface + # Nuclear-14-End + +- type: entity + parent: PoweredSmallLight + id: N14LightRadioOnAirSign + name: radio on air sign + components: + - type: Sprite + sprite: _Nuclear14/Structures/Misc/radiostation/radioonair.rsi + state: base + layers: + - state: off + - state: on + map: ["enum.PoweredLightLayers.Base"] + - type: WallMount + - type: PointLight + radius: 7 + energy: 0.6 + softness: 0.4 diff --git a/Resources/Prototypes/_Nuclear14/radio_channels.yml b/Resources/Prototypes/_Nuclear14/radio_channels.yml index e4df4bff8bf..a1c5165dbe8 100644 --- a/Resources/Prototypes/_Nuclear14/radio_channels.yml +++ b/Resources/Prototypes/_Nuclear14/radio_channels.yml @@ -82,6 +82,14 @@ frequency: 1546 color: "#801c14" +- type: radioChannel + id: PBS + name: chat-radio-pbs + keycode: 'o' + frequency: 1667 + color: "#c44508" + longRange: true + # Zetan # - type: radioChannel diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/meta.json new file mode 100644 index 00000000000..eca60f5b51c --- /dev/null +++ b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "made by maxxorion for nuclear14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "radiomicrophone" + }, + { + "name": "radiomicrophonestand", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/radiomicrophone.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/radiomicrophone.png new file mode 100644 index 0000000000000000000000000000000000000000..5cf978fbbce45dd25507ddec898abc39b6bd10f4 GIT binary patch literal 288 zcmV+*0pI?KP)Px#+DSw~R9J=Wm9Y+kAQVM!O=J9o=i{<;I3>EOcDb|E1SrAsxXLn}{Z zXgLc=BKP_pSAaw!k@$BGYhD&YxM|+^J!`My8u6+mSZh%f1pqjXiEImTYb~mhyo&5< z0DvbxjU3np-o>A7h-ctuD!`7R5W?NZaemJ7oE1fO3Ti36wOY!!DcB13j|c$H!!Vb; zX`0}#Uv1#jwk*+C*e&Rkn&-Fc1)Wmy4k7pA*~|bDIb)2sW{d$5?Vo~gBB3UNOSwcq mYrS}1Rxdx92oX;t0N??+%Vd#D952EE00008|A zx?t}Y)$#lHmGAxLC1SZZpmD~|O}BU7)r+{ZtT?8H<5Fsqgh74Xs&oIfbru$No$8pm z`elWSi_22OEfMRaH2((6rSo4cog^T5v1+sE*5>bxD<*GmF><`a1XOUIJ5wV4TczVt z!$%fz>u&yw&fn&8<<5$FzUuG|Q-6H=^=!@IolI{|PCpiK%IC9AF|S}x<+Q+4HEUSr zH(p%LDq#Cxy!+{@=ePN4uQS)2TEknT-{IGCf$72u#tg=cD-2s0OtKiF7^F-YbQyZ3 z8pImhcpbPMg!eL@d(Yfarx$SL`|T=IF{Ay(tT$3N|K9yLzwCENgmB9_{jA1^3JaC& zJ)Al;J~8vMcWShSpZxdCWEJbJbL%xunV*T-YWT@~X8ab5sQdZV3|v#=OQh%YxgRgx zsqvFv_kpSCwv*Z6`<=EpoYFZb|M&2O?Tn?z1&ucZ{Irf`+&;O}qU{8OU;c}~kAroX zI(IOw`!!v$mdKI;Vst0Gxm6VgLXD literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/radioonair.rsi/base.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/radioonair.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..5cc3294f59f613233cfad51183cdde7d8faedf71 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ah@)YArY;~ z2@m_paGZLK@E^eB0Wuk1{#bEwhwszNPo}t1lq*l>FVdQ I&MBb@0D}`U-T(jq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/radioonair.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/radioonair.rsi/meta.json new file mode 100644 index 00000000000..1c0eac8c81e --- /dev/null +++ b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/radioonair.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "made by maxxorion for nuclear14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "on" + }, + { + "name": "off" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/radioonair.rsi/off.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/radioonair.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..a86bd7e5d71cc553f991f32729633a9374d41094 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}%RF5iLn2y} z6C_v{Cp0iB?{Zi$|9*WCub_yCir3r?69k;g>+QSd>f8`nrJ-$HFyG2`5BI%&sw+QSd>f8`nrJ-%?q8IPC%KAf-=DT+h zM`wP>{I#=?OXl#86GcC6ocQ&DaSvYt2z)<(ut3CW{#|?a)u}sn#XXQn3=hv$J~o!kcG$G7fj1ZCjim($f@Zz~y#O1LT|lCWhNr W9kLcx#jpci%HZkh=d#Wzp$Pz0CRi2# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/base.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..db9da08fac27528af422e3342e099f6224a5c164 GIT binary patch literal 391 zcmV;20eJq2P)Px$K}keGR9J=Wlrc`jFcgM=5JyNsVjxCrwUnjm>Mos{4VG@qJpv0iDCgh;Fm-8G z#G0+bVL*cT4rWLlCE%Bsra?&fTmJWKssFD$_W>Tyf9IfYgOlS^ZR+=rw{L!jeFp%5 zU=WaZzY?H{zaN0}NOK-(Ti>QG98njuc&;;ulR;@A`i`rk(Ie-h7SJzf`fqVn&WQB>C zb_%vmR%M;Z)IEU86+%}3fi9?Ak$2=50D#AbdvaCJ;(0kw+d~_TMOg=f04i7gtYTws z)~(TMD9U^<0gS22RZXi<=6eZXGq;7HXnX@Mglq^PEyEZs&N~KJEN;l1p1r<&39%dG lY;0R=7nH$brb*q002ovPDHLkV1lEgqY(fA literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/icon.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d7246ba7ecdca93aa7d15c6e0be7b6282fc58f8a GIT binary patch literal 421 zcmV;W0b2fvP)Px$Ur9tkR9J=Wmd#4TKoo_K;v=LAF3ebW9f(TkMr69_%I@sOop0hB=o59*Qo50# zc9C7fbR%d6`UvA9osgt6$+V#&m=D6a_YU-&{7nipH2ilC_HA%-d@5D__5Hcwcew8W z0N}J7ms4nRsc%5t?fKpHP zSRefC9E4n~r-^a4PwH~53Q&0qIA4JCg|=7v^8BRLEPj{eUPmz(O!uJq zU6$5P%Ylf+?praBqVy=D%++?QG#kof4pdwL0J!$NjoEY-=FV70RQyI^ak!|0&fwRWNG{x>u= literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/meta.json new file mode 100644 index 00000000000..1c0eac8c81e --- /dev/null +++ b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "made by maxxorion for nuclear14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "on" + }, + { + "name": "off" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/off.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..3ec7be2f48ff21b6eb69c7a5bb94748e85432717 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}sh%#5ArY;~ z2@BSo0}#H#k@JVx0=VjZ*FQv_Ui+yr$-!c z>RH78{axT;y-zX;E0(t_mOZ%<`OEUbpQYX*n|pNF11@ienYV$F;o4@A7`AZNt3V4G NJYD@<);T3K0RVGLKNtW2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/on.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/on.png new file mode 100644 index 0000000000000000000000000000000000000000..5a02e2520a1e9939e345b7a4cbde3d237c51e56e GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>7Fi*ArY;~ z2@%0didUCh8R!A5v{$6~&v QKr0zMUHx3vIVCg!0A}qucK`qY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/radioon.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/tableradio.rsi/radioon.png new file mode 100644 index 0000000000000000000000000000000000000000..839a344f325fdea9495d0b50ad3f7985553ea8a1 GIT binary patch literal 423 zcmV;Y0a*TtP)Px$VM#l%mjjwHRiqzx6p`$2f#KalsyU2*|5n*Ywuwg(&@9OW$j{Q6j#x4Ufv z0AQGgwD&6pRQ!DduIuHl>*b=nN!zd|Yg`R)^OPhAf*~vA04n)1ma1htc%H`V8*p7O z4}$^7@d<4EbXhG1m-8Z4YmEpw_P|NiFpz=w!HqeIa(VbA+Abkg- zc!Dq(bTSsj6CS4|X>WjL6qa4RK^JI7r9J5i0KmC1MR?hRW67kHsQuZdo? zz8~<|Fb&X*ZhjP}$(&zx*l>2-GA)~u4F?)l001t`vz1ze*GkTwu&xZ*@Ky$%vNvU4 zHeB@sTFXE*UMTyP?Epx)8Ky Date: Sun, 10 Nov 2024 20:59:24 -0500 Subject: [PATCH 03/10] removed unnecessary code block was an artifact of previous coding trial --- .../Radio/EntitySystems/RadioDeviceSystem.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs index 2edb0fc51ed..f214ec62734 100644 --- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs +++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs @@ -216,12 +216,11 @@ private void OnReceiveRadio(EntityUid uid, RadioSpeakerComponent component, ref var name = Loc.GetString("speech-name-relay", ("speaker", Name(uid)), ("originalName", nameEv.Name)); - { - // log to chat so people can identity the speaker/source, but avoid clogging ghost chat if there are many radios - var message = args.OriginalChatMsg.Message; // The chat system will handle the rest and re-obfuscate if needed. - var chatType = component.IsSpeaker ? InGameICChatType.Speak : InGameICChatType.Whisper; - _chat.TrySendInGameICMessage(uid, message, chatType, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false, languageOverride: args.Language); - } + // log to chat so people can identity the speaker/source, but avoid clogging ghost chat if there are many radios + var message = args.OriginalChatMsg.Message; // The chat system will handle the rest and re-obfuscate if needed. + var chatType = component.IsSpeaker ? InGameICChatType.Speak : InGameICChatType.Whisper; + _chat.TrySendInGameICMessage(uid, message, chatType, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false, languageOverride: args.Language); + } private string ToString(RadioChannelPrototype channel) From 08044f381d3e2d66e53c664763f92034ddd6d2dd Mon Sep 17 00:00:00 2001 From: bryanhubbard Date: Sun, 10 Nov 2024 21:20:09 -0500 Subject: [PATCH 04/10] Update RadioSpeakerComponent.cs --- Content.Server/Radio/Components/RadioSpeakerComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Radio/Components/RadioSpeakerComponent.cs b/Content.Server/Radio/Components/RadioSpeakerComponent.cs index 09002e09b64..12b9b42e661 100644 --- a/Content.Server/Radio/Components/RadioSpeakerComponent.cs +++ b/Content.Server/Radio/Components/RadioSpeakerComponent.cs @@ -25,7 +25,7 @@ public sealed partial class RadioSpeakerComponent : Component [DataField("enabled")] public bool Enabled; - [DataField("IsSpeaker")] + [DataField("IsSpeaker")] //This field when true will play the audio over the Speak chat type. The default chat type is whisper. This will allow the audio to carry further. public bool IsSpeaker; } From 96182e7b0a9d849615c49f3b461cff9aff95b7a5 Mon Sep 17 00:00:00 2001 From: bryanhubbard Date: Sun, 10 Nov 2024 21:35:50 -0500 Subject: [PATCH 05/10] Update RadioDeviceSystem.cs removed unneeded code block as requested by notafet --- Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs index f214ec62734..f1859de726c 100644 --- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs +++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs @@ -223,11 +223,6 @@ private void OnReceiveRadio(EntityUid uid, RadioSpeakerComponent component, ref } - private string ToString(RadioChannelPrototype channel) - { - throw new NotImplementedException(); - } - private void OnBeforeIntercomUiOpen(EntityUid uid, IntercomComponent component, BeforeActivatableUIOpenEvent args) { UpdateIntercomUi(uid, component); From 89668b8e327f0742758bac424d1002eebfacd8c2 Mon Sep 17 00:00:00 2001 From: MaxxOrion <48482272+bryan-hub@users.noreply.github.com> Date: Sun, 10 Nov 2024 21:43:47 -0500 Subject: [PATCH 06/10] Update Content.Server/Radio/Components/RadioSpeakerComponent.cs Co-authored-by: Partmedia --- Content.Server/Radio/Components/RadioSpeakerComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Radio/Components/RadioSpeakerComponent.cs b/Content.Server/Radio/Components/RadioSpeakerComponent.cs index 12b9b42e661..93065ff2292 100644 --- a/Content.Server/Radio/Components/RadioSpeakerComponent.cs +++ b/Content.Server/Radio/Components/RadioSpeakerComponent.cs @@ -25,7 +25,7 @@ public sealed partial class RadioSpeakerComponent : Component [DataField("enabled")] public bool Enabled; - [DataField("IsSpeaker")] //This field when true will play the audio over the Speak chat type. The default chat type is whisper. This will allow the audio to carry further. + [DataField("IsSpeaker")] // Set to true for broadcast radio speakers so that it speaks instead of whispers the message. public bool IsSpeaker; } From 858ccdc6c0ca68c9ab473fb1549e6806f2b0ceec Mon Sep 17 00:00:00 2001 From: MaxxOrion <48482272+bryan-hub@users.noreply.github.com> Date: Sun, 10 Nov 2024 21:44:34 -0500 Subject: [PATCH 07/10] Update Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml Co-authored-by: Partmedia --- .../Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml index 342c01eb9b9..035622ef285 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml @@ -20,7 +20,7 @@ layer: - LowImpassable -- type: entity #prototype for radio station microphone +- type: entity # radio station microphone parent: BaseStructure id: RadioDJMicrophone name: radio microphone From ccc56f12ed8c60ab23dc23cbcabd49c07a7087d4 Mon Sep 17 00:00:00 2001 From: bryanhubbard Date: Sun, 10 Nov 2024 21:53:24 -0500 Subject: [PATCH 08/10] removed nuclear 14 comments --- .../Entities/Structures/Misc/radio.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml index 035622ef285..853d945b82e 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml @@ -31,8 +31,8 @@ state: radiomicrophone - type: RadioMicrophone broadcastChannel: PBS - toggleOnInteract: false # Nuclear-14 - frequency: 1667 # Nuclear-14 + toggleOnInteract: false + frequency: 1667 listenRange: 2 - type: Clickable - type: InteractionOutline @@ -55,14 +55,12 @@ - MachineMask layer: - MachineLayer - # Nuclear-14-Start - type: ActivatableUI key: enum.HandheldRadioUiKey.Key - type: UserInterface interfaces: - key: enum.HandheldRadioUiKey.Key type: HandheldRadioBoundUserInterface - # Nuclear-14-End - type: entity # Prototype for radio receivers name: table radio @@ -86,7 +84,7 @@ channels: - PBS enabled: true - toggleOnInteract: true # Nuclear-14 + toggleOnInteract: true IsSpeaker: true - type: Tag tags: @@ -96,11 +94,10 @@ - type: ActiveRadio channels: - PBS - # Nuclear-14-Start - type: RadioMicrophone broadcastChannel: PBS - toggleOnInteract: false # Nuclear-14 - frequency: 1667 # Nuclear-14 + toggleOnInteract: false + frequency: 1667 listenRange: 0 - type: entity # Prototype for radio receivers @@ -114,8 +111,6 @@ state: radiomicrophonestand - type: RadioMicrophone broadcastChannel: PBS - toggleOnInteract: false # Nuclear-14 - frequency: 1667 # Nuclear-14 listenRange: 2 - type: ActiveRadio channels: @@ -129,14 +124,12 @@ bounds: "-0.25,0.5,0,-0.5" layer: - LowImpassable - # Nuclear-14-Start - type: ActivatableUI key: enum.HandheldRadioUiKey.Key - type: UserInterface interfaces: - key: enum.HandheldRadioUiKey.Key type: HandheldRadioBoundUserInterface - # Nuclear-14-End - type: entity parent: PoweredSmallLight From 02cc69682deb8cf80c889fdda969ba9b89fa5c52 Mon Sep 17 00:00:00 2001 From: bryanhubbard Date: Mon, 11 Nov 2024 16:36:37 -0500 Subject: [PATCH 09/10] Mic adjustments and FTL string for PBS channel --- .../en-US/_Nuclear14/headset-component.ftl | 1 + .../Entities/Structures/Misc/radio.yml | 16 +++------------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Resources/Locale/en-US/_Nuclear14/headset-component.ftl b/Resources/Locale/en-US/_Nuclear14/headset-component.ftl index 5997df8c8a9..8c8a6f39242 100644 --- a/Resources/Locale/en-US/_Nuclear14/headset-component.ftl +++ b/Resources/Locale/en-US/_Nuclear14/headset-component.ftl @@ -13,3 +13,4 @@ chat-radio-bosmidwest = Brotherhood Midwest chat-radio-boswashington = Brotherhood Washington chat-radio-enclave = Enclave chat-radio-ncr = NCR +chat-radio-pbs = Public Broadcast diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml index 853d945b82e..58e75fbf494 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml @@ -31,7 +31,7 @@ state: radiomicrophone - type: RadioMicrophone broadcastChannel: PBS - toggleOnInteract: false + toggleOnInteract: true frequency: 1667 listenRange: 2 - type: Clickable @@ -55,12 +55,6 @@ - MachineMask layer: - MachineLayer - - type: ActivatableUI - key: enum.HandheldRadioUiKey.Key - - type: UserInterface - interfaces: - - key: enum.HandheldRadioUiKey.Key - type: HandheldRadioBoundUserInterface - type: entity # Prototype for radio receivers name: table radio @@ -111,6 +105,8 @@ state: radiomicrophonestand - type: RadioMicrophone broadcastChannel: PBS + toggleOnInteract: true + frequency: 1667 listenRange: 2 - type: ActiveRadio channels: @@ -124,12 +120,6 @@ bounds: "-0.25,0.5,0,-0.5" layer: - LowImpassable - - type: ActivatableUI - key: enum.HandheldRadioUiKey.Key - - type: UserInterface - interfaces: - - key: enum.HandheldRadioUiKey.Key - type: HandheldRadioBoundUserInterface - type: entity parent: PoweredSmallLight From 54101714b99d5c32022f78ed1ec70f2a864b15cc Mon Sep 17 00:00:00 2001 From: bryanhubbard Date: Mon, 11 Nov 2024 20:03:58 -0500 Subject: [PATCH 10/10] changed sprite names to reflect states better, attempt at power lights, not working --- .../Entities/Structures/Misc/radio.yml | 28 +++++++++++++++--- .../{radiomicrophone.png => base.png} | Bin .../radiostation/microphones.rsi/meta.json | 10 ++++--- .../Misc/radiostation/microphones.rsi/off.png | Bin 0 -> 107 bytes .../Misc/radiostation/microphones.rsi/on.png | Bin 0 -> 107 bytes .../base.png} | Bin .../standmicrophones.rsi/meta.json | 21 +++++++++++++ .../radiostation/standmicrophones.rsi/off.png | Bin 0 -> 129 bytes .../radiostation/standmicrophones.rsi/on.png | Bin 0 -> 129 bytes 9 files changed, 51 insertions(+), 8 deletions(-) rename Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/{radiomicrophone.png => base.png} (100%) create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/off.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/on.png rename Resources/Textures/_Nuclear14/Structures/Misc/radiostation/{microphones.rsi/radiomicrophonestand.png => standmicrophones.rsi/base.png} (100%) create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/meta.json create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/off.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/on.png diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml index 58e75fbf494..bd88b078636 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml @@ -28,15 +28,33 @@ components: - type: Sprite sprite: _Nuclear14/Structures/Misc/radiostation/microphones.rsi - state: radiomicrophone + layers: + - state: base + - state: on + map: ["enum.PowerDeviceVisualLayers.Powered"] + shader: unshaded + - state: off + map: [ "disabled"] + - type: Appearance + - type: GenericVisualizer + visuals: + enum.PowerDeviceVisuals.Powered: + enum.PowerDeviceVisualLayers.Powered: + True: {visible: true} + False: {visible: false} + - type: ApcPowerReceiver + - type: Electrified + enabled: false + usesApcPower: true + - type: ExtensionCableReceiver - type: RadioMicrophone + powerRequired: true broadcastChannel: PBS toggleOnInteract: true frequency: 1667 listenRange: 2 - type: Clickable - type: InteractionOutline - - type: Appearance - type: WiresVisuals - type: Transform noRot: false @@ -72,6 +90,7 @@ map: [ "base" ] - state: on map: [ "enabled" ] + shader: unshaded - state: off map: [ "disabled" ] - type: RadioSpeaker @@ -101,8 +120,8 @@ id: N14MicrophoneStand components: - type: Sprite - sprite: _Nuclear14/Structures/Misc/radiostation/microphones.rsi - state: radiomicrophonestand + sprite: _Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi + state: base - type: RadioMicrophone broadcastChannel: PBS toggleOnInteract: true @@ -133,6 +152,7 @@ - state: off - state: on map: ["enum.PoweredLightLayers.Base"] + - type: WallMount - type: PointLight radius: 7 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/radiomicrophone.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/base.png similarity index 100% rename from Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/radiomicrophone.png rename to Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/base.png diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/meta.json index eca60f5b51c..95cea345b75 100644 --- a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/meta.json @@ -8,11 +8,13 @@ }, "states": [ { - "name": "radiomicrophone" + "name": "base" }, { - "name": "radiomicrophonestand", - "directions": 4 - } + "name": "on" + }, + { + "name": "off" + } ] } \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/off.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..9ad55390fda0cd04bb9687d67d5322fddbf4c164 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}s-7;6ArY-_ z&lxf@FmNy{cZ;oTKn)C@u6{1-oD!M< DMeH7u literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/radiomicrophonestand.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/base.png similarity index 100% rename from Resources/Textures/_Nuclear14/Structures/Misc/radiostation/microphones.rsi/radiomicrophonestand.png rename to Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/base.png diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/meta.json new file mode 100644 index 00000000000..cbc2e354d97 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "made by maxxorion for nuclear14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base", + "directions": 4 + }, + { + "name": "on" + }, + { + "name": "off" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/off.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..85dc17102ab822f1cd1d8429ef17241466fcc54f GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|tUX;ELn`LH zy=f>2RK@J*qrmmQNsjwWK+VB*joFt}nG#kS-EUO`ssw@bohyHyW?}@hXJqavVLfTg RJbN;T>*?y}vd$@?2>=qDBUu0d literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/on.png b/Resources/Textures/_Nuclear14/Structures/Misc/radiostation/standmicrophones.rsi/on.png new file mode 100644 index 0000000000000000000000000000000000000000..56fe971c19b992b4add6f9f2189fcf7cbb8cea56 GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|tUX;ELn`LH zy}3{jsEXN9