Merge pull request #3877 from TheGreatKitsune/non-crew-role

Non crew role added

code/modules/client/preference_setup/occupation/occupation.dm

@@ -19,6 +19,11 @@
 	S["job_talon_high"]		>> pref.job_talon_high
 	//VOREStation Add End
 	S["player_alt_titles"]	>> pref.player_alt_titles
+	//CHOMPStation Add
+	S["job_other_low"]		>> pref.job_other_low
+	S["job_other_med"]		>> pref.job_other_med
+	S["job_other_high"]		>> pref.job_other_high
+	//CHOMPStation Add End
 
 /datum/category_item/player_setup_item/occupation/save_character(var/savefile/S)
 	S["alternate_option"]	<< pref.alternate_option
@@ -37,6 +42,11 @@
 	S["job_talon_high"]		<< pref.job_talon_high
 	//VOREStation Add End
 	S["player_alt_titles"]	<< pref.player_alt_titles
+	//CHOMPStation Add
+	S["job_other_low"]		<< pref.job_other_low
+	S["job_other_med"]		<< pref.job_other_med
+	S["job_other_high"]		<< pref.job_other_high
+	//CHOMPStation Add End
 
 /datum/category_item/player_setup_item/occupation/sanitize_character()
 	pref.alternate_option	= sanitize_integer(pref.alternate_option, 0, 2, initial(pref.alternate_option))
@@ -54,6 +64,11 @@
 	pref.job_talon_med 		= sanitize_integer(pref.job_talon_med, 0, 65535, initial(pref.job_talon_med))
 	pref.job_talon_low 		= sanitize_integer(pref.job_talon_low, 0, 65535, initial(pref.job_talon_low))
 	//VOREStation Add End
+	//CHOMPStation Add
+	pref.job_other_high		= sanitize_integer(pref.job_other_high, 0, 65535, initial(pref.job_other_high))
+	pref.job_other_med		= sanitize_integer(pref.job_other_med, 0, 65535, initial(pref.job_other_med))
+	pref.job_other_low		= sanitize_integer(pref.job_other_low, 0, 65535, initial(pref.job_other_low))
+	//CHOMPStation Add End
 	if(!(pref.player_alt_titles)) pref.player_alt_titles = new()
 
 	if(!job_master)
@@ -320,6 +335,7 @@
 	pref.job_medsci_high = 0
 	pref.job_engsec_high = 0
 	pref.job_talon_high = 0 //VOREStation Add
+	pref.job_other_high = 0 //CHOMPStation Add
 
 // Level is equal to the desired new level of the job. So for a value of 4, we want to disable the job.
 /datum/category_item/player_setup_item/occupation/proc/SetJobDepartment(var/datum/job/job, var/level)
@@ -377,6 +393,20 @@
 				if(3)
 					pref.job_talon_low |= job.flag
 		VOREStation Add End*/
+		//CHOMPStation Add
+		if(OTHER)
+			pref.job_other_low &= ~job.flag
+			pref.job_other_med &= ~job.flag
+			pref.job_other_high &= ~job.flag
+			switch(level)
+				if(1)
+					reset_jobhigh()
+					pref.job_other_high = job.flag
+				if(2)
+					pref.job_other_med |= job.flag
+				if(3)
+					pref.job_other_low |= job.flag
+		//CHOMPStation Add End
 
 	return 1
 
@@ -399,6 +429,12 @@
 	pref.job_talon_low = 0
 	//VOREStation Add End
 
+	//CHOMPStation Add
+	pref.job_other_high = 0
+	pref.job_other_med = 0
+	pref.job_other_low = 0
+	//CHOMPStation Add End
+
 	pref.player_alt_titles.Cut()
 
 /datum/preferences/proc/GetPlayerAltTitle(datum/job/job)
@@ -431,4 +467,14 @@
 					return job_engsec_med
 				if(3)
 					return job_engsec_low
+		//CHOMPStation Add
+		if(OTHER)
+			switch(level)
+				if(1)
+					return job_other_high
+				if(2)
+					return job_other_med
+				if(3)
+					return job_other_low
+		//CHOMPStation Add End
 	return 0

code/modules/client/preferences_ch.dm

@@ -1,2 +0,0 @@
-/datum/preferences
-	var/digitigrade = 0 // 0 = no digi, 1 = default, 2+ = digi styles... (Not used yet)

code/modules/client/preferences_spawnpoints.dm

@@ -13,6 +13,7 @@ var/list/spawntypes = list()
 	var/list/restrict_job = null
 	var/list/disallow_job = null
 	var/announce_channel = "Common"
+	var/allow_offmap_spawn = FALSE //CHOMPEdit - add option to allow offmap spawns to a spawnpoint without entirely restricting that spawnpoint
 	var/allowed_mob_types = JOB_SILICON|JOB_CARBON
 
 /datum/spawnpoint/proc/check_job_spawning(job)
@@ -26,7 +27,7 @@ var/list/spawntypes = list()
 	if(!J) // Couldn't find, admin shenanigans? Allow it
 		return 1
 
-	if(J.offmap_spawn && !(job in restrict_job))
+	if(J.offmap_spawn && !allow_offmap_spawn && !(job in restrict_job)) //CHOMPEdit - add option to allow offmap spawns to a spawnpoint without entirely restricting that spawnpoint
 		return 0
 
 	if(!(J.mob_type & allowed_mob_types))
@@ -40,6 +41,7 @@ var/list/spawntypes = list()
 /datum/spawnpoint/arrivals
 	display_name = "Arrivals Shuttle"
 	msg = "will arrive to the station shortly by shuttle"
+	disallow_job = list("Non-Crew") //CHOMPEdit add
 
 /datum/spawnpoint/arrivals/New()
 	..()
@@ -65,6 +67,7 @@ var/list/spawntypes = list()
 	display_name = "Cryogenic Storage"
 	msg = "has completed cryogenic revival"
 	allowed_mob_types = JOB_CARBON
+	disallow_job = list("Non-Crew") //CHOMPEdit add
 
 /datum/spawnpoint/cryo/New()
 	..()
@@ -74,6 +77,7 @@ var/list/spawntypes = list()
 	display_name = "Cyborg Storage"
 	msg = "has been activated from storage"
 	allowed_mob_types = JOB_SILICON
+	disallow_job = list("Non-Crew") //CHOMPEdit add
 
 /datum/spawnpoint/cyborg/New()
 	..()
@@ -100,7 +104,8 @@ var/global/list/latejoin_tram   = list()
 /datum/spawnpoint/tram
 	display_name = "Tram Station"
 	msg = "will arrive to the station shortly by shuttle"
+	disallow_job = list("Non-Crew") //CHOMPEdit add
 
 /datum/spawnpoint/tram/New()
 	..()
-	turfs = latejoin_tram
+	turfs = latejoin_tram

code/modules/client/preferences_spawnpoints_ch.dm

@@ -1,19 +0,0 @@
-/datum/spawnpoint/stationgateway
-	display_name = "Station gateway"
-	msg = "has completed translation from station gateway"
-
-/datum/spawnpoint/stationgateway/New()
-	..()
-	turfs = latejoin_gatewaystation
-
-/datum/spawnpoint/vore
-	display_name = "Vorespawn - Prey"
-	msg = "has arrived on the station"
-
-/datum/spawnpoint/vore/pred
-	display_name = "Vorespawn - Pred"
-	msg = "has arrived on the station"
-
-/datum/spawnpoint/vore/New()
-	..()
-	turfs = latejoin