Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TM] Communication Update #1765

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c33447c
Disable broadcasting common freq for most radios
m-dzianishchyts Jan 24, 2025
086f23f
Reduce intercom hear range
m-dzianishchyts Jan 25, 2025
dba66cd
Allow to talk into common when seclevel >= gamma
m-dzianishchyts Jan 25, 2025
e089a0c
Fix linter
m-dzianishchyts Jan 25, 2025
09fca7c
Update intercom
m-dzianishchyts Jan 25, 2025
bd52717
Fix gamma+ sec level runtime
m-dzianishchyts Jan 25, 2025
29c02c7
Add information message to a sec level announcement
m-dzianishchyts Jan 25, 2025
9c50527
Clean up
m-dzianishchyts Jan 25, 2025
332bd68
Clean up
m-dzianishchyts Jan 25, 2025
5ed3d05
Fix common channel filtering
m-dzianishchyts Jan 27, 2025
27eae99
yar
m-dzianishchyts Jan 27, 2025
d8d11ef
Tweak mic timeout
m-dzianishchyts Jan 27, 2025
16fb2fc
Add configurable hear range
m-dzianishchyts Jan 27, 2025
53573c9
Make hotmic being turned on indefinitely after toggling by silicon
m-dzianishchyts Jan 27, 2025
eb4d691
Merge remote-tracking branch 'origin/master' into intercom-update-feat
m-dzianishchyts Jan 27, 2025
b0bf13e
Enhance determining of common channel limitations
m-dzianishchyts Jan 28, 2025
e7d5693
Add emag act
m-dzianishchyts Jan 28, 2025
1aa29e2
Implement PDA alert button
m-dzianishchyts Jan 28, 2025
6397260
Add threshold as config option
m-dzianishchyts Jan 28, 2025
158f4e0
Centcom PDA alarm timeout
m-dzianishchyts Jan 28, 2025
ceb3af9
Merge remote-tracking branch 'origin/master' into radios-with-disable…
m-dzianishchyts Jan 28, 2025
be5519b
Disable alarm button after emp act
m-dzianishchyts Jan 28, 2025
92b0be2
Fix radio range being changed by ghosts
m-dzianishchyts Jan 28, 2025
bee6ccd
Merge remote-tracking branch 'origin/master' into radios-with-disable…
m-dzianishchyts Feb 1, 2025
c3c0991
Merge remote-tracking branch 'origin/master' into intercom-update-feat
m-dzianishchyts Feb 1, 2025
6ba1ee3
Translate emag messages
m-dzianishchyts Feb 1, 2025
99a0e48
Notify ghosts when someone calls for security
m-dzianishchyts Feb 1, 2025
2eb4507
Alarm Button app, cartridges
m-dzianishchyts Feb 1, 2025
e4d7b5a
Alarm button sound effect for secs
m-dzianishchyts Feb 1, 2025
ed63aab
Red alarm button
m-dzianishchyts Feb 1, 2025
cddb5b5
Bring back logging of the alarm button
m-dzianishchyts Feb 3, 2025
da27c5c
Merge remote-tracking branch 'fork/intercom-update-feat' into radios-…
m-dzianishchyts Feb 3, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion modular_ss220/balance/_balance.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
#include "code/access/access.dm"
#include "code/events/blob.dm"
#include "code/items/projectiles.dm"
#include "code/items/weapons.dm"
#include "code/items/radio.dm"
#include "code/items/storage/surgical_tray.dm"
#include "code/items/storage/closets.dm"
#include "code/items/weapons.dm"
#include "code/jobs/warden.dm"
#include "code/mobs/aliens/larva.dm"
#include "code/species/machine.dm"
Expand Down
29 changes: 29 additions & 0 deletions modular_ss220/balance/code/items/radio.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
GLOBAL_LIST_INIT(radios_broadcasting_common, list(
/obj/item/radio/intercom,
/obj/item/radio/centcom,
/obj/item/radio/uplink,
/obj/item/radio/syndicate,
/obj/item/radio/headset/heads,
/obj/item/radio/headset/ert,
/obj/item/radio/headset/alt/deathsquad,
/obj/item/radio/headset/skrellian,
/obj/item/radio/headset/centcom,
/obj/item/radio/headset/syndicate,
/obj/item/radio/headset/uplink,
/obj/item/radio/headset/chameleon,
/obj/item/radio/headset/deadsay,
))

/obj/item/radio
var/can_broadcast_into_common = FALSE

/obj/item/radio/Initialize(mapload)
. = ..()
if(is_type_in_list(src, GLOB.radios_broadcasting_common))
can_broadcast_into_common = TRUE

/obj/item/radio/handle_message_mode(mob/living/M, list/message_pieces, message_mode)
// Check if it can be send to common.
if(!can_broadcast_into_common && (!message_mode || message_mode == "headset"))
return RADIO_CONNECTION_FAIL
return ..()
Loading