Non crew role added

code/__defines/misc_ch.dm

@@ -1,3 +1,5 @@
+//Department defines
+#define DEPARTMENT_NONCREW      "Non crew"
 
 //Material defines
 #define MAT_CARPET				"red carpet"

code/datums/outfits/jobs/noncrew_ch.dm

@@ -0,0 +1,10 @@
+/decl/hierarchy/outfit/job/noncrew
+    hierarchy_type = /decl/hierarchy/outfit/job/noncrew
+    r_pocket = /obj/item/weapon/spacecash/ewallet
+
+/decl/hierarchy/outfit/job/noncrew/post_equip(mob/living/carbon/human/H)
+    ..()
+    var/obj/item/weapon/spacecash/ewallet/wallet = H.r_store
+    if(istype(wallet))
+        wallet.owner_name = H.real_name
+        wallet.worth = 1000

code/game/jobs/job/department_ch.dm

@@ -0,0 +1,6 @@
+/datum/department/noncrew
+    name = DEPARTMENT_NONCREW
+    short_name = "N/A"
+    sorting_order = -99
+    visible = FALSE
+    assignable = FALSE

code/game/jobs/job/job.dm

@@ -174,6 +174,10 @@
 	//return (brain_type && LAZYACCESS(ideal_age_by_species, brain_type)) || LAZYACCESS(ideal_age_by_species, brain_type) || ideal_character_age //VOREStation Removal
 
 /datum/job/proc/is_species_banned(species_name, brain_type)
+	// CHOMPEdit begin -- Shadekin cannot be any crew position
+	if(species_name == SPECIES_SHADEKIN)
+		return TRUE
+	// CHOMPEdit end
 	return FALSE // VOREStation Edit - Any species can be any job.
 	/* VOREStation Removal
 	if(banned_job_species == null)

code/game/jobs/job/noncrew_ch.dm

@@ -0,0 +1,21 @@
+/datum/job/noncrew
+    title = "Non crew"
+    disallow_jobhop = TRUE
+    total_positions = -1
+    spawn_positions = 6
+    supervisors = "no one."
+
+    flag = NONCREW
+    departments = list(DEPARTMENT_NONCREW)
+    department_flag = OTHER
+    faction = "Station"
+    assignable = FALSE
+    account_allowed = 0
+    offmap_spawn = TRUE
+
+    outfit_type = /decl/hierarchy/outfit/job/noncrew
+    job_description = "Not a crew member."
+
+/datum/job/noncrew/is_species_banned(species_name, brain_type)
+    // Any species can join as non-crew, including shadekin.
+    return FALSE

code/game/jobs/jobs.dm

@@ -51,6 +51,9 @@ var/const/ASSISTANT			=(1<<11)
 var/const/BRIDGE			=(1<<12)
 var/const/ENTERTAINER		=(1<<13) //VOREStation Add
 
+var/const/OTHER				=(1<<10) //CHOMPStation Add
+var/const/NONCREW			=(1<<0) //CHOMPStation Add
+
 var/list/assistant_occupations = list(
 )
 

code/game/objects/effects/landmarks.dm

@@ -36,6 +36,10 @@
 			latejoin_gatewaystation += loc
 			delete_me = 1
 			return
+		if("JoinLateSifPlains")
+			latejoin_plainspath += loc
+			delete_me = 1
+			return
 		//CHOMPEdit End
 		if("JoinLateElevator")
 			latejoin_elevator += loc

code/global_ch.dm

@@ -2,4 +2,5 @@
 var/list/shell_module_blacklist = list(
 	"Sci-borg", "Research"
 	)
-var/list/latejoin_gatewaystation = list()
+var/list/latejoin_gatewaystation = list()
+var/list/latejoin_plainspath = list()

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 +1,6 @@
 /datum/preferences
-	var/digitigrade = 0 // 0 = no digi, 1 = default, 2+ = digi styles... (Not used yet)
+	var/digitigrade = 0 // 0 = no digi, 1 = default, 2+ = digi styles... (Not used yet)
+
+	var/job_other_low = 0
+	var/job_other_med = 0
+	var/job_other_high = 0

code/modules/client/preferences_spawnpoints.dm

@@ -40,6 +40,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 +66,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 +76,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,6 +103,7 @@ 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()
 	..()

code/modules/client/preferences_spawnpoints_ch.dm

@@ -1,6 +1,7 @@
 /datum/spawnpoint/stationgateway
 	display_name = "Station gateway"
 	msg = "has completed translation from station gateway"
+	disallow_job = list("Non crew")
 
 /datum/spawnpoint/stationgateway/New()
 	..()
@@ -16,4 +17,13 @@
 
 /datum/spawnpoint/vore/New()
 	..()
-	turfs = latejoin
+	turfs = latejoin
+
+/datum/spawnpoint/plainspath
+	display_name = "Sif plains"
+	msg = "has checked in at the plains gate"
+	restrict_job = list("Non crew")
+
+/datum/spawnpoint/plainspath/New()
+	..()
+	turfs = latejoin_plainspath

code/modules/mob/new_player/new_player.dm

@@ -475,7 +475,12 @@
 
 	ticker.mode.latespawn(character)
 
-	if(J.mob_type & JOB_SILICON)
+	//CHOMPEdit Begin - non-crew join don't get a message
+	if(rank == "Non crew")
+		if(!(J.mob_type & JOB_SILICON))
+			ticker.minds += character.mind
+	//CHOMPEdit End
+	else if(J.mob_type & JOB_SILICON)
 		AnnounceCyborg(character, rank, join_message, announce_channel, character.z)
 	else
 		AnnounceArrival(character, rank, join_message, announce_channel, character.z)

maps/southern_cross/southern_cross-5.dmm

@@ -18,7 +18,7 @@
 "ar" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/white/border,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/surface/outpost/main/corridor/right_upper)
 "as" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/industrial/danger,/turf/simulated/floor/tiled,/area/surface/outpost/main/landing)
 "at" = (/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/monotile,/area/surface/outpost/mining_main)
-"au" = (/obj/machinery/light,/turf/simulated/shuttle/floor/voidcraft/external,/area/surface/outpost/wall)
+"au" = (/obj/machinery/light,/obj/effect/landmark{name = "JoinLateSifPlains"},/turf/simulated/shuttle/floor/voidcraft/external,/area/surface/outpost/wall)
 "av" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/surface/outpost/engineering/atmos_room)
 "aw" = (/obj/machinery/door/firedoor/multi_tile/glass,/obj/machinery/door/airlock/multi_tile/metal{name = "Sauna"},/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 8},/turf/simulated/floor/tiled/monotile,/area/surface/outpost/civilian/sauna)
 "ax" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 4},/turf/simulated/floor/plating,/area/surface/outpost/engineering/atmos_room)
@@ -1854,6 +1854,7 @@
 "NF" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/plating,/area/surface/outpost/main/construction_area)
 "NG" = (/obj/effect/floor_decal/steeldecal/steel_decals3{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals3{dir = 1},/obj/machinery/camera/network/civilian{c_tag = "CO - Airlock Access 2"},/turf/simulated/floor/tiled,/area/surface/outpost/civilian/sauna)
 "NH" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/heavyduty{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/overlay/snow/floor/edges{dir = 4},/turf/simulated/floor/tiled/steel/sif/planetuse,/area/surface/outside/plains/outpost)
+"NI" = (/obj/effect/landmark{name = "JoinLateSifPlains"},/turf/simulated/shuttle/floor/voidcraft/external,/area/surface/outpost/wall)
 "NJ" = (/obj/effect/floor_decal/steeldecal/steel_decals3{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals3,/obj/machinery/camera/network/mining{c_tag = "PO - Airlock Access 1"; dir = 8},/turf/simulated/floor/tiled,/area/surface/outpost/mining_main/storage)
 "NK" = (/obj/structure/cable/blue{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/surface/outpost/main/gym)
 "NL" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/full,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/surface/outpost/main/corridor/right_lower)
@@ -2592,7 +2593,7 @@ tFxaxaxaHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHu
 tFxaxaxaHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuioHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHupcpcpcpcpcHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuFsFsFsFskbkbkbkbkbFsFsFsFsFsFsFsHuHuuououououououopcpcpcpcpcpcpcuououououououououououououououououopcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcxaxatF
 tFxaxaxaHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuioHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHupcpcpcpcpcHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuFsFsFsFskbkbkbFsFsFsFsFsFsFsHuHuHuHuHuuououououopcpcpcpcpcpcpcuououououououououououououououououopcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcxaxatF
 tFxaxaxaHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuioHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHupcpcXWXWXWpcpcHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuFsFsFskbkbkbFsFsFsFsFsFsHuHuHuHuHuHuHuHuuouououopcpcXWXWXWpcpcuouououououououououououououououopcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcxaxaxatF
-tFxaxaxaHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuioHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHupcQZXWauXWRepcHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuFsFsFskbkbFsFsFsFsFsHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuQZXWauXWRepcuouououououououououououououououopcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcxaxaxatF
+tFxaxaxaHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuioHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHupcQZNIauNIRepcHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuFsFsFskbkbFsFsFsFsFsHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuQZNIauNIRepcuouououououououououououououououopcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcxaxaxatF
 tFxaxaxaxaxaxaxaHuxaHuxaxaHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuioHuHuHuHuHuHuHuHuHuHuxaxaxaxadVHuHuHudVHuHuHudVHuHuHudVHuHuHujsiiOSiijsHuHuHudVHuHuHudVHuHuHudVHuHuHudVHuFsFsFskbkbFsFsFsHudVHuHuHudVHuHuHudVHuHuHudVHuHuHujsiiIxiijsuououodVuououodVuououodVxaxauououopcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcxaxaxaxaxatF
 tFxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaHuHuHuHuHuHuHuHuHuHuHuHuHuxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaRrHuHuHuHuHuxaxaxaxaxaxadVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVXWXWXWdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVFsFskbkbFsFsdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVXWXWXWdVdVdVdVdVdVdVdVdVdVdVdVdVdVxauoxaxaxapcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcpcxaxaxaxaxaxatF
 tFaaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaRrxaxaxaxaxaxaxaxaxaxaxadVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVuJXWVidVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVFsFskbkbFsFsdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVdVuJXWVidVdVdVdVdVdVdVdVdVdVdVdVdVdVxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxatF

maps/southern_cross/southern_cross_defines.dm

@@ -87,7 +87,7 @@
 							NETWORK_SUPPLY
 							)
 	usable_email_tlds = list("freemail.nt")
-	allowed_spawns = list("Arrivals Shuttle","Gateway", "Cryogenic Storage", "Cyborg Storage", "Station gateway")
+	allowed_spawns = list("Arrivals Shuttle","Gateway", "Cryogenic Storage", "Cyborg Storage", "Station gateway", "Sif plains")
 	default_skybox = /datum/skybox_settings/southern_cross
 	unit_test_exempt_areas = list(/area/ninja_dojo, /area/shuttle/ninja)
 	unit_test_exempt_from_atmos = list(/area/tcomm/chamber)

vorestation.dme

@@ -440,6 +440,7 @@
 #include "code\datums\outfits\jobs\medical.dm"
 #include "code\datums\outfits\jobs\medical_vr.dm"
 #include "code\datums\outfits\jobs\misc.dm"
+#include "code\datums\outfits\jobs\noncrew_ch.dm"
 #include "code\datums\outfits\jobs\science.dm"
 #include "code\datums\outfits\jobs\science_vr.dm"
 #include "code\datums\outfits\jobs\security.dm"
@@ -809,6 +810,7 @@
 #include "code\game\jobs\job\civilian_chaplain.dm"
 #include "code\game\jobs\job\civilian_vr.dm"
 #include "code\game\jobs\job\department.dm"
+#include "code\game\jobs\job\department_ch.dm"
 #include "code\game\jobs\job\department_vr.dm"
 #include "code\game\jobs\job\engineering.dm"
 #include "code\game\jobs\job\engineering_vr.dm"
@@ -818,6 +820,7 @@
 #include "code\game\jobs\job\medical.dm"
 #include "code\game\jobs\job\medical_ch.dm"
 #include "code\game\jobs\job\medical_vr.dm"
+#include "code\game\jobs\job\noncrew_ch.dm"
 #include "code\game\jobs\job\offduty_vr.dm"
 #include "code\game\jobs\job\science.dm"
 #include "code\game\jobs\job\science_vr.dm"