Merge branch 'master' into upstream-merge-38116

code/game/machinery/computer/arcade.dm

@@ -51,7 +51,9 @@
 		/obj/item/hot_potato/harmless/toy						= 1,
 		/obj/item/card/emagfake									= 1,
 		/obj/item/clothing/shoes/wheelys				= 2,
-		/obj/item/clothing/shoes/kindleKicks				= 2)
+		/obj/item/clothing/shoes/kindleKicks				= 2,
+		/obj/item/storage/belt/military/snack					= 2
+		)
 
 	light_color = LIGHT_COLOR_GREEN
 

code/game/machinery/computer/camera.dm

@@ -196,7 +196,7 @@
 	icon_keyboard = "mining_key"
 	network = list("mine")
 	circuit = /obj/item/circuitboard/computer/mining
-	
+
 /obj/machinery/computer/security/research
 	name = "research camera console"
 	desc = "Used to access the various cameras in science."

code/game/machinery/computer/camera_advanced.dm

@@ -190,7 +190,7 @@
 		else
 			moveToNullspace()
 		if(use_static)
-			GLOB.cameranet.visibility(src)
+			GLOB.cameranet.visibility(src, GetViewerClient())
 		if(visible_icon)
 			if(eye_user.client)
 				eye_user.client.images -= user_image

code/game/machinery/computer/cloning.dm

@@ -476,7 +476,7 @@
 	R.fields["quirks"] = list()
 	for(var/V in mob_occupant.roundstart_quirks)
 		var/datum/quirk/T = V
-		R.fields["quirks"] += T.type
+		R.fields["quirks"][T.type] = T.clone_data()
 
 	if (!isnull(mob_occupant.mind)) //Save that mind so traitors can continue traitoring after cloning.
 		R.fields["mind"] = "[REF(mob_occupant.mind)]"

code/game/machinery/computer/communications.dm

@@ -51,7 +51,7 @@
 /obj/machinery/computer/communications/Topic(href, href_list)
 	if(..())
 		return
-	if(!is_station_level(z) && !is_centcom_level(z)) //Can only use on centcom and SS13
+	if(!is_station_level(z) && !is_transit_level(z)) //Can only use in transit and on SS13
 		to_chat(usr, "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!")
 		return
 	usr.set_machine(src)