From 0bbe5a67fa6cebea94a453b780955dd1bad4aac1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Apr 2017 17:05:17 -0500 Subject: [PATCH 1/3] The least surprising nerf: Null Crates & Emagged Plasma Export Bonus --- code/modules/cargo/exports/materials.dm | 7 +------ code/modules/cargo/packs.dm.rej | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 code/modules/cargo/packs.dm.rej 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) From 18abfb70c9907ecf07827fe0fb2d2534a9b9d393 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sun, 7 May 2017 19:13:29 -0700 Subject: [PATCH 2/3] Update packs.dm --- code/modules/cargo/packs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index b7c7a7e377..1a61048f48 100644 --- a/code/modules/cargo/packs.dm +++ b/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) From 2f55a67b7a6da16d06550656dde40d63af7b579c Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sun, 7 May 2017 19:13:39 -0700 Subject: [PATCH 3/3] Delete packs.dm.rej --- code/modules/cargo/packs.dm.rej | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 code/modules/cargo/packs.dm.rej diff --git a/code/modules/cargo/packs.dm.rej b/code/modules/cargo/packs.dm.rej deleted file mode 100644 index 68a6ec8e60..0000000000 --- a/code/modules/cargo/packs.dm.rej +++ /dev/null @@ -1,18 +0,0 @@ -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)