Switchblades added, new det belt item list, bundle updated, box contents updated.

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

@@ -463,8 +463,11 @@
 				if (41 to 50)
 					to_chat(H, "<span class='notice'>You don't see anything.</span>")
 					return
+		handle_hair(H)
 
-		//handle normal hair
+/obj/item/weapon/pocket_mirror/proc/handle_hair(mob/user)
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
 		var/list/species_hair = valid_sprite_accessories(hair_styles_list, null, (H.species.name || null))
 		//gender intentionally left null so speshul snowflakes can cross-hairdress
 		if (species_hair.len)
@@ -494,6 +497,20 @@
 	if (prob(25))
 		shatter()
 
+/obj/item/weapon/pocket_mirror/comb
+	name = "hair comb"
+	desc = "Despite the name honey is not included nor recommended for use with this."
+	icon_state = "comb"
+
+/obj/item/weapon/pocket_mirror/comb/shatter()
+	return
+
+/obj/item/weapon/pocket_mirror/comb/attack(mob/M, mob/user)
+	if(M == user)
+		handle_hair(user)
+	else
+		..()
+
 /obj/item/weapon/nanitecontacts
 	name = "nanite contacts"
 	desc = "Deploys nanobots to your eyes to change their color."

code/game/objects/items/weapons/storage/belt.dm

@@ -206,8 +206,6 @@
 		"/obj/item/ammo_storage",
 		"/obj/item/weapon/reagent_containers/food/snacks/donut",
 		"/obj/item/weapon/storage/fancy/cigarettes",
-		"/obj/item/weapon/melee/baton",
-		"/obj/item/weapon/gun/energy/taser",
 		"/obj/item/weapon/lighter",
 		"/obj/item/weapon/cigpacket",
 		"/obj/item/device/flashlight",
@@ -228,15 +226,27 @@
 		"/obj/item/weapon/depocket_wand",
 		)
 
-/obj/item/weapon/storage/belt/security/detective
+/obj/item/weapon/storage/belt/detective
 	name = "hard-worn belt"
-	desc = "There's a lot you can tell about a man from his clothes - sometimes it's all he can afford, or maybe he chooses to wear something as a message... this belt, then, is a statement. Classy, but not too drab. Fashionable, but still useful. People look at this belt and think, 'My god. That belt is frighteningly well placed. The shades of black that seem to flood over themselves, splayed across every notch... I fear many things, but I fear most the man who possesses such an incredible belt.'"
-	//fits_max_w_class = 3
-	max_combined_w_class = 200
-
-/obj/item/weapon/storage/belt/security/detective/New()
-	..()
-	can_only_hold += list(
+	desc = "There's a lot you can tell about a man from his clothes - sometimes it's all he can afford, or maybe he chooses to wear something as a message... this belt, then, is a statement. Classy, but not too drab. Fashionable, but still useful. People look at this belt and think, 'My god. That belt is frighteningly well placed. The shades of beige that seem to flood over themselves, splayed across every notch... I fear many things, but I fear most the man who possesses such an incredible belt.'"
+	max_combined_w_class = 200 //Some of their stuff is pretty large and they have a lot of crap so lets just be safe.
+	can_only_hold = list(
+		"/obj/item/clothing/glasses",
+		"/obj/item/ammo_storage",
+		"/obj/item/weapon/reagent_containers/food/snacks/donut",
+		"/obj/item/weapon/storage/fancy/cigarettes",
+		"/obj/item/weapon/lighter",
+		"/obj/item/weapon/cigpacket",
+		"/obj/item/device/flashlight",
+		"/obj/item/device/pda",
+		"/obj/item/device/radio/headset",
+		"/obj/item/weapon/handcuffs",
+		"/obj/item/device/flash",
+		"/obj/item/taperoll/police",
+		"/obj/item/taperoll/syndie/police",
+		"/obj/item/device/hailer",
+		"/obj/item/device/gps/secure",
+		"/obj/item/clothing/accessory/holobadge",
 		"/obj/item/weapon/reagent_containers/spray",
 		"/obj/item/weapon/storage/evidencebag",
 		"/obj/item/device/detective_scanner",
@@ -249,6 +259,8 @@
 		"/obj/item/device/camera",
 		"/obj/item/weapon/folder",
 		"/obj/item/weapon/f_card",
+		"/obj/item/device/vampirehead",
+		"/obj/item/weapon/switchtool/switchblade",
 		)
 
 /obj/item/weapon/storage/belt/security/batmanbelt

code/game/objects/items/weapons/storage/boxes.dm

@@ -544,9 +544,8 @@
 	var/glasses = pick(/obj/item/clothing/glasses/sunglasses/sechud/prescription, /obj/item/clothing/glasses/sunglasses/sechud)
 	new glasses(src)
 	new /obj/item/clothing/gloves/black(src)
-	new /obj/item/weapon/storage/belt/security/detective(src)
-	new /obj/item/device/flashlight/tactical(src)
-	new /obj/item/clothing/accessory/holster/knife/boot/preloaded/tactical(src)
+	new /obj/item/weapon/storage/belt/detective(src)
+	new /obj/item/weapon/switchtool/switchblade(src)
 	new /obj/item/device/gps/secure(src)
 	new /obj/item/ammo_storage/box/c38(src)
 	new /obj/item/ammo_storage/box/c38(src)

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

@@ -260,6 +260,13 @@
 		lighter.lit = 1
 		..()
 
+/obj/item/weapon/switchtool/switchblade
+	name = "switchblade"
+	icon_state = "switchblade"
+	desc = "Half switch. Half blade. Half comb."
+	stored_modules = list("/obj/item/weapon/kitchen/utensil/knife:knife" = null,
+						"/obj/item/weapon/pocket_mirror/comb:comb" = null)
+
 #define BT 1
 #define ENGI 2
 #define CB 4

code/game/objects/storage/gimmick_bundles.dm

@@ -11,4 +11,4 @@
    ..()
    new /obj/item/weapon/card/id/nt_disguise(src)
    new /obj/item/clothing/mask/gas/voice/detective(src)
-   new /obj/item/weapon/pocket_mirror(src)
+   new /obj/item/weapon/pocket_mirror/comb(src)

code/modules/detectivework/detective_scanner.dm

@@ -7,7 +7,7 @@
 	icon_state = "forensic1"
 	var/amount = 20.0
 	var/list/stored = list()
-	w_class = W_CLASS_MEDIUM
+	w_class = W_CLASS_SMALL
 	item_state = "electronic"
 	flags = FPRINT
 	siemens_coefficient = 1