Merge branch 'master' into upstream-merge-31129

code/modules/mob/dead/dead.dm

@@ -11,7 +11,7 @@ INITIALIZE_IMMEDIATE(/mob/dead)
 
 	prepare_huds()
 
-	if(config.cross_allowed)
+	if(CONFIG_GET(string/cross_server_address))
 		verbs += /mob/dead/proc/server_hop
 	return INITIALIZE_HINT_NORMAL
 
@@ -32,19 +32,20 @@ INITIALIZE_IMMEDIATE(/mob/dead)
 	set desc= "Jump to the other server"
 	if(notransform)
 		return
-	if(!config.cross_allowed)
+	var/csa = CONFIG_GET(string/cross_server_address)
+	if(csa)
 		verbs -= /mob/dead/proc/server_hop
 		to_chat(src, "<span class='notice'>Server Hop has been disabled.</span>")
 		return
-	if (alert(src, "Jump to server running at [config.cross_address]?", "Server Hop", "Yes", "No") != "Yes")
+	if (alert(src, "Jump to server running at [csa]?", "Server Hop", "Yes", "No") != "Yes")
 		return 0
-	if (client && config.cross_allowed)
-		to_chat(src, "<span class='notice'>Sending you to [config.cross_address].</span>")
+	if (client && csa)
+		to_chat(src, "<span class='notice'>Sending you to [csa].</span>")
 		new /obj/screen/splash(client)
 		notransform = TRUE
 		sleep(29)	//let the animation play
 		notransform = FALSE
 		winset(src, null, "command=.options") //other wise the user never knows if byond is downloading resources
-		client << link(config.cross_address + "?server_hop=[key]")
+		client << link(csa + "?server_hop=[key]")
 	else
 		to_chat(src, "<span class='error'>There is no other server configured!</span>")

code/modules/mob/dead/new_player/login.dm

@@ -1,5 +1,5 @@
 /mob/dead/new_player/Login()
-	if(config.use_exp_tracking)
+	if(CONFIG_GET(flag/use_exp_tracking))
 		client.set_exp_from_db()
 		client.set_db_player_flags()
 	if(!mind)
@@ -15,8 +15,9 @@
 	if(GLOB.admin_notice)
 		to_chat(src, "<span class='notice'><b>Admin Notice:</b>\n \t [GLOB.admin_notice]</span>")
 
-	if(config.soft_popcap && living_player_count() >= config.soft_popcap)
-		to_chat(src, "<span class='notice'><b>Server Notice:</b>\n \t [config.soft_popcap_message]</span>")
+	var/spc = CONFIG_GET(number/soft_popcap)
+	if(spc && living_player_count() >= spc)
+		to_chat(src, "<span class='notice'><b>Server Notice:</b>\n \t [CONFIG_GET(string/soft_popcap_message)]</span>")
 
 	sight |= SEE_TURFS
 

code/modules/mob/dead/new_player/new_player.dm

@@ -97,10 +97,12 @@
 
 	//Determines Relevent Population Cap
 	var/relevant_cap
-	if(config.hard_popcap && config.extreme_popcap)
-		relevant_cap = min(config.hard_popcap, config.extreme_popcap)
+	var/hpc = CONFIG_GET(number/hard_popcap)
+	var/epc = CONFIG_GET(number/extreme_popcap)
+	if(hpc && epc)
+		relevant_cap = min(hpc, epc)
 	else
-		relevant_cap = max(config.hard_popcap, config.extreme_popcap)
+		relevant_cap = max(hpc, epc)
 
 	if(href_list["show_preferences"])
 		client.prefs.ShowChoices(src)
@@ -133,7 +135,7 @@
 			return
 
 		if(SSticker.queued_players.len || (relevant_cap && living_player_count() >= relevant_cap && !(ckey(key) in GLOB.admin_datums)))
-			to_chat(usr, "<span class='danger'>[config.hard_popcap_message]</span>")
+			to_chat(usr, "<span class='danger'>[CONFIG_GET(string/hard_popcap_message)]</span>")
 
 			var/queue_position = SSticker.queued_players.Find(usr)
 			if(queue_position == 1)
@@ -309,7 +311,7 @@
 		return 0
 	if(job.required_playtime_remaining(client))
 		return 0
-	if(config.enforce_human_authority && !client.prefs.pref_species.qualifies_for_rank(rank, client.prefs.features))
+	if(CONFIG_GET(flag/enforce_human_authority) && !client.prefs.pref_species.qualifies_for_rank(rank, client.prefs.features))
 		return 0
 	return 1
 
@@ -326,11 +328,11 @@
 	var/arrivals_docked = TRUE
 	if(SSshuttle.arrivals)
 		close_spawn_windows()	//In case we get held up
-		if(SSshuttle.arrivals.damaged && config.arrivals_shuttle_require_safe_latejoin)
+		if(SSshuttle.arrivals.damaged && CONFIG_GET(flag/arrivals_shuttle_require_safe_latejoin))
 			src << alert("The arrivals shuttle is currently malfunctioning! You cannot join.")
 			return FALSE
 
-		if(config.arrivals_shuttle_require_undocked)
+		if(CONFIG_GET(flag/arrivals_shuttle_require_undocked))
 			SSshuttle.arrivals.RequireUndocked(src)
 		arrivals_docked = SSshuttle.arrivals.mode != SHUTTLE_CALL
 
@@ -374,7 +376,7 @@
 	GLOB.joined_player_list += character.ckey
 	GLOB.latejoiners += character
 
-	if(config.allow_latejoin_antagonists && humanc)	//Borgs aren't allowed to be antags. Will need to be tweaked if we get true latejoin ais.
+	if(CONFIG_GET(flag/allow_latejoin_antagonists) && humanc)	//Borgs aren't allowed to be antags. Will need to be tweaked if we get true latejoin ais.
 		if(SSshuttle.emergency)
 			switch(SSshuttle.emergency.mode)
 				if(SHUTTLE_RECALL, SHUTTLE_IDLE)
@@ -458,7 +460,7 @@
 
 	var/mob/living/carbon/human/H = new(loc)
 
-	if(config.force_random_names || jobban_isbanned(src, "appearance"))
+	if(CONFIG_GET(flag/force_random_names) || jobban_isbanned(src, "appearance"))
 		client.prefs.random_character()
 		client.prefs.real_name = client.prefs.pref_species.random_name(gender,1)
 	client.prefs.copy_to(H)

code/modules/mob/dead/new_player/preferences_setup.dm

@@ -14,7 +14,7 @@
 	facial_hair_color = hair_color
 	eye_color = random_eye_color()
 	if(!pref_species)
-		var/rando_race = pick(config.roundstart_races)
+		var/rando_race = pick(CONFIG_GET(keyed_flag_list/roundstart_races))
 		pref_species = new rando_race()
 	features = random_features()
 	age = rand(AGE_MIN,AGE_MAX)