diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 2d09c48a4ba..4f4adf9bee4 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -364,6 +364,8 @@ data["locked"] = src.connected.locked data["hasOccupant"] = connected.occupant ? 1 : 0 + data["isInjectorReady"] = injector_ready + data["hasDisk"] = disk ? 1 : 0 var/diskData[0] @@ -702,7 +704,7 @@ // Transfer Buffer Management if(href_list["bufferOption"]) var/bufferOption = href_list["bufferOption"] - + // These bufferOptions do not require a bufferId if (bufferOption == "wipeDisk") if ((isnull(src.disk)) || (src.disk.read_only)) @@ -722,12 +724,12 @@ return src.disk.loc = get_turf(src) src.disk = null - return 1 - + 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) @@ -776,14 +778,15 @@ src.buffers[bufferId]["ue"] = null return 1 - if (bufferOption == "label" && href_list["newLabel"]) - src.buffers[bufferId]["label"] = sanitize(href_list["newLabel"]) + if (bufferOption == "changeLabel") + var/label = src.buffers[bufferId]["label"] ? src.buffers[bufferId]["label"] : "New Label" + src.buffers[bufferId]["label"] = sanitize(input("New Label:", "Edit Label", label)) return 1 if (bufferOption == "transfer") if (!src.connected.occupant || (NOCLONE in src.connected.occupant.mutations) || !src.connected.occupant.dna) return - + irradiating = 2 var/lock_state = src.connected.locked src.connected.locked = 1//lock it @@ -793,7 +796,7 @@ irradiating = 0 src.connected.locked = lock_state - + if (src.buffers[bufferId]["type"] == "ui") if (src.buffers[bufferId]["ue"]) src.connected.occupant.real_name = src.buffers[bufferId]["owner"] @@ -811,7 +814,7 @@ var/success = 1 var/obj/item/weapon/dnainjector/I = new /obj/item/weapon/dnainjector I.dnatype = src.buffers[bufferId]["type"] - if(href_list["createInjectorOption"] == "2") + if(href_list["createBlockInjector"]) var/blk = input(usr,"Select Block","Block") in all_dna_blocks(src.buffers[bufferId]["data"]) success = setInjectorBlock(I,blk,src.buffers[bufferId]["data"]) else @@ -853,7 +856,7 @@ src.disk.owner = src.buffers[bufferId]["owner"] src.disk.name = "data disk - '[src.buffers[bufferId]["owner"]]'" //src.temphtml = "Data saved." - return 1 + return 1 /////////////////////////// DNA MACHINES diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index f993e0816d0..8b5400fa40e 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -117,7 +117,7 @@ } if (!ui) // 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 ui.set_initial_data(data) ui.open() diff --git a/nano/css/shared.css b/nano/css/shared.css index c9f4b2681b9..76aac18f469 100644 --- a/nano/css/shared.css +++ b/nano/css/shared.css @@ -24,7 +24,7 @@ hr { margin: 0 2px 2px 0; cursor:default; } -.noIcon { +.hasIcon { padding: 0px 4px 4px 0px; } @@ -163,8 +163,8 @@ h4 { font-size: 12px; font-style: italic; font-weight: bold; - padding: 3px 0px 3px 0px; - margin: 4px; + padding: 3px 4px 3px 4px; + margin: 4px 0 4px 0; } .notice.icon { padding: 2px 4px 0 20px; @@ -179,6 +179,12 @@ h4 { div.notice { clear: both; } +.itemGroup { + border: 1px solid #e9c183; + background: #2c2c2c; + padding: 4px; + clear: both; +} .item { width: 100%; margin: 4px 0 0 0; diff --git a/nano/js/nano_base_helpers.js b/nano/js/nano_base_helpers.js index 9d5b3bd9c14..ef34bd506a4 100644 --- a/nano/js/nano_base_helpers.js +++ b/nano/js/nano_base_helpers.js @@ -136,9 +136,15 @@ NanoBaseHelpers = function () continue; } - var selectBlockKey = 'select' + paramKey + 'Block'; - var selectSubblockKey = 'select' + paramKey + 'Subblock'; - var parameters = { selectBlockKey : block, selectSubblockKey : subblock }; + var parameters; + if (paramKey.toUpperCase() == 'UI') + { + parameters = { 'selectUIBlock' : block, 'selectUISubblock' : subblock }; + } + else + { + parameters = { 'selectSEBlock' : block, 'selectSESubblock' : subblock }; + } var status = 'linkActive'; if (block == selectedBlock && subblock == selectedSubblock) diff --git a/nano/templates/dna_modifier.tmpl b/nano/templates/dna_modifier.tmpl index e4412ace336..d4c7d36c82a 100644 --- a/nano/templates/dna_modifier.tmpl +++ b/nano/templates/dna_modifier.tmpl @@ -101,112 +101,117 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm

Transfer Buffers

{^{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)}} - {^{:~link('From Disk', 'disk', {'bufferOption' : 'loadDisk', 'bufferId' : (#index + 1)}, !~root.hasDisk || !~root.disk.data ? 'disabled' : null)}} -
-
- {^{if data}} +
- Label: + Load Data:
- {^{:label ? label : 'No Label'}} + {^{:~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)}} + {^{:~link('From Disk', 'disk', {'bufferOption' : 'loadDisk', 'bufferId' : (#index + 1)}, !~root.hasDisk || !~root.disk.data ? 'disabled' : null)}}
+ {^{if data}} +
+
+ Label: +
+
+ {^{:~link(label, 'document-b', {'bufferOption' : 'changeLabel', 'bufferId' : (#parent.index + 1)})}} +
+
+
+
+ Subject: +
+
+ {^{:owner ? owner : 'Unknown'}} +
+
+
+
+ Stored Data: +
+
+ {^{:data == 'ui' ? 'Unique Identifiers' : 'Structural Enzymes'}} + {^{:ue ? ' + Unique Enzymes' : ''}} +
+
+ {{else}} +
+
+ This buffer is empty. +
+
+ {{/if}}
- Subject: + Options:
- {^{:owner ? owner : 'Unknown'}} + {^{:~link('Clear', 'trash', {'bufferOption' : 'clear', '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', ~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('Save To Disk', 'disk', {'bufferOption' : 'saveDisk', 'bufferId' : (#index + 1)}, !data || !~root.hasDisk ? 'disabled' : null)}}
-
-
- 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)}} - {^{:~link('Save To Disk', 'disk', {'bufferOption' : 'saveDisk', 'bufferId' : (#index + 1)}, !data || !~root.hasDisk ? 'disabled' : null)}} -
{{/for}}

Data Disk

- {^{if hasDisk}} - {^{if disk.data}} -
-
- Label: +
+ {^{if hasDisk}} + {^{if disk.data}} +
+
+ Label: +
+
+ {^{:disk.label ? disk.label : 'No Label'}} +
-
- {^{:disk.label ? disk.label : 'No Label'}} +
+
+ Subject: +
+
+ {^{:disk.owner ? disk.owner : 'Unknown'}} +
-
-
-
- Subject: +
+
+ Stored Data: +
+
+ {^{:disk.data == 'ui' ? 'Unique Identifiers' : 'Structural Enzymes'}} + {^{:disk.ue ? ' + Unique Enzymes' : ''}} +
-
- {^{:disk.owner ? disk.owner : 'Unknown'}} + {{else}} +
+
+ Disk is blank. +
-
-
-
- Stored Data: -
-
- {^{:disk.data == 'ui' ? 'Unique Identifiers' : 'Structural Enzymes'}} - {^{:disk.ue ? ' + Unique Enzymes' : ''}} -
-
+ {{/if}} {{else}}
- Disk is blank. + No disk inserted.
{{/if}} - {{else}}
-
- No disk inserted. +
+ Options: +
+
+ {^{:~link('Wipe Disk', 'trash', {'bufferOption' : 'wipeDisk'}, !hasDisk || !disk.data ? 'disabled' : null)}} + {^{:~link('Eject Disk', 'eject', {'bufferOption' : 'ejectDisk'}, !hasDisk ? 'disabled' : null)}}
-
- {{/if}} -
-
- Options: -
-
- {^{:~link('Wipe Disk', 'trash', {'bufferOption' : 'wipeDisk'}, !hasDisk || !disk.data ? 'disabled' : null)}} - {^{:~link('Eject Disk', 'eject', {'bufferOption' : 'ejectDisk'}, !hasDisk ? 'disabled' : null)}}
{{else selectedMenuKey == 'rejuvenators'}} @@ -248,7 +253,7 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm
 
-{^{if selectedMenuKey == 'ui' || selectedMenuKey == 'se'}} +{^{if !selectedMenuKey || selectedMenuKey == 'ui' || selectedMenuKey == 'se'}}

Radiation Emitter Settings