Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit

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

@@ -75,9 +75,15 @@
 	var/comp_light_color = COLOR_WHITE
 
 	///Power usage when the computer is open (screen is active) and can be interacted with.
+<<<<<<< HEAD
 	var/base_active_power_usage = 0.4 WATTS // SKYRAT EDIT CHANGE - ORIGINAL: 2 WATTS
 	///Power usage when the computer is idle and screen is off.
 	var/base_idle_power_usage = 0.2 WATTS //SKYRAT EDIT CHANGE - ORIGINAL: 1 WATTS
+=======
+	var/base_active_power_usage = 2 WATTS
+	///Power usage when the computer is idle and screen is off.
+	var/base_idle_power_usage = 1 WATTS
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 
 	// Modular computers can run on various devices. Each DEVICE (Laptop, Console & Tablet)
 	// must have its own DMI file. Icon states must be called exactly the same in all files, but may look differently

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

@@ -43,7 +43,6 @@
 ///Charge depends on whether the PC is on, and what programs are running/idle on it.
 /obj/item/modular_computer/proc/handle_power(seconds_per_tick)
 	var/power_usage = screen_on ? base_active_power_usage : base_idle_power_usage
-
 	if(light_on)
 		power_usage *= FLASHLIGHT_DRAIN_MULTIPLIER
 	if(active_program)
@@ -54,6 +53,19 @@
 		if(open_programs in idle_threads)
 			power_usage += (open_programs.power_cell_use / 2)
 
+<<<<<<< HEAD
+	if(light_on)
+		power_usage *= FLASHLIGHT_DRAIN_MULTIPLIER
+	if(active_program)
+		power_usage += active_program.power_cell_use
+	for(var/datum/computer_file/program/open_programs as anything in idle_threads)
+		if(!open_programs.power_cell_use)
+			continue
+		if(open_programs in idle_threads)
+			power_usage += (open_programs.power_cell_use / 2)
+
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	if(use_energy(power_usage * seconds_per_tick))
 		return TRUE
 	power_failure()

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

@@ -38,10 +38,14 @@
 		/datum/computer_file/program/messenger,
 		/datum/computer_file/program/nt_pay,
 		/datum/computer_file/program/notepad,
+<<<<<<< HEAD
 		// SKYRAT EDIT ADDITION START
 		/datum/computer_file/program/maintenance/camera, // Adds camera to all base tablets
 		// SKRAT EDIT ADDITION END
 		/datum/computer_file/program/crew_manifest
+=======
+		/datum/computer_file/program/crew_manifest,
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	)
 	///List of items that can be stored in a PDA
 	var/static/list/contained_item = list(
@@ -329,8 +333,11 @@
 	starting_programs = list(
 		/datum/computer_file/program/filemanager,
 		/datum/computer_file/program/robotact,
+<<<<<<< HEAD
 		/datum/computer_file/program/crew_manifest, // SKYRAT EDIT ADDITION - Manifests for borgs
 		/datum/computer_file/program/messenger, // SKYRAT EDIT ADDITION - Messenger for borgs
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	)
 
 /obj/item/modular_computer/pda/silicon/Initialize(mapload)
@@ -425,7 +432,11 @@
 	return TRUE
 
 /obj/item/modular_computer/pda/silicon/ui_state(mob/user)
+<<<<<<< HEAD
 	return GLOB.reverse_contained_state
+=======
+	return GLOB.deep_inventory_state
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 
 /obj/item/modular_computer/pda/silicon/cyborg/syndicate
 	icon_state = "tablet-silicon-syndicate"

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

@@ -365,12 +365,18 @@
 		/datum/computer_file/program/newscaster,
 	)
 
+<<<<<<< HEAD
 /* // SKYRAT EDIT REMOVAL BEGIN - Mutes the Curator's ringer on spawn
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 /obj/item/modular_computer/pda/curator/Initialize(mapload)
 	. = ..()
 	for(var/datum/computer_file/program/messenger/msg in stored_files)
 		msg.alert_silenced = TRUE
+<<<<<<< HEAD
 */ // SKYRAT EDIT REMOVAL END
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 
 /obj/item/modular_computer/pda/psychologist
 	name = "psychologist PDA"