From e2ffd2f5b2537c99ba8956204af4425b032cc2a4 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Sat, 10 Sep 2011 19:35:54 +0000 Subject: [PATCH] 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 --- code/defines/obj/clothing/costume.dm | 5 -- code/game/machinery/requests_console.dm | 2 +- code/game/machinery/vending.dm | 61 ++++++++++++------------- icons/changelog.html | 1 + interface/skin.dmf | 44 ++++++++++-------- 5 files changed, 55 insertions(+), 58 deletions(-) diff --git a/code/defines/obj/clothing/costume.dm b/code/defines/obj/clothing/costume.dm index 98869fd77df..8c1f0e9f6d5 100644 --- a/code/defines/obj/clothing/costume.dm +++ b/code/defines/obj/clothing/costume.dm @@ -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() diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 43b5d023dfe..847339b2084 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -181,7 +181,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() if (announceAuth && message) dat += text("Announce
"); dat += text("
Back
") - user << browse("[dat]", "window=req_console") + user << browse("[dat]", "") onclose(user, "req_console") return diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 5ec02e82f22..bae5caf7780 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -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 = "Access Panel
" - for(var/wiredesc in vendwires) - var/is_uncut = src.wires & APCWireColorToFlag[vendwires[wiredesc]] - pdat += "[wiredesc] wire: " - if(!is_uncut) - pdat += "Mend" - else - pdat += "Cut " - pdat += "Pulse " - pdat += "
" - - pdat += "
" - pdat += "The orange light is [(src.seconds_electrified == 0) ? "off" : "on"].
" - pdat += "The red light is [src.shoot_inventory ? "off" : "blinking"].
" - pdat += "The green light is [src.extended_inventory ? "on" : "off"].
" - pdat += "The [(src.wires & WIRE_SCANID) ? "purple" : "yellow"] light is on.
" - - if (product_slogans != "") - pdat += "The speaker switch is [src.shut_up ? "off" : "on"]. Toggle" - - user << browse(pdat, "window=vendwires") - onclose(user, "vendwires") - var/dat = "Select an item:
" if (src.product_records.len == 0) @@ -173,8 +143,35 @@ dat += "" - user << browse(dat, "window=vending") - onclose(user, "vending") + if(panel_open) + var/list/vendwires = list( + "Violet" = 1, + "Orange" = 2, + "Goldenrod" = 3, + "Green" = 4, + ) + dat += "

Access Panel
" + for(var/wiredesc in vendwires) + var/is_uncut = src.wires & APCWireColorToFlag[vendwires[wiredesc]] + dat += "[wiredesc] wire: " + if(!is_uncut) + dat += "Mend" + else + dat += "Cut " + dat += "Pulse " + dat += "
" + + dat += "
" + dat += "The orange light is [(src.seconds_electrified == 0) ? "off" : "on"].
" + dat += "The red light is [src.shoot_inventory ? "off" : "blinking"].
" + dat += "The green light is [src.extended_inventory ? "on" : "off"].
" + dat += "The [(src.wires & WIRE_SCANID) ? "purple" : "yellow"] light is on.
" + + if (product_slogans != "") + dat += "The speaker switch is [src.shut_up ? "off" : "on"]. Toggle" + + user << browse(dat, "") + onclose(user, "") return /obj/machinery/vending/Topic(href, href_list) diff --git a/icons/changelog.html b/icons/changelog.html index 3f04a5116c0..d0418eb8b9b 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -59,6 +59,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
  • Lasty updated: diff --git a/interface/skin.dmf b/interface/skin.dmf index 4f36dac32da..26013d7be3e 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -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 = ""