"
- temp += "Contents of [P.name]: "
- temp += P.manifest
-
- else if (href_list["doorder"])
+ if (href_list["doorder"])
if(world.time < reqtime)
- for(var/mob/V in hearers(src))
- V.show_message("[src]'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
+ visible_message("[src]'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
+ nanomanager.update_uis(src)
return
-
- //Find the correct supply_pack datum
- var/datum/supply_packs/P = supply_controller.supply_packs[href_list["doorder"]]
- if(!istype(P)) return
+
+ var/index = copytext(href_list["doorder"], 1, lentext(href_list["doorder"])) //text2num(copytext(href_list["doorder"], 1))
+ var/multi = text2num(copytext(href_list["doorder"], -1))
+ if(!isnum(multi))
+ return
+ var/datum/supply_packs/P = supply_controller.supply_packs[index]
+ if(!istype(P))
+ return
+ var/crates = 1
+ if(multi)
+ var/num_input = input(usr, "Amount:", "How many crates?", "") as num
+ crates = Clamp(round(text2num(num_input)), 1, 20)
+ if(..())
+ return
var/timeout = world.time + 600
var/reason = sanitize(copytext(input(usr,"Reason:","Why do you require this item?","") as null|text,1,MAX_MESSAGE_LEN))
- if(world.time > timeout) return
- if(!reason) return
-
+ if(world.time > timeout || !reason || ..())
+ return
+
var/idname = "*None Provided*"
var/idrank = "*None Provided*"
if(ishuman(usr))
@@ -413,13 +422,14 @@ var/list/mechtoys = list(
supply_controller.ordernum++
var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc)
- reqform.name = "Requisition Form - [P.name]"
+ reqform.name = "Requisition Form - [crates] '[P.name]' for [idname]"
reqform.info += "
[station_name] Supply Requisition Form
"
reqform.info += "INDEX: #[supply_controller.ordernum] "
reqform.info += "REQUESTED BY: [idname] "
reqform.info += "RANK: [idrank] "
reqform.info += "REASON: [reason] "
reqform.info += "SUPPLY CRATE TYPE: [P.name] "
+ reqform.info += "NUMBER OF CRATES: [crates] "
reqform.info += "ACCESS RESTRICTION: [replacetext(get_access_desc(P.access))] "
reqform.info += "CONTENTS: "
reqform.info += P.manifest
@@ -429,130 +439,154 @@ var/list/mechtoys = list(
reqform.update_icon() //Fix for appearing blank when printed.
reqtime = (world.time + 5) % 1e5
- //make our supply_order datum
- var/datum/supply_order/O = new /datum/supply_order()
- O.ordernum = supply_controller.ordernum
- O.object = P
- O.orderedby = idname
- supply_controller.requestlist += O
+ //make our supply_order datums
+ for(var/i = 1; i <= crates; i++)
+ supply_controller.ordernum++
+ var/datum/supply_order/O = new /datum/supply_order()
+ O.ordernum = supply_controller.ordernum
+ O.object = P
+ O.orderedby = idname
+ O.comment = reason
+ supply_controller.requestlist += O
- temp = "Thanks for your request. The cargo team will process it as soon as possible. "
- temp += " BackMain Menu"
+ else if (href_list["rreq"])
+ var/ordernum = text2num(href_list["rreq"])
+ var/obj/item/weapon/card/id/I = usr.get_id_card()
+ for(var/i=1, i<=supply_controller.requestlist.len, i++)
+ var/datum/supply_order/SO = supply_controller.requestlist[i]
+ if(SO.ordernum == ordernum && (I && SO.orderedby == I.registered_name))
+ supply_controller.requestlist.Cut(i,i+1)
+ break
- else if (href_list["vieworders"])
- temp = "Current approved orders:
"
- for(var/S in supply_controller.shoppinglist)
- var/datum/supply_order/SO = S
- temp += "[SO.object.name] approved by [SO.orderedby] [SO.comment ? "([SO.comment])":""] "
- temp += " OK"
-
- else if (href_list["viewrequests"])
- temp = "Current requests:
"
- for(var/S in supply_controller.requestlist)
- var/datum/supply_order/SO = S
- temp += "#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby] "
- temp += " OK"
-
- else if (href_list["mainmenu"])
- temp = null
+ else if (href_list["last_viewed_group"])
+ content_pack = null
+ last_viewed_group = text2num(href_list["last_viewed_group"])
+
+ else if (href_list["contents"])
+ var/topic = href_list["contents"]
+ if(topic == 1)
+ content_pack = null
+ else
+ var/datum/supply_packs/P = supply_controller.supply_packs[topic]
+ content_pack = P
add_fingerprint(usr)
- updateUsrDialog()
+ nanomanager.update_uis(src)
return
+/obj/machinery/computer/supplycomp/attack_ai(var/mob/user as mob)
+ return attack_hand(user)
+
/obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob)
- if(!allowed(user))
- user << "\red Access Denied."
+ if(!allowed(user) && !isobserver(user))
+ user << "Access denied."
return
- if(..())
- return
- user.set_machine(src)
post_signal("supply")
- var/dat
- if (temp)
- dat = temp
- else
- var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle
- if (shuttle)
- dat += " Supply shuttle"
- dat += "\nLocation: "
- if (shuttle.has_arrive_time())
- dat += "In transit ([shuttle.eta_minutes()] Mins.) "
- else
- if (shuttle.at_station())
- if (shuttle.docking_controller)
- switch(shuttle.docking_controller.get_docking_status())
- if ("docked") dat += "Docked at station "
- if ("undocked") dat += "Undocked from station "
- if ("docking") dat += "Docking with station [shuttle.can_force()? "Force Launch" : ""] "
- if ("undocking") dat += "Undocking from station [shuttle.can_force()? "Force Launch" : ""] "
- else
- dat += "Station "
-
- if (shuttle.can_launch())
- dat += "Send away"
- else if (shuttle.can_cancel())
- dat += "Cancel launch"
- else
- dat += "*Shuttle is busy*"
- dat += " \n "
- else
- dat += "Away "
- if (shuttle.can_launch())
- dat += "Request supply shuttle"
- else if (shuttle.can_cancel())
- dat += "Cancel request"
- else
- dat += "*Shuttle is busy*"
- dat += " \n "
-
-
- dat += {"\nSupply points: [supply_controller.points] \n
- \nOrder items \n
- \nView requests \n
- \nView orders \n
- \nClose"}
-
-
- user << browse(dat, "window=computer;size=575x450")
- onclose(user, "computer")
+ ui_interact(user)
return
-/obj/machinery/computer/supplycomp/attackby(I as obj, user as mob, params)
- if(istype(I,/obj/item/weapon/card/emag) && !hacked)
- user << "\blue Special supplies unlocked."
+/obj/machinery/computer/supplycomp/emag_act(user as mob)
+ if(!hacked)
+ user << "Special supplies unlocked."
hacked = 1
return
- else
- ..()
- return
+
+/obj/machinery/computer/supplycomp/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
+ // data to send to ui
+ var/data[0]
+ data["last_viewed_group"] = last_viewed_group
+
+ var/category_list[0]
+ for(var/category in all_supply_groups)
+ category_list.Add(list(list("name" = get_supply_group_name(category), "category" = category)))
+ data["categories"] = category_list
+
+ var/cat = text2num(last_viewed_group)
+ var/packs_list[0]
+ for(var/set_name in supply_controller.supply_packs)
+ var/datum/supply_packs/pack = supply_controller.supply_packs[set_name]
+ if((pack.hidden && src.hacked) || (pack.contraband && src.can_order_contraband) || (!pack.contraband && !pack.hidden))
+ if(pack.group == cat)
+ // 0/1 after the pack name (set_name) is a boolean for ordering multiple crates
+ packs_list.Add(list(list("name" = pack.name, "amount" = pack.amount, "cost" = pack.cost, "command1" = list("doorder" = "[set_name]0"), "command2" = list("doorder" = "[set_name]1"), "command3" = list("contents" = set_name))))
+
+ data["supply_packs"] = packs_list
+ if(content_pack)
+ var/pack_name = sanitize(content_pack.name)
+ data["contents_name"] = pack_name
+ data["contents"] = content_pack.manifest
+ data["contents_access"] = get_access_desc(content_pack.access)
+
+ var/requests_list[0]
+ for(var/set_name in supply_controller.requestlist)
+ var/datum/supply_order/SO = set_name
+ if(SO)
+ if(!SO.comment)
+ SO.comment = "No comment."
+ requests_list.Add(list(list("ordernum" = SO.ordernum, "supply_type" = SO.object.name, "orderedby" = SO.orderedby, "comment" = SO.comment, "command1" = list("confirmorder" = SO.ordernum), "command2" = list("rreq" = SO.ordernum))))
+ data["requests"] = requests_list
+
+ var/orders_list[0]
+ for(var/set_name in supply_controller.shoppinglist)
+ var/datum/supply_order/SO = set_name
+ if(SO)
+ orders_list.Add(list(list("ordernum" = SO.ordernum, "supply_type" = SO.object.name, "orderedby" = SO.orderedby, "comment" = SO.comment)))
+ data["orders"] = orders_list
+
+ data["points"] = supply_controller.points
+ data["send"] = list("send" = 1)
+
+ var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle
+ data["moving"] = shuttle.has_arrive_time()
+ data["at_station"] = shuttle.at_station()
+ data["timeleft"] = shuttle.eta_minutes()
+ data["can_launch"] = shuttle.can_launch()
+ data["can_force"] = shuttle.can_force()
+ data["can_cancel"] = shuttle.can_cancel()
+ if(shuttle.docking_controller)
+ data["docked"] = capitalize(shuttle.docking_controller.get_docking_status())
+
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
+ if(!ui)
+ ui = new(user, src, ui_key, "supply_console.tmpl", name, COMP_SCREEN_WIDTH, COMP_SCREEN_HEIGHT)
+ ui.set_initial_data(data)
+ ui.open()
+ ui.set_auto_update(1)
+
+/obj/machinery/computer/supplycomp/proc/is_authorized(user)
+ if(allowed(user))
+ return 1
+
+ if(isobserver(user) && check_rights(R_ADMIN, 0))
+ return 1
+
+ return 0
/obj/machinery/computer/supplycomp/Topic(href, href_list)
- if(!supply_controller)
- log_to_dd("## ERROR: Eek. The supply_controller controller datum is missing somehow.")
- return
- var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle
- if (!shuttle)
- log_to_dd("## ERROR: Eek. The supply/shuttle datum is missing somehow.")
- return
if(..())
- return
-
- if(isturf(loc) && ( in_range(src, usr) || istype(usr, /mob/living/silicon) ) )
- usr.set_machine(src)
-
- //Calling the shuttle
+ return 1
+
+ if(!is_authorized(usr))
+ return 1
+
+ if(!supply_controller)
+ log_to_dd("## ERROR: The supply_controller controller datum is missing somehow.")
+ return 1
+
+ var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle
+ if(!shuttle)
+ log_to_dd("## ERROR: The supply or shuttle datum is missing somehow.")
+ return 1
+
if(href_list["send"])
if(shuttle.at_station())
if (shuttle.forbidden_atoms_check())
- temp = "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.
OK"
+ usr = "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons."
else
shuttle.launch(src)
- temp = "Initiating launch sequence. \[Force Launch\]
OK"
else
shuttle.launch(src)
- temp = "The supply shuttle has been called and will arrive in approximately [round(supply_controller.movetime/600,1)] minutes.
OK"
post_signal("supply")
if (href_list["force_send"])
@@ -561,70 +595,34 @@ var/list/mechtoys = list(
if (href_list["cancel_send"])
shuttle.cancel_launch(src)
- else if (href_list["order"])
- //if(!shuttle.idle()) return //this shouldn't be necessary it seems
- if(href_list["order"] == "categories")
- //all_supply_groups
- //Request what?
- last_viewed_group = "categories"
- temp = "Supply points: [supply_controller.points] "
- temp += "Main Menu
"
- for(var/supply_type in supply_controller.supply_packs )
- var/datum/supply_packs/N = supply_controller.supply_packs[supply_type]
- if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != cat) continue
- temp += "[N.name]" //Have to send the type instead of a reference to the obj because it would get caught by the garbage
- temp += " (contents)"
- temp += " Cost: [N.cost] "
-
- /*temp = "Supply points: [supply_controller.points] Request what?
"
-
- for(var/supply_name in supply_controller.supply_packs )
- var/datum/supply_packs/N = supply_controller.supply_packs[supply_name]
- if(N.hidden && !hacked) continue
- if(N.contraband && !can_order_contraband) continue
- temp += "[supply_name] Cost: [N.cost] " //the obj because it would get caught by the garbage
- temp += " OK"*/
-
- else if (href_list["see_contents"])
- //Find the correct supply_pack datum
- var/datum/supply_packs/P = supply_controller.supply_packs[href_list["see_contents"]]
- if(!istype(P)) return
-
- var/cat = P.group
- var/tempaccess = get_access_desc(P.access)
-
- temp = "Supply points: [supply_controller.points] "
- temp += "Back to [get_supply_group_name(cat)]
+ {{empty}}
+ No active requests.
+ {{/for}}
+
+ Orders
+
+ {{for data.orders}}
+
+ #{{:value.ordernum}} - {{:value.supply_type}} for {{:value.orderedby}}
+
+ {{empty}}
+ No confirmed orders.
+ {{/for}}
+
+
+
+
\ No newline at end of file
diff --git a/nano/templates/supply_console.tmpl b/nano/templates/supply_console.tmpl
new file mode 100644
index 00000000000..0591cf18698
--- /dev/null
+++ b/nano/templates/supply_console.tmpl
@@ -0,0 +1,125 @@
+
+
+
+