Remote Monitoring Cameras

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

@@ -277,9 +277,10 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_YAUTJA "Yautja"
 #define FACTION_ZOMBIE "Zombie"
 #define FACTION_MONKEY "Monkey" // Nanu
+#define FACTION_FAX "Fax Responder"
 
 #define FACTION_LIST_MARINE list(FACTION_MARINE)
-#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE)
+#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE, FACTION_FAX)
 #define FACTION_LIST_ERT_OTHER list(FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO)
 #define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE)
 #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
@@ -296,6 +297,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/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/datums/langchat/langchat.dm

@@ -113,6 +113,10 @@
 
 	langchat_listeners = listeners
 	for(var/mob/M in langchat_listeners)
+		if(ishologram(M))
+			var/mob/hologram/holo = M
+			if(holo.linked_mob)
+				langchat_listeners += holo.linked_mob
 		if(langchat_client_enabled(M) && !M.ear_deaf && (skip_language_check || M.say_understands(src, language)))
 			M.client.images += langchat_image
 
@@ -160,6 +164,10 @@
 
 	langchat_listeners = listeners
 	for(var/mob/M in langchat_listeners)
+		if(ishologram(M))
+			var/mob/hologram/holo = M
+			if(holo.linked_mob)
+				langchat_listeners += holo.linked_mob
 		if(langchat_client_enabled(M) && !M.ear_deaf && M.say_understands(src, language))
 			M.client.images += langchat_image
 

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/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