Merge branch 'master' into upstream-merge-10578

code/datums/chat_message.dm

@@ -325,10 +325,13 @@ var/list/runechat_image_cache = list()
 		if(5)
 			return rgb(c,m,x)
 
-/atom/proc/runechat_message(message, range = world.view, italics, list/classes = list(), audible = TRUE)
-	var/list/hear = get_mobs_and_objs_in_view_fast(get_turf(src), range, remote_ghosts = FALSE)
-
-	var/list/hearing_mobs = hear["mobs"]
+/atom/proc/runechat_message(message, range = world.view, italics, list/classes = list(), audible = TRUE, list/specific_viewers)
+	var/hearing_mobs
+	if(islist(specific_viewers))
+		hearing_mobs = specific_viewers.Copy()
+	else
+		var/list/hear = get_mobs_and_objs_in_view_fast(get_turf(src), range, remote_ghosts = FALSE)
+		hearing_mobs = hear["mobs"]
 
 	for(var/mob in hearing_mobs)
 		var/mob/M = mob

code/datums/supplypacks/misc_vr.dm

@@ -110,28 +110,6 @@
 	access = list(access_explorer,
 				  access_eva,
 				  access_pilot)
-<<<<<<< HEAD
-	one_access = TRUE
-||||||| parent of e28f7b423a... Merge pull request #10578 from Very-Soft/fixy
-	one_access = TRUE
-
-/datum/supply_pack/misc/music_players
-	name = "music players (3)"
-	contains = list(
-		/obj/item/device/walkpod = 3
-	)
-	cost = 150
-	containername = "portable music players crate"
-
-/datum/supply_pack/misc/juke_remotes
-	name = "jukebox remote speakers (2)"
-	contains = list(
-		/obj/item/device/juke_remote = 2
-	)
-	cost = 300
-	containername = "cordless jukebox speakers crate"
-	
-=======
 	one_access = TRUE
 
 /datum/supply_pack/misc/music_players
@@ -151,5 +129,3 @@
 	cost = 300
 	containertype = /obj/structure/closet/crate
 	containername = "cordless jukebox speakers crate"
-	
->>>>>>> e28f7b423a... Merge pull request #10578 from Very-Soft/fixy