Merge pull request #12670 from Citadel-Station-13/silicons-patch-14

PLEASE SANITIZE PREFERENCES PLEASE ALWAYS SANITIZE PREFERENCES NEVER DONT SANITIZE PREFERENCES EVERYONE HAS A NULL SPEECH VERB
2020-07-02 03:51:07 -07:00
parent bb67ab5ddd 5f11612078
commit fc306b5c1b
1 changed files with 7 additions and 0 deletions
@@ -325,6 +325,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	modless_key_bindings 	= sanitize_islist(modless_key_bindings, list())

 	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
+	sanitize_speech_and_tongue()

 	return 1

@@ -346,6 +347,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		if(!GLOB.keybindings_by_name[bindname])
 			modless_key_bindings -= key

+/datum/preferences/proc/sanitize_speech_and_tongue()
+	if(!(custom_speech_verb in GLOB.speech_verbs))
+		custom_speech_verb = GLOB.speech_verbs[1]
+	if(!(custom_tongue in GLOB.roundstart_tongues))
+		custom_tongue = GLOB.roundstart_tongues[1]
+
 /datum/preferences/proc/save_preferences()
 	if(!path)
 		return 0