cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

POLARIS: No string compare for assistants

Browse Source
This commit is contained in:
Leshana
2018-01-30 21:44:00 -05:00
parent 89f4e00e16
commit 6eec4063f3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/client/preference_setup/occupation/occupation.dm
View File

@@ -94,7 +94,7 @@
if(job.minimum_character_age && user.client && (user.client.prefs.age < job.minimum_character_age)) if(job.minimum_character_age && user.client && (user.client.prefs.age < job.minimum_character_age))
. += "<del>[rank]</del></td><td> \[MINIMUM CHARACTER AGE: [job.minimum_character_age]]</td></tr>" . += "<del>[rank]</del></td><td> \[MINIMUM CHARACTER AGE: [job.minimum_character_age]]</td></tr>"
continue continue
if((pref.job_civilian_low & ASSISTANT) && job.flag != ASSISTANT) if((pref.job_civilian_low & ASSISTANT) && job.type != /datum/job/assistant)
. += "<font color=grey>[rank]</font></td><td></td></tr>" . += "<font color=grey>[rank]</font></td><td></td></tr>"
continue continue
if((rank in command_positions) || (rank == "AI"))//Bold head jobs if((rank in command_positions) || (rank == "AI"))//Bold head jobs
@@ -106,7 +106,7 @@
. += "<a href='?src=\ref[src];set_job=[rank]'>" . += "<a href='?src=\ref[src];set_job=[rank]'>"
if(job.flag == ASSISTANT)//Assistant is special if(job.type == /datum/job/assistant)//Assistant is special
if(pref.job_civilian_low & ASSISTANT) if(pref.job_civilian_low & ASSISTANT)
. += " <font color=55cc55>\[Yes]</font>" . += " <font color=55cc55>\[Yes]</font>"
else else
@@ -180,7 +180,7 @@
if(!job) if(!job)
return 0 return 0
if(job.flag == ASSISTANT) if(job.type == /datum/job/assistant)
if(pref.job_civilian_low & job.flag) if(pref.job_civilian_low & job.flag)
pref.job_civilian_low &= ~job.flag pref.job_civilian_low &= ~job.flag
else else