From af802266e415239846ce428c0f668560ec65aaf5 Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 14 Dec 2015 20:20:35 +0000 Subject: [PATCH 1/2] Removes the else to properly for the switch statement, meaning that it no longer wipes your flavour text/thinks you're opening the general slot ever time. --- code/modules/client/preference_setup/general/06_flavor.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preference_setup/general/06_flavor.dm b/code/modules/client/preference_setup/general/06_flavor.dm index 3c2d93073b..6a02e3f7d7 100644 --- a/code/modules/client/preference_setup/general/06_flavor.dm +++ b/code/modules/client/preference_setup/general/06_flavor.dm @@ -42,10 +42,11 @@ . += "Set Robot Flavor Text
" /datum/category_item/player_setup_item/general/flavor/OnTopic(var/href,var/list/href_list, var/mob/user) + user << href_list["flavor_text"] if(href_list["flavor_text"]) switch(href_list["flavor_text"]) if("open") - else if("general") + if("general") var/msg = sanitize(input(usr,"Give a general description of your character. This will be shown regardless of clothing, and may include OOC notes and preferences.","Flavor Text",html_decode(pref.flavor_texts[href_list["task"]])) as message, extra = 0) if(CanUseTopic(user)) pref.flavor_texts[href_list["flavor_text"]] = msg @@ -59,7 +60,7 @@ else if(href_list["flavour_text_robot"]) switch(href_list["flavour_text_robot"]) if("open") - else if("Default") + if("Default") var/msg = sanitize(input(usr,"Set the default flavour text for your robot. It will be used for any module without individual setting.","Flavour Text",html_decode(pref.flavour_texts_robot["Default"])) as message, extra = 0) if(CanUseTopic(user)) pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg From 14bc2afe43d3988d997a1bbe36e56d12214b5130 Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 14 Dec 2015 20:22:18 +0000 Subject: [PATCH 2/2] Removes errant debug line. --- code/modules/client/preference_setup/general/06_flavor.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/client/preference_setup/general/06_flavor.dm b/code/modules/client/preference_setup/general/06_flavor.dm index 6a02e3f7d7..120749cef7 100644 --- a/code/modules/client/preference_setup/general/06_flavor.dm +++ b/code/modules/client/preference_setup/general/06_flavor.dm @@ -42,7 +42,6 @@ . += "Set Robot Flavor Text
" /datum/category_item/player_setup_item/general/flavor/OnTopic(var/href,var/list/href_list, var/mob/user) - user << href_list["flavor_text"] if(href_list["flavor_text"]) switch(href_list["flavor_text"]) if("open")