cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do.

Browse Source
This commit is contained in:
DJSnapshot
2014-06-22 03:31:06 -07:00
parent 4067dffb81
commit 7a5a3d47ae
7 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/WorkInProgress/computer3/computers/card.dm
View File

@@ -174,7 +174,8 @@
dat = show_manifest() dat = show_manifest()
popup = new(usr, "ID Computer", name, 940, 520) popup.width = 940
popup.height = 520
popup.set_content(dat) popup.set_content(dat)
popup.open() popup.open()
return return

3
code/WorkInProgress/computer3/computers/crew.dm
View File

@@ -67,5 +67,6 @@
Topic(href, list/href_list) Topic(href, list/href_list)
if(!interactable() || !computer.cardslot || ..(href,href_list)) if(!interactable() || !computer.cardslot || ..(href,href_list))
return return
computer.updateUsrDialog() if("update" in href_list)
interact()
return return

10
code/WorkInProgress/computer3/computers/medical.dm
View File

@@ -44,7 +44,8 @@
usr << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!" usr << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
return return
var/dat var/dat
if (src.temp)
if (temp)
dat = text("<TT>[src.temp]</TT><BR><BR><A href='?src=\ref[src];temp=1'>Clear Screen</A>") dat = text("<TT>[src.temp]</TT><BR><BR><A href='?src=\ref[src];temp=1'>Clear Screen</A>")
else else
dat = text("Confirm Identity: <A href='?src=\ref[];scan=1'>[]</A><HR>", src, (src.scan ? text("[]", src.scan.name) : "----------")) dat = text("Confirm Identity: <A href='?src=\ref[];scan=1'>[]</A><HR>", src, (src.scan ? text("[]", src.scan.name) : "----------"))
@@ -138,7 +139,8 @@
else else
else else
dat += text("<A href='?src=\ref[];login=1'>{Log In}</A>", src) dat += text("<A href='?src=\ref[];login=1'>{Log In}</A>", 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_content(dat)
popup.set_title_image(usr.browse_rsc_icon(computer.icon, computer.icon_state)) popup.set_title_image(usr.browse_rsc_icon(computer.icon, computer.icon_state))
popup.open() popup.open()
@@ -147,15 +149,11 @@
Topic(href, href_list) Topic(href, href_list)
if(!interactable() || !computer.cardslot || ..(href,href_list)) if(!interactable() || !computer.cardslot || ..(href,href_list))
return return
if (!( data_core.general.Find(src.active1) )) if (!( data_core.general.Find(src.active1) ))
src.active1 = null src.active1 = null
if (!( data_core.medical.Find(src.active2) )) if (!( data_core.medical.Find(src.active2) ))
src.active2 = null src.active2 = null
usr.set_machine(src)
if (href_list["temp"]) if (href_list["temp"])
src.temp = null src.temp = null

3
code/WorkInProgress/computer3/computers/security.dm
View File

@@ -193,7 +193,8 @@
else else
else else
dat += text("<A href='?src=\ref[];choice=Log In'>{Log In}</A>", src) dat += text("<A href='?src=\ref[];choice=Log In'>{Log In}</A>", 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_content(dat)
popup.set_title_image(usr.browse_rsc_icon(computer.icon, computer.icon_state)) popup.set_title_image(usr.browse_rsc_icon(computer.icon, computer.icon_state))
popup.open() popup.open()

1
code/WorkInProgress/computer3/program.dm
View File

@@ -155,6 +155,7 @@ Programs are a file that can be executed
popup = new(user, "\ref[computer]", name, nref=src) popup = new(user, "\ref[computer]", name, nref=src)
popup.set_title_image(usr.browse_rsc_icon(overlay.icon, overlay.icon_state)) popup.set_title_image(usr.browse_rsc_icon(overlay.icon, overlay.icon_state))
popup.set_title_buttons(topic_link(src,"quit","<img src=\ref['icons/NTOS/tb_close.png']>")) popup.set_title_buttons(topic_link(src,"quit","<img src=\ref['icons/NTOS/tb_close.png']>"))
// popup.set_title_buttons("<a href='?src=\ref[src];quit'><img src=\ref['icons/NTOS/tb_close.png']></a>")
if(popup.user != user) if(popup.user != user)
popup.user = user popup.user = user
popup.set_title_image(usr.browse_rsc_icon(overlay.icon, overlay.icon_state)) popup.set_title_image(usr.browse_rsc_icon(overlay.icon, overlay.icon_state))

7
code/datums/browser.dm
View File

@@ -82,7 +82,7 @@
</head> </head>
<body scroll=auto> <body scroll=auto>
<div class='uiWrapper'> <div class='uiWrapper'>
[title ? "<div class='uiTitleWrapper'><div [title_attributes]><tt>[title]</tt></div></div>" : ""] [title ? "<div class='uiTitleWrapper'><div [title_attributes]><tt>[title]</tt></div><div class='uiTitleButtons'>[title_buttons]</div></div>" : ""]
<div class='uiContent'> <div class='uiContent'>
"} "}
@@ -144,7 +144,7 @@
// Otherwise, the user mob's machine var will be reset directly. // Otherwise, the user mob's machine var will be reset directly.
// //
/proc/onclose(mob/user, windowid, var/atom/ref=null) /proc/onclose(mob/user, windowid, var/atom/ref=null)
if(!user.client) return if(!user || !user.client) return
var/param = "null" var/param = "null"
if(ref) if(ref)
param = "\ref[ref]" param = "\ref[ref]"
@@ -166,11 +166,10 @@
//world << "windowclose: [atomref]" //world << "windowclose: [atomref]"
if(atomref!="null") // if passed a real atomref if(atomref!="null") // if passed a real atomref
var/hsrc = locate(atomref) // find the reffed atom var/hsrc = locate(atomref) // find the reffed atom
var/href = "close=1"
if(hsrc) if(hsrc)
//world << "[src] Topic [href] [hsrc]" //world << "[src] Topic [href] [hsrc]"
usr = src.mob 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() return // Topic() proc via client.Topic()
// no atomref specified (or not found) // no atomref specified (or not found)

20
html/browser/common.css
View File

@@ -126,6 +126,7 @@ h4
width: 100%; width: 100%;
height: 100%; height: 100%;
padding-top:32px;
} }
.uiTitle .uiTitle
@@ -138,6 +139,25 @@ h4
font-size: 16px; 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 .uiTitle.icon
{ {
padding: 6px 8px 6px 42px; padding: 6px 8px 6px 42px;