Merge remote-tracking branch 'upstream/dev' into paintmixing

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

@@ -379,21 +379,21 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	data["stationTime"] = worldtime2text()
 	data["newMessage"] = newmessage
 	
+	if(mode==2)
+		var/convopdas[0]
+		var/pdas[0]
+		var/count = 0
+		for (var/obj/item/device/pda/P in sortAtom(PDAs))
+			if (!P.owner||P.toff||P == src||P.hidden)       continue
+			if(conversations.Find("\ref[P]"))
+				convopdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "1")))
+			else
+				pdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "0")))	
+			count++
 
-	var/convopdas[0]
-	var/pdas[0]
-	var/count = 0
-	for (var/obj/item/device/pda/P in sortAtom(PDAs))
-		if (!P.owner||P.toff||P == src||P.hidden)       continue
-		if(conversations.Find("\ref[P]"))
-			convopdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "1")))
-		else
-			pdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "0")))	
-		count++
-
-	data["convopdas"] = convopdas
-	data["pdas"] = pdas
-	data["pda_count"] = count
+		data["convopdas"] = convopdas
+		data["pdas"] = pdas
+		data["pda_count"] = count
 
 	if(mode==21)
 		data["messagescount"] = tnote.len

code/game/objects/items/stacks/sheets/glass.dm

@@ -305,7 +305,7 @@
 /obj/item/stack/sheet/glass/plasmaglass
 	name = "plasma glass"
 	desc = "A very strong and very resistant sheet of a plasma-glass alloy."
-	singular_name = "glass sheet"
+	singular_name = "plasma glass sheet"
 	icon_state = "sheet-plasmaglass"
 	g_amt = 7500
 	origin_tech = "materials=3;plasma=2"