cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Crit Whisper Fix (#12887)

Browse Source
This commit is contained in:
Geeves
2022-01-03 22:23:19 +01:00
committed by GitHub
parent 2f61d5c4ae
commit 66acb4bd54
5 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/say.dm
+2 -2
View File
@@ -161,8 +161,8 @@
return headsets[headsets[1]]
return null
/mob/living/carbon/human/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name, successful_radio)
if(paralysis || InStasis())
/mob/living/carbon/human/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name, successful_radio, whisper)
if(!whisper && (paralysis || InStasis()))
whisper(message, speaking)
return TRUE
switch(message_mode)
code/modules/mob/living/say.dm
+3 -3
View File
@@ -124,13 +124,13 @@ proc/get_radio_key_from_channel(var/channel)
returns[4] = world.view
return returns
/mob/living/proc/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name, successful_radio)
/mob/living/proc/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name, successful_radio, whisper)
if(message_mode == "intercom")
for(var/obj/item/device/radio/intercom/I in view(1, null))
used_radios += I
if(I.talk_into(src, message, verb, speaking))
successful_radio += I
if(message_mode == "whisper")
if(message_mode == "whisper" && !whisper)
whisper(message, speaking)
return TRUE
return 0
@@ -245,7 +245,7 @@ proc/get_radio_key_from_channel(var/channel)
var/list/obj/item/used_radios = new
var/list/successful_radio = new // passes a list because standard vars don't work when passed
if(handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name, successful_radio))
if(handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name, successful_radio, whisper))
return 1
var/list/handle_v = handle_speech_sound()
code/modules/mob/living/silicon/say.dm
+6 -6
View File
@@ -20,8 +20,8 @@
returns[4] = world.view
return returns
/mob/living/silicon/robot/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
if(message_mode == "whisper")
/mob/living/silicon/robot/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name, successful_radio, whisper)
if(message_mode == "whisper" && !whisper)
whisper(message, speaking)
return TRUE
if(message_mode)
@@ -36,8 +36,8 @@
/mob/living/silicon/robot/drone/handle_message_mode()
return null
/mob/living/silicon/ai/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
if(message_mode == "whisper")
/mob/living/silicon/ai/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name, successful_radio, whisper)
if(message_mode == "whisper" && !whisper)
whisper(message, speaking)
return TRUE
if(message_mode == "department")
@@ -52,9 +52,9 @@
log_say("[key_name(src)] : [message]",ckey=key_name(src))
return ai_radio.talk_into(src, message, message_mode, verb, speaking)
/mob/living/silicon/pai/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
/mob/living/silicon/pai/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name, successful_radio, whisper)
if(message_mode)
if(message_mode == "whisper")
if(message_mode == "whisper" && !whisper)
whisper(message, speaking)
return TRUE
if(message_mode == "general")
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+4 -3
View File
@@ -316,11 +316,12 @@
/mob/living/simple_animal/spiderbot/get_bullet_impact_effect_type(var/def_zone)
return BULLET_IMPACT_METAL
/mob/living/simple_animal/spiderbot/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
/mob/living/simple_animal/spiderbot/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name, successful_radio, whisper)
switch(message_mode)
if("whisper")
whisper(message, speaking)
return TRUE
if(!whisper)
whisper(message, speaking)
return TRUE
if("headset")
radio.talk_into(src, message, null, verb, speaking)
used_radios += radio