Bye bye, combat defib

code/game/objects/items/weapons/defib.dm

@@ -229,18 +229,6 @@
 	combat = 1
 	safety = 0
 
-/obj/item/defibrillator/compact/combat/ert
-	name = "Advanced Compact Defibrillator"
-	desc = "A belt-equipped defibrillator that can be rapidly deployed and can revive through space suits."
-	safety = 1
-
-/obj/item/defibrillator/compact/combat/ert/loaded/New()
-	..()
-	paddles = make_paddles()
-	bcell = new /obj/item/stock_parts/cell/infinite(src)
-	update_icon()
-	return
-
 /obj/item/defibrillator/compact/combat/loaded/New()
 	..()
 	paddles = make_paddles()

code/game/objects/items/weapons/storage/belt.dm

@@ -138,7 +138,7 @@
 	max_combined_w_class = 17
 	use_to_pickup = 1
 	name = "Surgical Belt"
-	desc = "Can hold various surgery tools."
+	desc = "Can hold various surgical tools."
 	storage_slots = 9
 	use_item_overlays = 1
 	can_hold = list(
@@ -153,9 +153,9 @@
 		/obj/item/cautery,
 	)
 
-/obj/item/storage/belt/medical/surgery/response_team
+/obj/item/storage/belt/medical/surgery/loaded
 
-/obj/item/storage/belt/medical/surgery/response_team/New()
+/obj/item/storage/belt/medical/surgery/loaded/New()
 	..()
 	new /obj/item/scalpel(src)
 	new /obj/item/hemostat(src)

code/game/response_team.dm

@@ -602,7 +602,7 @@ var/ert_request_answered = 0
 	suit = /obj/item/clothing/suit/armor/vest/ert/medical
 	glasses = /obj/item/clothing/glasses/hud/health
 
-	belt = /obj/item/storage/belt/medical/surgery/response_team
+	belt = /obj/item/storage/belt/medical/surgery/loaded
 
 	l_pocket = /obj/item/gun/energy/gun/mini
 	r_pocket = /obj/item/melee/classic_baton/telescopic
@@ -628,7 +628,7 @@ var/ert_request_answered = 0
 	 /obj/item/organ/internal/cyberimp/arm/surgery = 1,
 	 /obj/item/organ/internal/cyberimp/chest/nutriment = 1
 	)
-	belt = /obj/item/defibrillator/compact/combat/ert/loaded
+	belt = /obj/item/defibrillator/compact/loaded
 
 	r_pocket = /obj/item/melee/classic_baton/telescopic
 
@@ -653,7 +653,7 @@ var/ert_request_answered = 0
 		/obj/item/organ/internal/cyberimp/arm/surgery = 1
 	)
 
-	belt = /obj/item/defibrillator/compact/combat/ert/loaded
+	belt = /obj/item/defibrillator/compact/loaded
 
 	l_pocket = /obj/item/reagent_containers/hypospray/combat/nanites