Merge remote-tracking branch 'upstream/master'

code/FEA/FEA_system.dm

@@ -217,7 +217,7 @@ datum
 					base.processing = 0 //singletons at startup are technically unconnected anyway
 					base.parent = null
 
-					if(base.air.check_tile_graphic())
+					if(base.air && base.air.check_tile_graphic())
 						base.update_visuals(base.air)
 
 				return null

code/game/machinery/camera.dm

@@ -214,11 +214,11 @@
 	camera_sort(L)
 
 	var/list/D = list()
-	D["Cancel"] = "Cancel"
 	for (var/obj/machinery/camera/C in L)
 		if ( C.network in src.networks )
 			D[text("[]: [][]", C.network, C.c_tag, (C.status ? null : " (Deactivated)"))] = C
 	D = camera_network_sort(D)
+	D["Cancel"] = "Cancel"
 
 	var/t = input(user, "Which camera should you change to?") as null|anything in D
 

code/game/machinery/cloning.dm

@@ -444,7 +444,7 @@
 			break
 	if(!selected) //Search for a ghost if dead body with client isn't found.
 		for(var/mob/dead/observer/ghost in world)
-			if (ghost.corpse.mind.key == find_key)
+			if (ghost.corpse && ghost.corpse.mind.key == find_key)
 				selected = ghost
 				break
 	return selected

code/game/machinery/doors/airlock.dm

@@ -537,7 +537,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 			if (!src.canSynControl() && src.canSynHack(C))
 				src.synhack(user, C)
 				return
-			if(!src.canSynHack(C))
+			if(!src.canSynHack(C) && !synDoorHacked)
 				user << "The power is cut or something, I can't hack it!"
 				return
 			if(istype(C, /obj/item/device/hacktool/engineer))

code/game/objects/devices/scanners.dm

@@ -116,7 +116,7 @@ MASS SPECTROMETER
 				src.amount--
 				var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card( user.loc )
 				F.amount = 1
-				F.fingerprints = md5(M.dna.uni_identity)
+				F.fingerprints += md5(M.dna.uni_identity)
 				F.icon_state = "fingerprint1"
 				F.name = text("FPrintC- '[M.name]'")
 

code/game/turf.dm

@@ -132,7 +132,6 @@
 	for(var/obj/structure/lattice/L in locate(src.x, src.y, src.z))
 		del(L)
 	var/turf/simulated/floor/W = new /turf/simulated/floor( locate(src.x, src.y, src.z) )
-	W.New()
 
 	W.dir = old_dir
 	if(prior_icon) W.icon_state = prior_icon
@@ -152,7 +151,6 @@
 	for(var/obj/structure/lattice/L in locate(src.x, src.y, src.z))
 		del(L)
 	var/turf/simulated/floor/plating/W = new /turf/simulated/floor/plating( locate(src.x, src.y, src.z) )
-	W.New()
 
 	W.dir = old_dir
 	if(prior_icon) W.icon_state = prior_icon
@@ -168,7 +166,6 @@
 	for(var/obj/structure/lattice/L in locate(src.x, src.y, src.z))
 		del(L)
 	var/turf/simulated/floor/engine/E = new /turf/simulated/floor/engine( locate(src.x, src.y, src.z) )
-	E.New()
 
 	E.dir = old_dir
 	E.icon_state = "engine"
@@ -231,14 +228,12 @@
 /turf/proc/ReplaceWithSpace()
 	var/old_dir = dir
 	var/turf/space/S = new /turf/space( locate(src.x, src.y, src.z) )
-	S.New()
 	S.dir = old_dir
 	return S
 
 /turf/proc/ReplaceWithLattice()
 	var/old_dir = dir
 	var/turf/space/S = new /turf/space( locate(src.x, src.y, src.z) )
-	S.New()
 	S.dir = old_dir
 	new /obj/structure/lattice( locate(src.x, src.y, src.z) )
 	return S
@@ -246,7 +241,6 @@
 /turf/proc/ReplaceWithWall()
 	var/old_icon = icon_state
 	var/turf/simulated/wall/S = new /turf/simulated/wall( locate(src.x, src.y, src.z) )
-	S.New()
 	S.icon_old = old_icon
 	S.opacity = 0
 	S.sd_NewOpacity(1)
@@ -256,7 +250,6 @@
 /turf/proc/ReplaceWithRWall()
 	var/old_icon = icon_state
 	var/turf/simulated/wall/r_wall/S = new /turf/simulated/wall/r_wall( locate(src.x, src.y, src.z) )
-	S.New()
 	S.icon_old = old_icon
 	S.opacity = 0
 	S.sd_NewOpacity(1)

code/modules/admin/verbs/randomverbs.dm

@@ -530,7 +530,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		src << "Only administrators may use this command."
 		return
 	var/input = input(usr, "Please enter anything you want. Anything. Serious.", "What?", "") as message|null
-	var/customname = input(usr, "Pick a title for the report.", "Title") as message|null
+	var/customname = input(usr, "Pick a title for the report.", "Title") as text|null
 	if(!input)
 		return
 	if(!customname)

code/modules/mining/mine_turfs.dm

@@ -194,7 +194,6 @@
 				shroom.pixel_y = 0
 
 	W = new /turf/simulated/floor/plating/airless/asteroid( locate(src.x, src.y, src.z) )
-	W.New()
 	W.dir = old_dir
 	W.fullUpdateMineralOverlays()