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

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

@@ -825,7 +825,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 							difficulty += P.cartridge.access_engine
 							difficulty += P.cartridge.access_clown
 							difficulty += P.cartridge.access_janitor
-							difficulty += 3 * P.hidden_uplink
+							if(P.hidden_uplink)
+								difficulty += 3
 
 						if(prob(difficulty))
 							U.show_message("\red An error flashes on your [src].", 1)

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

@@ -161,6 +161,7 @@
 	singular_name = "reinforced glass sheet"
 	icon_state = "sheet-rglass"
 	charge_costs = list(500, 1000)
+	stacktype = /obj/item/stack/sheet/glass/reinforced
 
 /*
  * Phoron Glass sheets

code/game/objects/structures/girders.dm

@@ -113,7 +113,7 @@
 							del(src)
 					return
 
-			if(/obj/item/stack/sheet/plasteel)
+			if(/obj/item/stack/sheet/plasteel, /obj/item/stack/sheet/plasteel/cyborg)
 				if(!anchored)
 					if(S.use(2))
 						user << "\blue You create a false wall! Push on it to open or close the passage."