Removes useless uniforms (#8941)

aurorastation.dme

@@ -345,8 +345,6 @@
 #include "code\datums\outfits\event\outfit_killers.dm"
 #include "code\datums\outfits\event\outfit_lance.dm"
 #include "code\datums\outfits\event\outfit_nanotrasen.dm"
-#include "code\datums\outfits\event\outfit_pirate.dm"
-#include "code\datums\outfits\event\outfit_soviet.dm"
 #include "code\datums\outfits\event\outfit_tfcl.dm"
 #include "code\datums\radio\frequency.dm"
 #include "code\datums\radio\signal.dm"

code/datums/outfits/event/outfit_pirate.dm

@@ -1,19 +0,0 @@
-/datum/outfit/admin/pirate
-	name = "Pirate"
-
-	uniform = /obj/item/clothing/under/pirate
-	shoes = /obj/item/clothing/shoes/brown
-	head = /obj/item/clothing/head/bandana
-	glasses = /obj/item/clothing/glasses/eyepatch
-	r_hand = /obj/item/melee/energy/sword/pirate
-
-
-/datum/outfit/admin/pirate/space
-	name = "Space Pirate"
-
-	uniform = /obj/item/clothing/under/pirate
-	suit = /obj/item/clothing/suit/space/pirate
-	shoes = /obj/item/clothing/shoes/brown
-	head = /obj/item/clothing/head/helmet/space/pirate
-	glasses = /obj/item/clothing/glasses/eyepatch
-	r_hand = /obj/item/melee/energy/sword/pirate

code/datums/outfits/event/outfit_soviet.dm

@@ -1,26 +0,0 @@
-/datum/outfit/admin/soviet_soldier
-	name = "Soviet Soldier"
-
-	uniform = /obj/item/clothing/under/soviet
-	shoes = /obj/item/clothing/shoes/black
-	head = /obj/item/clothing/head/ushanka/grey
-
-
-/datum/outfit/admin/soviet_soldier/admiral
-	name = "Soviet Admiral"
-
-	uniform = /obj/item/clothing/under/soviet
-	suit = /obj/item/clothing/suit/hgpirate
-	gloves = /obj/item/clothing/gloves/combat
-	shoes = /obj/item/clothing/shoes/combat
-	head = /obj/item/clothing/head/hgpiratecap
-	belt = /obj/item/gun/projectile/revolver/mateba
-	l_ear = /obj/item/device/radio/headset/heads/captain
-	glasses = /obj/item/clothing/glasses/eyepatch/hud/thermal
-	id = /obj/item/card/id
-
-/datum/outfit/admin/soviet_soldier/admiral/get_id_assignment()
-	return "Admiral"
-
-/datum/outfit/admin/soviet_soldier/admiral/get_id_rank()
-	return "Admiral"

code/datums/outfits/outfit_admin.dm

@@ -77,7 +77,6 @@
 			var/datum/gear/G = gear_datums["gloves selection"]
 			H.equip_or_collect(G.spawn_random(), slot_gloves)
 
-
 /datum/outfit/admin/random/visitor
 	name = "Random Visitor"
 
@@ -88,4 +87,4 @@
 	return "Visitor"
 
 /datum/outfit/admin/random/visitor/get_id_rank()
-	return "Visitor"
+	return "Visitor"

code/datums/outfits/outfit_antag.dm

@@ -170,11 +170,7 @@
 	allow_backbag_choice = FALSE
 
 	uniform = list(
-		/obj/item/clothing/under/soviet,
-		/obj/item/clothing/under/pirate,
-		/obj/item/clothing/under/redcoat,
 		/obj/item/clothing/under/serviceoveralls,
-		/obj/item/clothing/under/captain_fly,
 		/obj/item/clothing/under/det,
 		/obj/item/clothing/under/brown,
 		/obj/item/clothing/under/syndicate/tracksuit

code/datums/trading/goods.dm

@@ -135,12 +135,9 @@
 		/obj/item/clothing/under/pj                              = TRADER_BLACKLIST,
 		/obj/item/clothing/under/rank                            = TRADER_BLACKLIST,
 		/obj/item/clothing/under/shorts                          = TRADER_BLACKLIST,
-		/obj/item/clothing/under/stripper                        = TRADER_BLACKLIST_ALL,
 		/obj/item/clothing/under/swimsuit                        = TRADER_BLACKLIST,
 		/obj/item/clothing/under/syndicate                       = TRADER_BLACKLIST_ALL,
 		/obj/item/clothing/under/tactical                        = TRADER_BLACKLIST,
-		/obj/item/clothing/under/vox                             = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/under/wedding                         = TRADER_BLACKLIST,
 		/obj/item/clothing/under/punpun                          = TRADER_BLACKLIST,
 		/obj/item/clothing/under/fluff                           = TRADER_BLACKLIST_ALL,
 		/obj/item/clothing/under/dress/fluff                     = TRADER_BLACKLIST_ALL,

code/datums/trading/misc.dm

@@ -153,8 +153,6 @@
 		/obj/item/clothing/suit/armor/tajara            = TRADER_THIS_TYPE,
 		/obj/item/clothing/under/gladiator              = TRADER_THIS_TYPE,
 		/obj/item/clothing/under/kilt                   = TRADER_THIS_TYPE,
-		/obj/item/clothing/under/redcoat                = TRADER_THIS_TYPE,
-		/obj/item/clothing/under/soviet                 = TRADER_THIS_TYPE,
 		/obj/item/material/harpoon               = TRADER_THIS_TYPE,
 		/obj/item/material/sword                 = TRADER_ALL,
 		/obj/item/material/scythe                = TRADER_THIS_TYPE,

code/game/antagonist/outsider/raider.dm

@@ -269,9 +269,6 @@ var/datum/antagonist/raider/raiders
 
 /datum/antagonist/raider/proc/equip_vox(var/mob/living/carbon/human/player)
 
-	var/uniform_type = pick(list(/obj/item/clothing/under/vox/vox_robes,/obj/item/clothing/under/vox/vox_casual))
-
-	player.equip_to_slot_or_del(new uniform_type(player), slot_w_uniform)
 	player.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/vox(player), slot_shoes) // REPLACE THESE WITH CODED VOX ALTERNATIVES.
 	player.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow/vox(player), slot_gloves) // AS ABOVE.
 	player.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/swat/vox(player), slot_wear_mask)

code/game/jobs/job/civilian.dm

@@ -159,7 +159,7 @@
 	name = "Cargo Technician"
 	jobtype = /datum/job/cargo_tech
 
-	uniform = /obj/item/clothing/under/rank/cargotech
+	uniform = /obj/item/clothing/under/rank/cargo
 	pda = /obj/item/device/pda/cargo
 	id = /obj/item/card/id/silver
 	shoes = /obj/item/clothing/shoes/brown
@@ -325,4 +325,4 @@
 	l_pocket = /obj/item/modular_computer/tablet/preset/custom_loadout/advanced
 	r_pocket = /obj/item/card/tech_support
 	l_hand = /obj/item/modular_computer/laptop/preset
-	gloves = /obj/item/modular_computer/wristbound/preset/advanced/generic
+	gloves = /obj/item/modular_computer/wristbound/preset/advanced/generic

code/game/jobs/job/medical.dm

@@ -271,8 +271,6 @@
 	name = "Emergency Medical Technician"
 	jobtype = /datum/job/paramedic
 
-	uniform = /obj/item/clothing/under/rank/medical/paramedic
-
 /datum/job/intern_med
 	title = "Medical Resident"
 	flag = INTERN_MED

code/game/jobs/job/outsider/merchant.dm

@@ -51,8 +51,6 @@
 		/obj/item/clothing/under/det/black,
 		/obj/item/clothing/under/suit_jacket/charcoal,
 		/obj/item/clothing/under/suit_jacket/tan,
-		/obj/item/clothing/under/assistantformal,
-		/obj/item/clothing/under/blazer
 		)
 	shoes = list(
 		/obj/item/clothing/shoes/laceup/brown,
@@ -85,4 +83,4 @@
 	return "Merchant's Assistant"
 
 /datum/outfit/merchant_assistant/get_id_access()
-	return list(access_merchant)
+	return list(access_merchant)

code/game/jobs/job/outsider/representative.dm

@@ -105,4 +105,4 @@
 	if(citizenship)
 		rep_objectives = citizenship.get_objectives(mission_level, H)
 
-	return rep_objectives
+	return rep_objectives

code/game/objects/effects/landmarks.dm

@@ -162,7 +162,7 @@
 /obj/effect/landmark/costume/scratch/New()
 	new /obj/item/clothing/gloves/white(src.loc)
 	new /obj/item/clothing/shoes/white(src.loc)
-	new /obj/item/clothing/under/scratch(src.loc)
+	new /obj/item/clothing/under/suit_jacket/white(src.loc)
 	if (prob(30))
 		new /obj/item/clothing/head/cueball(src.loc)
 	delete_me = 1
@@ -201,7 +201,6 @@
 	delete_me = 1
 
 /obj/effect/landmark/costume/pirate/New()
-	new /obj/item/clothing/under/pirate(src.loc)
 	new /obj/item/clothing/suit/pirate(src.loc)
 	var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana )
 	new CHOICE(src.loc)
@@ -209,7 +208,6 @@
 	delete_me = 1
 
 /obj/effect/landmark/costume/commie/New()
-	new /obj/item/clothing/under/soviet(src.loc)
 	new /obj/item/clothing/head/ushanka/grey(src.loc)
 	delete_me = 1
 

code/game/objects/items/weapons/gift_wrappaper.dm

@@ -309,7 +309,6 @@
 		/obj/random/backpack,
 		/obj/item/inflatable_duck,
 		/obj/item/beach_ball,
-		/obj/item/clothing/under/redcoat,
 		/obj/item/clothing/under/syndicate/tracksuit,
 		/obj/item/clothing/under/rank/clown,
 		/obj/item/clothing/under/mime,

code/game/objects/random/random.dm

@@ -686,7 +686,6 @@
 	icon_state = "black"
 	spawnlist = list(
 		/obj/item/clothing/under/color/black,
-		/obj/item/clothing/under/color/blackf,
 		/obj/item/clothing/under/color/blue,
 		/obj/item/clothing/under/color/green,
 		/obj/item/clothing/under/color/grey,
@@ -772,17 +771,10 @@
 		/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen = 0.7,
 		/obj/item/clothing/suit/storage/vest = 0.2,
 		/obj/item/clothing/suit/syndicatefake = 0.6,
-		/obj/item/clothing/under/assistantformal = 0.75,
-		/obj/item/clothing/under/captain_fly = 0.5,
 		/obj/item/clothing/under/mime = 0.1,
 		/obj/item/clothing/under/overalls = 1,
 		/obj/item/clothing/under/rainbow = 0.9,
 		/obj/item/clothing/under/rank/clown = 0.1,
-		/obj/item/clothing/under/rank/dispatch = 0.8,
-		/obj/item/clothing/under/rank/mailman = 0.6,
-		/obj/item/clothing/under/rank/vice = 0.8,
-		/obj/item/clothing/under/redcoat = 0.5,
-		/obj/item/clothing/under/serviceoveralls = 0.75,
 		/obj/item/clothing/under/syndicate/tacticool = 0.4,
 		/obj/item/clothing/under/syndicate/tracksuit = 0.2,
 		/obj/item/device/firing_pin = 0.3,

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

@@ -59,12 +59,6 @@
 	new /obj/item/clothing/head/ushanka/grey(src)
 	new /obj/item/clothing/head/ushanka/grey(src)
 	new /obj/item/clothing/head/ushanka/grey(src)
-	new /obj/item/clothing/under/soviet(src)
-	new /obj/item/clothing/under/soviet(src)
-	new /obj/item/clothing/under/soviet(src)
-	new /obj/item/clothing/under/soviet(src)
-	new /obj/item/clothing/under/soviet(src)
-
 
 /obj/structure/closet/gimmick/tacticool
 	name = "tacticool gear closet"
@@ -151,4 +145,4 @@
 	icon_state = "skrell"
 	icon_closed = "skrell"
 	icon_opened = "skrellopen"
-	layer = OBJ_LAYER - 0.01
+	layer = OBJ_LAYER - 0.01

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

@@ -29,7 +29,6 @@
 	new /obj/item/clothing/under/sl_suit(src)
 	new /obj/item/clothing/under/rank/bartender(src)
 	new /obj/item/clothing/under/rank/bartender(src)
-	new /obj/item/clothing/under/dress/dress_saloon(src)
 	new /obj/item/clothing/accessory/wcoat(src)
 	new /obj/item/clothing/accessory/wcoat(src)
 	new /obj/item/clothing/shoes/black(src)
@@ -102,12 +101,10 @@
 	icon_closed = "blue"
 
 /obj/structure/closet/lawcloset/fill()
-	new /obj/item/clothing/under/lawyer/female(src)
 	new /obj/item/clothing/under/lawyer/black(src)
 	new /obj/item/clothing/under/lawyer/red(src)
-	new /obj/item/clothing/under/lawyer/bluesuit(src)
 	new /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket(src)
-	new /obj/item/clothing/under/lawyer/purpsuit(src)
+	new /obj/item/clothing/under/lawyer/purple(src)
 	new /obj/item/clothing/suit/storage/lawyer/purpjacket(src)
 	new /obj/item/clothing/shoes/brown(src)
 	new /obj/item/clothing/shoes/black(src)

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

@@ -10,8 +10,8 @@
 
 /obj/structure/closet/secure_closet/cargotech/fill()
 	..()
-	new /obj/item/clothing/under/rank/cargotech(src)
-	new /obj/item/clothing/under/rank/cargotech/alt(src)
+	new /obj/item/clothing/under/rank/cargo(src)
+	new /obj/item/clothing/under/rank/cargo/alt(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/device/radio/headset/headset_cargo(src)
 	new /obj/item/device/radio/headset/headset_cargo/alt(src)

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

@@ -78,7 +78,6 @@
 			new /obj/item/clothing/under/rank/medical/purple(src)
 			new /obj/item/clothing/head/surgery/purple(src)
 	new /obj/item/clothing/under/rank/medical(src)
-	new /obj/item/clothing/under/rank/orderly(src)
 	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
 	new /obj/item/clothing/suit/storage/toggle/fr_jacket(src)
 	new /obj/item/clothing/shoes/medical(src)

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

@@ -98,11 +98,8 @@
 	..()
 	new /obj/item/clothing/under/rank/head_of_personnel(src)
 	new /obj/item/clothing/under/dress/dress_hop(src)
-	new /obj/item/clothing/under/dress/dress_hr(src)
-	new /obj/item/clothing/under/lawyer/female(src)
 	new /obj/item/clothing/under/lawyer/black(src)
 	new /obj/item/clothing/under/lawyer/red(src)
-	new /obj/item/clothing/under/lawyer/oldman(src)
 	new /obj/item/clothing/under/rank/head_of_personnel_whimsy(src)
 	new /obj/item/clothing/shoes/brown(src)
 	new /obj/item/clothing/shoes/black(src)
@@ -129,7 +126,6 @@
 	new /obj/item/storage/backpack/satchel_sec(src)
 	new /obj/item/clothing/under/rank/head_of_security(src)
 	new /obj/item/clothing/under/rank/head_of_security/corp(src)
-	new /obj/item/clothing/suit/storage/toggle/armor/hos/jensen(src)
 	new /obj/item/clothing/suit/armor/hos(src)
 	new /obj/item/clothing/suit/storage/vest/hos(src)
 	new /obj/item/clothing/head/helmet/hos/cap(src)

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

@@ -86,7 +86,6 @@
 	new /obj/item/clothing/suit/nun(src)
 	new /obj/item/clothing/head/nun_hood(src)
 	new /obj/item/clothing/suit/holidaypriest(src)
-	new /obj/item/clothing/under/wedding/bride_white(src)
 	new /obj/item/storage/fancy/candle_box(src)
 	new /obj/item/storage/fancy/candle_box(src)
 	new /obj/item/deck/tarot(src)
@@ -421,7 +420,6 @@
 
 /obj/structure/closet/wardrobe/suit/fill()
 	..()
-	new /obj/item/clothing/under/assistantformal(src)
 	new /obj/item/clothing/under/suit_jacket/charcoal(src)
 	new /obj/item/clothing/under/suit_jacket/navy(src)
 	new /obj/item/clothing/under/suit_jacket/burgundy(src)
@@ -432,4 +430,4 @@
 	new /obj/item/clothing/under/suit_jacket/female(src)
 	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/(src)

code/modules/admin/verbs/debug.dm

@@ -418,8 +418,6 @@
 			outfit_catagories["Ceres Lance"] = typesof(/datum/outfit/admin/lance)
 			outfit_catagories["TCFL"] = typesof(/datum/outfit/admin/tcfl)
 			outfit_catagories["Killers"] = typesof(/datum/outfit/admin/killer)
-			outfit_catagories["Pirates"] = typesof(/datum/outfit/admin/pirate)
-			outfit_catagories["Soviets"] = typesof(/datum/outfit/admin/soviet_soldier)
 			outfit_catagories["Miscellaneous"] = typesof(/datum/outfit/admin/random)
 			outfit_catagories["Miscellaneous"] += /datum/outfit/admin/random_employee
 

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

@@ -1,17 +1,9 @@
 // Uniform slot
 /datum/gear/uniform
-	display_name = "blazer, blue"
-	path = /obj/item/clothing/under/blazer
-	slot = slot_w_uniform
-	sort_category = "Uniforms and Casual Dress"
-
-/datum/gear/uniform/kilt
 	display_name = "kilt"
 	path = /obj/item/clothing/under/kilt
-
-/datum/gear/uniform/formalblouse
-    display_name = "formal blouse"
-    path = /obj/item/clothing/under/formalblouse
+	slot = slot_w_uniform
+	sort_category = "Uniforms and Casual Dress"
 
 /datum/gear/uniform/croptop
     display_name = "crop top"
@@ -76,7 +68,7 @@
 /datum/gear/uniform/suit
 	display_name = "suit selection"
 	description = "A selection of formal suits."
-	path = /obj/item/clothing/under/lawyer/bluesuit
+	path = /obj/item/clothing/under/sl_suit
 
 /datum/gear/uniform/suit/New()
 	..()
@@ -89,16 +81,13 @@
 	suits["checkered suit"] = /obj/item/clothing/under/suit_jacket/checkered
 	suits["executive suit"] = /obj/item/clothing/under/suit_jacket/really_black
 	suits["female executive suit"] = /obj/item/clothing/under/suit_jacket/female
-	suits["gentleman suit"] = /obj/item/clothing/under/gentlesuit
 	suits["navy suit"] = /obj/item/clothing/under/suit_jacket/navy
-	suits["old man suit"] = /obj/item/clothing/under/lawyer/oldman
-	suits["purple suit"] = /obj/item/clothing/under/lawyer/purpsuit
+	suits["purple suit"] = /obj/item/clothing/under/lawyer/purple
 	suits["red suit"] = /obj/item/clothing/under/suit_jacket/red
 	suits["red lawyer suit"] = /obj/item/clothing/under/lawyer/red
 	suits["shiny black suit"] = /obj/item/clothing/under/lawyer/black
 	suits["tan suit"] = /obj/item/clothing/under/suit_jacket/tan
-	suits["white suit"] = /obj/item/clothing/under/scratch
-	suits["white-blue suit"] = /obj/item/clothing/under/lawyer/bluesuit
+	suits["white suit"] = /obj/item/clothing/under/suit_jacket/white
 	gear_tweaks += new/datum/gear_tweak/path(suits)
 
 /datum/gear/uniform/scrubs
@@ -134,7 +123,6 @@
 	dress["dress, stripped"] = /obj/item/clothing/under/dress/stripeddress
 	dress["dress, sailor"] = /obj/item/clothing/under/dress/sailordress
 	dress["dress, red swept"] = /obj/item/clothing/under/dress/red_swept_dress
-	dress["dress, western bustle"] = /obj/item/clothing/under/dress/westernbustle
 	dress["dress, black tango"] = /obj/item/clothing/under/dress/blacktango
 	dress["dress, black tango alternative"] = /obj/item/clothing/under/dress/blacktango/alt
 	dress["cheongsam, white"] = /obj/item/clothing/under/cheongsam
@@ -151,21 +139,11 @@
 	path = /obj/item/clothing/under/dress/dress_cap
 	allowed_roles = list("Captain")
 
-/datum/gear/uniform/customdress
-	display_name = "evening gown"
-	path = /obj/item/clothing/under/dress/dress_evening
-	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
-
 /datum/gear/uniform/uniform_hop
 	display_name = "uniform, HoP dress"
 	path = /obj/item/clothing/under/dress/dress_hop
 	allowed_roles = list("Head of Personnel")
 
-/datum/gear/uniform/uniform_hr
-	display_name = "uniform, HR director (HoP)"
-	path = /obj/item/clothing/under/dress/dress_hr
-	allowed_roles = list("Head of Personnel")
-
 /datum/gear/uniform/pants
 	display_name = "pants selection"
 	description = "A selection of pants."
@@ -249,10 +227,6 @@
 	path = /obj/item/clothing/under/kimono
 	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
 
-/datum/gear/uniform/miscellaneous/greensuit
-	display_name = "green formal uniform"
-	path = /obj/item/clothing/under/gov
-
 /datum/gear/uniform/officer
 	display_name = "uniforms, (Security Officer)"
 	description = "A selection of officer uniforms."
@@ -314,7 +288,7 @@
 /datum/gear/uniform/cargo_alt
 	display_name = "cargo technician, shorts"
 	description = "For those that value leg-room."
-	path = /obj/item/clothing/under/rank/cargotech/alt
+	path = /obj/item/clothing/under/rank/cargo/alt
 	allowed_roles = list("Cargo Technician")
 
 /datum/gear/uniform/pyjama

code/modules/clothing/spacesuits/alien.dm

@@ -73,23 +73,6 @@
 	item_state = "vox-medic"
 	desc = "An almost organic looking nonhuman pressure suit."
 
-/obj/item/clothing/under/vox
-	has_sensor = 0
-	species_restricted = list("Vox")
-
-/obj/item/clothing/under/vox/vox_casual
-	name = "alien clothing"
-	desc = "This doesn't look very comfortable."
-	icon_state = "vox-casual-1"
-	item_state = "vox-casual-1"
-	body_parts_covered = LEGS
-
-/obj/item/clothing/under/vox/vox_robes
-	name = "alien robes"
-	desc = "Weird and flowing!"
-	icon_state = "vox-casual-2"
-	item_state = "vox-casual-2"
-
 /obj/item/clothing/gloves/yellow/vox
 	desc = "These bizarre gauntlets seem to be fitted for... bird claws?"
 	name = "insulated gauntlets"

code/modules/clothing/suits/armor.dm

@@ -100,24 +100,6 @@
 	armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
 	pocket_slots = 4//More slots because coat
 
-/obj/item/clothing/suit/storage/toggle/armor/hos/jensen
-	name = "armored trenchcoat"
-	desc = "A trenchcoat augmented with a special alloy for some protection and style."
-	icon_state = "jensencoat"
-	item_state = "jensencoat"
-	icon_open = "jensencoat_open"
-	icon_closed = "jensencoat"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-	armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
-	allowed = list(/obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/device/flashlight)
-
-/obj/item/clothing/suit/storage/toggle/armor/hos/jensen/Initialize()
-	. = ..()
-	pockets = new/obj/item/storage/internal(src)
-	pockets.storage_slots = 4
-	pockets.max_w_class = 2
-	pockets.max_storage_space = 8
-
 /obj/item/clothing/suit/armor/riot
 	name = "riot vest"
 	desc = "A vest of armor with heavy padding to protect against melee attacks. Looks like it might impair movement."

code/modules/clothing/under/color.dm

@@ -4,13 +4,6 @@
 	item_state = "bl_suit"
 	worn_state = "black"
 
-/obj/item/clothing/under/color/blackf
-	name = "feminine black jumpsuit"
-	desc = "It's very smart and in a ladies-size!"
-	icon_state = "black"
-	item_state = "bl_suit"
-	worn_state = "blackf"
-
 /obj/item/clothing/under/color/blue
 	name = "blue jumpsuit"
 	icon_state = "blue"
@@ -86,6 +79,13 @@
 	item_state = "psyche"
 	worn_state = "psyche"
 
+/obj/item/clothing/under/rainbow
+	name = "rainbow"
+	desc = "rainbow"
+	icon_state = "rainbow"
+	item_state = "rainbow"
+	worn_state = "rainbow"
+
 /obj/item/clothing/under/lightblue
 	name = "lightblue jumpsuit"
 	desc = "lightblue"

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

@@ -21,16 +21,16 @@
 	item_state = "lb_suit"
 	worn_state = "qm"
 
-/obj/item/clothing/under/rank/cargotech
+/obj/item/clothing/under/rank/cargo
 	name = "cargo technician's jumpsuit"
 	desc = "The future of cargo tech apparel: long, stuffy slacks. We never said it was a bright future."
-	icon_state = "cargotech"
+	icon_state = "cargo"
 	item_state = "lb_suit"
 	worn_state = "cargo"
 
-/obj/item/clothing/under/rank/cargotech/alt
+/obj/item/clothing/under/rank/cargo/alt
 	desc = "Shooooorts! They're comfy and easy to wear!"
-	icon_state = "cargotech_alt"
+	icon_state = "cargo_alt"
 	worn_state = "cargo_alt"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
@@ -102,12 +102,6 @@
 	item_state = "lawyer_black"
 	worn_state = "lawyer_black"
 
-/obj/item/clothing/under/lawyer/female
-	name = "black lawyer suit"
-	icon_state = "black_suit_fem"
-	item_state = "lawyer_black"
-	worn_state = "black_suit_fem"
-
 /obj/item/clothing/under/lawyer/red
 	name = "red Lawyer suit"
 	icon_state = "lawyer_red"
@@ -120,25 +114,11 @@
 	item_state = "lawyer_blue"
 	worn_state = "lawyer_blue"
 
-/obj/item/clothing/under/lawyer/bluesuit
-	name = "blue suit"
-	desc = "A classy suit and tie"
-	icon_state = "bluesuit"
-	item_state = "ba_suit"
-	worn_state = "bluesuit"
-
-/obj/item/clothing/under/lawyer/purpsuit
+/obj/item/clothing/under/lawyer/purple
 	name = "purple suit"
-	icon_state = "lawyer_purp"
+	icon_state = "lawyer_purple"
 	item_state = "ba_suit"
-	worn_state = "lawyer_purp"
-
-/obj/item/clothing/under/lawyer/oldman
-	name = "old man's suit"
-	desc = "A classic suit for the older gentleman with built in back support."
-	icon_state = "oldman"
-	item_state = "johnny"
-	worn_state = "oldman"
+	worn_state = "lawyer_purple"
 
 /obj/item/clothing/under/librarian
 	name = "sensible suit"

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

@@ -38,12 +38,3 @@
 	item_state = "bl_suit"
 	worn_state = "robotics"
 	siemens_coefficient = 0.75
-
-/obj/item/clothing/under/rank/roboticistalt
-	name = "roboticist's jumpsuit"
-	desc = "It's a slimming black jumpsuit with reinforced seams; great for industrial work."
-	icon_state = "robotics_alt"
-	item_state = "bl_suit"
-	worn_state = "robotics_alt"
-	siemens_coefficient = 0.75
-

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

@@ -120,38 +120,6 @@
 	item_state = "iacuniform"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 15, rad = 5)
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO
-
-
-
-/obj/item/clothing/under/rank/nursesuit
-	desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
-	name = "nurse's suit"
-	icon_state = "nursesuit"
-	item_state = "nursesuit"
-	worn_state = "nursesuit"
-	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO
-
-/obj/item/clothing/under/rank/nurse
-	desc = "A dress commonly worn by the nursing staff in the medical department."
-	name = "nurse's dress"
-	icon_state = "nurse"
-	item_state = "nursesuit"
-	worn_state = "nurse"
-	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-	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 = "nursesuit"
-	worn_state = "orderly"
-	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/rank/medical
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It denotes that the wearer is trained medical personnel."
@@ -168,13 +136,6 @@
 	icon_state = "intern_medical"
 	worn_state = "intern_medical"
 
-/obj/item/clothing/under/rank/medical/paramedic
-	name = "short sleeve medical jumpsuit"
-	desc = "It's made of a special fiber that provides minor protection against biohazards. This one has a cross on the chest denoting that the wearer is trained medical personnel."
-	icon_state = "medical_short"
-	item_state = "medical_short"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
-
 /obj/item/clothing/under/rank/medical/blue
 	name = "medical scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
@@ -210,44 +171,6 @@
 	item_state = "w_suit"
 	worn_state = "psych"
 
-/obj/item/clothing/under/rank/psych/turtleneck
-	desc = "A turqouise turtleneck and a pair of dark blue slacks, belonging to a psychologist."
-	name = "psychologist's turtleneck"
-	icon_state = "psychturtle"
-	item_state = "b_suit"
-	worn_state = "psychturtle"
-
-
-/*
- * Medsci, unused (i think) stuff
- */
-/obj/item/clothing/under/rank/geneticist_new
-	desc = "It's made of a special fiber which provides minor protection against biohazards."
-	name = "geneticist's jumpsuit"
-	icon_state = "genetics_new"
-	item_state = "w_suit"
-	worn_state = "genetics_new"
-	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-
-/obj/item/clothing/under/rank/chemist_new
-	desc = "It's made of a special fiber which provides minor protection against biohazards."
-	name = "chemist's jumpsuit"
-	icon_state = "chemist_new"
-	item_state = "w_suit"
-	worn_state = "chemist_new"
-	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-
-/obj/item/clothing/under/rank/scientist_new
-	desc = "Made of a special fiber that gives special protection against biohazards and small explosions."
-	name = "scientist's jumpsuit"
-	icon_state = "scientist_new"
-	item_state = "w_suit"
-	worn_state = "scientist_new"
-	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
-
 /obj/item/clothing/under/rank/biochemist
 	desc = "Made of a special fiber that gives increased protection against biohazards."
 	name = "biochemist's jumpsuit"
@@ -255,4 +178,4 @@
 	item_state = "w_suit"
 	worn_state = "virology"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)

code/modules/clothing/under/miscellaneous.dm

@@ -24,19 +24,12 @@
 	worn_state = "blue_pyjamas"
 	item_state = "w_suit"
 
-/obj/item/clothing/under/captain_fly
-	name = "rogue's uniform"
-	desc = "For the man who doesn't care because he's still free."
-	icon_state = "captain_fly"
-	item_state = "r_suit"
-	worn_state = "captain_fly"
-
-/obj/item/clothing/under/scratch
+/obj/item/clothing/under/suit_jacket/white
 	name = "white suit"
 	desc = "A white suit, suitable for an excellent host"
-	icon_state = "scratch"
-	item_state = "scratch"
-	worn_state = "scratch"
+	icon_state = "white_suit"
+	item_state = "w_suit"
+	worn_state = "white_suit"
 
 /obj/item/clothing/under/sl_suit
 	desc = "It's a very amish looking suit."
@@ -52,13 +45,6 @@
 	item_state = "waiter"
 	worn_state = "waiter"
 
-/obj/item/clothing/under/rank/mailman
-	name = "mailman's jumpsuit"
-	desc = "<i>'Special delivery!'</i>"
-	icon_state = "mailman"
-	item_state = "b_suit"
-	worn_state = "mailman"
-
 /obj/item/clothing/under/sexyclown
 	name = "sexy-clown suit"
 	desc = "It makes you look HONKable!"
@@ -67,13 +53,6 @@
 	worn_state = "sexyclown"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
-/obj/item/clothing/under/rank/vice
-	name = "vice officer's jumpsuit"
-	desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision."
-	icon_state = "vice"
-	item_state = "gy_suit"
-	worn_state = "vice"
-
 //This set of uniforms looks fairly fancy and is generally used for high-ranking NT personnel from what I've seen, so lets give them appropriate ranks.
 /obj/item/clothing/under/rank/centcom
 	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Captain.\""
@@ -160,20 +139,6 @@
 	worn_state = "owl"
 	item_state = "owl"
 
-/obj/item/clothing/under/johnny
-	name = "johnny~~ jumpsuit"
-	desc = "Johnny~~"
-	icon_state = "johnny"
-	worn_state = "johnny"
-	item_state = "johnny"
-
-/obj/item/clothing/under/rainbow
-	name = "rainbow"
-	desc = "rainbow"
-	icon_state = "rainbow"
-	item_state = "rainbow"
-	worn_state = "rainbow"
-
 /obj/item/clothing/under/psysuit
 	name = "dark undersuit"
 	desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm."
@@ -182,13 +147,6 @@
 	worn_state = "psysuit"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 
-/obj/item/clothing/under/gentlesuit
-	name = "gentlemans suit"
-	desc = "A silk black shirt with a white tie and a matching gray vest and slacks. Feels proper."
-	icon_state = "gentlesuit"
-	item_state = "gy_suit"
-	worn_state = "gentlesuit"
-
 /obj/item/clothing/under/gimmick/rank/captain/suit
 	name = "captain's suit"
 	desc = "A green suit and yellow necktie. Exemplifies authority."
@@ -196,6 +154,13 @@
 	item_state = "dg_suit"
 	worn_state = "green_suit"
 
+/obj/item/clothing/under/overalls
+	name = "laborer's overalls"
+	desc = "A set of durable overalls for getting the job done."
+	icon_state = "overalls"
+	item_state = "lb_suit"
+	worn_state = "overalls"
+
 /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit
 	name = "head of personnel's suit"
 	desc = "A teal suit and yellow necktie. An authoritative yet tacky ensemble."
@@ -231,35 +196,6 @@
 	item_state = "r_suit"
 	worn_state = "red_suit"
 
-/obj/item/clothing/under/overalls
-	name = "laborer's overalls"
-	desc = "A set of durable overalls for getting the job done."
-	icon_state = "overalls"
-	item_state = "lb_suit"
-	worn_state = "overalls"
-
-/obj/item/clothing/under/pirate
-	name = "pirate outfit"
-	desc = "Yarr."
-	icon_state = "pirate"
-	item_state = "sl_suit"
-	worn_state = "pirate"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
-
-/obj/item/clothing/under/soviet
-	name = "soviet uniform"
-	desc = "For the Motherland!"
-	icon_state = "soviet"
-	item_state = "gy_suit"
-	worn_state = "soviet"
-
-/obj/item/clothing/under/redcoat
-	name = "redcoat uniform"
-	desc = "Looks old."
-	icon_state = "redcoat"
-	item_state = "r_suit"
-	worn_state = "redcoat"
-
 /obj/item/clothing/under/kilt
 	name = "kilt"
 	desc = "Includes shoes and plaid"
@@ -323,19 +259,6 @@
 	item_state = "y_suit"
 	worn_state = "dress_yellow"
 
-/obj/item/clothing/under/dress/dress_saloon
-	name = "saloon girl dress"
-	desc = "A old western inspired gown for the girl who likes to drink."
-	icon_state = "dress_saloon"
-	item_state = "p_suit"
-	worn_state = "dress_saloon"
-
-/obj/item/clothing/under/dress/dress_evening
-	name = "evening gown"
-	desc = "A silky gown, leaves much to the imagination"
-	icon_state = "red_evening_gown"
-	item_state = "red_evening_gown"
-
 /obj/item/clothing/under/dress/dress_cap
 	name = "captain's dress uniform"
 	desc = "Feminine fashion for the style concious captain."
@@ -352,59 +275,6 @@
 	worn_state = "dress_hop"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
-/obj/item/clothing/under/dress/dress_hr
-	name = "human resources director uniform"
-	desc = "Superior class for the nosy H.R. Director."
-	icon_state = "huresource"
-	item_state = "y_suit"
-	worn_state = "huresource"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
-
-//wedding stuff
-/obj/item/clothing/under/wedding/
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
-
-/obj/item/clothing/under/wedding/bride_orange
-	name = "orange wedding dress"
-	desc = "A big and puffy orange dress."
-	icon_state = "bride_orange"
-	item_state = "y_suit"
-	worn_state = "bride_orange"
-	flags_inv = HIDESHOES
-
-/obj/item/clothing/under/wedding/bride_purple
-	name = "purple wedding dress"
-	desc = "A big and puffy purple dress."
-	icon_state = "bride_purple"
-	item_state = "p_suit"
-	worn_state = "bride_purple"
-	flags_inv = HIDESHOES
-
-/obj/item/clothing/under/wedding/bride_blue
-	name = "blue wedding dress"
-	desc = "A big and puffy blue dress."
-	icon_state = "bride_blue"
-	item_state = "b_suit"
-	worn_state = "bride_blue"
-	flags_inv = HIDESHOES
-
-/obj/item/clothing/under/wedding/bride_red
-	name = "red wedding dress"
-	desc = "A big and puffy red dress."
-	icon_state = "bride_red"
-	item_state = "r_suit"
-	worn_state = "bride_red"
-	flags_inv = HIDESHOES
-
-/obj/item/clothing/under/wedding/bride_white
-	name = "silky wedding dress"
-	desc = "A white wedding gown made from the finest silk."
-	icon_state = "bride_white"
-	item_state = "nursesuit"
-	worn_state = "bride_white"
-	flags_inv = HIDESHOES
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO
-
 /obj/item/clothing/under/sundress
 	name = "sundress"
 	desc = "Makes you want to frolic in a field of daisies."
@@ -442,11 +312,6 @@
 	desc = "A red dress that sweeps to the side."
 	icon_state = "red_swept_dress"
 
-/obj/item/clothing/under/dress/westernbustle
-	name = "western bustle"
-	desc = "A western bustle dress from somewhere in the ancient history of Earth."
-	icon_state = "westernbustle"
-
 /obj/item/clothing/under/dress/blacktango
 	name = "black tango dress"
 	desc = "An earthen black tango dress."
@@ -482,13 +347,6 @@
 	item_state = "r_suit"
 	worn_state = "hos_formal_fem"
 
-/obj/item/clothing/under/assistantformal
-	name = "assistant's formal uniform"
-	desc = "An assistant's formal-wear. Why an assistant needs formal-wear is still unknown."
-	icon_state = "assistant_formal"
-	item_state = "gy_suit"
-	worn_state = "assistant_formal"
-
 /obj/item/clothing/under/suit_jacket/charcoal
 	name = "charcoal suit"
 	desc = "A charcoal suit and red tie. Very professional."
@@ -568,35 +426,6 @@
 	icon_state = "cheongsampurple"
 	item_state = "cheongsampurple"
 
-/obj/item/clothing/under/blazer
-	name = "blue blazer"
-	desc = "A bold but yet conservative outfit, red corduroys, navy blazer and a tie."
-	icon_state = "blue_blazer"
-	item_state = "blue_blazer"
-	worn_state = "blue_blazer"
-
-//stripper
-/obj/item/clothing/under/stripper
-	body_parts_covered = 0
-
-/obj/item/clothing/under/stripper/stripper_pink
-	name = "pink swimsuit"
-	desc = "A rather skimpy pink swimsuit."
-	icon_state = "stripper_p"
-	siemens_coefficient = 1
-
-/obj/item/clothing/under/stripper/stripper_green
-	name = "green swimsuit"
-	desc = "A rather skimpy green swimsuit."
-	icon_state = "stripper_g"
-	siemens_coefficient = 1
-
-/obj/item/clothing/under/stripper/mankini
-	name = "mankini"
-	desc = "No honest man would wear this abomination"
-	icon_state = "mankini"
-	siemens_coefficient = 1
-
 //swimsuit
 /obj/item/clothing/under/swimsuit
 	siemens_coefficient = 1
@@ -650,13 +479,6 @@
 	icon_state = "fancy_kimono"
 	item_state = "fancy_kimono"
 
-/obj/item/clothing/under/gov
-	name = "green formal uniform"
-	desc = "A neat proper uniform of someone on offical business. Plain, professional attire. The collar is <i>immaculately</i> starched."
-	icon_state = "greensuit"
-	item_state = "greensuit"
-	worn_state = "greensuit"
-
 /obj/item/clothing/under/medical_gown
 	name = "medical gown"
 	desc = "A loose pieces of clothing, commonly worn by medical patients."
@@ -709,15 +531,6 @@
 	armor = list(melee = 10, bullet = 5, laser = 5,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.7
 
-/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"
-	worn_state = "dispatch"
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
-	siemens_coefficient = 0.7
-
 /obj/item/clothing/under/lance
 	name = "ceres lance fatigues"
 	desc = "A set of drab fatigues meant to be worn by the Ceres' Lance Regiment, with their emblem found on the shoulder."
@@ -768,15 +581,6 @@
 	item_state = "cropdress_s"
 	worn_state = "cropdress"
 
-
-/obj/item/clothing/under/formalblouse
-	name = "formal blouse"
-	desc = "A formal, office-style blouse, with a black skirt in addition."
-	icon_state = "formalblouse"
-	item_state = "formalblouse_s"
-	worn_state = "formalblouse"
-
-
 /obj/item/clothing/under/croptop
 	name = "crop top"
 	desc = "Light shirt which shows the midsection of the wearer."

code/modules/item_worth/worths_list.dm

@@ -501,7 +501,6 @@ var/list/worths = list(
 					/obj/item/clothing/suit/armor/centcomm = 2000,
 					/obj/item/clothing/suit/armor/heavy = 1000,
 					/obj/item/clothing/suit/armor/hos = 1000,
-					/obj/item/clothing/suit/storage/toggle/armor/hos/jensen = 1000,
 					/obj/item/clothing/suit/armor/tactical = 1500,
 					/obj/item/clothing/suit/armor = 500,
 					/obj/item/clothing/suit/bio_suit = 150,

code/modules/mining/abandonedcrates.dm

@@ -107,7 +107,6 @@
 		if(88)
 			new /obj/item/gun/projectile/shotgun/pump/rifle(src)
 			new /obj/item/ammo_magazine/boltaction(src)
-			new /obj/item/clothing/under/soviet(src)
 			new /obj/item/clothing/head/ushanka/grey(src)
 		if(89)
 			new /obj/item/stack/material/animalhide/xeno(src)
@@ -152,7 +151,6 @@
 			new /obj/item/ammo_magazine/mc10mm(src)
 			new /obj/item/ammo_magazine/mc10mm(src)
 			new /obj/item/ammo_magazine/mc10mm/rubber(src)
-			new /obj/item/clothing/under/rank/dispatch(src)
 			new /obj/item/clothing/accessory/badge/old(src)
 			new /obj/item/clothing/head/helmet/formalcaptain(src)
 

code/modules/mob/living/carbon/human/human_species.dm

@@ -179,7 +179,6 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
 		mind.name = real_name
 	status_flags |= NO_ANTAG
 
-	equip_to_slot_or_del(new /obj/item/clothing/under/assistantformal(src), slot_w_uniform)
 	equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
 	equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(src), slot_shoes)
 	equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_com(src), slot_l_ear)
@@ -249,7 +248,6 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
 		mind.name = real_name
 	status_flags |= NO_ANTAG
 
-	equip_to_slot_or_del(new /obj/item/clothing/under/assistantformal(src), slot_w_uniform)
 	equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
 	equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(src), slot_shoes)
 	equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_com(src), slot_l_ear)

code/modules/mob/living/simple_animal/corpse.dm

@@ -134,7 +134,6 @@
 
 /obj/effect/landmark/mobcorpse/pirate
 	name = "Pirate"
-	corpseuniform = /obj/item/clothing/under/pirate
 	corpseshoes = /obj/item/clothing/shoes/jackboots
 	corpseglasses = /obj/item/clothing/glasses/eyepatch
 	corpsehelmet = /obj/item/clothing/head/bandana
@@ -150,7 +149,6 @@
 
 /obj/effect/landmark/mobcorpse/russian
 	name = "Russian"
-	corpseuniform = /obj/item/clothing/under/soviet
 	corpseshoes = /obj/item/clothing/shoes/jackboots
 	corpsehelmet = /obj/item/clothing/head/bearpelt
 

html/changelogs/wezzy_remove_kebab.yml

@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscdel: "Removes unused/superfluous uniforms."

maps/aurora/aurora-1_centcomm.dmm

@@ -11738,7 +11738,6 @@
 /area/centcom/spawning)
 "aIV" = (
 /obj/structure/table/rack,
-/obj/item/clothing/under/vox/vox_casual,
 /obj/item/clothing/shoes/magboots/vox,
 /obj/item/clothing/gloves/yellow/vox,
 /obj/item/clothing/suit/space/vox/stealth,
@@ -11838,7 +11837,6 @@
 /area/centcom/holding)
 "aJj" = (
 /obj/structure/table/rack,
-/obj/item/clothing/under/vox/vox_casual,
 /obj/item/clothing/shoes/magboots/vox,
 /obj/item/clothing/gloves/yellow/vox,
 /obj/item/clothing/suit/space/vox/carapace,
@@ -12096,7 +12094,6 @@
 /area/centcom/spawning)
 "aJJ" = (
 /obj/structure/table/rack,
-/obj/item/clothing/under/vox/vox_casual,
 /obj/item/clothing/shoes/magboots/vox,
 /obj/item/clothing/gloves/yellow/vox,
 /obj/item/clothing/suit/space/vox/medic,
@@ -12408,7 +12405,6 @@
 /area/centcom/spawning)
 "aKq" = (
 /obj/structure/table/rack,
-/obj/item/clothing/under/vox/vox_robes,
 /obj/item/clothing/shoes/magboots/vox,
 /obj/item/clothing/gloves/yellow/vox,
 /obj/item/clothing/suit/space/vox/pressure,
@@ -12753,7 +12749,6 @@
 /area/shuttle/arrival/centcom)
 "aLl" = (
 /obj/structure/table/rack,
-/obj/item/clothing/under/vox/vox_robes,
 /obj/item/clothing/shoes/magboots/vox,
 /obj/item/clothing/gloves/yellow/vox,
 /obj/item/clothing/suit/space/vox/carapace,
@@ -15458,7 +15453,6 @@
 	icon_opened = "cabinet_open";
 	icon_state = "cabinet_closed"
 	},
-/obj/item/clothing/under/psysuit,
 /obj/item/clothing/suit/wizrobe/psypurple,
 /obj/item/clothing/head/wizard/amp,
 /obj/effect/decal/cleanable/cobweb2{
@@ -15512,7 +15506,6 @@
 	desc = "A set of fancy shoes that are as functional as they are comfortable.";
 	name = "Gentlemans Shoes"
 	},
-/obj/item/clothing/under/gentlesuit,
 /obj/item/clothing/head/wizard/cap,
 /obj/item/clothing/suit/storage/toggle/wizrobe/gentlecoat,
 /obj/item/staff/gentcane,
@@ -28493,11 +28486,9 @@
 	dir = 8
 	},
 /obj/structure/closet/cabinet,
-/obj/item/clothing/under/pirate,
 /obj/item/clothing/under/pants/tacticool,
 /obj/item/clothing/under/color/black,
 /obj/item/clothing/under/color/pink,
-/obj/item/clothing/under/captain_fly,
 /obj/item/clothing/under/unathi,
 /obj/item/clothing/suit/unathi/mantle,
 /obj/item/clothing/accessory/poncho,

maps/exodus/exodus-2_centcomm.dmm

@@ -106,7 +106,6 @@
 /area/holodeck/source_picnicarea)
 "abx" = (
 /obj/structure/table/rack/holorack,
-/obj/item/clothing/under/dress/dress_saloon,
 /obj/item/clothing/head/pin/flower,
 /turf/simulated/floor/holofloor/tiled/dark,
 /area/holodeck/source_theatre)
@@ -7769,7 +7768,6 @@
 /area/shuttle/escape/centcom)
 "aBS" = (
 /obj/structure/table/rack,
-/obj/item/clothing/under/vox/vox_casual,
 /obj/item/clothing/shoes/magboots/vox,
 /obj/item/clothing/gloves/yellow/vox,
 /obj/item/clothing/suit/space/vox/stealth,
@@ -7927,7 +7925,6 @@
 /area/shuttle/escape/centcom)
 "aCq" = (
 /obj/structure/table/rack,
-/obj/item/clothing/under/vox/vox_casual,
 /obj/item/clothing/shoes/magboots/vox,
 /obj/item/clothing/gloves/yellow/vox,
 /obj/item/clothing/suit/space/vox/carapace,
@@ -7962,7 +7959,6 @@
 /area/centcom/creed)
 "aCz" = (
 /obj/structure/table/rack,
-/obj/item/clothing/under/vox/vox_casual,
 /obj/item/clothing/shoes/magboots/vox,
 /obj/item/clothing/gloves/yellow/vox,
 /obj/item/clothing/suit/space/vox/medic,
@@ -8011,7 +8007,6 @@
 	})
 "aCH" = (
 /obj/structure/table/rack,
-/obj/item/clothing/under/vox/vox_robes,
 /obj/item/clothing/shoes/magboots/vox,
 /obj/item/clothing/gloves/yellow/vox,
 /obj/item/clothing/suit/space/vox/pressure,
@@ -8095,7 +8090,6 @@
 /area/centcom/specops)
 "aCV" = (
 /obj/structure/table/rack,
-/obj/item/clothing/under/vox/vox_robes,
 /obj/item/clothing/shoes/magboots/vox,
 /obj/item/clothing/gloves/yellow/vox,
 /obj/item/clothing/suit/space/vox/carapace,
@@ -10193,7 +10187,6 @@
 	icon_opened = "cabinet_open";
 	icon_state = "cabinet_closed"
 	},
-/obj/item/clothing/under/psysuit,
 /obj/item/clothing/suit/wizrobe/psypurple,
 /obj/item/clothing/head/wizard/amp,
 /turf/unsimulated/floor{
@@ -10211,7 +10204,6 @@
 	desc = "A set of fancy shoes that are as functional as they are comfortable.";
 	name = "Gentlemans Shoes"
 	},
-/obj/item/clothing/under/gentlesuit,
 /obj/item/clothing/head/wizard/cap,
 /obj/item/staff/gentcane,
 /obj/item/clothing/suit/storage/toggle/wizrobe/gentlecoat,