shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

leftovers.

Browse Source
This commit is contained in:
Ghommie
2019-12-03 06:48:25 +01:00
parent 6e318bfb09
commit fa270c8a79
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/brain_damage/split_personality.dm
+2 -2
View File
@@ -198,9 +198,9 @@
/datum/brain_trauma/severe/split_personality/brainwashing/handle_hearing(datum/source, list/hearing_args) /datum/brain_trauma/severe/split_personality/brainwashing/handle_hearing(datum/source, list/hearing_args)
if(HAS_TRAIT(owner, TRAIT_DEAF) || owner == hearing_args[HEARING_SPEAKER]) if(HAS_TRAIT(owner, TRAIT_DEAF) || owner == hearing_args[HEARING_SPEAKER])
return return
var/message = hearing_args[HEARING_MESSAGE] var/message = hearing_args[HEARING_RAW_MESSAGE]
if(findtext(message, codeword)) if(findtext(message, codeword))
hearing_args[HEARING_MESSAGE] = replacetext(message, codeword, "<span class='warning'>[codeword]</span>") hearing_args[HEARING_RAW_MESSAGE] = replacetext(message, codeword, "<span class='warning'>[codeword]</span>")
addtimer(CALLBACK(src, /datum/brain_trauma/severe/split_personality.proc/switch_personalities), 10) addtimer(CALLBACK(src, /datum/brain_trauma/severe/split_personality.proc/switch_personalities), 10)
/datum/brain_trauma/severe/split_personality/brainwashing/handle_speech(datum/source, list/speech_args) /datum/brain_trauma/severe/split_personality/brainwashing/handle_speech(datum/source, list/speech_args)
code/modules/antagonists/traitor/datum_traitor.dm
+1 -1
View File
@@ -269,7 +269,7 @@
. = ..() . = ..()
update_traitor_icons_removed() update_traitor_icons_removed()
var/mob/M = mob_override || owner.current var/mob/M = mob_override || owner.current
if(iaAI(M) && traitor_kind == TRAITOR_AI) if(isAI(M) && traitor_kind == TRAITOR_AI)
var/mob/living/silicon/ai/A = M var/mob/living/silicon/ai/A = M
A.hack_software = FALSE A.hack_software = FALSE
UnregisterSignal(M, COMSIG_MOVABLE_HEAR) UnregisterSignal(M, COMSIG_MOVABLE_HEAR)
code/modules/mob/living/say.dm
-3
View File
@@ -237,9 +237,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
show_message(message, 2, deaf_message, deaf_type) show_message(message, 2, deaf_message, deaf_type)
return message return message
/mob/living/proc/hear_intercept(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
return message
/mob/living/send_speech(message, message_range = 6, obj/source = src, bubble_type = bubble_icon, list/spans, datum/language/message_language=null, message_mode) /mob/living/send_speech(message, message_range = 6, obj/source = src, bubble_type = bubble_icon, list/spans, datum/language/message_language=null, message_mode)
var/static/list/eavesdropping_modes = list(MODE_WHISPER = TRUE, MODE_WHISPER_CRIT = TRUE) var/static/list/eavesdropping_modes = list(MODE_WHISPER = TRUE, MODE_WHISPER_CRIT = TRUE)
var/eavesdrop_range = 0 var/eavesdrop_range = 0