Merge with upstream/master

Fixes conflicts

code/modules/paperwork/fax.dm

@@ -0,0 +1,87 @@
+// Fax datum - holds all faxes sent during the round
+var/list/faxes = list()
+var/list/adminfaxes = list()
+
+/datum/fax
+	var/name = "fax"
+	var/from_department = null
+	var/to_department = null
+	var/origin = null
+	var/message = null
+	var/sent_by = null
+	var/sent_at = null
+
+/datum/fax/New()
+	faxes += src
+
+/datum/fax/admin
+	var/list/reply_to = null
+
+/datum/fax/admin/New()
+	adminfaxes += src
+
+// Fax panel - lets admins check all faxes sent during the round
+/client/proc/fax_panel()
+	set name = "Fax Panel"
+	set category = "Event"
+	if(holder)
+		holder.fax_panel(usr)
+	feedback_add_details("admin_verb","FXP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	return
+
+/datum/admins/proc/fax_panel(var/mob/living/user)
+	var/html = "<A align='right' href='?src=\ref[src];refreshfaxpanel=1'>Refresh</A>"
+	html += "<A align='right' href='?src=\ref[src];AdminFaxCreate=1;faxtype=Administrator'>Create Fax</A>"
+
+	html += "<div class='block'>"
+	html += "<h2>Admin Faxes</h2>"
+	html += "<table>"
+	html += "<tr style='font-weight:bold;'><td width='150px'>Name</td><td width='150px'>From Department</td><td width='150px'>To Department</td><td width='75px'>Sent At</td><td width='150px'>Sent By</td><td width='50px'>View</td><td width='50px'>Reply</td><td width='75px'>Replied To</td></td></tr>"
+	for(var/datum/fax/admin/A in adminfaxes)
+		html += "<tr>"
+		html += "<td>[A.name]</td>"
+		html += "<td>[A.from_department]</td>"
+		html += "<td>[A.to_department]</td>"
+		html += "<td>[worldtime2text(A.sent_at)]</td>"
+		if(A.sent_by)
+			var/mob/living/S = A.sent_by
+			html += "<td><A HREF='?_src_=holder;adminplayeropts=\ref[A.sent_by]'>[S.name]</A></td>"
+		else
+			html += "<td>Unknown</td>"
+		html += "<td><A align='right' href='?src=\ref[src];AdminFaxView=\ref[A.message]'>View</A></td>"
+		if(!A.reply_to)
+			if(A.from_department == "Administrator")
+				html += "<td>N/A</td>"
+			else
+				html += "<td><A align='right' href='?src=\ref[src];AdminFaxCreate=\ref[A.sent_by];originfax=\ref[A.origin];faxtype=[A.to_department];replyto=\ref[A.message]'>Reply</A></td>"
+			html += "<td>N/A</td>"
+		else
+			html += "<td>N/A</td>"
+			html += "<td><A align='right' href='?src=\ref[src];AdminFaxView=\ref[A.reply_to]'>Original</A></td>"
+		html += "</tr>"
+	html += "</table>"
+	html += "</div>"
+
+	html += "<div class='block'>"
+	html += "<h2>Departmental Faxes</h2>"
+	html += "<table>"
+	html += "<tr style='font-weight:bold;'><td width='150px'>Name</td><td width='150px'>From Department</td><td width='150px'>To Department</td><td width='75px'>Sent At</td><td width='150px'>Sent By</td><td width='175px'>View</td></td></tr>"
+	for(var/datum/fax/F in faxes)
+		html += "<tr>"
+		html += "<td>[F.name]</td>"
+		html += "<td>[F.from_department]</td>"
+		html += "<td>[F.to_department]</td>"
+		html += "<td>[worldtime2text(F.sent_at)]</td>"
+		if(F.sent_by)
+			var/mob/living/S = F.sent_by
+			html += "<td><A HREF='?_src_=holder;adminplayeropts=\ref[F.sent_by]'>[S.name]</A></td>"
+		else
+			html += "<td>Unknown</td>"
+		html += "<td><A align='right' href='?src=\ref[src];AdminFaxView=\ref[F.message]'>View</A></td>"
+		html += "</tr>"
+	html += "</table>"
+	html += "</div>"
+
+	var/datum/browser/popup = new(user, "fax_panel", "Fax Panel", 950, 450)
+	popup.set_content(html)
+	popup.open()

code/modules/paperwork/faxmachine.dm

@@ -1,9 +1,8 @@
 var/list/obj/machinery/photocopier/faxmachine/allfaxes = list()
 var/list/admin_departments = list("Central Command")
+var/list/hidden_admin_departments = list("Syndicate")
 var/list/alldepartments = list()
 
-var/list/adminfaxes = list()	//cache for faxes that have been sent to admins
-
 /obj/machinery/photocopier/faxmachine
 	name = "fax machine"
 	icon = 'icons/obj/library.dmi'
@@ -22,6 +21,8 @@ var/list/adminfaxes = list()	//cache for faxes that have been sent to admins
 	var/department = "Unknown" // our department
 
 	var/destination = "Central Command" // the department we're sending to
+	
+	var/data[0]
 
 /obj/machinery/photocopier/faxmachine/New()
 	..()
@@ -31,111 +32,146 @@ var/list/adminfaxes = list()	//cache for faxes that have been sent to admins
 		alldepartments |= department
 
 /obj/machinery/photocopier/faxmachine/attack_hand(mob/user as mob)
-	user.set_machine(src)
-
-	var/dat = "Fax Machine<BR>"
-
-	var/scan_name
+	ui_interact(user)
+	
+/obj/machinery/photocopier/faxmachine/attackby(obj/item/weapon/item, mob/user)
+	if(istype(item,/obj/item/weapon/card/id) && !scan)
+		scan(item)
+	else if(istype(item, /obj/item/weapon/paper) || istype(item, /obj/item/weapon/photo) || istype(item, /obj/item/weapon/paper_bundle))
+		..()
+		nanomanager.update_uis(src)
+	else
+		return ..()
+		
+/obj/machinery/photocopier/faxmachine/emag_act(user as mob)
+	if(!emagged)
+		emagged = 1
+		user << "<span class='notice'>The transmitters realign to an unknown source!</span>"
+	else
+		user << "<span class='warning'>You swipe the card through [src], but nothing happens.</span>"
+	
+/obj/machinery/photocopier/faxmachine/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
 	if(scan)
-		scan_name = scan.name
+		data["scan_name"] = scan.name
 	else
-		scan_name = "--------"
-
-	dat += "Confirm Identity: <a href='byond://?src=\ref[src];scan=1'>[scan_name]</a><br>"
-
-	if(authenticated)
-		dat += "<a href='byond://?src=\ref[src];logout=1'>{Log Out}</a>"
+		data["scan_name"] = "-----"
+	data["authenticated"] = authenticated
+	if(!authenticated)
+		data["network"] = "Disconnected"
+	else if(!emagged)
+		data["network"] = "Central Command Quantum Entanglement Network"
 	else
-		dat += "<a href='byond://?src=\ref[src];auth=1'>{Log In}</a>"
-
-	dat += "<hr>"
-
-	if(authenticated)
-		dat += "<b>Logged in to:</b> Central Command Quantum Entanglement Network<br><br>"
-
-		if(copyitem)
-			dat += "<a href='byond://?src=\ref[src];remove=1'>Remove Item</a><br><br>"
-
-			if(sendcooldown)
-				dat += "<b>Transmitter arrays realigning. Please stand by.</b><br>"
-
-			else
-				
-				dat += "<a href='byond://?src=\ref[src];send=1'>Send</a><br>"
-				dat += "<b>Currently sending:</b> [copyitem.name]<br>"
-				dat += "<b>Sending to:</b> <a href='byond://?src=\ref[src];dept=1'>[destination]</a><br>"
-
-		else
-			if(sendcooldown)
-				dat += "Please insert paper to send via secure connection.<br><br>"
-				dat += "<b>Transmitter arrays realigning. Please stand by.</b><br>"
-			else
-				dat += "Please insert paper to send via secure connection.<br><br>"
-
+		data["network"] = "ERR*?*%!*"
+	if(copyitem)
+		data["paper"] = copyitem.name
+		data["paperinserted"] = 1
 	else
-		dat += "Proper authentication is required to use this device.<br><br>"
+		data["paper"] = "-----"
+		data["paperinserted"] = 0
+	data["destination"] = destination
+	data["cooldown"] = sendcooldown
+	if((destination in admin_departments) || (destination in hidden_admin_departments))
+		data["respectcooldown"] = 1
+	else
+		data["respectcooldown"] = 0
 
-		if(copyitem)
-			dat += "<a href ='byond://?src=\ref[src];remove=1'>Remove Item</a><br>"
-
-	user << browse(dat, "window=copier")
-	onclose(user, "copier")
-	return
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)	
+	if (!ui)
+		ui = new(user, src, ui_key, "faxmachine.tmpl", "Fax Machine UI", 540, 450)
+		ui.set_initial_data(data)		
+		ui.open()
 
 /obj/machinery/photocopier/faxmachine/Topic(href, href_list)
+	if(..())
+		return 1
+		
 	if(href_list["send"])
-		if(copyitem)
-			if (destination in admin_departments)
+		if(copyitem && authenticated)
+			if ((destination in admin_departments) || (destination in hidden_admin_departments))
 				send_admin_fax(usr, destination)
 			else
-				sendfax(destination)
+				sendfax(destination,usr)
 			
 			if (sendcooldown)
 				spawn(sendcooldown) // cooldown time
 					sendcooldown = 0
+					nanomanager.update_uis(src)
 
-	else if(href_list["remove"])
+	if(href_list["paper"])
 		if(copyitem)
 			copyitem.loc = usr.loc
 			usr.put_in_hands(copyitem)
 			usr << "<span class='notice'>You take \the [copyitem] out of \the [src].</span>"
 			copyitem = null
-			updateUsrDialog()
+		else
+			var/obj/item/I = usr.get_active_hand()
+			if (istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/paper_bundle))
+				usr.drop_item()
+				copyitem = I
+				I.loc = src
+				usr << "<span class='notice'>You insert \the [I] into \the [src].</span>"
+				flick(insert_anim, src)
 
 	if(href_list["scan"])
-		if (scan)
-			if(ishuman(usr))
-				scan.loc = usr.loc
-				if(!usr.get_active_hand())
-					usr.put_in_hands(scan)
-				scan = null
-			else
-				scan.loc = src.loc
-				scan = null
+		scan()
+
+	if(href_list["dept"])
+		if(authenticated)
+			var/lastdestination = destination
+			var/list/combineddepartments = alldepartments + admin_departments
+			if(emagged)
+				combineddepartments += hidden_admin_departments
+			destination = input(usr, "To which department?", "Choose a department", "") as null|anything in combineddepartments
+			if(!destination) 
+				destination = lastdestination
+
+	if(href_list["auth"])
+		if((!authenticated) && scan)
+			if(check_access(scan))
+				authenticated = 1
+		else if(authenticated)
+			authenticated = 0
+			
+	if(href_list["rename"])
+		if(copyitem)
+			var/n_name = copytext(sanitize(input(usr, "What would you like to label the fax?", "Fax Labelling", copyitem.name)  as text), 1, MAX_MESSAGE_LEN)
+			if((copyitem && copyitem.loc == src && usr.stat == 0))
+				if (istype(copyitem, /obj/item/weapon/paper)) 
+					copyitem.name = "[(n_name ? text("[n_name]") : initial(copyitem.name))]"		
+					copyitem.desc = "This is a paper titled '" + copyitem.name + "'."					
+				else if(istype(copyitem, /obj/item/weapon/photo)) 
+					copyitem.name = "[(n_name ? text("[n_name]") : "photo")]"
+				else if(istype(copyitem, /obj/item/weapon/paper_bundle))
+					copyitem.name = "[(n_name ? text("[n_name]") : "paper")]"
+				data["name"] = copyitem.name				
+
+	nanomanager.update_uis(src)
+	
+/obj/machinery/photocopier/faxmachine/proc/scan(var/obj/item/weapon/card/id/card = null)
+	if(scan) // Card is in machine
+		if(ishuman(usr))
+			scan.loc = usr.loc
+			if(!usr.get_active_hand())
+				usr.put_in_hands(scan)
+			scan = null
 		else
+			scan.loc = src.loc
+			scan = null
+	else
+		if(!card)
 			var/obj/item/I = usr.get_active_hand()
 			if (istype(I, /obj/item/weapon/card/id))
 				usr.drop_item()
 				I.loc = src
 				scan = I
-		authenticated = 0
+		else
+			if(istype(card))
+				usr.drop_item()
+				card.loc = src
+				scan = card
+	nanomanager.update_uis(src)
 
-	if(href_list["dept"])
-		var/lastdestination = destination
-		destination = input(usr, "Which department?", "Choose a department", "") as null|anything in (alldepartments + admin_departments)
-		if(!destination) destination = lastdestination
-
-	if(href_list["auth"])
-		if ( (!( authenticated ) && (scan)) )
-			if (check_access(scan))
-				authenticated = 1
-
-	if(href_list["logout"])
-		authenticated = 0
-
-	updateUsrDialog()
-
-/obj/machinery/photocopier/faxmachine/proc/sendfax(var/destination)
+/obj/machinery/photocopier/faxmachine/proc/sendfax(var/destination,var/mob/sender)
 	if(stat & (BROKEN|NOPOWER))
 		return
 	
@@ -144,15 +180,24 @@ var/list/adminfaxes = list()	//cache for faxes that have been sent to admins
 	var/success = 0
 	for(var/obj/machinery/photocopier/faxmachine/F in allfaxes)
 		if( F.department == destination )
-			success = F.recievefax(copyitem)
+			success = F.receivefax(copyitem)
 	
 	if (success)
+		var/datum/fax/F = new /datum/fax()
+		F.name = copyitem.name
+		F.from_department = department
+		F.to_department = destination
+		F.origin = src
+		F.message = copyitem
+		F.sent_by = sender
+		F.sent_at = world.time
+		
 		visible_message("[src] beeps, \"Message transmitted successfully.\"")
 		//sendcooldown = 600
 	else
 		visible_message("[src] beeps, \"Error transmitting message.\"")
 
-/obj/machinery/photocopier/faxmachine/proc/recievefax(var/obj/item/incoming)
+/obj/machinery/photocopier/faxmachine/proc/receivefax(var/obj/item/incoming)
 	if(stat & (BROKEN|NOPOWER))
 		return 0
 	
@@ -195,20 +240,29 @@ var/list/adminfaxes = list()	//cache for faxes that have been sent to admins
 		return
 	
 	rcvdcopy.loc = null //hopefully this shouldn't cause trouble
-	adminfaxes += rcvdcopy
+	
+	var/datum/fax/admin/A = new /datum/fax/admin()
+	A.name = rcvdcopy.name
+	A.from_department = department
+	A.to_department = destination
+	A.origin = src
+	A.message = rcvdcopy
+	A.sent_by = sender
+	A.sent_at = world.time
 	
 	//message badmins that a fax has arrived
 	switch(destination)
 		if ("Central Command")
-			message_admins(sender, "CENTCOMM FAX", rcvdcopy, "CentcommFaxReply", "#006100")
-	
+			message_admins(sender, "CENTCOM FAX", destination, rcvdcopy, "#006100")
+		if ("Syndicate")
+			message_admins(sender, "SYNDICATE FAX", destination, rcvdcopy, "#DC143C")
 	sendcooldown = 1800
 	sleep(50)
 	visible_message("[src] beeps, \"Message transmitted successfully.\"")
 	
 
-/obj/machinery/photocopier/faxmachine/proc/message_admins(var/mob/sender, var/faxname, var/obj/item/sent, var/reply_type, font_colour="#006100")
-	var/msg = "\blue <b><font color='[font_colour]'>[faxname]: </font>[key_name(sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<a href='?_src_=holder;[reply_type]=\ref[sender];originfax=\ref[src]'>REPLY</a>)</b>: Receiving '[sent.name]' via secure connection ... <a href='?_src_=holder;AdminFaxView=\ref[sent]'>view message</a>"
+/obj/machinery/photocopier/faxmachine/proc/message_admins(var/mob/sender, var/faxname, var/faxtype, var/obj/item/sent, font_colour="#006100")
+	var/msg = "\blue <b><font color='[font_colour]'>[faxname]: </font>[key_name(sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[sender]'>BSA</A>) (<a href='?_src_=holder;AdminFaxCreate=\ref[sender];originfax=\ref[src];faxtype=[faxtype];replyto=\ref[sent]'>REPLY</a>)</b>: Receiving '[sent.name]' via secure connection... <a href='?_src_=holder;AdminFaxView=\ref[sent]'>view message</a>"
 
 	for(var/client/C in admins)
 		if(R_ADMIN & C.holder.rights)

code/modules/paperwork/paper.dm

@@ -76,7 +76,7 @@
 	if((M_CLUMSY in usr.mutations) && prob(50))
 		usr << "<span class='warning'>You cut yourself on the paper.</span>"
 		return
-	var/n_name = copytext(sanitize(input(usr, "What would you like to label the paper?", "Paper Labelling", null)  as text), 1, MAX_MESSAGE_LEN)
+	var/n_name = copytext(sanitize(input(usr, "What would you like to label the paper?", "Paper Labelling", name)  as text), 1, MAX_MESSAGE_LEN)
 	if((loc == usr && usr.stat == 0))
 		name = "[(n_name ? text("[n_name]") : initial(name))]"
 	if(name != "paper")

code/modules/paperwork/paper_bundle.dm

@@ -189,9 +189,9 @@
 	set category = "Object"
 	set src in usr
 
-	var/n_name = copytext(sanitize(input(usr, "What would you like to label the bundle?", "Bundle Labelling", null)  as text), 1, MAX_MESSAGE_LEN)
+	var/n_name = copytext(sanitize(input(usr, "What would you like to label the bundle?", "Bundle Labelling", name)  as text), 1, MAX_MESSAGE_LEN)
 	if((loc == usr && usr.stat == 0))
-		name = "[(n_name ? text("[n_name]") : "paper")]"
+		name = "[(n_name ? text("[n_name]") : "paper bundle")]"
 	add_fingerprint(usr)
 	return
 

code/modules/paperwork/photography.dm

@@ -90,7 +90,7 @@
 	set category = "Object"
 	set src in usr
 
-	var/n_name = copytext(sanitize(input(usr, "What would you like to label the photo?", "Photo Labelling", null)  as text), 1, MAX_MESSAGE_LEN)
+	var/n_name = copytext(sanitize(input(usr, "What would you like to label the photo?", "Photo Labelling", name)  as text), 1, MAX_MESSAGE_LEN)
 	//loc.loc check is for making possible renaming photos in clipboards
 	if(( (loc == usr || (loc.loc && loc.loc == usr)) && usr.stat == 0))
 		name = "[(n_name ? text("[n_name]") : "photo")]"
@@ -311,6 +311,7 @@
 
 	var/datum/picture/P = new()
 	P.fields["name"] = "photo"
+	P.fields["author"] = user
 	P.fields["icon"] = ic
 	P.fields["tiny"] = pc
 	P.fields["img"] = photoimage
@@ -401,4 +402,4 @@
 		if(get_dist(src, M) <= canhear_range)
 			talk_into(M, msg)
 		for(var/mob/living/carbon/human/H in watcherslist)
-			H.show_message(text("\blue (Newscaster) [] says, '[]'",M,msg), 1)
+			H.show_message(text("\blue (Newscaster) [] says, '[]'",M,msg), 1)

code/modules/paperwork/stamps.dm

@@ -1,5 +1,5 @@
 /obj/item/weapon/stamp
-	name = "\improper GRANTED rubber stamp"
+	name = "\improper rubber stamp"
 	desc = "A rubber stamp for stamping important documents."
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "stamp-ok"
@@ -53,6 +53,11 @@
 	icon_state = "stamp-cmo"
 	_color = "cmo"
 
+/obj/item/weapon/stamp/granted
+	name = "\improper GRANTED rubber stamp"
+	icon_state = "stamp-ok"
+	_color = "qm"	
+	
 /obj/item/weapon/stamp/denied
 	name = "\improper DENIED rubber stamp"
 	icon_state = "stamp-deny"