Skip to content

Commit

Permalink
Soft-spoken trait no longer applies to radio messages (#2330)
Browse files Browse the repository at this point in the history
* done

* ok
  • Loading branch information
RikuTheKiller authored Jul 12, 2024
1 parent c89f601 commit e6272b5
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions code/modules/mob/living/living_say.dm
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list(
say_dead(original_message)
return

if(HAS_TRAIT(src, TRAIT_SOFTSPOKEN) && !HAS_TRAIT(src, TRAIT_SIGN_LANG)) // softspoken trait only applies to spoken languages
message_mods[WHISPER_MODE] = MODE_WHISPER
/*if(HAS_TRAIT(src, TRAIT_SOFTSPOKEN) && !HAS_TRAIT(src, TRAIT_SIGN_LANG)) MONKESTATION EDIT: Moved to be after radios.
message_mods[WHISPER_MODE] = MODE_WHISPER*/

if(client && SSlag_switch.measures[SLOWMODE_SAY] && !HAS_TRAIT(src, TRAIT_BYPASS_MEASURES) && !forced && src == usr)
if(!COOLDOWN_FINISHED(client, say_slowmode))
Expand Down Expand Up @@ -231,6 +231,9 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list(
if(radio_return & NOPASS)
return TRUE

if(HAS_TRAIT(src, TRAIT_SOFTSPOKEN) && !HAS_TRAIT(src, TRAIT_SIGN_LANG)) // MONKESTATION EDIT: Moved TRAIT_SOFTSPOKEN check to be after radios.
message_mods[WHISPER_MODE] = MODE_WHISPER

//No screams in space, unless you're next to someone.
var/turf/T = get_turf(src)
var/datum/gas_mixture/environment = T.return_air()
Expand Down

0 comments on commit e6272b5

Please sign in to comment.