From 3625d88b47f546f0f8f40cd87914160b68c4bcc5 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 25 Apr 2020 03:41:15 -0700 Subject: [PATCH] fixes --- code/datums/skills/_skill.dm | 2 ++ code/datums/skills/_skill_holder.dm | 7 +++++-- code/modules/admin/callproc/callproc.dm | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/datums/skills/_skill.dm b/code/datums/skills/_skill.dm index d0422ed00d..2dd321c4c6 100644 --- a/code/datums/skills/_skill.dm +++ b/code/datums/skills/_skill.dm @@ -45,6 +45,8 @@ GLOBAL_LIST_INIT(skill_datums, init_skill_datums()) * Checks if a value is greater */ /datum/skill/proc/is_value_greater(existing, new_value) + if(!existing) + return TRUE return new_value > existing /** diff --git a/code/datums/skills/_skill_holder.dm b/code/datums/skills/_skill_holder.dm index 98031ec39f..352adc46ff 100644 --- a/code/datums/skills/_skill_holder.dm +++ b/code/datums/skills/_skill_holder.dm @@ -25,7 +25,10 @@ CRASH("Invalid get_skill_affinity call. Use typepaths.") //until a time when we somehow need text ids for dynamic skills, I'm enforcing this. if(!skills) return 1 - return skill_affinities[skill] + var/affinity = skill_affinities[skill] + if(isnull(affinity)) + return 1 + return affinity /** * Sets the value of a skill. @@ -45,7 +48,7 @@ */ /datum/skill_holder/proc/boost_skill_value_to(skill, value) var/current = get_skill_value(skill) - if(is_skill_value_greater(skill, current, value)) + if(!is_skill_value_greater(skill, current, value)) return FALSE set_skill_value(skill, value) return TRUE diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm index 3de5e39ff4..c13353b7cd 100644 --- a/code/modules/admin/callproc/callproc.dm +++ b/code/modules/admin/callproc/callproc.dm @@ -120,7 +120,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) //adv proc call this, ya nerds /world/proc/WrapAdminProcCall(datum/target, procname, list/arguments) if(target == GLOBAL_PROC) - return call(procname)(arglist(arguments)) + return call(text2path("/proc/[procname]"))(arglist(arguments)) else if(target != world) return call(target, procname)(arglist(arguments)) else