Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace

# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm

code/modules/paperwork/frames.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 
 	usesound = 'sound/items/Deconstruct.ogg'
-	
+
 	var/icon_base
 	var/obj/displayed
 
@@ -198,9 +198,7 @@
 		verbs |= /obj/structure/sign/picture_frame/proc/tilt
 
 /obj/structure/sign/picture_frame/Destroy()
-	if(frame)
-		qdel(frame)
-		frame = null
+	QDEL_NULL(frame)
 	return ..()
 
 /obj/structure/sign/picture_frame/update_icon()

code/modules/paperwork/photography.dm

@@ -30,6 +30,7 @@
 	w_class = 2
 	burn_state = FLAMMABLE
 	burntime = 5
+	var/blueprints = 0 // Does this have the blueprints?
 	var/icon/img	//Big photo image
 	var/scribble	//Scribble on the back.
 	var/icon/tiny
@@ -151,6 +152,7 @@
 	var/pictures_max = 10
 	var/pictures_left = 10
 	var/on = 1
+	var/blueprints = 0
 	var/icon_on = "camera"
 	var/icon_off = "camera_off"
 	var/size = 3
@@ -253,6 +255,8 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
 		var/atom/A = sorted[i]
 		if(A)
 			var/icon/img = getFlatIcon(A)//build_composite_icon(A)
+			if(istype(A, /obj/item/areaeditor/blueprints))
+				blueprints = 1
 
 			// If what we got back is actually a picture, draw it.
 			if(istype(img, /icon))
@@ -351,7 +355,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
 		y_c--
 		x_c = x_c - size
 
-	var/datum/picture/P = createpicture(target, user, turfs, mobs, flag)
+	var/datum/picture/P = createpicture(target, user, turfs, mobs, flag, blueprints)
 	printpicture(user, P)
 
 /obj/item/device/camera/proc/createpicture(atom/target, mob/user, list/turfs, mobs, flag)
@@ -388,6 +392,10 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
 	Photo.loc = user.loc
 	if(!user.get_inactive_hand())
 		user.put_in_inactive_hand(Photo)
+
+	if(blueprints)
+		Photo.blueprints = 1
+		blueprints = 0
 	Photo.construct(P)
 
 /obj/item/weapon/photo/proc/construct(var/datum/picture/P)
@@ -409,6 +417,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
 	p.name = name
 	p.desc = desc
 	p.scribble = scribble
+	p.blueprints = blueprints
 
 	return p