Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII

[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
This commit is contained in:
kevinz000
2020-10-28 05:48:57 -03:00
committed by Dip
parent 89aa5852c8
commit 45f7b020c4
39 changed files with 1253 additions and 117 deletions
+3 -3
View File
@@ -29,11 +29,11 @@
obj_flags &= ~EMAGGED
/obj/machinery/computer/cargo/proc/get_export_categories()
var/cat = EXPORT_CARGO
. = EXPORT_CARGO
if(contraband)
cat |= EXPORT_CONTRABAND
. |= EXPORT_CONTRABAND
if(obj_flags & EMAGGED)
cat |= EXPORT_EMAG
. |= EXPORT_EMAG
/obj/machinery/computer/cargo/emag_act(mob/user)
if(obj_flags & EMAGGED)