cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Browser Window Stuff (#9960)

Browse Source
This commit is contained in:
Geeves
2020-09-14 11:00:14 +02:00
committed by GitHub
parent af44e8eb19
commit 5b87eb39d3
27 changed files with 242 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machine_processing.dm
+4 -3
View File
@@ -109,9 +109,10 @@
dat += "</table><hr>"
dat += "Currently displaying [show_all_ores ? "all ore types" : "only available ore types"]. <A href='?src=\ref[src];toggle_ores=1'>\[[show_all_ores ? "show less" : "show more"]\]</a></br>"
dat += "The ore processor is currently <A href='?src=\ref[src];toggle_power=1'>[(machine.active ? "<font color='green'>processing</font>" : "<font color='red'>disabled</font>")]</a>."
user << browse(dat, "window=processor_console;size=400x500")
onclose(user, "processor_console")
return
var/datum/browser/processor_win = new(user, "processor_console", capitalize_first_letters(name))
processor_win.set_content(dat)
processor_win.open()
/obj/machinery/mineral/processing_unit_console/Topic(href, href_list)
if(..())
code/modules/mob/living/bot/cleanbot.dm
+4 -5
View File
@@ -259,8 +259,7 @@ var/list/cleanbot_types // Going to use this to generate a list of types once th
to_chat(user, SPAN_WARNING("The unit's interface refuses to unlock!"))
return
var/dat
dat += "<TT><B>Automatic Station Cleaner v1.1</B></TT><BR><BR>"
var/dat = ""
dat += "Status: <A href='?src=\ref[src];operation=start'>[on ? "On" : "Off"]</A><BR>"
dat += "Behaviour controls are [locked ? "locked" : "unlocked"]<BR>"
dat += "Maintenance panel is [open ? "opened" : "closed"]"
@@ -271,9 +270,9 @@ var/list/cleanbot_types // Going to use this to generate a list of types once th
dat += "Odd looking screw twiddled: <A href='?src=\ref[src];operation=screw'>[screw_loose ? "Yes" : "No"]</A><BR>"
dat += "Weird button pressed: <A href='?src=\ref[src];operation=odd_button'>[odd_button ? "Yes" : "No"]</A>"
user << browse("<HEAD><TITLE>Cleaner v1.1 controls</TITLE></HEAD>[dat]", "window=autocleaner")
onclose(user, "autocleaner")
return
var/datum/browser/bot_win = new(user, "autocleaner", "Automatic Station Cleaner v1.2 Controls")
bot_win.set_content(dat)
bot_win.open()
/mob/living/bot/cleanbot/Topic(href, href_list)
if(..())
code/modules/mob/living/bot/farmbot.dm
+3 -4
View File
@@ -49,7 +49,6 @@
return
var/dat = ""
dat += "<TT><B>Automatic Hyrdoponic Assisting Unit v1.1</B></TT><BR><BR>"
dat += "Status: <A href='?src=\ref[src];power=1'>[on ? "On" : "Off"]</A><BR>"
dat += "Water Tank: "
if (tank)
@@ -71,9 +70,9 @@
dat += "Remove dead plants: <A href='?src=\ref[src];removedead=1'>[removes_dead ? "Yes" : "No"]</A><BR>"
dat += "</TT>"
user << browse("<HEAD><TITLE>Farmbot v1.1 controls</TITLE></HEAD>[dat]", "window=autofarm")
onclose(user, "autofarm")
return
var/datum/browser/bot_win = new(user, "autofarm", "Automatic Farmbot v1.2 Controls")
bot_win.set_content(dat)
bot_win.open()
/mob/living/bot/farmbot/emag_act(var/remaining_charges, var/mob/user)
. = ..()
code/modules/mob/living/bot/floorbot.dm
+5 -5
View File
@@ -31,8 +31,8 @@
return
user.set_machine(src)
var/dat
dat += "<TT><B>Automatic Station Floor Repairer v1.1</B></TT><BR><BR>"
var/dat = ""
dat += "Status: <A href='?src=\ref[src];operation=start'>[src.on ? "On" : "Off"]</A><BR>"
dat += "Maintenance panel is [open ? "opened" : "closed"]<BR>"
//dat += "Tiles left: [amount]<BR>"
@@ -48,9 +48,9 @@
bmode = "Disabled"
dat += "<BR><BR>Bridge Mode : <A href='?src=\ref[src];operation=bridgemode'>[bmode]</A><BR>"
user << browse("<HEAD><TITLE>Repairbot v1.1 controls</TITLE></HEAD>[dat]", "window=autorepair")
onclose(user, "autorepair")
return
var/datum/browser/bot_win = new(user, "autorepair", "Automatic Repairbot v1.2 Controls")
bot_win.set_content(dat)
bot_win.open()
/mob/living/bot/floorbot/emag_act(var/remaining_charges, var/mob/user)
. = ..()
code/modules/mob/living/bot/medbot.dm
+4 -5
View File
@@ -129,8 +129,7 @@
to_chat(user, "<span class='warning'>The unit's interface refuses to unlock!</span>")
return
var/dat
dat += "<TT><B>Automatic Medical Unit v1.1</B></TT><BR><BR>"
var/dat = ""
dat += "Status: <A href='?src=\ref[src];power=1'>[on ? "On" : "Off"]</A><BR>"
dat += "Maintenance panel is [open ? "opened" : "closed"]<BR>"
dat += "Beaker: "
@@ -161,9 +160,9 @@
dat += "The speaker switch is [vocal ? "on" : "off"]. <a href='?src=\ref[src];togglevoice=[1]'>Toggle</a><br>"
user << browse("<HEAD><TITLE>Medibot v1.1 controls</TITLE></HEAD>[dat]", "window=automed")
onclose(user, "automed")
return
var/datum/browser/bot_win = new(user, "automed", "Automatic Medibot v1.2 Controls")
bot_win.set_content(dat)
bot_win.open()
/mob/living/bot/medbot/attackby(var/obj/item/O, var/mob/user)
if(istype(O, /obj/item/reagent_containers/glass))
code/modules/mob/living/bot/secbot.dm
+6 -6
View File
@@ -41,7 +41,7 @@
var/next_destination = "__nearest__" // This is the next beacon's ID
var/nearest_beacon // Tag of the beakon that we assume to be the closest one
var/bot_version = 1.4
var/bot_version = 1.5
var/list/threat_found_sounds = list(
'sound/voice/bcriminal.ogg',
'sound/voice/bjustice.ogg',
@@ -102,8 +102,7 @@
to_chat(user, "<span class='warning'>The unit's interface refuses to unlock!</span>")
return
user.set_machine(src)
var/dat
dat += "<TT><B>Automatic Security Unit v[bot_version]</B></TT><BR><BR>"
var/dat = ""
dat += "Status: <A href='?src=\ref[src];power=1'>[on ? "On" : "Off"]</A><BR>"
dat += "Behaviour controls are [locked ? "locked" : "unlocked"]<BR>"
dat += "Maintenance panel is [open ? "opened" : "closed"]"
@@ -114,9 +113,10 @@
dat += "Operating Mode: <A href='?src=\ref[src];operation=switchmode'>[arrest_type ? "Detain" : "Arrest"]</A><BR>"
dat += "Report Arrests: <A href='?src=\ref[src];operation=declarearrests'>[declare_arrests ? "Yes" : "No"]</A><BR>"
dat += "Auto Patrol: <A href='?src=\ref[src];operation=patrol'>[auto_patrol ? "On" : "Off"]</A>"
user << browse("<HEAD><TITLE>Securitron v[bot_version] controls</TITLE></HEAD>[dat]", "window=autosec")
onclose(user, "autosec")
return
var/datum/browser/bot_win = new(user, "autosec", "Automatic Securitron v[bot_version] Controls")
bot_win.set_content(dat)
bot_win.open()
/mob/living/bot/secbot/Topic(href, href_list)
if(..())
code/modules/mob/living/carbon/human/human.dm
+3 -3
View File
@@ -402,9 +402,9 @@
dat += "<BR><A href='?src=\ref[user];refresh=1'>Refresh</A>"
dat += "<BR><A href='?src=\ref[user];mach_close=mob[name]'>Close</A>"
user << browse(dat, text("window=mob[name];size=340x540"))
onclose(user, "mob[name]")
return
var/datum/browser/mob_win = new(user, "mob[name]", capitalize_first_letters(name), 350, 550)
mob_win.set_content(dat)
mob_win.open()
// called when something steps onto a human
// this handles mulebots and vehicles
code/modules/mob/living/silicon/robot/drone/drone_console.dm
+3 -3
View File
@@ -41,10 +41,10 @@
dat += "<BR><BR><B>Drone fabricator</B>: "
dat += "[dronefab ? "<A href='?src=\ref[src];toggle_fab=1'>[(dronefab.produce_drones && !(dronefab.stat & NOPOWER)) ? "ACTIVE" : "INACTIVE"]</A>" : "<font color='red'><b>FABRICATOR NOT DETECTED.</b></font> (<A href='?src=\ref[src];search_fab=1'>search</a>)"]"
user << browse(dat, "window=computer;size=400x500")
onclose(user, "computer")
return
var/datum/browser/drone_win = new(user, "computer", capitalize_first_letters(name), 400, 500)
drone_win.set_content(dat)
drone_win.open()
/obj/machinery/computer/drone_control/Topic(href, href_list)
if(..())
code/modules/mob/mob.dm
+8 -10
View File
@@ -280,11 +280,9 @@
return
/mob/proc/show_inv(mob/user as mob)
/mob/proc/show_inv(mob/user)
user.set_machine(src)
var/dat = {"
<B><HR><FONT size=3>[name]</FONT></B>
<BR><HR>
<BR><B>Head(Mask):</B> <A href='?src=\ref[src];item=mask'>[(wear_mask ? wear_mask : "Nothing")]</A>
<BR><B>Left Hand:</B> <A href='?src=\ref[src];item=l_hand'>[(l_hand ? l_hand : "Nothing")]</A>
<BR><B>Right Hand:</B> <A href='?src=\ref[src];item=r_hand'>[(r_hand ? r_hand : "Nothing")]</A>
@@ -294,9 +292,10 @@
<BR><A href='?src=\ref[user];refresh=1'>Refresh</A>
<BR><A href='?src=\ref[user];mach_close=mob[name]'>Close</A>
<BR>"}
user << browse(dat, text("window=mob[];size=325x500", name))
onclose(user, "mob[name]")
return
var/datum/browser/mob_win = new(user, "mob[name]", capitalize_first_letters(name))
mob_win.set_content(dat)
mob_win.open()
//mob verbs are faster than object verbs. See http://www.byond.com/forum/?post=1326139&page=2#comment8198716 for why this isn't atom/verb/examine()
/mob/verb/examinate(atom/A as mob|obj|turf in view())
@@ -608,12 +607,11 @@
src << browse(null, t1)
if(href_list["flavor_more"])
usr << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", name, replacetext(flavor_text, "\n", "<BR>")), text("window=[];size=500x200", name))
onclose(usr, "[name]")
var/datum/browser/flavor_win = new(usr, name, capitalize_first_letters(name), 500, 250)
flavor_win.set_content(replacetext(flavor_text, "\n", "<BR>"))
flavor_win.open()
if(href_list["flavor_change"])
update_flavor_text()
// ..()
return
/mob/proc/pull_damage()
code/modules/power/singularity/particle_accelerator/particle_control.dm
+3 -3
View File
@@ -258,6 +258,6 @@
dat += "Particle Strength: [src.strength] "
dat += "<A href='?src=\ref[src];strengthdown=1'>--</A>|<A href='?src=\ref[src];strengthup=1'>++</A><BR><BR>"
user << browse(dat, "window=pacontrol;size=420x500")
onclose(user, "pacontrol")
return
var/datum/browser/pa_win = new(user, "pacontrol", capitalize_first_letters(name), 420, 500)
pa_win.set_content(dat)
pa_win.open()
code/modules/reagents/Chemistry-Machinery.dm
+4 -4
View File
@@ -417,7 +417,7 @@
dat = {"
<b>Processing chamber contains:</b><br>
<b>Processing Chamber contains:</b><br>
[processing_chamber]<br>
[beaker_contents]<hr>
"}
@@ -429,10 +429,10 @@
dat += "<A href='?src=\ref[src];action=detach'>Detach the beaker</a><BR>"
else
dat += "Please wait..."
user << browse("<HEAD><TITLE>All-In-One Grinder</TITLE></HEAD><TT>[dat]</TT>", "window=reagentgrinder")
onclose(user, "reagentgrinder")
return
var/datum/browser/grindr_win = new(user, "reagentgrinder", capitalize_first_letters(name))
grindr_win.set_content(dat)
grindr_win.open()
/obj/machinery/reagentgrinder/Topic(href, href_list)
if(..())
code/modules/recycling/disposal.dm
+4 -2
View File
@@ -345,8 +345,10 @@
user.set_machine(src)
user << browse(dat, "window=disposal;size=360x170")
onclose(user, "disposal")
var/datum/browser/disposal_win = new(user, "disposal", capitalize_first_letters(name), 320, 200)
disposal_win.set_content(dat)
disposal_win.open()
// handle machine interaction
code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm
+5 -2
View File
@@ -51,9 +51,12 @@
dat += "<br>"
dat += "<hr>"
dat += "<a href='?src=\ref[src]'>Refresh</a> <a href='?src=\ref[src];close=1'>Close</a>"
user << browse(dat, "window=artanalyser;size=450x500")
user.set_machine(src)
onclose(user, "artanalyser")
var/datum/browser/analyzer_win = new(user, "artanalyser", capitalize_first_letters(name), 500, 500)
analyzer_win.set_content(dat)
analyzer_win.open()
/obj/machinery/artifact_analyser/machinery_process()
if(scan_in_progress && world.time > scan_completion_time)
code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
+5 -3
View File
@@ -63,11 +63,13 @@
dat += "No battery inserted.<BR>"
else
dat += "<B><font color=red>Unable to locate analysis pad.</font><BR></b>"
//
dat += "<HR>"
dat += "<A href='?src=\ref[src];refresh=1'>Refresh</A> <A href='?src=\ref[src];close=1'>Close<BR>"
user << browse(dat, "window=artharvester;size=450x500")
onclose(user, "artharvester")
var/datum/browser/harvester_win = new(user, "artharvester", capitalize_first_letters(name), 500, 500)
harvester_win.set_content(dat)
harvester_win.open()
/obj/machinery/artifact_harvester/machinery_process()
if(stat & (NOPOWER|BROKEN))
code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
+3 -2
View File
@@ -75,8 +75,9 @@
dat += "<hr>"
dat += "<a href='?src=\ref[src];refresh=1'>Refresh</a> <a href='?src=\ref[src];close=1'>Close</a>"
user << browse(dat, "window=anodevice;size=400x500")
onclose(user, "anodevice")
var/datum/browser/battery_win = new(user, "anodevice", capitalize_first_letters(name), 400, 500)
battery_win.set_content(dat)
battery_win.open()
/obj/item/anodevice/process()
if(activated)
code/modules/research/xenoarchaeology/tools/suspension_generator.dm
+4 -2
View File
@@ -108,8 +108,10 @@
dat += "<br>"
dat += "<A href='?src=\ref[src];refresh=1'>Refresh console</A><br>"
dat += "<A href='?src=\ref[src];close=1'>Close console</A>"
user << browse(dat, "window=suspension;size=500x400")
onclose(user, "suspension")
var/datum/browser/suspension_win = new(user, "suspension", capitalize_first_letters(name), 500, 400)
suspension_win.set_content(dat)
suspension_win.open()
/obj/machinery/suspension_gen/Topic(href, href_list)
..()
code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
+4 -2
View File
@@ -100,8 +100,10 @@
dat += "<hr>"
dat += "<A href='?src=\ref[src];refresh=1'>Refresh</a><br>"
dat += "<A href='?src=\ref[src];close=1'>Close</a><br>"
user << browse(dat,"window=depth_scanner;size=300x500")
onclose(user, "depth_scanner")
var/datum/browser/scanner_win = new(user, "depth_scanner", capitalize_first_letters(name), 300, 500)
scanner_win.set_content(dat)
scanner_win.open()
/obj/item/device/depth_scanner/Topic(href, href_list)
..()
code/modules/spell_system/artifacts/items/monster_manual.dm
+4 -2
View File
@@ -45,8 +45,10 @@
var/mob/M = monster[i]
var/name = capitalize(initial(M.name))
dat += "<BR><a href='byond://?src=\ref[src];path=[monster[i]]'>[name]</a> - [monster_info[i]]</BR>"
user << browse(dat,"window=monstermanual")
onclose(user,"monstermanual")
var/datum/browser/manual_win = new(user, "monstermanual", capitalize_first_letters(name))
manual_win.set_content(dat)
manual_win.open()
/obj/item/monster_manual/Topic(href, href_list)
..()