Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595

2020-02-29 15:16:43 +01:00
parent bd87d46ce6 d32cc370ad
commit bcc1c954c8
418 changed files with 1912 additions and 2321 deletions
@@ -1482,8 +1482,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)

 				if("flavor_text")
 					var/msg = stripped_multiline_input(usr, "Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!", "Flavor Text", features["flavor_text"], MAX_FLAVOR_LEN, TRUE)
-					if(msg)
-						features["flavor_text"] = msg
+					if(!isnull(msg))
+						features["flavor_text"] = html_decode(msg)

 				if("hair")
 					var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference","#"+hair_color) as color|null