Merge pull request #10457 from Zuhayr/dev-freeze

Custom item rolldown.

code/modules/clothing/clothing.dm

@@ -383,23 +383,42 @@ BLIND     // can't see anything
 	var/displays_id = 1
 	var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
 	sprite_sheets = list("Vox" = 'icons/mob/species/vox/uniform.dmi')
-	
+
 	//convenience var for defining the icon state for the overlay used when the clothing is worn.
 	//Also used by rolling/unrolling.
 	var/worn_state = null
 
 /obj/item/clothing/under/New()
 	if(worn_state)
-		if(!item_state_slots) 
+		if(!item_state_slots)
 			item_state_slots = list()
 		item_state_slots[slot_w_uniform_str] = worn_state
 	else
 		worn_state = icon_state
-		
-	//autodetect rollability
-	if(rolled_down < 0)
-		if((worn_state + "_d_s") in icon_states('icons/mob/uniform.dmi'))
+
+/obj/item/clothing/under/proc/update_rolldown_status()
+
+	var/mob/living/carbon/human/H
+	if(istype(src.loc, /mob/living/carbon/human))
+		H = src.loc
+
+	var/icon/under_icon
+	if(icon_override)
+		under_icon = icon_override
+	else if(H && sprite_sheets && sprite_sheets[H.species.name])
+		under_icon = sprite_sheets[H.species.name]
+	else if(item_icons && item_icons[slot_w_uniform_str])
+		under_icon = item_icons[slot_w_uniform_str]
+	else
+		under_icon = INV_W_UNIFORM_DEF_ICON
+
+	// The _s is because the icon update procs append it.
+	if(("[worn_state]_d_s") in icon_states(under_icon))
+		if(rolled_down != 1)
 			rolled_down = 0
+	else
+		rolled_down = -1
+	if(H) update_clothing_icon()
 
 /obj/item/clothing/under/update_clothing_icon()
 	if (ismob(src.loc))
@@ -459,10 +478,10 @@ BLIND     // can't see anything
 
 		if (( usr.restrained() ) || ( usr.stat ))
 			return
-		
+
 		if (!usr.unEquip(src))
 			return
-		
+
 		switch(over_object.name)
 			if("r_hand")
 				usr.put_in_r_hand(src)
@@ -542,10 +561,11 @@ BLIND     // can't see anything
 	if(!istype(usr, /mob/living)) return
 	if(usr.stat) return
 
-	if(rolled_down < 0)
+	update_rolldown_status()
+	if(rolled_down == -1)
 		usr << "<span class='notice'>You cannot roll down [src]!</span>"
 		return
-	
+
 	rolled_down = !rolled_down
 	if(rolled_down)
 		body_parts_covered &= LOWER_TORSO|LEGS|FEET

code/modules/customitems/item_spawning.dm

@@ -49,18 +49,23 @@
 			item.icon = CUSTOM_ITEM_OBJ
 			item.icon_state = item_icon
 			return
-		else 
+		else
 			if(inherit_inhands)
 				apply_inherit_inhands(item)
 			else
 				item.item_state_slots = null
 				item.item_icons = null
-			
+
 			item.icon = CUSTOM_ITEM_OBJ
 			item.icon_state = item_icon
 			item.item_state = null
 			item.icon_override = CUSTOM_ITEM_MOB
 
+		var/obj/item/clothing/under/U = item
+		if(istype(U))
+			U.worn_state = U.icon_state
+			U.update_rolldown_status()
+
 	// Kits are dumb so this is going to have to be hardcoded/snowflake.
 	if(istype(item, /obj/item/device/kit))
 		var/obj/item/device/kit/K = item
@@ -81,9 +86,9 @@
 /datum/custom_item/proc/apply_inherit_inhands(var/obj/item/item)
 	var/list/new_item_icons = list()
 	var/list/new_item_state_slots = list()
-	
+
 	var/list/available_states = icon_states(CUSTOM_ITEM_MOB)
-	
+
 	//If l_hand or r_hand are not present, preserve them using item_icons/item_state_slots
 	//Then use icon_override to make every other slot use the custom sprites by default.
 	//This has to be done before we touch any of item's vars
@@ -93,7 +98,7 @@
 	if(!("[item_icon]_r" in available_states))
 		new_item_state_slots[slot_r_hand_str] = get_state(item, slot_r_hand_str, "_r")
 		new_item_icons[slot_r_hand_str] = get_icon(item, slot_r_hand_str, 'icons/mob/items/righthand.dmi')
-	
+
 	item.item_state_slots = new_item_state_slots
 	item.item_icons = new_item_icons
 

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"

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'