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

Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII

Browse Source 
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
This commit is contained in:
kevinz000
2019-11-14 16:00:45 -07:00
committed by GitHub
parent 04b9e3fe91 73661cfe52
commit 4c89b8c33f
40 changed files with 1254 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/supply.dm
+8
View File
@@ -150,5 +150,13 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
msg += export_text + "\n"
SSshuttle.points += ex.total_value[E]
for(var/datum/reagent/R in ex.total_reagents)
var/amount = ex.total_reagents[R]
var/value = amount*R.value
if(!value)
continue
msg += "[value] credits: received [amount]u of [R.name].\n"
SSshuttle.points += value
SSshuttle.centcom_message = msg
investigate_log("Shuttle contents sold for [SSshuttle.points - presale_points] credits. Contents: [ex.exported_atoms || "none."] Message: [SSshuttle.centcom_message || "none."]", INVESTIGATE_CARGO)