From 31e10b1b07ea12a2ad3606061546bac514519073 Mon Sep 17 00:00:00 2001 From: Markolie Date: Thu, 16 Mar 2017 23:51:46 +0100 Subject: [PATCH] Flavor text fix, disabilities window popup --- code/modules/client/preference/preferences.dm | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 8abda089a34..7956b9f5a1c 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -294,7 +294,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts dat += "Skin Tone: [species == "Vox" ? "[s_tone]" : "[-s_tone + 35]/220"]
" dat += "Disabilities: \[Set\]
" dat += "Nanotrasen Relation: [nanotrasen_relation]
" - dat += "Set Flavor Text
" + dat += "Set Flavor Text
" if(lentext(flavor_text) <= 40) if(!lentext(flavor_text)) dat += "\[...\]
" else dat += "[flavor_text]
" @@ -812,12 +812,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts /datum/preferences/proc/SetDisabilities(mob/user) var/HTML = "" + HTML += "
" - // AUTOFIXED BY fix_string_idiocy.py - // C:\Users\Rob\Documents\Projects\vgstation13\code\modules\client\preferences.dm:474: HTML += "
" - HTML += {"
- Choose disabilities
    "} - // END AUTOFIX HTML += ShowDisabilityState(user,DISABILITY_FLAG_NEARSIGHTED,"Needs Glasses") HTML += ShowDisabilityState(user,DISABILITY_FLAG_FAT,"Obese") HTML += ShowDisabilityState(user,DISABILITY_FLAG_EPILEPTIC,"Seizures") @@ -827,16 +823,14 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts HTML += ShowDisabilityState(user,DISABILITY_FLAG_MUTE,"Mute") - // AUTOFIXED BY fix_string_idiocy.py - // C:\Users\Rob\Documents\Projects\vgstation13\code\modules\client\preferences.dm:481: HTML += "
" HTML += {" \[Done\] \[Reset\]
"} - // END AUTOFIX - user << browse(null, "window=preferences") - user << browse(HTML, "window=disabil;size=350x300") - return + + var/datum/browser/popup = new(user, "disabil", "
Choose Disabilities
", 350, 300) + popup.set_content(HTML) + popup.open(0) /datum/preferences/proc/SetRecords(mob/user) var/HTML = "" @@ -866,7 +860,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts HTML += "\[Done\]" HTML += "
" - var/datum/browser/popup = new(user, "records", "
Character Records
", 300, 390) + var/datum/browser/popup = new(user, "records", "
Character Records
", 350, 300) popup.set_content(HTML) popup.open(0)