and finally, the modules folder. Now I can publish and take a break

code/modules/mining/equipment/goliath_hide.dm

@@ -7,6 +7,6 @@
 	singular_name = "hide plate"
 	max_amount = 6
 	novariants = FALSE
-	flags_1 = NOBLUDGEON_1
+	item_flags = NOBLUDGEON
 	w_class = WEIGHT_CLASS_NORMAL
-	layer = MOB_LAYER
+	layer = MOB_LAYER

code/modules/mining/equipment/kinetic_crusher.dm

@@ -381,7 +381,7 @@
 
 /obj/item/crusher_trophy/blaster_tubes/on_mark_detonation(mob/living/target, mob/living/user)
 	deadly_shot = TRUE
-	addtimer(CALLBACK(src, .proc/reset_deadly_shot), 300, TIMER_OVERRIDE)
+	addtimer(CALLBACK(src, .proc/reset_deadly_shot), 300, TIMER_UNIQUE|TIMER_OVERRIDE)
 
 /obj/item/crusher_trophy/blaster_tubes/proc/reset_deadly_shot()
 	deadly_shot = FALSE

code/modules/mining/equipment/mining_tools.dm

@@ -63,7 +63,8 @@
 /obj/item/pickaxe/drill/cyborg
 	name = "cyborg mining drill"
 	desc = "An integrated electric mining drill."
-	flags_1 = NODROP_1
+	item_flags = NODROP
+	flags_1 = NONE
 
 /obj/item/pickaxe/drill/diamonddrill
 	name = "diamond-tipped mining drill"

code/modules/mining/equipment/regenerative_core.dm

@@ -21,7 +21,7 @@
 	name = "regenerative core"
 	desc = "All that remains of a hivelord. It can be used to heal completely, but it will rapidly decay into uselessness."
 	icon_state = "roro core 2"
-	flags_1 = NOBLUDGEON_1
+	item_flags = NOBLUDGEON
 	slot = "hivecore"
 	force = 0
 	actions_types = list(/datum/action/item_action/organ_action/use)

code/modules/mining/equipment/survival_pod.dm

@@ -4,7 +4,7 @@
 	icon_state = "away"
 	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
 	requires_power = FALSE
-	has_gravity = TRUE
+	has_gravity = STANDARD_GRAVITY
 	valid_territory = FALSE
 
 //Survival Capsule

code/modules/mining/equipment/wormhole_jaunter.dm

@@ -54,18 +54,20 @@
 	. = ..()
 	if(. & EMP_PROTECT_SELF)
 		return
-	var/triggered = FALSE
 
-	if(usr.get_item_by_slot(SLOT_BELT) == src)
-		if(power == 1)
-			triggered = TRUE
-		else if(power == 2 && prob(50))
-			triggered = TRUE
+	var/mob/M = loc
+	if(istype(M))
+		var/triggered = FALSE
+		if(M.get_item_by_slot(SLOT_BELT) == src)
+			if(power == 1)
+				triggered = TRUE
+			else if(power == 2 && prob(50))
+				triggered = TRUE
 
-	if(triggered)
-		usr.visible_message("<span class='warning'>[src] overloads and activates!</span>")
-		SSblackbox.record_feedback("tally", "jaunter", 1, "EMP") // EMP accidental activation
-		activate(usr)
+		if(triggered)
+			M.visible_message("<span class='warning'>[src] overloads and activates!</span>")
+			SSblackbox.record_feedback("tally", "jaunter", 1, "EMP") // EMP accidental activation
+			activate(M)
 
 /obj/item/wormhole_jaunter/proc/chasm_react(mob/user)
 	if(user.get_item_by_slot(SLOT_BELT) == src)