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

2020-05-31 16:08:52 +02:00
parent 949e8f6b3a b7411bf9a0
commit 2f3fd48b84
363 changed files with 10012 additions and 3157 deletions
@@ -27,7 +27,7 @@ GLOBAL_LIST_EMPTY(potential_mods_per_skill)
 	/// Priority of this skill modifier compared to other ones.
 	var/priority = MODIFIER_SKILL_PRIORITY_DEF
 	/// Skill modifier icon, used in the UI
-	var/icon = "default"
+	var/icon_name = "default_mod"

 /datum/skill_modifier/New(id, register = FALSE)
 	identifier = GET_SKILL_MOD_ID(type, id)