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

Fixes codewords and MKUltra enthrall hearing.

Browse Source
This commit is contained in:
GrayRachnid
2019-11-27 16:36:19 -05:00
parent 8cec8fa506
commit 47e3cd346f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/traitor/datum_traitor.dm
+2
View File
@@ -23,6 +23,7 @@
owner.special_role = special_role
if(give_objectives)
forge_traitor_objectives()
RegisterSignal(owner.current, COMSIG_MOVABLE_HEAR, .proc/handle_hearing)
finalize_traitor()
..()
@@ -48,6 +49,7 @@
A.verbs -= /mob/living/silicon/ai/proc/choose_modules
A.malf_picker.remove_malf_verbs(A)
qdel(A.malf_picker)
UnregisterSignal(owner.current, COMSIG_MOVABLE_HEAR, .proc/handle_hearing)
/datum/antagonist/traitor/proc/handle_hearing(datum/source, list/hearing_args)
var/message = hearing_args[HEARING_MESSAGE]
modular_citadel/code/datums/status_effects/chems.dm
+2 -2
View File
@@ -608,13 +608,13 @@
UnregisterSignal(owner, COMSIG_GLOB_LIVING_SAY_SPECIAL)
/datum/status_effect/chem/enthrall/proc/owner_hear(var/hearer, message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
/datum/status_effect/chem/enthrall/proc/owner_hear(datum/source, list/hearing_args)
if(owner.client?.prefs.lewdchem == FALSE)
return
if (cTriggered > 0)
return
var/mob/living/carbon/C = owner
raw_message = lowertext(raw_message)
var/raw_message = lowertext(hearing_args[HEARING_RAW_MESSAGE])
for (var/trigger in customTriggers)
var/cached_trigger = lowertext(trigger)
if (findtext(raw_message, cached_trigger))//if trigger1 is the message