Merge branch 'master' into synctesting

2018-04-09 21:43:26 +00:00
parent d3ba1085bb dab96582bd
commit e0d7630c19
43 changed files with 411 additions and 90 deletions
@@ -108,8 +108,8 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 	set desc = "Sets an extended description of your character's features."
 	set category = "IC"

-	var/new_flavor = (input(src, "Enter your new flavor text:", "Flavor text", null) as text|null)
-	if(new_flavor)
+	var/new_flavor = input(src, "Enter your new flavor text:", "Flavor text", null) as message|null
+	if(!isnull(new_flavor))
 		flavor_text = sanitize(new_flavor)
 		to_chat(src, "Your flavor text has been updated.")