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

Conflicts: code/game/machinery/vending.dm
2026-08-23 03:57:48 +01:00 · 2015-04-10 15:25:34 +02:00
parent 05da117d10 4c44482dfc
commit 1ba8dcbca9
12 changed files with 1093 additions and 1077 deletions
@@ -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)
@@ -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