Merge branch 'master' into izac-voreupdate

code/__defines/machinery.dm

@@ -67,6 +67,9 @@ var/global/defer_powernet_rebuild = 0      // True if net rebuild will be called
 #define NETWORK_SECURITY "Security"
 #define NETWORK_INTERROGATION "Interrogation"
 #define NETWORK_TELECOM "Tcomms"
+#define NETWORK_TCOMMS "Telecommunications"	//YW ADD: needs to be defined here or it freaks out
+#define NETWORK_OUTSIDE "Outside"		//YW ADD: ditto
+#define NETWORK_SUBSTATIONS "Substations"	//YW ADD: and again
 #define NETWORK_THUNDER "Entertainment"		//VOREStation Edit: broader definition
 #define NETWORK_COMMUNICATORS "Communicators"
 #define NETWORK_ALARM_ATMOS "Atmosphere Alarms"

code/game/jobs/access_datum_yw.dm

@@ -10,10 +10,10 @@
 	desc = "Blueshield Special Access"
 	region = ACCESS_REGION_COMMAND
 
-var/const/access_sar = 68
+var/const/access_fieldmedic = 68
 /datum/access/fieldmedic
-	id = access_sar
-	desc = "Search and Rescue"
+	id = access_fieldmedic
+	desc = "Field Medic"
 	region = ACCESS_REGION_MEDBAY
 	
 var/const/access_pathfinder = 69

code/game/machinery/camera/presets.dm

@@ -80,6 +80,9 @@ var/global/list/engineering_networks = list(
 
 /obj/machinery/camera/network/northern_star
 	network = list(NETWORK_NORTHERN_STAR)
+	
+/obj/machinery/camera/network/outside
+	network = list(NETWORK_OUTSIDE)
 
 /obj/machinery/camera/network/prison
 	network = list(NETWORK_PRISON)
@@ -99,8 +102,11 @@ var/global/list/engineering_networks = list(
 /obj/machinery/camera/network/security
 	network = list(NETWORK_SECURITY)
 
+/obj/machinery/camera/network/substations
+	network = list(NETWORK_SUBSTATIONS)
+
 /obj/machinery/camera/network/telecom
-	network = list(NETWORK_TELECOM)
+	network = list(NETWORK_TCOMMS) //yw edit
 
 /obj/machinery/camera/network/thunder
 	network = list(NETWORK_THUNDER)
@@ -146,6 +152,12 @@ var/global/list/engineering_networks = list(
 /obj/machinery/camera/motion/security
 	network = list(NETWORK_SECURITY)
 
+/obj/machinery/camera/motion/command
+	network = list(NETWORK_COMMAND)
+	
+/obj/machinery/camera/motion/telecom
+	network = list(NETWORK_TCOMMS) //yw edit
+
 // ALL UPGRADES
 
 

maps/yw/cryogaia_defines.dm

@@ -70,6 +70,7 @@
 							NETWORK_CRYOGAIA,
 							NETWORK_ENGINE,
 							NETWORK_ENGINEERING,
+							NETWORK_SUBSTATIONS,
 							NETWORK_EXPLORATION,
 							//NETWORK_DEFAULT,  //Is this even used for anything? Robots show up here, but they show up in ROBOTS network too,
 							NETWORK_MEDICAL,

maps/yw/cryogaia_jobs.dm

@@ -112,8 +112,8 @@
 	economic_modifier = 6
 	minimal_player_age = 3
 	pto_type = PTO_EXPLORATION
-	access = list(access_medical, access_medical_equip, access_eva, access_maint_tunnels, access_external_airlocks, access_sar, access_chemistry) //restoring chemistry access. FMs need it to mix meds, and they're basically just glorified EMTs - who also have chemistry access.
-	minimal_access = list(access_medical, access_medical_equip, access_eva, access_sar)
+	access = list(access_medical, access_medical_equip, access_eva, access_maint_tunnels, access_external_airlocks, access_fieldmedic, access_chemistry) //restoring chemistry access. FMs need it to mix meds, and they're basically just glorified EMTs - who also have chemistry access.
+	minimal_access = list(access_medical, access_medical_equip, access_eva, access_fieldmedic)
 	outfit_type = /decl/hierarchy/outfit/job/medical/sar
 	job_description = "A Field Medic works as the field doctor of expedition teams."
 

maps/yw/structures/closets/misc.dm

@@ -79,7 +79,7 @@
 	icon_opened = "medicalopen"
 	icon_broken = "medicalbroken"
 	icon_off = "medicaloff"
-	req_access = list(access_sar)
+	req_access = list(access_fieldmedic)
 
 	starts_with = list(
 		/obj/item/weapon/storage/backpack/dufflebag/emt,