From d40b34d4dc3350c6a90590fcd5aed4a52b94c3c1 Mon Sep 17 00:00:00 2001
From: Datraen <datraen@gmail.com>
Date: Thu, 7 Apr 2016 20:41:33 -0400
Subject: [PATCH] Adds jumpskirt to the jumpclothes list, renames selections
 for clothing.

---
 .../client/preference_setup/loadout/loadout_suit.dm      | 4 ++--
 .../client/preference_setup/loadout/loadout_uniform.dm   | 6 +++---
 code/modules/clothing/under/color.dm                     | 9 ++++++++-
 code/modules/clothing/under/miscellaneous.dm             | 7 -------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm
index 440786f679..2b403c81b1 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm
@@ -59,7 +59,7 @@
 	path = /obj/item/clothing/suit/storage/hazardvest
 
 /datum/gear/suit/hoodie
-	display_name = "hoodie"
+	display_name = "hoodie selection"
 	path = /obj/item/clothing/suit/storage/toggle/hoodie
 
 /datum/gear/suit/hoodie/New()
@@ -113,7 +113,7 @@
 	cost = 1
 
 /datum/gear/suit/poncho
-	display_name = "poncho"
+	display_name = "poncho selection"
 	path = /obj/item/clothing/suit/poncho
 	cost = 1
 
diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
index f4eb1c0f78..d39041c526 100644
--- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
@@ -34,7 +34,7 @@
 	path = /obj/item/clothing/under/cuttop/red
 
 /datum/gear/uniform/jumpsuit
-	display_name = "generic jumpclothes"
+	display_name = "jumpclothes selection"
 	path = /obj/item/clothing/under/color/grey
 
 /datum/gear/uniform/jumpsuit/New()
@@ -152,7 +152,7 @@
 	allowed_roles = list("Quartermaster","Cargo Technician")
 
 /datum/gear/uniform/pants
-	display_name = "pants"
+	display_name = "pants selection"
 	path = /obj/item/clothing/under/pants/white
 
 /datum/gear/uniform/pants/New()
@@ -164,7 +164,7 @@
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants))
 
 /datum/gear/uniform/shorts
-	display_name = "shorts"
+	display_name = "shorts selection"
 	path = /obj/item/clothing/under/shorts/jeans
 
 /datum/gear/uniform/shorts/New()
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 1add4cf595..c852147ba3 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -12,6 +12,13 @@
 	item_state = "bl_suit"
 	worn_state = "blackf"
 
+/obj/item/clothing/under/color/blackjumpskirt
+	name = "black jumpskirt"
+	desc = "A black jumpskirt, Sol size 0."
+	icon_state = "blackjumpskirt"
+	item_state = "bl_suit"
+	worn_state = "blackjumpskirt"
+
 /obj/item/clothing/under/color/blue
 	name = "blue jumpsuit"
 	icon_state = "blue"
@@ -96,7 +103,7 @@
 
 /obj/item/clothing/under/color
 	name = "purple jumpsuit"
-	desc = "A purple jumpsuit."
+	desc = "The latest in space fashion."
 	icon_state = "purple"
 	item_state = "p_suit"
 	worn_state = "purple"
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index a33ee63a2b..91ade60b71 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -482,13 +482,6 @@
 	worn_state = "sundress_white"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
-/obj/item/clothing/under/blackjumpskirt
-	name = "black jumpskirt"
-	desc = "A black jumpskirt, Sol size 0."
-	icon_state = "blackjumpskirt"
-	item_state = "bl_suit"
-	worn_state = "blackjumpskirt"
-
 /obj/item/clothing/under/captainformal
 	name = "captain's formal uniform"
 	desc = "A captain's formal-wear, for special occasions."