Merge pull request #10457 from Zuhayr/dev-freeze

Custom item rolldown.

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 = ""

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"