diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 8d7979e053..3491943699 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -1106,8 +1106,10 @@ GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0 if (isfile(thing)) //special snowflake var/name = sanitize_filename("[generate_asset_name(thing)].png") register_asset(name, thing) - for (var/thing2 in targets) - send_asset_async(thing2, key) + for (var/mob/thing2 in targets) + if(!istype(thing2) || !thing2.client) + continue + send_asset_async(thing2?.client, key) return "" var/atom/A = thing if (isnull(dir)) @@ -1130,8 +1132,10 @@ GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0 key = "[generate_asset_name(I)].png" register_asset(key, I) - for (var/thing2 in targets) - send_asset_async(thing2, key) + for (var/mob/thing2 in targets) + if(!istype(thing2) || !thing2.client) + continue + send_asset_async(thing2?.client, key) return "" diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 34695b4e38..8cc2a0c38e 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -832,6 +832,8 @@ // Get a bonus multiplier dependant on age to apply to exp gains. Arg is a skill path. /datum/mind/proc/get_learning_boon(skill) var/mob/living/carbon/human/H = current + if(!istype(H)) + return 1 var/boon = H.age == AGE_OLD ? 0.8 : 1 // Can't teach an old dog new tricks. Most old jobs start with higher skill too. boon += get_skill_level(skill) / 10 return boon