From 79f27421794905a9e157123bcc311201f42be633 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Mon, 12 Oct 2015 08:42:56 -0700 Subject: [PATCH 1/6] PDA CSS, to make it look like the old PDAs. #nostalgia --- nano/templates/pda.tmpl | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl index 8b2920bb23b..9b3c01adfdd 100644 --- a/nano/templates/pda.tmpl +++ b/nano/templates/pda.tmpl @@ -3,6 +3,39 @@ Title: PDA UI Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm --> + + + {{if data.owner}}
From 9398a3a92ca1435d0cdf6396d7c5e74670b8c581 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Mon, 12 Oct 2015 13:38:22 -0700 Subject: [PATCH 2/6] Retro Toggle, more color tweaks --- code/game/objects/items/devices/PDA/PDA.dm | 9 +++- nano/templates/pda.tmpl | 57 ++++++++++++---------- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 842501da8a1..cfb3cd14c7c 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -62,6 +62,7 @@ var/global/list/obj/item/device/pda/PDAs = list() var/ownrank = null // this one is rank, never alt title var/obj/item/device/paicard/pai = null // A slot for a personal AI device + var/retro_mode = 0 /obj/item/device/pda/medical default_cartridge = /obj/item/weapon/cartridge/medical @@ -401,6 +402,8 @@ var/global/list/obj/item/device/pda/PDAs = list() data["idInserted"] = (id ? 1 : 0) data["idLink"] = (id ? text("[id.registered_name], [id.assignment]") : "--------") + data["useRetro"] = retro_mode + data["cart_loaded"] = cartridge ? 1:0 if(cartridge) var/cartdata[0] @@ -574,6 +577,9 @@ var/global/list/obj/item/device/pda/PDAs = list() mode = 0 else if(mode >= 40 && mode <= 49)//Fix for cartridges. Redirects to refresh the menu. cartridge.mode = mode + if("Retro") + retro_mode = !retro_mode + ui_interact(user) if ("Authenticate")//Checks for ID id_check(U, 1) if("UpdateInfo") @@ -1138,7 +1144,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(T.ptank) atmosanalyzer_scan(T.ptank.air_contents, user, T) else if (istype(A, /obj/machinery/portable_atmospherics/scrubber/huge)) var/obj/machinery/portable_atmospherics/scrubber/huge/T = A - atmosanalyzer_scan(T.air_contents, user, T) + atmosanalyzer_scan(T.air_contents, user, T) else if (istype(A, /obj/machinery/atmospherics/unary/tank)) var/obj/machinery/atmospherics/unary/tank/T = A atmosanalyzer_scan(T.air_contents, user, T) @@ -1276,4 +1282,3 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/emp_act(severity) for(var/atom/A in src) A.emp_act(severity) - \ No newline at end of file diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl index 9b3c01adfdd..de7bcf83e09 100644 --- a/nano/templates/pda.tmpl +++ b/nano/templates/pda.tmpl @@ -3,39 +3,41 @@ Title: PDA UI Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm --> - - - + .fixedLeft, .fixedLeftWide, .fixedLeftWider, .fixedLeftWidest { + color: #000000; + } + + +{{/if}} {{if data.owner}}
@@ -46,6 +48,7 @@ h1, h2, h3, h4, h5, h6 { {{:helper.link('Close', 'gear', {'choice' : "Close"}, null, 'fixedLeft')}} {{if data.idInserted}} {{:helper.link('Update PDA Info', 'eject', {'choice' : "UpdateInfo"}, null, 'fixedLeftWide')}} {{/if}} {{if data.mode != 0}} {{:helper.link('Return', 'arrowreturn-1-w', {'choice' : "Return"}, null, 'fixedLeft')}} {{/if}} + {{:helper.link('Toggle R.E.T.R.O. mode', 'gear', {'choice': "Retro"}, null, 'floatRight')}}

From ca3d60278bbe2476135c46641a0a3368d1549b33 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Mon, 12 Oct 2015 13:45:06 -0700 Subject: [PATCH 3/6] One last color tweak --- nano/templates/pda.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl index de7bcf83e09..308edb36e4c 100644 --- a/nano/templates/pda.tmpl +++ b/nano/templates/pda.tmpl @@ -32,7 +32,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm color: #000000; } - .fixedLeft, .fixedLeftWide, .fixedLeftWider, .fixedLeftWidest { + .fixedLeft, .fixedLeftWide, .fixedLeftWider, .fixedLeftWidest, floatRight { color: #000000; } From 8e99e99f4a94c3cf04459cc5c12e214c822fb7ed Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Mon, 12 Oct 2015 13:51:27 -0700 Subject: [PATCH 4/6] Fix ID link inconsistant styling --- nano/templates/pda.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl index 308edb36e4c..7dc44c263f9 100644 --- a/nano/templates/pda.tmpl +++ b/nano/templates/pda.tmpl @@ -78,7 +78,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm ID:
- {{:helper.link(data.idLink, 'eject', {'choice' : "Authenticate"}, data.idInserted ? null : 'disabled', data.idInserted ? 'fixedLeftWidest' : 'fixedLeft')}} + {{:helper.link(data.idLink, 'eject', {'choice' : "Authenticate"}, data.idInserted ? null : 'disabled', data.idInserted ? 'link fixedLeftWidest' : 'link fixedLeft')}}

From 69f4d9651736935ce1ebcab2239ea6841e6dfbb7 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Mon, 12 Oct 2015 14:15:27 -0700 Subject: [PATCH 5/6] Switch to goon coloring, new note class for PDA's --- nano/css/shared.css | 5 +++++ nano/templates/pda.tmpl | 22 ++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/nano/css/shared.css b/nano/css/shared.css index 861fd9e165c..786b577e615 100644 --- a/nano/css/shared.css +++ b/nano/css/shared.css @@ -445,6 +445,11 @@ div.notice { white-space: nowrap; } +.pdanote { + color: #cd6500; + font-weight: bold; +} + /* DNA Modifier styling */ .dnaBlock { float: left; diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl index 7dc44c263f9..e827bab7a08 100644 --- a/nano/templates/pda.tmpl +++ b/nano/templates/pda.tmpl @@ -12,29 +12,39 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm } body { - background: #808000; + background: #6F7961; } .itemLabelNarrow, .itemLabel, .itemLabelWide, .itemLabelWider, .itemLabelWidest { - color: #444400; + color: #000000; + font-weight: bold; } .average { - color: #ABAB00; + color: #222222; + } + + .pdanote { + color: #555555; } .link, .linkOn, .linkOff, .selected, .disabled, .yellowButton, .redButton { color: #000000; - background: #ACAC50; + background: #565D4B; } h1, h2, h3, h4, h5, h6 { color: #000000; } - .fixedLeft, .fixedLeftWide, .fixedLeftWider, .fixedLeftWidest, floatRight { + .fixedLeft, .fixedLeftWide, .fixedLeftWider, .fixedLeftWidest, .floatRight { color: #000000; } + + #uiTitleText { + color: #000000; + } + {{/if}} @@ -225,7 +235,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
- {{:data.note}} + {{:data.note}}
From e07f4e0423195b1ecaba2192abdf30a9707f4deb Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Tue, 13 Oct 2015 18:29:39 -0700 Subject: [PATCH 6/6] Final tweaks Unified PDA links with .pdalink class, changed .good to be brighter in retro, fixed scrollbar in retro, retro now overrides .pdalink in order to make goon-style buttons --- nano/templates/pda.tmpl | 126 ++++++++++++++++++++++++---------------- 1 file changed, 77 insertions(+), 49 deletions(-) diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl index e827bab7a08..753e06f299e 100644 --- a/nano/templates/pda.tmpl +++ b/nano/templates/pda.tmpl @@ -8,7 +8,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm