From 94d12032761fef8a894830164c824b5b0c5d59a3 Mon Sep 17 00:00:00 2001 From: YPOQ <30683121+YPOQ@users.noreply.github.com> Date: Tue, 18 Jun 2019 14:29:07 -0600 Subject: [PATCH] Fix obsessed not respecting player preferences (#44609) Also fixes a runtime due to a missing early return --- code/datums/brain_damage/creepy_trauma.dm | 1 + code/modules/events/creep_awakening.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/brain_damage/creepy_trauma.dm b/code/datums/brain_damage/creepy_trauma.dm index 20d7a73d1d1..8c0e49d5e6a 100644 --- a/code/datums/brain_damage/creepy_trauma.dm +++ b/code/datums/brain_damage/creepy_trauma.dm @@ -24,6 +24,7 @@ if(!obsession)//we didn't find one lose_text = "" qdel(src) + return gain_text = "You hear a sickening, raspy voice in your head. It wants one small task of you..." owner.mind.add_antag_datum(/datum/antagonist/obsessed) antagonist = owner.mind.has_antag_datum(/datum/antagonist/obsessed) diff --git a/code/modules/events/creep_awakening.dm b/code/modules/events/creep_awakening.dm index 84b6df7f111..d0269b8ddef 100644 --- a/code/modules/events/creep_awakening.dm +++ b/code/modules/events/creep_awakening.dm @@ -9,7 +9,7 @@ /datum/round_event/obsessed/start() for(var/mob/living/carbon/human/H in shuffle(GLOB.player_list)) - if(!H.client) + if(!H.client || !(ROLE_OBSESSED in H.client.prefs.be_special)) continue if(H.stat == DEAD) continue