Merge branch 'project/fax_responders/l_devices' into project/fax_resp…

…onders/test_merge

code/__DEFINES/mob_hud.dm

@@ -13,8 +13,6 @@
 #define XENO_HOSTILE_SLOW "13" // xeno-inflicted slow. used by a bunch of MOBA xenos stuff
 #define XENO_HOSTILE_TAG "14" // dancer prae 'tag'
 #define XENO_HOSTILE_FREEZE "15" // Any xeno-inflifcted root
-#define XENO_EXECUTE "28" // Execute thershold, vampire
-
 #define HEALTH_HUD_XENO "16" // health HUD for xenos
 #define PLASMA_HUD "17" // indicates the plasma level of xenos.
 #define PHEROMONE_HUD "18" // indicates which pheromone is active on a xeno.
@@ -27,7 +25,9 @@
 #define HUNTER_CLAN "25" //Displays a colored icon to represent ingame Hunter Clans
 #define HUNTER_HUD "26" //Displays various statuses on mobs for Hunters to identify targets
 #define HOLOCARD_HUD "27" //Displays the holocards set by medical personnel
+#define XENO_EXECUTE "28" // Execute thershold, vampire
 #define NEW_PLAYER_HUD "29" //Makes it easy to see new players.
+#define SPYCAM_HUD "30" //Remote control spy cameras.
 
 //data HUD (medhud, sechud) defines
 #define MOB_HUD_SECURITY_BASIC 1
@@ -49,6 +49,7 @@
 #define MOB_HUD_HUNTER_CLAN 17
 #define MOB_HUD_EXECUTE 18
 #define MOB_HUD_NEW_PLAYER 19
+#define MOB_HUD_SPYCAMS 20
 
 //for SL/FTL/LZ targeting on locator huds
 #define TRACKER_SL "track_sl"

code/__DEFINES/mode.dm

@@ -310,6 +310,11 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_LIST_MARINE_UPP list(FACTION_MARINE, FACTION_UPP)
 #define FACTION_LIST_MARINE_TWE list(FACTION_MARINE, FACTION_TWE)
 #define FACTION_LIST_YAUTJA list(FACTION_YAUTJA)
+#define FACTION_LIST_COLONY list(FACTION_SURVIVOR, FACTION_COLONIST)
+#define FACTION_LIST_NEUTRAL list(FACTION_NEUTRAL)
+
+/// The list of factions loosely allied with the USCM
+#define FACTION_LIST_MARINE_FAXES list(FACTION_MARINE, FACTION_WY, FACTION_MARSHAL, FACTION_TWE)
 
 // Xenomorphs
 #define FACTION_PREDALIEN "Predalien"

code/__DEFINES/radio.dm

@@ -66,6 +66,11 @@
 #define RADIO_CHANNEL_BUG_A "Listening Device A"
 #define RADIO_CHANNEL_BUG_B "Listening Device B"
 
+//Fax Responder Bugs
+#define RADIO_CHANNEL_FAX_WY "WY Monitor"
+#define RADIO_CHANNEL_FAX_USCM_HC "USCM-HC Monitor"
+#define RADIO_CHANNEL_FAX_USCM_PVST "Provost Monitor"
+
 //1-Channel ERTs
 #define RADIO_CHANNEL_DUTCH_DOZEN "DD"
 #define RADIO_CHANNEL_VAI "VAI"

code/__DEFINES/typecheck/mobs_generic.dm

@@ -20,3 +20,5 @@
 #define isnewplayer(A) (istype(A, /mob/new_player))
 #define isHellhound(A) (istype(A, /mob/living/carbon/xenomorph/hellhound))
 #define isaghost(A) (copytext(A.key, 1, 2) == "@")
+
+#define ishologram(A) (istype(A, /mob/hologram))

code/_globalvars/lists/mapping_globals.dm

@@ -33,6 +33,7 @@ GLOBAL_LIST_EMPTY(zombie_landmarks)
 
 GLOBAL_LIST_EMPTY(newplayer_start)
 GLOBAL_LIST_EMPTY_TYPED(observer_starts, /obj/effect/landmark/observer_start)
+GLOBAL_LIST_EMPTY_TYPED(spycam_starts, /obj/effect/landmark/spycam_start)
 
 GLOBAL_LIST_EMPTY(map_items)
 GLOBAL_LIST_EMPTY(xeno_tunnels)

code/controllers/subsystem/communications.dm

@@ -103,10 +103,15 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
 #define CLF_MED_FREQ 1274
 #define CLF_CCT_FREQ 1275
 
-//Listening Bugs (1290-1291)
+//Listening Bugs (1290-1295)
 #define BUG_A_FREQ 1290
 #define BUG_B_FREQ 1291
 
+//Listening Bugs (1296-1300)
+#define FAX_WY_FREQ 1296
+#define FAX_USCM_HC_FREQ 1297
+#define FAX_USCM_PVST_FREQ 1298
+
 //General Radio
 #define MIN_FREQ 1460 // ------------------------------------------------------
 #define PUB_FREQ 1461
@@ -210,6 +215,10 @@ GLOBAL_LIST_INIT(radiochannels, list(
 
 	RADIO_CHANNEL_BUG_A = BUG_A_FREQ,
 	RADIO_CHANNEL_BUG_B = BUG_B_FREQ,
+
+	RADIO_CHANNEL_FAX_WY = FAX_WY_FREQ,
+	RADIO_CHANNEL_FAX_USCM_HC = FAX_USCM_HC_FREQ,
+	RADIO_CHANNEL_FAX_USCM_PVST = FAX_USCM_PVST_FREQ,
 ))
 
 // Response Teams
@@ -227,6 +236,9 @@ GLOBAL_LIST_INIT(radiochannels, list(
 //Listening Device Frequencies
 #define BUG_FREQS list(BUG_A_FREQ, BUG_B_FREQ)
 
+//Fax Responder internal monitor frequencies
+#define FAX_RESP_FREQS list(FAX_WY_FREQ, FAX_USCM_HC_FREQ, FAX_USCM_PVST_FREQ)
+
 //Depts - used for colors in headset.dm, as well as deciding what the marine comms tower can listen into
 #define DEPT_FREQS list(COMM_FREQ, MED_FREQ, ENG_FREQ, SEC_FREQ, SENTRY_FREQ, ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ, ECHO_FREQ, CRYO_FREQ, REQ_FREQ, JTAC_FREQ, INTEL_FREQ, WY_FREQ)
 
@@ -304,6 +316,9 @@ SUBSYSTEM_DEF(radio)
 		"[CLF_ENGI_FREQ]" = "opforeng",
 		"[CLF_MED_FREQ]" = "opformed",
 		"[CLF_CCT_FREQ]" = "opforcct",
+		"[FAX_WY_FREQ]" = "airadio",
+		"[FAX_USCM_HC_FREQ]" = "aiprivradio",
+		"[FAX_USCM_PVST_FREQ]" = "aiprivradio",
 	)
 
 /datum/controller/subsystem/radio/proc/add_object(obj/device as obj, new_frequency as num, filter = null as text|null)

code/datums/mob_hud.dm

@@ -21,6 +21,7 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 	MOB_HUD_HUNTER_CLAN = new /datum/mob_hud/hunter_clan(),
 	MOB_HUD_EXECUTE = new /datum/mob_hud/execute_hud(),
 	MOB_HUD_NEW_PLAYER = new /datum/mob_hud/new_player(),
+	MOB_HUD_SPYCAMS = new /datum/mob_hud/spy_cams(),
 	))
 
 /datum/mob_hud
@@ -219,6 +220,9 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 /datum/mob_hud/faction/observer
 	hud_icons = list(FACTION_HUD, ORDER_HUD, HUNTER_CLAN, HOLOCARD_HUD)
 
+/datum/mob_hud/spy_cams
+	hud_icons = list(SPYCAM_HUD)
+
 ///////// MOB PROCS //////////////////////////////:
 
 

code/game/gamemodes/game_mode.dm

@@ -48,6 +48,11 @@ GLOBAL_VAR_INIT(cas_tracking_id_increment, 0) //this var used to assign unique t
 	if(taskbar_icon)
 		GLOB.available_taskbar_icons |= taskbar_icon
 
+	//loaded_fax_base = SSmapping.lazy_load_template(/datum/lazy_template/fax_response_base, force = TRUE)
+	//if(!loaded_fax_base)
+	//	log_debug("Error loading fax response base!")
+	//	return FALSE
+
 /datum/game_mode/proc/announce() //to be calles when round starts
 	to_world("<B>Notice</B>: [src] did not define announce()")
 

code/game/machinery/camera/camera.dm

@@ -38,6 +38,8 @@
 	var/autoname = FALSE
 	var/autonumber = 0 //camera number in area
 
+	var/list/owner_factions = FACTION_LIST_NEUTRAL
+
 GLOBAL_LIST_EMPTY_TYPED(all_cameras, /obj/structure/machinery/camera)
 /obj/structure/machinery/camera/Initialize(mapload, ...)
 	. = ..()
@@ -314,6 +316,9 @@ GLOBAL_LIST_EMPTY_TYPED(all_cameras, /obj/structure/machinery/camera)
 	linked_broadcasting = camera_item
 	c_tag = linked_broadcasting.get_broadcast_name()
 
+/obj/structure/machinery/camera/overwatch
+	network = list(CAMERA_NET_OVERWATCH)
+
 /obj/structure/machinery/camera/mortar
 	alpha = 0
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT

code/game/machinery/camera/presets.dm

@@ -59,6 +59,7 @@
 	icon = 'icons/obj/vehicles/interiors/general.dmi'
 	icon_state = "vehicle_camera"
 	network = list(CAMERA_NET_VEHICLE)
+	owner_factions = FACTION_LIST_HUMANOID
 
 /obj/structure/machinery/camera/vehicle/toggle_cam_status(on = FALSE)
 	if(on)
@@ -85,6 +86,7 @@
 /obj/structure/machinery/camera/autoname/almayer
 	name = "military-grade camera"
 	network = list(CAMERA_NET_ALMAYER)
+	owner_factions = FACTION_LIST_MARINE_WY
 
 /obj/structure/machinery/camera/autoname/almayer/containment
 	name = "containment camera"
@@ -97,6 +99,7 @@
 
 /obj/structure/machinery/camera/autoname/almayer/containment/hidden
 	network = list(CAMERA_NET_CONTAINMENT_HIDDEN)
+	owner_factions = FACTION_LIST_WY
 
 /obj/structure/machinery/camera/autoname/almayer/containment/ares
 	name = "ares core camera"
@@ -118,6 +121,7 @@
 
 	colony_camera_mapload = FALSE
 	emp_proof = TRUE
+	owner_factions = FACTION_LIST_HUMANOID
 
 /obj/structure/machinery/camera/autoname/lz_camera/ex_act()
 	return