diff --git a/code/WorkInProgress/computer3/computers/card.dm b/code/WorkInProgress/computer3/computers/card.dm
index 00e51778a35..7b62612398d 100644
--- a/code/WorkInProgress/computer3/computers/card.dm
+++ b/code/WorkInProgress/computer3/computers/card.dm
@@ -174,7 +174,8 @@
dat = show_manifest()
- popup = new(usr, "ID Computer", name, 940, 520)
+ popup.width = 940
+ popup.height = 520
popup.set_content(dat)
popup.open()
return
diff --git a/code/WorkInProgress/computer3/computers/crew.dm b/code/WorkInProgress/computer3/computers/crew.dm
index d9ecace0c39..22a8b3425f7 100644
--- a/code/WorkInProgress/computer3/computers/crew.dm
+++ b/code/WorkInProgress/computer3/computers/crew.dm
@@ -67,5 +67,6 @@
Topic(href, list/href_list)
if(!interactable() || !computer.cardslot || ..(href,href_list))
return
- computer.updateUsrDialog()
+ if("update" in href_list)
+ interact()
return
\ No newline at end of file
diff --git a/code/WorkInProgress/computer3/computers/medical.dm b/code/WorkInProgress/computer3/computers/medical.dm
index 13302f75b07..e370182744c 100644
--- a/code/WorkInProgress/computer3/computers/medical.dm
+++ b/code/WorkInProgress/computer3/computers/medical.dm
@@ -44,7 +44,8 @@
usr << "\red Unable to establish a connection: \black You're too far away from the station!"
return
var/dat
- if (src.temp)
+
+ if (temp)
dat = text("[src.temp]
Clear Screen")
else
dat = text("Confirm Identity: []
", src, (src.scan ? text("[]", src.scan.name) : "----------"))
@@ -138,7 +139,8 @@
else
else
dat += text("{Log In}", src)
- var/datum/browser/popup = new(usr, "med_comp", "Medical Records", 600, 400)
+ popup.width = 600
+ popup.height = 400
popup.set_content(dat)
popup.set_title_image(usr.browse_rsc_icon(computer.icon, computer.icon_state))
popup.open()
@@ -147,15 +149,11 @@
Topic(href, href_list)
if(!interactable() || !computer.cardslot || ..(href,href_list))
return
-
if (!( data_core.general.Find(src.active1) ))
src.active1 = null
-
if (!( data_core.medical.Find(src.active2) ))
src.active2 = null
- usr.set_machine(src)
-
if (href_list["temp"])
src.temp = null
diff --git a/code/WorkInProgress/computer3/computers/security.dm b/code/WorkInProgress/computer3/computers/security.dm
index 8c6152e1c1b..17903477fb9 100644
--- a/code/WorkInProgress/computer3/computers/security.dm
+++ b/code/WorkInProgress/computer3/computers/security.dm
@@ -193,7 +193,8 @@
else
else
dat += text("{Log In}", src)
- var/datum/browser/popup = new(usr, "secure_rec", "Security Records", 600, 400)
+ popup.width = 600
+ popup.height = 400
popup.set_content(dat)
popup.set_title_image(usr.browse_rsc_icon(computer.icon, computer.icon_state))
popup.open()
diff --git a/code/WorkInProgress/computer3/program.dm b/code/WorkInProgress/computer3/program.dm
index 42794f4c2e7..e16afe49397 100644
--- a/code/WorkInProgress/computer3/program.dm
+++ b/code/WorkInProgress/computer3/program.dm
@@ -155,6 +155,7 @@ Programs are a file that can be executed
popup = new(user, "\ref[computer]", name, nref=src)
popup.set_title_image(usr.browse_rsc_icon(overlay.icon, overlay.icon_state))
popup.set_title_buttons(topic_link(src,"quit","
"))
+ // popup.set_title_buttons("")
if(popup.user != user)
popup.user = user
popup.set_title_image(usr.browse_rsc_icon(overlay.icon, overlay.icon_state))
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index cb1ded74eec..15c667256ee 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -563,31 +563,6 @@ var/list/sortMobsOrder = list( "/mob/living/silicon/ai",
return loc
-// Registers the on-close verb for a browse window (client/verb/.windowclose)
-// this will be called when the close-button of a window is pressed.
-//
-// This is usually only needed for devices that regularly update the browse window,
-// e.g. canisters, timers, etc.
-//
-// windowid should be the specified window name
-// e.g. code is : user << browse(text, "window=fred")
-// then use : onclose(user, "fred")
-//
-// Optionally, specify the "ref" parameter as the controlled atom (usually src)
-// to pass a "close=1" parameter to the atom's Topic() proc for special handling.
-// Otherwise, the user mob's machine var will be reset directly.
-//
-/proc/onclose(mob/user, windowid, var/atom/ref=null)
- if(!user.client) return
- var/param = "null"
- if(ref)
- param = "\ref[ref]"
-
- winset(user, windowid, "on-close=\".windowclose [param]\"")
-
- //world << "OnClose [user]: [windowid] : ["on-close=\".windowclose [param]\""]"
-
-
// the on-close client verb
// called when a browser popup window is closed after registering with proc/onclose()
// if a valid atom reference is supplied, call the atom's Topic() with "close=1"
diff --git a/code/datums/browser.dm b/code/datums/browser.dm
index 405f407b7d6..da5a80443ba 100644
--- a/code/datums/browser.dm
+++ b/code/datums/browser.dm
@@ -144,7 +144,7 @@
// Otherwise, the user mob's machine var will be reset directly.
//
-/proc/onclosed(mob/user, windowid, var/atom/ref=null)
+/proc/onclose(mob/user, windowid, var/atom/ref=null)
if(!user || !user.client) return
var/param = "null"
if(ref)
@@ -170,7 +170,7 @@
if(hsrc)
//world << "[src] Topic [href] [hsrc]"
usr = src.mob
- src.Topic("close=1", list("close"="1"), hsrc) // this will direct to the atom's
+ src.Topic("close=1", list("close"="1"), hsrc) // this will direct to the atom's
return // Topic() proc via client.Topic()
// no atomref specified (or not found)
diff --git a/html/browser/common.css b/html/browser/common.css
index 49f3fdd6e94..8c0a0253599 100644
--- a/html/browser/common.css
+++ b/html/browser/common.css
@@ -156,22 +156,23 @@ h4
}
.uiTitleWrapper
-{
- position:fixed;
- top:0px;
- left:0px;
- right:0px;
- z-index: 10
-}
+ {
+ position:fixed;
+ top:0px;
+ left:0px;
+ right:0px;
+ z-index: 10
+ }
+
+ .uiTitleButtons
+ {
+ position:fixed;
+ top:0px;
+ right:0px;
+ height:32px;
+ z-index:11;
+ }
-.uiTitleButtons
-{
- position:fixed;
- top:0px;
- right:0px;
- height:32px;
- z-index:11;
-}
.uiTitle.icon
{