Merge pull request #1169 from Citadel-Station-13/upstream-merge-27596

[MIRROR] Nerfs plasma cost
2017-05-30 15:46:34 -05:00
parent 2de531b2e7 3c89f142ed
commit 33af767101
2 changed files with 12 additions and 2 deletions
@@ -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"

@@ -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"

@@ -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"