From 7de70dc236cd2b26ccf63c71a2d64d13e39c2926 Mon Sep 17 00:00:00 2001
From: Emmett Gaines <ninjanomnom@gmail.com>
Date: Mon, 24 May 2021 12:28:20 -0400
Subject: [PATCH] Cargo canister purchases fixed again (#59274)

There were some remaining bugs with purchasing gas canisters brought to my attention.
---
 code/modules/atmospherics/machinery/portable/canister.dm | 2 +-
 code/modules/cargo/expressconsole.dm                     | 5 +++--
 code/modules/cargo/packs.dm                              | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 9fca3dbfa06..c2c5b85004b 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
 		"no2" = /obj/machinery/portable_atmospherics/canister/nitryl,
 		"bz" = /obj/machinery/portable_atmospherics/canister/bz,
 		"air" = /obj/machinery/portable_atmospherics/canister/air,
-		"water vapor" = /obj/machinery/portable_atmospherics/canister/water_vapor,
+		"water_vapor" = /obj/machinery/portable_atmospherics/canister/water_vapor,
 		"tritium" = /obj/machinery/portable_atmospherics/canister/tritium,
 		"hyper-noblium" = /obj/machinery/portable_atmospherics/canister/nob,
 		"stimulum" = /obj/machinery/portable_atmospherics/canister/stimulum,
diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm
index ed4093e39d8..8195ec352c5 100644
--- a/code/modules/cargo/expressconsole.dm
+++ b/code/modules/cargo/expressconsole.dm
@@ -163,10 +163,11 @@
 			if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_EXPRESSPOD_CONSOLE))
 				say("Railgun recalibrating. Stand by.")
 				return
-			var/id = text2path(params["id"])
+			var/id = params["id"]
+			id = text2path(id) || id
 			var/datum/supply_pack/pack = SSshuttle.supply_packs[id]
 			if(!istype(pack))
-				return
+				CRASH("Unknown supply pack id given by express order console ui. ID: [params["id"]]")
 			var/name = "*None Provided*"
 			var/rank = "*None Provided*"
 			var/ckey = usr.ckey
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index b13e485ca34..2ac4c20b2ae 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -1148,6 +1148,8 @@
 
 		pack.contains = list(GLOB.gas_id_to_canister[initial(gas.id)])
 
+		pack.crate_type = crate_type
+
 		canister_packs += pack
 
 	return canister_packs