Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151

code/game/machinery/computer/arcade/minesweeper.dm

@@ -250,11 +250,11 @@
 						itemname = "a syndicate bomb beacon"
 						new /obj/item/sbeacondrop/bomb(loc)
 					if(2)
-						itemname = "a grenade launcher"
-						new /obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted(loc)
-						new /obj/item/ammo_casing/a40mm(loc)
-						new /obj/item/ammo_casing/a40mm(loc)
-						new /obj/item/ammo_casing/a40mm(loc)
+						itemname = "a rocket launcher"
+						new /obj/item/gun/ballistic/rocketlauncher/unrestricted(loc)
+						new /obj/item/ammo_casing/caseless/rocket(loc)
+						new /obj/item/ammo_casing/caseless/rocket(loc)
+						new /obj/item/ammo_casing/caseless/rocket(loc)
 					if(3)
 						itemname = "two bags of c4"
 						new /obj/item/storage/backpack/duffelbag/syndie/c4(loc)

code/game/machinery/computer/camera_advanced.dm

@@ -361,14 +361,16 @@
 		return
 	button_icon_state = "warp_down"
 	owner.update_action_buttons()
+	QDEL_NULL(warping)
+	if(!do_teleport(user, T, channel = TELEPORT_CHANNEL_CULT, forced = TRUE))
+		to_chat(user, "<span class='bold sevtug_small'>Warp Failed. Something deflected our attempt to warp to [AR].</span>")
+		return
 	T.visible_message("<span class='warning'>[user] warps in!</span>")
 	playsound(user, 'sound/magic/magic_missile.ogg', 50, TRUE)
 	playsound(T, 'sound/magic/magic_missile.ogg', 50, TRUE)
-	user.forceMove(get_turf(T))
 	user.setDir(SOUTH)
 	flash_color(user, flash_color = "#AF0AAF", flash_time = 5)
 	R.remove_eye_control(user)
-	QDEL_NULL(warping)
 
 /datum/action/innate/servant_warp/proc/is_canceled()
 	return !cancel

code/game/machinery/computer/cloning.dm

@@ -1,4 +1,4 @@
-#define AUTOCLONING_MINIMAL_LEVEL 3
+#define AUTOCLONING_MINIMAL_LEVEL 4
 
 /obj/machinery/computer/cloning
 	name = "cloning console"
@@ -13,17 +13,20 @@
 	var/scantemp_ckey
 	var/scantemp = "Ready to Scan"
 	var/menu = 1 //Which menu screen to display
-	var/list/records = list()
 	var/datum/data/record/active_record = null
 	var/obj/item/disk/data/diskette = null //Mostly so the geneticist can steal everything.
 	var/loading = 0 // Nice loading text
 	var/autoprocess = 0
+	var/list/records = list()
 
 	light_color = LIGHT_COLOR_BLUE
 
 /obj/machinery/computer/cloning/Initialize()
 	. = ..()
 	updatemodules(TRUE)
+	var/obj/item/circuitboard/computer/cloning/board = circuit
+	records = board.records
+
 
 /obj/machinery/computer/cloning/Destroy()
 	if(pods)
@@ -346,6 +349,8 @@
 					active_record = null
 					playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
 					src.menu = 2
+					var/obj/item/circuitboard/computer/cloning/board = circuit
+					board.records = records
 				else
 					src.temp = "<font class='bad'>Access Denied.</font>"
 					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
@@ -368,6 +373,8 @@
 				for(var/key in diskette.fields)
 					src.active_record.fields[key] = diskette.fields[key]
 				src.temp = "Load successful."
+				var/obj/item/circuitboard/computer/cloning/board = circuit
+				board.records = records
 				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
 
 			if("eject")
@@ -502,5 +509,7 @@
 	R.fields["imp"] = "[REF(imp)]"
 
 	src.records += R
+	var/obj/item/circuitboard/computer/cloning/board = circuit
+	board.records = records
 	scantemp = "Subject successfully scanned."
 	playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)