Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813

code/modules/cargo/exports/materials.dm

@@ -50,11 +50,6 @@
 	material_id = MAT_PLASMA
 	message = "cm3 of plasma"
 
-/datum/export/material/plasma/get_cost(obj/O, contr = 0, emag = 0)
-	. = ..()
-	if(emag) // Syndicate pays you more for the plasma.
-		. = round(. * 1.5)
-
 // Uranium. Still useful for both power generation and nuclear annihilation.
 /datum/export/material/uranium
 	cost = 400
@@ -98,4 +93,4 @@
 	message = "cm3 of glass"
 	material_id = MAT_GLASS
 	export_types = list(/obj/item/stack/sheet/glass, /obj/item/weapon/ore,
-		/obj/item/weapon/shard)
+		/obj/item/weapon/shard)

code/modules/cargo/packs.dm

@@ -182,14 +182,14 @@
 /datum/supply_pack/emergency/syndicate
 	name = "NULL_ENTRY"
 	hidden = TRUE
-	cost = 14000
+	cost = 20000
 	contains = list()
 	crate_name = "emergency crate"
 	crate_type = /obj/structure/closet/crate/internals
 	dangerous = TRUE
 
 /datum/supply_pack/emergency/syndicate/fill(obj/structure/closet/crate/C)
-	var/crate_value = 50
+	var/crate_value = 30
 	var/list/uplink_items = get_uplink_items(SSticker.mode)
 	while(crate_value)
 		var/category = pick(uplink_items)
@@ -828,6 +828,14 @@
 					/obj/item/weapon/defibrillator/loaded)
 	crate_name = "defibrillator crate"
 
+/datum/supply_pack/medical/vending
+	name = "Medical Vending Crate"
+	cost = 2000
+	contains = list(/obj/item/weapon/vending_refill/medical,
+					/obj/item/weapon/vending_refill/medical,
+					/obj/item/weapon/vending_refill/medical)
+	crate_name = "medical vending crate"
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Science /////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////