Merge VS changes for telecomms

code/modules/alarm/atmosphere_alarm.dm

@@ -5,11 +5,7 @@
 	var/list/major_alarms = new()
 	var/list/map_levels = using_map.get_map_levels(z)
 	for(var/datum/alarm/A in visible_alarms())
-<<<<<<< HEAD
-		if(z && (z && !(A.origin?.z in map_levels)))
-=======
 		if(z && !(A.origin?.z in map_levels))
->>>>>>> e92ed43... Merge pull request #6990 from VOREStation/pol-tcomupdate
 			continue
 		if(A.max_severity() > 1)
 			major_alarms.Add(A)
@@ -19,11 +15,7 @@
 	var/list/minor_alarms = new()
 	var/list/map_levels = using_map.get_map_levels(z)
 	for(var/datum/alarm/A in visible_alarms())
-<<<<<<< HEAD
-		if(z && (z && !(A.origin?.z in map_levels)))
-=======
 		if(z && !(A.origin?.z in map_levels))
->>>>>>> e92ed43... Merge pull request #6990 from VOREStation/pol-tcomupdate
 			continue
 		if(A.max_severity() == 1)
 			minor_alarms.Add(A)

code/modules/mob/new_player/new_player.dm

@@ -377,11 +377,7 @@
 
 	var/turf/T = join_props["turf"]
 	var/join_message = join_props["msg"]
-<<<<<<< HEAD
-	var/announce_channel = join_props["channel"] || "Common" // VOREStation Add
-=======
 	var/announce_channel = join_props["channel"] || "Common"
->>>>>>> e92ed43... Merge pull request #6990 from VOREStation/pol-tcomupdate
 
 	if(!T || !join_message)
 		return 0

code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm

@@ -111,11 +111,7 @@
 	var/z = get_z(nano_host())
 	for(var/datum/alarm_handler/AH in alarm_handlers)
 		categories[++categories.len] = list("category" = AH.category, "alarms" = list())
-<<<<<<< HEAD
 		for(var/datum/alarm/A in AH.visible_alarms(z))
-=======
-		for(var/datum/alarm/A in AH.major_alarms(z))
->>>>>>> e92ed43... Merge pull request #6990 from VOREStation/pol-tcomupdate
 			var/cameras[0]
 			var/lost_sources[0]
 

code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm

@@ -44,13 +44,9 @@
 
 	if(!data["map_levels"].len)
 		to_chat(user, "<span class='warning'>The crew monitor doesn't seem like it'll work here.</span>")
-<<<<<<< HEAD
 		if(program)
 			program.kill_program()
-		else if(ui)
-=======
 		if(ui)
->>>>>>> e92ed43... Merge pull request #6990 from VOREStation/pol-tcomupdate
 			ui.close()
 		return