Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792
This commit is contained in:
@@ -34,7 +34,7 @@
|
||||
all_mods[id] = list(
|
||||
name = M.name,
|
||||
desc = M.desc,
|
||||
icon = assets.icon_class_name(M.icon)
|
||||
icon = assets.icon_class_name(M.icon_name)
|
||||
)
|
||||
|
||||
.["categories"] = list()
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user