cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 12:05:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cargo canister purchases fixed again (#59274)

Browse Source 
There were some remaining bugs with purchasing gas canisters brought to my attention.
This commit is contained in:
Emmett Gaines
2021-05-24 12:28:20 -04:00
committed by GitHub
parent c0553e5e46
commit 7de70dc236
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/machinery/portable/canister.dm
+1 -1
View File
@@ -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,
code/modules/cargo/expressconsole.dm
+3 -2
View File
@@ -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
code/modules/cargo/packs.dm
+2
View File
@@ -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