Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765

code/modules/mining/equipment/kinetic_crusher.dm

@@ -425,7 +425,7 @@
 		marker.icon_state = "chronobolt"
 		marker.damage = bonus_value
 		marker.nodamage = FALSE
-		marker.speed = 2
+		marker.pixels_per_second = TILES_TO_PIXELS(5)
 		deadly_shot = FALSE
 
 /obj/item/crusher_trophy/blaster_tubes/on_mark_detonation(mob/living/target, mob/living/user)

code/modules/mining/equipment/lazarus_injector.dm

@@ -33,7 +33,7 @@
 					if(malfunctioning)
 						H.faction |= list("lazarus", "[REF(user)]")
 						H.robust_searching = 1
-						H.friends += user
+						H.friends[user]++
 						H.attack_same = 1
 						log_game("[key_name(user)] has revived hostile mob [key_name(target)] with a malfunctioning lazarus injector")
 					else

code/modules/mining/equipment/mining_tools.dm

@@ -168,3 +168,17 @@
 	throwforce = 7
 	custom_materials = list(/datum/material/iron=50)
 	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/shovel/serrated
+	name = "serrated bone shovel"
+	desc = "A wicked tool that cleaves through dirt just as easily as it does flesh. The design was styled after ancient lavaland tribal designs."
+	icon_state = "shovel_bone"
+	item_state = "shovel_bone"
+	lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
+	force = 15
+	throwforce = 12
+	w_class = WEIGHT_CLASS_NORMAL
+	toolspeed = 0.7
+	attack_verb = list("slashed", "impaled", "stabbed", "sliced")
+	sharpness = IS_SHARP

code/modules/mining/equipment/survival_pod.dm

@@ -270,6 +270,7 @@
 	desc = "A sign of relief for weary miners, and a warning for would-be competitors to Nanotrasen's mining claims."
 	icon = 'icons/turf/walls/survival_pod_walls.dmi'
 	icon_state = "ntpod"
+	buildable_sign = FALSE
 
 /obj/structure/sign/mining/survival
 	name = "shelter sign"