From 3031dd8afa97892509f1fff9295df282fec31d58 Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Tue, 30 Jan 2018 21:13:50 -0500
Subject: [PATCH 1/2] POLARIS: No string compare for assistants

---
 .../client/preference_setup/occupation/occupation.dm        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm
index 801e4ce6831..c1b55252a8e 100644
--- a/code/modules/client/preference_setup/occupation/occupation.dm
+++ b/code/modules/client/preference_setup/occupation/occupation.dm
@@ -94,7 +94,7 @@
 		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>"
 			continue
-		if((pref.job_civilian_low & ASSISTANT) && (rank != "Assistant"))
+		if((pref.job_civilian_low & ASSISTANT) && job.flag != ASSISTANT)
 			. += "<font color=grey>[rank]</font></td><td></td></tr>"
 			continue
 		if((rank in command_positions) || (rank == "AI"))//Bold head jobs
@@ -106,7 +106,7 @@
 
 		. += "<a href='?src=\ref[src];set_job=[rank]'>"
 
-		if(rank == "Assistant")//Assistant is special
+		if(job.flag == ASSISTANT)//Assistant is special
 			if(pref.job_civilian_low & ASSISTANT)
 				. += " <font color=55cc55>\[Yes]</font>"
 			else
@@ -180,7 +180,7 @@
 	if(!job)
 		return 0
 
-	if(role == "Assistant")
+	if(job.flag == ASSISTANT)
 		if(pref.job_civilian_low & job.flag)
 			pref.job_civilian_low &= ~job.flag
 		else

From 76a1006cfbb4cd33522f46d623e5089cea05fddf Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Tue, 30 Jan 2018 21:14:16 -0500
Subject: [PATCH 2/2] VS: Fix bit for Pilot and lack of config at new

---
 code/game/jobs/job/assistant.dm | 10 ++++++----
 code/game/jobs/jobs.dm          |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm
index 8ac53caa852..768462c8350 100644
--- a/code/game/jobs/job/assistant.dm
+++ b/code/game/jobs/job/assistant.dm
@@ -17,8 +17,9 @@
 //VOREStation Add
 /datum/job/intern/New()
 	..()
-	total_positions = config.limit_interns
-	spawn_positions = config.limit_interns
+	if(config)
+		total_positions = config.limit_interns
+		spawn_positions = config.limit_interns
 //VOREStation Add End
 
 // VOREStation Add
@@ -38,8 +39,9 @@
 	outfit_type = /decl/hierarchy/outfit/job/assistant
 /datum/job/assistant/New()
 	..()
-	total_positions = config.limit_visitors
-	spawn_positions = config.limit_visitors
+	if(config)
+		total_positions = config.limit_visitors
+		spawn_positions = config.limit_visitors
 /datum/job/assistant/get_access()
 	if(config.assistant_maint)
 		return list(access_maint_tunnels)
diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index e5e9d240e24..c2ed7c231aa 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -44,7 +44,7 @@ var/const/ASSISTANT			=(1<<11)
 var/const/BRIDGE			=(1<<12)
 var/const/CLOWN				=(1<<13) //VOREStation Add
 var/const/MIME				=(1<<14) //VOREStation Add
-var/const/INTERN			=(1<<15) //VOREStation Add
+var/const/INTERN			=(1<<16) //VOREStation Add
 
 var/list/assistant_occupations = list(
 )