mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-21 20:13:45 +01:00
Updated the interface a bit to allow a built-in browser.
The upper right panel, where the verbs usually are now has two functions, verbs and the browser. This feature has been added to hopefully reduce the number or pop-ups that appear. Currently only request consoles and vending machines use this feature. I'll wait for feedback and then update the rest, if feedback is positive. Also removed the redcoat spawn pack... The redcoat suit is MINE. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2170 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
@@ -142,11 +142,6 @@
|
||||
new /obj/item/clothing/under/sexymime(src.loc)
|
||||
del(src)
|
||||
|
||||
/obj/landmark/costume/brits/New()
|
||||
new /obj/item/clothing/head/redcoat(src.loc)
|
||||
new /obj/item/clothing/under/redocat(src.loc)
|
||||
del(src)
|
||||
|
||||
|
||||
/*
|
||||
/obj/landmark/costume/cyborg/New()
|
||||
|
||||
@@ -181,7 +181,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
|
||||
if (announceAuth && message)
|
||||
dat += text("<A href='?src=\ref[src];sendAnnouncement=[1]'>Announce</A><BR>");
|
||||
dat += text("<BR><A href='?src=\ref[src];setScreen=[0]'>Back</A><BR>")
|
||||
user << browse("[dat]", "window=req_console")
|
||||
user << browse("[dat]", "")
|
||||
onclose(user, "req_console")
|
||||
return
|
||||
|
||||
|
||||
@@ -123,36 +123,6 @@
|
||||
if(src.shock(user, 100))
|
||||
return
|
||||
|
||||
if(panel_open)
|
||||
var/list/vendwires = list(
|
||||
"Violet" = 1,
|
||||
"Orange" = 2,
|
||||
"Goldenrod" = 3,
|
||||
"Green" = 4,
|
||||
)
|
||||
var/pdat = "<B>Access Panel</B><br>"
|
||||
for(var/wiredesc in vendwires)
|
||||
var/is_uncut = src.wires & APCWireColorToFlag[vendwires[wiredesc]]
|
||||
pdat += "[wiredesc] wire: "
|
||||
if(!is_uncut)
|
||||
pdat += "<a href='?src=\ref[src];cutwire=[vendwires[wiredesc]]'>Mend</a>"
|
||||
else
|
||||
pdat += "<a href='?src=\ref[src];cutwire=[vendwires[wiredesc]]'>Cut</a> "
|
||||
pdat += "<a href='?src=\ref[src];pulsewire=[vendwires[wiredesc]]'>Pulse</a> "
|
||||
pdat += "<br>"
|
||||
|
||||
pdat += "<br>"
|
||||
pdat += "The orange light is [(src.seconds_electrified == 0) ? "off" : "on"].<BR>"
|
||||
pdat += "The red light is [src.shoot_inventory ? "off" : "blinking"].<BR>"
|
||||
pdat += "The green light is [src.extended_inventory ? "on" : "off"].<BR>"
|
||||
pdat += "The [(src.wires & WIRE_SCANID) ? "purple" : "yellow"] light is on.<BR>"
|
||||
|
||||
if (product_slogans != "")
|
||||
pdat += "The speaker switch is [src.shut_up ? "off" : "on"]. <a href='?src=\ref[src];togglevoice=[1]'>Toggle</a>"
|
||||
|
||||
user << browse(pdat, "window=vendwires")
|
||||
onclose(user, "vendwires")
|
||||
|
||||
var/dat = "<TT><b>Select an item:</b><br>"
|
||||
|
||||
if (src.product_records.len == 0)
|
||||
@@ -173,8 +143,35 @@
|
||||
|
||||
dat += "</TT>"
|
||||
|
||||
user << browse(dat, "window=vending")
|
||||
onclose(user, "vending")
|
||||
if(panel_open)
|
||||
var/list/vendwires = list(
|
||||
"Violet" = 1,
|
||||
"Orange" = 2,
|
||||
"Goldenrod" = 3,
|
||||
"Green" = 4,
|
||||
)
|
||||
dat += "<br><hr><br><B>Access Panel</B><br>"
|
||||
for(var/wiredesc in vendwires)
|
||||
var/is_uncut = src.wires & APCWireColorToFlag[vendwires[wiredesc]]
|
||||
dat += "[wiredesc] wire: "
|
||||
if(!is_uncut)
|
||||
dat += "<a href='?src=\ref[src];cutwire=[vendwires[wiredesc]]'>Mend</a>"
|
||||
else
|
||||
dat += "<a href='?src=\ref[src];cutwire=[vendwires[wiredesc]]'>Cut</a> "
|
||||
dat += "<a href='?src=\ref[src];pulsewire=[vendwires[wiredesc]]'>Pulse</a> "
|
||||
dat += "<br>"
|
||||
|
||||
dat += "<br>"
|
||||
dat += "The orange light is [(src.seconds_electrified == 0) ? "off" : "on"].<BR>"
|
||||
dat += "The red light is [src.shoot_inventory ? "off" : "blinking"].<BR>"
|
||||
dat += "The green light is [src.extended_inventory ? "on" : "off"].<BR>"
|
||||
dat += "The [(src.wires & WIRE_SCANID) ? "purple" : "yellow"] light is on.<BR>"
|
||||
|
||||
if (product_slogans != "")
|
||||
dat += "The speaker switch is [src.shut_up ? "off" : "on"]. <a href='?src=\ref[src];togglevoice=[1]'>Toggle</a>"
|
||||
|
||||
user << browse(dat, "")
|
||||
onclose(user, "")
|
||||
return
|
||||
|
||||
/obj/machinery/vending/Topic(href, href_list)
|
||||
|
||||
@@ -59,6 +59,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
|
||||
<ul>
|
||||
<li>A new pet on the bridge.</li>
|
||||
<li>The pet can now be buckled and will no longer escape from closed containers, such as closets or the cloning pods.</li>
|
||||
<li>Vending machines and request consoles are the first to use the new in-built browser in the upper-right of the user interface. If feedback is positive on these, more machines will be added to this. Hoping </li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><b>Lasty updated:</b>
|
||||
|
||||
+24
-20
@@ -51,6 +51,10 @@ macro "macro"
|
||||
name = "SOUTH+REP"
|
||||
command = ".south"
|
||||
is-disabled = false
|
||||
elem "drop_item_v"
|
||||
name = "CTRL+D"
|
||||
command = "drop_item_v"
|
||||
is-disabled = false
|
||||
elem
|
||||
name = "F1"
|
||||
command = "adminhelp"
|
||||
@@ -367,7 +371,7 @@ window "mainwindow"
|
||||
window "mapwindow"
|
||||
elem "mapwindow"
|
||||
type = MAIN
|
||||
pos = none
|
||||
pos = 281,0
|
||||
size = 640x480
|
||||
anchor1 = none
|
||||
anchor2 = none
|
||||
@@ -407,7 +411,7 @@ window "mapwindow"
|
||||
elem "map"
|
||||
type = MAP
|
||||
pos = 0,0
|
||||
size = 0x0
|
||||
size = 640x480
|
||||
anchor1 = 0,0
|
||||
anchor2 = 100,100
|
||||
font-family = ""
|
||||
@@ -432,7 +436,7 @@ window "mapwindow"
|
||||
window "outputwindow"
|
||||
elem "outputwindow"
|
||||
type = MAIN
|
||||
pos = none
|
||||
pos = 281,0
|
||||
size = 640x480
|
||||
anchor1 = none
|
||||
anchor2 = none
|
||||
@@ -472,7 +476,7 @@ window "outputwindow"
|
||||
elem "output"
|
||||
type = OUTPUT
|
||||
pos = 0,0
|
||||
size = 0x0
|
||||
size = 640x480
|
||||
anchor1 = 0,0
|
||||
anchor2 = 100,100
|
||||
font-family = ""
|
||||
@@ -499,7 +503,7 @@ window "outputwindow"
|
||||
window "rpane"
|
||||
elem "rpane"
|
||||
type = MAIN
|
||||
pos = none
|
||||
pos = 559,121
|
||||
size = 640x480
|
||||
anchor1 = none
|
||||
anchor2 = none
|
||||
@@ -539,7 +543,7 @@ window "rpane"
|
||||
elem "rpanewindow"
|
||||
type = CHILD
|
||||
pos = 0,0
|
||||
size = 0x0
|
||||
size = 640x499
|
||||
anchor1 = 0,0
|
||||
anchor2 = 100,100
|
||||
font-family = ""
|
||||
@@ -571,7 +575,7 @@ window "rpane"
|
||||
font-family = ""
|
||||
font-size = 0
|
||||
font-style = ""
|
||||
text-color = none
|
||||
text-color = #000000
|
||||
background-color = none
|
||||
is-visible = false
|
||||
is-disabled = false
|
||||
@@ -599,9 +603,9 @@ window "rpane"
|
||||
font-family = ""
|
||||
font-size = 0
|
||||
font-style = ""
|
||||
text-color = none
|
||||
text-color = #000000
|
||||
background-color = none
|
||||
is-visible = false
|
||||
is-visible = true
|
||||
is-disabled = false
|
||||
is-transparent = false
|
||||
is-default = false
|
||||
@@ -627,7 +631,7 @@ window "rpane"
|
||||
font-family = ""
|
||||
font-size = 0
|
||||
font-style = ""
|
||||
text-color = none
|
||||
text-color = #000000
|
||||
background-color = none
|
||||
is-visible = false
|
||||
is-disabled = false
|
||||
@@ -650,7 +654,7 @@ window "rpane"
|
||||
window "browserwindow"
|
||||
elem "browserwindow"
|
||||
type = MAIN
|
||||
pos = none
|
||||
pos = 281,0
|
||||
size = 640x480
|
||||
anchor1 = none
|
||||
anchor2 = none
|
||||
@@ -669,11 +673,11 @@ window "browserwindow"
|
||||
saved-params = "pos;size;is-minimized;is-maximized"
|
||||
on-size = ""
|
||||
title = "Browser"
|
||||
titlebar = true
|
||||
statusbar = true
|
||||
can-close = true
|
||||
can-minimize = true
|
||||
can-resize = true
|
||||
titlebar = false
|
||||
statusbar = false
|
||||
can-close = false
|
||||
can-minimize = false
|
||||
can-resize = false
|
||||
is-pane = true
|
||||
is-minimized = false
|
||||
is-maximized = false
|
||||
@@ -690,7 +694,7 @@ window "browserwindow"
|
||||
elem "browser"
|
||||
type = BROWSER
|
||||
pos = 0,0
|
||||
size = 0x0
|
||||
size = 638x475
|
||||
anchor1 = 0,0
|
||||
anchor2 = 100,100
|
||||
font-family = ""
|
||||
@@ -712,12 +716,12 @@ window "browserwindow"
|
||||
auto-format = true
|
||||
use-title = false
|
||||
on-show = ".winset\"rpane.infob.is-visible=true?rpane.infob.pos=130,0;rpane.textb.is-visible=true;rpane.browseb.is-visible=true;rpane.browseb.is-checked=true;rpane.rpanewindow.pos=0,30;rpane.rpanewindow.size=0x0;rpane.rpanewindow.left=browserwindow\""
|
||||
on-hide = ".winset\"rpane.browseb.is-visible=false;rpane.infob.is-visible=true?rpane.infob.is-checked=true rpane.infob.pos=65,0 rpane.rpanewindow.left=infowindow:rpane.rpanewindow.left=textwindow rpane.textb.is-visible=false rpane.rpanewindow.pos=0,0 rpane.rpanewindow.size=0x0\""
|
||||
on-hide = ".winset\"rpane.infob.is-visible=true?rpane.infob.is-checked=true rpane.infob.pos=65,0 rpane.rpanewindow.left=infowindow:rpane.rpanewindow.left=textwindow rpane.textb.is-visible=false rpane.rpanewindow.pos=0,0 rpane.rpanewindow.size=0x0\""
|
||||
|
||||
window "infowindow"
|
||||
elem "infowindow"
|
||||
type = MAIN
|
||||
pos = none
|
||||
pos = 281,0
|
||||
size = 640x480
|
||||
anchor1 = none
|
||||
anchor2 = none
|
||||
@@ -757,7 +761,7 @@ window "infowindow"
|
||||
elem "info"
|
||||
type = INFO
|
||||
pos = 0,0
|
||||
size = 0x0
|
||||
size = 640x499
|
||||
anchor1 = 0,0
|
||||
anchor2 = 100,100
|
||||
font-family = ""
|
||||
|
||||
Reference in New Issue
Block a user