Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2019-05-15 14:46:50 +01:00
77 changed files with 1694 additions and 141 deletions
+1 -1
View File
@@ -588,7 +588,7 @@ var/list/admin_verbs_event_manager = list(
prefs.ooccolor = input(src, "Please select your OOC colour.", "OOC colour") as color
else if(response == "Reset to default")
prefs.ooccolor = initial(prefs.ooccolor)
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","OC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return