Overwatch cleanup

_maps/map_files/Arachne/TGS_Arachne.dmm

@@ -962,7 +962,7 @@
 /area/mainship/medical/morgue)
 "aRa" = (
 /obj/structure/table/mainship/nometal,
-/obj/machinery/computer/camera_advanced/overwatch/delta,
+/obj/machinery/computer/camera_advanced/overwatch/military/delta,
 /obj/machinery/light/mainship,
 /turf/open/floor/mainship/floor,
 /area/mainship/command/cic)
@@ -10255,7 +10255,7 @@
 	dir = 1
 	},
 /obj/structure/table/mainship/nometal,
-/obj/machinery/computer/camera_advanced/overwatch/main,
+/obj/machinery/computer/camera_advanced/overwatch/military/main,
 /turf/open/floor/mainship/sterile/dark,
 /area/mainship/command/cic)
 "iwz" = (
@@ -19738,7 +19738,7 @@
 /area/mainship/engineering/upper_engine_monitoring)
 "qbL" = (
 /obj/structure/table/mainship/nometal,
-/obj/machinery/computer/camera_advanced/overwatch/bravo,
+/obj/machinery/computer/camera_advanced/overwatch/military/bravo,
 /obj/machinery/light/mainship,
 /turf/open/floor/mainship/floor,
 /area/mainship/command/cic)
@@ -24336,7 +24336,7 @@
 /area/mainship/hallways/hangar)
 "tYv" = (
 /obj/structure/table/mainship/nometal,
-/obj/machinery/computer/camera_advanced/overwatch/alpha,
+/obj/machinery/computer/camera_advanced/overwatch/military/alpha,
 /obj/machinery/light/mainship{
 	dir = 1
 	},
@@ -24630,7 +24630,7 @@
 /area/mainship/shipboard/firing_range)
 "umC" = (
 /obj/structure/table/mainship/nometal,
-/obj/machinery/computer/camera_advanced/overwatch/charlie,
+/obj/machinery/computer/camera_advanced/overwatch/military/charlie,
 /obj/machinery/light/mainship{
 	dir = 1
 	},

_maps/map_files/Fort_Phobos/Fort_Phobos.dmm

@@ -2854,7 +2854,7 @@
 	},
 /area/mainship/patrol_base/som)
 "Jh" = (
-/obj/machinery/computer/camera_advanced/overwatch/som/yankee,
+/obj/machinery/computer/camera_advanced/overwatch/military/som/yankee,
 /turf/open/floor/mainship/red{
 	dir = 9
 	},
@@ -3151,7 +3151,7 @@
 /area/mainship/patrol_base/som)
 "Ne" = (
 /obj/machinery/camera/autoname/mainship/somship,
-/obj/machinery/computer/camera_advanced/overwatch/main/som,
+/obj/machinery/computer/camera_advanced/overwatch/military/main/som,
 /obj/machinery/light/red{
 	dir = 1
 	},
@@ -3277,7 +3277,7 @@
 /turf/closed/wall/r_wall/prison_unmeltable,
 /area/mainship/patrol_base/som/barracks)
 "Ox" = (
-/obj/machinery/computer/camera_advanced/overwatch/som/xray{
+/obj/machinery/computer/camera_advanced/overwatch/military/som/xray{
 	dir = 8
 	},
 /turf/open/floor/mainship/red{
@@ -3296,7 +3296,7 @@
 	},
 /area/mainship/patrol_base/som)
 "OG" = (
-/obj/machinery/computer/camera_advanced/overwatch/som/zulu{
+/obj/machinery/computer/camera_advanced/overwatch/military/som/zulu{
 	dir = 4
 	},
 /turf/open/floor/mainship/red{
@@ -3652,7 +3652,7 @@
 /turf/closed/shuttle/dropship_regular/backhatch,
 /area/mainship/patrol_base/som/hanger)
 "Tz" = (
-/obj/machinery/computer/camera_advanced/overwatch/som/whiskey,
+/obj/machinery/computer/camera_advanced/overwatch/military/som/whiskey,
 /turf/open/floor/mainship/red{
 	dir = 5
 	},
@@ -3842,7 +3842,7 @@
 /turf/open/floor/mainship/red,
 /area/mainship/patrol_base/som)
 "VP" = (
-/obj/machinery/computer/camera_advanced/overwatch/main/som,
+/obj/machinery/computer/camera_advanced/overwatch/military/main/som,
 /turf/open/floor/mainship/red{
 	dir = 1
 	},

_maps/map_files/Iteron/Iteron.dmm

@@ -1095,7 +1095,7 @@
 /turf/open/floor/prison/plate,
 /area/mainship/patrol_base)
 "pk" = (
-/obj/machinery/computer/camera_advanced/overwatch/bravo,
+/obj/machinery/computer/camera_advanced/overwatch/military/bravo,
 /turf/open/floor/mainship/blue{
 	dir = 1
 	},
@@ -2143,7 +2143,7 @@
 /turf/open/floor/mainship/mono,
 /area/mainship/patrol_base/barracks)
 "DD" = (
-/obj/machinery/computer/camera_advanced/overwatch/alpha,
+/obj/machinery/computer/camera_advanced/overwatch/military/alpha,
 /turf/open/floor/mainship/blue{
 	dir = 1
 	},
@@ -2201,7 +2201,7 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/mainship/patrol_base/command)
 "EI" = (
-/obj/machinery/computer/camera_advanced/overwatch/main,
+/obj/machinery/computer/camera_advanced/overwatch/military/main,
 /obj/structure/platform{
 	dir = 8
 	},
@@ -2558,7 +2558,7 @@
 	},
 /area/mainship/patrol_base/command)
 "Iw" = (
-/obj/machinery/computer/camera_advanced/overwatch/charlie,
+/obj/machinery/computer/camera_advanced/overwatch/military/charlie,
 /turf/open/floor/mainship/blue,
 /area/mainship/patrol_base/command)
 "IE" = (
@@ -3151,7 +3151,7 @@
 /turf/open/floor/mainship/blue,
 /area/mainship/patrol_base/command)
 "Sh" = (
-/obj/machinery/computer/camera_advanced/overwatch/delta,
+/obj/machinery/computer/camera_advanced/overwatch/military/delta,
 /turf/open/floor/mainship/blue,
 /area/mainship/patrol_base/command)
 "Si" = (

_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm

@@ -2098,7 +2098,7 @@
 /area/mainship/living/numbertwobunks)
 "cBW" = (
 /obj/structure/table/mainship/nometal,
-/obj/machinery/computer/camera_advanced/overwatch/charlie,
+/obj/machinery/computer/camera_advanced/overwatch/military/charlie,
 /turf/open/floor/mainship/emerald{
 	dir = 4
 	},
@@ -2784,7 +2784,7 @@
 	},
 /area/mainship/squads/req)
 "dph" = (
-/obj/machinery/computer/camera_advanced/overwatch/alpha,
+/obj/machinery/computer/camera_advanced/overwatch/military/alpha,
 /turf/open/floor/mainship/red{
 	dir = 4
 	},
@@ -18301,7 +18301,7 @@
 /obj/structure/window/reinforced/toughened{
 	dir = 8
 	},
-/obj/machinery/computer/camera_advanced/overwatch/main,
+/obj/machinery/computer/camera_advanced/overwatch/military/main,
 /turf/open/floor/plating/mainship,
 /area/mainship/command/cic)
 "wRN" = (
@@ -19100,7 +19100,7 @@
 /area/mainship/hallways/hangar)
 "xIq" = (
 /obj/structure/table/mainship/nometal,
-/obj/machinery/computer/camera_advanced/overwatch/delta,
+/obj/machinery/computer/camera_advanced/overwatch/military/delta,
 /turf/open/floor/mainship/blue{
 	dir = 8
 	},
@@ -19509,7 +19509,7 @@
 /turf/open/floor/mainship/mono,
 /area/mainship/squads/req)
 "ycp" = (
-/obj/machinery/computer/camera_advanced/overwatch/bravo,
+/obj/machinery/computer/camera_advanced/overwatch/military/bravo,
 /turf/open/floor/mainship/orange{
 	dir = 8
 	},

_maps/map_files/Sulaco/TGS_Sulaco.dmm

@@ -3367,7 +3367,7 @@
 /obj/structure/window/reinforced/toughened{
 	dir = 8
 	},
-/obj/machinery/computer/camera_advanced/overwatch/main,
+/obj/machinery/computer/camera_advanced/overwatch/military/main,
 /obj/structure/table/reinforced,
 /turf/open/floor/prison/bright_clean,
 /area/sulaco/bridge)

_maps/map_files/Theseus/TGS_Theseus.dmm

@@ -12888,7 +12888,7 @@
 "lkZ" = (
 /obj/structure/table/mainship/nometal,
 /obj/structure/window/reinforced/toughened,
-/obj/machinery/computer/camera_advanced/overwatch/main,
+/obj/machinery/computer/camera_advanced/overwatch/military/main,
 /turf/open/floor/mainship/silver,
 /area/mainship/command/cic)
 "llf" = (
@@ -16613,14 +16613,14 @@
 /area/mainship/command/bridge)
 "rau" = (
 /obj/structure/table/mainship/nometal,
-/obj/machinery/computer/camera_advanced/overwatch/charlie,
+/obj/machinery/computer/camera_advanced/overwatch/military/charlie,
 /turf/open/floor/mainship/silver{
 	dir = 4
 	},
 /area/mainship/command/cic)
 "raw" = (
 /obj/structure/table/mainship/nometal,
-/obj/machinery/computer/camera_advanced/overwatch/delta,
+/obj/machinery/computer/camera_advanced/overwatch/military/delta,
 /turf/open/floor/mainship/silver{
 	dir = 8
 	},
@@ -20120,7 +20120,7 @@
 	pixel_x = 17;
 	pixel_y = 16
 	},
-/obj/machinery/computer/camera_advanced/overwatch/alpha,
+/obj/machinery/computer/camera_advanced/overwatch/military/alpha,
 /obj/structure/table/mainship/nometal,
 /turf/open/floor/mainship/silver{
 	dir = 4
@@ -20136,7 +20136,7 @@
 	pixel_x = -17;
 	pixel_y = 16
 	},
-/obj/machinery/computer/camera_advanced/overwatch/bravo,
+/obj/machinery/computer/camera_advanced/overwatch/military/bravo,
 /obj/structure/table/mainship/nometal,
 /turf/open/floor/mainship/mono,
 /area/mainship/command/cic)

_maps/map_files/debugdalus/tgs_debugdalus.dmm

@@ -760,7 +760,7 @@
 	pixel_x = 17;
 	pixel_y = 16
 	},
-/obj/machinery/computer/camera_advanced/overwatch/alpha,
+/obj/machinery/computer/camera_advanced/overwatch/military/alpha,
 /obj/structure/table/mainship,
 /turf/open/floor/mainship,
 /area/mainship/command/cic)
@@ -774,7 +774,7 @@
 	pixel_x = -17;
 	pixel_y = 16
 	},
-/obj/machinery/computer/camera_advanced/overwatch/bravo,
+/obj/machinery/computer/camera_advanced/overwatch/military/bravo,
 /obj/structure/table/mainship,
 /turf/open/floor/mainship,
 /area/mainship/command/cic)
@@ -1073,7 +1073,7 @@
 	dir = 4
 	},
 /obj/structure/window/reinforced/toughened,
-/obj/machinery/computer/camera_advanced/overwatch/main,
+/obj/machinery/computer/camera_advanced/overwatch/military/main,
 /turf/open/floor/mainship,
 /area/mainship/command/cic)
 "aeW" = (
@@ -1273,7 +1273,7 @@
 /area/mainship/command/cic)
 "aga" = (
 /obj/structure/table/mainship,
-/obj/machinery/computer/camera_advanced/overwatch/charlie,
+/obj/machinery/computer/camera_advanced/overwatch/military/charlie,
 /turf/open/floor/mainship,
 /area/mainship/command/cic)
 "agb" = (
@@ -1951,7 +1951,7 @@
 /area/mainship/medical/lower_medical)
 "aiS" = (
 /obj/structure/table/mainship,
-/obj/machinery/computer/camera_advanced/overwatch/delta,
+/obj/machinery/computer/camera_advanced/overwatch/military/delta,
 /turf/open/floor/mainship,
 /area/mainship/command/cic)
 "aiT" = (

_maps/map_files/oscar_outpost/oscar_outpost.dmm

@@ -7093,7 +7093,7 @@
 /obj/structure/window{
 	dir = 8
 	},
-/obj/machinery/computer/camera_advanced/overwatch/main,
+/obj/machinery/computer/camera_advanced/overwatch/military/main,
 /turf/open/floor/tile/dark,
 /area/oscar_outpost/base)
 "NR" = (

code/__DEFINES/jobs.dm

@@ -124,6 +124,17 @@ SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_CORPSMAN, SOM
 GLOBAL_LIST_INIT(jobs_xenos, list(ROLE_XENOMORPH, ROLE_XENO_QUEEN))
 GLOBAL_LIST_INIT(jobs_fallen_marine, typecacheof(list(/datum/job/fallen/marine), TRUE))
 
+///Is an SL type job
+GLOBAL_LIST_INIT(jobs_squad_leader, list(SQUAD_LEADER, SOM_SQUAD_LEADER))
+///Is a corpsman type job
+GLOBAL_LIST_INIT(jobs_squad_corpsman, list(SQUAD_CORPSMAN, SOM_SQUAD_CORPSMAN))
+///Is a engineer type job
+GLOBAL_LIST_INIT(jobs_squad_engineer, list(SQUAD_ENGINEER, SOM_SQUAD_ENGINEER))
+///Is a specialist type job
+GLOBAL_LIST_INIT(jobs_squad_specialist, list(SQUAD_SMARTGUNNER, SOM_SQUAD_VETERAN))
+///Is a squad standard type job
+GLOBAL_LIST_INIT(jobs_squad_standard, list(SQUAD_MARINE, SOM_SQUAD_MARINE))
+
 //Playtime tracking system, see jobs_exp.dm
 #define EXP_TYPE_LIVING "Living"
 #define EXP_TYPE_REGULAR_ALL "Any"