From 6634e43be4e60c9f52d18beabebfc0db196cea07 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 7 Jul 2020 07:41:33 -0700 Subject: [PATCH] fix --- code/modules/client/preferences.dm | 11 +++++------ code/modules/mob/dead/new_player/new_player.dm | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 738a2c6fd4..1b6b149d66 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -345,9 +345,8 @@ 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 += "" - - dat += "Security Records
" + dat += "
Records
" + dat += "
Security Records
" if(length_char(security_records) <= 40) if(!length(security_records)) dat += "\[...\]" @@ -356,15 +355,15 @@ GLOBAL_LIST_EMPTY(preferences_datums) else dat += "[TextPreview(security_records)]...
" - dat += "Medical Records
" + dat += "
Medical Records
" if(length_char(medical_records) <= 40) if(!length(medical_records)) - dat += "\[...\]" + dat += "\[...\]
" else dat += "[medical_records]" else dat += "[TextPreview(medical_records)]...
" - + dat += "" //Character Appearance if(2) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index be18f78cfb..d3892cc282 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -398,7 +398,7 @@ humanc = character //Let's retypecast the var to be human, if(humanc) //These procs all expect humans - GLOB.data_core.manifest_inject(humanc, client, client.prefs) + GLOB.data_core.manifest_inject(humanc, humanc.client, humanc.client.prefs) if(SSshuttle.arrivals) SSshuttle.arrivals.QueueAnnounce(humanc, rank) else