Construction Update

code/modules/paperwork/faxmachine.dm

@@ -14,6 +14,7 @@ var/list/adminfaxes = list()	//cache for faxes that have been sent to admins
 	use_power = 1
 	idle_power_usage = 30
 	active_power_usage = 200
+	frame_type = "fax"
 
 	var/obj/item/weapon/card/id/scan = null // identification
 	var/authenticated = 0

code/modules/paperwork/filingcabinet.dm

@@ -17,12 +17,10 @@
 	density = 1
 	anchored = 1
 
-
 /obj/structure/filingcabinet/chestdrawer
 	name = "chest drawer"
 	icon_state = "chestdrawer"
 
-
 /obj/structure/filingcabinet/filingcabinet	//not changing the path to avoid unecessary map issues, but please don't name stuff like this in the future -Pete
 	icon_state = "tallcabinet"
 
@@ -46,6 +44,16 @@
 		playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
 		anchored = !anchored
 		user << "<span class='notice'>You [anchored ? "wrench" : "unwrench"] \the [src].</span>"
+	else if(istype(P, /obj/item/weapon/screwdriver))
+		user << "<span class='notice'>You begin taking the [name] apart.</span>"
+		if(do_after(user, 10))
+			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+			user << "<span class='notice'>You take the [name] apart.</span>"
+			new /obj/item/stack/material/steel( src.loc, 4 )
+			for(var/obj/item/I in contents)
+				I.forceMove(loc)
+			qdel(src)
+		return
 	else
 		user << "<span class='notice'>You can't put [P] in [src]!</span>"
 
@@ -151,7 +159,7 @@
 				var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src)
 				P.info = "<CENTER><B>Medical Record</B></CENTER><BR>"
 				P.info += "Name: [G.fields["name"]] ID: [G.fields["id"]]<BR>\nSex: [G.fields["sex"]]<BR>\nAge: [G.fields["age"]]<BR>\nFingerprint: [G.fields["fingerprint"]]<BR>\nPhysical Status: [G.fields["p_stat"]]<BR>\nMental Status: [G.fields["m_stat"]]<BR>"
-				
+
 				P.info += "<BR>\n<CENTER><B>Medical Data</B></CENTER><BR>\nBlood Type: [M.fields["b_type"]]<BR>\nDNA: [M.fields["b_dna"]]<BR>\n<BR>\nMinor Disabilities: [M.fields["mi_dis"]]<BR>\nDetails: [M.fields["mi_dis_d"]]<BR>\n<BR>\nMajor Disabilities: [M.fields["ma_dis"]]<BR>\nDetails: [M.fields["ma_dis_d"]]<BR>\n<BR>\nAllergies: [M.fields["alg"]]<BR>\nDetails: [M.fields["alg_d"]]<BR>\n<BR>\nCurrent Diseases: [M.fields["cdi"]] (per disease info placed in log/comment section)<BR>\nDetails: [M.fields["cdi_d"]]<BR>\n<BR>\nImportant Notes:<BR>\n\t[M.fields["notes"]]<BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>"
 				var/counter = 1
 				while(M.fields["com_[counter]"])

code/modules/paperwork/paper.dm

@@ -337,8 +337,9 @@
 		var/obj/item/i = usr.get_active_hand() // Check to see if he still got that darn pen, also check if he's using a crayon or pen.
 		var/iscrayon = 0
 		if(!istype(i, /obj/item/weapon/pen))
-			if(usr.back && istype(usr.back,/obj/item/weapon/rig))
-				var/obj/item/weapon/rig/r = usr.back
+			var/mob/living/M = usr
+			if(istype(M) && M.back && istype(M.back,/obj/item/weapon/rig))
+				var/obj/item/weapon/rig/r = M.back
 				var/obj/item/rig_module/device/pen/m = locate(/obj/item/rig_module/device/pen) in r.installed_modules
 				if(!r.offline && m)
 					i = m.device

code/modules/paperwork/photocopier.dm

@@ -9,11 +9,21 @@
 	idle_power_usage = 30
 	active_power_usage = 200
 	power_channel = EQUIP
+	circuit = /obj/item/weapon/circuitboard/photocopier
+	frame_type = "photocopier"
 	var/obj/item/copyitem = null	//what's in the copier!
 	var/copies = 1	//how many copies to print!
 	var/toner = 30 //how much toner is left! woooooo~
 	var/maxcopies = 10	//how many copies can be copied at once- idea shamelessly stolen from bs12's copier!
 
+/obj/machinery/photocopier/New()
+	component_parts = list()
+	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
+	component_parts += new /obj/item/weapon/stock_parts/motor(src)
+	component_parts += new /obj/item/weapon/stock_parts/micro_laser(src)
+	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
+	RefreshParts()
+
 /obj/machinery/photocopier/attack_ai(mob/user as mob)
 	return attack_hand(user)
 
@@ -126,6 +136,12 @@
 		playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
 		anchored = !anchored
 		user << "<span class='notice'>You [anchored ? "wrench" : "unwrench"] \the [src].</span>"
+
+	else if(default_deconstruction_screwdriver(user, O))
+		return
+	else if(default_deconstruction_crowbar(user, O))
+		return
+
 	return
 
 /obj/machinery/photocopier/ex_act(severity)

code/modules/paperwork/photography.dm

@@ -91,7 +91,7 @@ var/global/photo_count = 0
 /obj/item/weapon/storage/photo_album/MouseDrop(obj/over_object as obj)
 
 	if((istype(usr, /mob/living/carbon/human)))
-		var/mob/M = usr
+		var/mob/living/carbon/human/M = usr
 		if(!( istype(over_object, /obj/screen) ))
 			return ..()
 		playsound(loc, "rustle", 50, 1, -5)

code/modules/paperwork/stamps.dm

@@ -52,6 +52,10 @@
 	name = "centcomm rubber stamp"
 	icon_state = "stamp-cent"
 
+/obj/item/weapon/stamp/qm
+	name = "quartermaster's stamp"
+	icon_state = "stamp-qm"
+
 // Syndicate stamp to forge documents.
 /obj/item/weapon/stamp/chameleon/attack_self(mob/user as mob)