Merge pull request #3144 from Anewbe/uniforms

Makes space in the uniforms.dmi file

code/datums/supplypacks/costumes.dm

@@ -156,7 +156,7 @@ datum/supply_packs/costumes/witch
 			/obj/item/clothing/under/wedding/bride_blue,
 			/obj/item/clothing/under/wedding/bride_red,
 			/obj/item/clothing/under/wedding/bride_white,
-			/obj/item/clothing/under/sundress,
+			/obj/item/clothing/under/dress/sundress,
 			/obj/item/clothing/under/dress/dress_green,
 			/obj/item/clothing/under/dress/dress_pink,
 			/obj/item/clothing/under/dress/dress_orange,

code/game/objects/effects/landmarks.dm

@@ -226,7 +226,7 @@
 	delete_me = 1
 
 /obj/effect/landmark/costume/cutewitch/New()
-	new /obj/item/clothing/under/sundress(src.loc)
+	new /obj/item/clothing/under/dress/sundress(src.loc)
 	new /obj/item/clothing/head/witchwig(src.loc)
 	new /obj/item/weapon/staff/broom(src.loc)
 	delete_me = 1

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -45,7 +45,7 @@
 
 /obj/structure/closet/chefcloset/New()
 	..()
-	new /obj/item/clothing/under/sundress(src)
+	new /obj/item/clothing/under/dress/sundress(src)
 	new /obj/item/clothing/under/waiter(src)
 	new /obj/item/clothing/under/waiter(src)
 	new /obj/item/device/radio/headset/headset_service(src)

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -273,11 +273,11 @@
 
 /datum/gear/uniform/sundress
 	display_name = "sundress"
-	path = /obj/item/clothing/under/sundress
+	path = /obj/item/clothing/under/dress/sundress
 
 /datum/gear/uniform/sundress/white
 	display_name = "sundress, white"
-	path = /obj/item/clothing/under/sundress_white
+	path = /obj/item/clothing/under/dress/sundress/white
 
 /datum/gear/uniform/dress_fire
 	display_name = "flame dress"
@@ -446,10 +446,10 @@
 	display_name = "jumpsuit, hephaestus"
 	path = 	/obj/item/clothing/under/hephaestus
 
-/datum/gear/uniform/yogapants
+/datum/gear/uniform/yoga
 	display_name = "yoga pants"
-	path = /obj/item/clothing/under/pants/yogapants
+	path = /obj/item/clothing/under/pants/yoga
 
-/datum/gear/uniform/yogapants/New()
+/datum/gear/uniform/yoga/New()
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)

code/modules/clothing/clothing.dm

@@ -525,6 +525,10 @@
 	var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
 	var/rolled_sleeves = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
 	sprite_sheets = list(
+		"Human" = 'icons/mob/uniforms/uniform.dmi',
+		"Skrell" = 'icons/mob/species/skrell/uniforms/uniform.dmi',
+		"Tajaran" = 'icons/mob/species/tajaran/uniforms/uniform.dmi',
+		"Unathi" = 'icons/mob/species/unathi/uniforms/uniform.dmi',
 		"Teshari" = 'icons/mob/species/seromi/uniform.dmi',
 		"Vox" = 'icons/mob/species/vox/uniform.dmi'
 		)

code/modules/clothing/under/color.dm

@@ -1,3 +1,11 @@
+/obj/item/clothing/under/color
+	sprite_sheets = list(
+		"Human" = 'icons/mob/uniforms/color.dmi',
+		"Skrell" = 'icons/mob/species/skrell/uniforms/color.dmi',
+		"Tajara" = 'icons/mob/species/tajaran/uniforms/color.dmi',
+		"Unathi" = 'icons/mob/species/unathi/uniforms/color.dmi',
+		"Diona" = 'icons/mob/species/diona/uniforms/color.dmi'
+		)
 /obj/item/clothing/under/color/black
 	name = "black jumpsuit"
 	icon_state = "black"

code/modules/clothing/under/miscellaneous.dm

@@ -255,6 +255,13 @@
  */
 /obj/item/clothing/under/dress
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+	sprite_sheets = list(
+		"Human" = 'icons/mob/uniforms/dresses.dmi',
+		"Skrell" = 'icons/mob/species/skrell/uniforms/dresses.dmi',
+		"Tajara" = 'icons/mob/species/tajaran/uniforms/dresses.dmi',
+		"Unathi" = 'icons/mob/species/unathi/uniforms/dresses.dmi',
+		"Diona" = 'icons/mob/species/diona/uniforms/dresses.dmi'
+		)
 
 /obj/item/clothing/under/dress/blacktango
 	name = "black tango dress"
@@ -344,8 +351,16 @@
 /*
  * wedding stuff
  */
-/obj/item/clothing/under/wedding/
+/obj/item/clothing/under/wedding
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
+	sprite_sheets = list(
+		"Human" = 'icons/mob/uniforms/dresses.dmi',
+		"Skrell" = 'icons/mob/species/skrell/uniforms/dresses.dmi',
+		"Tajara" = 'icons/mob/species/tajaran/uniforms/dresses.dmi',
+		"Unathi" = 'icons/mob/species/unathi/uniforms/dresses.dmi',
+		"Diona" = 'icons/mob/species/diona/uniforms/dresses.dmi'
+		)
+
 
 /obj/item/clothing/under/wedding/bride_orange
 	name = "orange wedding dress"
@@ -378,13 +393,13 @@
 	flags_inv = HIDESHOES
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
-/obj/item/clothing/under/sundress
+/obj/item/clothing/under/dress/sundress
 	name = "sundress"
 	desc = "Makes you want to frolic in a field of daisies."
 	icon_state = "sundress"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
-/obj/item/clothing/under/sundress_white
+/obj/item/clothing/under/dress/sundress/white
 	name = "white sundress"
 	desc = "A white sundress decorated with purple lilies."
 	icon_state = "sundress_white"
@@ -459,6 +474,13 @@
 /obj/item/clothing/under/cheongsam
 	name = "white cheongsam"
 	desc = "It is a white cheongsam dress."
+	sprite_sheets = list(
+		"Human" = 'icons/mob/uniforms/dresses.dmi',
+		"Skrell" = 'icons/mob/species/skrell/uniforms/dresses.dmi',
+		"Tajara" = 'icons/mob/species/tajaran/uniforms/dresses.dmi',
+		"Unathi" = 'icons/mob/species/unathi/uniforms/dresses.dmi',
+		"Diona" = 'icons/mob/species/diona/uniforms/dresses.dmi'
+		)
 	icon_state = "mai_yang"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
 
@@ -486,6 +508,13 @@
 /obj/item/clothing/under/croptop
 	name = "crop top"
 	desc = "A shirt that has had the top cropped. This one is NT sponsored."
+	sprite_sheets = list(
+		"Human" = 'icons/mob/uniforms/dresses.dmi',
+		"Skrell" = 'icons/mob/species/skrell/uniforms/dresses.dmi',
+		"Tajara" = 'icons/mob/species/tajaran/uniforms/dresses.dmi',
+		"Unathi" = 'icons/mob/species/unathi/uniforms/dresses.dmi',
+		"Diona" = 'icons/mob/species/diona/uniforms/dresses.dmi'
+		)
 	icon_state = "croptop"
 	item_state_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "grey")
 

code/modules/clothing/under/pants.dm

@@ -2,6 +2,13 @@
 /obj/item/clothing/under/pants
 	name = "jeans"
 	desc = "A nondescript pair of tough blue jeans."
+	sprite_sheets = list(
+		"Human" = 'icons/mob/uniforms/pants.dmi',
+		"Skrell" = 'icons/mob/species/skrell/uniforms/pants.dmi',
+		"Tajara" = 'icons/mob/species/tajaran/uniforms/pants.dmi',
+		"Unathi" = 'icons/mob/species/unathi/uniforms/pants.dmi',
+		"Diona" = 'icons/mob/species/diona/uniforms/pants.dmi'
+		)
 	icon_state = "jeans"
 	gender = PLURAL
 	body_parts_covered = LOWER_TORSO|LEGS
@@ -117,10 +124,10 @@
 	desc = "A pair of sexy, tight black leather chaps."
 	icon_state = "chapsbl"
 
-/obj/item/clothing/under/pants/yogapants
+/obj/item/clothing/under/pants/yoga
 	name = "yoga pants"
 	desc = "A pair of tight-fitting yoga pants for those lazy days."
-	icon_state = "yogapants"
+	icon_state = "yoga"
 
 /*
  * Baggy Pants

code/modules/clothing/under/shorts.dm

@@ -2,6 +2,13 @@
 /obj/item/clothing/under/shorts
 	name = "athletic shorts"
 	desc = "95% Polyester, 5% Spandex!"
+	sprite_sheets = list(
+		"Human" = 'icons/mob/uniforms/pants.dmi',
+		"Skrell" = 'icons/mob/species/skrell/uniforms/pants.dmi',
+		"Tajara" = 'icons/mob/species/tajaran/uniforms/pants.dmi',
+		"Unathi" = 'icons/mob/species/unathi/uniforms/pants.dmi',
+		"Diona" = 'icons/mob/species/diona/uniforms/pants.dmi'
+		)
 	gender = PLURAL
 	body_parts_covered = LOWER_TORSO
 
@@ -91,16 +98,18 @@
 	name = "khaki short shorts"
 	icon_state = "khaki_shorts_f"
 
-/obj/item/clothing/under/shorts/loincloth
-	name = "loincloth"
-	desc = "A piece of cloth wrapped around the waist."
-	icon_state = "loincloth"
-
 //Argh, skirts be below this line -> ------------------------------
 
 /obj/item/clothing/under/skirt
 	name = "short black skirt"
 	desc = "A skirt that is a shiny black."
+	sprite_sheets = list(
+		"Human" = 'icons/mob/uniforms/dresses.dmi',
+		"Skrell" = 'icons/mob/species/skrell/uniforms/dresses.dmi',
+		"Tajara" = 'icons/mob/species/tajaran/uniforms/dresses.dmi',
+		"Unathi" = 'icons/mob/species/unathi/uniforms/dresses.dmi',
+		"Diona" = 'icons/mob/species/diona/uniforms/dresses.dmi'
+		)
 	icon_state = "skirt_short_black"
 	body_parts_covered = LOWER_TORSO
 	rolled_sleeves = -1
@@ -130,6 +139,11 @@
 	desc = "A skirt that is swept to one side."
 	icon_state = "skirt_swept"
 
+/obj/item/clothing/under/skirt/loincloth
+	name = "loincloth"
+	desc = "A piece of cloth wrapped around the waist."
+	icon_state = "loincloth"
+
 /obj/item/clothing/under/skirt/outfit
 	name = "black skirt"
 	desc = "A black skirt, very fancy!"
@@ -154,6 +168,8 @@
 	icon_state = "plaid_purple"
 	item_state_slots = list(slot_r_hand_str = "purple", slot_l_hand_str = "purple")
 
+//Job skirts
+
 /obj/item/clothing/under/rank/cargo/skirt
 	name = "quartermaster's jumpskirt"
 	desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."

code/modules/clothing/under/solgov.dm

@@ -4,6 +4,12 @@
 /obj/item/clothing/under/pt
 	name = "pt uniform"
 	desc = "Shorts! Shirt! Miami! Sexy!"
+	sprite_sheets = list(
+		"Human" = 'icons/mob/uniforms/military.dmi',
+		"Skrell" = 'icons/mob/species/skrell/uniforms/military.dmi',
+		"Tajara" = 'icons/mob/species/tajaran/uniforms/military.dmi',
+		"Unathi" = 'icons/mob/species/unathi/uniforms/military.dmi'
+		)
 	icon_state = "miami"
 	worn_state = "miami"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -34,6 +40,13 @@
 /obj/item/clothing/under/utility
 	name = "utility uniform"
 	desc = "A comfortable turtleneck and black utility trousers."
+	sprite_sheets = list(
+		"Human" = 'icons/mob/uniforms/military.dmi',
+		"Skrell" = 'icons/mob/species/skrell/uniforms/military.dmi',
+		"Tajara" = 'icons/mob/species/tajaran/uniforms/military.dmi',
+		"Unathi" = 'icons/mob/species/unathi/uniforms/military.dmi',
+		"Diona" = 'icons/mob/species/diona/uniforms/military.dmi'
+		)
 	icon_state = "blackutility"
 	worn_state = "blackutility"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -94,7 +107,6 @@
 	icon_state = "blackutility_com"
 	worn_state = "blackutility_com"
 
-
 /obj/item/clothing/under/utility/fleet
 	name = "fleet coveralls"
 	desc = "The utility uniform of the SCG Fleet, made from an insulated material."
@@ -133,7 +145,6 @@
 	icon_state = "navyutility_com"
 	worn_state = "navyutility_com"
 
-
 /obj/item/clothing/under/utility/marine
 	name = "marine fatigues"
 	desc = "The utility uniform of the SCG Marine Corps, made from durable material."
@@ -188,6 +199,13 @@
 /obj/item/clothing/under/service
 	name = "service uniform"
 	desc = "A service uniform of some kind."
+	sprite_sheets = list(
+		"Human" = 'icons/mob/uniforms/military.dmi',
+		"Skrell" = 'icons/mob/species/skrell/uniforms/military.dmi',
+		"Tajara" = 'icons/mob/species/tajaran/uniforms/military.dmi',
+		"Unathi" = 'icons/mob/species/unathi/uniforms/military.dmi',
+		"Diona" = 'icons/mob/species/diona/uniforms/military.dmi'
+		)
 	icon_state = "whiteservice"
 	worn_state = "whiteservice"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -212,33 +230,40 @@
 	worn_state = "greenservice_com"
 
 //Dress
-/obj/item/clothing/under/dress/plain
+/obj/item/clothing/under/mildress
 	name = "dress uniform"
 	desc = "A dress uniform of some kind."
+	sprite_sheets = list(
+		"Human" = 'icons/mob/uniforms/military.dmi',
+		"Skrell" = 'icons/mob/species/skrell/uniforms/military.dmi',
+		"Tajara" = 'icons/mob/species/tajaran/uniforms/military.dmi',
+		"Unathi" = 'icons/mob/species/unathi/uniforms/military.dmi',
+		"Diona" = 'icons/mob/species/diona/uniforms/military.dmi'
+		)
 	icon_state = "greydress"
 	worn_state = "greydress"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
 
-/obj/item/clothing/under/dress/expeditionary
+/obj/item/clothing/under/mildress/expeditionary
 	name = "\improper SifGuard dress uniform"
 	desc = "The dress uniform of the Sif Homeguard Corps in silver trim."
 	icon_state = "greydress"
 	worn_state = "greydress"
 
-/obj/item/clothing/under/dress/expeditionary/command
+/obj/item/clothing/under/mildress/expeditionary/command
 	name = "\improper SifGuard command dress uniform"
 	desc = "The dress uniform of the Sif Homeguard Corps in gold trim."
 	icon_state = "greydress_com"
 	worn_state = "greydress_com"
 
-/obj/item/clothing/under/dress/marine
+/obj/item/clothing/under/mildress/marine
 	name = "marine dress uniform"
 	desc = "The dress uniform of the SCG Marine Corps, class given form."
 	icon_state = "blackdress"
 	worn_state = "blackdress"
 
-/obj/item/clothing/under/dress/marine/command
+/obj/item/clothing/under/mildress/marine/command
 	name = "marine command dress uniform"
 	desc = "The dress uniform of the SCG Marine Corps, even classier in gold."
 	icon_state = "blackdress_com"