From 9c66b2f2693d56d3a15d84561625f51516f969a8 Mon Sep 17 00:00:00 2001 From: Rykka Date: Mon, 13 Jul 2020 20:50:26 -0400 Subject: [PATCH] Fix Janicart PDA bug from Aro's Rewrite of Janicarts. Fixes https://github.com/VOREStation/VOREStation/issues/8387 that happened as a result of the janicart rewrite, and them no longer starting with buckets. Polaris PR incoming ASAP. --- code/game/objects/items/devices/PDA/cart.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index ad4e1d7f3e..0e5f8f287a 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -519,7 +519,10 @@ var/list/civilian_cartridges = list( if(bl.z != cl.z) continue var/direction = get_dir(src,B) - CartData[++CartData.len] = list("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "status" = B.reagents.total_volume/100) + var/status = "No Bucket" + if(B.mybucket) + status = B.mybucket.reagents.total_volume / 100 + CartData[++CartData.len] = list("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "status" = status) if(!CartData.len) CartData[++CartData.len] = list("x" = 0, "y" = 0, dir=null, status = null)