Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723

2020-05-05 05:09:29 +02:00
parent c34655d094 367bb0f71c
commit f770586407
109 changed files with 1370 additions and 468 deletions
@@ -41,9 +41,7 @@
 /datum/skill_holder/proc/get_skill_affinity(skill)
 	if(!ispath(skill))
 		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
-	var/affinity = skill_affinities[skill]
+	var/affinity = LAZYACCESS(skill_affinities, skill)
 	if(isnull(affinity))
 		return 1
 	return affinity