Merge pull request tgstation#7546 from TZK13/Purple-Shorts

Adds purple shorts
phil235 · Feb 5, 2015 · 6fab02e · 6fab02e
2 parents 574fc61 + 01bf5b3
commit 6fab02e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm
@@ -6,6 +6,7 @@
 
 /obj/structure/closet/athletic_mixed/New()
 	..()
+	new /obj/item/clothing/under/shorts/purple(src)
 	new /obj/item/clothing/under/shorts/grey(src)
 	new /obj/item/clothing/under/shorts/black(src)
 	new /obj/item/clothing/under/shorts/red(src)

diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm
@@ -24,4 +24,8 @@
 
 /obj/item/clothing/under/shorts/grey
 	icon_state = "greyshorts"
-	item_color = "greyshorts"
+	item_color = "greyshorts"
+
+/obj/item/clothing/under/shorts/purple
+	icon_state = "purpleshorts"
+	item_color = "purpleshorts"
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi