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

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

@@ -305,6 +305,7 @@
 		if("toggleprivate")
 			self_paid = !self_paid
 			. = TRUE
+<<<<<<< HEAD
 		//SKYRAT EDIT START
 		if("company_import_window")
 			var/datum/component/armament/company_imports/gun_comp = computer.GetComponent(/datum/component/armament/company_imports)
@@ -315,6 +316,8 @@
 			gun_comp.ui_interact(usr)
 			. = TRUE
 		//SKYRAT EDIT END
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	if(.)
 		post_signal(cargo_shuttle)
 

code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm

@@ -157,7 +157,11 @@
 
 /datum/computer_file/program/messenger/ui_state(mob/user)
 	if(issilicon(user))
+<<<<<<< HEAD
 		return GLOB.reverse_contained_state
+=======
+		return GLOB.deep_inventory_state
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	return GLOB.default_state
 
 /datum/computer_file/program/messenger/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
@@ -623,10 +627,13 @@
 			playsound(computer, 'sound/machines/terminal_error.ogg', 15, TRUE)
 		return FALSE
 
+<<<<<<< HEAD
 	// SKYRAT EDIT BEGIN - PDA messages show a visible message; again!
 	sender.visible_message(span_notice("[sender]'s PDA rings out with the soft sound of keypresses"), vision_distance = COMBAT_MESSAGE_RANGE)
 	// SKYRAT EDIT END
 
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	var/shell_addendum = ""
 	if(istype(source, /obj/item/circuit_component))
 		var/obj/item/circuit_component/circuit = source

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

@@ -40,7 +40,10 @@
 				var/list/current_record = list()
 
 				current_record["age"] = person.age
+<<<<<<< HEAD
 				current_record["chrono_age"] = person.chrono_age // SKYRAT EDIT ADDITION - Chronological age
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 				current_record["fingerprint"] = person.fingerprint
 				current_record["gender"] = person.gender
 				current_record["name"] = person.name
@@ -54,8 +57,11 @@
 			for(var/datum/record/crew/person in GLOB.manifest.general)
 				var/list/current_record = list()
 
+<<<<<<< HEAD
 				current_record["age"] = person.age // SKYRAT EDIT ADDITION - Chronological age
 				current_record["chrono_age"] = person.chrono_age // SKYRAT EDIT ADDITION - Chronological age
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 				current_record["bloodtype"] = person.blood_type
 				current_record["ma_dis"] = person.major_disabilities_desc
 				current_record["mi_dis"] = person.minor_disabilities_desc