Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two

code/modules/client/preferences.dm

@@ -227,6 +227,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/persistent_scars = TRUE
 	///If we want to broadcast deadchat connect/disconnect messages
 	var/broadcast_login_logout = TRUE
+	///What outfit typepaths we've favorited in the SelectEquipment menu
+	var/list/favorite_outfits = list()
 	/// We have 5 slots for persistent scars, if enabled we pick a random one to load (empty by default) and scars at the end of the shift if we survived as our original person
 	var/list/scars_list = list("1" = "", "2" = "", "3" = "", "4" = "", "5" = "")
 	/// Which of the 5 persistent scar slots we randomly roll to load for this round, if enabled. Actually rolled in [/datum/preferences/proc/load_character(slot)]

code/modules/client/preferences_savefile.dm

@@ -406,6 +406,15 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["auto_ooc"]			>> auto_ooc
 	S["no_tetris_storage"]		>> no_tetris_storage
 
+	//favorite outfits
+	S["favorite_outfits"]	>> favorite_outfits
+
+	var/list/parsed_favs = list()
+	for(var/typetext in favorite_outfits)
+		var/datum/outfit/path = text2path(typetext)
+		if(ispath(path)) //whatever typepath fails this check probably doesn't exist anymore
+			parsed_favs += path
+	favorite_outfits = uniqueList(parsed_favs)
 
 	//try to fix any outdated data if necessary
 	if(needs_update >= 0)
@@ -455,6 +464,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	no_tetris_storage		= sanitize_integer(no_tetris_storage, 0, 1, initial(no_tetris_storage))
 	key_bindings 			= sanitize_islist(key_bindings, list())
 	modless_key_bindings 	= sanitize_islist(modless_key_bindings, list())
+	favorite_outfits = SANITIZE_LIST(favorite_outfits)
 
 	verify_keybindings_valid()		// one of these days this will runtime and you'll be glad that i put it in a different proc so no one gets their saves wiped
 
@@ -556,6 +566,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["pda_skin"], pda_skin)
 	WRITE_FILE(S["key_bindings"], key_bindings)
 	WRITE_FILE(S["modless_key_bindings"], modless_key_bindings)
+	WRITE_FILE(S["favorite_outfits"], favorite_outfits)
 
 	//citadel code
 	WRITE_FILE(S["screenshake"], screenshake)

code/modules/client/verbs/autobunker.dm

@@ -3,7 +3,7 @@
 	set desc = "Authorizes your account in the panic bunker of any servers connected to this function."
 	set category = "OOC"
 	
-	if(!(prefs.db_flags & DB_FLAG_AGE_CONFIRMATION_INCOMPLETE))
+	if(prefs.db_flags & DB_FLAG_AGE_CONFIRMATION_INCOMPLETE)
 		to_chat(src, "<span class='danger'>You are not age verified.</span>")
 		return