Revert "[FEATURE] Emergency Response Team"

code/_globalvars/lists/mapping.dm

@@ -43,7 +43,6 @@ var/list/prisonwarped = list()	//list of players already warped
 var/list/blobstart = list()
 var/list/secequipment = list()
 var/list/deathsquadspawn = list()
-var/list/emergencyresponseteamspawn = list()
 
 	//away missions
 var/list/awaydestinations = list()	//a list of landmarks that the warpgate can take you to

code/game/jobs/access.dm

@@ -193,14 +193,6 @@
 			return get_all_centcom_access()
 		if("Centcom Commander")
 			return get_all_centcom_access()
-		if("Emergency Response Team Commander")
-			return list(access_cent_general)
-		if("Security Response Officer")
-			return list(access_cent_general)
-		if("Engineer Response Officer")
-			return list(access_cent_general)
-		if("Medical Response Officer")
-			return list(access_cent_general)
 
 /proc/get_all_accesses()
 	return list(access_security, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_court,
@@ -419,7 +411,7 @@ proc/get_all_job_icons() //For all existing HUD icons
 	return get_all_jobs() + list("Prisoner")
 
 /proc/get_all_centcom_jobs()
-	return list("VIP Guest","Custodian","Thunderdome Overseer","Centcom Official","Medical Officer","Death Commando","Research Officer","Special Ops Officer","Admiral","Centcom Commander","Emergency Response Team Commander","Security Response Officer","Engineer Response Officer", "Medical Response Officer")
+	return list("VIP Guest","Custodian","Thunderdome Overseer","Centcom Official","Medical Officer","Death Commando","Research Officer","Special Ops Officer","Admiral","Centcom Commander")
 
 /obj/item/proc/GetJobName() //Used in secHUD icon generation
 	var/obj/item/weapon/card/id/I = GetID()

code/game/machinery/suit_storage_unit.dm

@@ -81,30 +81,6 @@
 	MASK_TYPE = /obj/item/clothing/mask/gas/syndicate
 	STORAGE_TYPE = /obj/item/weapon/tank/jetpack/oxygen/harness
 
-/obj/machinery/suit_storage_unit/ertCom
-	SUIT_TYPE = /obj/item/clothing/suit/space/ert
-	HELMET_TYPE = /obj/item/clothing/head/helmet/space/hardsuit/ert
-	MASK_TYPE = /obj/item/clothing/mask/breath
-	STORAGE_TYPE = /obj/item/weapon/tank/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ertSec
-	SUIT_TYPE = /obj/item/clothing/suit/space/ert/sec
-	HELMET_TYPE = /obj/item/clothing/head/helmet/space/hardsuit/ert/sec
-	MASK_TYPE = /obj/item/clothing/mask/breath
-	STORAGE_TYPE = /obj/item/weapon/tank/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ertEngi
-	SUIT_TYPE = /obj/item/clothing/suit/space/ert/engi
-	HELMET_TYPE = /obj/item/clothing/head/helmet/space/hardsuit/ert/engi
-	MASK_TYPE = /obj/item/clothing/mask/breath
-	STORAGE_TYPE = /obj/item/weapon/tank/emergency_oxygen/double
-
-/obj/machinery/suit_storage_unit/ertMed
-	SUIT_TYPE = /obj/item/clothing/suit/space/ert/med
-	HELMET_TYPE = /obj/item/clothing/head/helmet/space/hardsuit/ert/med
-	MASK_TYPE = /obj/item/clothing/mask/breath
-	STORAGE_TYPE = /obj/item/weapon/tank/emergency_oxygen/double
-
 /obj/machinery/suit_storage_unit/New()
 	src.update_icon()
 	if(SUIT_TYPE)

code/game/objects/effects/landmarks.dm

@@ -59,10 +59,6 @@
 			deathsquadspawn += loc
 			qdel(src)
 			return
-		if("Emergencyresponseteam")
-			emergencyresponseteamspawn += loc
-			qdel(src)
-			return
 		if("xeno_spawn")
 			xeno_spawn += loc
 			qdel(src)

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

@@ -191,38 +191,6 @@ update_label("John Doe", "Clowny")
 		access = get_all_centcom_access()
 		..()
 
-/obj/item/weapon/card/id/ertsCommand
-	name = "\improper Centcom ID"
-	desc = "A ERT ID card"
-	icon_state = "centcom"
-	registered_name = "Emergency Response Team Commander"
-	assignment = "Emergency Response Team Commander"
-	access = list(access_sec_doors, access_engine, access_medical)
-
-/obj/item/weapon/card/id/ertsSecurity
-	name = "\improper Centcom ID"
-	desc = "A ERT ID card"
-	icon_state = "centcom"
-	registered_name = "Security Response Officer"
-	assignment = "Security Response Officer"
-	access = list(access_sec_doors)
-
-/obj/item/weapon/card/id/ertsEngineer
-	name = "\improper Centcom ID"
-	desc = "A ERT ID card"
-	icon_state = "centcom"
-	registered_name = "Engineer Response Officer"
-	assignment = "Engineer Response Officer"
-	access = list(access_engine)
-
-/obj/item/weapon/card/id/ertsMedical
-	name = "\improper Centcom ID"
-	desc = "A ERT ID card"
-	icon_state = "centcom"
-	registered_name = "Medical Response Officer"
-	assignment = "Medical Response Officer"
-	access = list(access_medical)
-
 /obj/item/weapon/card/id/prisoner
 	name = "prisoner ID card"
 	desc = "You are a number, you are not a free man."

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -5,37 +5,6 @@
 	icon_closed = "syndicate"
 	icon_opened = "syndicateopen"
 
-/obj/structure/closet/syndicate/ertCom/New()
-	name = "commanders closet"
-	desc = "Emergency Response Team equipment locker"
-	new /obj/item/weapon/card/id/ertsCommand(src)
-	new /obj/item/weapon/storage/backpack/security(src)
-	return
-
-/obj/structure/closet/syndicate/ertSec/New()
-	name = "security closet"
-	desc = "Emergency Response Team equipment locker"
-	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
-	new /obj/item/weapon/card/id/ertsSecurity(src)
-	new /obj/item/weapon/storage/backpack/security(src)
-	return
-
-/obj/structure/closet/syndicate/ertMed/New()
-	name = "medical closet"
-	desc = "Emergency Response Team equipment locker"
-	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
-	new /obj/item/weapon/card/id/ertsMedical(src)
-	new /obj/item/weapon/storage/backpack/medic(src)
-	return
-
-/obj/structure/closet/syndicate/ertEngi/New()
-	name = "engineer closet"
-	desc = "Emergency Response Team equipment locker"
-	new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
-	new /obj/item/weapon/card/id/ertsEngineer(src)
-	new /obj/item/weapon/storage/backpack/industrial(src)
-
-	return
 
 /obj/structure/closet/syndicate/personal
 	desc = "It's a personal storage unit for operative gear."

code/modules/admin/topic.dm

@@ -66,11 +66,6 @@
 				log_admin("[key_name(usr)] started a gang war.")
 				if(!src.makeGangsters())
 					usr << "<span class='danger'>Unfortunatly there were not enough candidates available.</span>"
-			if("13")
-				message_admins("[key_name(usr)] created a emergency response team.")
-				log_admin("[key_name(usr)] created a emergency response team.")
-				if(!src.makeEmergencyresponseteam())
-					usr << "<span class='danger'>Unfortunatly there were not enough candidates available.</span>"
 
 
 	else if(href_list["forceevent"])

code/modules/admin/verbs/debug.dm

@@ -819,9 +819,6 @@ var/global/list/g_fancy_list_of_types = null
 		if("death commando")
 			equip_deathsquad(M)
 
-		if("emergency response officer")
-			equip_emergencyresponsesquad(M)
-
 		if("centcom official")
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(M), slot_shoes)
@@ -1104,26 +1101,3 @@ var/global/list/g_fancy_list_of_types = null
 	W.registered_name = M.real_name
 	W.update_label(M.real_name)
 	M.equip_to_slot_or_del(W, slot_wear_id)
-
-/proc/equip_emergencyresponsesquad(var/mob/living/carbon/human/M, var/officer)
-	var/obj/item/device/radio/R = new /obj/item/device/radio/headset(M)
-	R.set_frequency(1441)
-	M.equip_to_slot_or_del(R, slot_ears)
-
-	if(officer)
-		M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform)
-		M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat/swat(M), slot_shoes)
-		M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
-		M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(M), slot_back)
-		M.equip_to_slot_or_del(new /obj/item/weapon/card/id/ertsCommand(M), slot_wear_id)
-	else
-		M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform)
-		M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat/swat(M), slot_shoes)
-		M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
-
-	var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(M)
-	L.imp_in = M
-	L.implanted = 1
-	M.sec_hud_set_implants()
-
-

code/modules/admin/verbs/one_click_antag.dm

@@ -21,7 +21,6 @@ client/proc/one_click_antag()
 		<a href='?src=\ref[src];makeAntag=6'>Make Wizard (Requires Ghosts)</a><br>
 		<a href='?src=\ref[src];makeAntag=7'>Make Nuke Team (Requires Ghosts)</a><br>
 		<a href='?src=\ref[src];makeAntag=10'>Make Deathsquad (Requires Ghosts)</a><br>
-		<a href='?src=\ref[src];makeAntag=13'>Make Emergency Response Team (Requires Ghosts)</a><br>
 		"}
 /* These dont work just yet
 	Ninja, aliens and deathsquad I have not looked into yet
@@ -428,83 +427,6 @@ client/proc/one_click_antag()
 
 	return 0
 
-// EMERGENCY RESPONSE TEAM
-/datum/admins/proc/makeEmergencyresponseteam()
-	var/list/mob/dead/observer/candidates = list()
-	var/time_passed = world.time
-	var/mission = input("Assign a mission to the Emergency Response Team", "Assign Mission", "Assist the station.")
-
-	//Generates a list of officers from active ghosts. Then the user picks which characters to respawn as the officers.
-	for(var/mob/dead/observer/G in player_list)
-		spawn(0)
-			switch(alert(G,"Do you wish to be considered for an elite Nanotrasen Emergency Response Team being sent in?","Please answer in 30 seconds!","Yes","No"))
-				if("Yes")
-					if((world.time-time_passed)>300)//If more than 30 game seconds passed.
-						return
-					candidates += G
-				if("No")
-					return
-				else
-					return
-	sleep(300)
-
-	for(var/mob/dead/observer/G in candidates)
-		if(!G.key)
-			candidates.Remove(G)
-
-	if(candidates.len >= 4) //Minimum 4 to be considered a squad
-		//Pick the (un)lucky players
-		var/numagents = min(7,candidates.len) //How many officers to spawn
-		var/list/spawnpoints = emergencyresponseteamspawn
-		while(numagents && spawnpoints.len && candidates.len)
-			var/spawnloc = spawnpoints[1]
-			var/mob/dead/observer/chosen_candidate = pick(candidates)
-			candidates -= chosen_candidate
-			if(!chosen_candidate.key)
-				continue
-
-			//Spawn and equip the officer
-			var/mob/living/carbon/human/ERTOperative = new(spawnloc)
-			chosen_candidate.client.prefs.copy_to(ERTOperative)
-			ready_dna(ERTOperative)
-			if(numagents == 1) //If Squad Leader
-				ERTOperative.real_name = "Commander [pick(ERTOperative.real_name)]"
-				equip_emergencyresponsesquad(ERTOperative, 1)
-			else
-				ERTOperative.real_name = "Officer [pick(ERTOperative.real_name)]"
-				equip_emergencyresponsesquad(ERTOperative)
-			ERTOperative.key = chosen_candidate.key
-			ERTOperative.mind.assigned_role = "ERT"
-
-			//Assign antag status and the mission
-			ticker.mode.traitors += ERTOperative.mind
-			ERTOperative.mind.special_role = "ert"
-			var/datum/objective/missionobj = new
-			missionobj.owner = ERTOperative.mind
-			missionobj.explanation_text = mission
-			missionobj.completed = 1
-			ERTOperative.mind.objectives += missionobj
-
-			//Greet the commando
-			ERTOperative << "<B><font size=3 color=red>You are the [numagents==1?"Emergency Response Team Commander":"Emergency Response Officer"].</font></B>"
-			var/missiondesc = "Your squad is being sent on a mission to [station_name()] by Nanotrasen's Security Division."
-			if(numagents == 1) //If Squad Leader
-				missiondesc += " Lead your squad to ensure the completion of the mission. Avoid civilian casualites when possible. Board the shuttle when your team is ready."
-			else
-				missiondesc += " Follow orders given to you by your commander. Avoid civilian casualites when possible."
-			missiondesc += "<BR><B>Your Mission</B>: [mission]"
-			ERTOperative << missiondesc
-
-			//Logging and cleanup
-			if(numagents == 1)
-				message_admins("The emergency response team has spawned with the mission: [mission].")
-			log_game("[key_name(ERTOperative)] has been selected as a Emergency Response Officer")
-			spawnpoints -= spawnloc
-			numagents--
-
-		return 1
-
-	return
 
 /datum/admins/proc/makeBody(var/mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character
 	if(!G_found || !G_found.key)	return

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -115,56 +115,3 @@
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
 	strip_delay = 40
 	put_on_delay = 20
-
-	//Emergency Response Team suits
-/obj/item/clothing/head/helmet/space/hardsuit/ert
-	name = "emergency response unit helmet"
-	desc = "Standard issue command helmet for the ERT"
-	icon_state = "hardsuit0-ert_commander"
-	item_state = "hardsuit0-ert_commander"
-	item_color = "ert_commander"
-	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)
-	strip_delay = 130
-
-/obj/item/clothing/head/helmet/space/hardsuit/ert/sec
-	desc = "Standard issue security helmet for the ERT"
-	icon_state = "hardsuit0-ert_security"
-	item_state = "hardsuit0-ert_security"
-	item_color = "ert_security"
-
-/obj/item/clothing/head/helmet/space/hardsuit/ert/engi
-	desc = "Standard issue engineer helmet for the ERT"
-	icon_state = "hardsuit0-ert_engineer"
-	item_state = "hardsuit0-ert_engineer"
-	item_color = "ert_engineer"
-
-/obj/item/clothing/head/helmet/space/hardsuit/ert/med
-	desc = "Standard issue medical helmet for the ERT"
-	icon_state = "hardsuit0-ert_medical"
-	item_state = "hardsuit0-ert_medical"
-	item_color = "ert_medical"
-
-/obj/item/clothing/suit/space/ert
-	name = "emergency response team suit"
-	desc = "Standard issue command suit for the ERT."
-	icon_state = "ert_command"
-	item_state = "ert_command"
-	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
-	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)
-	slowdown = 1
-	strip_delay = 130
-
-/obj/item/clothing/suit/space/ert/sec
-	desc = "Standard issue security suit for the ERT."
-	icon_state = "ert_security"
-	item_state = "ert_security"
-
-/obj/item/clothing/suit/space/ert/engi
-	desc = "Standard issue engineer suit for the ERT."
-	icon_state = "ert_engineer"
-	item_state = "ert_engineer"
-
-/obj/item/clothing/suit/space/ert/med
-	desc = "Standard issue medical suit for the ERT."
-	icon_state = "ert_medical"
-	item_state = "ert_medical"

code/modules/projectiles/ammunition/energy.dm

@@ -38,24 +38,6 @@
 	select_name = "DESTROY"
 	fire_sound = 'sound/weapons/pulse.ogg'
 
-/obj/item/ammo_casing/energy/laser/pulse/carbine
-	e_cost = 1000
-
-/obj/item/ammo_casing/energy/laser/carbine
-	e_cost = 1000
-
-/obj/item/ammo_casing/energy/electrode/carbine
-	e_cost = 1000
-
-/obj/item/ammo_casing/energy/laser/pulse/pistol
-	e_cost = 2000
-
-/obj/item/ammo_casing/energy/laser/pistol
-	e_cost = 1000
-
-/obj/item/ammo_casing/energy/electrode/pistol
-	e_cost = 1000
-
 /obj/item/ammo_casing/energy/laser/bluetag
 	projectile_type = /obj/item/projectile/lasertag/bluetag
 	select_name = "bluetag"
@@ -142,4 +124,4 @@
 
 /obj/item/ammo_casing/energy/wormhole/orange
 	projectile_type = /obj/item/projectile/beam/wormhole/orange
-	select_name = "orange"
+	select_name = "orange"

code/modules/projectiles/guns/energy/pulse.dm

@@ -10,25 +10,10 @@
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
 	cell_type = "/obj/item/weapon/stock_parts/cell/super"
 
+
 /obj/item/weapon/gun/energy/pulse_rifle/attack_self(mob/living/user as mob)
 	select_fire(user)
 
-/obj/item/weapon/gun/energy/pulse_rifle/pulse_carbine
-	name = "pulse carbine"
-	desc = "A ligther weight varient of the pulse rifle, a multifaceted energy carbine with three modes."
-	w_class = 3.0
-	icon_state = "pulse_carbine"
-	item_state = "pulse"
-	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse/carbine, /obj/item/ammo_casing/energy/electrode/carbine, /obj/item/ammo_casing/energy/laser/carbine)
-
-/obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol
-	name = "pulse pistol"
-	desc = "A ligther weight varient of the pulse rifle, a multifaceted energy pistol with three modes."
-	w_class = 2.0
-	icon_state = "pulse_pistol"
-	item_state = "pulse"
-	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse/pistol, /obj/item/ammo_casing/energy/electrode/pistol, /obj/item/ammo_casing/energy/laser/pistol)
-
 /obj/item/weapon/gun/energy/pulse_rifle/destroyer
 	name = "pulse destroyer"
 	desc = "A heavy-duty energy rifle built for pure destruction."
@@ -38,8 +23,12 @@
 /obj/item/weapon/gun/energy/pulse_rifle/destroyer/attack_self(mob/living/user as mob)
 	user << "<span class='danger'>[src.name] has three settings, and they are all DESTROY.</span>"
 
+
+
 /obj/item/weapon/gun/energy/pulse_rifle/M1911
 	name = "m1911-P"
 	desc = "A compact pulse core in a classic handgun frame for Nanotrasen officers. It's not the size of the gun, it's the size of the hole it puts through people."
 	icon_state = "m1911-p"
-	cell_type = "/obj/item/weapon/stock_parts/cell/infinite"
+	cell_type = "/obj/item/weapon/stock_parts/cell/infinite"
+
+

code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm

@@ -226,11 +226,6 @@ datum/reagent/medicine/adminordrazine/on_mob_life(var/mob/living/carbon/M as mob
 	..()
 	return
 
-datum/reagent/medicine/adminordrazine/nanites
-	name = "Nanites"
-	id = "nanites"
-	description = "Tiny machines capable of rapid cellular regeneration."
-
 datum/reagent/medicine/synaptizine
 	name = "Synaptizine"
 	id = "synaptizine"

code/modules/reagents/reagent_containers/hypospray.dm

@@ -56,14 +56,7 @@
 	..()
 	reagents.add_reagent("synaptizine", 30)
 
-obj/item/weapon/reagent_containers/hypospray/combat/nanites
-	desc = "A modified air-needle autoinjector for use in combat situations. Prefilled with expensive medical nanites for rapid healing."
-	volume = 100
 
-/obj/item/weapon/reagent_containers/hypospray/combat/nanites/New()
-	..()
-	reagents.remove_reagent("synaptizine", 30)
-	reagents.add_reagent("nanites", 100)
 
 //MediPens