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

[NON-MODULAR] Players in the interlink can no longer be selected as antagonist objective targets (#9619)

Browse Source 
* objective

* lets do obsessed while we're at it

* missed a bit

* fix + other kind of obsession

* Sure

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Fixed

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
This commit is contained in:
Zonespace
2021-12-16 17:28:30 -08:00
committed by GitHub
parent 21f8381327
commit 549f881be0
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@
/datum/brain_trauma/special/obsessed/proc/on_failed_social_interaction()
if(QDELETED(owner) || owner.stat >= UNCONSCIOUS)
return
switch(rand(1, 100))
switch(rand(1, 100))
if(1 to 40)
INVOKE_ASYNC(owner, /mob.proc/emote, pick("blink", "blink_r"))
owner.blur_eyes(10)
@@ -126,6 +126,10 @@
continue
if(!(player.mind.assigned_role.job_flags & JOB_CREW_MEMBER))
continue
// SKYRAT EDIT ADDITION START - Players in the interlink can't be obsession targets
if(SSticker.IsRoundInProgress() && istype(get_area(player), /area/centcom/interlink))
continue
// SKYRAT EDIT END
viable_minds += player.mind
for(var/datum/mind/possible_target as anything in viable_minds)
if(possible_target != owner && ishuman(possible_target.current))