addresses points in Purpose's review. Fixes some spans, replaces some 0,1 with TRUE,FALSE, uses some defines

code/modules/response_team/ert.dm

@@ -10,8 +10,8 @@
 var/list/response_team_members = list()
 var/responseteam_age = 21 // Minimum account age to play as an ERT member
 var/datum/response_team/active_team = null
-var/send_emergency_team = 0
-var/ert_request_answered = 0
+var/send_emergency_team = FALSE
+var/ert_request_answered = FALSE
 
 /client/proc/response_team()
 	set name = "Dispatch CentComm Response Team"
@@ -25,7 +25,7 @@ var/ert_request_answered = 0
 		to_chat(usr, "<span class='warning'>The game hasn't started yet!</span>")
 		return
 
-	if(ticker.current_state == 1)
+	if(ticker.current_state == GAME_STATE_PREGAME)
 		to_chat(usr, "<span class='warning'>The round hasn't started yet!</span>")
 		return
 
@@ -39,11 +39,11 @@ var/ert_request_answered = 0
 
 /mob/dead/observer/proc/JoinResponseTeam()
 	if(!send_emergency_team)
-		to_chat(src, "No emergency response team is currently being sent.")
+		to_chat(src, "<span class='warning'>No emergency response team is currently being sent.</span>")
 		return 0
 
 	if(jobban_isbanned(src, ROLE_ERT))
-		to_chat(src, "<span class='warning'>You are jobbanned from the emergency reponse team!</span>")
+		to_chat(src, "<span class='warning'>You are jobbanned from playing on an emergency response team!</span>")
 		return 0
 
 	var/player_age_check = check_client_age(client, responseteam_age)
@@ -56,7 +56,7 @@ var/ert_request_answered = 0
 		return 0
 
 	if(response_team_members.len > 6)
-		to_chat(src, "The emergency response team is already full!")
+		to_chat(src, "<span class='warning'>The emergency response team is already full!</span>")
 		return 0
 
 	return 1
@@ -66,11 +66,11 @@ var/ert_request_answered = 0
 	active_team = response_team_type
 	active_team.setSlots(commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots)
 
-	send_emergency_team = 1
+	send_emergency_team = TRUE
 	var/list/ert_candidates = pollCandidates("Join the Emergency Response Team?",, responseteam_age, 600, 1, role_playtime_requirements[ROLE_ERT])
 	if(!ert_candidates.len)
 		active_team.cannot_send_team()
-		send_emergency_team = 0
+		send_emergency_team = FALSE
 		return 0
 
 	// Respawnable players get first dibs
@@ -86,7 +86,7 @@ var/ert_request_answered = 0
 
 	if(!response_team_members.len)
 		active_team.cannot_send_team()
-		send_emergency_team = 0
+		send_emergency_team = FALSE
 		return 0
 
 	var/index = 1
@@ -115,7 +115,7 @@ var/ert_request_answered = 0
 		new_commando.update_icons()
 		index++
 
-	send_emergency_team = 0
+	send_emergency_team = FALSE
 	active_team.announce_team()
 	return 1
 
@@ -366,4 +366,3 @@ var/ert_request_answered = 0
 	new /obj/item/radio/centcom(src)
 	new /obj/item/reagent_containers/food/pill/patch/synthflesh(src)
 	new /obj/item/reagent_containers/hypospray/autoinjector(src)
-	return

code/modules/response_team/ert_outfits.dm

@@ -90,7 +90,7 @@
 		/obj/item/restraints/handcuffs = 1,
 		/obj/item/storage/lockbox/mindshield = 1,
 		/obj/item/gun/energy/ionrifle/carbine = 1,
-		/obj/item/ammo_box/magazine/m45/enforcer45/lethal = 2,
+		/obj/item/ammo_box/magazine/m45/enforcer45/lethal = 2
 		)
 
 	cybernetic_implants = list(
@@ -179,7 +179,7 @@
 		/obj/item/storage/box/handcuffs = 1,
 		/obj/item/storage/box/flashbangs = 1,
 		/obj/item/whetstone = 1,
-		/obj/item/storage/lockbox/t4 = 1,
+		/obj/item/storage/lockbox/t4 = 1
 	)
 
 	cybernetic_implants = list(
@@ -187,7 +187,7 @@
 		/obj/item/organ/internal/cyberimp/eyes/hud/security,
 		/obj/item/organ/internal/cyberimp/brain/anti_stun,
 		/obj/item/organ/internal/cyberimp/arm/telebaton,
-		/obj/item/organ/internal/cyberimp/chest/reviver,
+		/obj/item/organ/internal/cyberimp/chest/reviver
 	)
 
 
@@ -261,7 +261,7 @@
 		/obj/item/clothing/head/helmet/space/hardsuit/ert/engineer/gamma = 1,
 		/obj/item/clothing/mask/gas/sechailer/swat = 1,
 		/obj/item/rcd/combat = 1,
-		/obj/item/rcd_ammo/large = 3,
+		/obj/item/rcd_ammo/large = 3
 	)
 
 	cybernetic_implants = list(
@@ -269,7 +269,7 @@
 		/obj/item/organ/internal/cyberimp/eyes/hud/security,
 		/obj/item/organ/internal/cyberimp/brain/anti_stun,
 		/obj/item/organ/internal/cyberimp/eyes/shield,
-		/obj/item/organ/internal/cyberimp/arm/toolset,
+		/obj/item/organ/internal/cyberimp/arm/toolset
 	)
 
 //////////////////// MEDIC ///////////////////
@@ -343,9 +343,6 @@
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/medical/gamma
 	glasses = /obj/item/clothing/glasses/night
 	suit_store = /obj/item/gun/energy/gun/blueshield/pdw9
-	cybernetic_implants = list(
-		/obj/item/organ/internal/cyberimp/arm/surgery
-	)
 
 	belt = /obj/item/defibrillator/compact/loaded
 
@@ -358,7 +355,7 @@
 		/obj/item/bodyanalyzer/advanced = 1,
 		/obj/item/extinguisher/mini = 1,
 		/obj/item/storage/belt/medical/surgery/loaded = 1,
-		/obj/item/roller = 1,
+		/obj/item/roller = 1
 		)
 
 	cybernetic_implants = list(
@@ -459,14 +456,13 @@
 	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
-	cybernetic_implants = list(
-		/obj/item/organ/internal/cyberimp/chest/nutriment
-	)
+
 	r_pocket = /obj/item/scythe/tele
 	l_pocket = /obj/item/gun/energy/gun/mini
 
 	cybernetic_implants = list(
-		/obj/item/organ/internal/cyberimp/arm/advmop
+		/obj/item/organ/internal/cyberimp/arm/advmop,
+		/obj/item/organ/internal/cyberimp/chest/nutriment
 	)
 
 /datum/outfit/job/centcom/response_team/janitorial/gamma