From 245f0d2c3b419ae26cd54435f0e4ad73400ced8c Mon Sep 17 00:00:00 2001 From: Raeschen Date: Mon, 4 Mar 2024 13:22:53 +0100 Subject: [PATCH] Some more preferences setup runtimes (#7884) --- code/modules/client/preference_setup/general/03_body.dm | 2 +- code/modules/client/preference_setup/global/02_settings.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 6e1e543285..93dbbc2aa6 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -451,7 +451,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O for(var/BP in mark_datum.body_parts) var/obj/item/organ/external/O = character.organs_by_name[BP] - if(O && islist(O.markings) && islist(pref.body_markings[M])) + if(O && islist(O.markings) && O.markings[M] && islist(pref.body_markings[M])) O.markings[M] = list("color" = pref.body_markings[M][BP]["color"], "datum" = mark_datum, "priority" = priority, "on" = pref.body_markings[M][BP]["on"]) character.markings_len = priority diff --git a/code/modules/client/preference_setup/global/02_settings.dm b/code/modules/client/preference_setup/global/02_settings.dm index 1ac55cbf9d..98c04a51d8 100644 --- a/code/modules/client/preference_setup/global/02_settings.dm +++ b/code/modules/client/preference_setup/global/02_settings.dm @@ -91,7 +91,7 @@ preference = list(preference) for(var/p in preference) var/datum/client_preference/cp = get_client_preference(p) - if(!prefs || !cp || !(cp.key in prefs.preferences_enabled)) + if(!prefs || !cp || !istype(cp, /datum/client_preference) || !(cp.key in prefs.preferences_enabled)) return FALSE return TRUE