cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-19 11:59:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #423 from Jay-Sparrow/master

Browse Source 
Maybe fix for antag
This commit is contained in:
Dahlular
2020-09-03 12:57:25 -06:00
committed by GitHub
parent 282a25142c 78fc7ce945
commit c02e28d020
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+1 -1
View File
@@ -892,7 +892,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<b>Damage Screen Shake:</b> <a href='?_src_=prefs;preference=damagescreenshake'>[(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]</a><br>"
//Add the Hyper stuff below here
dat += "<h2>Hyper Preferences</h2>"
dat += "<b>NonCon:</b><a href='?_src_=prefs;preference=noncon'>[noncon == TRUE ? "Enabled" : "Disabled"]</a><BR>"
dat += "<b>NonCon - Bottom:</b><a href='?_src_=prefs;preference=noncon'>[noncon == TRUE ? "Enabled" : "Disabled"]</a><BR>"
dat += "<h2>Hyper Special Roles</h2>"
hyperstation/code/gamemode/traitor_lewd.dm
+1 -1
View File
@@ -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)