Cameras for strike teams.

code/game/response_team.dm

@@ -224,11 +224,6 @@ proc/trigger_armed_response_team(var/force = 0)
 	//Special radio setup
 	equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(src), slot_ears)
 
-	//Adding Camera Network
-	var/obj/machinery/camera/camera = new /obj/machinery/camera(src) //Gives all the commandos internals cameras.
-	camera.network = "CREED"
-	camera.c_tag = real_name
-
 	//Replaced with new ERT uniform
 	equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(src), slot_w_uniform)
 	equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(src), slot_shoes)

code/modules/clothing/spacesuits/ert.dm

@@ -1,14 +1,30 @@
-/obj/item/clothing/head/helmet/space/ert
+/obj/item/clothing/head/helmet/space/rig/ert
 	name = "emergency response team helmet"
 	desc = "A helmet worn by members of the NanoTrasen Emergency Response Team. Armoured and space ready."
-	icon_state = "ert_commander"
+	icon_state = "rig0-ert_commander"
 	item_state = "helm-command"
 	armor = list(melee = 50, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 60)
 	siemens_coefficient = 0.6
+	var/obj/machinery/camera/camera
 
-/obj/item/clothing/suit/space/ert
+/obj/item/clothing/head/helmet/space/rig/ert/attack_self(mob/user)
+	if(camera)
+		..(user)
+	else
+		camera = new /obj/machinery/camera(src)
+		camera.network = list("ERT")
+		cameranet.removeCamera(camera)
+		camera.c_tag = user.name
+		user << "\blue User scanned as [camera.c_tag]. Camera activated."
+
+/obj/item/clothing/head/helmet/space/rig/ert/examine()
+	..()
+	if(get_dist(usr,src) <= 1)
+		usr << "This helmet has a built-in camera. It's [camera ? "" : "in"]active."
+
+/obj/item/clothing/suit/space/rig/ert
 	name = "emergency response team suit"
-	desc = "A suit worn by members of the NanoTrasen Emergency Response Team. Armoured, space ready, and fire resistant."
+	desc = "A suit worn by members of the NanoTrasen Emaergency Response Team. Armoured, space ready, and fire resistant."
 	icon_state = "ert_commander"
 	item_state = "suit-command"
 	w_class = 3
@@ -22,49 +38,53 @@
 	siemens_coefficient = 0.6
 
 //Commander
-/obj/item/clothing/head/helmet/space/ert/commander
+/obj/item/clothing/head/helmet/space/rig/ert/commander
 	name = "emergency response team commander helmet"
 	desc = "A helmet worn by the commander of a NanoTrasen Emergency Response Team. Has blue highlights. Armoured and space ready."
-	icon_state = "ert_commander"
+	icon_state = "rig0-ert_commander"
 	item_state = "helm-command"
+	color = "ert_commander"
 
-/obj/item/clothing/suit/space/ert/commander
+/obj/item/clothing/suit/space/rig/ert/commander
 	name = "emergency response team commander suit"
 	desc = "A suit worn by the commander of a NanoTrasen Emergency Response Team. Has blue highlights. Armoured, space ready, and fire resistant."
 	icon_state = "ert_commander"
 	item_state = "suit-command"
 
 //Security
-/obj/item/clothing/head/helmet/space/ert/security
+/obj/item/clothing/head/helmet/space/rig/ert/security
 	name = "emergency response team security helmet"
 	desc = "A helmet worn by security members of a NanoTrasen Emergency Response Team. Has red highlights. Armoured and space ready."
-	icon_state = "ert_security"
+	icon_state = "rig0-ert_security"
 	item_state = "syndicate-helm-black-red"
+	color = "ert_security"
 
-/obj/item/clothing/suit/space/ert/security
+/obj/item/clothing/suit/space/rig/ert/security
 	name = "emergency response team security suit"
 	desc = "A suit worn by security members of a NanoTrasen Emergency Response Team. Has red highlights. Armoured, space ready, and fire resistant."
 	icon_state = "ert_security"
 	item_state = "syndicate-black-red"
 
 //Engineer
-/obj/item/clothing/head/helmet/space/ert/engineer
+/obj/item/clothing/head/helmet/space/rig/ert/engineer
 	name = "emergency response team engineer helmet"
 	desc = "A helmet worn by engineering members of a NanoTrasen Emergency Response Team. Has blue highlights. Armoured and space ready."
-	icon_state = "ert_engineer"
+	icon_state = "rig0-ert_engineer"
+	color = "ert_engineer"
 
-/obj/item/clothing/suit/space/ert/engineer
+/obj/item/clothing/suit/space/rig/ert/engineer
 	name = "emergency response team engineer suit"
 	desc = "A suit worn by the engineering of a NanoTrasen Emergency Response Team. Has blue highlights. Armoured, space ready, and fire resistant."
 	icon_state = "ert_engineer"
 
 //Medical
-/obj/item/clothing/head/helmet/space/ert/medical
+/obj/item/clothing/head/helmet/space/rig/ert/medical
 	name = "emergency response team medical helmet"
 	desc = "A helmet worn by medical members of a NanoTrasen Emergency Response Team. Has white highlights. Armoured and space ready."
-	icon_state = "ert_medical"
+	icon_state = "rig0-ert_medical"
+	color = "ert_medical"
 
-/obj/item/clothing/suit/space/ert/medical
+/obj/item/clothing/suit/space/rig/ert/medical
 	name = "emergency response team medical suit"
 	desc = "A suit worn by medical members of a NanoTrasen Emergency Response Team. Has white highlights. Armoured and space ready."
 	icon_state = "ert_medical"

code/modules/clothing/spacesuits/rig.dm

@@ -87,7 +87,22 @@
 	color = "syndi"
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
 	siemens_coefficient = 0.6
+	var/obj/machinery/camera/camera
 
+/obj/item/clothing/head/helmet/space/rig/syndi/attack_self(mob/user)
+	if(camera)
+		..(user)
+	else
+		camera = new /obj/machinery/camera(src)
+		camera.network = list("NUKE")
+		cameranet.removeCamera(camera)
+		camera.c_tag = user.name
+		user << "\blue User scanned as [camera.c_tag]. Camera activated."
+
+/obj/item/clothing/head/helmet/space/rig/syndi/examine()
+	..()
+	if(get_dist(usr,src) <= 1)
+		usr << "This helmet has a built-in camera. It's [camera ? "" : "in"]active."
 
 /obj/item/clothing/suit/space/rig/syndi
 	icon_state = "rig-syndi"

code/modules/clothing/under/ties.dm

@@ -222,7 +222,7 @@
 	slots = 5
 
 /obj/item/clothing/tie/storage/brown_vest
-	name = "black webbing vest"
+	name = "brown webbing vest"
 	desc = "Worn brownish synthcotton vest with lots of pockets to unload your hands."
 	icon_state = "vest_brown"
 	color = "vest_brown"

code/setup.dm

@@ -697,5 +697,6 @@ var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "space_d
 
 var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accessed by preexisting terminals. AIs and new terminals can't use them.
 	"thunder",
-	"CREED"
+	"ERT",
+	"NUKE"
 	)