diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 1edd37d7d2..888622ff38 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -278,7 +278,7 @@ var/list/ai_verbs_default = list( if(Entry[1] == src.ckey && Entry[2] == src.real_name) custom_sprite = 1 //They're in the list? Custom sprite time - icon = 'icons/mob/custom-synthetic.dmi' + icon = CUSTOM_ITEM_ROBOT //if(icon_state == initial(icon_state)) var/icontype = "" diff --git a/code/modules/mob/living/silicon/robot/custom_sprites.dm b/code/modules/mob/living/silicon/robot/custom_sprites.dm index ee4d9905e9..360308ccec 100644 --- a/code/modules/mob/living/silicon/robot/custom_sprites.dm +++ b/code/modules/mob/living/silicon/robot/custom_sprites.dm @@ -1,5 +1,5 @@ -//list(ckey = real_name,) +//list(ckey = real_name,) //Since the ckey is used as the icon_state, the current system will only permit a single custom robot sprite per ckey. //While it might be possible for a ckey to use that custom sprite for several real_names, it seems rather pointless to support it. var/list/robot_custom_icons @@ -14,10 +14,10 @@ var/list/robot_custom_icons var/split_idx = findtext(line, "-") //this works if ckey cannot contain dashes, and findtext starts from the beginning if(!split_idx || split_idx == length(line)) continue //bad entry - + var/ckey = copytext(line, 1, split_idx) var/real_name = copytext(line, split_idx+1) - + robot_custom_icons[ckey] = real_name return 1 @@ -25,6 +25,6 @@ var/list/robot_custom_icons var/rname = robot_custom_icons[ckey] if(rname && rname == real_name) custom_sprite = 1 - icon = 'icons/mob/custom-synthetic.dmi' + icon = CUSTOM_ITEM_ROBOT if(icon_state == "robot") icon_state = "[ckey]-Standard" diff --git a/code/setup.dm b/code/setup.dm index d6649aa41c..a21e9f6042 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -977,6 +977,9 @@ var/list/be_special_flags = list( #ifndef CUSTOM_ITEM_MOB #define CUSTOM_ITEM_MOB 'icons/mob/custom_items_mob.dmi' #endif +#ifndef CUSTOM_ITEM_ROBOT +#define CUSTOM_ITEM_ROBOT 'icons/mob/custom_synthetic.dmi' +#endif //default item on-mob icons #define INV_HEAD_DEF_ICON 'icons/mob/head.dmi' diff --git a/icons/mob/custom-synthetic.dmi b/icons/mob/custom-synthetic.dmi deleted file mode 100644 index 36916cc1f1..0000000000 Binary files a/icons/mob/custom-synthetic.dmi and /dev/null differ diff --git a/icons/mob/custom_synthetic.dmi b/icons/mob/custom_synthetic.dmi new file mode 100644 index 0000000000..e69de29bb2