cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-12 08:43:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5127 from VOREStation/upstream-merge-6130

Browse Source 
[MIRROR] Fixes gamemode checking list itself, instead of entries
This commit is contained in:
Novacat
2019-04-23 06:17:07 -04:00
committed by GitHub
parent a28944dc48 28fcde4b13
commit 0bc08531c9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/game_mode.dm
+2 -2
View File
@@ -146,10 +146,10 @@ var/global/list/additional_antag_types = list()
playerC++
if(master_mode=="secret")
if(playerC < config.player_requirements_secret)
if(playerC < config.player_requirements_secret[config_tag])
return 0
else
if(playerC < config.player_requirements)
if(playerC < config.player_requirements[config_tag])
return 0
if(!(antag_templates && antag_templates.len))
code/game/gamemodes/gameticker.dm
+1 -1
View File
@@ -101,7 +101,7 @@ var/global/datum/controller/gameticker/ticker
job_master.DivideOccupations() // Apparently important for new antagonist system to register specific job antags properly.
if(!src.mode.can_start())
world << "<B>Unable to start [mode.name].</B> Not enough players readied, [mode.required_players] players needed. Reverting to pregame lobby."
world << "<B>Unable to start [mode.name].</B> Not enough players readied, [config.player_requirements[mode.config_tag]] players needed. Reverting to pregame lobby."
current_state = GAME_STATE_PREGAME
Master.SetRunLevel(RUNLEVEL_LOBBY)
mode.fail_setup()