diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 561a583bc7c..b7884ff874c 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -698,6 +698,13 @@ var/list/uplink_items = list()
 	gamemodes = list(/datum/game_mode/nuclear,/datum/game_mode/gang)
 	surplus = 20
 
+/datum/uplink_item/device_tools/medgun
+	name = "Medbeam Gun"
+	desc = "Medical Beam Gun, useful in prolonged firefights."
+	item = /obj/item/weapon/gun/medbeam
+	cost = 15
+	gamemodes = list(/datum/game_mode/nuclear)
+
 
 // IMPLANTS
 
diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm
index 0e1b16d75fd..7209b40e937 100644
--- a/code/modules/clothing/outfits/ert.dm
+++ b/code/modules/clothing/outfits/ert.dm
@@ -104,7 +104,8 @@
 		/obj/item/weapon/melee/baton/loaded=1,\
 		/obj/item/clothing/mask/gas/sechailer=1,\
 		/obj/item/weapon/gun/energy/gun=1,\
-		/obj/item/weapon/reagent_containers/hypospray/combat=1)
+		/obj/item/weapon/reagent_containers/hypospray/combat=1,\
+		/obj/item/weapon/gun/medbeam=1)
 
 /datum/outfit/ert/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	..()
diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm
index e20d878776a..48a56421ff6 100644
--- a/code/modules/projectiles/guns/medbeam.dm
+++ b/code/modules/projectiles/guns/medbeam.dm
@@ -94,9 +94,9 @@
 			if(!AM.CanPass(dummy,turf,1))
 				qdel(dummy)
 				return 0
-		for(var/obj/effect/overlay/beam/O in turf)// Don't cross the str-beams!
-			if(O.BeamSource!=user)
-				explosion(O.loc,0,3,5,8)
+		for(var/obj/effect/ebeam/medical/B in turf)// Don't cross the str-beams!
+			if(B.owner != current_beam)
+				explosion(B.loc,0,3,5,8)
 				qdel(dummy)
 				return 0
 	qdel(dummy)
@@ -111,4 +111,7 @@
 	return 
 
 /obj/item/weapon/gun/medbeam/proc/on_beam_relase(var/mob/living/target)
-	return
\ No newline at end of file
+	return
+
+/obj/effect/ebeam/medical
+	name = "medical beam"
\ No newline at end of file