TGS Test Merge (#7165)

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

@@ -292,6 +292,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/paperwork.dm

@@ -0,0 +1,18 @@
+#define PAPER_CATEGORY_USCM "USCM"
+#define PAPER_CATEGORY_USCM_HC "USCM HC"
+
+#define PAPER_CATEGORY_MP "Military Police"
+#define PAPER_CATEGORY_PROVOST "Provost"
+
+#define PAPER_CATEGORY_LIAISON "WY Liaison"
+#define PAPER_CATEGORY_WEYYU_HC "Weyland Yutani"
+
+#define PAPER_CATEGORY_UPP_HC "UPP HC"
+
+#define PAPER_CATEGORY_CMB_HC "CMB HC"
+
+#define PAPER_CATEGORY_CLF_HC "CLF HC"
+
+#define PAPER_CATEGORY_TWE_HC "TWE HC"
+
+#define PAPER_CATEGORY_PRESS_HC "PRESS HC"

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

@@ -108,6 +108,11 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
 #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
@@ -212,6 +217,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
@@ -229,6 +238,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)
 
@@ -307,6 +319,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/datums/skills/civilian.dm

@@ -250,8 +250,9 @@ CIVILIAN
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
 		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
-		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
+		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 		SKILL_INTEL = SKILL_INTEL_EXPERT,
+		SKILL_POLICE = SKILL_POLICE_MAX,
 	)

code/game/area/admin_level.dm

@@ -142,9 +142,18 @@
 	soundscape_playlist = SCAPE_PL_ELEVATOR_MUSIC
 	icon_state = "yellow"
 
+//Fax Responder areas
 /area/adminlevel/ert_station/fax_response_station
 	name = "Sector Comms Relay"
 	icon_state = "green"
+	unlimited_power = TRUE
+
+/area/adminlevel/ert_station/fax_response_station/exterior
+	name = "Sector Comms Relay"
+	icon_state = "red"
+	ambience_exterior = AMBIENCE_JUNGLE
+	//ambience = list('sound/ambience/jungle_amb1.ogg')
+	base_lighting_alpha = 185
 
 //Simulation area
 /area/adminlevel/simulation

code/game/bioscans.dm

@@ -52,6 +52,8 @@ GLOBAL_DATUM_INIT(bioscan_data, /datum/bioscan_data, new)
 	for(var/mob/current_mob as anything in GLOB.living_xeno_list)
 		if(current_mob.mob_flags & NOBIOSCAN)
 			continue
+		if(istype(get_turf(current_mob), /area/adminlevel/ert_station/fax_response_station))
+			continue
 		var/area/A = get_area(current_mob)
 		if(A?.flags_area & AREA_AVOID_BIOSCAN)
 			xenos_on_ship++
@@ -70,6 +72,8 @@ GLOBAL_DATUM_INIT(bioscan_data, /datum/bioscan_data, new)
 	for(var/mob/living/carbon/human/current_human as anything in GLOB.alive_human_list)
 		if(current_human.mob_flags & NOBIOSCAN)
 			continue
+		if(istype(get_turf(current_human), /area/adminlevel/ert_station/fax_response_station))
+			continue
 		var/atom/where = current_human
 		if(isspecieshuman(current_human))
 			if (where.z == 0 && current_human.loc)

code/game/gamemodes/cm_initialize.dm

@@ -321,9 +321,8 @@ Additional game mode variables.
 		log_debug("Null client attempted to transform_fax_responder")
 		return FALSE
 	if(!loaded_fax_base)
-		loaded_fax_base = SSmapping.lazy_load_template(/datum/lazy_template/fax_response_base, force = TRUE)
+		load_fax_base()
 		if(!loaded_fax_base)
-			log_debug("Error loading fax response base!")
 			return FALSE
 
 	responder_candidate.client.prefs.find_assigned_slot(JOB_FAX_RESPONDER)
@@ -344,11 +343,18 @@ Additional game mode variables.
 	GLOB.RoleAuthority.equip_role(new_responder, fax_responder_job, new_responder.loc)
 	SSticker.minds += new_responder.mind
 
-	message_admins(FONT_SIZE_XL(SPAN_RED("([new_responder.key]) joined as a [sub_job], [new_responder.real_name].")))
+	message_admins(FONT_SIZE_XL(SPAN_RED("[key_name(new_responder)] joined as a [sub_job].")))
 	new_responder.add_fax_responder()
 
 	return TRUE
 
+/datum/game_mode/proc/load_fax_base()
+	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
+	return TRUE
+
 
 //===================================================\\
 

code/game/gamemodes/cm_process.dm

@@ -186,7 +186,7 @@ GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES)
 	var/num_xenos = 0
 	for(var/i in GLOB.living_xeno_list)
 		var/mob/M = i
-		if(M.z && (M.z in z_levels) && !istype(M.loc, /turf/open/space)) //If they have a z var, they are on a turf.
+		if(M.z && (M.z in z_levels) && !istype(M.loc, /turf/open/space) && !istype(M.loc, /area/adminlevel/ert_station/fax_response_station)) //If they have a z var, they are on a turf.
 			num_xenos++
 	return num_xenos
 
@@ -195,7 +195,7 @@ GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES)
 	var/num_xenos = 0
 
 	for(var/mob/M in GLOB.player_list)
-		if(M.z && (M.z in z_levels) && M.stat != DEAD && !istype(M.loc, /turf/open/space)) //If they have a z var, they are on a turf.
+		if(M.z && (M.z in z_levels) && M.stat != DEAD && !istype(M.loc, /turf/open/space) && !istype(M.loc, /area/adminlevel/ert_station/fax_response_station)) //If they have a z var, they are on a turf.
 			if(ishuman(M) && !isyautja(M) && !(M.status_flags & XENO_HOST) && !iszombie(M))
 				var/mob/living/carbon/human/H = M
 				if(((H.species && H.species.name == "Human") || (H.is_important)) && !H.hivenumber) //only real humans count, or those we have set to also be included
@@ -225,7 +225,7 @@ GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES)
 
 	for(var/i in GLOB.alive_human_list)
 		var/mob/M = i
-		if(M.z && (M.z in z_levels) && !istype(M.loc, /turf/open/space))
+		if(M.z && (M.z in z_levels) && !istype(M.loc, /turf/open/space) && !istype(M.loc, /area/adminlevel/ert_station/fax_response_station))
 			if(M.faction in FACTION_LIST_WY)
 				num_pmcs++
 			else if(M.faction == FACTION_MARINE)
@@ -238,7 +238,7 @@ GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES)
 
 	for(var/i in GLOB.alive_human_list)
 		var/mob/M = i
-		if(M.z && (M.z in z_levels) && !istype(M.loc, /turf/open/space))
+		if(M.z && (M.z in z_levels) && !istype(M.loc, /turf/open/space) && !istype(M.loc, /area/adminlevel/ert_station/fax_response_station))
 			if(M.faction == FACTION_MARINE)
 				num_marines++
 
@@ -252,7 +252,7 @@ GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES)
 	var/num_headcount = 0
 
 	for(var/mob/living/carbon/human/current_human as anything in GLOB.alive_human_list)
-		if(!(current_human.z && (current_human.z in z_levels) && !istype(current_human.loc, /turf/open/space)))
+		if(!(current_human.z && (current_human.z in z_levels) && !istype(current_human.loc, /turf/open/space) && !istype(current_human.loc, /area/adminlevel/ert_station/fax_response_station)))
 			continue
 		if((current_human.faction in FACTION_LIST_WY) || current_human.job == "Corporate Liaison") //The CL is assigned the USCM faction for gameplay purposes
 			num_WY++

code/game/gamemodes/colonialmarines/xenovsxeno.dm

@@ -205,7 +205,7 @@
 		hivenumbers += list(HS.name = list())
 
 	for(var/mob/M in GLOB.player_list)
-		if(M.z && (M.z in z_levels) && M.stat != DEAD && !istype(M.loc, /turf/open/space)) //If they have a z var, they are on a turf.
+		if(M.z && (M.z in z_levels) && M.stat != DEAD && !istype(M.loc, /turf/open/space) && !istype(M.loc, /area/adminlevel/ert_station/fax_response_station)) //If they have a z var, they are on a turf.
 			var/mob/living/carbon/xenomorph/X = M
 			var/datum/hive_status/hive = GLOB.hive_datum[X.hivenumber]
 			if(!hive)

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)
@@ -92,6 +93,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"
@@ -104,6 +106,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"
@@ -125,6 +128,7 @@
 
 	colony_camera_mapload = FALSE
 	emp_proof = TRUE
+	owner_factions = FACTION_LIST_HUMANOID
 
 /obj/structure/machinery/camera/autoname/lz_camera/ex_act()
 	return