cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 09:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix obsessed not respecting player preferences (#44609)

Browse Source 
Also fixes a runtime due to a missing early return
This commit is contained in:
YPOQ
2019-06-18 14:29:07 -06:00
committed by Tad Hardesty
parent a0b99380ad
commit 94d1203276
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/datums/brain_damage/creepy_trauma.dm
View File

@@ -24,6 +24,7 @@
if(!obsession)//we didn't find one if(!obsession)//we didn't find one
lose_text = "" lose_text = ""
qdel(src) qdel(src)
return
gain_text = "<span class='warning'>You hear a sickening, raspy voice in your head. It wants one small task of you...</span>" gain_text = "<span class='warning'>You hear a sickening, raspy voice in your head. It wants one small task of you...</span>"
owner.mind.add_antag_datum(/datum/antagonist/obsessed) owner.mind.add_antag_datum(/datum/antagonist/obsessed)
antagonist = owner.mind.has_antag_datum(/datum/antagonist/obsessed) antagonist = owner.mind.has_antag_datum(/datum/antagonist/obsessed)

2
code/modules/events/creep_awakening.dm
View File

@@ -9,7 +9,7 @@
/datum/round_event/obsessed/start() /datum/round_event/obsessed/start()
for(var/mob/living/carbon/human/H in shuffle(GLOB.player_list)) 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 continue
if(H.stat == DEAD) if(H.stat == DEAD)
continue continue