Merge branch 'master' into final_shuttle_touches_and_stuff

# Conflicts:
#	code/modules/power/breaker_box.dm

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

@@ -416,6 +416,12 @@
 	..()
 	update_icon()
 
+/obj/item/storage/lockbox/vials/forensic
+	icon_state = "vialbox6"
+	locked = FALSE
+	starts_with = list(/obj/item/reagent_containers/glass/beaker/vial = 6)
+	req_access = list(access_forensics_lockers)
+
 /obj/item/storage/box/fancy/chocolate_box
 	name = "chocolate box"
 	desc = "A lot like life, you never know what you're going to get."

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

@@ -303,7 +303,9 @@
 		/obj/item/surgery/scalpel = 1,
 		/obj/item/surgery/surgicaldrill = 1,
 		/obj/item/autopsy_scanner = 1,
-		/obj/item/device/mass_spectrometer = 1
+		/obj/item/device/mass_spectrometer = 1,
+		/obj/item/reagent_containers/glass/beaker/vial = 1,
+		/obj/item/reagent_containers/syringe = 1
 	)
 
 	can_hold = list(