Merge remote-tracking branch 'origin/master' into rustsql

code/modules/cargo/console.dm

@@ -179,6 +179,10 @@
 			if((pack.hidden && !(obj_flags & EMAGGED)) || (pack.contraband && !contraband) || pack.DropPodOnly)
 				return
 
+			if(self_paid && !pack.can_private_buy)
+				say("This cannot be bought privately.")
+				return
+
 			var/name = "*None Provided*"
 			var/rank = "*None Provided*"
 			var/ckey = usr.ckey

code/modules/cargo/packs/medical.dm

@@ -90,6 +90,18 @@
 	crate_name = "medical hardsuit"
 	crate_type = /obj/structure/closet/crate/secure/medical
 
+/datum/supply_pack/medical/paramedicevasuit
+	name = "Paramedic EVA Suit"
+	desc = "Greytide pushing up daisies with the carp outside the station? Chemistry vented in a meth experiment gone wrong? Be the blue saviour this station desperately needs and get your Paramedical EVA suit today! Requires medical access to open."
+	cost = 1975
+	access = ACCESS_MEDICAL
+	contains = list(/obj/item/tank/internals/emergency_oxygen,
+					/obj/item/clothing/head/helmet/space/eva/paramedic,
+					/obj/item/clothing/suit/space/eva/paramedic,
+					/obj/item/clothing/mask/breath)
+	crate_name = "paramedic EVA suit"
+	crate_type = /obj/structure/closet/crate/secure/medical
+
 /datum/supply_pack/medical/supplies
 	name = "Medical Supplies Crate"
 	desc = "Contains seven beakers, syringes, and bodybags. Three morphine bottles, four insulin pills. Two charcoal bottles, epinephrine bottles, antitoxin bottles, and large beakers. Finally, a single roll of medical gauze, as well as a bottle of stimulant pills for long, hard work days. German doctor not included."

code/modules/cargo/packs/service.dm

@@ -261,9 +261,9 @@
 					/obj/item/reagent_containers/glass/bucket,
 					/obj/item/reagent_containers/glass/bucket,
 					/obj/item/mop,
-					/obj/item/caution,
-					/obj/item/caution,
-					/obj/item/caution,
+					/obj/item/clothing/suit/caution,
+					/obj/item/clothing/suit/caution,
+					/obj/item/clothing/suit/caution,
 					/obj/item/storage/bag/trash,
 					/obj/item/reagent_containers/spray/cleaner,
 					/obj/item/reagent_containers/rag,