cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes latejoin slots and merges them with the normal job slots if they would be given (#21816)

Browse Source 
* FINALLY GONE

* Update code/controllers/subsystem/SSticker.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>

* Fairy review

* DivideOccupations fix

* Update code/controllers/subsystem/SSjobs.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

---------

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Emagged <ariulashmbgerdo@gmail.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
This commit is contained in:
DGamerL
2023-09-01 21:47:59 +01:00
committed by GitHub
co-authored by warriorstar-orion SteelSlayer Emagged
parent fd46ed6c67
commit 5a8872f39e
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/SSticker.dm
+13 -11
View File
@@ -226,7 +226,7 @@ SUBSYSTEM_DEF(ticker)
mode.pre_pre_setup()
var/can_continue = FALSE
can_continue = mode.pre_setup() //Setup special modes. This also does the antag fishing checks.
SSjobs.DivideOccupations() //Distribute jobs
if(!can_continue)
QDEL_NULL(mode)
to_chat(world, "<B>Error setting up [GLOB.master_mode].</B> Reverting to pre-game lobby.")
@@ -236,6 +236,18 @@ SUBSYSTEM_DEF(ticker)
Master.SetRunLevel(RUNLEVEL_LOBBY)
return FALSE
// Enable highpop slots just before we distribute jobs.
var/playercount = length(GLOB.clients)
var/highpop_trigger = 80
if(playercount >= highpop_trigger)
log_debug("Playercount: [playercount] versus trigger: [highpop_trigger] - loading highpop job config")
SSjobs.LoadJobs(TRUE)
else
log_debug("Playercount: [playercount] versus trigger: [highpop_trigger] - keeping standard job config")
SSjobs.DivideOccupations() //Distribute jobs
if(hide_mode)
var/list/modes = new
for(var/datum/game_mode/M in runnable_modes)
@@ -317,16 +329,6 @@ SUBSYSTEM_DEF(ticker)
if(N.client)
N.new_player_panel_proc()
// Now that every other piece of the round has initialized, lets setup player job scaling
var/playercount = length(GLOB.clients)
var/highpop_trigger = 80
if(playercount >= highpop_trigger)
log_debug("Playercount: [playercount] versus trigger: [highpop_trigger] - loading highpop job config")
SSjobs.LoadJobs(TRUE)
else
log_debug("Playercount: [playercount] versus trigger: [highpop_trigger] - keeping standard job config")
SSnightshift.check_nightshift(TRUE)
#ifdef UNIT_TESTS