rej clean

This commit is contained in:
LetterJay
2017-05-30 15:55:00 -05:00
parent a821d90a37
commit bc5ecc91b5
6 changed files with 0 additions and 68 deletions
@@ -1,10 +0,0 @@
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"