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

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