diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index eed8492ffd..1bf774c850 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -50,7 +50,6 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/weapon/storage/box/swabs,
/obj/item/weapon/storage/box/swabs,
/obj/item/weapon/storage/box/swabs,
- /obj/item/weapon/storage/box/slides,
/obj/item/device/uv_light,
/obj/item/weapon/reagent_containers/spray/luminol)
cost = 30
@@ -775,7 +774,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
cost = 125
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Experimental weapons crate"
- access = access_heads
+ access = access_armory
group = "Security"
/datum/supply_packs/randomised/armor
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index f977830ef3..6f93f03df2 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -136,7 +136,6 @@
/obj/item/weapon/melee/baton,
/obj/item/weapon/gun/energy/taser,
/obj/item/weapon/flame/lighter,
- /obj/item/clothing/glasses/hud/security,
/obj/item/device/flashlight,
/obj/item/device/pda,
/obj/item/device/radio/headset,
@@ -166,7 +165,6 @@
/obj/item/weapon/forensics/sample_kit/powder,
/obj/item/weapon/forensics/swab,
/obj/item/device/uv_light,
- /obj/item/weapon/forensics/slide,
/obj/item/weapon/forensics/sample_kit,
/obj/item/weapon/photo,
/obj/item/device/camera_film,
diff --git a/code/modules/detectivework/microscope/microscope.dm b/code/modules/detectivework/microscope/microscope.dm
index 5fd31a555c..3bc596fb57 100644
--- a/code/modules/detectivework/microscope/microscope.dm
+++ b/code/modules/detectivework/microscope/microscope.dm
@@ -16,7 +16,7 @@
user << "There is already a slide in the microscope."
return
- if(istype(W, /obj/item/weapon/forensics/slide) || istype(W, /obj/item/weapon/sample/print))
+ if(istype(W, /obj/item/weapon/forensics/swab)|| istype(W, /obj/item/weapon/sample/fibers) || istype(W, /obj/item/weapon/sample/print))
user << "You insert \the [W] into the microscope."
user.unEquip(W)
W.forceMove(src)
@@ -33,6 +33,7 @@
user << "The microscope whirrs as you examine \the [sample]."
if(!do_after(user, 25) || !sample)
+ user << "You stop examining \the [sample]."
return
user << "Printing findings now..."
@@ -41,32 +42,27 @@
report.overlays = list("paper_stamped")
report_num++
- if(istype(sample, /obj/item/weapon/forensics/slide))
- var/obj/item/weapon/forensics/slide/slide = sample
- if(slide.has_swab)
- var/obj/item/weapon/forensics/swab/swab = slide.has_swab
+ if(istype(sample, /obj/item/weapon/forensics/swab))
+ var/obj/item/weapon/forensics/swab/swab = sample
- report.name = "GSR report #[++report_num]: [swab.name]"
- report.info = "Scanned item:
[swab.name]
"
+ report.name = "GSR report #[++report_num]: [swab.name]"
+ report.info = "Scanned item:
[swab.name]
"
- if(swab.gsr)
- report.info += "Residue from a [swab.gsr] bullet detected."
- else
- report.info += "No gunpowder residue found."
-
- else if(slide.has_sample)
- var/obj/item/weapon/sample/fibers/fibers = slide.has_sample
- report.name = "Fiber report #[++report_num]: [fibers.name]"
- report.info = "Scanned item:
[fibers.name]
"
- if(fibers.evidence)
- report.info = "Molecular analysis on provided sample has determined the presence of unique fiber strings.
"
- for(var/fiber in fibers.evidence)
- report.info += "Most likely match for fibers: [fiber]
"
- else
- report.info += "No fibers found."
+ if(swab.gsr)
+ report.info += "Residue from a [swab.gsr] bullet detected."
else
- report.name = "Empty slide report #[report_num]"
- report.info = "Evidence suggests that there's nothing in this slide."
+ report.info += "No gunpowder residue found."
+
+ else if(istype(sample, /obj/item/weapon/sample/fibers))
+ var/obj/item/weapon/sample/fibers/fibers = sample
+ report.name = "Fiber report #[++report_num]: [fibers.name]"
+ report.info = "Scanned item:
[fibers.name]
"
+ if(fibers.evidence)
+ report.info = "Molecular analysis on provided sample has determined the presence of unique fiber strings.
"
+ for(var/fiber in fibers.evidence)
+ report.info += "Most likely match for fibers: [fiber]
"
+ else
+ report.info += "No fibers found."
else if(istype(sample, /obj/item/weapon/sample/print))
report.name = "Fingerprint report #[report_num]: [sample.name]"
report.info = "Fingerprint analysis report #[report_num]: [sample.name]
"
diff --git a/code/modules/detectivework/microscope/slides.dm b/code/modules/detectivework/microscope/slides.dm
deleted file mode 100644
index 8226e6a51e..0000000000
--- a/code/modules/detectivework/microscope/slides.dm
+++ /dev/null
@@ -1,42 +0,0 @@
-/obj/item/weapon/forensics/slide
- name = "microscope slide"
- desc = "A pair of thin glass panes used in the examination of samples beneath a microscope."
- icon_state = "slide"
- var/obj/item/weapon/forensics/swab/has_swab
- var/obj/item/weapon/sample/fibers/has_sample
-
-/obj/item/weapon/forensics/slide/attackby(var/obj/item/weapon/W, var/mob/user)
- if(has_swab || has_sample)
- user << "There is already a sample in the slide."
- return
- if(istype (W, /obj/item/weapon/forensics/swab))
- has_swab = W
- else if(istype(W, /obj/item/weapon/sample/fibers))
- has_sample = W
- else
- user << "You don't think this will fit."
- return
- user << "You insert the sample into the slide."
- user.unEquip(W)
- W.forceMove(src)
- update_icon()
-
-/obj/item/weapon/forensics/slide/attack_self(var/mob/user)
- if(has_swab || has_sample)
- user << "You remove \the sample from \the [src]."
- if(has_swab)
- has_swab.loc = get_turf(src)
- has_swab = null
- if(has_sample)
- has_sample.forceMove(get_turf(src))
- has_sample = null
- update_icon()
- return
-
-/obj/item/weapon/forensics/slide/update_icon()
- if(!has_swab && !has_sample)
- icon_state = "slide"
- else if(has_swab)
- icon_state = "slideswab"
- else if(has_sample)
- icon_state = "slidefiber"
diff --git a/code/modules/detectivework/tools/storage.dm b/code/modules/detectivework/tools/storage.dm
index 58cbcbf594..e0cdabaafd 100644
--- a/code/modules/detectivework/tools/storage.dm
+++ b/code/modules/detectivework/tools/storage.dm
@@ -11,16 +11,6 @@
for(var/i=0;i