Merge pull request #711 from Erthilo/Bleeding-Edge

Mining Equipment, other tweaks

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

@@ -166,3 +166,33 @@
 	can_hold = list(
 		"/obj/item/clothing/mask/luchador"
 		)
+
+
+/obj/item/weapon/storage/belt/mining
+	name = "mining gear belt"
+	desc = "Can hold various mining gear like pickaxes or drills."
+	icon_state = "miningbelt"
+	item_state = "mining"
+	w_class = 4 //Lets it hold mining satchels.
+	max_w_class = 4
+	max_combined_w_class = 28
+	can_hold = list(
+		"/obj/item/weapon/storage/bag/ore",
+		"/obj/item/weapon/shovel",
+		"/obj/item/weapon/storage/box/samplebags",
+		"/obj/item/device/core_sampler",
+		"/obj/item/device/beacon_locator",
+		"/obj/item/device/radio/beacon",
+		"/obj/item/device/gps",
+		"/obj/item/device/measuring_tape",
+		"/obj/item/device/flashlight",
+		"/obj/item/weapon/pickaxe",
+		"/obj/item/device/depth_scanner",
+		"/obj/item/weapon/paper",
+		"/obj/item/weapon/pen",
+		"/obj/item/clothing/glasses",
+		"/obj/item/weapon/wrench",
+		"/obj/item/device/mining_scanner",
+		"/obj/item/weapon/crowbar",
+		"/obj/item/weapon/storage/box/excavation",
+		"/obj/item/weapon/anobattery")

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

@@ -29,6 +29,7 @@
 		new /obj/item/clothing/mask/gas(src)
 		new /obj/item/device/multitool(src)
 		new /obj/item/device/flash(src)
+		new /obj/item/device/gps/engineering(src)
 		return
 
 
@@ -114,6 +115,7 @@
 		new /obj/item/clothing/glasses/meson(src)
 		new /obj/item/taperoll/engineering(src)
 		new /obj/item/taperoll/engineering(src)
+		new /obj/item/device/gps/engineering(src)
 		return
 
 /obj/structure/closet/secure_closet/engineering_general