Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

code/game/objects/contraband.dm

@@ -153,7 +153,7 @@ obj/effect/decal/poster/New(var/serial)
 			desc += " Here to protect and serve... your donuts! A generously proportioned man, he teaches you the value of hiding your snacks."
 		if(20)
 			name += " - Tajaran Today, Special #222"
-			desc += " A controversial front page pinup from NTFashion, banned on numerous stations for it's unreasonably cute depictions."
+			desc += " A controversial front page pinup from NTFashion, banned on numerous stations for its unreasonably cute depictions."
 		if(21)
 			name += " - Respect a Soghun"
 			desc += " This poster depicts a well dressed looking Soghun receiving a prestigious award. It appears to espouse greater co-operation and harmony between the two races."

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

@@ -192,7 +192,7 @@
 		return 0
 	var/mob/M = loc
 
-	if(!M.canmove)
+	if(!M.canmove && (!M.buckled && M.handcuffed))
 		return 0
 
 	if((src in M.contents) || ( istype(loc, /turf) && in_range(src, M) ) )

code/game/objects/devices/scanners.dm

@@ -114,14 +114,14 @@ MASS SPECTROMETER
 	else if (M.getBrainLoss() >= 10)
 		user.show_message(text("\red Significant brain damage detected. Subject may have had a concussion."), 1)
 	if (M.virus2 || M.reagents.reagent_list.len > 0)
-		user.show_message(text("\red Unknown substance detected in blood."), 1)
+		user.show_message(text("\red Foreign substances detected in bloodstream."), 1)
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		for(var/name in H.organs)
 			var/datum/organ/external/e = H.organs[name]
 			var/limb = e.getDisplayName()
 			if(e.status & BROKEN)
-				if(((e.name == "l_arm") || (e.name == "r_arm") || (e.name == "l_leg") || (e.name == "r_leg")) && (!e.status & SPLINTED))
+				if(((e.name == "l_arm") || (e.name == "r_arm") || (e.name == "l_leg") || (e.name == "r_leg")) && (!(e.status & SPLINTED)))
 					user << "\red Unsecured fracture in subject [limb]. Splinting recommended for transport."
 		for(var/name in H.organs)
 			var/datum/organ/external/e = H.organs[name]

code/game/objects/devices/taperecorder.dm

@@ -23,6 +23,9 @@
 	if (recording)
 		var/ending = copytext(msg, length(msg))
 		src.timestamp+= src.timerecorded
+		if (issilicon(M))
+			src.storedinfo += "\[[time2text(src.timerecorded*10,"hh:mm:ss")]\] [M.name] states, \"[msg]\""
+			return
 		if (M.stuttering)
 			src.storedinfo += "\[[time2text(src.timerecorded*10,"hh:mm:ss")]\] [M.name] stammers, \"[msg]\""
 			return

code/game/objects/items.dm

@@ -139,7 +139,7 @@
 
 		var/direction = get_dir(src,target)
 
-		if(usr.buckled && isobj(usr.buckled) && !usr.buckled.anchored )
+		if(usr.buckled && istype(usr.buckled, /obj/structure/stool/bed/chair/office) && !usr.buckled.anchored ) //Making only office chairs fire-extinguishable. Because NO FUN ALLOWED
 			spawn(0)
 				var/obj/B = usr.buckled
 				var/movementdirection = turn(direction,180)

code/game/objects/items/weapons/cameras.dm

@@ -103,7 +103,8 @@
 
 	var/n_name = input(usr, "What would you like to label the photo?", "Photo Labelling", src.name)  as text
 	n_name = copytext(n_name, 1, 32)
-	if ((loc == usr && usr.stat == 0))
+	//loc.loc check is for making possible renaming photos in clipboards
+	if (( (src.loc == usr || (src.loc.loc && src.loc.loc == usr)) && usr.stat == 0))
 		name = "photo[(n_name ? text("- '[n_name]'") : null)]"
 	add_fingerprint(usr)
 	return
@@ -203,7 +204,10 @@
 		y_c--
 		x_c = x_c - 3
 
-	var/obj/item/weapon/photo/P = new/obj/item/weapon/photo( get_turf(src) )
+	var/obj/item/weapon/photo/P = new/obj/item/weapon/photo()
+	P.loc = usr.loc
+	if(!user.get_inactive_hand())
+		usr.put_in_inactive_hand(P)
 	var/icon/small_img = icon(temp)
 	var/icon/ic = icon('items.dmi',"photo")
 	small_img.Scale(8,8)

code/game/objects/items/weapons/medical.dm

@@ -7,10 +7,10 @@ MEDICAL
 
 
 /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob)
-	var/heal_cap = 0
+	var/heal_cap = 50
 
 	if(istype(src, /obj/item/stack/medical/advanced))
-		heal_cap = -50
+		heal_cap = 0
 
 	if (M.stat == 2)
 		var/t_him = "it"
@@ -51,7 +51,7 @@ MEDICAL
 			if(!((affecting.name == "l_arm") || (affecting.name == "r_arm") || (affecting.name == "l_leg") || (affecting.name == "r_leg")))
 				user << "\red You can't apply a splint there!"
 				return
-			if(!affecting.status & BROKEN)
+			if(!(affecting.status & BROKEN))
 				user << "\red [M]'s [limb] isn't broken!"
 				return
 			if(affecting.status & SPLINTED)
@@ -87,25 +87,26 @@ MEDICAL
 			user << "\red \The [M] is wounded badly, this item cannot help [t_him]!"
 			return
 
+		if (user)
+			if (M != user)
+				user.visible_message("\red \The [H]'s [affecting.display_name] has been bandaged with \a [src] by \the [user].",\
+					"\red You bandage \the [H]'s [affecting.display_name] with \the [src].",\
+					"You hear gauze being ripped.")
+			else
+				var/t_his = "its"
+				if (user.gender == MALE)
+					t_his = "his"
+				else if (user.gender == FEMALE)
+					t_his = "her"
+				user.visible_message("\red \The [user] bandages [t_his] [affecting.display_name] with \a [src].",\
+					"\red You bandage your [affecting.display_name] with \the [src].",\
+					"You hear gauze being ripped.")
+		use(1)
+
 		if (affecting.heal_damage(src.heal_brute, src.heal_burn))
 			H.UpdateDamageIcon()
-			if (user)
-				if (M != user)
-					user.visible_message("\red \The [H]'s [affecting.display_name] has been bandaged with \a [src] by \the [user].",\
-						"\red You bandage \the [H]'s [affecting.display_name] with \the [src].",\
-						"You hear gauze being ripped.")
-				else
-					var/t_his = "its"
-					if (user.gender == MALE)
-						t_his = "his"
-					else if (user.gender == FEMALE)
-						t_his = "her"
-					user.visible_message("\red \The [user] bandages [t_his] [affecting.display_name] with \a [src].",\
-						"\red You bandage your [affecting.display_name] with \the [src].",\
-						"You hear gauze being ripped.")
-			use(1)
 		else
-			user << "Nothing to patch up!"
+			H.UpdateDamage()
 
 		M.updatehealth()
 	else

code/game/objects/items/weapons/papers_bins.dm

@@ -101,7 +101,8 @@ NOTEBOOK
 		return
 	var/n_name = input(usr, "What would you like to label the paper?", "Paper Labelling", null)  as text
 	n_name = copytext(n_name, 1, 32)
-	if ((src.loc == usr && usr.stat == 0))
+	//loc.loc check is for making possible renaming papers in clipboards
+	if ((src.loc == usr || (src.loc.loc && src.loc.loc == usr) && usr.stat == 0))
 		src.name = n_name && n_name != "" ? n_name : "Untitled paper"
 	src.add_fingerprint(usr)
 	return
@@ -633,8 +634,24 @@ NOTEBOOK
 	var/dat = "<B>Clipboard</B><BR>"
 	if (src.pen)
 		dat += text("<A href='?src=\ref[];pen=1'>Remove Pen</A><BR><HR>", src)
-	for(var/obj/item/weapon/paper/P in src)
-		dat += text("<A href='?src=\ref[];read=\ref[]'>[]</A> <A href='?src=\ref[];write=\ref[]'>Write</A> <A href='?src=\ref[];remove=\ref[]'>Remove</A><BR>", src, P, P.name, src, P, src, P)
+	dat += "<table>"
+	for(var/obj/item/weapon/W in src)
+		dat += "<tr>"
+		if (istype(W, /obj/item/weapon/paper))
+			var/obj/item/weapon/paper/P = W
+			dat += text("<td><A href='?src=\ref[];read=\ref[]'>[]</A></td><td>	\
+			<A href='?src=\ref[];write=\ref[]'>Write</A></td><td> 				\
+			<A href='?src=\ref[];rname=\ref[]'>Rename</A></td><td> 				\
+			<A href='?src=\ref[];remove=\ref[]'>Remove</A><BR></td>", 			\
+			src, P, P.name, src, P, src, P, src, P)
+		if (istype(W, /obj/item/weapon/photo))
+			var/obj/item/weapon/photo/P = W
+			dat += text("<td><A href='?src=\ref[];read=\ref[]'>[]</A></td><td> 	\
+			<A href='?src=\ref[];rname=\ref[]'>Rename</A></td><td> 				\
+			<A href='?src=\ref[];remove=\ref[]'>Remove</A><BR></td>"			\
+			, src, P, P.name, src, P, src, P)
+		dat += "</tr>"
+	dat += "</table>"
 	user << browse(dat, "window=clipboard")
 	onclose(user, "clipboard")
 	return
@@ -679,6 +696,16 @@ NOTEBOOK
 						usr.update_clothing()
 				P.add_fingerprint(usr)
 				src.add_fingerprint(usr)
+		if (href_list["rname"])
+			var/obj/item/I = locate(href_list["rname"])
+			if ((I && I.loc == src))
+				if (istype(I, /obj/item/weapon/paper))
+					var/obj/item/weapon/paper/P = I
+					P.rename()
+				if (istype(I, /obj/item/weapon/photo))
+					var/obj/item/weapon/photo/P = I
+					P.rename()
+			src.add_fingerprint(usr)
 		if (href_list["write"])
 			var/obj/item/P = locate(href_list["write"])
 			if ((P && P.loc == src))
@@ -692,13 +719,25 @@ NOTEBOOK
 							P.attackby(src.pen, usr)
 			src.add_fingerprint(usr)
 		if (href_list["read"])
-			var/obj/item/weapon/paper/P = locate(href_list["read"])
-			if ((P && P.loc == src))
-				if (!( istype(usr, /mob/living/carbon/human) ))
-					usr << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", P.name, stars(P.info)), text("window=[]", P.name))
-					onclose(usr, "[P.name]")
-				else
-					usr << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", P.name, P.info), text("window=[]", P.name))
+			var/obj/item/I = locate(href_list["read"])
+			if ((I && I.loc == src))
+				if (istype(I, /obj/item/weapon/paper))
+					var/obj/item/weapon/paper/P = I
+					if (!( istype(usr, /mob/living/carbon/human) ))
+						usr << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", P.name, stars(P.info)), text("window=[]", P.name))
+						onclose(usr, "[P.name]")
+					else
+						var/t = dd_replacetext(P.info, "\n", "<BR>")
+						usr << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", P.name, t), text("window=[]", P.name))
+						onclose(usr, "[P.name]")
+				if (istype(I, /obj/item/weapon/photo))
+					var/obj/item/weapon/photo/P = I
+					usr << browse_rsc(P.img, "tmp_photo.png")
+					usr << browse("<html><head><title>Photo</title></head>" \
+						+ "<body style='overflow:hidden'>" \
+						+ "<div> <img src='tmp_photo.png' width = '180'" \
+						+ "[P.scribble ? "<div> Writings on the back:<br><i>[P.scribble]</i>" : ]"\
+						+ "</body></html>", "window=book;size=200x[P.scribble ? 400 : 200]")
 					onclose(usr, "[P.name]")
 		if (ismob(src.loc))
 			var/mob/M = src.loc
@@ -733,7 +772,7 @@ NOTEBOOK
 
 /obj/item/weapon/clipboard/attackby(obj/item/weapon/P as obj, mob/user as mob)
 	..()
-	if (istype(P, /obj/item/weapon/paper))
+	if (istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/photo))
 		if (src.contents.len < 15)
 			user.drop_item()
 			P.loc = src

code/game/objects/items/weapons/surgery_tools.dm

@@ -1242,7 +1242,7 @@ CIRCULAR SAW
 				if(istype(M, /mob/living/carbon/human))
 					var/datum/organ/external/affecting = M:get_organ("head")
 					affecting.take_damage(7)
-					affecting.status |= OPEN
+					affecting.open = 1
 				else
 					M.take_organ_damage(7)
 
@@ -1454,7 +1454,8 @@ CIRCULAR SAW
 			user << "\red You mess up!"
 			S.take_damage(15)
 
-		S.status |= OPEN|BLEEDING
+		S.status |= BLEEDING
+		S.open = 1
 		if(S.display_name == "chest")
 			H:embryo_op_stage = 1.0
 		if(S.display_name == "groin")

code/game/objects/storage/briefcase.dm

@@ -1,12 +1,5 @@
 /obj/item/weapon/storage/briefcase/New()
 	..()
-	new /obj/item/weapon/paper(src)
-	new /obj/item/weapon/paper(src)
-	new /obj/item/weapon/paper(src)
-	new /obj/item/weapon/paper(src)
-	new /obj/item/weapon/paper(src)
-	new /obj/item/weapon/paper(src)
-	new /obj/item/weapon/pen(src)
 
 /obj/item/weapon/storage/briefcase/attack(mob/M as mob, mob/living/user as mob)
 	//..()