Merge pull request #1037 from comma/master

Police tape overhaul

code/game/objects/closets/secure/engineering.dm

@@ -32,6 +32,7 @@
 		new /obj/item/device/multitool(src)
 		new /obj/item/device/flash(src)
 		new /obj/item/clothing/glasses/meson(src)
+		new /obj/item/taperoll/engineering(src)
 		return
 
 

code/game/objects/closets/secure/security.dm

@@ -136,7 +136,7 @@
 		var/obj/item/weapon/storage/backpack/security/BPK = new /obj/item/weapon/storage/backpack/security(src)
 		var/obj/item/weapon/storage/box/B = new(BPK)
 		new /obj/item/weapon/pen(B)
-		new /obj/item/policetaperoll(src)
+		new /obj/item/taperoll/police(src)
 		new /obj/item/clothing/suit/armor/vest(src)
 		new /obj/item/clothing/suit/storage/gearharness(src)
 		new /obj/item/clothing/head/helmet(src)
@@ -174,7 +174,7 @@
 		new /obj/item/weapon/pen(C)
 		new /obj/item/weapon/clipboard/notebook(src)
 		new /obj/item/device/detective_scanner(src)
-		new /obj/item/policetaperoll(src)
+		new /obj/item/taperoll/police(src)
 		new /obj/item/weapon/storage/box/evidence(src)
 		new /obj/item/device/pda/detective(src)
 		new /obj/item/device/radio/headset/headset_sec(src)

code/game/objects/storage/belt.dm

@@ -153,7 +153,7 @@
 		"/obj/item/weapon/zippo",
 		"/obj/item/device/taperecorder",
 		"/obj/item/weapon/evidencebag",
-		"/obj/item/policetaperoll"
+		"/obj/item/taperoll/police"
 		)
 
 /obj/item/weapon/storage/belt/soulstone