diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 570d7617..a2505f74 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -249,6 +249,7 @@ BLIND     // can't see anything
 	var/obj/item/clothing/tie/hastie = null
 	var/displays_id = 1
 	var/rolled_down = 0
+	var/rolled_sleeves = 0
 	var/basecolor
 
 /obj/item/clothing/under/attackby(obj/item/I, mob/user)
@@ -367,13 +368,26 @@ BLIND     // can't see anything
 	if(!istype(usr, /mob/living)) return
 	if(usr.stat) return
 
-	if(copytext(item_color,-2) != "_d")
+	if(copytext(item_color,-2) != "_d" && rolled_sleeves == 0)
 		basecolor = item_color
 	if(basecolor + "_d_s" in icon_states('icons/mob/uniform.dmi'))
 		item_color = item_color == "[basecolor]" ? "[basecolor]_d" : "[basecolor]"
 		usr.update_inv_w_uniform()
-	else
-		usr << "<span class='notice'>You cannot roll down the uniform!</span>"
+		rolled_down = 1
+
+/obj/item/clothing/under/verb/rollsleeve()
+	set name = "Roll Up Sleeves"
+	set category = "Object"
+	set src in usr
+	if(!istype(usr, /mob/living)) return
+	if(usr.stat) return
+
+	if(copytext(item_color,-2) != "_r" && rolled_down == 0)
+		basecolor = item_color
+	if(basecolor + "_r_s" in icon_states('icons/mob/uniform.dmi'))
+		item_color = item_color == "[basecolor]" ? "[basecolor]_r" : "[basecolor]"
+		usr.update_inv_w_uniform()
+		rolled_sleeves = 1
 
 /obj/item/clothing/under/proc/remove_accessory(mob/user as mob)
 	if(!hastie)
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 6107886b..d2b0aee5 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ