Merge pull request #8404 from Rykka-Stormheart/shep-dev-pda-fix

Fix Janicart PDA bug from Aro's Rewrite of Janicarts.
This commit is contained in:
Novacat
2020-07-13 22:28:55 -04:00
committed by GitHub
+4 -1
View File
@@ -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)