Overwatch Camera gear

x

code/game/machinery/camera/camera.dm

@@ -327,3 +327,6 @@ GLOBAL_LIST_EMPTY_TYPED(all_cameras, /obj/structure/machinery/camera)
 
 /obj/structure/machinery/camera/cas/isXRay()
 	return TRUE
+
+/obj/structure/machinery/camera/overwatch
+	network = list(CAMERA_NET_OVERWATCH)

code/game/machinery/vending/vendor_types/requisitions.dm

@@ -416,6 +416,7 @@
 
 		list("MISCELLANEOUS", -1, null, null),
 		list("Bedroll", 30, /obj/item/roller/bedroll, VENDOR_ITEM_REGULAR),
+		list("M5 Camera Gear", 3, /obj/item/device/overwatch_camera, VENDOR_ITEM_REGULAR),
 		)
 
 /obj/structure/machinery/cm_vending/sorted/uniform_supply/ui_state(mob/user)

code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm

@@ -190,6 +190,7 @@
 		list("Falling Falcons Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch/falcon, VENDOR_ITEM_REGULAR),
 		list("USCM Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch, VENDOR_ITEM_REGULAR),
 		list("Bedroll", round(scale * 20), /obj/item/roller/bedroll, VENDOR_ITEM_REGULAR),
+		list("M5 Camera Gear", 0.5, /obj/item/device/overwatch_camera, VENDOR_ITEM_REGULAR),
 
 		list("OPTICS", -1, null, null, null),
 		list("Advanced Medical Optic (CORPSMAN ONLY)", round(scale * 4), /obj/item/device/helmet_visor/medical/advanced, VENDOR_ITEM_REGULAR),

code/modules/clothing/head/helmet.dm

@@ -423,8 +423,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	pockets.bypass_w_limit = GLOB.allowed_helmet_items
 	pockets.max_storage_space = storage_max_storage_space
 
-	camera = new /obj/structure/machinery/camera(src)
-	camera.network = list(CAMERA_NET_OVERWATCH)
+	camera = new /obj/structure/machinery/camera/overwatch(src)
 
 	for(var/obj/visor as anything in built_in_visors)
 		visor.forceMove(src)

code/modules/cm_marines/equipment/gear.dm

@@ -360,3 +360,23 @@
 			new /obj/item/reagent_container/food/snacks/cookie(src)
 		if(5)
 			new /obj/item/reagent_container/food/snacks/chocolatebar(src)
+
+/obj/item/device/overwatch_camera
+	name = "M5 Camera Gear"
+	desc = "A camera and associated headgear designed to allow marine commanders to see what their troops can see. A more robust version of this equipment is integrated into all standard USCM combat helmets."
+	icon = 'icons/obj/items/clothing/glasses.dmi'
+	icon_state = "overwatch_gear"
+	item_icons = list(
+		WEAR_L_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		WEAR_R_EAR = 'icons/mob/humans/onmob/ears.dmi',
+	)
+	item_state_slots = list(
+		WEAR_L_EAR = "cam_gear",
+		WEAR_R_EAR = "cam_gear",
+	)
+	flags_equip_slot = SLOT_EAR
+	var/obj/structure/machinery/camera/camera
+
+/obj/item/device/overwatch_camera/Initialize(mapload, ...)
+	. = ..()
+	camera = new /obj/structure/machinery/camera/overwatch(src)

code/modules/cm_marines/overwatch.dm

@@ -217,7 +217,7 @@
 				if(DEAD)
 					mob_state = "Dead"
 
-			if(!istype(marine_human.head, /obj/item/clothing/head/helmet/marine))
+			if(!marine_has_camera(marine_human))
 				has_helmet = FALSE
 
 			if(!marine_human.key || !marine_human.client)
@@ -619,13 +619,27 @@
 		cam = null
 		user.reset_view(null)
 
-//returns the helmet camera the human is wearing
-/obj/structure/machinery/computer/overwatch/proc/get_camera_from_target(mob/living/carbon/human/H)
+/// checks if the human has an overwatch camera at all
+/obj/structure/machinery/computer/overwatch/proc/marine_has_camera(mob/living/carbon/human/marine)
+	if(istype(marine.head, /obj/item/clothing/head/helmet/marine))
+		return TRUE
+	if(istype(marine.wear_l_ear, /obj/item/device/overwatch_camera) || istype(marine.wear_r_ear, /obj/item/device/overwatch_camera))
+		return TRUE
+	return FALSE
+/// returns the overwatch camera the human is wearing
+/obj/structure/machinery/computer/overwatch/proc/get_camera_from_target(mob/living/carbon/human/marine)
 	if(current_squad)
-		if(H && istype(H) && istype(H.head, /obj/item/clothing/head/helmet/marine))
-			var/obj/item/clothing/head/helmet/marine/helm = H.head
-			return helm.camera
-
+		if(marine && istype(marine))
+			if(istype(marine.head, /obj/item/clothing/head/helmet/marine))
+				var/obj/item/clothing/head/helmet/marine/helm = marine.head
+				return helm.camera
+			var/obj/item/device/overwatch_camera/cam_gear
+			if(istype(marine.wear_l_ear, /obj/item/device/overwatch_camera))
+				cam_gear = marine.wear_l_ear
+				return cam_gear.camera
+			if(istype(marine.wear_r_ear, /obj/item/device/overwatch_camera))
+				cam_gear = marine.wear_r_ear
+				return cam_gear.camera
 
 // Alerts all groundside marines about the incoming OB
 /obj/structure/machinery/computer/overwatch/proc/alert_ob(turf/target)

tgui/packages/tgui/interfaces/OverwatchConsole.jsx

@@ -457,7 +457,7 @@ const SquadMonitor = (props, context) => {
                   }>
                   {squad_leader.name}
                 </Button>
-              )) || <Box color="yellow">{squad_leader.name} (NO HELMET)</Box>}
+              )) || <Box color="yellow">{squad_leader.name} (NO CAMERA)</Box>}
             </Table.Cell>
             <Table.Cell p="2px">{squad_leader.role}</Table.Cell>
             <Table.Cell
@@ -505,7 +505,7 @@ const SquadMonitor = (props, context) => {
                         }>
                         {marine.name}
                       </Button>
-                    )) || <Box color="yellow">{marine.name} (NO HELMET)</Box>}
+                    )) || <Box color="yellow">{marine.name} (NO CAMERA)</Box>}
                   </Table.Cell>
                   <Table.Cell p="2px">{marine.role}</Table.Cell>
                   <Table.Cell