Merge pull request #3469 from CHOMPStation2/upstream-merge-11864

[MIRROR] Fixes pizzaguy and talon uniforms not rolling down properly

code/modules/clothing/clothing.dm

@@ -344,8 +344,10 @@
 			to_chat(user, "<span class='notice'>The [src] have already been clipped!</span>")
 			update_icon()
 			return
+
 		playsound(src, W.usesound, 50, 1)
 		user.visible_message("<font color='red'>[user] cuts the fingertips off of the [src].</font>","<font color='red'>You cut the fingertips off of the [src].</font>")
+
 		clipped = 1
 		name = "modified [name]"
 		desc = "[desc]<br>They have had the fingertips cut off of them."
@@ -772,7 +774,7 @@
 	// means that if a taur puts on an already taurized suit without a taur sprite
 	// for their taur type, but the previous taur type had a sprite, it stays
 	// taurized and they end up with that taur style which is funny
-	else 
+	else
 		taurized = FALSE
 
 	if(!taurized)
@@ -824,7 +826,9 @@
 		*/
 	var/displays_id = 1
 	var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
+	var/rolled_down_icon_override = TRUE
 	var/rolled_sleeves = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
+	var/rolled_sleeves_icon_override = TRUE									
 	sprite_sheets = list(
 		SPECIES_TESHARI = 'icons/inventory/uniform/mob_teshari.dmi',
 		SPECIES_VOX = 'icons/inventory/uniform/mob_vox.dmi'
@@ -886,7 +890,7 @@
 		H = src.loc
 
 	var/icon/under_icon
-	if(icon_override)
+	if(icon_override && rolled_down_icon_override)
 		under_icon = icon_override
 	else if(H && LAZYACCESS(sprite_sheets, H.species.get_bodytype(H)))
 		under_icon = sprite_sheets[H.species.get_bodytype(H)]
@@ -909,7 +913,7 @@
 		H = src.loc
 
 	var/icon/under_icon
-	if(icon_override)
+	if(icon_override && rolled_sleeves_icon_override)
 		under_icon = icon_override
 	else if(H && LAZYACCESS(sprite_sheets, H.species.get_bodytype(H)))
 		under_icon = sprite_sheets[H.species.get_bodytype(H)]

code/modules/clothing/under/miscellaneous_vr.dm

@@ -142,7 +142,9 @@
 	name = "pizza delivery uniform"
 	desc = "A dedicated outfit for pizza delivery people, one of most dangerous occupations around these parts. Can be rolled up for extra show of skin."
 	icon = 'icons/inventory/uniform/item_vr.dmi'
+	icon_override = 'icons/inventory/uniform/mob_vr.dmi'
 	rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
+	rolled_down_icon_override = FALSE
 	icon_state = "pizzadelivery"
 	item_state = "pizzadelivery"
 	rolled_down = 0
@@ -158,6 +160,8 @@
 	icon_state = "talon_basic"
 	item_state = "talon_basic"
 	rolled_sleeves = 0
+	rolled_down_icon_override = FALSE
+	rolled_sleeves_icon_override = FALSE
 
 /obj/item/clothing/under/rank/talon/proper
 	name = "Talon proper jumpsuit"
@@ -168,6 +172,8 @@
 	icon_state = "talon_jumpsuit"
 	item_state = "talon_jumpsuit"
 	rolled_sleeves = 0
+	rolled_down_icon_override = FALSE
+	rolled_sleeves_icon_override = FALSE
 
 /obj/item/clothing/under/rank/talon/security
 	name = "Talon security jumpsuit"
@@ -178,6 +184,8 @@
 	icon_state = "talon_security"
 	item_state = "talon_security"
 	rolled_sleeves = 0
+	rolled_down_icon_override = FALSE
+	rolled_sleeves_icon_override = FALSE
 
 /obj/item/clothing/under/rank/talon/pilot
 	name = "Talon pilot jumpsuit"
@@ -188,6 +196,8 @@
 	icon_state = "talon_pilot"
 	item_state = "talon_pilot"
 	rolled_sleeves = 0
+	rolled_down_icon_override = FALSE
+	rolled_sleeves_icon_override = FALSE
 
 /obj/item/clothing/under/rank/talon/command
 	name = "Talon command jumpsuit"
@@ -198,6 +208,8 @@
 	icon_state = "talon_captain"
 	item_state = "talon_captain"
 	rolled_sleeves = 0
+	rolled_down_icon_override = FALSE
+	rolled_sleeves_icon_override = FALSE
 
 // Excelsior uniforms
 /obj/item/clothing/under/excelsior