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

Styling improvements for Chem Dispenser and DNA Modifier Nano UIs.

Browse Source 
Injector buttons are now disabled when the injector system is not ready.
This commit is contained in:
Mark Aherne (Faerdan)
2013-09-20 23:08:04 +01:00
parent 1fe407f769
commit f9906ef76e
4 changed files with 95 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/dna/dna_modifier.dm
View File

@@ -364,6 +364,8 @@
data["locked"] = src.connected.locked data["locked"] = src.connected.locked
data["hasOccupant"] = connected.occupant ? 1 : 0 data["hasOccupant"] = connected.occupant ? 1 : 0
data["isInjectorReady"] = injector_ready
data["hasDisk"] = disk ? 1 : 0 data["hasDisk"] = disk ? 1 : 0
var/diskData[0] var/diskData[0]

2
code/modules/reagents/Chemistry-Machinery.dm
View File

@@ -117,7 +117,7 @@
} }
if (!ui) if (!ui)
// the ui does not exist, so we'll create a new one // the ui does not exist, so we'll create a new one
ui = new(user, src, ui_key, "chem_dispenser.tmpl", "Chem Dispenser 5000", 370, 605) ui = new(user, src, ui_key, "chem_dispenser.tmpl", "Chem Dispenser 5000", 374, 640)
// When the UI is first opened this is the data it will use // When the UI is first opened this is the data it will use
ui.set_initial_data(data) ui.set_initial_data(data)
ui.open() ui.open()

12
nano/css/shared.css
View File

@@ -24,7 +24,7 @@ hr {
margin: 0 2px 2px 0; margin: 0 2px 2px 0;
cursor:default; cursor:default;
} }
.noIcon { .hasIcon {
padding: 0px 4px 4px 0px; padding: 0px 4px 4px 0px;
} }
@@ -163,8 +163,8 @@ h4 {
font-size: 12px; font-size: 12px;
font-style: italic; font-style: italic;
font-weight: bold; font-weight: bold;
padding: 3px 0px 3px 0px; padding: 3px 4px 3px 4px;
margin: 4px; margin: 4px 0 4px 0;
} }
.notice.icon { .notice.icon {
padding: 2px 4px 0 20px; padding: 2px 4px 0 20px;
@@ -179,6 +179,12 @@ h4 {
div.notice { div.notice {
clear: both; clear: both;
} }
.itemGroup {
border: 1px solid #e9c183;
background: #2c2c2c;
padding: 4px;
clear: both;
}
.item { .item {
width: 100%; width: 100%;
margin: 4px 0 0 0; margin: 4px 0 0 0;

14
nano/templates/dna_modifier.tmpl
View File

@@ -101,6 +101,7 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm
<h3>Transfer Buffers</h3> <h3>Transfer Buffers</h3>
{^{for buffers}} {^{for buffers}}
<h4>Buffer {{:#index + 1}}</h4> <h4>Buffer {{:#index + 1}}</h4>
<div class="itemGroup">
<div class="item"> <div class="item">
<div class="itemLabelNarrow"> <div class="itemLabelNarrow">
Load Data: Load Data:
@@ -141,7 +142,7 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm
{{else}} {{else}}
<div class="item"> <div class="item">
<div class="itemContentWide"> <div class="itemContentWide">
<span class="notice">This buffer is empty.</span> <span class="highlight">This buffer is empty.</span>
</div> </div>
</div> </div>
{{/if}} {{/if}}
@@ -151,15 +152,17 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm
</div> </div>
<div class="itemContentWide"> <div class="itemContentWide">
{^{:~link('Clear', 'trash', {'bufferOption' : 'clear', 'bufferId' : (#index + 1)}, !data ? 'disabled' : null)}} {^{:~link('Clear', 'trash', {'bufferOption' : 'clear', 'bufferId' : (#index + 1)}, !data ? 'disabled' : null)}}
{^{:~link('Injector', 'pencil', {'bufferOption' : 'createInjector', 'bufferId' : (#index + 1)}, !data ? 'disabled' : null)}} {^{:~link('Injector', ~root.isInjectorReady ? 'pencil' : 'clock', {'bufferOption' : 'createInjector', 'bufferId' : (#index + 1)}, !~root.isInjectorReady || !data ? 'disabled' : null)}}
{^{:~link('Block Injector', 'pencil', {'bufferOption' : 'createInjector', 'bufferId' : (#index + 1), 'createBlockInjector' : 1}, !data ? 'disabled' : null)}} {^{:~link('Block Injector', ~root.isInjectorReady ? 'pencil' : 'clock', {'bufferOption' : 'createInjector', 'bufferId' : (#index + 1), 'createBlockInjector' : 1}, !~root.isInjectorReady || !data ? 'disabled' : null)}}
{^{:~link('Transfer', 'radiation', {'bufferOption' : 'transfer', 'bufferId' : (#index + 1)}, !~root.hasOccupant || !data ? 'disabled' : null)}} {^{:~link('Transfer', 'radiation', {'bufferOption' : 'transfer', 'bufferId' : (#index + 1)}, !~root.hasOccupant || !data ? 'disabled' : null)}}
{^{:~link('Save To Disk', 'disk', {'bufferOption' : 'saveDisk', 'bufferId' : (#index + 1)}, !data || !~root.hasDisk ? 'disabled' : null)}} {^{:~link('Save To Disk', 'disk', {'bufferOption' : 'saveDisk', 'bufferId' : (#index + 1)}, !data || !~root.hasDisk ? 'disabled' : null)}}
</div> </div>
</div> </div>
</div>
{{/for}} {{/for}}
<h4>Data Disk</h4> <h4>Data Disk</h4>
<div class="itemGroup">
{^{if hasDisk}} {^{if hasDisk}}
{^{if disk.data}} {^{if disk.data}}
<div class="item"> <div class="item">
@@ -190,14 +193,14 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm
{{else}} {{else}}
<div class="item"> <div class="item">
<div class="itemContentWide"> <div class="itemContentWide">
<span class="notice">Disk is blank.</span> <span class="average">Disk is blank.</span>
</div> </div>
</div> </div>
{{/if}} {{/if}}
{{else}} {{else}}
<div class="item"> <div class="item">
<div class="itemContentWide"> <div class="itemContentWide">
<span class="notice">No disk inserted.</span> <span class="highlight">No disk inserted.</span>
</div> </div>
</div> </div>
{{/if}} {{/if}}
@@ -210,6 +213,7 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm
{^{:~link('Eject Disk', 'eject', {'bufferOption' : 'ejectDisk'}, !hasDisk ? 'disabled' : null)}} {^{:~link('Eject Disk', 'eject', {'bufferOption' : 'ejectDisk'}, !hasDisk ? 'disabled' : null)}}
</div> </div>
</div> </div>
</div>
{{else selectedMenuKey == 'rejuvenators'}} {{else selectedMenuKey == 'rejuvenators'}}
<h3>Rejuvenators</h3> <h3>Rejuvenators</h3>
<div class="item"> <div class="item">