shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-27773

Browse Source
This commit is contained in:
LetterJay
2017-06-06 09:05:26 -05:00
committed by GitHub
parent 2feab0a411 629a417177
commit 35b56f3075
359 changed files with 404750 additions and 231336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/cargo/exports/materials.dm
View File

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