Merge branch 'master' into Projectile_Rework

code/modules/mining/equipment/wormhole_jaunter.dm

@@ -20,7 +20,7 @@
 
 /obj/item/wormhole_jaunter/equipped(mob/user, slot)
 	. = ..()
-	if(slot == SLOT_BELT)
+	if(slot == ITEM_SLOT_BELT)
 		RegisterSignal(user, COMSIG_MOVABLE_CHASM_DROP, .proc/chasm_react)
 
 /obj/item/wormhole_jaunter/dropped(mob/user)
@@ -68,7 +68,7 @@
 
 	var/mob/M = loc
 	if(istype(M))
-		if(M.get_item_by_slot(SLOT_BELT) == src)
+		if(M.get_item_by_slot(ITEM_SLOT_BELT) == src)
 			if(prob(severity))
 				M.visible_message("<span class='warning'>[src] overloads and activates!</span>")
 				SSblackbox.record_feedback("tally", "jaunter", 1, "EMP") // EMP accidental activation

code/modules/mining/lavaland/necropolis_chests.dm

@@ -307,7 +307,7 @@
 	var/mob/living/carbon/human/active_owner
 
 /obj/item/clothing/neck/necklace/memento_mori/item_action_slot_check(slot, mob/user, datum/action/A)
-	return slot == SLOT_NECK
+	return slot == ITEM_SLOT_NECK
 
 /obj/item/clothing/neck/necklace/memento_mori/dropped(mob/user)
 	..()