From 9daacd69c5410ff414ecc00b788ef8ab97d03445 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 27 Oct 2017 23:54:35 -0500 Subject: [PATCH] Update game_options.dm --- .../configuration/entries/game_options.dm | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index 436c77131d..44d7308fa3 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -110,33 +110,7 @@ CONFIG_DEF(number/shuttle_refuel_delay) CONFIG_DEF(flag/show_game_type_odds) //if set this allows players to see the odds of each roundtype on the get revision screen -<<<<<<< HEAD -CONFIG_DEF(flag/join_with_mutant_race) //players can choose their mutant race before joining the game - -CONFIG_DEF(keyed_flag_list/roundstart_races) //races you can play as from the get go. If left undefined the game's roundstart var for species is used - var/first_edit = TRUE - -/datum/config_entry/keyed_flag_list/roundstart_races/New() - for(var/I in subtypesof(/datum/species)) - var/datum/species/S = I - if(initial(S.roundstart)) - value[initial(S.id)] = TRUE - ..() - -/datum/config_entry/keyed_flag_list/roundstart_races/ValidateAndSet(str_val) - var/list/old_val - if(first_edit) - old_val = value - old_val = old_val.Copy() - . = ..() - if(first_edit) - if(!.) - value = old_val - else - first_edit = FALSE -======= CONFIG_DEF(keyed_flag_list/roundstart_races) //races you can play as from the get go. ->>>>>>> 360fbff... Fixes losing species preferences (#32093) CONFIG_DEF(flag/join_with_mutant_humans) //players can pick mutant bodyparts for humans before joining the game