From 1273a51f83498fdbf0752910b50cf93107ee9659 Mon Sep 17 00:00:00 2001
From: Mark9013100 <mark2971@gmail.com>
Date: Fri, 18 Sep 2015 23:21:52 -0400
Subject: [PATCH] Merges f-card box and evidence bag box

Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
---
 code/game/objects/items/weapons/storage/boxes.dm         | 3 +--
 .../structures/crates_lockers/closets/secure/security.dm | 1 -
 code/modules/detectivework/evidence.dm                   | 9 ++++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 80b09823b0a..a67d9e8dafc 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -15,7 +15,6 @@
  *		Handcuff, mousetrap, and pillbottle boxes,
  *		Snap-pops and matchboxes,
  *		Replacement light boxes.
- *		Fingerprint card box.
  *
  *		For syndicate call-ins see uplink_kits.dm
  */
@@ -691,4 +690,4 @@
 	storage_slots=21
 	max_w_class = 1
 	can_hold = list(/obj/item/weapon/f_card)
-	use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
+	use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 44aa6b06491..9135ea2901d 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -285,7 +285,6 @@
 		new /obj/item/taperoll/police(src)
 		new /obj/item/weapon/gun/projectile/colt/detective(src)
 		new /obj/item/clothing/accessory/holster/armpit(src)
-		new /obj/item/weapon/storage/box/fcard(src)
 		return
 
 /obj/structure/closet/secure_closet/detective/update_icon()
diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm
index 898dbbaf1d3..fa2feaca63d 100644
--- a/code/modules/detectivework/evidence.dm
+++ b/code/modules/detectivework/evidence.dm
@@ -99,7 +99,14 @@
 
 /obj/item/weapon/storage/box/evidence
 	name = "evidence bag box"
-	desc = "A box claiming to contain evidence bags."
+	desc = "A box claiming to contain evidence bags. Also holds fingerprint cards."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "box"
+	storage_slots= 14
+	max_w_class = 3
+	max_storage_space = 38
+	can_hold = list(/obj/item/weapon/f_card, /obj/item/weapon/evidencebag)
+	use_to_pickup = 1
 	New()
 		new /obj/item/weapon/evidencebag(src)
 		new /obj/item/weapon/evidencebag(src)