more trimming

code/__DEFINES/role_preferences.dm

@@ -67,7 +67,6 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_DEVIL = /datum/game_mode/devil,
 	ROLE_INTERNAL_AFFAIRS = /datum/game_mode/traitor/internal_affairs,
 	ROLE_SENTIENCE,
-	ROLE_FAMILIES = /datum/game_mode/gang,
 	ROLE_BORER
 )) //WS Edit - Borers
 

code/__HELPERS/game.dm

@@ -464,7 +464,6 @@ block( \
 
 	//First we spawn a dude.
 	var/mob/living/carbon/human/new_character = new//The mob being spawned.
-	SSjob.SendToLateJoin(new_character)
 
 	G_found.client.prefs.copy_to(new_character)
 	new_character.dna.update_dna_identity()

code/_onclick/hud/hud.dm

@@ -62,10 +62,6 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	var/atom/movable/screen/healths
 	var/atom/movable/screen/healthdoll
 	var/atom/movable/screen/internals
-	var/atom/movable/screen/wanted/wanted_lvl
-	/*WS begin
-	var/atom/movable/screen/spacesuit
-	WS End - Fuckin' spacesuits. */
 	// subtypes can override this to force a specific UI style
 	var/ui_style
 
@@ -113,7 +109,6 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 
 	healths = null
 	healthdoll = null
-	wanted_lvl = null
 	internals = null
 	lingchemdisplay = null
 	devilsouldisplay = null

code/controllers/subsystem/job.dm

@@ -29,7 +29,6 @@ SUBSYSTEM_DEF(job)
 
 	return 1
 
-
 /datum/controller/subsystem/job/proc/GetJob(rank)
 	if(!occupations.len)
 		SetupOccupations()
@@ -42,20 +41,9 @@ SUBSYSTEM_DEF(job)
 		SetupOccupations()
 	return type_occupations[jobtype]
 
-/datum/controller/subsystem/job/proc/ResetOccupations()
-	JobDebug("Occupations reset.")
-	for(var/i in GLOB.new_player_list)
-		var/mob/dead/new_player/player = i
-		if((player) && (player.mind))
-			player.mind.assigned_role = null
-			player.mind.special_role = null
-	SetupOccupations()
-	return
-
 /datum/controller/subsystem/job/Recover()
 	set waitfor = FALSE
 	var/oldjobs = SSjob.occupations
-	sleep(20)
 
 /atom/proc/join_player_here(mob/M)
 	// By default, just place the mob on the same turf as the marker or whatever.
@@ -67,65 +55,6 @@ SUBSYSTEM_DEF(job)
 		return
 	..()
 
-/datum/controller/subsystem/job/proc/SendToLateJoin(mob/M, buckle = TRUE, atom/destination)
-	if(destination)
-		destination.join_player_here(M, buckle)
-		return TRUE
-
-	if(M.mind && M.mind.assigned_role && length(GLOB.jobspawn_overrides[M.mind.assigned_role])) //We're doing something special today.
-		destination = pick(GLOB.jobspawn_overrides[M.mind.assigned_role])
-		destination.join_player_here(M, FALSE)
-		return TRUE
-
-	var/msg = "Unable to send mob [M] to late join!"
-	message_admins(msg)
-	CRASH(msg)
-
-
-///////////////////////////////////
-//Keeps track of all living heads//
-///////////////////////////////////
-/datum/controller/subsystem/job/proc/get_living_heads()
-	. = list()
-	for(var/i in GLOB.human_list)
-		var/mob/living/carbon/human/player = i
-		if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.command_positions))
-			. |= player.mind
-
-
-////////////////////////////
-//Keeps track of all heads//
-////////////////////////////
-/datum/controller/subsystem/job/proc/get_all_heads()
-	. = list()
-	for(var/i in GLOB.mob_list)
-		var/mob/player = i
-		if(player.mind && (player.mind.assigned_role in GLOB.command_positions))
-			. |= player.mind
-
-//////////////////////////////////////////////
-//Keeps track of all living security members//
-//////////////////////////////////////////////
-/datum/controller/subsystem/job/proc/get_living_sec()
-	. = list()
-	for(var/i in GLOB.human_list)
-		var/mob/living/carbon/human/player = i
-		if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.security_positions))
-			. |= player.mind
-
-////////////////////////////////////////
-//Keeps track of all  security members//
-////////////////////////////////////////
-/datum/controller/subsystem/job/proc/get_all_sec()
-	. = list()
-	for(var/i in GLOB.human_list)
-		var/mob/living/carbon/human/player = i
-		if(player.mind && (player.mind.assigned_role in GLOB.security_positions))
-			. |= player.mind
-
-/datum/controller/subsystem/job/proc/JobDebug(message)
-	log_job_debug(message)
-
 /datum/controller/subsystem/job/proc/get_manifest()
 	var/list/manifest_out = list()
 	for(var/datum/overmap/ship/controlled/ship as anything in SSovermap.controlled_ships)

code/controllers/subsystem/ticker.dm

@@ -240,7 +240,6 @@ SUBSYSTEM_DEF(ticker)
 			to_chat(world, "<B>Unable to start [mode.name].</B> Not enough players, [mode.required_players] players and [mode.required_enemies] eligible antagonists needed. Reverting to pre-game lobby.")
 			qdel(mode)
 			mode = null
-			SSjob.ResetOccupations()
 			return 0
 
 	CHECK_TICK
@@ -254,7 +253,6 @@ SUBSYSTEM_DEF(ticker)
 			log_game("[mode.name] failed pre_setup, cause: [mode.setup_error]")
 			QDEL_NULL(mode)
 			to_chat(world, "<B>Error setting up [GLOB.master_mode].</B> Reverting to pre-game lobby.")
-			SSjob.ResetOccupations()
 			return 0
 	else
 		message_admins("<span class='notice'>DEBUG: Bypassing prestart checks...</span>")

code/datums/mind.dm

@@ -87,8 +87,8 @@
 	/// A lazy list of statuses to add next to this mind in the traitor panel
 	var/list/special_statuses
 
-	///WS edit - Crew objectives variable, stores crew objective datums
-	var/list/crew_objectives
+	/// A weakref to the /datum/overmap/ship/controlled the original mob spawned on
+	var/datum/weakref/original_ship
 
 /datum/mind/New(_key)
 	SSticker.minds += src