cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7979 from VOREStation/upstream-merge-7195

Browse Source 
[MIRROR] Fixes runtime in antagonist_helpers.dm, line 15
This commit is contained in:
Aronai Sieyes
2020-05-20 15:47:41 -04:00
committed by GitHub
parent 37ec338ab3 eac7699560
commit 4c4d4aa74a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/antagonist/antagonist_helpers.dm
View File

@@ -12,8 +12,12 @@
return FALSE return FALSE
if(avoid_silicons) if(avoid_silicons)
var/datum/job/J = SSjob.get_job(player.assigned_role) var/datum/job/J = SSjob.get_job(player.assigned_role)
if(J.mob_type & JOB_SILICON) if(J)
return FALSE if(J.mob_type & JOB_SILICON)
return FALSE
else // If SSjob couldn't find a job, they don't have one yet, so the next best thing we can switch on are job preferences
if((player.current.client.prefs.job_engsec_high | player.current.client.prefs.job_engsec_med | player.current.client.prefs.job_engsec_low) & (AI | CYBORG)) // If they have ANY chance of being silicon
return FALSE
return TRUE return TRUE
/datum/antagonist/proc/antags_are_dead() /datum/antagonist/proc/antags_are_dead()