Several fixes/additions. Will list in pull request.

2025-12-11 10:43:20 +00:00 · 2011-12-18 20:56:39 -07:00
parent 9afbbfb2d3
commit 1c67be2707
32 changed files with 9722 additions and 66 deletions
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -622,6 +622,7 @@
 #include "code\game\objects\items\weapons\cigs_lighters.dm"
 #include "code\game\objects\items\weapons\clown_items.dm"
 #include "code\game\objects\items\weapons\dna_injector.dm"
+#include "code\game\objects\items\weapons\evidence.dm"
 #include "code\game\objects\items\weapons\explosives.dm"
 #include "code\game\objects\items\weapons\flamethrower.dm"
 #include "code\game\objects\items\weapons\grenades.dm"
@@ -670,6 +671,7 @@
 #include "code\game\objects\storage\belt.dm"
 #include "code\game\objects\storage\bible.dm"
 #include "code\game\objects\storage\briefcase.dm"
+#include "code\game\objects\storage\coat.dm"
 #include "code\game\objects\storage\crates.dm"
 #include "code\game\objects\storage\firstaid.dm"
 #include "code\game\objects\storage\kit.dm"
--- a/code/WorkInProgress/detective_work.dm
+++ b/code/WorkInProgress/detective_work.dm
@@ -132,9 +132,14 @@ obj/machinery/computer/forensic_scanning
 				var/mob/M = usr
 				var/obj/item/I = M.equipped()
 				if(I && istype(I))
-					scanning = I
-					M.drop_item()
-					I.loc = src
+					if(istype(I, /obj/item/weapon/evidencebag))
+						scanning = I.contents[1]
+						scanning.loc = src
+						I.underlays -= scanning
+					else
+						scanning = I
+						M.drop_item()
+						I.loc = src
 				else
 					temp = "Invalid Object Rejected."
 			if("scan")
--- a/code/defines/obj/clothing/costume.dm
+++ b/code/defines/obj/clothing/costume.dm
@@ -15,7 +15,7 @@
 /obj/effect/landmark/costume/madscientist/New()
 	new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
 	new /obj/item/clothing/head/flatcap(src.loc)
-	new /obj/item/clothing/suit/labcoat/mad(src.loc)
+	new /obj/item/clothing/suit/storage/labcoat/mad(src.loc)
 	new /obj/item/clothing/glasses/gglasses(src.loc)
 	del(src)

@@ -39,7 +39,7 @@
 	del(src)

 /obj/effect/landmark/costume/butler/New()
-	new /obj/item/clothing/suit/wcoat(src.loc)
+	new /obj/item/clothing/suit/storage/wcoat(src.loc)
 	new /obj/item/clothing/under/suit_jacket(src.loc)
 	new /obj/item/clothing/head/that(src.loc)
 	del(src)
@@ -58,7 +58,7 @@
 	del(src)

 /obj/effect/landmark/costume/prig/New()
-	new /obj/item/clothing/suit/wcoat(src.loc)
+	new /obj/item/clothing/suit/storage/wcoat(src.loc)
 	new /obj/item/clothing/glasses/monocle(src.loc)
 	var/CHOICE= pick( /obj/item/clothing/head/bowler, /obj/item/clothing/head/that)
 	new CHOICE(src.loc)
@@ -82,7 +82,7 @@
 	new /obj/item/clothing/under/waiter(src.loc)
 	var/CHOICE= pick( /obj/item/clothing/head/kitty, /obj/item/clothing/head/rabbitears)
 	new CHOICE(src.loc)
-	new /obj/item/clothing/suit/apron(src.loc)
+	new /obj/item/clothing/suit/storage/apron(src.loc)
 	del(src)

 /obj/effect/landmark/costume/pirate/New()
--- a/code/defines/obj/supplypacks.dm
+++ b/code/defines/obj/supplypacks.dm
@@ -285,7 +285,7 @@
 					"/obj/item/weapon/minihoe",
 					"/obj/item/device/analyzer/plant_analyzer",
 					"/obj/item/clothing/gloves/botanic_leather",
-					"/obj/item/clothing/suit/apron") // Updated with new things
+					"/obj/item/clothing/suit/storage/apron") // Updated with new things
 	cost = 10
 	containertype = /obj/structure/closet/crate/hydroponics
 	containername = "Hydroponics crate"
--- a/code/defines/obj/vending.dm
+++ b/code/defines/obj/vending.dm
@@ -158,8 +158,8 @@
 	icon_state = "sec"
 	icon_deny = "sec-deny"
 	req_access_txt = "1"
-	product_paths = "/obj/item/weapon/handcuffs;/obj/item/weapon/flashbang;/obj/item/device/flash;/obj/item/weapon/reagent_containers/food/snacks/donut"
-	product_amounts = "8;4;5;12"
+	product_paths = "/obj/item/weapon/handcuffs;/obj/item/weapon/flashbang;/obj/item/device/flash;/obj/item/weapon/reagent_containers/food/snacks/donut;/obj/item/weapon/evidencebag"
+	product_amounts = "8;4;5;12;6"
 	product_hidden = "/obj/item/clothing/glasses/sunglasses;/obj/item/kitchen/donut_box"
 	product_hideamt = "2;2"
 	charge_type = "security"
@@ -205,7 +205,7 @@
 	name = "Dinnerware"
 	desc = "A kitchen and restaurant equipment vendor"
 	icon_state = "dinnerware"
-	product_paths = "/obj/item/weapon/tray;/obj/item/weapon/kitchen/utensil/fork;/obj/item/weapon/kitchenknife;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass;/obj/item/clothing/suit/chef/classic"
+	product_paths = "/obj/item/weapon/tray;/obj/item/weapon/kitchen/utensil/fork;/obj/item/weapon/kitchenknife;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass;/obj/item/clothing/suit/storage/chef/classic"
 	product_amounts = "8;6;3;8;2"
 	//product_amounts = "8;5;4" Old totals
 	product_hidden = "/obj/item/weapon/kitchen/utensil/spoon;/obj/item/weapon/kitchen/utensil/knife;/obj/item/weapon/kitchen/rollingpin;/obj/item/weapon/butch"
--- a/code/game/jobs/job/civilian.dm
+++ b/code/game/jobs/job/civilian.dm
@@ -39,7 +39,7 @@
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/clothing/under/rank/chef(H), H.slot_w_uniform)
-		H.equip_if_possible(new /obj/item/clothing/suit/chef(H), H.slot_wear_suit)
+		H.equip_if_possible(new /obj/item/clothing/suit/storage/chef(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/clothing/head/chefhat(H), H.slot_head)
 		return 1
@@ -60,7 +60,7 @@
 		H.equip_if_possible(new /obj/item/clothing/under/rank/hydroponics(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/clothing/gloves/botanic_leather(H), H.slot_gloves)
-		H.equip_if_possible(new /obj/item/clothing/suit/apron(H), H.slot_wear_suit)
+		H.equip_if_possible(new /obj/item/clothing/suit/storage/apron(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/device/analyzer/plant_analyzer(H), H.slot_s_store)
 		return 1

--- a/code/game/jobs/job/engineering.dm
+++ b/code/game/jobs/job/engineering.dm
@@ -80,7 +80,7 @@
 		H.equip_if_possible(new /obj/item/clothing/under/rank/roboticist(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/engineering(H), H.slot_belt)
-		H.equip_if_possible(new /obj/item/clothing/suit/labcoat(H), H.slot_wear_suit)
+		H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves)
 		H.equip_if_possible(new /obj/item/weapon/storage/toolbox/mechanical(H), H.slot_l_hand)
 		return 1
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -14,7 +14,7 @@
 		H.equip_if_possible(new /obj/item/clothing/under/rank/chief_medical_officer(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/heads/cmo(H), H.slot_belt)
-		H.equip_if_possible(new /obj/item/clothing/suit/labcoat/cmo(H), H.slot_wear_suit)
+		H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat/cmo(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/weapon/storage/firstaid/regular(H), H.slot_l_hand)
 		H.equip_if_possible(new /obj/item/device/flashlight/pen(H), H.slot_s_store)
 		return 1
@@ -37,7 +37,7 @@
 		H.equip_if_possible(new /obj/item/clothing/under/rank/medical(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/medical(H), H.slot_belt)
-		H.equip_if_possible(new /obj/item/clothing/suit/labcoat(H), H.slot_wear_suit)
+		H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/weapon/storage/firstaid/regular(H), H.slot_l_hand)
 		H.equip_if_possible(new /obj/item/device/flashlight/pen(H), H.slot_s_store)
 		return 1
@@ -60,7 +60,7 @@
 		H.equip_if_possible(new /obj/item/clothing/under/rank/geneticist(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/medical(H), H.slot_belt)
-		H.equip_if_possible(new /obj/item/clothing/suit/labcoat/genetics(H), H.slot_wear_suit)
+		H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat/genetics(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/device/flashlight/pen(H), H.slot_s_store)
 		return 1

@@ -83,7 +83,7 @@
 		H.equip_if_possible(new /obj/item/device/pda/medical(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/mask/surgical(H), H.slot_wear_mask)
 		H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes)
-		H.equip_if_possible(new /obj/item/clothing/suit/labcoat/virologist(H), H.slot_wear_suit)
+		H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat/virologist(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/device/flashlight/pen(H), H.slot_s_store)
 		return 1

--- a/code/game/jobs/job/science.dm
+++ b/code/game/jobs/job/science.dm
@@ -13,7 +13,7 @@
 		H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/research_director(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/device/pda/heads/rd(H), H.slot_belt)
-		H.equip_if_possible(new /obj/item/clothing/suit/labcoat(H), H.slot_wear_suit)
+		H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/weapon/clipboard(H), H.slot_r_hand)
 		return 1

@@ -34,7 +34,7 @@
 		H.equip_if_possible(new /obj/item/clothing/under/rank/scientist(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/toxins(H), H.slot_belt)
-		H.equip_if_possible(new /obj/item/clothing/suit/labcoat/science(H), H.slot_wear_suit)
+		H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat/science(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/mask/gas(H), H.slot_wear_mask)
 		H.equip_if_possible(new /obj/item/weapon/tank/oxygen(H), H.slot_l_hand)
 		return 1
@@ -56,5 +56,5 @@
 		H.equip_if_possible(new /obj/item/clothing/under/rank/chemist(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/toxins(H), H.slot_belt)
-		H.equip_if_possible(new /obj/item/clothing/suit/labcoat/chemist(H), H.slot_wear_suit)
+		H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat/chemist(H), H.slot_wear_suit)
 		return 1
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -12,9 +12,11 @@
 		H.equip_if_possible(new /obj/item/weapon/storage/backpack/security (H), H.slot_back)
 		H.equip_if_possible(new /obj/item/device/radio/headset/heads/hos(H), H.slot_ears)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/head_of_security(H), H.slot_w_uniform)
+		H.equip_if_possible(new /obj/item/clothing/suit/storage/armourrigvest(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/heads/hos(H), H.slot_belt)
-		H.equip_if_possible(new /obj/item/clothing/suit/armor/hos(H), H.slot_wear_suit)
+//		H.equip_if_possible(new /obj/item/clothing/suit/armor/hos(H), H.slot_wear_suit)
+//We're Bay12, not Goon.  We don't need armor 24/7
 		H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves)
 		H.equip_if_possible(new /obj/item/clothing/head/helmet/HoS(H), H.slot_head)
 		H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses/sechud(H), H.slot_glasses)
@@ -69,6 +71,7 @@
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/device/radio/headset/headset_sec(H), H.slot_ears)
 		H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
+		H.equip_if_possible(new /obj/item/weapon/storage/box/evidence(H.back), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/clothing/under/det(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/detective(H), H.slot_belt)
@@ -80,7 +83,7 @@
 		H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves)
 		H.equip_if_possible(new /obj/item/weapon/storage/fcard_kit(H.back), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/weapon/fcardholder(H), H.slot_in_backpack)
-		H.equip_if_possible(new /obj/item/clothing/suit/det_suit(H), H.slot_wear_suit)
+		H.equip_if_possible(new /obj/item/clothing/suit/storage/det_suit(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/device/detective_scanner(H), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/weapon/zippo(H), H.slot_l_store)
 //		H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/snacks/candy_corn(H), H.slot_h_store)
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -228,6 +228,7 @@ var/global/datum/controller/occupations/job_master
 		H.equip_if_possible(new /obj/item/device/radio/headset(H), H.slot_ears)
 		var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(H)
 		H.equip_if_possible(BPK, H.slot_back,1)
+		H.equip_if_possible(new /obj/item/weapon/storage/box(H.back), H.slot_in_backpack)
 		return 1


--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -43,6 +43,9 @@
 								background = "'background-color:#3BB9FF;'"
 							if("None")
 								background = "'background-color:#00FF7F;'"
+							if("")
+								background = "'background-color:#FFFFFF;'"
+								crimstat = "No Record."
 						dat += text("<tr style=[]><td><A href='?src=\ref[];choice=Browse Record;d_rec=\ref[]'>[] (ID:[])</a></td>", background, src, R, R.fields["name"], R.fields["id"])
 						dat += text("<td>[]</td>", R.fields["rank"])
 						dat += text("<td>[]</td>", R.fields["fingerprint"])
--- a/code/game/objects/closets/gmcloset.dm
+++ b/code/game/objects/closets/gmcloset.dm
@@ -7,7 +7,7 @@
 	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/suit/wcoat(src)
-	new /obj/item/clothing/suit/wcoat(src)
+	new /obj/item/clothing/suit/storage/wcoat(src)
+	new /obj/item/clothing/suit/storage/wcoat(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/shoes/black(src)
--- a/code/game/objects/closets/secure/medical.dm
+++ b/code/game/objects/closets/secure/medical.dm
@@ -63,7 +63,7 @@
 		new /obj/item/clothing/under/rank/nursesuit (src)
 		new /obj/item/clothing/head/nursehat (src)
 		new /obj/item/clothing/under/rank/medical(src)
-		new /obj/item/clothing/suit/labcoat(src)
+		new /obj/item/clothing/suit/storage/labcoat(src)
 		new /obj/item/clothing/shoes/white(src)
 		new /obj/item/device/radio/headset/headset_med(src)
 		new /obj/item/weapon/storage/belt/medical(src)
@@ -82,7 +82,7 @@
 		new /obj/item/clothing/suit/bio_suit/cmo(src)
 		new /obj/item/clothing/head/bio_hood/general(src)
 		new /obj/item/clothing/under/rank/chief_medical_officer(src)
-		new /obj/item/clothing/suit/labcoat/cmo(src)
+		new /obj/item/clothing/suit/storage/labcoat/cmo(src)
 		new /obj/item/clothing/gloves/latex(src)
 		new /obj/item/clothing/shoes/brown	(src)
 		new /obj/item/device/radio/headset/heads/cmo(src)
--- a/code/game/objects/closets/secure/scientist.dm
+++ b/code/game/objects/closets/secure/scientist.dm
@@ -7,7 +7,7 @@
 		..()
 		sleep(2)
 		new /obj/item/clothing/under/rank/scientist(src)
-		new /obj/item/clothing/suit/labcoat(src)
+		new /obj/item/clothing/suit/storage/labcoat(src)
 		new /obj/item/clothing/shoes/white(src)
 		new /obj/item/device/radio/headset/headset_sci(src)
 		new /obj/item/weapon/tank/air(src)
@@ -27,7 +27,7 @@
 		new /obj/item/clothing/suit/bio_suit/scientist(src)
 		new /obj/item/clothing/head/bio_hood/scientist(src)
 		new /obj/item/clothing/under/rank/research_director(src)
-		new /obj/item/clothing/suit/labcoat(src)
+		new /obj/item/clothing/suit/storage/labcoat(src)
 		new /obj/item/clothing/shoes/white(src)
 		new /obj/item/clothing/gloves/latex(src)
 		new /obj/item/device/radio/headset/heads/rd(src)
--- a/code/game/objects/closets/secure/security.dm
+++ b/code/game/objects/closets/secure/security.dm
@@ -6,7 +6,7 @@
 	New()
 		..()
 		sleep(2)
-		new /obj/item/clothing/suit/captunic(src)
+		new /obj/item/clothing/suit/storage/captunic(src)
 		new /obj/item/clothing/head/helmet/cap(src)
 		new /obj/item/clothing/under/rank/captain(src)
 		new /obj/item/clothing/suit/armor/vest(src)
@@ -76,6 +76,7 @@
 		sleep(2)
 		new /obj/item/clothing/under/rank/warden(src)
 		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/clothing/suit/storage/gearharness(src)
 		new /obj/item/clothing/head/helmet/warden(src)
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/weapon/storage/flashbang_kit(src)
@@ -96,6 +97,7 @@
 		..()
 		sleep(2)
 		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/clothing/suit/storage/gearharness(src)
 		new /obj/item/clothing/head/helmet(src)
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/weapon/storage/belt/security(src)
@@ -125,7 +127,7 @@
 		sleep(2)
 		new /obj/item/clothing/under/det(src)
 		new /obj/item/clothing/suit/det_suit/armor(src)
-		new /obj/item/clothing/suit/det_suit(src)
+		new /obj/item/clothing/suit/storage/det_suit(src)
 		new /obj/item/clothing/gloves/black(src)
 		new /obj/item/clothing/head/det_hat(src)
 		new /obj/item/clothing/shoes/brown(src)
@@ -135,6 +137,7 @@
 		new /obj/item/weapon/clipboard(src)
 		new /obj/item/device/detective_scanner(src)
 		new /obj/item/weapon/pepperspray/small(src)
+		new /obj/item/weapon/storage/box/evidence(src)
 		return


--- a/code/game/objects/closets/wardrobe.dm
+++ b/code/game/objects/closets/wardrobe.dm
@@ -48,7 +48,7 @@
 	new /obj/item/clothing/under/rank/chaplain(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/suit/nun(src)
-	new /obj/item/clothing/suit/chaplain_hoodie(src)
+	new /obj/item/clothing/suit/storage/chaplain_hoodie(src)
 	new /obj/item/clothing/head/chaplain_hood(src)
 	new /obj/item/clothing/suit/holidaypriest(src)
 	new /obj/item/clothing/suit/hastur (src)
@@ -116,9 +116,9 @@
 	new /obj/item/clothing/under/rank/scientist(src)
 	new /obj/item/clothing/under/rank/scientist(src)
 	new /obj/item/clothing/under/rank/scientist(src)
-	new /obj/item/clothing/suit/labcoat(src)
-	new /obj/item/clothing/suit/labcoat(src)
-	new /obj/item/clothing/suit/labcoat(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/shoes/white(src)
@@ -133,9 +133,9 @@
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/weapon/storage/stma_kit(src)
-	new /obj/item/clothing/suit/labcoat(src)
-	new /obj/item/clothing/suit/labcoat(src)
-	new /obj/item/clothing/suit/labcoat(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
 	return

 /obj/structure/closet/wardrobe/grey/New()
--- a/code/game/objects/effect_system.dm
+++ b/code/game/objects/effect_system.dm
@@ -618,7 +618,7 @@ steam.start() -- spawns the effect
 /obj/effect/effect/mustard_gas/Move()
 	..()
 	for(var/mob/living/carbon/human/R in get_turf(src))
-		if (R.internal != null && usr.wear_mask && (R.wear_mask.flags & MASKINTERNALS) && R.wear_suit != null && !istype(R.wear_suit, /obj/item/clothing/suit/labcoat) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket && !istype(R.wear_suit, /obj/item/clothing/suit/armor)))
+		if (R.internal != null && usr.wear_mask && (R.wear_mask.flags & MASKINTERNALS) && R.wear_suit != null && !istype(R.wear_suit, /obj/item/clothing/suit/storage/labcoat) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket && !istype(R.wear_suit, /obj/item/clothing/suit/armor)))
 		else
 			R.burn_skin(0.75)
 			if (R.coughedtime != 1)
@@ -632,7 +632,7 @@ steam.start() -- spawns the effect
 /obj/effect/effect/mustard_gas/HasEntered(mob/living/carbon/human/R as mob )
 	..()
 	if (istype(R, /mob/living/carbon/human))
-		if (R.internal != null && usr.wear_mask && (R.wear_mask.flags & MASKINTERNALS) && R.wear_suit != null && !istype(R.wear_suit, /obj/item/clothing/suit/labcoat) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket && !istype(R.wear_suit, /obj/item/clothing/suit/armor)))
+		if (R.internal != null && usr.wear_mask && (R.wear_mask.flags & MASKINTERNALS) && R.wear_suit != null && !istype(R.wear_suit, /obj/item/clothing/suit/storage/labcoat) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket) && !istype(R.wear_suit, /obj/item/clothing/suit/straight_jacket && !istype(R.wear_suit, /obj/item/clothing/suit/armor)))
 			return
 		R.burn_skin(0.75)
 		if (R.coughedtime != 1)
--- a/code/game/objects/items/clothing.dm
+++ b/code/game/objects/items/clothing.dm
@@ -302,7 +302,7 @@ THERMAL GLASSES
 	else
 		usr << "Sorry! The suit you're wearing doesn't have buttons!"

-/obj/item/clothing/suit/labcoat/verb/toggle()
+/obj/item/clothing/suit/storage/labcoat/verb/toggle()
 	set name = "Toggle Labcoat Buttons"
 	set category = "Object"
 	if(src.icon_state == "labcoat_open")
--- a/code/game/objects/items/weapons/evidence.dm
+++ b/code/game/objects/items/weapons/evidence.dm
@@ -0,0 +1,54 @@
+//CONTAINS:
+//Evidence bags and stuff
+///////////
+//Shamelessly ripped from Mini's old code.
+
+/obj/item/weapon/evidencebag
+	name = "evidence bag"
+	desc = "An empty evidence bag."
+	icon = 'storage.dmi'
+	icon_state = "evidenceobj"
+
+/* buggy and stuff
+/obj/item/weapon/evidencebag/attackby(obj/item/weapon/O, mob/user as mob)
+	return src.afterattack(O, user)
+*/
+
+/obj/item/weapon/evidencebag/afterattack(obj/item/O, mob/user as mob)
+
+//Now you can put it into a briefcase, if it is in your hand.  Otherwise, if it is evidence on the ground, it picks it up.
+	if(istype(O, /obj/item/weapon/storage) && O in user)
+		user << "You put the evidence bag into the [O]."
+		return ..()
+	if(!(O && istype(O)) || O.anchored == 1)
+		user << "You can't put that inside the [src]!"
+		return ..()
+	if(src.contents.len > 0)
+		user << "The [src] already has something inside it."
+		return ..()
+	user << "You put the [O] inside the [src]."
+	O.loc = src
+	icon_state = "evidence"
+	src.underlays += O
+	desc = "An evidence bag containing \a [O]. [O.desc]"
+
+/obj/item/weapon/evidencebag/attack_self(mob/user as mob)
+	var/obj/item/I = src.contents[1]
+	user << "You take the [I] out of the [src]."
+	I.loc = user.loc
+	src.underlays -= I
+	icon_state = "evidenceobj"
+
+/obj/item/weapon/storage/box/evidence
+	name = "evidence bag box"
+	desc = "A box claiming to contain evidence bags."
+	New()
+		new /obj/item/weapon/evidencebag(src)
+		new /obj/item/weapon/evidencebag(src)
+		new /obj/item/weapon/evidencebag(src)
+		new /obj/item/weapon/evidencebag(src)
+		new /obj/item/weapon/evidencebag(src)
+		new /obj/item/weapon/evidencebag(src)
+		new /obj/item/weapon/evidencebag(src)
+		..()
+		return
--- a/code/game/objects/storage/coat.dm
+++ b/code/game/objects/storage/coat.dm
@@ -0,0 +1,215 @@
+
+/obj/item/clothing/suit/storage/
+	var/obj/screen/storage/boxes
+	var/obj/screen/close/closer
+	var/obj/slot1
+	var/obj/slot2
+
+/obj/item/clothing/suit/storage/New()
+	src.boxes = new /obj/screen/storage(  )
+	src.boxes.name = "storage"
+	src.boxes.master = src
+	src.boxes.icon_state = "block"
+	src.boxes.screen_loc = "7,7 to 9,7"
+	src.boxes.layer = 19
+	src.closer = new /obj/screen/close(  )
+	src.closer.master = src
+	src.closer.icon_state = "x"
+	src.closer.layer = 20
+	src.closer.screen_loc = "9,7"
+
+/obj/item/clothing/suit/storage/proc/view_inv(mob/user as mob)
+	if(!user)
+		return
+	user.client.screen += src.boxes
+	user.client.screen += src.closer
+	user.client.screen += src.contents
+	var/xs = 7
+	var/ys = 7
+	for(var/obj/O in src.contents)
+		O.screen_loc = "[xs],[ys]"
+		O.layer = 20
+		xs++
+
+/obj/item/clothing/suit/storage/proc/close(mob/user as mob)
+	if(!user)
+		return
+	user.s_active = src
+	user.client.screen -= src.boxes
+	user.client.screen -= src.closer
+	user.client.screen -= src.contents
+
+/obj/item/clothing/suit/storage/MouseDrop(atom/A)
+	if(istype(A,/mob/living/carbon))
+		src.view_inv(A)
+
+/obj/item/clothing/suit/storage/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(W.w_class > 2 || src.loc == W )
+		return
+	if(src.contents.len >= 2)
+		user << "You have nowhere to place that"
+		return
+	user.u_equip(W)
+	W.loc = src
+	if ((user.client && user.s_active != src))
+		user.client.screen -= W
+	else if(user.s_active == src)
+		close(user)
+		view_inv(user)
+	W.dropped(user)
+/*/obj/item/clothing/suit/storage/New()
+
+	src.boxes = new /obj/screen/storage(  )
+	src.boxes.name = "storage"
+	src.boxes.master = src
+	src.boxes.icon_state = "block"
+	src.boxes.screen_loc = "7,7 to 10,8"
+	src.boxes.layer = 19
+	src.closer = new /obj/screen/close(  )
+	src.closer.master = src
+	src.closer.icon_state = "x"
+	src.closer.layer = 20
+	spawn( 5 )
+		src.orient_objs(7, 8, 10, 7)
+		return
+	return
+
+/obj/item/clothing/suit/storage/attackby(obj/item/weapon/W as obj, mob/user as mob)
+
+	if(can_hold.len)
+		var/ok = 0
+		for(var/A in can_hold)
+			if(istype(W, text2path(A) )) ok = 1
+		if(!ok)
+			user << "\red This container cannot hold [W]."
+			return
+
+	if (src.contents.len >= 7)
+		return
+	if ((W.w_class >= 3 || istype(W, /obj/item/weapon/storage) || src.loc == W))
+		return
+	user.u_equip(W)
+	W.loc = src
+	if ((user.client && user.s_active != src))
+		user.client.screen -= W
+	src.orient2hud(user)
+	W.dropped(user)
+	add_fingerprint(user)
+	if (istype(W, /obj/item/weapon/gun/energy/crossbow)) return //STEALTHY
+	for(var/mob/O in viewers(user, null))
+		O.show_message(text("\blue [] has added [] to []!", user, W, src), 1)
+		//Foreach goto(139)
+	return
+
+/obj/item/clothing/suit/storage/dropped(mob/user as mob)
+	src.orient_objs(7, 8, 10, 7)
+	return
+
+/obj/item/clothing/suit/storage/MouseDrop(over_object, src_location, over_location)
+	..()
+	if ((over_object == usr && (in_range(src, usr) || usr.contents.Find(src))))
+		if (usr.s_active)
+			usr.s_active.close(usr)
+		src.show_to(usr)
+	return
+
+/obj/item/clothing/suit/storage/attack_paw(mob/user as mob)
+	playsound(src.loc, "rustle", 50, 1, -5)
+	return src.attack_hand(user)
+	return
+
+/obj/item/clothing/suit/storage/attack_hand(mob/user as mob)
+	playsound(src.loc, "rustle", 50, 1, -5)
+	if (src.loc == user)
+		if (user.s_active)
+			user.s_active.close(user)
+		src.show_to(user)
+	else
+		..()
+		for(var/mob/M in range(1))
+			if (M.s_active == src)
+				src.close(M)
+			//Foreach goto(76)
+		src.orient2hud(user)
+	src.add_fingerprint(user)
+	return
+
+/obj/item/clothing/suit/storage/proc/return_inv()
+
+	var/list/L = list(  )
+
+	L += src.contents
+
+	for(var/obj/item/weapon/storage/S in src)
+		L += S.return_inv()
+	for(var/obj/item/weapon/gift/G in src)
+		L += G.gift
+		if (istype(G.gift, /obj/item/weapon/storage))
+			L += G.gift:return_inv()
+	return L
+
+/obj/item/clothing/suit/storage/proc/show_to(mob/user as mob)
+	for(var/obj/item/weapon/mousetrap/MT in src)
+		if(MT.armed)
+			for(var/mob/O in viewers(user, null))
+				if(O == user)
+					user.show_message(text("\red <B>You reach into the [src.name], but there was a live mousetrap in there!</B>"), 1)
+				else
+					user.show_message(text("\red <B>[user] reaches into the [src.name] and sets off a hidden mousetrap!</B>"), 1)
+			MT.loc = user.loc
+			MT.triggered(user, user.hand ? "l_hand" : "r_hand")
+			MT.layer = OBJ_LAYER
+			return
+	user.client.screen -= src.boxes
+	user.client.screen -= src.closer
+	user.client.screen -= src.contents
+	user.client.screen += src.boxes
+	user.client.screen += src.closer
+	user.client.screen += src.contents
+	user.s_active = src
+	return
+
+/obj/item/clothing/suit/storage/proc/hide_from(mob/user as mob)
+
+	if(!user.client)
+		return
+	user.client.screen -= src.boxes
+	user.client.screen -= src.closer
+	user.client.screen -= src.contents
+	return
+
+/obj/item/clothing/suit/storage/proc/close(mob/user as mob)
+
+	src.hide_from(user)
+	user.s_active = null
+	return
+
+/obj/item/weapon/storage/proc/orient_objs(tx, ty, mx, my)
+
+	var/cx = tx
+	var/cy = ty
+	src.boxes.screen_loc = text("[],[] to [],[]", tx, ty, mx, my)
+	for(var/obj/O in src.contents)
+		O.screen_loc = text("[],[]", cx, cy)
+		O.layer = 20
+		cx++
+		if (cx > mx)
+			cx = tx
+			cy--
+		//Foreach goto(56)
+	src.closer.screen_loc = text("[],[]", mx, my)
+	return
+
+/obj/item/weapon/storage/proc/orient2hud(mob/user as mob)
+
+	if (src == user.l_hand)
+		src.orient_objs(3, 11, 3, 4)
+	else
+		if (src == user.r_hand)
+			src.orient_objs(1, 11, 1, 4)
+		else
+			if (src == user.back)
+				src.orient_objs(4, 10, 4, 3)
+			else
+				src.orient_objs(4, 10, 4, 3)
+	return*/
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -427,7 +427,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_if_possible(new /obj/item/clothing/under/det(M), M.slot_w_uniform)
 			M.equip_if_possible(new /obj/item/clothing/shoes/black(M), M.slot_shoes)

-			M.equip_if_possible(new /obj/item/clothing/suit/det_suit(M), M.slot_wear_suit)
+			M.equip_if_possible(new /obj/item/clothing/suit/storage/det_suit(M), M.slot_wear_suit)
 			M.equip_if_possible(new /obj/item/clothing/glasses/thermal/monocle(M), M.slot_glasses)
 			M.equip_if_possible(new /obj/item/clothing/head/det_hat(M), M.slot_head)

@@ -438,7 +438,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that

 		if ("tournament chef") //Steven Seagal FTW
 			M.equip_if_possible(new /obj/item/clothing/under/rank/chef(M), M.slot_w_uniform)
-			M.equip_if_possible(new /obj/item/clothing/suit/chef(M), M.slot_wear_suit)
+			M.equip_if_possible(new /obj/item/clothing/suit/storage/chef(M), M.slot_wear_suit)
 			M.equip_if_possible(new /obj/item/clothing/shoes/black(M), M.slot_shoes)
 			M.equip_if_possible(new /obj/item/clothing/head/chefhat(M), M.slot_head)

@@ -501,7 +501,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_if_possible(new /obj/item/clothing/head/chaplain_hood(M), M.slot_head)
 			M.equip_if_possible(new /obj/item/device/radio/headset(M), M.slot_ears)
 			M.equip_if_possible(new /obj/item/clothing/glasses/thermal/monocle(M), M.slot_glasses)
-			M.equip_if_possible(new /obj/item/clothing/suit/chaplain_hoodie(M), M.slot_wear_suit)
+			M.equip_if_possible(new /obj/item/clothing/suit/storage/chaplain_hoodie(M), M.slot_wear_suit)
 			M.equip_if_possible(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(M), M.slot_l_store)
 			M.equip_if_possible(new /obj/item/weapon/bikehorn(M), M.slot_r_store)

@@ -524,7 +524,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_if_possible(new /obj/item/clothing/head/helmet/welding(M), M.slot_head)
 			M.equip_if_possible(new /obj/item/device/radio/headset(M), M.slot_ears)
 			M.equip_if_possible(new /obj/item/clothing/glasses/thermal/monocle(M), M.slot_glasses)
-			M.equip_if_possible(new /obj/item/clothing/suit/apron(M), M.slot_wear_suit)
+			M.equip_if_possible(new /obj/item/clothing/suit/storage/apron(M), M.slot_wear_suit)
 			M.equip_if_possible(new /obj/item/weapon/kitchenknife(M), M.slot_l_store)
 			M.equip_if_possible(new /obj/item/weapon/scalpel(M), M.slot_r_store)

@@ -542,7 +542,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_if_possible(new /obj/item/clothing/gloves/black(M), M.slot_gloves)
 			M.equip_if_possible(new /obj/item/device/radio/headset(M), M.slot_ears)
 			M.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(M), M.slot_glasses)
-			M.equip_if_possible(new /obj/item/clothing/suit/wcoat(M), M.slot_wear_suit)
+			M.equip_if_possible(new /obj/item/clothing/suit/storage/wcoat(M), M.slot_wear_suit)
 			M.equip_if_possible(new /obj/item/weapon/melee/energy/sword(M), M.slot_l_store)
 			M.equip_if_possible(new /obj/item/weapon/cloaking_device(M), M.slot_r_store)

--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -55,6 +55,21 @@
 	item_state = "armor_reflec"
 	armor = list(melee = 10, bullet = 10, laser = 80, energy = 50, bomb = 0, bio = 0, rad = 0)

+/obj/item/clothing/suit/storage/gearharness
+	name = "gear harness"
+	desc = "A simple security harness, used for storing small objects"
+	icon_state = "gearharness"
+	item_state = "gearharness"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+
+/obj/item/clothing/suit/storage/armourrigvest
+	name = "armour rig vest"
+	desc = "An important looking armoured vest, outfitted with pockets."
+	icon_state = "armourrigvest"
+	item_state = "armourrigvest"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+	flags = FPRINT | TABLEPASS | ONESIZEFITSALL



--- a/code/modules/clothing/suits/detective.dm
+++ b/code/modules/clothing/suits/detective.dm
@@ -6,7 +6,7 @@
 	armor = list(melee = 50, bullet = 5, laser = 25,energy = 10, bomb = 0, bio = 0, rad = 0)


-/obj/item/clothing/suit/det_suit
+/obj/item/clothing/suit/storage/det_suit
 	name = "coat"
 	desc = "An 18th-century multi-purpose trenchcoat. Someone who wears this means serious business."
 	icon_state = "detective"
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -1,5 +1,5 @@

-/obj/item/clothing/suit/labcoat
+/obj/item/clothing/suit/storage/labcoat
 	name = "labcoat"
 	desc = "A suit that protects against minor chemical spills."
 	icon_state = "labcoat_open"
@@ -10,34 +10,34 @@
 	allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)

-/obj/item/clothing/suit/labcoat/cmo
+/obj/item/clothing/suit/storage/labcoat/cmo
 	name = "chief medical officer's labcoat"
 	desc = "Bluer than the standard model."
 	icon_state = "labcoat_cmo_open"
 	item_state = "labcoat_cmo"

-/obj/item/clothing/suit/labcoat/mad
+/obj/item/clothing/suit/storage/labcoat/mad
 	name = "The Mad's labcoat"
 	desc = "It makes you look capable of konking someone on the noggin and shooting them into space."
 	icon_state = "labgreen_open"
 	item_state = "labgreen"

-/obj/item/clothing/suit/labcoat/genetics
+/obj/item/clothing/suit/storage/labcoat/genetics
 	name = "Geneticist Labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder."
 	icon_state = "labcoat_gen_open"

-/obj/item/clothing/suit/labcoat/chemist
+/obj/item/clothing/suit/storage/labcoat/chemist
 	name = "Chemist Labcoat"
 	desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder."
 	icon_state = "labcoat_chem_open"

-/obj/item/clothing/suit/labcoat/virologist
+/obj/item/clothing/suit/storage/labcoat/virologist
 	name = "Virologist Labcoat"
 	desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder."
 	icon_state = "labcoat_vir_open"

-/obj/item/clothing/suit/labcoat/science
+/obj/item/clothing/suit/storage/labcoat/science
 	name = "Scientist Labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder."
 	icon_state = "labcoat_tox_open"
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -6,7 +6,7 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS


-/obj/item/clothing/suit/wcoat
+/obj/item/clothing/suit/storage/wcoat
 	name = "waistcoat"
 	desc = "For some classy, murderous fun."
 	icon_state = "vest"
@@ -14,18 +14,18 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS


-/obj/item/clothing/suit/apron
+/obj/item/clothing/suit/storage/apron
 	name = "apron"
-	desc = "A basic blue apron."
+	desc = "A basic blue apron. It has a large pocket you can store things in."
 	icon_state = "apron"
 	item_state = "apron"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	allowed = list (/obj/item/weapon/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/nutrient,/obj/item/weapon/minihoe)


-/obj/item/clothing/suit/chef
+/obj/item/clothing/suit/storage/chef
 	name = "Chef's apron"
-	desc = "An apron used by a high class chef."
+	desc = "An apron used by a high class chef.  Has a few pockets for nic-naks."
 	icon_state = "chef"
 	item_state = "chef"
 	gas_transfer_coefficient = 0.90
@@ -36,7 +36,7 @@
 	allowed = list (/obj/item/weapon/kitchenknife,/obj/item/weapon/butch)


-/obj/item/clothing/suit/chef/classic
+/obj/item/clothing/suit/storage/chef/classic
 	name = "A classic chef's apron."
 	desc = "A basic, dull, white chef's apron."
 	icon_state = "apronchef"
@@ -68,7 +68,7 @@
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy)


-/obj/item/clothing/suit/captunic
+/obj/item/clothing/suit/storage/captunic
 	name = "captain's parade tunic"
 	desc = "Worn by a Captain to show their class."
 	icon_state = "captunic"
@@ -84,7 +84,7 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS


-/obj/item/clothing/suit/chaplain_hoodie
+/obj/item/clothing/suit/storage/chaplain_hoodie
 	name = "chaplain hoodie"
 	desc = "This suit says to you 'hush'!"
 	icon_state = "chaplain_hoodie"
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -928,9 +928,9 @@
 		if (wear_suit)
 			if (wear_suit.blood_DNA)
 				var/icon/stain_icon = null
-				if (istype(wear_suit, /obj/item/clothing/suit/armor/vest || /obj/item/clothing/suit/wcoat))
+				if (istype(wear_suit, /obj/item/clothing/suit/armor/vest || /obj/item/clothing/suit/storage/wcoat))
 					stain_icon = icon('blood.dmi', "armorblood[!lying ? "" : "2"]")
-				else if (istype(wear_suit, /obj/item/clothing/suit/det_suit || /obj/item/clothing/suit/labcoat))
+				else if (istype(wear_suit, /obj/item/clothing/suit/storage/det_suit || /obj/item/clothing/suit/storage/labcoat))
 					stain_icon = icon('blood.dmi', "coatblood[!lying ? "" : "2"]")
 				else
 					stain_icon = icon('blood.dmi', "suitblood[!lying ? "" : "2"]")
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -9,7 +9,7 @@

 	special_check(var/mob/living/carbon/human/M)
 /*		if(ishuman(M))
-			if(istype(M.w_uniform, /obj/item/clothing/under/det) && istype(M.head, /obj/item/clothing/head/det_hat) && istype(M.wear_suit, /obj/item/clothing/suit/det_suit))
+			if(istype(M.w_uniform, /obj/item/clothing/under/det) && istype(M.head, /obj/item/clothing/head/det_hat) && istype(M.wear_suit, /obj/item/clothing/suit/storage/det_suit))
 				return 1
 			M << "\red You just don't feel cool enough to use this gun looking like that."
 		return 0	*/
--- a/icons/mob/suit.dmi
+++ b/icons/mob/suit.dmi
--- a/icons/obj/storage.dmi
+++ b/icons/obj/storage.dmi
--- a/maps/backup/tgstation.2.0.8.dmm
+++ b/maps/backup/tgstation.2.0.8.dmm
--- a/maps/tgstation.2.0.8.dmm
+++ b/maps/tgstation.2.0.8.dmm
@@ -6143,7 +6143,7 @@
 "cog" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access_txt = "101"},/turf/unsimulated/floor{icon_state = "floor"},/area/tdome)
 "coh" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/tdome)
 "coi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/tdome)
-"coj" = (/obj/structure/rack,/obj/item/clothing/head/that,/obj/item/clothing/under/suit_jacket,/obj/item/clothing/suit/wcoat,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
+"coj" = (/obj/structure/rack,/obj/item/clothing/head/that,/obj/item/clothing/under/suit_jacket,/obj/item/clothing/suit/storage/wcoat,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
 "cok" = (/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/holding)
 "col" = (/obj/structure/table,/turf/unsimulated/floor{icon_state = "floor"},/area/tdome)
 "com" = (/turf/unsimulated/floor{icon_state = "floor"},/area/tdome)