Merge pull request #711 from Erthilo/Bleeding-Edge

Mining Equipment, other tweaks

code/game/machinery/kitchen/processor.dm

@@ -78,6 +78,7 @@
 
 
 		slime
+			time=0//It's painful enough
 
 			process(loc, what)
 

code/game/machinery/newscaster.dm

@@ -261,7 +261,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 				// AUTOFIXED BY fix_string_idiocy.py
 				// C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\newscaster.dm:234: dat+="Creating new Feed Message..."
 				dat += {"Creating new Feed Message...
-					<HR><B><A href='?src=\ref[src];set_channel_receiving=1'>Receiving Channel</A>:</B> [src.channel_name]<BR>" //MAR
+					<HR><B><A href='?src=\ref[src];set_channel_receiving=1'>Receiving Channel</A>:</B> [src.channel_name]<BR>"
 					<B>Message Author:</B> <FONT COLOR='green'>[src.scanned_user]</FONT><BR>
 					<B><A href='?src=\ref[src];set_new_message=1'>Message Body</A>:</B> [src.msg] <BR>
 					<B><A href='?src=\ref[src];set_attachment=1'>Attach Photo</A>:</B>  [(src.photo ? "Photo Attached" : "No Photo")]</BR>

code/game/machinery/vending.dm

@@ -362,12 +362,22 @@
 			if(istype(usr, /mob/living/carbon/human))
 				var/mob/living/carbon/human/H=usr
 				var/obj/item/weapon/card/card = null
+				var/obj/item/device/pda/pda = null
 				if(istype(H.wear_id,/obj/item/weapon/card))
 					card=H.wear_id
 				else if(istype(H.get_active_hand(),/obj/item/weapon/card))
 					card=H.get_active_hand()
+				else if(istype(H.wear_id,/obj/item/device/pda))
+					pda=H.wear_id
+					if(pda.id)
+						card=pda.id
+				else if(istype(H.get_active_hand(),/obj/item/device/pda))
+					pda=H.get_active_hand()
+					if(pda.id)
+						card=pda.id
 				if(card)
 					connect_account(card)
+			src.updateUsrDialog()
 			return
 
 		else if ((href_list["togglevoice"]) && (src.panel_open))

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

code/modules/clothing/shoes/magboots.dm

@@ -4,7 +4,7 @@
 	icon_state = "magboots0"
 	var/magpulse = 0
 //	flags = NOSLIP //disabled by default
-
+	icon_action_button = "action_magboots"
 
 	verb/toggle()
 		set name = "Toggle Magboots"
@@ -26,6 +26,10 @@
 			usr << "You enable the mag-pulse traction system."
 		usr.update_inv_shoes()	//so our mob-overlays update
 
+	attack_self()
+		src.toggle()
+		..()
+		return
 
 	examine()
 		set src in view()

code/modules/mining/equipment_locker.dm

@@ -286,6 +286,7 @@
 			usr.drop_item()
 			I.loc = src
 			inserted_id = I
+		return
 	..()
 
 /obj/machinery/mineral/equipment_locker/proc/RedeemVoucher(voucher, redeemer)

code/modules/mining/mine_items.dm

@@ -36,6 +36,8 @@
 	new /obj/item/weapon/shovel(src)
 	new /obj/item/weapon/pickaxe(src)
 	new /obj/item/clothing/glasses/meson(src)
+	new /obj/item/device/gps/mining(src)
+	new /obj/item/weapon/storage/belt/mining(src)
 
 
 /**********************Shuttle Computer**************************/

code/modules/projectiles/guns/energy/special.dm

@@ -193,6 +193,7 @@ obj/item/weapon/gun/energy/staff/focus
 	item_state = "kineticgun"
 	projectile_type = "/obj/item/projectile/kinetic"
 	cell_type = "/obj/item/weapon/cell/crap"
+	charge_cost = 50
 	var/overheat = 0
 	var/recent_reload = 1
 /*

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -16,6 +16,7 @@
 		else gulp_size = max(round(reagents.total_volume / 5), 5)
 
 	attack_self(mob/user as mob)
+		attack(user,user)
 		return
 
 	attack(mob/M as mob, mob/user as mob, def_zone)

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -34,6 +34,7 @@
 
 
 /obj/item/weapon/reagent_containers/food/snacks/attack_self(mob/user)
+	attack(user,user)
 	return
 
 

code/modules/telesci/gps.dm

@@ -74,3 +74,8 @@ var/list/GPS_list = list()
 /obj/item/device/gps/paramedic
 	icon_state = "gps-p"
 	gpstag = "PMD0"
+
+/obj/item/device/gps/mining
+	desc = "A more rugged looking GPS device. Useful for finding miners. Or their corpses."
+	icon_state = "gps-m"
+	gpstag = "MIN0"