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

code/modules/client/preferences.dm

@@ -1596,17 +1596,6 @@ datum/preferences
 
 		else continue
 
-	// Wheelchair necessary?
-	var/datum/organ/external/l_foot = character.get_organ("l_foot")
-	var/datum/organ/external/r_foot = character.get_organ("r_foot")
-	if((!l_foot || l_foot.status & ORGAN_DESTROYED) && (!r_foot || r_foot.status & ORGAN_DESTROYED))
-		var/obj/structure/stool/bed/chair/wheelchair/W = new /obj/structure/stool/bed/chair/wheelchair (character.loc)
-		character.buckled = W
-		character.update_canmove()
-		W.dir = character.dir
-		W.buckled_mob = character
-		W.add_fingerprint(character)
-
 	if(underwear > underwear_m.len || underwear < 1)
 		underwear = 0 //I'm sure this is 100% unnecessary, but I'm paranoid... sue me. //HAH NOW NO MORE MAGIC CLONING UNDIES
 	character.underwear = underwear

code/modules/clothing/under/ties.dm

@@ -342,7 +342,7 @@
 		..(over_object)
 
 /obj/item/clothing/tie/storage/attackby(obj/item/W as obj, mob/user as mob)
-	hold.attackby(W, user)
+	return hold.attackby(W, user)
 
 /obj/item/clothing/tie/storage/emp_act(severity)
 	hold.emp_act(severity)

code/modules/mob/living/silicon/pai/pai.dm

@@ -400,6 +400,7 @@
 	src.forceMove(card)
 	card.forceMove(card.loc)
 	canmove = 0
+	icon_state = "[chassis]"
 
 /mob/living/silicon/pai/start_pulling(var/atom/movable/AM)
 
@@ -439,4 +440,4 @@
 
 // No binary for pAIs.
 /mob/living/silicon/pai/binarycheck()
-	return 0
+	return 0

code/modules/mob/living/silicon/pai/software.dm

@@ -122,6 +122,8 @@
 		return
 	var/soft = href_list["software"]
 	var/sub = href_list["sub"]
+	if(!soft && !sub)
+		return
 	if(soft)
 		src.screen = soft
 	if(sub)
@@ -670,7 +672,7 @@
 	dat += "<ul>"
 	if(!pda.toff)
 		for (var/obj/item/device/pda/P in sortAtom(PDAs))
-			if (!P.owner||P.toff||P == src.pda)	continue
+			if (!P.owner||P.toff||P == src.pda||P.hidden)	continue
 			dat += "<li><a href='byond://?src=\ref[src];software=pdamessage;target=\ref[P]'>[P]</a>"
 			dat += "</li>"
 	dat += "</ul>"

code/modules/mob/new_player/new_player.dm

@@ -95,7 +95,10 @@
 			return 1
 
 		if(href_list["ready"])
-			ready = !ready
+			if(!ticker || ticker.current_state <= GAME_STATE_PREGAME) // Make sure we don't ready up after the round has started
+				ready = !ready
+			else
+				ready = 0
 
 		if(href_list["refresh"])
 			src << browse(null, "window=playersetup") //closes the player setup window

code/modules/paperwork/paper.dm

@@ -40,6 +40,12 @@
 	pixel_y = rand(-8, 8)
 	pixel_x = rand(-9, 9)
 	stamps = ""
+
+	if(info != initial(info))
+		info = html_encode(info)
+		info = replacetext(info, "\n", "<BR>")
+		info = parsepencode(info)
+
 	spawn(2)
 		update_icon()
 		updateinfolinks()
@@ -198,7 +204,7 @@
 	t = replacetext(t, "\[/u\]", "</U>")
 	t = replacetext(t, "\[large\]", "<font size=\"4\">")
 	t = replacetext(t, "\[/large\]", "</font>")
-	t = replacetext(t, "\[sign\]", "<font face=\"[signfont]\"><i>[user.real_name]</i></font>")
+	t = replacetext(t, "\[sign\]", "<font face=\"[signfont]\"><i>[user ? user.real_name : "Anonymous"]</i></font>")
 	t = replacetext(t, "\[field\]", "<span class=\"paper_field\"></span>")
 	
 	t = replacetext(t, "\[h1\]", "<H1>")
@@ -223,7 +229,7 @@
 		t = replacetext(t, "\[cell\]", "<td>")
 		t = replacetext(t, "\[logo\]", "<img src = http://baystation12.net/wiki/logo.png>")
 
-		t = "<font face=\"[deffont]\" color=[P.colour]>[t]</font>"
+		t = "<font face=\"[deffont]\" color=[P ? P.colour : "black"]>[t]</font>"
 	else // If it is a crayon, and he still tries to use these, make them empty!
 		t = replacetext(t, "\[*\]", "")
 		t = replacetext(t, "\[hr\]", "")
@@ -237,7 +243,7 @@
 		t = replacetext(t, "\[cell\]", "")
 		t = replacetext(t, "\[logo\]", "")
 
-		t = "<font face=\"[crayonfont]\" color=[P.colour]><b>[t]</b></font>"
+		t = "<font face=\"[crayonfont]\" color=[P ? P.colour : "black"]><b>[t]</b></font>"
 
 //	t = replacetext(t, "#", "") // Junk converted to nothing!
 

code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm

@@ -20,16 +20,18 @@
 	return src.interact(user)
 
 /obj/item/device/ano_scanner/interact(var/mob/user as mob)
-	var/message = "Background radiation levels detected."
 	if(world.time - last_scan_time >= scan_delay)
 		spawn(0)
 			scan()
-		if(nearest_artifact_distance >= 0)
-			message = "Exotic energy detected on wavelength '[nearest_artifact_id]' in a radius of [nearest_artifact_distance]m"
-	else
-		message = "Scanning array is recharging."
 
-	user << "<span class='info'>[message]</span>"
+			if(!user) return
+
+			if(nearest_artifact_distance >= 0)
+				user << "Exotic energy detected on wavelength '[nearest_artifact_id]' in a radius of [nearest_artifact_distance]m"
+			else
+				user << "Background radiation levels detected."
+	else
+		user << "Scanning array is recharging."
 
 /obj/item/device/ano_scanner/proc/scan()
 	set background = 1