From 78df6facb6577975519550f0d2f00a412e3d7c28 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 9 Jan 2018 22:59:22 -0500 Subject: [PATCH 1/2] fixes flavortext readmores for real this time --- code/modules/mob/living/carbon/human/human.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 9cc9227fa1..afd0cd50be 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -264,7 +264,7 @@ // Display a warning if the user mocks up to_chat(src, "You feel your [pocket_side] pocket being fumbled with!") - ..() + ..() ///////HUDs/////// @@ -1031,4 +1031,4 @@ race = /datum/species/zombie/infectious /mob/living/carbon/human/species/zombie/krokodil_addict - race = /datum/species/krokodil_addict \ No newline at end of file + race = /datum/species/krokodil_addict From 34297d5005fa12b82230ef1aa6b1e712080272b4 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 9 Jan 2018 23:11:22 -0500 Subject: [PATCH 2/2] fixes setting flavortext in preferences. hopefully --- code/modules/client/preferences.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 7c45a77814..84e0d15172 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -412,7 +412,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(2) dat += "
" dat += "

" - dat += "Set Flavor Text
" + dat += "Set Flavor Text
" if(lentext(features["flavor_text"]) <= 40) if(!lentext(features["flavor_text"])) dat += "\[...\]" @@ -1379,7 +1379,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) else user << "Invalid color. Your color is not bright enough." - + else switch(href_list["preference"])