diff --git a/code/WorkInProgress/SkyMarshal/coatrack.dm b/code/WorkInProgress/SkyMarshal/coatrack.dm
index b0fa8dfc211..0807dce7448 100644
--- a/code/WorkInProgress/SkyMarshal/coatrack.dm
+++ b/code/WorkInProgress/SkyMarshal/coatrack.dm
@@ -1,5 +1,5 @@
 /obj/machinery/coatrack/attack_hand(mob/user as mob)
-	switch(alert("What do you want from the coatrack?",,"Coat","Hat"))
+	switch(alert("What do you want from the coat rack?",,"Coat","Hat"))
 		if("Coat")
 			if(coat)
 				if(!user.get_active_hand())
diff --git a/code/defines/obj/clothing/jumpsuit.dm b/code/defines/obj/clothing/jumpsuit.dm
index 3b724694f2b..78229b539b8 100644
--- a/code/defines/obj/clothing/jumpsuit.dm
+++ b/code/defines/obj/clothing/jumpsuit.dm
@@ -85,7 +85,7 @@
 	color = "red"
 
 /obj/item/clothing/under/color/white
-	desc = "Made of a special fiber that gives special protection against biohazards."
+	desc = "Made of a special fiber that gives protection against biohazards."
 	name = "White Jumpsuit"
 	icon_state = "white"
 	item_state = "w_suit"
@@ -375,6 +375,7 @@
 	item_state = "det"
 	color = "detective"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	var/obj/item/weapon/gun/projectile/detective/gun
 
 /obj/item/clothing/under/scratch
 	name = "White Suit"
diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm
index 98e7a3efdeb..b305a5525b4 100644
--- a/code/defines/obj/machinery.dm
+++ b/code/defines/obj/machinery.dm
@@ -453,7 +453,7 @@
 		h_b = 245.0
 
 /obj/machinery/coatrack
-	name = "coatrack"
+	name = "coat rack"
 	desc = "A fancy stand for the Detective's coat and hat."
 	icon_state = "coatrack0"
 	icon = 'coatrack.dmi'
diff --git a/code/modules/clothing/suits/detective.dm b/code/modules/clothing/suits/detective.dm
index bceefa513b7..58ec3fd0008 100644
--- a/code/modules/clothing/suits/detective.dm
+++ b/code/modules/clothing/suits/detective.dm
@@ -25,3 +25,34 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
 	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+
+/obj/item/clothing/under/det/verb/holster()
+	set name = "Holster"
+	set category = "Object"
+	set src in usr
+
+	if(!gun)
+		if(istype(usr.get_active_hand(),/obj/item/weapon/gun/projectile/detective))
+			gun = usr.get_active_hand()
+			usr.drop_item()
+			gun.loc = src
+			for(var/mob/M in viewers(usr, null))
+				if(M.client)
+					M.show_message(text("\blue [usr] holsters his gun."), 2)
+		else
+			usr << "\blue You need your gun equiped to holster it."
+	else
+		if(istype(usr.get_active_hand(),/obj) && istype(usr.get_inactive_hand(),/obj))
+			usr << "\red If you want your gun from your holster, you need an empty hand!"
+		else
+			usr.put_in_hand(gun)
+			icon_state = "detective"
+			gun = null
+			if(usr.a_intent == "hurt")
+				for(var/mob/M in viewers(usr, null))
+					if(M.client)
+						M.show_message(text("\red [usr] draws his gun, and readies it for use!"), 2)
+			else
+				for(var/mob/M in viewers(usr, null))
+					if(M.client)
+						M.show_message(text("\blue [usr] draws his gun, but keeps it pointed safely at the ground."), 2)
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 9c829c3c9cd..553f49900b4 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ