Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff

code/datums/shuttles.dm

@@ -45,6 +45,13 @@
 	description = "Features include: areas for each department, and a small bar."
 	admin_notes = "Designed to reduce chaos. Each dept requires dept access."
 
+/datum/map_template/shuttle/emergency/military
+	suffix = "mil"
+	name = "emergency shuttle (military)"
+	description = "Troop transport with point defense turrets."
+	admin_notes = "Designed to ensure a safe evacuation during xeno outbreaks."
+
+
 /datum/map_template/shuttle/emergency/clown
 	suffix = "clown"
 	name = "Snappop(tm)!"

code/datums/supplypacks.dm

@@ -1249,7 +1249,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 /datum/supply_packs/misc/watertank
 	name = "Water Tank Crate"
 	contains = list(/obj/structure/reagent_dispensers/watertank)
-	cost = 6
+	cost = 8
 	containertype = /obj/structure/largecrate
 	containername = "water tank crate"
 
@@ -1663,6 +1663,26 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 					)
 	containername = "shield control board crate"
 
+///////////// Bathroom Fixtures
+
+/datum/supply_packs/misc/toilet
+	name = "Lavatory Crate"
+	cost = 10
+	contains = list(
+					/obj/item/weapon/bathroom_parts,
+					/obj/item/weapon/bathroom_parts/urinal
+					)
+	containername = "lavatory crate"
+
+/datum/supply_packs/misc/hygiene
+	name = "Hygiene Station Crate"
+	cost = 10
+	contains = list(
+					/obj/item/weapon/bathroom_parts/sink,
+					/obj/item/mounted/shower
+					)
+	containername = "hygiene station crate"
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Vending /////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////

code/datums/uplink_item.dm

@@ -863,6 +863,7 @@ var/list/uplink_items = list()
 	reference = "NNSSS"
 	cost = 4 //but they aren't
 	gamemodes = list(/datum/game_mode/nuclear)
+	excludefrom = list()
 
 /datum/uplink_item/stealthy_tools/agent_card
 	name = "Agent ID Card"