From c2f5a853942a31f5485f909bd385bca9ed7e4d1b Mon Sep 17 00:00:00 2001
From: Dax Dupont <skyemenjou@gmail.com>
Date: Mon, 22 Jan 2018 04:23:48 +0100
Subject: [PATCH 1/2] Adds the camera to the autolathe and changes the
 materials (#34636)

---
 code/modules/paperwork/photography.dm          |  3 ++-
 .../research/designs/autolathe_designs.dm      | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index b7334f0fe1..d7f15d65e9 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -21,6 +21,7 @@
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	w_class = WEIGHT_CLASS_TINY
 	resistance_flags = FLAMMABLE
+	materials = list(MAT_METAL = 10, MAT_GLASS = 10)
 
 /*
  * Photo
@@ -116,7 +117,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	flags_1 = CONDUCT_1
 	slot_flags = SLOT_BELT
-	materials = list(MAT_METAL=2000)
+	materials = list(MAT_METAL = 50, MAT_GLASS = 150)
 	var/pictures_max = 10
 	var/pictures_left = 10
 	var/on = TRUE
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 87a4a0af2c..f0e0d924dd 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -163,6 +163,22 @@
 	build_path = /obj/item/electronics/firealarm
 	category = list("initial", "Electronics")
 
+/datum/design/camera
+	name = "Camera"
+	id = "camera"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 50, MAT_GLASS = 100)
+	build_path = /obj/item/device/camera
+	category = list("initial", "Misc")
+
+/datum/design/camera_film
+	name = "Camera Film Cartridge"
+	id = "camera_film"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 10, MAT_GLASS = 10)
+	build_path = /obj/item/device/camera_film
+	category = list("initial", "Misc")
+
 /datum/design/earmuffs
 	name = "Earmuffs"
 	id = "earmuffs"
@@ -436,7 +452,7 @@
 	id = "tape"
 	build_type = AUTOLATHE
 	materials = list(MAT_METAL = 20, MAT_GLASS = 5)
-	build_path = /obj/item/device/tape
+	build_path = /obj/item/device/tape/random
 	category = list("initial", "Misc")
 
 /datum/design/igniter