bugfix: reset occupations after game mod probing (ss220-space#4006)

SS13-Extended · Dec 22, 2023 · 783d199 · 783d199
1 parent 1cb17b7
commit 783d199
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm
@@ -221,10 +221,9 @@ SUBSYSTEM_DEF(jobs)
 		if(player?.mind)
 			player.mind.assigned_role = null
 			player.mind.special_role = null
-	SetupOccupations()
+	for(var/datum/job/job in occupations)
+		job.current_positions = initial(job.current_positions)
 	unassigned = list()
-	return
-
 
 ///This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until it locates a head or runs out of levels to check
 /datum/controller/subsystem/jobs/proc/FillHeadPosition()

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
@@ -203,6 +203,7 @@ SUBSYSTEM_DEF(ticker)
 			var/datum/game_mode/M = config.pick_mode(GLOB.secret_force_mode)
 			if(M.can_start())
 				mode = config.pick_mode(GLOB.secret_force_mode)
+		SSjobs.ResetOccupations()
 		if(!mode)
 			mode = pickweight(runnable_modes)
 		if(mode)