Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII

[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2019-11-14 16:00:45 -07:00
parent 04b9e3fe91 73661cfe52
commit 4c89b8c33f
40 changed files with 1254 additions and 118 deletions
@@ -31,11 +31,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)
 	. = ..()