Skip to content

Commit

Permalink
hotfix for radio talking (#4769)
Browse files Browse the repository at this point in the history
# About the pull request

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

Hotfix for #4645 - removing the switch clause makes normal talk fall
through into radio speech and makes everyone talk on radio all the time


# Testing Photographs and Procedure
Very basic testing


# Changelog
:cl:
fix: Fixed people talking in radios all the time. Finally some quiet.
/:cl:
  • Loading branch information
fira authored Oct 24, 2023
1 parent 78c8974 commit 62aac19
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions code/modules/mob/living/carbon/human/say.dm
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,10 @@
used_radios += I
break // remove this if we EVER have two different intercomms with DIFFERENT frequencies IN ONE ROOM
else
var/earpiece = get_type_in_ears(/obj/item/device/radio)
if(earpiece)
used_radios += earpiece
if(message_mode != MESSAGE_MODE_LOCAL)
var/earpiece = get_type_in_ears(/obj/item/device/radio)
if(earpiece)
used_radios += earpiece

var/sound/speech_sound
var/sound_vol
Expand Down

0 comments on commit 62aac19

Please sign in to comment.