yeet

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

@@ -229,6 +229,17 @@
 	combat = 1
 	safety = 0
 
+/obj/item/defibrillator/compact/combat/ERT
+	desc = "A belt-equipped defibrillator that can be rapidly deployed. Does not have the restrictions or safeties of conventional defibrillators and can revive through space suits."
+
+
+/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

@@ -133,6 +133,40 @@
 		/obj/item/wrench/medical,
 	)
 
+/obj/item/storage/belt/medical/surgery
+	max_w_class = WEIGHT_CLASS_NORMAL
+	max_combined_w_class = 17
+	use_to_pickup = 1
+	name = "Surgical Belt"
+	desc = "Can hold various surgery tools."
+	storage_slots = 9
+	use_item_overlays = 1
+	can_hold = list(
+		/obj/item/scalpel,
+		/obj/item/hemostat,
+		/obj/item/retractor,
+		/obj/item/circular_saw,
+		/obj/item/bonegel,
+		/obj/item/bonesetter,
+		/obj/item/FixOVein,
+		/obj/item/surgicaldrill,
+		/obj/item/cautery,
+	)
+
+/obj/item/storage/belt/medical/surgery/response_team
+
+/obj/item/storage/belt/medical/surgery/response_team/New()
+	..()
+	new /obj/item/scalpel(src)
+	new /obj/item/hemostat(src)
+	new /obj/item/retractor(src)
+	new /obj/item/circular_saw(src)
+	new /obj/item/bonegel(src)
+	new /obj/item/bonesetter(src)
+	new /obj/item/FixOVein(src)
+	new /obj/item/surgicaldrill(src)
+	new /obj/item/cautery(src)
+
 /obj/item/storage/belt/medical/response_team
 
 /obj/item/storage/belt/medical/response_team/New()
@@ -203,7 +237,7 @@
 
 /obj/item/storage/belt/security/response_team/New()
 	..()
-	new /obj/item/kitchen/knife/combat(src)
+	new /obj/item/reagent_containers/spray/pepper(src)
 	new /obj/item/melee/baton/loaded(src)
 	new /obj/item/flash(src)
 	new /obj/item/melee/classic_baton/telescopic(src)

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

@@ -227,10 +227,21 @@
 	var/base_name = ""
 	var/label_text = ""
 
+/obj/item/storage/pill_bottle/ERT
+
 /obj/item/storage/pill_bottle/New()
 	..()
 	base_name = name
 
+/obj/item/storage/pill_bottle/ERT/New()
+	..()
+	new /obj/item/reagent_containers/food/pill/salicylic(src)
+	new /obj/item/reagent_containers/food/pill/salicylic(src)
+	new /obj/item/reagent_containers/food/pill/salicylic(src)
+	new /obj/item/reagent_containers/food/pill/charcoal(src)
+	new /obj/item/reagent_containers/food/pill/charcoal(src)
+	new /obj/item/reagent_containers/food/pill/charcoal(src)
+
 /obj/item/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri
 	if(ishuman(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
 		var/mob/M = usr

code/game/response_team.dm

@@ -449,15 +449,6 @@ var/ert_request_answered = 0
 	id = /obj/item/card/id/ert/security
 	var/has_grenades = FALSE
 
-/datum/outfit/job/centcom/response_team/security/pre_equip()
-	. = ..()
-	if(has_grenades)
-		var/grenadebox = /obj/item/storage/box/flashbangs
-		if(prob(50))
-			grenadebox = /obj/item/storage/box/teargas
-		backpack_contents.Insert(1, grenadebox)
-		backpack_contents[grenadebox] = 1
-
 /datum/outfit/job/centcom/response_team/security/amber
 	name = "RT Security (Amber)"
 	shoes = /obj/item/clothing/shoes/combat
@@ -471,7 +462,9 @@ var/ert_request_answered = 0
 	backpack_contents = list(
 		/obj/item/clothing/head/helmet/ert/security = 1,
 		/obj/item/clothing/mask/gas/sechailer = 1,
-		/obj/item/storage/box/zipties = 1
+		/obj/item/storage/box/zipties = 1,
+		/obj/item/storage/box/teargas = 1,
+		/obj/item/flashlight/seclite = 1
 	)
 
 /datum/outfit/job/centcom/response_team/security/red
@@ -481,17 +474,20 @@ var/ert_request_answered = 0
 	shoes = /obj/item/clothing/shoes/combat
 	gloves = /obj/item/clothing/gloves/color/black
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/security
-	suit_store = /obj/item/gun/energy/gun/advtaser
+	suit_store = /obj/item/gun/energy/gun/blueshield
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 
-	r_hand = /obj/item/gun/energy/lasercannon
+	r_hand = /obj/item/gun/projectile/automatic/lasercarbine
 
 	backpack_contents = list(
 		/obj/item/clothing/head/helmet/space/hardsuit/ert/security = 1,
 		/obj/item/clothing/mask/gas/sechailer = 1,
 		/obj/item/clothing/shoes/magboots = 1,
 		/obj/item/storage/box/handcuffs = 1,
-		/obj/item/gun/energy/ionrifle/carbine = 1
+		/obj/item/gun/energy/ionrifle/carbine = 1,
+		/obj/item/storage/box/teargas = 1,
+		/obj/item/grenade/flashbang = 1,
+		/obj/item/ammo_box/magazine/laser = 2
 	)
 
 /datum/outfit/job/centcom/response_team/security/gamma
@@ -530,19 +526,20 @@ var/ert_request_answered = 0
 	suit_store = /obj/item/tank/emergency_oxygen/engi
 	glasses = /obj/item/clothing/glasses/meson
 
-	l_pocket = /obj/item/t_scanner
+	l_pocket = /obj/item/gun/energy/gun/mini
 	r_pocket = /obj/item/melee/classic_baton/telescopic
 
 	backpack_contents = list(
 		/obj/item/clothing/head/helmet/space/hardsuit/ert/engineer = 1,
 		/obj/item/clothing/mask/gas = 1,
+		/obj/item/t_scanner = 1,
 		/obj/item/stack/sheet/glass/fifty = 1,
 		/obj/item/stack/sheet/metal/fifty = 1
 	)
 
 /datum/outfit/job/centcom/response_team/engineer/red
 	name = "RT Engineer (Red)"
-	shoes = /obj/item/clothing/shoes/magboots/advance
+	shoes = /obj/item/clothing/shoes/magboots
 	gloves = /obj/item/clothing/gloves/color/yellow
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer
 	suit_store = /obj/item/tank/emergency_oxygen/engi
@@ -556,7 +553,8 @@ var/ert_request_answered = 0
 		/obj/item/clothing/mask/gas = 1,
 		/obj/item/rcd/preloaded = 1,
 		/obj/item/rcd_ammo = 3,
-		/obj/item/gun/energy/gun = 1
+		/obj/item/gun/energy/gun = 1,
+		/obj/item/clothing/shoes/workboots = 1
 	)
 
 /datum/outfit/job/centcom/response_team/engineer/gamma
@@ -586,9 +584,6 @@ var/ert_request_answered = 0
 	pda = /obj/item/pda/heads/ert/medical
 	id = /obj/item/card/id/ert/medic
 
-	l_pocket = /obj/item/reagent_containers/hypospray/CMO
-	r_pocket = /obj/item/melee/classic_baton/telescopic
-
 /datum/outfit/job/centcom/response_team/medic/amber
 	name = "RT Medic (Amber)"
 
@@ -597,17 +592,19 @@ 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/response_team
+	belt = /obj/item/storage/belt/medical/surgery/response_team
 
-	l_pocket = /obj/item/reagent_containers/hypospray/CMO
+	l_pocket = /obj/item/gun/energy/gun/mini
 	r_pocket = /obj/item/melee/classic_baton/telescopic
 
 	backpack_contents = list(
 		/obj/item/clothing/head/helmet/ert/medical = 1,
 		/obj/item/clothing/mask/surgical = 1,
-		/obj/item/storage/firstaid/o2 = 1,
-		/obj/item/storage/firstaid/brute = 1,
 		/obj/item/storage/firstaid/adv = 1,
+		/obj/item/storage/firstaid/regular = 1,
+		/obj/item/storage/box/autoinjectors = 1,
+		/obj/item/roller = 1,
+		/obj/item/storage/pill_bottle/ERT = 1
 	)
 
 /datum/outfit/job/centcom/response_team/medic/red
@@ -616,18 +613,22 @@ var/ert_request_answered = 0
 	gloves = /obj/item/clothing/gloves/color/latex/nitrile
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/medical
 	glasses = /obj/item/clothing/glasses/hud/health/health_advanced
+	suit_store = /obj/item/gun/energy/gun
+	cybernetic_implants = list(
+	 /obj/item/organ/internal/cyberimp/arm/surgery = 1
+	)
+	belt = /obj/item/defibrillator/compact/combat/ERT/loaded
 
-	belt = /obj/item/defibrillator/compact/loaded
-
+	r_pocket = /obj/item/melee/classic_baton/telescopic
 
 	backpack_contents = list(
 		/obj/item/clothing/head/helmet/space/hardsuit/ert/medical = 1,
 		/obj/item/clothing/mask/surgical = 1,
-		/obj/item/storage/firstaid/o2 = 1,
 		/obj/item/storage/firstaid/toxin = 1,
-		/obj/item/storage/firstaid/adv = 1,
-		/obj/item/storage/firstaid/surgery = 1,
-		/obj/item/gun/energy/gun = 1,
+		/obj/item/storage/firstaid/brute = 1,
+		/obj/item/storage/firstaid/fire = 1,
+		/obj/item/storage/box/autoinjectors = 1,
+		/obj/item/roller = 1,
 		/obj/item/clothing/shoes/magboots = 1
 	)
 
@@ -637,8 +638,11 @@ var/ert_request_answered = 0
 	gloves = /obj/item/clothing/gloves/combat
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/medical
 	glasses = /obj/item/clothing/glasses/hud/health/night
+	cybernetic_implants = list(
+		/obj/item/organ/internal/cyberimp/arm/surgery = 1
+	)
 
-	belt = /obj/item/defibrillator/compact/loaded
+	belt = /obj/item/defibrillator/compact/combat/ERT/loaded
 
 	l_pocket = /obj/item/reagent_containers/hypospray/combat/nanites
 
@@ -711,15 +715,19 @@ var/ert_request_answered = 0
 
 /datum/outfit/job/centcom/response_team/janitorial/amber
 	name = "RT Janitor (Amber)"
+	suit = /obj/item/clothing/suit/armor/vest/ert/janitor
+	head = /obj/item/clothing/head/helmet/ert/janitor
 	glasses = /obj/item/clothing/glasses/sunglasses
 
+	r_hand = /obj/item/gun/energy/disabler
+
 /datum/outfit/job/centcom/response_team/janitorial/red
 	name = "RT Janitor (Red)"
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor
 	head = /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
-	suit_store = /obj/item/gun/energy/gun
 	r_pocket = /obj/item/scythe/tele
+	l_pocket = /obj/item/gun/energy/gun/mini
 
 /datum/outfit/job/centcom/response_team/janitorial/gamma
 	name = "RT Janitor (Gamma)"

code/modules/clothing/spacesuits/ert.dm

@@ -40,7 +40,7 @@
 	allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/t_scanner, /obj/item/rcd, /obj/item/crowbar, \
 	/obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/multitool, \
 	/obj/item/radio, /obj/item/analyzer, /obj/item/gun/energy/laser, /obj/item/gun/energy/pulse, \
-	/obj/item/gun/energy/gun/advtaser, /obj/item/melee/baton, /obj/item/gun/energy/gun)
+	/obj/item/gun/energy/gun/advtaser, /obj/item/melee/baton, /obj/item/gun/energy/gun, /obj/item/gun/projectile/automatic/lasercarbine, /obj/item/gun/energy/gun/blueshield)
 	strip_delay = 130
 	species_fit = list("Drask", "Vox")
 	sprite_sheets = list(