From 20886e15de84100052032d80630e680190bb13d8 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 24 May 2017 16:54:14 -0500 Subject: [PATCH 1/2] Nerfs plasma cost --- code/modules/cargo/exports/materials.dm | 2 +- code/modules/cargo/exports/materials.dm.rej | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 code/modules/cargo/exports/materials.dm.rej diff --git a/code/modules/cargo/exports/materials.dm b/code/modules/cargo/exports/materials.dm index 8f3292df3a..f11789deb5 100644 --- a/code/modules/cargo/exports/materials.dm +++ b/code/modules/cargo/exports/materials.dm @@ -76,7 +76,7 @@ // Plastitanium. /datum/export/material/plastitanium - cost = 750 + cost = 550 material_id = MAT_TITANIUM // code can only check for one material_id; plastitanium is half plasma, half titanium, so ((250 x 250) + (250 x 500)) / 250 message = "cm3 of plastitanium" diff --git a/code/modules/cargo/exports/materials.dm.rej b/code/modules/cargo/exports/materials.dm.rej new file mode 100644 index 0000000000..a45710fc0d --- /dev/null +++ b/code/modules/cargo/exports/materials.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/cargo/exports/materials.dm b/code/modules/cargo/exports/materials.dm (rejected hunks) +@@ -43,7 +43,7 @@ + + // Plasma. The oil of 26 century. The reason why you are here. + /datum/export/material/plasma +- cost = 500 ++ cost = 300 + k_elasticity = 0 + material_id = MAT_PLASMA + message = "cm3 of plasma" From 3c89f142edcf4e51013faf5a3dfe80b0b43aea4c Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 30 May 2017 15:17:00 -0500 Subject: [PATCH 2/2] Update materials.dm --- code/modules/cargo/exports/materials.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/exports/materials.dm b/code/modules/cargo/exports/materials.dm index f11789deb5..d4e41186b5 100644 --- a/code/modules/cargo/exports/materials.dm +++ b/code/modules/cargo/exports/materials.dm @@ -46,7 +46,7 @@ // Plasma. The oil of 26 century. The reason why you are here. /datum/export/material/plasma - cost = 500 + cost = 300 material_id = MAT_PLASMA message = "cm3 of plasma"