diff --git a/code/datums/uplink/highly visible and dangerous weapons.dm b/code/datums/uplink/highly visible and dangerous weapons.dm
index 447d9c7f760..530f853a8e7 100644
--- a/code/datums/uplink/highly visible and dangerous weapons.dm	
+++ b/code/datums/uplink/highly visible and dangerous weapons.dm	
@@ -120,7 +120,7 @@
 	path = /obj/item/gun/custom_ka/frame01/illegal
 
 /datum/uplink_item/item/visible_weapons/teslagauntlet
-	name = "Tesla Gauntlet"
+	name = "Tesla Glove"
 	item_cost = 10
 	path = /obj/item/clothing/gloves/tesla
 
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index 66602e01617..5b0c41fbb6d 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -316,7 +316,7 @@
 		mounted.switch_firemodes()
 
 /obj/item/clothing/gloves/tesla
-	name = "tesla gauntlet"
+	name = "tesla glove"
 	desc = "A weaponized gauntlet capable of firing lightning bolts."
 	desc_fluff = "A tesla-based weapon created by the People's Republic of Adhomai as part of their Tesla Brigade program. Because of its long recharge time, the gauntlet is commonly \
 	used as an ancillary weapon."
@@ -337,19 +337,32 @@
 		return
 
 	if(user.a_intent == I_HURT)
-		var/turf/T = get_turf(user)
-		user.visible_message(SPAN_DANGER("\The [user] crackles with energy!"))
-		var/obj/item/projectile/beam/tesla/LE = new (T)
-		playsound(usr.loc, 'sound/magic/LightningShock.ogg', 75, 1)
-		LE.launch_projectile(A, user.zone_sel? user.zone_sel.selecting : null, user)
-		charged = FALSE
-		update_icon()
-		user.update_inv_gloves()
-		addtimer(CALLBACK(src, .proc/rearm), 30 SECONDS)
+		if(proximity)
+			if(iscarbon(A))
+				var/mob/living/carbon/L = A
+				L.electrocute_act(20,src, 1, user.zone_sel.selecting)
+				spark(src, 3, alldirs)
+				charged = FALSE
+				update_icon()
+				user.update_inv_gloves()
+				addtimer(CALLBACK(src, .proc/rearm), 10 SECONDS)
+
+		else
+			var/turf/T = get_turf(user)
+			user.visible_message(SPAN_DANGER("\The [user] crackles with energy!"))
+			var/obj/item/projectile/beam/tesla/LE = new (T)
+			LE.launch_projectile(A, user.zone_sel? user.zone_sel.selecting : null, user)
+			spark(src, 3, alldirs)
+			playsound(user.loc, 'sound/magic/LightningShock.ogg', 75, 1)
+			charged = FALSE
+			update_icon()
+			user.update_inv_gloves()
+			addtimer(CALLBACK(src, .proc/rearm), 30 SECONDS)
 
 /obj/item/clothing/gloves/tesla/proc/rearm()
 	visible_message(SPAN_NOTICE("\The [src] surges back with energy!"))
 	charged = TRUE
+	update_icon()
 
 /obj/item/clothing/gloves/tesla/update_icon()
 	if(charged)
@@ -357,4 +370,7 @@
 		item_state = "tesla_glove_on"
 	else
 		icon_state = "tesla_glove"
-		item_state = "tesla_glove"
\ No newline at end of file
+		item_state = "tesla_glove"
+	if(ismob(src.loc))
+		var/mob/M = src.loc
+		M.update_inv_gloves()
\ No newline at end of file
diff --git a/html/changelogs/alberyk-teslagloveupdate.yml b/html/changelogs/alberyk-teslagloveupdate.yml
new file mode 100644
index 00000000000..cd9068c73e5
--- /dev/null
+++ b/html/changelogs/alberyk-teslagloveupdate.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes:
+  - tweak: "The tesla gauntlet now shock its target at melee range when punching."