Merge pull request #785 from Rei1226/rei21

Fixed issues with pants sprites not showing up correctly

code/game/machinery/vending.dm

@@ -872,7 +872,7 @@
 	products = list(/obj/item/clothing/under/color/black = 10,/obj/item/clothing/under/color/blue = 10,/obj/item/clothing/under/color/green = 10,/obj/item/clothing/under/color/grey = 10,/obj/item/clothing/under/color/pink = 10,/obj/item/clothing/under/color/red = 10,
 					/obj/item/clothing/under/color/white = 10, /obj/item/clothing/under/color/yellow = 10,/obj/item/clothing/under/lightblue = 10,/obj/item/clothing/under/aqua = 10,/obj/item/clothing/under/purple = 10,/obj/item/clothing/under/lightgreen = 10,
 					/obj/item/clothing/under/lightblue = 10,/obj/item/clothing/under/lightbrown = 10,/obj/item/clothing/under/brown = 10,/obj/item/clothing/under/yellowgreen = 10,/obj/item/clothing/under/darkblue = 10,/obj/item/clothing/under/lightred = 10, /obj/item/clothing/under/darkred = 10,
-					/obj/item/clothing/under/color/bluepants = 10,/obj/item/clothing/under/color/blackpants = 10,/obj/item/clothing/under/color/redpants = 10,/obj/item/clothing/under/color/greypants = 10)
+					/obj/item/clothing/under/bluepants = 10,/obj/item/clothing/under/blackpants = 10,/obj/item/clothing/under/redpants = 10,/obj/item/clothing/under/greypants = 10)
 	contraband = list(/obj/item/clothing/under/syndicate/tacticool = 5,/obj/item/clothing/under/color/orange = 5,/obj/item/clothing/under/psyche = 5)
 	premium = list(/obj/item/clothing/under/rainbow = 1)
 

code/modules/clothing/under/color.dm

@@ -144,30 +144,25 @@
 	_color = "darkred"
 	flags = FPRINT | TABLEPASS
 
-/obj/item/clothing/under/color/blackpants
+/obj/item/clothing/under/blackpants
 	name = "black pants"
-	icon_state = "blackpants"
+	icon_state = "blpants"
-	item_state = "blackpants"
+	_color = "blpants"
-	_color = "black"
 	flags = FPRINT | TABLEPASS
 
-/obj/item/clothing/under/color/redpants
+/obj/item/clothing/under/redpants
 	name = "red pants"
-	icon_state = "redpants"
+	icon_state = "rpants"
-	item_state = "redpants"
+	_color = "rpants"
-	_color = "red"
 	flags = FPRINT | TABLEPASS
 
-/obj/item/clothing/under/color/bluepants
+/obj/item/clothing/under/bluepants
 	name = "blue pants"
-	icon_state = "bluepants"
+	icon_state = "bpants"
-	item_state = "bluepants"
+	_color = "bpants"
-	_color = "blue"
 	flags = FPRINT | TABLEPASS
 
-/obj/item/clothing/under/color/greypants
+/obj/item/clothing/under/greypants
 	name = "grey pants"
-	icon_state = "greypants"
+	icon_state = "gpants"
-	item_state = "greypants"
+	_color = "gpants"
-	_color = "grey"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL