diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 1c77d90426..2d09c48a4b 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -700,7 +700,7 @@ return 1 // Transfer Buffer Management - if(href_list["bufferOption"] && href_list["bufferId"]) + if(href_list["bufferOption"]) var/bufferOption = href_list["bufferOption"] // These bufferOptions do not require a bufferId @@ -725,6 +725,9 @@ return 1 // All bufferOptions from here on require a bufferId + if (!href_list["bufferId"]) + return 0 + var/bufferId = text2num(href_list["bufferId"]) if (bufferId < 1 || bufferId > 3) diff --git a/nano/css/shared.css b/nano/css/shared.css index 6f5b79a31f..c9f4b2681b 100644 --- a/nano/css/shared.css +++ b/nano/css/shared.css @@ -193,6 +193,15 @@ div.notice { float: left; width: 69%; } +.itemLabelNarrow { + float: left; + width: 20%; + color: #e9c183; +} +.itemContentWide { + float: left; + width: 79%; +} .itemContentSmall { float: left; width: 33%; diff --git a/nano/images/uiMaskBackground.png b/nano/images/uiMaskBackground.png index ac3500537a..6494f78a61 100644 Binary files a/nano/images/uiMaskBackground.png and b/nano/images/uiMaskBackground.png differ diff --git a/nano/templates/dna_modifier.tmpl b/nano/templates/dna_modifier.tmpl index b22be24bd1..e4412ace33 100644 --- a/nano/templates/dna_modifier.tmpl +++ b/nano/templates/dna_modifier.tmpl @@ -74,17 +74,17 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm {^{:~displayDNABlocks(occupant.uniqueIdentity, selectedUIBlock, selectedUISubBlock, dnaBlockSize, 'UI')}}
-
+
Target:
-
+
{^{:~link('-', null, {'changeUITarget' : 0}, selectedUITarget > 0 ? null : 'disabled')}}
 {^{:selectedUITargetHex}} 
{^{:~link('+', null, {'changeUITarget' : 1}, selectedUITarget < 15 ? null : 'disabled')}}
-
+
{^{:~link('Irradiate Block', 'radiation', {'pulseUIRadiation' : 1}, !occupant.isViableSubject ? 'disabled' : null)}}
@@ -93,7 +93,7 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm {^{:~displayDNABlocks(occupant.structuralEnzymes, selectedSEBlock, selectedSESubBlock, dnaBlockSize, 'SE')}}
-
+
{^{:~link('Irradiate Block', 'radiation', {'pulseSERadiation' : 1}, !occupant.isViableSubject ? 'disabled' : null)}}
@@ -102,10 +102,10 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm {^{for buffers}}

Buffer {{:#index + 1}}

-
+
Load Data:
-
+
{^{:~link('Subject U.I.', 'link', {'bufferOption' : 'saveUI', 'bufferId' : (#index + 1)}, !~root.hasOccupant ? 'disabled' : null)}} {^{:~link('Subject U.I. + U.E.', 'link', {'bufferOption' : 'saveUIAndUE', 'bufferId' : (#index + 1)}, !~root.hasOccupant ? 'disabled' : null)}} {^{:~link('Subject S.E.', 'link', {'bufferOption' : 'saveSE', 'bufferId' : (#index + 1)}, !~root.hasOccupant ? 'disabled' : null)}} @@ -114,42 +114,42 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm
{^{if data}}
-
+
Label:
-
+
{^{:label ? label : 'No Label'}}
-
+
Subject:
-
+
{^{:owner ? owner : 'Unknown'}}
-
+
Stored Data:
-
+
{^{:data == 'ui' ? 'Unique Identifiers' : 'Structural Enzymes'}} {^{:ue ? ' + Unique Enzymes' : ''}}
{{else}}
-
+
This buffer is empty.
{{/if}}
-
+
Options:
-
+
{^{:~link('Clear', 'trash', {'bufferOption' : 'clear', 'bufferId' : (#index + 1)}, !data ? 'disabled' : null)}} {^{:~link('Create Injector', 'pencil', {'bufferOption' : 'createInjector', 'bufferId' : (#index + 1)}, !data ? 'disabled' : null)}} {^{:~link('Transfer To Subject', 'radiation', {'bufferOption' : 'transfer', 'bufferId' : (#index + 1)}, !~root.hasOccupant || !data ? 'disabled' : null)}} @@ -162,46 +162,49 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm {^{if hasDisk}} {^{if disk.data}}
-
+
Label:
-
+
{^{:disk.label ? disk.label : 'No Label'}}
-
+
Subject:
-
+
{^{:disk.owner ? disk.owner : 'Unknown'}}
-
+
Stored Data:
-
+
{^{:disk.data == 'ui' ? 'Unique Identifiers' : 'Structural Enzymes'}} {^{:disk.ue ? ' + Unique Enzymes' : ''}}
{{else}}
-
+
Disk is blank.
{{/if}} {{else}}
-
+
No disk inserted.
{{/if}}
-
+
+ Options: +
+
{^{:~link('Wipe Disk', 'trash', {'bufferOption' : 'wipeDisk'}, !hasDisk || !disk.data ? 'disabled' : null)}} {^{:~link('Eject Disk', 'eject', {'bufferOption' : 'ejectDisk'}, !hasDisk ? 'disabled' : null)}}
@@ -209,10 +212,10 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm {{else selectedMenuKey == 'rejuvenators'}}

Rejuvenators

-
+
Inject:
-
+
{^{:~link('5', 'pencil', {'injectRejuvenators' : 5}, !hasOccupant || !beakerVolume ? 'disabled' : null)}} {^{:~link('10', 'pencil', {'injectRejuvenators' : 10}, !hasOccupant || !beakerVolume ? 'disabled' : null)}} {^{:~link('20', 'pencil', {'injectRejuvenators' : 20}, !hasOccupant || !beakerVolume ? 'disabled' : null)}} @@ -222,10 +225,10 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm
 
-
+
Beaker:
-
+
{^{if isBeakerLoaded}} {^{:beakerLabel ? beakerLabel : 'No label'}}
{^{if beakerVolume}} @@ -237,7 +240,7 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm No beaker loaded {{/if}}
-
+
{^{:~link('Eject Beaker', 'eject', {'ejectBeaker' : 1}, isBeakerLoaded ? null : 'disabled')}}
@@ -248,30 +251,30 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm {^{if selectedMenuKey == 'ui' || selectedMenuKey == 'se'}}

Radiation Emitter Settings

-
+
Intensity:
-
+
{^{:~link('-', null, {'radiationIntensity' : 0}, radiationIntensity > 1 ? null : 'disabled')}}
 {^{:radiationIntensity}} 
{^{:~link('+', null, {'radiationIntensity' : 1}, radiationIntensity < 10 ? null : 'disabled')}}
-
+
Duration:
-
+
{^{:~link('-', null, {'radiationDuration' : 0}, radiationDuration > 2 ? null : 'disabled')}}
 {^{:radiationDuration}} 
{^{:~link('+', null, {'radiationDuration' : 1}, radiationDuration < 20 ? null : 'disabled')}}
-
+
 
-
+
{^{:~link('Pulse Radiation', 'radiation', {'pulseRadiation' : 1}, !hasOccupant ? 'disabled' : null)}}
@@ -282,18 +285,18 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm
-
+
Occupant:
-
+
{^{:~link('Eject Occupant', 'eject', {'ejectOccupant' : 1}, locked || !hasOccupant || irradiating ? 'disabled' : null)}}
-
+
Door Lock:
-
+
{^{:~link('Engaged', 'locked', {'toggleLock' : 1}, locked ? 'selected' : !hasOccupant ? 'disabled' : null)}} {^{:~link('Disengaged', 'unlocked', {'toggleLock' : 1}, !locked ? 'selected' : irradiating ? 'disabled' : null)}}