Merge pull request #7386 from Citadel-Station-13/photography_update

Photography update - Photo persistence, 7x7 photos, adjustable camera photo size, photo logging with full metadata, etc etc

code/game/objects/items/devices/PDA/PDA.dm

@@ -72,7 +72,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 
 	var/obj/item/paicard/pai = null	// A slot for a personal AI device
 
-	var/icon/photo //Scanned photo
+	var/datum/picture/picture //Scanned photo
 
 	var/list/contained_item = list(/obj/item/pen, /obj/item/toy/crayon, /obj/item/lipstick, /obj/item/flashlight/pen, /obj/item/clothing/mask/cigarette)
 	var/obj/item/inserted_item //Used for pen, crayon, and lipstick insertion or removal. Same as above.
@@ -636,8 +636,8 @@ GLOBAL_LIST_EMPTY(PDAs)
 		"message" = message,
 		"targets" = string_targets
 	))
-	if (photo)
-		signal.data["photo"] = photo
+	if (picture)
+		signal.data["photo"] = picture
 	signal.send_to_receivers()
 
 	// If it didn't reach, note that fact
@@ -657,7 +657,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	log_talk(user, "[key_name(user)] (PDA: [initial(name)]) sent \"[message]\" to [target_text]", LOGPDA)
 	to_chat(user, "<span class='info'>Message sent to [target_text]: \"[message]\"</span>")
 	// Reset the photo
-	photo = null
+	picture = null
 	last_text = world.time
 	if (everyone)
 		last_everyone = world.time
@@ -811,7 +811,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 			update_icon()
 	else if(istype(C, /obj/item/photo))
 		var/obj/item/photo/P = C
-		photo = P.img
+		picture = P.picture
 		to_chat(user, "<span class='notice'>You scan \the [C].</span>")
 	else
 		return ..()
@@ -925,11 +925,11 @@ GLOBAL_LIST_EMPTY(PDAs)
 
 	var/selected = plist[c]
 
-	if(aicamera.aipictures.len>0)
+	if(aicamera.stored.len)
 		var/add_photo = input(user,"Do you want to attach a photo?","Photo","No") as null|anything in list("Yes","No")
 		if(add_photo=="Yes")
-			var/datum/picture/Pic = aicamera.selectpicture(aicamera)
-			aiPDA.photo = Pic.fields["img"]
+			var/datum/picture/Pic = aicamera.selectpicture(user)
+			aiPDA.picture = Pic
 
 	if(incapacitated())
 		return

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -19,3 +19,4 @@
 	new /obj/item/export_scanner(src)
 	new /obj/item/door_remote/quartermaster(src)
 	new /obj/item/circuitboard/machine/techfab/department/cargo(src)
+	new /obj/item/storage/photo_album/QM(src)

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -29,6 +29,7 @@
 	new /obj/item/inducer(src)
 	new /obj/item/circuitboard/machine/techfab/department/engineering(src)
 	new /obj/item/extinguisher/advanced(src)
+	new /obj/item/storage/photo_album/CE(src)
 
 /obj/structure/closet/secure_closet/engineering_electrical
 	name = "electrical supplies locker"

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -76,6 +76,7 @@
 	new /obj/item/pet_carrier(src)
 	new /obj/item/wallframe/defib_mount(src)
 	new /obj/item/circuitboard/machine/techfab/department/medical(src)
+	new /obj/item/storage/photo_album/CMO(src)
 
 /obj/structure/closet/secure_closet/animal
 	name = "animal control"

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -25,3 +25,4 @@
 	new /obj/item/laser_pointer(src)
 	new /obj/item/door_remote/research_director(src)
 	new /obj/item/circuitboard/machine/techfab/department/science(src)
+	new /obj/item/storage/photo_album/RD(src)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -33,6 +33,7 @@
 	new /obj/item/gun/energy/e_gun(src)
 	new /obj/item/door_remote/captain(src)
 	new /obj/item/card/id/captains_spare(src)
+	new /obj/item/storage/photo_album/Captain(src)
 
 /obj/structure/closet/secure_closet/hop
 	name = "\proper head of personnel's locker"
@@ -59,6 +60,7 @@
 	new /obj/item/pet_carrier(src)
 	new /obj/item/door_remote/civillian(src)
 	new /obj/item/circuitboard/machine/techfab/department/service(src)
+	new /obj/item/storage/photo_album/HoP(src)
 
 /obj/structure/closet/secure_closet/hos
 	name = "\proper head of security's locker"
@@ -91,6 +93,7 @@
 	new /obj/item/flashlight/seclite(src)
 	new /obj/item/pinpointer/nuke(src)
 	new /obj/item/circuitboard/machine/techfab/department/security(src)
+	new /obj/item/storage/photo_album/HoS(src)
 
 /obj/structure/closet/secure_closet/warden
 	name = "\proper warden's locker"