diff --git a/code/controllers/configuration_vr.dm b/code/controllers/configuration_vr.dm
index 61ac89ad69..6d6a922e9f 100644
--- a/code/controllers/configuration_vr.dm
+++ b/code/controllers/configuration_vr.dm
@@ -5,6 +5,8 @@
 /datum/configuration
 	var/list/engine_map	// Comma separated list of engines to choose from.  Blank means fully random.
 	var/time_off = FALSE
+	var/limit_interns = -1 //Unlimited by default
+	var/limit_visitors = -1 //Unlimited by default
 
 /hook/startup/proc/read_vs_config()
 	var/list/Lines = file2list("config/config.txt")
@@ -41,6 +43,10 @@
 				config.fax_export_dir = value
 			if ("items_survive_digestion")
 				config.items_survive_digestion = 1
+			if ("limit_interns")
+				config.limit_interns = text2num(value)
+			if ("limit_visitors")
+				config.limit_visitors = text2num(value)
 			if ("time_off")
 				config.time_off = TRUE
 
diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm
index 50f22c6fef..e5cabfeb23 100644
--- a/code/game/jobs/job/assistant.dm
+++ b/code/game/jobs/job/assistant.dm
@@ -1,23 +1,39 @@
 /datum/job/assistant
-	title = "Assistant"
-	flag = ASSISTANT
+	title = "Intern"
+	flag = INTERN
 	department = "Civilian"
 	department_flag = CIVILIAN
 	faction = "Station"
-	total_positions = -1
-	spawn_positions = -1
+	total_positions = config.limit_interns //VOREStation Edit
+	spawn_positions = config.limit_interns //VOREStation Edit
 	supervisors = "absolutely everyone"
 	selection_color = "#515151"
-	economic_modifier = 1
+	economic_modifier = 2
 	access = list()			//See /datum/job/assistant/get_access()
 	minimal_access = list()	//See /datum/job/assistant/get_access()
 	outfit_type = /decl/hierarchy/outfit/job/assistant
-	alt_titles = list("Technical Assistant","Test Subject","Medical Intern","Research Assistant",
-					"Visitor" = /decl/hierarchy/outfit/job/assistant/visitor,
-					"Resident" = /decl/hierarchy/outfit/job/assistant/resident) //Test Subject is a VOREStation edit
+	alt_titles = list("Engineering Intern","Medical Intern","Research Intern","Security Intern","Cargo Intern") //VOREStation Edit
 
 /datum/job/assistant/get_access()
 	if(config.assistant_maint)
 		return list(access_maint_tunnels)
 	else
 		return list()
+
+// VOREStation Add
+/datum/job/visitor
+	title = "Visitor"
+	flag = ASSISTANT
+	department = "Civilian"
+	department_flag = CIVILIAN
+	faction = "Station"
+	total_positions = config.limit_visitors
+	spawn_positions = config.limit_visitors
+	supervisors = "absolutely everyone"
+	selection_color = "#515151"
+	economic_modifier = 1
+	access = list()
+	minimal_access = list()
+	outfit_type = /decl/hierarchy/outfit/job/assistant
+	alt_titles = list("Test Subject")
+// VOREStation Add End
\ No newline at end of file
diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index d2905c3a61..e5e9d240e2 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -44,6 +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/list/assistant_occupations = list(
 )
diff --git a/config/example/config.txt b/config/example/config.txt
index 2536b1350e..f9ff877e89 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -404,4 +404,8 @@ STARLIGHT 0
 ENGINE_MAP Supermatter Engine,Edison's Bane
 
 # Controls if the 'time off' system is used for determining if players can play 'Off-Duty' jobs (requires SQL)
-# time_off
\ No newline at end of file
+# TIME_OFF
+
+# Applies a limit to the number of assistants and visitors respectively
+# LIMIT_INTERNS 6
+# LIMIT_VISITORS 6
\ No newline at end of file