diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index ce23dae177..6010b6b170 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -364,24 +364,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Custom job preferences:
"
dat += "Preferred AI Core Display: [preferred_ai_core_display]
"
dat += "Preferred Security Department: [prefered_security_department]
"
- dat += "
Records
"
- dat += "
Security Records
"
- if(length_char(security_records) <= 40)
- if(!length(security_records))
- dat += "\[...\]"
- else
- dat += "[security_records]"
- else
- dat += "[TextPreview(security_records)]...
"
-
- dat += "
Medical Records
"
- if(length_char(medical_records) <= 40)
- if(!length(medical_records))
- dat += "\[...\]
"
- else
- dat += "[medical_records]"
- else
- dat += "[TextPreview(medical_records)]...
"
dat += ""
//Character Appearance
@@ -428,16 +410,39 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/ooc_notes_len = length(features["ooc_notes"])
if(ooc_notes_len <= 40)
if(!ooc_notes_len)
- dat += "\[...\]"
+ dat += "\[...\]
"
else
- dat += "[features["ooc_notes"]]"
+ dat += "[features["ooc_notes"]]
"
else
dat += "[TextPreview(features["ooc_notes"])]...
"
+
//SKYRAT EDIT
dat += "ERP : [erppref]
"
dat += "Non-Con : [nonconpref]
"
dat += "Vore : [vorepref]
"
//END OF SKYRAT EDIT
+
+ dat += "
Records
"
+ dat += "Security Records
"
+ if(length_char(security_records) <= 40)
+ if(!length(security_records))
+ dat += "\[...\]"
+ else
+ dat += "[security_records]"
+ else
+ dat += "[TextPreview(security_records)]...
"
+
+ dat += "
Medical Records
"
+ if(length_char(medical_records) <= 40)
+ if(!length(medical_records))
+ dat += "\[...\]
"
+ else
+ dat += "[medical_records]"
+ else
+ dat += "[TextPreview(medical_records)]...
"
+
+ dat += APPEARANCE_CATEGORY_COLUMN //body moves right sandstorm change
+
dat += "Body
"
dat += "Gender:[gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]
"
if(gender != NEUTER && pref_species.sexes)
@@ -448,6 +453,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Always Random Body:[be_random_body ? "Yes" : "No"]
"
dat += "
Cycle background:[bgstate]
"
+ dat += "" //body moves right sandstorm change
+
var/use_skintones = pref_species.use_skintones
if(use_skintones)
dat += APPEARANCE_CATEGORY_COLUMN
@@ -485,11 +492,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += " Change
"
- dat += ""
+ /* dat += ""
else if(use_skintones || mutant_colors)
- dat += ""
+ dat += "" */ //sandstorm change, speech and body colors stay together
- dat += APPEARANCE_CATEGORY_COLUMN
dat += "Speech preferences
"
dat += "Custom Speech Verb:
"
dat += "[custom_speech_verb]
"
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index b75f7a6357..0ee335ece9 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -153,9 +153,11 @@
if(client && client.prefs) // Skyrat Change
if(client.prefs.toggles & VERB_CONSENT) // Skyrat Change
- . += "[t_His] player has allowed lewd verbs.\n" // Skyrat Change
+ . += "[t_His] player has allowed lewd verbs." // Skyrat Change
else // Skyrat Change
- . += "[t_His] player has not allowed lewd verbs.\n" // Skyrat Change
+ . += "[t_His] player has not allowed lewd verbs." // Skyrat Change
+
+ . += "[src]'s Prefs :
ERP : [client.prefs.erppref] | Non-Con : [client.prefs.nonconpref] | Vore : [client.prefs.vorepref]
"
var/list/missing = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
var/list/disabled = list()