purge(clothing): removes lack of uniforms quality

code/datums/supplypacks/medical.dm

@@ -261,7 +261,6 @@
 					/obj/item/clothing/under/rank/virologist,
 					/obj/item/clothing/under/rank/nursesuit,
 					/obj/item/clothing/under/rank/nurse,
-					/obj/item/clothing/under/rank/orderly,
 					/obj/item/clothing/under/rank/medical = 3,
 					/obj/item/clothing/under/rank/medical/paramedic = 3,
 					/obj/item/clothing/suit/storage/toggle/labcoat = 3,

code/game/objects/items/storage/garment.dm

@@ -70,7 +70,7 @@
 		/obj/item/clothing/under/dress/dress_hr,
 		/obj/item/clothing/under/dress/dress_hop,
 		/obj/item/clothing/under/rank/head_of_personnel,
-		/obj/item/clothing/under/rank/head_of_personnel_whimsy,
+		/obj/item/clothing/under/rank/head_of_personnel/whimsy,
 		/obj/item/clothing/suit/armor/vest,
 		/obj/item/clothing/shoes/black,
 		/obj/item/clothing/shoes/white

code/game/objects/random/random.dm

@@ -765,10 +765,10 @@
 	return list(/obj/item/clothing/under/syndicate/tacticool = 2,
 				/obj/item/clothing/under/syndicate/combat = 1,
 				/obj/item/clothing/under/hazard = 2,
-				/obj/item/clothing/under/sterile = 2,
 				/obj/item/clothing/under/casual_pants/camo = 2,
 				/obj/item/clothing/under/casual_pants/classicjeans = 2,
 				/obj/item/clothing/under/track_pants = 2,
+				/obj/item/clothing/under/rank/medical = 2,
 				/obj/item/clothing/under/rank/medical/paramedic = 2,
 				/obj/item/clothing/under/overalls = 2,
 				/obj/item/clothing/ears/earmuffs = 2,

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -63,8 +63,6 @@
 		/obj/item/clothing/head/nursehat,
 		/obj/item/clothing/under/rank/medical,
 		/obj/item/clothing/under/rank/nurse,
-		/obj/item/clothing/under/rank/orderly,
-		///obj/item/clothing/under/rank/rosa,
 		/obj/item/clothing/suit/storage/toggle/labcoat,
 		/obj/item/clothing/suit/storage/toggle/fr_jacket,
 		/obj/item/clothing/shoes/white,

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

@@ -441,7 +441,6 @@
 	new /obj/item/clothing/under/suit_jacket/really_black(src)
 	new /obj/item/clothing/under/suit_jacket/red(src)
 	new /obj/item/clothing/under/scratch(src)
-	new /obj/item/clothing/under/rank/internalaffairs/plain(src)
 	new /obj/item/clothing/suit/storage/toggle/suit/black(src)
 	new /obj/item/clothing/under/assistantformal(src)
 	new /obj/item/clothing/under/lawyer/female(src)

code/modules/Z_item_worth/worths_list.dm

@@ -462,7 +462,7 @@ var/list/worths = list(
 //UNDERS,
 					/obj/item/clothing/under/rank/captain = 100,
 					/obj/item/clothing/under/rank/head_of_personnel = 60,
-					/obj/item/clothing/under/rank/head_of_personnel_whimsy = 80,
+					/obj/item/clothing/under/rank/head_of_personnel/whimsy = 80,
 					/obj/item/clothing/under/rank/chief_engineer = 95,
 					/obj/item/clothing/under/rank/research_director = 60,
 					/obj/item/clothing/under/rank/chief_medical_officer = 65,

code/modules/client/preference_setup/loadout/lists/uniforms.dm

@@ -7,6 +7,11 @@
 	path = /obj/item/clothing/under/color
 	flags = GEAR_HAS_COLOR_SELECTION
 
+/datum/gear/uniform/jumpskirt
+	display_name = "jumpskirt, colour select"
+	path = /obj/item/clothing/under/jumpskirt
+	flags = GEAR_HAS_COLOR_SELECTION
+
 /datum/gear/uniform/roboticist_skirt
 	display_name = "skirt, roboticist"
 	path = /obj/item/clothing/under/rank/roboticist/skirt
@@ -31,9 +36,7 @@
 	suits += /obj/item/clothing/under/lawyer/black
 	suits += /obj/item/clothing/under/scratch
 	suits += /obj/item/clothing/under/lawyer/bluesuit
-	suits += /obj/item/clothing/under/rank/internalaffairs/plain
 	suits += /obj/item/clothing/under/blazer
-	suits += /obj/item/clothing/under/blackjumpskirt
 	suits += /obj/item/clothing/under/kilt
 	suits += /obj/item/clothing/under/dress/dress_hr
 	suits += /obj/item/clothing/under/det
@@ -126,32 +129,6 @@
 	display_name = "tacticool turtleneck"
 	path = /obj/item/clothing/under/syndicate/tacticool
 
-// /datum/gear/uniform/turtleneck
-// 	display_name = "sweater, colour select"
-// 	path = /obj/item/clothing/under/rank/psych/turtleneck/sweater
-// 	flags = GEAR_HAS_COLOR_SELECTION
-
-/* MissingNo. uniform. Causes logs wreckage. *shrug
-/datum/gear/uniform/corporate
-	display_name = "corporate uniform selection"
-	path = /obj/item/clothing/under
-
-/datum/gear/uniform/corporate/New()
-	..()
-	var/corps = list()
-	// corps += /obj/item/clothing/under/saare
-	// corps += /obj/item/clothing/under/aether
-	// corps += /obj/item/clothing/under/hephaestus
-	// corps += /obj/item/clothing/under/grayson
-	// corps += /obj/item/clothing/under/focal
-	// corps += /obj/item/clothing/under/rank/ntwork
-	gear_tweaks += new /datum/gear_tweak/path/specified_types_list(corps)
-*/
-
-/datum/gear/uniform/sterile
-	display_name = "sterile jumpsuit"
-	path = /obj/item/clothing/under/sterile
-
 /datum/gear/uniform/hazard
 	display_name = "hazard jumpsuit"
 	path = /obj/item/clothing/under/hazard
@@ -344,7 +321,7 @@
 
 /datum/gear/uniform/shortjumpskirt
 	display_name = "short jumpskirt"
-	path = /obj/item/clothing/under/shortjumpskirt
+	path = /obj/item/clothing/under/jumpskirt/grey
 	price = 10
 
 /datum/gear/uniform/charcoal

code/modules/clothing/custom_clothing.dm

@@ -165,6 +165,13 @@
 		/obj/item/grenade
 		)
 
+/obj/item/clothing/under/syndicate/tacticool/bundeswehr
+	desc = "A durable black suit worn by various private security members."
+	name = "tactical uniform"
+	icon_state = "black"
+	item_state = "BW_uniform_r"
+	worn_state = "BW_uniform_r"
+
 // AnimeshkaTvar
 /obj/item/clothing/head/helmet/space/void/syndi/clown_syndie
 	name = "strange clown helmet"

code/modules/clothing/under/color.dm

@@ -62,3 +62,53 @@
 /obj/item/clothing/under/color/brown
 	name = "brown jumpsuit"
 	color = "#c08720"
+
+
+/obj/item/clothing/under/jumpskirt
+	name = "jumpskirt"
+	desc = "A slimming, short jumpskirt."
+	icon_state = "jumpskirt"
+	item_state_slots = list(
+		slot_hand_str = "white"
+		)
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+
+/obj/item/clothing/under/jumpskirt/white
+	name = "white jumpskirt"
+	color = "#ffffff"
+
+/obj/item/clothing/under/jumpskirt/black
+	name = "black jumpskirt"
+	color = "#3d3d3d"
+
+/obj/item/clothing/under/jumpskirt/grey
+	name = "grey jumpskirt"
+	color = "#c4c4c4"
+
+/obj/item/clothing/under/jumpskirt/blue
+	name = "blue jumpskirt"
+	color = "#0066ff"
+
+/obj/item/clothing/under/jumpskirt/pink
+	name = "pink jumpskirt"
+	color = "#df20a6"
+
+/obj/item/clothing/under/jumpskirt/red
+	name = "red jumpskirt"
+	color = "#ee1511"
+
+/obj/item/clothing/under/jumpskirt/green
+	name = "green jumpskirt"
+	color = "#42a345"
+
+/obj/item/clothing/under/jumpskirt/yellow
+	name = "yellow jumpskirt"
+	color = "#ffee00"
+
+/obj/item/clothing/under/jumpskirt/lightpurple
+	name = "light purple jumpskirt"
+	color = "#c600fc"
+
+/obj/item/clothing/under/jumpskirt/brown
+	name = "brown jumpskirt"
+	color = "#c08720"

code/modules/clothing/under/jobs/civilian.dm

@@ -5,13 +5,11 @@
 	name = "bartender's uniform"
 	icon_state = "ba_suit"
 
-
 /obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
 	desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
 	name = "captain's jumpsuit"
 	icon_state = "captain"
 
-
 /obj/item/clothing/under/rank/cargo
 	name = "quartermaster's jumpsuit"
 	desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
@@ -26,7 +24,6 @@
 	icon_state = "cargo"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
-
 /obj/item/clothing/under/rank/chaplain
 	desc = "It's a black jumpsuit, often worn by religious folk."
 	name = "chaplain's jumpsuit"
@@ -40,27 +37,24 @@
 	name = "chef's uniform"
 	icon_state = "chef"
 
-
 /obj/item/clothing/under/rank/clown
 	name = "clown suit"
 	desc = "<i>'HONK!'</i>"
 	icon_state = "clown"
 
-
 /obj/item/clothing/under/rank/head_of_personnel
 	desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
 	name = "head of personnel's jumpsuit"
 	icon_state = "hop"
 
-/obj/item/clothing/under/rank/head_of_personnel_whimsy
+/obj/item/clothing/under/rank/head_of_personnel/whimsy
 	desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does."
 	name = "head of personnel's suit"
 	icon_state = "hopwhimsy"
 	item_state_slots = list(
 		slot_hand_str = "hop"
 		)
 
-
 /obj/item/clothing/under/rank/hydroponics
 	desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
 	name = "botanist's jumpsuit"
@@ -70,7 +64,6 @@
 		)
 	permeability_coefficient = 0.50
 
-
 /obj/item/clothing/under/rank/internalaffairs
 	desc = "The plain, professional attire of an Internal Affairs Agent. The collar is <i>immaculately</i> starched."
 	name = "Internal Affairs uniform"
@@ -80,24 +73,12 @@
 		)
 	starting_accessories = list(/obj/item/clothing/accessory/black)
 
-/obj/item/clothing/under/rank/internalaffairs/plain
-	desc = "A plain shirt and pair of pressed black pants."
-	name = "formal outfit"
-	starting_accessories = null
-
-/obj/item/clothing/under/rank/internalaffairs/plain/nt
-	desc = "A plain shirt and pair of pressed black pants."
-	name = "formal outfit"
-	starting_accessories = list(/obj/item/clothing/accessory/red_long)
-
-
 /obj/item/clothing/under/rank/janitor
 	desc = "It's the official uniform of the janitor. It has minor protection from biohazards."
 	name = "janitor's jumpsuit"
 	icon_state = "janitor"
 	armor = list(melee = 5, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 10)
 
-
 /obj/item/clothing/under/lawyer
 	desc = "Slick threads."
 	name = "Lawyer suit"
@@ -118,12 +99,10 @@
 	name = "red Lawyer suit"
 	icon_state = "lawyer_red"
 
-
 /obj/item/clothing/under/lawyer/blue
 	name = "blue Lawyer suit"
 	icon_state = "lawyer_blue"
 
-
 /obj/item/clothing/under/lawyer/bluesuit
 	name = "Blue Suit"
 	desc = "A classy suit."
@@ -133,7 +112,6 @@
 		)
 	starting_accessories = list(/obj/item/clothing/accessory/red)
 
-
 /obj/item/clothing/under/lawyer/purpsuit
 	name = "Purple Suit"
 	icon_state = "lawyer_purp"
@@ -149,7 +127,6 @@
 		slot_hand_str = "johnny"
 		)
 
-
 /obj/item/clothing/under/librarian
 	name = "sensible suit"
 	desc = "It's very... sensible."

code/modules/clothing/under/jobs/medsci.dm

@@ -98,25 +98,15 @@
 	armor = list(melee = 5, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 10)
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
-/obj/item/clothing/under/rank/orderly
-	desc = "A white suit to be worn by medical attendants."
-	name = "orderly's uniform"
-	icon_state = "orderly"
-	item_state_slots = list(
-		slot_hand_str = "nursesuit"
-		)
-	permeability_coefficient = 0.50
-	armor = list(melee = 5, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 10)
-
 /obj/item/clothing/under/rank/medical
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
 	name = "medical doctor's jumpsuit"
 	icon_state = "medical"
 	item_state_slots = list(
 		slot_hand_str = "white"
 		)
-	permeability_coefficient = 0.50
-	armor = list(melee = 5, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 10)
+	permeability_coefficient = 0.5
+	armor = list(melee = 5, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 30)
 
 /obj/item/clothing/under/rank/medical/paramedic
 	name = "short sleeve medical jumpsuit"

code/modules/clothing/under/jobs/security.dm

@@ -28,17 +28,6 @@
 	armor = list(melee = 20, bullet = 20, laser = 20, energy = 0, bomb = 0, bio = 0)
 	siemens_coefficient = 0.8
 
-/obj/item/clothing/under/rank/dispatch
-	name = "dispatcher's uniform"
-	desc = "A dress shirt and khakis with a security patch sewn on."
-	icon_state = "dispatch"
-	item_state_slots = list(
-		slot_hand_str = "blue"
-		)
-	armor = list(melee = 10, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 0)
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
-	siemens_coefficient = 0.9
-
 /obj/item/clothing/under/rank/security/corp
 	icon_state = "sec_corp"
 	item_state_slots = list(
@@ -115,10 +104,6 @@
 		slot_hand_str = "black"
 		)
 
-/obj/item/clothing/under/rank/head_of_security/old
-	icon_state = "hos_corp"
-	desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer. This one must be quite old, yet it's colors are so vibrant it hurts your eyes."
-
 /obj/item/clothing/under/rank/head_of_security/jensen
 	desc = "You never asked for anything that stylish."
 	name = "head of security's jumpsuit"