Updates Part Seven

code/modules/modular_computers/computers/item/modular_computer.dm

@@ -776,4 +776,11 @@
 		if(HALLOSS)
 			take_damage(Proj.damage, Proj.damage / 3, 0)
 		if(BURN)
-			take_damage(Proj.damage, Proj.damage / 1.5) 
+			take_damage(Proj.damage, Proj.damage / 1.5)
+
+// Used by camera monitor program
+/obj/item/modular_computer/check_eye(var/mob/user)
+	if(active_program)
+		return active_program.check_eye(user)
+	else
+		return ..()

code/modules/modular_computers/computers/machinery/console_presets.dm

@@ -17,7 +17,6 @@
 		cpu.battery_module = new/obj/item/weapon/computer_hardware/battery_module/super(cpu)
 	install_programs()
 
-// Override in child types to install preset-specific programs.
 /obj/machinery/modular_computer/console/preset/proc/install_programs()
 	return
 
@@ -31,6 +30,7 @@
 	cpu.hard_drive.store_file(new/datum/computer_file/program/alarm_monitor())
 	cpu.hard_drive.store_file(new/datum/computer_file/program/atmos_control())
 	cpu.hard_drive.store_file(new/datum/computer_file/program/rcon_console())
+	cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
 
 
 // ===== MEDICAL CONSOLE =====
@@ -40,6 +40,7 @@
 
 /obj/machinery/modular_computer/console/preset/medical/install_programs()
 	cpu.hard_drive.store_file(new/datum/computer_file/program/suit_sensors())
+	cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
 
 
 // ===== RESEARCH CONSOLE =====
@@ -51,6 +52,7 @@
 	cpu.hard_drive.store_file(new/datum/computer_file/program/ntnetmonitor())
 	cpu.hard_drive.store_file(new/datum/computer_file/program/nttransfer())
 	cpu.hard_drive.store_file(new/datum/computer_file/program/chatclient())
+	cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
 
 
 // ===== COMMAND CONSOLE =====
@@ -64,6 +66,7 @@
 	cpu.hard_drive.store_file(new/datum/computer_file/program/chatclient())
 	cpu.hard_drive.store_file(new/datum/computer_file/program/card_mod())
 	cpu.hard_drive.store_file(new/datum/computer_file/program/comm())
+	cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
 
 
 // ===== SECURITY CONSOLE =====
@@ -72,7 +75,7 @@
 	 desc = "A stationary computer. This one comes preloaded with security programs."
 
 /obj/machinery/modular_computer/console/preset/security/install_programs()
-	return // No security programs exist, yet, but the preset is ready so it may be mapped in.
+	cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
 
 
 // ===== CIVILIAN CONSOLE =====
@@ -83,3 +86,27 @@
 /obj/machinery/modular_computer/console/preset/civilian/install_programs()
 	cpu.hard_drive.store_file(new/datum/computer_file/program/chatclient())
 	cpu.hard_drive.store_file(new/datum/computer_file/program/nttransfer())
+	cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor()) // Mainly for the entertainment channel, won't allow connection to other channels without access anyway
+
+// ===== ERT CONSOLE =====
+/obj/machinery/modular_computer/console/preset/ert
+	 console_department = "Crescent"
+	 desc = "A stationary computer. This one comes preloaded with various programs used by Nanotrasen response teams."
+
+/obj/machinery/modular_computer/console/preset/ert/install_programs()
+	cpu.hard_drive.store_file(new/datum/computer_file/program/nttransfer())
+	cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor/ert())
+	cpu.hard_drive.store_file(new/datum/computer_file/program/alarm_monitor())
+	cpu.hard_drive.store_file(new/datum/computer_file/program/comm())
+
+// ===== MERCENARY CONSOLE =====
+/obj/machinery/modular_computer/console/preset/mercenary
+	 console_department = "Unset"
+	 desc = "A stationary computer. This one comes preloaded with various programs used by shady organizations."
+	 _has_printer = 1
+	 _has_id_slot = 1
+	 emagged = 1		// Allows download of other antag programs for free.
+
+/obj/machinery/modular_computer/console/preset/ert/install_programs()
+	cpu.hard_drive.store_file(new/datum/computer_file/program/camera_monitor/hacked())
+	cpu.hard_drive.store_file(new/datum/computer_file/program/alarm_monitor())

code/modules/modular_computers/computers/machinery/modular_computer.dm

@@ -190,4 +190,7 @@
 	if(cpu)
 		cpu.bullet_act(Proj)
 
-
+/obj/machinery/modular_computer/check_eye(var/mob/user)
+	if(cpu)
+		return cpu.check_eye(user)
+	return -1

code/modules/modular_computers/file_system/program.dm

@@ -2,7 +2,9 @@
 /datum/computer_file/program
 	filetype = "PRG"
 	filename = "UnknownProgram"				// File name. FILE NAME MUST BE UNIQUE IF YOU WANT THE PROGRAM TO BE DOWNLOADABLE FROM NTNET!
-	var/required_access = null				// List of required accesses to *run* the program.
+	var/required_access = null				// List of required accesses to run/download the program.
+	var/requires_access_to_run = 1			// Whether the program checks for required_access when run.
+	var/requires_access_to_download = 1		// Whether the program checks for required_access when downloading.
 	var/datum/nano_module/NM = null			// If the program uses NanoModule, put it here and it will be automagically opened. Otherwise implement ui_interact.
 	var/nanomodule_path = null				// Path to nanomodule, make sure to set this if implementing new program.
 	var/program_state = PROGRAM_STATE_KILLED// PROGRAM_STATE_KILLED or PROGRAM_STATE_BACKGROUND or PROGRAM_STATE_ACTIVE - specifies whether this program is running.
@@ -80,6 +82,9 @@
 	if(!access_to_check) // No required_access, allow it.
 		return 1
 
+	if(!istype(user))
+		return 0
+
 	var/obj/item/weapon/card/id/I = user.GetIdCard()
 	if(!I)
 		if(loud)
@@ -101,7 +106,7 @@
 // This is performed on program startup. May be overriden to add extra logic. Remember to include ..() call. Return 1 on success, 0 on failure.
 // When implementing new program based device, use this to run the program.
 /datum/computer_file/program/proc/run_program(var/mob/living/user)
-	if(can_run(user, 1))
+	if(can_run(user, 1) || !requires_access_to_run)
 		if(nanomodule_path)
 			NM = new nanomodule_path(src, new /datum/topic_manager/program(src), src)
 		if(requires_ntnet && network_destination)
@@ -143,3 +148,10 @@
 		return 1
 	if(computer)
 		return computer.Topic(href, href_list)
+
+// Relays the call to nano module, if we have one
+/datum/computer_file/program/proc/check_eye(var/mob/user)
+	if(NM)
+		return NM.check_eye(user)
+	else
+		return -1

code/modules/modular_computers/file_system/programs/_program.dm

@@ -28,4 +28,4 @@
 // Calls forwarded to PROGRAM itself should begin with "PRG_"
 // Calls forwarded to COMPUTER running the program should begin with "PC_"
 /datum/topic_manager/program/Topic(href, href_list)
-	return program && program.Topic(href, href_list)
+	return program && program.Topic(href, href_list) 

code/modules/modular_computers/file_system/programs/antagonist/dos.dm

@@ -17,11 +17,11 @@
 	dos_speed = 0
 	switch(ntnet_status)
 		if(1)
-			dos_speed = NTNETSPEED_LOWSIGNAL * 10
+			dos_speed = NTNETSPEED_LOWSIGNAL * NTNETSPEED_DOS_AMPLIFICATION
 		if(2)
-			dos_speed = NTNETSPEED_HIGHSIGNAL * 10
+			dos_speed = NTNETSPEED_HIGHSIGNAL * NTNETSPEED_DOS_AMPLIFICATION
 		if(3)
-			dos_speed = NTNETSPEED_ETHERNET * 10
+			dos_speed = NTNETSPEED_ETHERNET * NTNETSPEED_DOS_AMPLIFICATION
 	if(target && executed)
 		target.dos_overload += dos_speed
 		if(!target.is_operational())

code/modules/modular_computers/file_system/programs/antagonist/hacked_camera.dm

@@ -0,0 +1,36 @@
+/datum/computer_file/program/camera_monitor/hacked
+	filename = "camcrypt"
+	filedesc = "Camera Decryption Tool"
+	nanomodule_path = /datum/nano_module/camera_monitor/hacked
+	program_icon_state = "hostile"
+	extended_desc = "This very advanced piece of software uses adaptive programming and large database of cipherkeys to bypass most encryptions used on camera networks. Be warned that system administrator may notice this."
+	size = 73 // Very large, a price for bypassing ID checks completely.
+	available_on_ntnet = 0
+	available_on_syndinet = 1
+
+/datum/computer_file/program/camera_monitor/hacked/process_tick()
+	..()
+	if(program_state != PROGRAM_STATE_ACTIVE) // Background programs won't trigger alarms.
+		return
+
+	var/datum/nano_module/camera_monitor/hacked/HNM = NM
+
+	// The program is active and connected to one of the station's networks. Has a very small chance to trigger IDS alarm every tick.
+	if(HNM.current_network && (HNM.current_network in using_map.station_networks) && prob(0.1))
+		if(ntnet_global.intrusion_detection_enabled)
+			ntnet_global.add_log("IDS WARNING - Unauthorised access detected to camera network [HNM.current_network] by device with NID [computer.network_card.get_network_tag()]")
+			ntnet_global.intrusion_detection_alarm = 1
+
+
+/datum/nano_module/camera_monitor/hacked
+	name = "Hacked Camera Monitoring Program"
+
+/datum/nano_module/camera_monitor/hacked/can_access_network(var/mob/user, var/network_access)
+	return 1
+
+// The hacked variant has access to all commonly used networks.
+/datum/nano_module/camera_monitor/hacked/modify_networks_list(var/list/networks)
+	networks.Add(list(list("tag" = NETWORK_MERCENARY, "has_access" = 1)))
+	networks.Add(list(list("tag" = NETWORK_ERT, "has_access" = 1)))
+	networks.Add(list(list("tag" = NETWORK_CRESCENT, "has_access" = 1)))
+	return networks 

code/modules/modular_computers/file_system/programs/camera.dm

@@ -0,0 +1,173 @@
+// Returns which access is relevant to passed network. Used by the program.
+/proc/get_camera_access(var/network)
+	if(!network)
+		return 0
+
+	switch(network)
+		if(NETWORK_THUNDER)
+			return 0
+		if(NETWORK_ENGINE || NETWORK_ENGINEERING || NETWORK_ENGINEERING_OUTPOST || NETWORK_ALARM_ATMOS || NETWORK_ALARM_FIRE || NETWORK_ALARM_POWER)
+			return access_engine
+		if(NETWORK_MEDICAL)
+			return access_medical
+		if(NETWORK_RESEARCH || NETWORK_RESEARCH_OUTPOST)
+			return access_research
+		if(NETWORK_MINE || NETWORK_SUPPLY )
+			return access_mailsorting // Cargo office - all cargo staff should have access here.
+		if(NETWORK_COMMAND || NETWORK_TELECOM)
+			return access_heads
+		if(NETWORK_ERT)
+			return access_cent_specops
+
+	return access_security // Default for all other networks
+
+/datum/computer_file/program/camera_monitor
+	filename = "cammon"
+	filedesc = "Camera Monitoring"
+	nanomodule_path = /datum/nano_module/camera_monitor
+	program_icon_state = "generic"
+	extended_desc = "This program allows remote access to station's camera system. Some camera networks may have additional access requirements."
+	size = 12
+	available_on_ntnet = 1
+	requires_ntnet = 1
+
+/datum/nano_module/camera_monitor
+	name = "Camera Monitoring program"
+	var/obj/machinery/camera/current_camera = null
+	var/current_network = null
+
+/datum/nano_module/camera_monitor/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
+	var/list/data = host.initial_data()
+
+	data["current_camera"] = current_camera ? current_camera.nano_structure() : null
+	data["current_network"] = current_network
+
+	var/list/all_networks[0]
+	for(var/network in using_map.station_networks)
+		all_networks.Add(list(list(
+							"tag" = network,
+							"has_access" = can_access_network(usr, get_camera_access(network))
+							)))
+
+	all_networks = modify_networks_list(all_networks)
+
+	data["networks"] = all_networks
+
+	if(current_network)
+		data["cameras"] = camera_repository.cameras_in_network(current_network)
+
+	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "mod_sec_camera.tmpl", "Camera Monitoring", 900, 800)
+		// ui.auto_update_layout = 1 // Disabled as with suit sensors monitor - breaks the UI map. Re-enable once it's fixed somehow.
+
+		ui.add_template("mapContent", "sec_camera_map_content.tmpl")
+		ui.add_template("mapHeader", "mod_sec_camera_map_header.tmpl")
+		ui.set_initial_data(data)
+		ui.open()
+
+// Intended to be overriden by subtypes to manually add non-station networks to the list.
+/datum/nano_module/camera_monitor/proc/modify_networks_list(var/list/networks)
+	return networks
+
+/datum/nano_module/camera_monitor/proc/can_access_network(var/mob/user, var/network_access)
+	// No access passed, or 0 which is considered no access requirement. Allow it.
+	if(!network_access)
+		return 1
+
+	return check_access(user, access_security) || check_access(user, network_access)
+
+/datum/nano_module/camera_monitor/Topic(href, href_list)
+	if(..())
+		return 1
+
+	if(href_list["switch_camera"])
+		var/obj/machinery/camera/C = locate(href_list["switch_camera"]) in cameranet.cameras
+		if(!C)
+			return
+		if(!(current_network in C.network))
+			return
+
+		switch_to_camera(usr, C)
+		return 1
+
+	else if(href_list["switch_network"])
+		if(!(href_list["switch_network"] in using_map.station_networks))
+			return
+
+		// Either security access, or access to the specific camera network's department is required in order to access the network.
+		if(can_access_network(usr, get_camera_access(href_list["switch_network"])))
+			current_network = href_list["switch_network"]
+		else
+			usr << "\The [nano_host()] shows an \"Network Access Denied\" error message."
+		return 1
+
+	else if(href_list["reset"])
+		reset_current()
+		usr.reset_view(current_camera)
+		return 1
+
+/datum/nano_module/camera_monitor/proc/switch_to_camera(var/mob/user, var/obj/machinery/camera/C)
+	//don't need to check if the camera works for AI because the AI jumps to the camera location and doesn't actually look through cameras.
+	if(isAI(user))
+		var/mob/living/silicon/ai/A = user
+		// Only allow non-carded AIs to view because the interaction with the eye gets all wonky otherwise.
+		if(!A.is_in_chassis())
+			return 0
+
+		A.eyeobj.setLoc(get_turf(C))
+		A.client.eye = A.eyeobj
+		return 1
+
+	set_current(C)
+	user.machine = nano_host()
+	user.reset_view(C)
+	return 1
+
+/datum/nano_module/camera_monitor/proc/set_current(var/obj/machinery/camera/C)
+	if(current_camera == C)
+		return
+
+	if(current_camera)
+		reset_current()
+
+	current_camera = C
+	if(current_camera)
+		var/mob/living/L = current_camera.loc
+		if(istype(L))
+			L.tracking_initiated()
+
+/datum/nano_module/camera_monitor/proc/reset_current()
+	if(current_camera)
+		var/mob/living/L = current_camera.loc
+		if(istype(L))
+			L.tracking_cancelled()
+	current_camera = null
+
+/datum/nano_module/camera_monitor/check_eye(var/mob/user as mob)
+	if(!current_camera)
+		return 0
+	var/viewflag = current_camera.check_eye(user)
+	if ( viewflag < 0 ) //camera doesn't work
+		reset_current()
+	return viewflag
+
+
+// ERT Variant of the program
+/datum/computer_file/program/camera_monitor/ert
+	filename = "ntcammon"
+	filedesc = "Advanced Camera Monitoring"
+	extended_desc = "This program allows remote access to station's camera system. Some camera networks may have additional access requirements. This version has an integrated database with additional encrypted keys."
+	size = 14
+	nanomodule_path = /datum/nano_module/camera_monitor/ert
+	available_on_ntnet = 0
+
+/datum/nano_module/camera_monitor/ert
+	name = "Advanced Camera Monitoring Program"
+
+// The ERT variant has access to ERT and crescent cams, but still checks for accesses. ERT members should be able to use it.
+/datum/nano_module/camera_monitor/hacked/modify_networks_list(var/list/networks)
+	..()
+	networks.Add(list(list("tag" = NETWORK_ERT, "has_access" = 1)))
+	networks.Add(list(list("tag" = NETWORK_CRESCENT, "has_access" = 1)))
+	return networks

code/modules/modular_computers/file_system/programs/ntdownloader.dm

@@ -133,7 +133,7 @@
 		var/list/all_entries[0]
 		for(var/datum/computer_file/program/P in ntnet_global.available_station_software)
 			// Only those programs our user can run will show in the list
-			if(!P.can_run(user))
+			if(!P.can_run(user) && P.requires_access_to_download)
 				continue
 			all_entries.Add(list(list(
 			"filename" = P.filename,

code/modules/modular_computers/laptop_vendor.dm

@@ -221,15 +221,17 @@
 
 	var/list/data[0]
 	data["state"] = state
-	data["devtype"] = devtype
-	data["hw_battery"] = dev_battery
-	data["hw_disk"] = dev_disk
-	data["hw_netcard"] = dev_netcard
-	data["hw_tesla"] = dev_tesla
-	data["hw_nanoprint"] = dev_nanoprint
-	data["hw_card"] = dev_card
-	data["hw_cpu"] = dev_cpu
-	data["totalprice"] = "[total_price]$"
+	if(state == 1)
+		data["devtype"] = devtype
+		data["hw_battery"] = dev_battery
+		data["hw_disk"] = dev_disk
+		data["hw_netcard"] = dev_netcard
+		data["hw_tesla"] = dev_tesla
+		data["hw_nanoprint"] = dev_nanoprint
+		data["hw_card"] = dev_card
+		data["hw_cpu"] = dev_cpu
+	if(state == 1 || state == 2)
+		data["totalprice"] = total_price
 
 	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
 	if (!ui)