cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated the interface a bit to allow a built-in browser.

Browse Source 
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
2011-09-10 19:35:54 +00:00
parent e74922a985
commit e2ffd2f5b2
5 changed files with 55 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/clothing/costume.dm
-5
View File
@@ -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()
code/game/machinery/requests_console.dm
+1 -1
View File
@@ -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
code/game/machinery/vending.dm
+29 -32
View File
@@ -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)