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

code/modules/mining/lavaland/necropolis_chests.dm

@@ -835,9 +835,9 @@
 
 	force = CLAMP((ghost_counter * 4), 0, 75)
 	user.visible_message("<span class='danger'>[user] strikes with the force of [ghost_counter] vengeful spirits!</span>")
-	..()
+	return ..()
 
-/obj/item/melee/ghost_sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+/obj/item/melee/ghost_sword/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
 	var/ghost_counter = ghost_check()
 	final_block_chance += CLAMP((ghost_counter * 5), 0, 75)
 	owner.visible_message("<span class='danger'>[owner] is protected by a ring of [ghost_counter] ghosts!</span>")

code/modules/mining/mine_items.dm

@@ -87,14 +87,6 @@
 		return
 	. = ..()
 
-/obj/machinery/computer/shuttle/mining/common
-	name = "lavaland shuttle console"
-	desc = "Used to call and send the lavaland shuttle."
-	req_access = list()
-	circuit = /obj/item/circuitboard/computer/mining_shuttle/common
-	shuttleId = "mining_common"
-	possible_destinations = "lavaland_common_away;commonmining_home"
-
 /**********************Mining car (Crate like thing, not the rail car)**************************/
 
 /obj/structure/closet/crate/miningcar