From ea55a53a9962320ad4dd7528cc553db4729de846 Mon Sep 17 00:00:00 2001
From: TalkingCactus <talkingcactus98@gmail.com>
Date: Sun, 28 Aug 2016 08:26:50 -0400
Subject: [PATCH] fixes flavor text not saving/displaying correctly

---
 code/modules/client/preferences.dm            |  2 +-
 code/modules/client/preferences_savefile.dm   | 36 +++++++++----------
 code/modules/mob/living/carbon/human/human.dm |  2 ++
 code/modules/mob/mob.dm                       |  2 +-
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index a34d3ea6b8..460d8a8489 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1287,6 +1287,7 @@ var/list/preferences_datums = list()
 
 	character.real_name = real_name
 	character.name = character.real_name
+	character.flavor_text = flavor_text
 
 	character.gender = gender
 	character.age = age
@@ -1301,7 +1302,6 @@ var/list/preferences_datums = list()
 	character.underwear = underwear
 	character.undershirt = undershirt
 	character.socks = socks
-
 	character.backbag = backbag
 
 	character.dna.features = features.Copy()
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index c7d243ff31..655cfff137 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -310,7 +310,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		S["features["mcolor3"]"]	<< "#FFF"
 
 	//Character
-	S["Flavor_Text"]					>> flavor_text
 	S["real_name"]						>> real_name
 	S["name_is_always_random"]  		>> be_random_name
 	S["body_is_always_random"]  		>> be_random_body
@@ -326,6 +325,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["undershirt"]						>> undershirt
 	S["socks"]							>> socks
 	S["backbag"]						>> backbag
+	S["flavor_text"]					>> flavor_text
 	S["feature_mcolor"]					>> features["mcolor"]
 	S["feature_mcolor2"]				>> features["mcolor2"]
 	S["feature_mcolor3"]				>> features["mcolor3"]
@@ -438,23 +438,23 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["version"]			<< SAVEFILE_VERSION_MAX	//load_character will sanitize any bad data, so assume up-to-date.
 
 	//Character
-	S["Flavor_Text"]			>> flavor_text
-	S["real_name"]			<< real_name
-	S["name_is_always_random"] << be_random_name
-	S["body_is_always_random"] << be_random_body
-	S["gender"]				<< gender
-	S["age"]				<< age
-	S["hair_color"]			<< hair_color
-	S["facial_hair_color"]	<< facial_hair_color
-	S["eye_color"]			<< eye_color
-	S["skin_tone"]			<< skin_tone
-	S["hair_style_name"]	<< hair_style
-	S["facial_style_name"]	<< facial_hair_style
-	S["underwear"]			<< underwear
-	S["undershirt"]			<< undershirt
-	S["socks"]				<< socks
-	S["backbag"]			<< backbag
-	S["species"]			<< pref_species.id
+	S["real_name"]				<< real_name
+	S["name_is_always_random"]  << be_random_name
+	S["body_is_always_random"]  << be_random_body
+	S["gender"]					<< gender
+	S["age"]					<< age
+	S["hair_color"]				<< hair_color
+	S["facial_hair_color"]		<< facial_hair_color
+	S["eye_color"]				<< eye_color
+	S["skin_tone"]				<< skin_tone
+	S["hair_style_name"]		<< hair_style
+	S["facial_style_name"]		<< facial_hair_style
+	S["underwear"]				<< underwear
+	S["undershirt"]				<< undershirt
+	S["socks"]					<< socks
+	S["backbag"]				<< backbag
+	S["flavor_text"]			<< flavor_text
+	S["species"]				<< pref_species.id
 	S["feature_mcolor"]					<< features["mcolor"]
 	S["feature_mcolor2"]				<< features["mcolor2"]
 	S["feature_mcolor3"]				<< features["mcolor3"]
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index c4466fa10b..604ffb8fd7 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -382,6 +382,8 @@
 				src << "<span class='warning'>You feel your [pocket_side] pocket being fumbled with!</span>"
 
 		..()
+	else
+		..()
 
 
 ///////HUDs///////
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index a2bbcfb3c4..da6541445e 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -467,7 +467,7 @@ proc/get_top_level_mob(var/mob/S)
 		src << "<span class='alert'>Your flavor text is likely out of date! <a href='byond://?src=\ref[src];flavor_change=1'>Change</a></span>"
 
 /mob/proc/print_flavor_text()
-	if (flavor_text && flavor_text != "")
+	if(flavor_text && flavor_text != "")
 		var/msg = replacetext(flavor_text, "\n", " ")
 		if(lentext(msg) <= 40)
 			return "\blue [msg]"