diff --git a/code/modules/cargo/exports/materials.dm b/code/modules/cargo/exports/materials.dm index c2a0734958..8f3292df3a 100644 --- a/code/modules/cargo/exports/materials.dm +++ b/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) \ No newline at end of file + /obj/item/weapon/shard) diff --git a/code/modules/cargo/packs.dm.rej b/code/modules/cargo/packs.dm.rej new file mode 100644 index 0000000000..68a6ec8e60 --- /dev/null +++ b/code/modules/cargo/packs.dm.rej @@ -0,0 +1,18 @@ +diff a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm (rejected hunks) +@@ -169,14 +169,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(ticker.mode) + while(crate_value) + var/category = pick(uplink_items)