diff --git a/code/WorkInProgress/computer3/computers/card.dm b/code/WorkInProgress/computer3/computers/card.dm index 00e51778a3..7b62612398 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 d9ecace0c3..22a8b3425f 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 13302f75b0..e370182744 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 8c6152e1c1..17903477fb 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 42794f4c2e..e16afe4939 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/datums/browser.dm b/code/datums/browser.dm index 31124c6faf..09281bf1f7 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -82,7 +82,7 @@
- [title ? "
[title]
" : ""] + [title ? "
[title]
[title_buttons]
" : ""]
"} @@ -144,7 +144,7 @@ // Otherwise, the user mob's machine var will be reset directly. // /proc/onclose(mob/user, windowid, var/atom/ref=null) - if(!user.client) return + if(!user || !user.client) return var/param = "null" if(ref) param = "\ref[ref]" @@ -166,11 +166,10 @@ //world << "windowclose: [atomref]" if(atomref!="null") // if passed a real atomref var/hsrc = locate(atomref) // find the reffed atom - var/href = "close=1" if(hsrc) //world << "[src] Topic [href] [hsrc]" usr = src.mob - src.Topic(href, params2list(href), 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 9e8b8b0b43..1de45bd953 100644 --- a/html/browser/common.css +++ b/html/browser/common.css @@ -126,6 +126,7 @@ h4 width: 100%; height: 100%; + padding-top:32px; } .uiTitle @@ -138,6 +139,25 @@ h4 font-size: 16px; } +.uiTitleWrapper + { + position:fixed; + top:0px; + left:0px; + right:0px; + z-index: 10 + } + + .uiTitleButtons + { + position:fixed; + top:0px; + right:0px; + height:32px; + z-index:11; + } + + .uiTitle.icon { padding: 6px 8px 6px 42px;