mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-15 17:13:46 +01:00
Add coordinate janicart pda (#23489)
* Add janicart coordinates to the Janitor PDA * Compiled the new TGUI * TGUI update * TGUI update * Space for indent is the evil * Update code/modules/pda/cart_apps.dm Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Update code/modules/pda/cart_apps.dm Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Update code/modules/pda/cart_apps.dm Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Update code/modules/vehicle/janivehicle.dm Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Update tgui/packages/tgui/interfaces/pda/pda_janitor.js Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Update code/modules/pda/cart_apps.dm Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Update tgui/packages/tgui/interfaces/pda/pda_janitor.js Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Update tgui/packages/tgui/interfaces/pda/pda_janitor.js Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Update code/modules/pda/cart_apps.dm Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * TGUI update --------- Co-authored-by: Pierre-Louis <hernandezpierrelouis@protonmail.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
This commit is contained in:
@@ -449,8 +449,19 @@
|
||||
var/direction = get_dir(pda,B)
|
||||
CartData[++CartData.len] = list("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "volume" = B.reagents.total_volume, "max_volume" = B.reagents.maximum_volume)
|
||||
|
||||
var/list/JaniCartData = list()
|
||||
for(var/obj/vehicle/janicart/janicart in GLOB.janitorial_equipment)
|
||||
var/turf/janicart_loc = get_turf(janicart )
|
||||
if(janicart_loc)
|
||||
if(janicart_loc.z != cl.z)
|
||||
continue
|
||||
var/direction_from_user = get_dir(pda, janicart)
|
||||
JaniCartData[++JaniCartData.len] = list("x" = janicart_loc.x, "y" = janicart_loc.y, "direction_from_user" = uppertext(dir2text(direction_from_user)))
|
||||
|
||||
JaniData["mops"] = MopData.len ? MopData : null
|
||||
JaniData["buckets"] = BucketData.len ? BucketData : null
|
||||
JaniData["cleanbots"] = CbotData.len ? CbotData : null
|
||||
JaniData["carts"] = CartData.len ? CartData : null
|
||||
JaniData["janicarts"] = JaniCartData.len ? JaniCartData : null
|
||||
data["janitor"] = JaniData
|
||||
|
||||
|
||||
@@ -11,7 +11,12 @@
|
||||
/// Does it clean the tile under it?
|
||||
var/floorbuffer = FALSE
|
||||
|
||||
/obj/vehicle/janicart/Initialize(mapload)
|
||||
. = ..()
|
||||
GLOB.janitorial_equipment += src
|
||||
|
||||
/obj/vehicle/janicart/Destroy()
|
||||
GLOB.janitorial_equipment -= src
|
||||
QDEL_NULL(mybag)
|
||||
return ..()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user