Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit

code/controllers/configuration/configuration.dm

@@ -341,7 +341,7 @@
 		if(probabilities[M.config_tag]<=0)
 			qdel(M)
 			continue
-		if(M.config_tag in SSvote.stored_modetier_results && SSvote.stored_modetier_results[M.config_tag] < Get(/datum/config_entry/number/dropped_modes))
+		if(CONFIG_GET(flag/modetier_voting) && !(M.config_tag in SSvote.stored_modetier_results))
 			qdel(M)
 			continue
 		if(min_pop[M.config_tag])

code/controllers/configuration/entries/game_options.dm

@@ -362,6 +362,15 @@
 
 /datum/config_entry/flag/enable_night_shifts
 
+/datum/config_entry/number/night_shift_public_areas_only
+	config_entry_value = NIGHTSHIFT_AREA_PUBLIC
+
+/datum/config_entry/flag/nightshift_toggle_requires_auth
+	config_entry_value = FALSE
+
+/datum/config_entry/flag/nightshift_toggle_public_requires_auth
+	config_entry_value = TRUE
+
 /datum/config_entry/flag/randomize_shift_time
 
 /datum/config_entry/flag/shift_time_realtime
@@ -396,7 +405,8 @@
 	config_entry_value = TRUE
 
 /datum/config_entry/flag/modetier_voting
-	config_entry_value = TRUE
 
 /datum/config_entry/number/dropped_modes
 	config_entry_value = 3
+
+/datum/config_entry/flag/suicide_allowed

code/controllers/configuration/entries/general.dm

@@ -43,6 +43,8 @@
 
 /datum/config_entry/flag/log_vote	// log voting
 
+/datum/config_entry/flag/log_craft	// log crafting
+
 /datum/config_entry/flag/log_whisper	// log client whisper
 
 /datum/config_entry/flag/log_attack	// log attack messages