From 78fc7ce94584b3e5ba2be6172fb46461c668978d Mon Sep 17 00:00:00 2001 From: JaySparrow Date: Tue, 1 Sep 2020 16:48:30 -0500 Subject: [PATCH] Maybe fix for antag Hard to test outside of a live environment, but let's see if this fixes the target picker giving "nothing". Also changes one label on preferences for a little more clarity. I'll work on it more. --- code/modules/client/preferences.dm | 2 +- hyperstation/code/gamemode/traitor_lewd.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 150ae28d..c98a7a90 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -892,7 +892,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Damage Screen Shake: [(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]
" //Add the Hyper stuff below here dat += "

Hyper Preferences

" - dat += "NonCon:[noncon == TRUE ? "Enabled" : "Disabled"]
" + dat += "NonCon - Bottom:[noncon == TRUE ? "Enabled" : "Disabled"]
" dat += "

Hyper Special Roles

" diff --git a/hyperstation/code/gamemode/traitor_lewd.dm b/hyperstation/code/gamemode/traitor_lewd.dm index 72bc8fb2..02902c18 100644 --- a/hyperstation/code/gamemode/traitor_lewd.dm +++ b/hyperstation/code/gamemode/traitor_lewd.dm @@ -216,7 +216,7 @@ GLOBAL_LIST_INIT(hyper_special_roles, list( var/list/datum/mind/targets = list() var/list/datum/mind/owners = get_owners() for(var/datum/mind/candidate in SSticker.minds) - if (!(candidate in owners) && ishuman(candidate.current)) + if (!(candidate in owners) && ishuman(candidate.current) && (candidate.current.client == TRUE)) if(candidate.current.client.prefs.noncon == 1) targets += candidate if(targets.len > 0)