From 041cf7d512a462b8076c5fc77f87e868274667c2 Mon Sep 17 00:00:00 2001
From: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
Date: Tue, 20 Oct 2020 19:07:48 +0200
Subject: [PATCH] fixed express consoles without weird conflicts (#54481)

---
 code/modules/cargo/expressconsole.dm | 1 +
 code/modules/cargo/orderconsole.dm   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm
index ec47ec05199..f19166ceaba 100644
--- a/code/modules/cargo/expressconsole.dm
+++ b/code/modules/cargo/expressconsole.dm
@@ -15,6 +15,7 @@
 	circuit = /obj/item/circuitboard/computer/cargo/express
 	blockade_warning = "Bluespace instability detected. Delivery impossible."
 	req_access = list(ACCESS_QM)
+	is_express = TRUE
 
 	var/message
 	var/printed_beacons = 0 //number of beacons printed. Used to determine beacon names.
diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm
index 132dd64b351..9197dce0e96 100644
--- a/code/modules/cargo/orderconsole.dm
+++ b/code/modules/cargo/orderconsole.dm
@@ -22,6 +22,8 @@
 	/// var that tracks message cooldown
 	var/message_cooldown
 	var/list/loaded_coupons
+	/// var that makes express console use rockets
+	var/is_express = FALSE
 
 
 /obj/machinery/computer/cargo/request
@@ -176,6 +178,8 @@
 				log_game("[key_name(usr)] accepted a shuttle loan event.")
 				. = TRUE
 		if("add")
+			if(is_express)
+				return
 			var/id = text2path(params["id"])
 			var/datum/supply_pack/pack = SSshuttle.supply_packs[id]
 			if(!istype(pack))