diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index ad43f32ea40e2..7d5dc9a9181af 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -34,7 +34,7 @@
 /obj/structure/closet/crate/necropolis/tendril/try_spawn_loot(datum/source, obj/item/item, mob/user, params) ///proc that handles key checking and generating loot - MAY REPLACE WITH pick_weight(loot)
 	var/static/list/necropolis_goodies = list(	//weights to be defined later on, for now they're all the same
 		/obj/item/clothing/glasses/godeye									= 5,
-		/obj/item/clothing/gloves/gauntlets									= 5,
+		/obj/item/clothing/gloves/concussive_gauntlets						= 5,
 		/obj/item/rod_of_asclepius											= 5,
 		/obj/item/organ/heart/cursed/wizard						 			= 5,
 		/obj/item/ship_in_a_bottle											= 5,
@@ -666,11 +666,12 @@
 	name = "jacob's ladder"
 	desc = "An indestructible celestial ladder that violates the laws of physics."
 
-/obj/item/clothing/gloves/gauntlets
+/obj/item/clothing/gloves/concussive_gauntlets
 	name = "concussive gauntlets"
 	desc = "Pickaxes... for your hands!"
 	icon_state = "concussive_gauntlets"
-	item_state = "concussive_gauntlets"
+	worn_icon_state = "concussive_gauntlets"
+	item_state = "combatgloves"
 	toolspeed = 0.1 //Sonic jackhammer, but only works on minerals.
 	strip_delay = 40
 	equip_delay_other = 20
@@ -681,25 +682,25 @@
 	resistance_flags = LAVA_PROOF | FIRE_PROOF //they are from lavaland after all
 	armor = list(MELEE = 15,  BULLET = 35, LASER = 35, ENERGY = 20, BOMB = 35, BIO = 35, RAD = 35, FIRE = 0, ACID = 0, STAMINA = 20, BLEED = 20) //Equivalent to bone bracers. Not bad.
 
-/obj/item/clothing/gloves/gauntlets/equipped(mob/user, slot)
+/obj/item/clothing/gloves/concussive_gauntlets/equipped(mob/user, slot)
 	. = ..()
 	if(slot == ITEM_SLOT_GLOVES)
 		tool_behaviour = TOOL_MINING
-		RegisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/rocksmash)
-		RegisterSignal(user, COMSIG_MOVABLE_BUMP, .proc/rocksmash)
+		RegisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(rocksmash))
+		RegisterSignal(user, COMSIG_MOVABLE_BUMP, PROC_REF(rocksmash))
 	else
 		stopmining(user)
 
-/obj/item/clothing/gloves/gauntlets/dropped(mob/user)
+/obj/item/clothing/gloves/concussive_gauntlets/dropped(mob/user)
 	. = ..()
 	stopmining(user)
 
-/obj/item/clothing/gloves/gauntlets/proc/stopmining(mob/user)
+/obj/item/clothing/gloves/concussive_gauntlets/proc/stopmining(mob/user)
 	tool_behaviour = initial(tool_behaviour)
 	UnregisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK)
 	UnregisterSignal(user, COMSIG_MOVABLE_BUMP)
 
-/obj/item/clothing/gloves/gauntlets/proc/rocksmash(mob/living/carbon/human/user, atom/rocks, proximity)
+/obj/item/clothing/gloves/concussive_gauntlets/proc/rocksmash(mob/living/carbon/human/user, atom/rocks, proximity)
     if(!ismineralturf(rocks))
         return
     rocks.attackby(src, user)