Merge remote-tracking branch 'upstream/dev' into secure-airlock

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -9,7 +9,6 @@
 				new /obj/item/clothing/shoes/syndigaloshes(src)
 				return
 
-			if ("stealth")
 			if("stealth")
 				new /obj/item/weapon/gun/energy/crossbow(src)
 				new /obj/item/weapon/pen/paralysis(src)
@@ -22,6 +21,8 @@
 				new /obj/item/device/powersink(src)
 				new /obj/item/clothing/suit/space/syndicate(src)
 				new /obj/item/clothing/head/helmet/space/syndicate(src)
+				new /obj/item/clothing/mask/gas/syndicate(src)
+				new /obj/item/weapon/tank/emergency_oxygen/double(src)
 				return
 
 			if("guns")
@@ -55,6 +56,8 @@
 				new /obj/item/device/radio/beacon/syndicate(src)
 				new /obj/item/clothing/suit/space/syndicate(src)
 				new /obj/item/clothing/head/helmet/space/syndicate(src)
+				new /obj/item/clothing/mask/gas/syndicate(src)
+				new /obj/item/weapon/tank/emergency_oxygen/double(src)
 				new /obj/item/weapon/card/emag(src)
 				return
 
@@ -116,7 +119,10 @@
 	..()
 	new /obj/item/clothing/suit/space/syndicate(src)
 	new /obj/item/clothing/head/helmet/space/syndicate(src)
+	new /obj/item/clothing/mask/gas/syndicate(src)
+	new /obj/item/weapon/tank/emergency_oxygen/double(src)
 	return
+
 /obj/item/weapon/storage/box/syndie_kit/chameleon
 	name = "Chameleon Kit"
 	desc = "Comes with all the clothes you need to impersonate most people.  Acting lessons sold seperately."

code/game/objects/structures/window.dm

@@ -214,7 +214,7 @@
 			visible_message("<span class='notice'>[user] dismantles \the [src].</span>")
 			if(dir == SOUTHWEST)
 				var/obj/item/stack/sheet/mats = new glasstype(loc)
-				mats.amount = 2
+				mats.amount = is_fulltile() ? 4 : 2
 			else
 				new glasstype(loc)
 			del(src)