cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-06 15:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Janicart PDA bug from Aro's Rewrite of Janicarts.

Browse Source 
Upstream port of https://github.com/VOREStation/VOREStation/pull/8404

Fixes create_NanoUI_values() crashing before it returns the data, thus crashing everything else, because reagents was `null`, as a result of Aro's redoing of the janitor carts to not have a bucket by default.
This commit is contained in:
Rykka
2020-07-13 20:57:06 -04:00
parent 66cc3568d5
commit ebbfc92a95
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/objects/items/devices/PDA/cart.dm
View File

@@ -515,7 +515,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)