From da6ff0a251a93e9709057341a5315e80b9412359 Mon Sep 17 00:00:00 2001 From: JimTheCactus Date: Sat, 5 Jul 2014 19:55:23 -0600 Subject: [PATCH 01/88] Patched PDA scanner to be more useful PDA's integrated scanner was VERY rudimentary. Patched it to resolve some formatting issues and improve usability. --- code/game/objects/items/devices/PDA/PDA.dm | 49 +++++++++++++++++++++- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index bc402a7a39..f524826b7c 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -1214,8 +1214,53 @@ var/global/list/obj/item/device/pda/PDAs = list() user << "\blue Tank is empty!" if (!scanmode && istype(A, /obj/item/weapon/paper) && owner) - note = A:info - user << "\blue Paper scanned." //concept of scanning paper copyright brainoblivion 2009 + // JMO 20140705: Makes scanned document show up in edit window if you edit notes. Not pretty for formatted documents, + // as this will clobber the HTML, but at least it lets you scan a document and add notes after the end. + var/raw_scan = (A:info) + var/formatted_scan = "" + // Scrub out the tags (replacing a few formatting ones along the way) + + // Find the beginning and end of the first tag. + var/tag_start = findtext(raw_scan,"<") + var/tag_stop = findtext(raw_scan,">") + + // Until we run out of complete tags... + while(tag_start&&tag_stop) + var/pre = copytext(raw_scan,1,tag_start) // Get the stuff that comes before the tag + var/tag = lowertext(copytext(raw_scan,tag_start+1,tag_stop)) // Get the tag so we can do intellegent replacement + var/tagend = findtext(tag," ") // Find the first space in the tag if there is one. + + // Anything that's before the tag can just be added as is. + formatted_scan = formatted_scan+pre + + // If we have a space after the tag (and presumably attributes) just crop that off. + if (tagend) + tag=copytext(tag,1,tagend) + + if (tag=="p"||tag=="/p"||tag=="br") // Check if it's I vertical space tag. + formatted_scan=formatted_scan+"
" // If so, add some padding in. + + raw_scan = copytext(raw_scan,tag_stop+1) // continue on with the stuff after the tag + + // Look for the next tag in what's left + tag_start = findtext(raw_scan,"<") + tag_stop = findtext(raw_scan,">") + + // Anything that is left in the page. just tack it on to the end as is + formatted_scan=formatted_scan+raw_scan + + // If there is something in there already, pad it out. + if (length(note)>0) + note = note + "

" + + // Store the scanned document to the notes + note = "Scanned Document. Edit to restore previous notes/delete scan.
----------
" + formatted_scan + "
" + // notehtml ISN'T set to allow user to get their old notes back. A better implementation would add a "scanned documents" + // feature to the PDA, which would better convey the availability of the feature, but this will work for now. + + // Inform the user + user << "\blue Paper scanned and OCRed to notekeeper." //concept of scanning paper copyright brainoblivion 2009 + /obj/item/device/pda/proc/explode() //This needs tuning. //Sure did. From 4376465f5d9a6dfc8f94c5e558863a45c72bab81 Mon Sep 17 00:00:00 2001 From: Mark Aherne Date: Sun, 6 Jul 2014 23:02:09 +0100 Subject: [PATCH 02/88] Work in progress on a major revision of the NanoUI templating system. --- code/modules/nano/nanoui.dm | 6 +- nano/js/libraries.min.js | 2 +- nano/js/libraries/2-doT.js | 153 ++ nano/js/libraries/2-jsrender.js | 1520 ----------------- nano/js/nano_base_helpers.js | 53 +- nano/js/nano_template.js | 65 + nano/js/nano_update.js | 38 +- nano/js/{nano_config.js => nano_utility.js} | 38 +- nano/templates/accounts_terminal.tmpl | 67 +- nano/templates/advanced_airlock_console.tmpl | 26 +- nano/templates/apc.tmpl | 72 +- nano/templates/canister.tmpl | 34 +- nano/templates/chem_dispenser.tmpl | 34 +- nano/templates/crew_monitor.tmpl | 14 +- nano/templates/cryo.tmpl | 50 +- nano/templates/disease_splicer.tmpl | 46 +- nano/templates/dish_incubator.tmpl | 40 +- nano/templates/dna_modifier.tmpl | 154 +- nano/templates/docking_airlock_console.tmpl | 54 +- nano/templates/door_access_console.tmpl | 16 +- nano/templates/escape_pod_console.tmpl | 26 +- .../escape_shuttle_control_console.tmpl | 34 +- nano/templates/freezer.tmpl | 24 +- nano/templates/geoscanner.tmpl | 98 +- nano/templates/identification_computer.tmpl | 90 +- nano/templates/isolation_centrifuge.tmpl | 36 +- nano/templates/multi_docking_console.tmpl | 14 +- nano/templates/omni_filter.tmpl | 42 +- nano/templates/omni_mixer.tmpl | 48 +- nano/templates/pathogenic_isolator.tmpl | 58 +- nano/templates/pda.tmpl | 540 +++--- nano/templates/shuttle_control_console.tmpl | 28 +- nano/templates/simple_airlock_console.tmpl | 22 +- nano/templates/simple_docking_console.tmpl | 56 +- .../templates/simple_docking_console_pod.tmpl | 60 +- nano/templates/smartfridge.tmpl | 56 +- nano/templates/smes.tmpl | 34 +- nano/templates/tanks.tmpl | 24 +- nano/templates/telescience_console.tmpl | 12 +- nano/templates/transfer_valve.tmpl | 24 +- nano/templates/uplink.tmpl | 18 +- 41 files changed, 1258 insertions(+), 2568 deletions(-) create mode 100644 nano/js/libraries/2-doT.js delete mode 100644 nano/js/libraries/2-jsrender.js create mode 100644 nano/js/nano_template.js rename nano/js/{nano_config.js => nano_utility.js} (76%) diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 1a3257ed24..3cfec37fa5 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -86,13 +86,13 @@ nanoui is used to open and update nano browser uis add_common_assets() /** - * Use this proc to add assets which are common to all nano uis + * Use this proc to add assets which are common to (and required by) all nano uis * * @return nothing */ /datum/nanoui/proc/add_common_assets() - add_script("libraries.min.js") // The jQuery library - add_script("nano_config.js") // The NanoConfig JS, this is used to store configuration values. + add_script("libraries.min.js") // A JS file comprising of jQuery, doT.js and jQuery Timer libraries (compressed together) + add_script("nano_utility.js") // The NanoUtility JS, this is used to store utility functions. add_script("nano_update.js") // The NanoUpdate JS, this is used to receive updates and apply them. add_script("nano_base_helpers.js") // The NanoBaseHelpers JS, this is used to set up template helpers which are common to all templates add_stylesheet("shared.css") // this CSS sheet is common to all UIs diff --git a/nano/js/libraries.min.js b/nano/js/libraries.min.js index 11c9ffb918..0c7a0f598a 100644 --- a/nano/js/libraries.min.js +++ b/nano/js/libraries.min.js @@ -1 +1 @@ -(function(e,t){function H(e){var t=e.length,n=w.type(e);if(w.isWindow(e)){return false}if(e.nodeType===1&&t){return true}return n==="array"||n!=="function"&&(t===0||typeof t==="number"&&t>0&&t-1 in e)}function j(e){var t=B[e]={};w.each(e.match(S)||[],function(e,n){t[n]=true});return t}function q(e,n,r,i){if(!w.acceptData(e)){return}var s,o,u=w.expando,a=e.nodeType,f=a?w.cache:e,l=a?e[u]:e[u]&&u;if((!l||!f[l]||!i&&!f[l].data)&&r===t&&typeof n==="string"){return}if(!l){if(a){l=e[u]=c.pop()||w.guid++}else{l=u}}if(!f[l]){f[l]=a?{}:{toJSON:w.noop}}if(typeof n==="object"||typeof n==="function"){if(i){f[l]=w.extend(f[l],n)}else{f[l].data=w.extend(f[l].data,n)}}o=f[l];if(!i){if(!o.data){o.data={}}o=o.data}if(r!==t){o[w.camelCase(n)]=r}if(typeof n==="string"){s=o[n];if(s==null){s=o[w.camelCase(n)]}}else{s=o}return s}function R(e,t,n){if(!w.acceptData(e)){return}var r,i,s=e.nodeType,o=s?w.cache:e,u=s?e[w.expando]:w.expando;if(!o[u]){return}if(t){r=n?o[u]:o[u].data;if(r){if(!w.isArray(t)){if(t in r){t=[t]}else{t=w.camelCase(t);if(t in r){t=[t]}else{t=t.split(" ")}}}else{t=t.concat(w.map(t,w.camelCase))}i=t.length;while(i--){delete r[t[i]]}if(n?!z(r):!w.isEmptyObject(r)){return}}}if(!n){delete o[u].data;if(!z(o[u])){return}}if(s){w.cleanData([e],true)}else if(w.support.deleteExpando||o!=o.window){delete o[u]}else{o[u]=null}}function U(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(I,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r==="string"){try{r=r==="true"?true:r==="false"?false:r==="null"?null:+r+""===r?+r:F.test(r)?w.parseJSON(r):r}catch(s){}w.data(e,n,r)}else{r=t}}return r}function z(e){var t;for(t in e){if(t==="data"&&w.isEmptyObject(e[t])){continue}if(t!=="toJSON"){return false}}return true}function it(){return true}function st(){return false}function ot(){try{return o.activeElement}catch(e){}}function ct(e,t){do{e=e[t]}while(e&&e.nodeType!==1);return e}function ht(e,t,n){if(w.isFunction(t)){return w.grep(e,function(e,r){return!!t.call(e,r,e)!==n})}if(t.nodeType){return w.grep(e,function(e){return e===t!==n})}if(typeof t==="string"){if(ut.test(t)){return w.filter(t,e,n)}t=w.filter(t,e)}return w.grep(e,function(e){return w.inArray(e,t)>=0!==n})}function pt(e){var t=dt.split("|"),n=e.createDocumentFragment();if(n.createElement){while(t.length){n.createElement(t.pop())}}return n}function Mt(e,t){return w.nodeName(e,"table")&&w.nodeName(t.nodeType===1?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function _t(e){e.type=(w.find.attr(e,"type")!==null)+"/"+e.type;return e}function Dt(e){var t=Ct.exec(e.type);if(t){e.type=t[1]}else{e.removeAttribute("type")}return e}function Pt(e,t){var n,r=0;for(;(n=e[r])!=null;r++){w._data(n,"globalEval",!t||w._data(t[r],"globalEval"))}}function Ht(e,t){if(t.nodeType!==1||!w.hasData(e)){return}var n,r,i,s=w._data(e),o=w._data(t,s),u=s.events;if(u){delete o.handle;o.events={};for(n in u){for(r=0,i=u[n].length;r").css("cssText","display:block !important")).appendTo(t.documentElement);t=(It[0].contentWindow||It[0].contentDocument).document;t.write("");t.close();n=fn(e,t);It.detach()}Qt[e]=n}return n}function fn(e,t){var n=w(t.createElement(e)).appendTo(t.body),r=w.css(n[0],"display");n.remove();return r}function vn(e,t,n,r){var i;if(w.isArray(t)){w.each(t,function(t,i){if(n||cn.test(e)){r(e,i)}else{vn(e+"["+(typeof i==="object"?t:"")+"]",i,n,r)}})}else if(!n&&w.type(t)==="object"){for(i in t){vn(e+"["+i+"]",t[i],n,r)}}else{r(e,t)}}function _n(e){return function(t,n){if(typeof t!=="string"){n=t;t="*"}var r,i=0,s=t.toLowerCase().match(S)||[];if(w.isFunction(n)){while(r=s[i++]){if(r[0]==="+"){r=r.slice(1)||"*";(e[r]=e[r]||[]).unshift(n)}else{(e[r]=e[r]||[]).push(n)}}}}}function Dn(e,t,n,r){function o(u){var a;i[u]=true;w.each(e[u]||[],function(e,u){var f=u(t,n,r);if(typeof f==="string"&&!s&&!i[f]){t.dataTypes.unshift(f);o(f);return false}else if(s){return!(a=f)}});return a}var i={},s=e===An;return o(t.dataTypes[0])||!i["*"]&&o("*")}function Pn(e,n){var r,i,s=w.ajaxSettings.flatOptions||{};for(i in n){if(n[i]!==t){(s[i]?e:r||(r={}))[i]=n[i]}}if(r){w.extend(true,e,r)}return e}function Hn(e,n,r){var i,s,o,u,a=e.contents,f=e.dataTypes;while(f[0]==="*"){f.shift();if(s===t){s=e.mimeType||n.getResponseHeader("Content-Type")}}if(s){for(u in a){if(a[u]&&a[u].test(s)){f.unshift(u);break}}}if(f[0]in r){o=f[0]}else{for(u in r){if(!f[0]||e.converters[u+" "+f[0]]){o=u;break}if(!i){i=u}}o=o||i}if(o){if(o!==f[0]){f.unshift(o)}return r[o]}}function Bn(e,t,n,r){var i,s,o,u,a,f={},l=e.dataTypes.slice();if(l[1]){for(o in e.converters){f[o.toLowerCase()]=e.converters[o]}}s=l.shift();while(s){if(e.responseFields[s]){n[e.responseFields[s]]=t}if(!a&&r&&e.dataFilter){t=e.dataFilter(t,e.dataType)}a=s;s=l.shift();if(s){if(s==="*"){s=a}else if(a!=="*"&&a!==s){o=f[a+" "+s]||f["* "+s];if(!o){for(i in f){u=i.split(" ");if(u[1]===s){o=f[a+" "+u[0]]||f["* "+u[0]];if(o){if(o===true){o=f[i]}else if(f[i]!==true){s=u[0];l.unshift(u[1])}break}}}}if(o!==true){if(o&&e["throws"]){t=o(t)}else{try{t=o(t)}catch(c){return{state:"parsererror",error:o?c:"No conversion from "+a+" to "+s}}}}}}}return{state:"success",data:t}}function zn(){try{return new e.XMLHttpRequest}catch(t){}}function Wn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function Yn(){setTimeout(function(){Xn=t});return Xn=w.now()}function Zn(e,t,n){var r,i=(Gn[t]||[]).concat(Gn["*"]),s=0,o=i.length;for(;s)[^>]*|#([\w-]*))$/,N=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,C=/^[\],:{}\s]*$/,k=/(?:^|:|,)(?:\s*\[)+/g,L=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,O=/^-ms-/,M=/-([\da-z])/gi,_=function(e,t){return t.toUpperCase()},D=function(e){if(o.addEventListener||e.type==="load"||o.readyState==="complete"){P();w.ready()}},P=function(){if(o.addEventListener){o.removeEventListener("DOMContentLoaded",D,false);e.removeEventListener("load",D,false)}else{o.detachEvent("onreadystatechange",D);e.detachEvent("onload",D)}};w.fn=w.prototype={jquery:h,constructor:w,init:function(e,n,r){var i,s;if(!e){return this}if(typeof e==="string"){if(e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3){i=[null,e,null]}else{i=T.exec(e)}if(i&&(i[1]||!n)){if(i[1]){n=n instanceof w?n[0]:n;w.merge(this,w.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,true));if(N.test(i[1])&&w.isPlainObject(n)){for(i in n){if(w.isFunction(this[i])){this[i](n[i])}else{this.attr(i,n[i])}}}return this}else{s=o.getElementById(i[2]);if(s&&s.parentNode){if(s.id!==i[2]){return r.find(e)}this.length=1;this[0]=s}this.context=o;this.selector=e;return this}}else if(!n||n.jquery){return(n||r).find(e)}else{return this.constructor(n).find(e)}}else if(e.nodeType){this.context=this[0]=e;this.length=1;return this}else if(w.isFunction(e)){return r.ready(e)}if(e.selector!==t){this.selector=e.selector;this.context=e.context}return w.makeArray(e,this)},selector:"",length:0,toArray:function(){return v.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e){var t=w.merge(this.constructor(),e);t.prevObject=this;t.context=this.context;return t},each:function(e,t){return w.each(this,e,t)},ready:function(e){w.ready.promise().done(e);return this},slice:function(){return this.pushStack(v.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n0){return}n.resolveWith(o,[w]);if(w.fn.trigger){w(o).trigger("ready").off("ready")}},isFunction:function(e){return w.type(e)==="function"},isArray:Array.isArray||function(e){return w.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){if(e==null){return String(e)}return typeof e==="object"||typeof e==="function"?l[g.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||w.type(e)!=="object"||e.nodeType||w.isWindow(e)){return false}try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf")){return false}}catch(r){return false}if(w.support.ownLast){for(n in e){return y.call(e,n)}}for(n in e){}return n===t||y.call(e,n)},isEmptyObject:function(e){var t;for(t in e){return false}return true},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){if(!e||typeof e!=="string"){return null}if(typeof t==="boolean"){n=t;t=false}t=t||o;var r=N.exec(e),i=!n&&[];if(r){return[t.createElement(r[1])]}r=w.buildFragment([e],t,i);if(i){w(i).remove()}return w.merge([],r.childNodes)},parseJSON:function(t){if(e.JSON&&e.JSON.parse){return e.JSON.parse(t)}if(t===null){return t}if(typeof t==="string"){t=w.trim(t);if(t){if(C.test(t.replace(L,"@").replace(A,"]").replace(k,""))){return(new Function("return "+t))()}}}w.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!=="string"){return null}try{if(e.DOMParser){i=new DOMParser;r=i.parseFromString(n,"text/xml")}else{r=new ActiveXObject("Microsoft.XMLDOM");r.async="false";r.loadXML(n)}}catch(s){r=t}if(!r||!r.documentElement||r.getElementsByTagName("parsererror").length){w.error("Invalid XML: "+n)}return r},noop:function(){},globalEval:function(t){if(t&&w.trim(t)){(e.execScript||function(t){e["eval"].call(e,t)})(t)}},camelCase:function(e){return e.replace(O,"ms-").replace(M,_)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,s=e.length,o=H(e);if(n){if(o){for(;is.cacheLength){delete t[e.shift()]}return t[n]=r}var e=[];return t}function at(e){e[b]=true;return e}function ft(e){var t=h.createElement("div");try{return!!e(t)}catch(n){return false}finally{if(t.parentNode){t.parentNode.removeChild(t)}t=null}}function lt(e,t){var n=e.split("|"),r=e.length;while(r--){s.attrHandle[n[r]]=t}}function ct(e,t){var n=t&&e,r=n&&e.nodeType===1&&t.nodeType===1&&(~t.sourceIndex||O)-(~e.sourceIndex||O);if(r){return r}if(n){while(n=n.nextSibling){if(n===t){return-1}}}return e?1:-1}function ht(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function pt(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function dt(e){return at(function(t){t=+t;return at(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--){if(n[i=s[o]]){n[i]=!(r[i]=n[i])}}})})}function vt(){}function mt(e,t){var n,r,i,o,u,a,f,l=N[e+" "];if(l){return t?0:l.slice(0)}u=e;a=[];f=s.preFilter;while(u){if(!n||(r=X.exec(u))){if(r){u=u.slice(r[0].length)||u}a.push(i=[])}n=false;if(r=V.exec(u)){n=r.shift();i.push({value:n,type:r[0].replace(W," ")});u=u.slice(n.length)}for(o in s.filter){if((r=G[o].exec(u))&&(!f[o]||(r=f[o](r)))){n=r.shift();i.push({value:n,type:o,matches:r});u=u.slice(n.length)}}if(!n){break}}return t?u.length:u?ot.error(e):N(e,a).slice(0)}function gt(e){var t=0,n=e.length,r="";for(;t1?function(t,n,r){var i=e.length;while(i--){if(!e[i](t,n,r)){return false}}return true}:e[0]}function wt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u-1){s[f]=!(o[f]=c)}}}}else{g=wt(g===o?g.splice(d,g.length):g);if(i){i(null,o,g,a)}else{H.apply(o,g)}}})}function St(e){var t,n,r,i=e.length,o=s.relative[e[0].type],u=o||s.relative[" "],a=o?1:0,l=yt(function(e){return e===t},u,true),c=yt(function(e){return j.call(t,e)>-1},u,true),h=[function(e,n,r){return!o&&(r||n!==f)||((t=n).nodeType?l(e,n,r):c(e,n,r))}];for(;a1&&bt(h),a>1&>(e.slice(0,a-1).concat({value:e[a-2].type===" "?"*":""})).replace(W,"$1"),n,a0,o=e.length>0,u=function(u,a,l,c,p){var d,v,m,g=[],y=0,b="0",w=u&&[],E=p!=null,x=f,T=u||o&&s.find["TAG"]("*",p&&a.parentNode||a),N=S+=x==null?1:Math.random()||.1;if(E){f=a!==h&&a;i=n}for(;(d=T[b])!=null;b++){if(o&&d){v=0;while(m=e[v++]){if(m(d,a,l)){c.push(d);break}}if(E){S=N;i=++n}}if(r){if(d=!m&&d){y--}if(u){w.push(d)}}}y+=b;if(r&&b!==y){v=0;while(m=t[v++]){m(w,g,a,l)}if(u){if(y>0){while(b--){if(!(w[b]||g[b])){g[b]=D.call(c)}}}g=wt(g)}H.apply(c,g);if(E&&!u&&g.length>0&&y+t.length>1){ot.uniqueSort(c)}}if(E){S=N;f=x}return w};return r?at(u):u}function Tt(e,t,n){var r=0,i=t.length;for(;r2&&(f=u[0]).type==="ID"&&r.getById&&t.nodeType===9&&d&&s.relative[u[1].type]){t=(s.find["ID"](f.matches[0].replace(rt,it),t)||[])[0];if(!t){return n}e=e.slice(u.shift().value.length)}o=G["needsContext"].test(e)?0:u.length;while(o--){f=u[o];if(s.relative[l=f.type]){break}if(c=s.find[l]){if(i=c(f.matches[0].replace(rt,it),$.test(u[0].type)&&t.parentNode||t)){u.splice(o,1);e=i.length&>(u);if(!e){H.apply(n,i);return n}break}}}}}a(e,h)(i,t,!d,n,$.test(e));return n}var n,r,i,s,o,u,a,f,l,c,h,p,d,v,m,g,y,b="sizzle"+ -(new Date),E=e.document,S=0,x=0,T=ut(),N=ut(),C=ut(),k=false,L=function(e,t){if(e===t){k=true;return 0}return 0},A=typeof t,O=1<<31,M={}.hasOwnProperty,_=[],D=_.pop,P=_.push,H=_.push,B=_.slice,j=_.indexOf||function(e){var t=0,n=this.length;for(;t+~]|"+I+")"+I+"*"),$=new RegExp(I+"*[+~]"),J=new RegExp("="+I+"*([^\\]'\"]*)"+I+"*\\]","g"),K=new RegExp(z),Q=new RegExp("^"+R+"$"),G={ID:new RegExp("^#("+q+")"),CLASS:new RegExp("^\\.("+q+")"),TAG:new RegExp("^("+q.replace("w","w*")+")"),ATTR:new RegExp("^"+U),PSEUDO:new RegExp("^"+z),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+I+"*(even|odd|(([+-]|)(\\d*)n|)"+I+"*(?:([+-]|)"+I+"*(\\d+)|))"+I+"*\\)|)","i"),bool:new RegExp("^(?:"+F+")$","i"),needsContext:new RegExp("^"+I+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+I+"*((?:-\\d)?\\d*)"+I+"*\\)|)(?=[^-]|$)","i")},Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=new RegExp("\\\\([\\da-f]{1,6}"+I+"?|("+I+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,r&1023|56320)};try{H.apply(_=B.call(E.childNodes),E.childNodes);_[E.childNodes.length].nodeType}catch(st){H={apply:_.length?function(e,t){P.apply(e,B.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]){}e.length=n-1}}}u=ot.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":false};r=ot.support={};c=ot.setDocument=function(e){var t=e?e.ownerDocument||e:E,n=t.defaultView;if(t===h||t.nodeType!==9||!t.documentElement){return h}h=t;p=t.documentElement;d=!u(t);if(n&&n.attachEvent&&n!==n.top){n.attachEvent("onbeforeunload",function(){c()})}r.attributes=ft(function(e){e.className="i";return!e.getAttribute("className")});r.getElementsByTagName=ft(function(e){e.appendChild(t.createComment(""));return!e.getElementsByTagName("*").length});r.getElementsByClassName=ft(function(e){e.innerHTML="
";e.firstChild.className="i";return e.getElementsByClassName("i").length===2});r.getById=ft(function(e){p.appendChild(e).id=b;return!t.getElementsByName||!t.getElementsByName(b).length});if(r.getById){s.find["ID"]=function(e,t){if(typeof t.getElementById!==A&&d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}};s.filter["ID"]=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}}else{delete s.find["ID"];s.filter["ID"]=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}}s.find["TAG"]=r.getElementsByTagName?function(e,t){if(typeof t.getElementsByTagName!==A){return t.getElementsByTagName(e)}}:function(e,t){var n,r=[],i=0,s=t.getElementsByTagName(e);if(e==="*"){while(n=s[i++]){if(n.nodeType===1){r.push(n)}}return r}return s};s.find["CLASS"]=r.getElementsByClassName&&function(e,t){if(typeof t.getElementsByClassName!==A&&d){return t.getElementsByClassName(e)}};m=[];v=[];if(r.qsa=Y.test(t.querySelectorAll)){ft(function(e){e.innerHTML="";if(!e.querySelectorAll("[selected]").length){v.push("\\["+I+"*(?:value|"+F+")")}if(!e.querySelectorAll(":checked").length){v.push(":checked")}});ft(function(e){var n=t.createElement("input");n.setAttribute("type","hidden");e.appendChild(n).setAttribute("t","");if(e.querySelectorAll("[t^='']").length){v.push("[*^$]="+I+"*(?:''|\"\")")}if(!e.querySelectorAll(":enabled").length){v.push(":enabled",":disabled")}e.querySelectorAll("*,:x");v.push(",.*:")})}if(r.matchesSelector=Y.test(g=p.webkitMatchesSelector||p.mozMatchesSelector||p.oMatchesSelector||p.msMatchesSelector)){ft(function(e){r.disconnectedMatch=g.call(e,"div");g.call(e,"[s!='']:x");m.push("!=",z)})}v=v.length&&new RegExp(v.join("|"));m=m.length&&new RegExp(m.join("|"));y=Y.test(p.contains)||p.compareDocumentPosition?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&(n.contains?n.contains(r):e.compareDocumentPosition&&e.compareDocumentPosition(r)&16))}:function(e,t){if(t){while(t=t.parentNode){if(t===e){return true}}}return false};L=p.compareDocumentPosition?function(e,n){if(e===n){k=true;return 0}var i=n.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(n);if(i){if(i&1||!r.sortDetached&&n.compareDocumentPosition(e)===i){if(e===t||y(E,e)){return-1}if(n===t||y(E,n)){return 1}return l?j.call(l,e)-j.call(l,n):0}return i&4?-1:1}return e.compareDocumentPosition?-1:1}:function(e,n){var r,i=0,s=e.parentNode,o=n.parentNode,u=[e],a=[n];if(e===n){k=true;return 0}else if(!s||!o){return e===t?-1:n===t?1:s?-1:o?1:l?j.call(l,e)-j.call(l,n):0}else if(s===o){return ct(e,n)}r=e;while(r=r.parentNode){u.unshift(r)}r=n;while(r=r.parentNode){a.unshift(r)}while(u[i]===a[i]){i++}return i?ct(u[i],a[i]):u[i]===E?-1:a[i]===E?1:0};return t};ot.matches=function(e,t){return ot(e,null,null,t)};ot.matchesSelector=function(e,t){if((e.ownerDocument||e)!==h){c(e)}t=t.replace(J,"='$1']");if(r.matchesSelector&&d&&(!m||!m.test(t))&&(!v||!v.test(t))){try{var n=g.call(e,t);if(n||r.disconnectedMatch||e.document&&e.document.nodeType!==11){return n}}catch(i){}}return ot(t,h,null,[e]).length>0};ot.contains=function(e,t){if((e.ownerDocument||e)!==h){c(e)}return y(e,t)};ot.attr=function(e,n){if((e.ownerDocument||e)!==h){c(e)}var i=s.attrHandle[n.toLowerCase()],o=i&&M.call(s.attrHandle,n.toLowerCase())?i(e,n,!d):t;return o===t?r.attributes||!d?e.getAttribute(n):(o=e.getAttributeNode(n))&&o.specified?o.value:null:o};ot.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)};ot.uniqueSort=function(e){var t,n=[],i=0,s=0;k=!r.detectDuplicates;l=!r.sortStable&&e.slice(0);e.sort(L);if(k){while(t=e[s++]){if(t===e[s]){i=n.push(s)}}while(i--){e.splice(n[i],1)}}return e};o=ot.getText=function(e){var t,n="",r=0,i=e.nodeType;if(!i){for(;t=e[r];r++){n+=o(t)}}else if(i===1||i===9||i===11){if(typeof e.textContent==="string"){return e.textContent}else{for(e=e.firstChild;e;e=e.nextSibling){n+=o(e)}}}else if(i===3||i===4){return e.nodeValue}return n};s=ot.selectors={cacheLength:50,createPseudo:at,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:true}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:true},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){e[1]=e[1].replace(rt,it);e[3]=(e[4]||e[5]||"").replace(rt,it);if(e[2]==="~="){e[3]=" "+e[3]+" "}return e.slice(0,4)},CHILD:function(e){e[1]=e[1].toLowerCase();if(e[1].slice(0,3)==="nth"){if(!e[3]){ot.error(e[0])}e[4]=+(e[4]?e[5]+(e[6]||1):2*(e[3]==="even"||e[3]==="odd"));e[5]=+(e[7]+e[8]||e[3]==="odd")}else if(e[3]){ot.error(e[0])}return e},PSEUDO:function(e){var n,r=!e[5]&&e[2];if(G["CHILD"].test(e[0])){return null}if(e[3]&&e[4]!==t){e[2]=e[4]}else if(r&&K.test(r)&&(n=mt(r,true))&&(n=r.indexOf(")",r.length-n)-r.length)){e[0]=e[0].slice(0,n);e[2]=r.slice(0,n)}return e.slice(0,3)}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return e==="*"?function(){return true}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=T[e+" "];return t||(t=new RegExp("(^|"+I+")"+e+"("+I+"|$)"))&&T(e,function(e){return t.test(typeof e.className==="string"&&e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=ot.attr(r,e);if(i==null){return t==="!="}if(!t){return true}i+="";return t==="="?i===n:t==="!="?i!==n:t==="^="?n&&i.indexOf(n)===0:t==="*="?n&&i.indexOf(n)>-1:t==="$="?n&&i.slice(-n.length)===n:t==="~="?(" "+i+" ").indexOf(n)>-1:t==="|="?i===n||i.slice(0,n.length+1)===n+"-":false}},CHILD:function(e,t,n,r,i){var s=e.slice(0,3)!=="nth",o=e.slice(-4)!=="last",u=t==="of-type";return r===1&&i===0?function(e){return!!e.parentNode}:function(t,n,a){var f,l,c,h,p,d,v=s!==o?"nextSibling":"previousSibling",m=t.parentNode,g=u&&t.nodeName.toLowerCase(),y=!a&&!u;if(m){if(s){while(v){c=t;while(c=c[v]){if(u?c.nodeName.toLowerCase()===g:c.nodeType===1){return false}}d=v=e==="only"&&!d&&"nextSibling"}return true}d=[o?m.firstChild:m.lastChild];if(o&&y){l=m[b]||(m[b]={});f=l[e]||[];p=f[0]===S&&f[1];h=f[0]===S&&f[2];c=p&&m.childNodes[p];while(c=++p&&c&&c[v]||(h=p=0)||d.pop()){if(c.nodeType===1&&++h&&c===t){l[e]=[S,p,h];break}}}else if(y&&(f=(t[b]||(t[b]={}))[e])&&f[0]===S){h=f[1]}else{while(c=++p&&c&&c[v]||(h=p=0)||d.pop()){if((u?c.nodeName.toLowerCase()===g:c.nodeType===1)&&++h){if(y){(c[b]||(c[b]={}))[e]=[S,h]}if(c===t){break}}}}h-=i;return h===r||h%r===0&&h/r>=0}}},PSEUDO:function(e,t){var n,r=s.pseudos[e]||s.setFilters[e.toLowerCase()]||ot.error("unsupported pseudo: "+e);if(r[b]){return r(t)}if(r.length>1){n=[e,e,"",t];return s.setFilters.hasOwnProperty(e.toLowerCase())?at(function(e,n){var i,s=r(e,t),o=s.length;while(o--){i=j.call(e,s[o]);e[i]=!(n[i]=s[o])}}):function(e){return r(e,0,n)}}return r}},pseudos:{not:at(function(e){var t=[],n=[],r=a(e.replace(W,"$1"));return r[b]?at(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--){if(s=o[u]){e[u]=!(t[u]=s)}}}):function(e,i,s){t[0]=e;r(t,null,s,n);return!n.pop()}}),has:at(function(e){return function(t){return ot(e,t).length>0}}),contains:at(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:at(function(e){if(!Q.test(e||"")){ot.error("unsupported lang: "+e)}e=e.replace(rt,it).toLowerCase();return function(t){var n;do{if(n=d?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang")){n=n.toLowerCase();return n===e||n.indexOf(e+"-")===0}}while((t=t.parentNode)&&t.nodeType===1);return false}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===p},focus:function(e){return e===h.activeElement&&(!h.hasFocus||h.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===false},disabled:function(e){return e.disabled===true},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){if(e.parentNode){e.parentNode.selectedIndex}return e.selected===true},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling){if(e.nodeName>"@"||e.nodeType===3||e.nodeType===4){return false}}return true},parent:function(e){return!s.pseudos["empty"](e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},text:function(e){var t;return e.nodeName.toLowerCase()==="input"&&e.type==="text"&&((t=e.getAttribute("type"))==null||t.toLowerCase()===e.type)},first:dt(function(){return[0]}),last:dt(function(e,t){return[t-1]}),eq:dt(function(e,t,n){return[n<0?n+t:n]}),even:dt(function(e,t){var n=0;for(;n=0;){e.push(r)}return e}),gt:dt(function(e,t,n){var r=n<0?n+t:n;for(;++r";e.firstChild.setAttribute("value","");return e.firstChild.getAttribute("value")===""})){lt("value",function(e,t,n){if(!n&&e.nodeName.toLowerCase()==="input"){return e.defaultValue}})}if(!ft(function(e){return e.getAttribute("disabled")==null})){lt(F,function(e,t,n){var r;if(!n){return(r=e.getAttributeNode(t))&&r.specified?r.value:e[t]===true?t.toLowerCase():null}})}w.find=ot;w.expr=ot.selectors;w.expr[":"]=w.expr.pseudos;w.unique=ot.uniqueSort;w.text=ot.getText;w.isXMLDoc=ot.isXML;w.contains=ot.contains})(e);var B={};w.Callbacks=function(e){e=typeof e==="string"?B[e]||j(e):w.extend({},e);var n,r,i,s,o,u,a=[],f=!e.once&&[],l=function(t){r=e.memory&&t;i=true;o=u||0;u=0;s=a.length;n=true;for(;a&&o-1){a.splice(r,1);if(n){if(r<=s){s--}if(r<=o){o--}}}})}return this},has:function(e){return e?w.inArray(e,a)>-1:!!(a&&a.length)},empty:function(){a=[];s=0;return this},disable:function(){a=f=r=t;return this},disabled:function(){return!a},lock:function(){f=t;if(!r){c.disable()}return this},locked:function(){return!f},fireWith:function(e,t){if(a&&(!i||f)){t=t||[];t=[e,t.slice?t.slice():t];if(n){f.push(t)}else{l(t)}}return this},fire:function(){c.fireWith(this,arguments);return this},fired:function(){return!!i}};return c};w.extend({Deferred:function(e){var t=[["resolve","done",w.Callbacks("once memory"),"resolved"],["reject","fail",w.Callbacks("once memory"),"rejected"],["notify","progress",w.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){i.done(arguments).fail(arguments);return this},then:function(){var e=arguments;return w.Deferred(function(n){w.each(t,function(t,s){var o=s[0],u=w.isFunction(e[t])&&e[t];i[s[1]](function(){var e=u&&u.apply(this,arguments);if(e&&w.isFunction(e.promise)){e.promise().done(n.resolve).fail(n.reject).progress(n.notify)}else{n[o+"With"](this===r?n.promise():this,u?[e]:arguments)}})});e=null}).promise()},promise:function(e){return e!=null?w.extend(e,r):r}},i={};r.pipe=r.then;w.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add;if(u){o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock)}i[s[0]]=function(){i[s[0]+"With"](this===i?r:this,arguments);return this};i[s[0]+"With"]=o.fireWith});r.promise(i);if(e){e.call(i,i)}return i},when:function(e){var t=0,n=v.call(arguments),r=n.length,i=r!==1||e&&w.isFunction(e.promise)?r:0,s=i===1?e:w.Deferred(),o=function(e,t,n){return function(r){t[e]=this;n[e]=arguments.length>1?v.call(arguments):r;if(n===u){s.notifyWith(t,n)}else if(!--i){s.resolveWith(t,n)}}},u,a,f;if(r>1){u=new Array(r);a=new Array(r);f=new Array(r);for(;t
a";n=p.getElementsByTagName("*")||[];r=p.getElementsByTagName("a")[0];if(!r||!r.style||!n.length){return t}u=o.createElement("select");f=u.appendChild(o.createElement("option"));s=p.getElementsByTagName("input")[0];r.style.cssText="top:1px;float:left;opacity:.5";t.getSetAttribute=p.className!=="t";t.leadingWhitespace=p.firstChild.nodeType===3;t.tbody=!p.getElementsByTagName("tbody").length;t.htmlSerialize=!!p.getElementsByTagName("link").length;t.style=/top/.test(r.getAttribute("style"));t.hrefNormalized=r.getAttribute("href")==="/a";t.opacity=/^0.5/.test(r.style.opacity);t.cssFloat=!!r.style.cssFloat;t.checkOn=!!s.value;t.optSelected=f.selected;t.enctype=!!o.createElement("form").enctype;t.html5Clone=o.createElement("nav").cloneNode(true).outerHTML!=="<:nav>";t.inlineBlockNeedsLayout=false;t.shrinkWrapBlocks=false;t.pixelPosition=false;t.deleteExpando=true;t.noCloneEvent=true;t.reliableMarginRight=true;t.boxSizingReliable=true;s.checked=true;t.noCloneChecked=s.cloneNode(true).checked;u.disabled=true;t.optDisabled=!f.disabled;try{delete p.test}catch(d){t.deleteExpando=false}s=o.createElement("input");s.setAttribute("value","");t.input=s.getAttribute("value")==="";s.value="t";s.setAttribute("type","radio");t.radioValue=s.value==="t";s.setAttribute("checked","t");s.setAttribute("name","t");a=o.createDocumentFragment();a.appendChild(s);t.appendChecked=s.checked;t.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;if(p.attachEvent){p.attachEvent("onclick",function(){t.noCloneEvent=false});p.cloneNode(true).click()}for(h in{submit:true,change:true,focusin:true}){p.setAttribute(l="on"+h,"t");t[h+"Bubbles"]=l in e||p.attributes[l].expando===false}p.style.backgroundClip="content-box";p.cloneNode(true).style.backgroundClip="";t.clearCloneStyle=p.style.backgroundClip==="content-box";for(h in w(t)){break}t.ownLast=h!=="0";w(function(){var n,r,s,u="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",a=o.getElementsByTagName("body")[0];if(!a){return}n=o.createElement("div");n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";a.appendChild(n).appendChild(p);p.innerHTML="
t
";s=p.getElementsByTagName("td");s[0].style.cssText="padding:0;margin:0;border:0;display:none";c=s[0].offsetHeight===0;s[0].style.display="";s[1].style.display="none";t.reliableHiddenOffsets=c&&s[0].offsetHeight===0;p.innerHTML="";p.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";w.swap(a,a.style.zoom!=null?{zoom:1}:{},function(){t.boxSizing=p.offsetWidth===4});if(e.getComputedStyle){t.pixelPosition=(e.getComputedStyle(p,null)||{}).top!=="1%";t.boxSizingReliable=(e.getComputedStyle(p,null)||{width:"4px"}).width==="4px";r=p.appendChild(o.createElement("div"));r.style.cssText=p.style.cssText=u;r.style.marginRight=r.style.width="0";p.style.width="1px";t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)}if(typeof p.style.zoom!==i){p.innerHTML="";p.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1";t.inlineBlockNeedsLayout=p.offsetWidth===3;p.style.display="block";p.innerHTML="
";p.firstChild.style.width="5px";t.shrinkWrapBlocks=p.offsetWidth!==3;if(t.inlineBlockNeedsLayout){a.style.zoom=1}}a.removeChild(n);n=p=s=r=null});n=u=a=f=r=s=null;return t}({});var F=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;w.extend({cache:{},noData:{applet:true,embed:true,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){e=e.nodeType?w.cache[e[w.expando]]:e[w.expando];return!!e&&!z(e)},data:function(e,t,n){return q(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return q(e,t,n,true)},_removeData:function(e,t){return R(e,t,true)},acceptData:function(e){if(e.nodeType&&e.nodeType!==1&&e.nodeType!==9){return false}var t=e.nodeName&&w.noData[e.nodeName.toLowerCase()];return!t||t!==true&&e.getAttribute("classid")===t}});w.fn.extend({data:function(e,n){var r,i,s=null,o=0,u=this[0];if(e===t){if(this.length){s=w.data(u);if(u.nodeType===1&&!w._data(u,"parsedAttrs")){r=u.attributes;for(;o1?this.each(function(){w.data(this,e,n)}):u?U(u,e,w.data(u,e)):null},removeData:function(e){return this.each(function(){w.removeData(this,e)})}});w.extend({queue:function(e,t,n){var r;if(e){t=(t||"fx")+"queue";r=w._data(e,t);if(n){if(!r||w.isArray(n)){r=w._data(e,t,w.makeArray(n))}else{r.push(n)}}return r||[]}},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),s=w._queueHooks(e,t),o=function(){w.dequeue(e,t)};if(i==="inprogress"){i=n.shift();r--}if(i){if(t==="fx"){n.unshift("inprogress")}delete s.stop;i.call(e,o,s)}if(!r&&s){s.empty.fire()}},_queueHooks:function(e,t){var n=t+"queueHooks";return w._data(e,n)||w._data(e,n,{empty:w.Callbacks("once memory").add(function(){w._removeData(e,t+"queue");w._removeData(e,n)})})}});w.fn.extend({queue:function(e,n){var r=2;if(typeof e!=="string"){n=e;e="fx";r--}if(arguments.length1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})},prop:function(e,t){return w.access(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){e=w.propFix[e]||e;return this.each(function(){try{this[e]=t;delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o=0,u=this.length,a=typeof e==="string"&&e;if(w.isFunction(e)){return this.each(function(t){w(this).addClass(e.call(this,t,this.className))})}if(a){t=(e||"").match(S)||[];for(;o=0){r=r.replace(" "+i+" "," ")}}n.className=e?w.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e;if(typeof t==="boolean"&&n==="string"){return t?this.addClass(e):this.removeClass(e)}if(w.isFunction(e)){return this.each(function(n){w(this).toggleClass(e.call(this,n,this.className,t),t)})}return this.each(function(){if(n==="string"){var t,r=0,s=w(this),o=e.match(S)||[];while(t=o[r++]){if(s.hasClass(t)){s.removeClass(t)}else{s.addClass(t)}}}else if(n===i||n==="boolean"){if(this.className){w._data(this,"__className__",this.className)}this.className=this.className||e===false?"":w._data(this,"__className__")||""}})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n=0){return true}}return false},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s){r=w.valHooks[s.type]||w.valHooks[s.nodeName.toLowerCase()];if(r&&"get"in r&&(n=r.get(s,"value"))!==t){return n}n=s.value;return typeof n==="string"?n.replace($,""):n==null?"":n}return}i=w.isFunction(e);return this.each(function(n){var s;if(this.nodeType!==1){return}if(i){s=e.call(this,n,w(this).val())}else{s=e}if(s==null){s=""}else if(typeof s==="number"){s+=""}else if(w.isArray(s)){s=w.map(s,function(e){return e==null?"":e+""})}r=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()];if(!r||!("set"in r)||r.set(this,s,"value")===t){this.value=s}})}});w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return t!=null?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a=0){n=true}}if(!n){e.selectedIndex=-1}return s}}},attr:function(e,n,r){var s,o,u=e.nodeType;if(!e||u===3||u===8||u===2){return}if(typeof e.getAttribute===i){return w.prop(e,n,r)}if(u!==1||!w.isXMLDoc(e)){n=n.toLowerCase();s=w.attrHooks[n]||(w.expr.match.bool.test(n)?X:W)}if(r!==t){if(r===null){w.removeAttr(e,n)}else if(s&&"set"in s&&(o=s.set(e,r,n))!==t){return o}else{e.setAttribute(n,r+"");return r}}else if(s&&"get"in s&&(o=s.get(e,n))!==null){return o}else{o=w.find.attr(e,n);return o==null?t:o}},removeAttr:function(e,t){var n,r,i=0,s=t&&t.match(S);if(s&&e.nodeType===1){while(n=s[i++]){r=w.propFix[n]||n;if(w.expr.match.bool.test(n)){if(Y&&G||!Q.test(n)){e[r]=false}else{e[w.camelCase("default-"+n)]=e[r]=false}}else{w.attr(e,n,"")}e.removeAttribute(G?n:r)}}},attrHooks:{type:{set:function(e,t){if(!w.support.radioValue&&t==="radio"&&w.nodeName(e,"input")){var n=e.value;e.setAttribute("type",t);if(n){e.value=n}return t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,s,o,u=e.nodeType;if(!e||u===3||u===8||u===2){return}o=u!==1||!w.isXMLDoc(e);if(o){n=w.propFix[n]||n;s=w.propHooks[n]}if(r!==t){return s&&"set"in s&&(i=s.set(e,r,n))!==t?i:e[n]=r}else{return s&&"get"in s&&(i=s.get(e,n))!==null?i:e[n]}},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):J.test(e.nodeName)||K.test(e.nodeName)&&e.href?0:-1}}}});X={set:function(e,t,n){if(t===false){w.removeAttr(e,n)}else if(Y&&G||!Q.test(n)){e.setAttribute(!G&&w.propFix[n]||n,n)}else{e[w.camelCase("default-"+n)]=e[n]=true}return n}};w.each(w.expr.match.bool.source.match(/\w+/g),function(e,n){var r=w.expr.attrHandle[n]||w.find.attr;w.expr.attrHandle[n]=Y&&G||!Q.test(n)?function(e,n,i){var s=w.expr.attrHandle[n],o=i?t:(w.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;w.expr.attrHandle[n]=s;return o}:function(e,n,r){return r?t:e[w.camelCase("default-"+n)]?n.toLowerCase():null}});if(!Y||!G){w.attrHooks.value={set:function(e,t,n){if(w.nodeName(e,"input")){e.defaultValue=t}else{return W&&W.set(e,t,n)}}}}if(!G){W={set:function(e,n,r){var i=e.getAttributeNode(r);if(!i){e.setAttributeNode(i=e.ownerDocument.createAttribute(r))}i.value=n+="";return r==="value"||n===e.getAttribute(r)?n:t}};w.expr.attrHandle.id=w.expr.attrHandle.name=w.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.value!==""?i.value:null};w.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:W.set};w.attrHooks.contenteditable={set:function(e,t,n){W.set(e,t===""?false:t,n)}};w.each(["width","height"],function(e,t){w.attrHooks[t]={set:function(e,n){if(n===""){e.setAttribute(t,"auto");return n}}}})}if(!w.support.hrefNormalized){w.each(["href","src"],function(e,t){w.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})}if(!w.support.style){w.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}}if(!w.support.optSelected){w.propHooks.selected={get:function(e){var t=e.parentNode;if(t){t.selectedIndex;if(t.parentNode){t.parentNode.selectedIndex}}return null}}}w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});if(!w.support.enctype){w.propFix.enctype="encoding"}w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(w.isArray(t)){return e.checked=w.inArray(w(e).val(),t)>=0}}};if(!w.support.checkOn){w.valHooks[this].get=function(e){return e.getAttribute("value")===null?"on":e.value}}});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;w.event={global:{},add:function(e,n,r,s,o){var u,a,f,l,c,h,p,d,v,m,g,y=w._data(e);if(!y){return}if(r.handler){l=r;r=l.handler;o=l.selector}if(!r.guid){r.guid=w.guid++}if(!(a=y.events)){a=y.events={}}if(!(h=y.handle)){h=y.handle=function(e){return typeof w!==i&&(!e||w.event.triggered!==e.type)?w.event.dispatch.apply(h.elem,arguments):t};h.elem=e}n=(n||"").match(S)||[""];f=n.length;while(f--){u=rt.exec(n[f])||[];v=g=u[1];m=(u[2]||"").split(".").sort();if(!v){continue}c=w.event.special[v]||{};v=(o?c.delegateType:c.bindType)||v;c=w.event.special[v]||{};p=w.extend({type:v,origType:g,data:s,handler:r,guid:r.guid,selector:o,needsContext:o&&w.expr.match.needsContext.test(o),namespace:m.join(".")},l);if(!(d=a[v])){d=a[v]=[];d.delegateCount=0;if(!c.setup||c.setup.call(e,s,m,h)===false){if(e.addEventListener){e.addEventListener(v,h,false)}else if(e.attachEvent){e.attachEvent("on"+v,h)}}}if(c.add){c.add.call(e,p);if(!p.handler.guid){p.handler.guid=r.guid}}if(o){d.splice(d.delegateCount++,0,p)}else{d.push(p)}w.event.global[v]=true}e=null},remove:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,p,d,v,m=w.hasData(e)&&w._data(e);if(!m||!(l=m.events)){return}t=(t||"").match(S)||[""];f=t.length;while(f--){u=rt.exec(t[f])||[];p=v=u[1];d=(u[2]||"").split(".").sort();if(!p){for(p in l){w.event.remove(e,p+t[f],n,r,true)}continue}c=w.event.special[p]||{};p=(r?c.delegateType:c.bindType)||p;h=l[p]||[];u=u[2]&&new RegExp("(^|\\.)"+d.join("\\.(?:.*\\.|)")+"(\\.|$)");a=s=h.length;while(s--){o=h[s];if((i||v===o.origType)&&(!n||n.guid===o.guid)&&(!u||u.test(o.namespace))&&(!r||r===o.selector||r==="**"&&o.selector)){h.splice(s,1);if(o.selector){h.delegateCount--}if(c.remove){c.remove.call(e,o)}}}if(a&&!h.length){if(!c.teardown||c.teardown.call(e,d,m.handle)===false){w.removeEvent(e,p,m.handle)}delete l[p]}}if(w.isEmptyObject(l)){delete m.handle;w._removeData(e,"events")}},trigger:function(n,r,i,s){var u,a,f,l,c,h,p,d=[i||o],v=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];f=h=i=i||o;if(i.nodeType===3||i.nodeType===8){return}if(nt.test(v+w.event.triggered)){return}if(v.indexOf(".")>=0){m=v.split(".");v=m.shift();m.sort()}a=v.indexOf(":")<0&&"on"+v;n=n[w.expando]?n:new w.Event(v,typeof n==="object"&&n);n.isTrigger=s?2:3;n.namespace=m.join(".");n.namespace_re=n.namespace?new RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null;n.result=t;if(!n.target){n.target=i}r=r==null?[n]:w.makeArray(r,[n]);c=w.event.special[v]||{};if(!s&&c.trigger&&c.trigger.apply(i,r)===false){return}if(!s&&!c.noBubble&&!w.isWindow(i)){l=c.delegateType||v;if(!nt.test(l+v)){f=f.parentNode}for(;f;f=f.parentNode){d.push(f);h=f}if(h===(i.ownerDocument||o)){d.push(h.defaultView||h.parentWindow||e)}}p=0;while((f=d[p++])&&!n.isPropagationStopped()){n.type=p>1?l:c.bindType||v;u=(w._data(f,"events")||{})[n.type]&&w._data(f,"handle");if(u){u.apply(f,r)}u=a&&f[a];if(u&&w.acceptData(f)&&u.apply&&u.apply(f,r)===false){n.preventDefault()}}n.type=v;if(!s&&!n.isDefaultPrevented()){if((!c._default||c._default.apply(d.pop(),r)===false)&&w.acceptData(i)){if(a&&i[v]&&!w.isWindow(i)){h=i[a];if(h){i[a]=null}w.event.triggered=v;try{i[v]()}catch(g){}w.event.triggered=t;if(h){i[a]=h}}}}return n.result},dispatch:function(e){e=w.event.fix(e);var n,r,i,s,o,u=[],a=v.call(arguments),f=(w._data(this,"events")||{})[e.type]||[],l=w.event.special[e.type]||{};a[0]=e;e.delegateTarget=this;if(l.preDispatch&&l.preDispatch.call(this,e)===false){return}u=w.event.handlers.call(this,e,f);n=0;while((s=u[n++])&&!e.isPropagationStopped()){e.currentTarget=s.elem;o=0;while((i=s.handlers[o++])&&!e.isImmediatePropagationStopped()){if(!e.namespace_re||e.namespace_re.test(i.namespace)){e.handleObj=i;e.data=i.data;r=((w.event.special[i.origType]||{}).handle||i.handler).apply(s.elem,a);if(r!==t){if((e.result=r)===false){e.preventDefault();e.stopPropagation()}}}}}if(l.postDispatch){l.postDispatch.call(this,e)}return e.result},handlers:function(e,n){var r,i,s,o,u=[],a=n.delegateCount,f=e.target;if(a&&f.nodeType&&(!e.button||e.type!=="click")){for(;f!=this;f=f.parentNode||this){if(f.nodeType===1&&(f.disabled!==true||e.type!=="click")){s=[];for(o=0;o=0:w.find(r,this,null,[f]).length}if(s[r]){s.push(i)}}if(s.length){u.push({elem:f,handlers:s})}}}}if(a1?w.unique(n):n);n.selector=this.selector?this.selector+" "+e:e;return n},has:function(e){var t,n=w(e,this),r=n.length;return this.filter(function(){for(t=0;t-1:n.nodeType===1&&w.find.matchesSelector(n,e))){n=s.push(n);break}}}return this.pushStack(s.length>1?w.unique(s):s)},index:function(e){if(!e){return this[0]&&this[0].parentNode?this.first().prevAll().length:-1}if(typeof e==="string"){return w.inArray(this[0],w(e))}return w.inArray(e.jquery?e[0]:e,this)},add:function(e,t){var n=typeof e==="string"?w(e,t):w.makeArray(e&&e.nodeType?[e]:e),r=w.merge(this.get(),n);return this.pushStack(w.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}});w.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return w.dir(e,"parentNode")},parentsUntil:function(e,t,n){return w.dir(e,"parentNode",n)},next:function(e){return ct(e,"nextSibling")},prev:function(e){return ct(e,"previousSibling")},nextAll:function(e){return w.dir(e,"nextSibling")},prevAll:function(e){return w.dir(e,"previousSibling")},nextUntil:function(e,t,n){return w.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return w.dir(e,"previousSibling",n)},siblings:function(e){return w.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return w.sibling(e.firstChild)},contents:function(e){return w.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:w.merge([],e.childNodes)}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);if(e.slice(-5)!=="Until"){r=n}if(r&&typeof r==="string"){i=w.filter(r,i)}if(this.length>1){if(!lt[e]){i=w.unique(i)}if(at.test(e)){i=i.reverse()}}return this.pushStack(i)}});w.extend({filter:function(e,t,n){var r=t[0];if(n){e=":not("+e+")"}return t.length===1&&r.nodeType===1?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return e.nodeType===1}))},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!w(s).is(r))){if(s.nodeType===1){i.push(s)}s=s[n]}return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling){if(e.nodeType===1&&e!==t){n.push(e)}}return n}});var dt="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|"+"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",vt=/ jQuery\d+="(?:null|\d+)"/g,mt=new RegExp("<(?:"+dt+")[\\s/>]","i"),gt=/^\s+/,yt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,wt=/\s*$/g,Lt={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:w.support.htmlSerialize?[0,"",""]:[1,"X
","
"]},At=pt(o),Ot=At.appendChild(o.createElement("div"));Lt.optgroup=Lt.option;Lt.tbody=Lt.tfoot=Lt.colgroup=Lt.caption=Lt.thead;Lt.th=Lt.td;w.fn.extend({text:function(e){return w.access(this,function(e){return e===t?w.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(this.nodeType===1||this.nodeType===11||this.nodeType===9){var t=Mt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(this.nodeType===1||this.nodeType===11||this.nodeType===9){var t=Mt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){if(this.parentNode){this.parentNode.insertBefore(e,this)}})},after:function(){return this.domManip(arguments,function(e){if(this.parentNode){this.parentNode.insertBefore(e,this.nextSibling)}})},remove:function(e,t){var n,r=e?w.filter(e,this):this,i=0;for(;(n=r[i])!=null;i++){if(!t&&n.nodeType===1){w.cleanData(jt(n))}if(n.parentNode){if(t&&w.contains(n.ownerDocument,n)){Pt(jt(n,"script"))}n.parentNode.removeChild(n)}}return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){if(e.nodeType===1){w.cleanData(jt(e,false))}while(e.firstChild){e.removeChild(e.firstChild)}if(e.options&&w.nodeName(e,"select")){e.options.length=0}}return this},clone:function(e,t){e=e==null?false:e;t=t==null?e:t;return this.map(function(){return w.clone(this,e,t)})},html:function(e){return w.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t){return n.nodeType===1?n.innerHTML.replace(vt,""):t}if(typeof e==="string"&&!St.test(e)&&(w.support.htmlSerialize||!mt.test(e))&&(w.support.leadingWhitespace||!gt.test(e))&&!Lt[(bt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(yt,"<$1>");try{for(;r")){s=e.cloneNode(true)}else{Ot.innerHTML=e.outerHTML;Ot.removeChild(s=Ot.firstChild)}if((!w.support.noCloneEvent||!w.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!w.isXMLDoc(e)){r=jt(s);u=jt(e);for(o=0;(i=u[o])!=null;++o){if(r[o]){Bt(i,r[o])}}}if(t){if(n){u=u||jt(e);r=r||jt(s);for(o=0;(i=u[o])!=null;o++){Ht(i,r[o])}}else{Ht(e,s)}}r=jt(s,"script");if(r.length>0){Pt(r,!a&&jt(e,"script"))}r=u=i=null;return s},buildFragment:function(e,t,n,r){var i,s,o,u,a,f,l,c=e.length,h=pt(t),p=[],d=0;for(;d")+l[2];i=l[0];while(i--){u=u.lastChild}if(!w.support.leadingWhitespace&>.test(s)){p.push(t.createTextNode(gt.exec(s)[0]))}if(!w.support.tbody){s=a==="table"&&!wt.test(s)?u.firstChild:l[1]===""&&!wt.test(s)?u:0;i=s&&s.childNodes.length;while(i--){if(w.nodeName(f=s.childNodes[i],"tbody")&&!f.childNodes.length){s.removeChild(f)}}}w.merge(p,u.childNodes);u.textContent="";while(u.firstChild){u.removeChild(u.firstChild)}u=h.lastChild}}}if(u){h.removeChild(u)}if(!w.support.appendChecked){w.grep(jt(p,"input"),Ft)}d=0;while(s=p[d++]){if(r&&w.inArray(s,r)!==-1){continue}o=w.contains(s.ownerDocument,s);u=jt(h.appendChild(s),"script");if(o){Pt(u)}if(n){i=0;while(s=u[i++]){if(Nt.test(s.type||"")){n.push(s)}}}}u=null;return h},cleanData:function(e,t){var n,r,s,o,u=0,a=w.expando,f=w.cache,l=w.support.deleteExpando,h=w.event.special;for(;(n=e[u])!=null;u++){if(t||w.acceptData(n)){s=n[a];o=s&&f[s];if(o){if(o.events){for(r in o.events){if(h[r]){w.event.remove(n,r)}else{w.removeEvent(n,r,o.handle)}}}if(f[s]){delete f[s];if(l){delete n[a]}else if(typeof n.removeAttribute!==i){n.removeAttribute(a)}else{n[a]=null}c.push(s)}}}}},_evalUrl:function(e){return w.ajax({url:e,type:"GET",dataType:"script",async:false,global:false,"throws":true})}});w.fn.extend({wrapAll:function(e){if(w.isFunction(e)){return this.each(function(t){w(this).wrapAll(e.call(this,t))})}if(this[0]){var t=w(e,this[0].ownerDocument).eq(0).clone(true);if(this[0].parentNode){t.insertBefore(this[0])}t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1){e=e.firstChild}return e}).append(this)}return this},wrapInner:function(e){if(w.isFunction(e)){return this.each(function(t){w(this).wrapInner(e.call(this,t))})}return this.each(function(){var t=w(this),n=t.contents();if(n.length){n.wrapAll(e)}else{t.append(e)}})},wrap:function(e){var t=w.isFunction(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){if(!w.nodeName(this,"body")){w(this).replaceWith(this.childNodes)}}).end()}});var It,qt,Rt,Ut=/alpha\([^)]*\)/i,zt=/opacity\s*=\s*([^)]*)/,Wt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Vt=/^margin/,$t=new RegExp("^("+E+")(.*)$","i"),Jt=new RegExp("^("+E+")(?!px)[a-z%]+$","i"),Kt=new RegExp("^([+-])=("+E+")","i"),Qt={BODY:"block"},Gt={position:"absolute",visibility:"hidden",display:"block"},Yt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];w.fn.extend({css:function(e,n){return w.access(this,function(e,n,r){var i,s,o={},u=0;if(w.isArray(n)){s=qt(e);i=n.length;for(;u1)},show:function(){return rn(this,true)},hide:function(){return rn(this)},toggle:function(e){if(typeof e==="boolean"){return e?this.show():this.hide()}return this.each(function(){if(nn(this)){w(this).show()}else{w(this).hide()}})}});w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Rt(e,"opacity");return n===""?"1":n}}}},cssNumber:{columnCount:true,fillOpacity:true,fontWeight:true,lineHeight:true,opacity:true,order:true,orphans:true,widows:true,zIndex:true,zoom:true},cssProps:{"float":w.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style){return}var s,o,u,a=w.camelCase(n),f=e.style;n=w.cssProps[a]||(w.cssProps[a]=tn(f,a));u=w.cssHooks[n]||w.cssHooks[a];if(r!==t){o=typeof r;if(o==="string"&&(s=Kt.exec(r))){r=(s[1]+1)*s[2]+parseFloat(w.css(e,n));o="number"}if(r==null||o==="number"&&isNaN(r)){return}if(o==="number"&&!w.cssNumber[a]){r+="px"}if(!w.support.clearCloneStyle&&r===""&&n.indexOf("background")===0){f[n]="inherit"}if(!u||!("set"in u)||(r=u.set(e,r,i))!==t){try{f[n]=r}catch(l){}}}else{if(u&&"get"in u&&(s=u.get(e,false,i))!==t){return s}return f[n]}},css:function(e,n,r,i){var s,o,u,a=w.camelCase(n);n=w.cssProps[a]||(w.cssProps[a]=tn(e.style,a));u=w.cssHooks[n]||w.cssHooks[a];if(u&&"get"in u){o=u.get(e,true,r)}if(o===t){o=Rt(e,n,i)}if(o==="normal"&&n in Yt){o=Yt[n]}if(r===""||r){s=parseFloat(o);return r===true||w.isNumeric(s)?s||0:o}return o}});if(e.getComputedStyle){qt=function(t){return e.getComputedStyle(t,null)};Rt=function(e,n,r){var i,s,o,u=r||qt(e),a=u?u.getPropertyValue(n)||u[n]:t,f=e.style;if(u){if(a===""&&!w.contains(e.ownerDocument,e)){a=w.style(e,n)}if(Jt.test(a)&&Vt.test(n)){i=f.width;s=f.minWidth;o=f.maxWidth;f.minWidth=f.maxWidth=f.width=a;a=u.width;f.width=i;f.minWidth=s;f.maxWidth=o}}return a}}else if(o.documentElement.currentStyle){qt=function(e){return e.currentStyle};Rt=function(e,n,r){var i,s,o,u=r||qt(e),a=u?u[n]:t,f=e.style;if(a==null&&f&&f[n]){a=f[n]}if(Jt.test(a)&&!Wt.test(n)){i=f.left;s=e.runtimeStyle;o=s&&s.left;if(o){s.left=e.currentStyle.left}f.left=n==="fontSize"?"1em":a;a=f.pixelLeft+"px";f.left=i;if(o){s.left=o}}return a===""?"auto":a}}w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n){return e.offsetWidth===0&&Xt.test(w.css(e,"display"))?w.swap(e,Gt,function(){return un(e,t,r)}):un(e,t,r)}},set:function(e,n,r){var i=r&&qt(e);return sn(e,n,r?on(e,t,r,w.support.boxSizing&&w.css(e,"boxSizing",false,i)==="border-box",i):0)}}});if(!w.support.opacity){w.cssHooks.opacity={get:function(e,t){return zt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=w.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if((t>=1||t==="")&&w.trim(s.replace(Ut,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(t===""||r&&!r.filter){return}}n.filter=Ut.test(s)?s.replace(Ut,i):s+" "+i}}}w(function(){if(!w.support.reliableMarginRight){w.cssHooks.marginRight={get:function(e,t){if(t){return w.swap(e,{display:"inline-block"},Rt,[e,"marginRight"])}}}}if(!w.support.pixelPosition&&w.fn.position){w.each(["top","left"],function(e,t){w.cssHooks[t]={get:function(e,n){if(n){n=Rt(e,t);return Jt.test(n)?w(e).position()[t]+"px":n}}}})}});if(w.expr&&w.expr.filters){w.expr.filters.hidden=function(e){return e.offsetWidth<=0&&e.offsetHeight<=0||!w.support.reliableHiddenOffsets&&(e.style&&e.style.display||w.css(e,"display"))==="none"};w.expr.filters.visible=function(e){return!w.expr.filters.hidden(e)}}w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){var r=0,i={},s=typeof n==="string"?n.split(" "):[n];for(;r<4;r++){i[e+Zt[r]+t]=s[r]||s[r-2]||s[0]}return i}};if(!Vt.test(e)){w.cssHooks[e+t].set=sn}});var ln=/%20/g,cn=/\[\]$/,hn=/\r?\n/g,pn=/^(?:submit|button|image|reset|file)$/i,dn=/^(?:input|select|textarea|keygen)/i;w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&dn.test(this.nodeName)&&!pn.test(e)&&(this.checked||!xt.test(e))}).map(function(e,t){var n=w(this).val();return n==null?null:w.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(hn,"\r\n")}}):{name:t.name,value:n.replace(hn,"\r\n")}}).get()}});w.param=function(e,n){var r,i=[],s=function(e,t){t=w.isFunction(t)?t():t==null?"":t;i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t){n=w.ajaxSettings&&w.ajaxSettings.traditional}if(w.isArray(e)||e.jquery&&!w.isPlainObject(e)){w.each(e,function(){s(this.name,this.value)})}else{for(r in e){vn(r,e[r],n,s)}}return i.join("&").replace(ln,"+")};w.each(("blur focus focusin focusout load resize scroll unload click dblclick "+"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave "+"change select submit keydown keypress keyup error contextmenu").split(" "),function(e,t){w.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}});w.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return arguments.length===1?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,gn,yn=w.now(),bn=/\?/,wn=/#.*$/,En=/([?&])_=[^&]*/,Sn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,xn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Tn=/^(?:GET|HEAD)$/,Nn=/^\/\//,Cn=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,kn=w.fn.load,Ln={},An={},On="*/".concat("*");try{gn=s.href}catch(Mn){gn=o.createElement("a");gn.href="";gn=gn.href}mn=Cn.exec(gn.toLowerCase())||[];w.fn.load=function(e,n,r){if(typeof e!=="string"&&kn){return kn.apply(this,arguments)}var i,s,o,u=this,a=e.indexOf(" ");if(a>=0){i=e.slice(a,e.length);e=e.slice(0,a)}if(w.isFunction(n)){r=n;n=t}else if(n&&typeof n==="object"){o="POST"}if(u.length>0){w.ajax({url:e,type:o,dataType:"html",data:n}).done(function(e){s=arguments;u.html(i?w("
").append(w.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){u.each(r,s||[e.responseText,t,e])})}return this};w.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){w.fn[t]=function(e){return this.on(t,e)}});w.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:gn,type:"GET",isLocal:xn.test(mn[1]),global:true,processData:true,async:true,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":On,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":true,"text json":w.parseJSON,"text xml":w.parseXML},flatOptions:{url:true,context:true}},ajaxSetup:function(e,t){return t?Pn(Pn(e,w.ajaxSettings),t):Pn(w.ajaxSettings,e)},ajaxPrefilter:_n(Ln),ajaxTransport:_n(An),ajax:function(e,n){function N(e,n,r,i){var l,g,y,E,S,T=n;if(b===2){return}b=2;if(u){clearTimeout(u)}f=t;o=i||"";x.readyState=e>0?4:0;l=e>=200&&e<300||e===304;if(r){E=Hn(c,x,r)}E=Bn(c,E,x,l);if(l){if(c.ifModified){S=x.getResponseHeader("Last-Modified");if(S){w.lastModified[s]=S}S=x.getResponseHeader("etag");if(S){w.etag[s]=S}}if(e===204||c.type==="HEAD"){T="nocontent"}else if(e===304){T="notmodified"}else{T=E.state;g=E.data;y=E.error;l=!y}}else{y=T;if(e||!T){T="error";if(e<0){e=0}}}x.status=e;x.statusText=(n||T)+"";if(l){d.resolveWith(h,[g,T,x])}else{d.rejectWith(h,[x,T,y])}x.statusCode(m);m=t;if(a){p.trigger(l?"ajaxSuccess":"ajaxError",[x,c,l?g:y])}v.fireWith(h,[x,T]);if(a){p.trigger("ajaxComplete",[x,c]);if(!--w.active){w.event.trigger("ajaxStop")}}}if(typeof e==="object"){n=e;e=t}n=n||{};var r,i,s,o,u,a,f,l,c=w.ajaxSetup({},n),h=c.context||c,p=c.context&&(h.nodeType||h.jquery)?w(h):w.event,d=w.Deferred(),v=w.Callbacks("once memory"),m=c.statusCode||{},g={},y={},b=0,E="canceled",x={readyState:0,getResponseHeader:function(e){var t;if(b===2){if(!l){l={};while(t=Sn.exec(o)){l[t[1].toLowerCase()]=t[2]}}t=l[e.toLowerCase()]}return t==null?null:t},getAllResponseHeaders:function(){return b===2?o:null},setRequestHeader:function(e,t){var n=e.toLowerCase();if(!b){e=y[n]=y[n]||e;g[e]=t}return this},overrideMimeType:function(e){if(!b){c.mimeType=e}return this},statusCode:function(e){var t;if(e){if(b<2){for(t in e){m[t]=[m[t],e[t]]}}else{x.always(e[x.status])}}return this},abort:function(e){var t=e||E;if(f){f.abort(t)}N(0,t);return this}};d.promise(x).complete=v.add;x.success=x.done;x.error=x.fail;c.url=((e||c.url||gn)+"").replace(wn,"").replace(Nn,mn[1]+"//");c.type=n.method||n.type||c.method||c.type;c.dataTypes=w.trim(c.dataType||"*").toLowerCase().match(S)||[""];if(c.crossDomain==null){r=Cn.exec(c.url.toLowerCase());c.crossDomain=!!(r&&(r[1]!==mn[1]||r[2]!==mn[2]||(r[3]||(r[1]==="http:"?"80":"443"))!==(mn[3]||(mn[1]==="http:"?"80":"443"))))}if(c.data&&c.processData&&typeof c.data!=="string"){c.data=w.param(c.data,c.traditional)}Dn(Ln,c,n,x);if(b===2){return x}a=c.global;if(a&&w.active++===0){w.event.trigger("ajaxStart")}c.type=c.type.toUpperCase();c.hasContent=!Tn.test(c.type);s=c.url;if(!c.hasContent){if(c.data){s=c.url+=(bn.test(s)?"&":"?")+c.data;delete c.data}if(c.cache===false){c.url=En.test(s)?s.replace(En,"$1_="+yn++):s+(bn.test(s)?"&":"?")+"_="+yn++}}if(c.ifModified){if(w.lastModified[s]){x.setRequestHeader("If-Modified-Since",w.lastModified[s])}if(w.etag[s]){x.setRequestHeader("If-None-Match",w.etag[s])}}if(c.data&&c.hasContent&&c.contentType!==false||n.contentType){x.setRequestHeader("Content-Type",c.contentType)}x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+On+"; q=0.01":""):c.accepts["*"]);for(i in c.headers){x.setRequestHeader(i,c.headers[i])}if(c.beforeSend&&(c.beforeSend.call(h,x,c)===false||b===2)){return x.abort()}E="abort";for(i in{success:1,error:1,complete:1}){x[i](c[i])}f=Dn(An,c,n,x);if(!f){N(-1,"No Transport")}else{x.readyState=1;if(a){p.trigger("ajaxSend",[x,c])}if(c.async&&c.timeout>0){u=setTimeout(function(){x.abort("timeout")},c.timeout)}try{b=1;f.send(g,N)}catch(T){if(b<2){N(-1,T)}else{throw T}}}return x},getJSON:function(e,t,n){return w.get(e,t,n,"json")},getScript:function(e,n){return w.get(e,t,n,"script")}});w.each(["get","post"],function(e,n){w[n]=function(e,r,i,s){if(w.isFunction(r)){s=s||i;i=r;r=t}return w.ajax({url:e,type:n,dataType:s,data:r,success:i})}});w.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){w.globalEval(e);return e}}});w.ajaxPrefilter("script",function(e){if(e.cache===t){e.cache=false}if(e.crossDomain){e.type="GET";e.global=false}});w.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||w("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script");n.async=true;if(e.scriptCharset){n.charset=e.scriptCharset}n.src=e.url;n.onload=n.onreadystatechange=function(e,t){if(t||!n.readyState||/loaded|complete/.test(n.readyState)){n.onload=n.onreadystatechange=null;if(n.parentNode){n.parentNode.removeChild(n)}n=null;if(!t){i(200,"success")}}};r.insertBefore(n,r.firstChild)},abort:function(){if(n){n.onload(t,true)}}}}});var jn=[],Fn=/(=)\?(?=&|$)|\?\?/;w.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=jn.pop()||w.expando+"_"+yn++;this[e]=true;return e}});w.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.jsonp!==false&&(Fn.test(n.url)?"url":typeof n.data==="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Fn.test(n.data)&&"data");if(a||n.dataTypes[0]==="jsonp"){s=n.jsonpCallback=w.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback;if(a){n[a]=n[a].replace(Fn,"$1"+s)}else if(n.jsonp!==false){n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+s}n.converters["script json"]=function(){if(!u){w.error(s+" was not called")}return u[0]};n.dataTypes[0]="json";o=e[s];e[s]=function(){u=arguments};i.always(function(){e[s]=o;if(n[s]){n.jsonpCallback=r.jsonpCallback;jn.push(s)}if(u&&w.isFunction(o)){o(u[0])}u=o=t});return"script"}});var In,qn,Rn=0,Un=e.ActiveXObject&&function(){var e;for(e in In){In[e](t,true)}};w.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&zn()||Wn()}:zn;qn=w.ajaxSettings.xhr();w.support.cors=!!qn&&"withCredentials"in qn;qn=w.support.ajax=!!qn;if(qn){w.ajaxTransport(function(n){if(!n.crossDomain||w.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();if(n.username){a.open(n.type,n.url,n.async,n.username,n.password)}else{a.open(n.type,n.url,n.async)}if(n.xhrFields){for(u in n.xhrFields){a[u]=n.xhrFields[u]}}if(n.mimeType&&a.overrideMimeType){a.overrideMimeType(n.mimeType)}if(!n.crossDomain&&!i["X-Requested-With"]){i["X-Requested-With"]="XMLHttpRequest"}try{for(u in i){a.setRequestHeader(u,i[u])}}catch(f){}a.send(n.hasContent&&n.data||null);r=function(e,i){var u,f,l,c;try{if(r&&(i||a.readyState===4)){r=t;if(o){a.onreadystatechange=w.noop;if(Un){delete In[o]}}if(i){if(a.readyState!==4){a.abort()}}else{c={};u=a.status;f=a.getAllResponseHeaders();if(typeof a.responseText==="string"){c.text=a.responseText}try{l=a.statusText}catch(h){l=""}if(!u&&n.isLocal&&!n.crossDomain){u=c.text?200:404}else if(u===1223){u=204}}}}catch(p){if(!i){s(-1,p)}}if(c){s(u,l,c,f)}};if(!n.async){r()}else if(a.readyState===4){setTimeout(r)}else{o=++Rn;if(Un){if(!In){In={};w(e).unload(Un)}In[o]=r}a.onreadystatechange=r}},abort:function(){if(r){r(t,true)}}}}})}var Xn,Vn,$n=/^(?:toggle|show|hide)$/,Jn=new RegExp("^(?:([+-])=|)("+E+")([a-z%]*)$","i"),Kn=/queueHooks$/,Qn=[nr],Gn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Jn.exec(t),s=i&&i[3]||(w.cssNumber[e]?"":"px"),o=(w.cssNumber[e]||s!=="px"&&+r)&&Jn.exec(w.css(n.elem,e)),u=1,a=20;if(o&&o[3]!==s){s=s||o[3];i=i||[];o=+r||1;do{u=u||".5";o=o/u;w.style(n.elem,e,o+s)}while(u!==(u=n.cur()/r)&&u!==1&&--a)}if(i){o=n.start=+o||+r||0;n.unit=s;n.end=i[1]?o+(i[1]+1)*i[2]:+i[2]}return n}]};w.Animation=w.extend(er,{tweener:function(e,t){if(w.isFunction(e)){t=e;e=["*"]}else{e=e.split(" ")}var n,r=0,i=e.length;for(;r-1,f={},l={},c,h;if(a){l=i.position();c=l.top;h=l.left}else{c=parseFloat(o)||0;h=parseFloat(u)||0}if(w.isFunction(t)){t=t.call(e,n,s)}if(t.top!=null){f.top=t.top-s.top+c}if(t.left!=null){f.left=t.left-s.left+h}if("using"in t){t.using.call(e,f)}else{i.css(f)}}};w.fn.extend({position:function(){if(!this[0]){return}var e,t,n={top:0,left:0},r=this[0];if(w.css(r,"position")==="fixed"){t=r.getBoundingClientRect()}else{e=this.offsetParent();t=this.offset();if(!w.nodeName(e[0],"html")){n=e.offset()}n.top+=w.css(e[0],"borderTopWidth",true);n.left+=w.css(e[0],"borderLeftWidth",true)}return{top:t.top-n.top-w.css(r,"marginTop",true),left:t.left-n.left-w.css(r,"marginLeft",true)}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||u;while(e&&!w.nodeName(e,"html")&&w.css(e,"position")==="static"){e=e.offsetParent}return e||u})}});w.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);w.fn[e]=function(i){return w.access(this,function(e,i,s){var o=sr(e);if(s===t){return o?n in o?o[n]:o.document.documentElement[i]:e[i]}if(o){o.scrollTo(!r?s:w(o).scrollLeft(),r?s:w(o).scrollTop())}else{e[i]=s}},e,i,arguments.length,null)}});w.each({Height:"height",Width:"width"},function(e,n){w.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){w.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!=="boolean"),u=r||(i===true||s===true?"margin":"border");return w.access(this,function(n,r,i){var s;if(w.isWindow(n)){return n.document.documentElement["client"+e]}if(n.nodeType===9){s=n.documentElement;return Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])}return i===t?w.css(n,r,u):w.style(n,r,i,u)},n,o?i:t,o,null)}})});w.fn.size=function(){return this.length};w.fn.andSelf=w.fn.addBack;if(typeof module==="object"&&module&&typeof module.exports==="object"){module.exports=w}else{e.jQuery=e.$=w;if(typeof define==="function"&&define.amd){define("jquery",[],function(){return w})}}})(window);(function(e,t,n){"use strict";function O(e,t){if(t&&t.onError){if(t.onError(e)===false){return}}this.name="JsRender Error";this.message=e||"JsRender error"}function M(e,t){var n;e=e||{};for(n in t){e[n]=t[n]}return e}function _(e,t,n){if(!it.rTag||e){a=e?e.charAt(0):a;f=e?e.charAt(1):f;l=t?t.charAt(0):l;c=t?t.charAt(1):c;h=n||h;e="\\"+a+"(\\"+h+")?\\"+f;t="\\"+l+"\\"+c;o="(?:(?:(\\w+(?=[\\/\\s\\"+l+"]))|(?:(\\w+)?(:)|(>)|!--((?:[^-]|-(?!-))*)--|(\\*)))"+"\\s*((?:[^\\"+l+"]|\\"+l+"(?!\\"+c+"))*?)";it.rTag=o+")";o=new RegExp(e+o+"(\\/)?|(?:\\/(\\w+)))"+t,"g");u=new RegExp("<.*>|([^\\\\]|^)[{}]|"+e+".*"+t)}return[a,f,l,c,h]}function D(e,t){if(!t){t=e;e=n}var r,i,s,o,u=this,a=!t||t==="root";if(e){o=u.type===t?u:n;if(!o){r=u.views;if(u._.useKey){for(i in r){if(o=r[i].get(e,t)){break}}}else for(i=0,s=r.length;!o&&i0){try{h=n.nodeType>0?n:!u.test(n)&&t&&t(e.document).find(n)[0]}catch(i){}if(h){n=h.getAttribute(C);r=r||n;n=et[n];if(!n){r=r||"_"+x++;h.setAttribute(C,r);n=et[r]=z(r,h.innerHTML,s,o,a,f)}}return n}}var c,h;i=i||"";c=l(i);f=f||(i.markup?i:{});f.tmplName=r;if(s){f._parentTmpl=s}if(!c&&i.markup&&(c=l(i.markup))){if(c.fn&&(c.debug!==i.debug||c.allowCode!==i.allowCode)){c=c.markup}}if(c!==n){if(r&&!s){k[r]=function(){return i.render.apply(i,arguments)}}if(c.fn||i.fn){if(c.fn){if(r&&r!==c.tmplName){i=Y(f,c)}else{i=c}}}else{i=W(c,f);K(c.replace(g,"\\$&"),i)}R(f);return i}}function W(e,t){var n,r=st.wrapMap||{},s=M({markup:e,tmpls:[],links:{},tags:{},bnds:[],_is:"template",render:V},t);if(!t.htmlTag){n=w.exec(e);s.htmlTag=n?n[1].toLowerCase():""}n=r[s.htmlTag];if(n&&n!==r.div){s.markup=i.trim(s.markup)}return s}function X(e,t){function r(s,o,u){var a,f,l,c;if(s&&""+s!==s&&!s.nodeType&&!s.markup){for(l in s){r(l,s[l],o)}return A}if(o===n){o=s;s=n}if(s&&""+s!==s){u=o;o=s;s=n}c=u?u[i]=u[i]||{}:r;f=t.compile;if(a=it.onBeforeStoreItem){f=a(c,s,o,f)||f}if(!s){o=f(n,o)}else if(o===null){delete c[s]}else{c[s]=f?o=f(s,o,u,e,t):o}if(f&&o){o._is=e}if(a=it.onStoreItem){a(c,s,o,f)}return o}var i=e+"s";A[i]=r;L[e]=t}function V(e,t,r,s,o,u){var a,f,l,c,h,p,d,v,m,g,y,b,w,E=this,S=!E.attr||E.attr==="html",x="";if(s===true){d=true;s=0}if(E.tag){v=E;E=E.tag;g=E._;b=E.tagName;w=v.tmpl;t=Y(t,E.ctx);m=v.content;if(v.props.link===false){t=t||{};t.link=false}r=r||v.view;e=e===n?r:e}else{w=E.jquery&&(E[0]||$('Unknown template: "'+E.selector+'"'))||E}if(w){if(!r&&e&&e._is==="view"){r=e}if(r){m=m||r.content;u=u||r._.onRender;if(e===r){e=r.data;o=true}t=Y(t,r.ctx)}if(!r||r.data===n){(t=t||{}).root=e}if(!w.fn){w=et[w]||et(w)}if(w){u=(t&&t.link)!==false&&S&&u;y=u;if(u===true){y=n;u=r._.onRender}t=w.helpers?Y(w.helpers,t):t;if(i.isArray(e)&&!o){c=d?r:s!==n&&r||q(t,"array",r,e,w,s,m,u);for(a=0,f=e.length;a":u+o}if(_){L="prm"+i;_="try{var "+L+"=["+a+"][0];}catch(e){"+L+'="";}\n';a=L}}else{if(S){w=W(x,D);w.tmplName=b+"/"+o;Q(S,w);y.push(w)}if(!C){E=o;N=M;M=""}T=e[i+1];T=T&&T[0]==="else"}f+=",args:["+a+"]}";if(k&&g||u&&o!==">"){A=new Function("data,view,j,u"," // "+b+" "+O+" "+o+"\n"+_+"return {"+f+";");A.paths=g;A._ctxs=o;if(r){return A}d=1}M+=k?"\n"+(g?"":_)+(r?"return ":"ret+=")+(d?(d=0,p=true,'c("'+u+'",view,'+(g?(m[O-1]=A,O):"{"+f)+");"):o===">"?(c=true,"h("+a+");"):(h=true,"(v="+a+")!="+(r?"=":"")+'u?v:"";')):(l=true,"{view:view,tmpl:"+(S?y.length:"0")+","+f+",");if(E&&!T){M="["+M.slice(0,-1)+"]";if(r||g){M=new Function("data,view,j,u"," // "+b+" "+O+" "+E+"\nreturn "+M+";");if(g){(m[O-1]=M).paths=g}M._ctxs=o;if(r){return M}}M=N+'\nret+=t("'+E+'",view,this,'+(O||M)+");";g=0;E=0}}}}M="// "+b+"\nvar j=j||"+(t?"jQuery.":"js")+"views"+(h?",v":"")+(l?",t=j._tag":"")+(p?",c=j._cnvt":"")+(c?",h=j.converters.html":"")+(r?";\n":',ret="";\n')+(st.tryCatch?"try{\n":"")+(D.debug?"debugger;":"")+M+(r?"\n":"\nreturn ret;\n")+(st.tryCatch?"\n}catch(e){return j._err(e);}":"");try{M=new Function("data,view,j,u",M)}catch(H){J("Compiled template code:\n\n"+M,H)}if(n){n.fn=M}return M}function G(e,t,n){function r(r,d,b,w,E,S,x,T,N,C,k,L,A,O,M,_,D,P,H,B){function F(e,n,r,u,a,f,l,c){if(r){if(t){if(i==="linkTo"){s=t._jsvto=t._jsvto||[];s.push(E)}if(!i||o){t.push(E.slice(n.length))}}if(r!=="."){var h=(u?'view.hlp("'+u+'")':a?"view":"data")+(c?(f?"."+f:u?"":a?"":"."+r)+(l||""):(c=u?"":a?f||"":r,""));h=h+(c?"."+c:"");return n+(h.slice(0,9)==="view.data"?h.slice(5):h)}}return e}var j;S=S||"";b=b||d||L;E=E||N;C=C||D||"";if(x){J(e)}else{if(t&&_&&!y&&!g){if(!i||o||s){j=v[m];if(B.length-1>H-j){j=B.slice(j,H+1);_=f+":"+j+l;_=u[_]=u[_]||K(a+_+c,n,true);if(!_.paths){G(j,_.paths=[],n)}(s||t).push({_jsvOb:_})}}}return y?(y=!A,y?r:'"'):g?(g=!O,g?r:'"'):(b?(m++,v[m]=H++,b):"")+(P?m?"":i?(i=o=s=false,"\b"):",":T?(m&&J(e),i=E,o=w,"\b"+E+":"):E?E.split("^").join(".").replace(p,F)+(C?(h[++m]=true,E.charAt(0)!=="."&&(v[m]=H),C):S):S?S:M?(h[m--]=false,M)+(C?(h[++m]=true,C):""):k?(h[m]||J(e),","):d?"":(y=A,g=O,'"'))}}var i,s,o,u=n.links,h={},v={0:-1},m=0,g=false,y=false;return(e+" ").replace(/\)\^/g,").").replace(d,r)}function Y(e,t){return e&&e!==t?t?M(M({},t),e):e:t&&M({},t)}function Z(e){return N[e]||(N[e]="&#"+e.charCodeAt(0)+";")}function ut(e){var t=this,r=t.tagCtx,s=!arguments.length,o="",u=s||0;if(!t.rendering.done){if(s){o=n}else if(e!==n){e=t.prep?t.prep(e):e;o+=r.render(e);u+=i.isArray(e)?e.length:1}if(t.rendering.done=u){t.selected=r.index}}return o}if(t&&t.views||e.jsviews){return}var r="v1.0.0-beta",i,s,o,u,a="{",f="{",l="}",c="}",h="^",p=/^(!*?)(?:null|true|false|\d[\d.]*|([\w$]+|\.|~([\w$]+)|#(view|([\w$]+))?)([\w$.^]*?)(?:[.[^]([\w$]+)\]?)?)$/g,d=/(\()(?=\s*\()|(?:([([])\s*)?(?:(\^?)(!*?[#~]?[\w$.^]+)?\s*((\+\+|--)|\+|-|&&|\|\||===|!==|==|!=|<=|>=|[<>%*:?\/]|(=))\s*|(!*?[#~]?[\w$.^]+)([([])?)|(,\s*)|(\(?)\\?(?:(')|("))|(?:\s*(([)\]])(?=\s*\.|\s*\^|\s*$)|[)\]])([([]?))|(\s+)/g,v=/[ \t]*(\r\n|\n|\r)/g,m=/\\(['"])/g,g=/['"\\]/g,y=/\x08(~)?([^\x08]+)\x08/g,b=/^if\s/,w=/<(\w+)[>\s]/,E=/[\x00`><"'&]/g,S=E,x=0,T=0,N={"&":"&","<":"<",">":">","\0":"�","'":"'",'"':""","`":"`"},C="data-jsv-tmpl",k={},L={template:{compile:z},tag:{compile:U},helper:{},converter:{}},A={jsviews:r,render:k,settings:{delimiters:_,debugMode:true,tryCatch:true},sub:{View:q,Error:O,tmplFn:K,parse:G,extend:M,error:$,syntaxError:J},_cnvt:j,_tag:I,_err:function(e){return st.debugMode?"Error: "+(e.message||e)+". ":""}};(O.prototype=new Error).constructor=O;P.depends=function(){return[this.get("item"),"index"]};H.depends=function(){return["index"]};for(s in L){X(s,L[s])}var et=A.templates,tt=A.converters,nt=A.helpers,rt=A.tags,it=A.sub,st=A.settings,ot="Error: #index in nested view: use #getIndex()";if(t){i=t;i.fn.render=V}else{i=e.jsviews={};i.isArray=Array&&Array.isArray||function(e){return Object.prototype.toString.call(e)==="[object Array]"}}i.render=k;i.views=A;i.templates=et=A.templates;rt({"else":function(){},"if":{render:function(e){var t=this,n=t.rendering.done||!e&&(arguments.length||!t.tagCtx.index)?"":(t.rendering.done=true,t.selected=t.tagCtx.index,t.tagCtx.render());return n},onUpdate:function(e,t,n){var r,i,s;for(r=0;(i=this.tagCtxs[r])&&i.args.length;r++){i=i.args[0];s=!i!==!n[r].args[0];if(!!i||s){return s}}return false},flow:true},"for":{render:ut,onArrayChange:function(e,t){var n,r=this,i=t.change;if(this.tagCtxs[1]&&(i==="insert"&&e.target.length===t.items.length||i==="remove"&&!e.target.length||i==="refresh"&&!t.oldItems.length!==!e.target.length)){this.refresh()}else{for(n in r._.arrVws){n=r._.arrVws[n];if(n.data===e.target){n._.onArrayChange.apply(n,arguments)}}}e.done=true},flow:true},props:{prep:function(e){var t,n=[];for(t in e){n.push({key:t,prop:e[t]})}return n},render:ut,flow:true},include:{flow:true},"*":{render:function(e){return e},flow:true}});tt({html:function(e){return e!=n?String(e).replace(S,Z):""},attr:function(e){return e!=n?String(e).replace(E,Z):e===null?e:""},url:function(e){return e!=n?encodeURI(String(e)):e===null?e:""}});_()})(this,this.jQuery);jQuery.fn.extend({everyTime:function(e,t,n,r){return this.each(function(){jQuery.timer.add(this,e,t,n,r)})},oneTime:function(e,t,n){return this.each(function(){jQuery.timer.add(this,e,t,n,1)})},stopTime:function(e,t){return this.each(function(){jQuery.timer.remove(this,e,t)})}});jQuery.extend({timer:{global:[],guid:1,dataKey:"jQuery.timer",regex:/^([0-9]+(?:\.[0-9]*)?)\s*(.*s)?$/,powers:{ms:1,cs:10,ds:100,s:1e3,das:1e4,hs:1e5,ks:1e6},timeParse:function(e){if(e==undefined||e==null)return null;var t=this.regex.exec(jQuery.trim(e.toString()));return t[2]?parseFloat(t[1])*(this.powers[t[2]]||1):e},add:function(e,t,n,r,i){var s=0;if(jQuery.isFunction(n)){i||(i=r);r=n;n=t}t=jQuery.timer.timeParse(t);if(!(typeof t!="number"||isNaN(t)||t<0)){if(typeof i!="number"||isNaN(i)||i<0)i=0;i=i||0;var o=jQuery.data(e,this.dataKey)||jQuery.data(e,this.dataKey,{});o[n]||(o[n]={});r.timerID=r.timerID||this.guid++;var u=function(){if(++s>i&&i!==0||r.call(e,s)===false)jQuery.timer.remove(e,n,r)};u.timerID=r.timerID;o[n][r.timerID]||(o[n][r.timerID]=window.setInterval(u,t));this.global.push(e)}},remove:function(e,t,n){var r=jQuery.data(e,this.dataKey),i;if(r){if(t){if(r[t]){if(n){if(n.timerID){window.clearInterval(r[t][n.timerID]);delete r[t][n.timerID]}}else for(n in r[t]){window.clearInterval(r[t][n]);delete r[t][n]}for(i in r[t])break;if(!i){i=null;delete r[t]}}}else for(t in r)this.remove(e,t,n);for(i in r)break;i||jQuery.removeData(e,this.dataKey)}}}});jQuery(window).bind("unload",function(){jQuery.each(jQuery.timer.global,function(e,t){jQuery.timer.remove(t)})}) \ No newline at end of file +(function(e,t){function H(e){var t=e.length,n=w.type(e);if(w.isWindow(e)){return false}if(e.nodeType===1&&t){return true}return n==="array"||n!=="function"&&(t===0||typeof t==="number"&&t>0&&t-1 in e)}function j(e){var t=B[e]={};w.each(e.match(S)||[],function(e,n){t[n]=true});return t}function q(e,n,r,i){if(!w.acceptData(e)){return}var s,o,u=w.expando,a=e.nodeType,f=a?w.cache:e,l=a?e[u]:e[u]&&u;if((!l||!f[l]||!i&&!f[l].data)&&r===t&&typeof n==="string"){return}if(!l){if(a){l=e[u]=c.pop()||w.guid++}else{l=u}}if(!f[l]){f[l]=a?{}:{toJSON:w.noop}}if(typeof n==="object"||typeof n==="function"){if(i){f[l]=w.extend(f[l],n)}else{f[l].data=w.extend(f[l].data,n)}}o=f[l];if(!i){if(!o.data){o.data={}}o=o.data}if(r!==t){o[w.camelCase(n)]=r}if(typeof n==="string"){s=o[n];if(s==null){s=o[w.camelCase(n)]}}else{s=o}return s}function R(e,t,n){if(!w.acceptData(e)){return}var r,i,s=e.nodeType,o=s?w.cache:e,u=s?e[w.expando]:w.expando;if(!o[u]){return}if(t){r=n?o[u]:o[u].data;if(r){if(!w.isArray(t)){if(t in r){t=[t]}else{t=w.camelCase(t);if(t in r){t=[t]}else{t=t.split(" ")}}}else{t=t.concat(w.map(t,w.camelCase))}i=t.length;while(i--){delete r[t[i]]}if(n?!z(r):!w.isEmptyObject(r)){return}}}if(!n){delete o[u].data;if(!z(o[u])){return}}if(s){w.cleanData([e],true)}else if(w.support.deleteExpando||o!=o.window){delete o[u]}else{o[u]=null}}function U(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(I,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r==="string"){try{r=r==="true"?true:r==="false"?false:r==="null"?null:+r+""===r?+r:F.test(r)?w.parseJSON(r):r}catch(s){}w.data(e,n,r)}else{r=t}}return r}function z(e){var t;for(t in e){if(t==="data"&&w.isEmptyObject(e[t])){continue}if(t!=="toJSON"){return false}}return true}function it(){return true}function st(){return false}function ot(){try{return o.activeElement}catch(e){}}function ct(e,t){do{e=e[t]}while(e&&e.nodeType!==1);return e}function ht(e,t,n){if(w.isFunction(t)){return w.grep(e,function(e,r){return!!t.call(e,r,e)!==n})}if(t.nodeType){return w.grep(e,function(e){return e===t!==n})}if(typeof t==="string"){if(ut.test(t)){return w.filter(t,e,n)}t=w.filter(t,e)}return w.grep(e,function(e){return w.inArray(e,t)>=0!==n})}function pt(e){var t=dt.split("|"),n=e.createDocumentFragment();if(n.createElement){while(t.length){n.createElement(t.pop())}}return n}function Mt(e,t){return w.nodeName(e,"table")&&w.nodeName(t.nodeType===1?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function _t(e){e.type=(w.find.attr(e,"type")!==null)+"/"+e.type;return e}function Dt(e){var t=Ct.exec(e.type);if(t){e.type=t[1]}else{e.removeAttribute("type")}return e}function Pt(e,t){var n,r=0;for(;(n=e[r])!=null;r++){w._data(n,"globalEval",!t||w._data(t[r],"globalEval"))}}function Ht(e,t){if(t.nodeType!==1||!w.hasData(e)){return}var n,r,i,s=w._data(e),o=w._data(t,s),u=s.events;if(u){delete o.handle;o.events={};for(n in u){for(r=0,i=u[n].length;r").css("cssText","display:block !important")).appendTo(t.documentElement);t=(It[0].contentWindow||It[0].contentDocument).document;t.write("");t.close();n=fn(e,t);It.detach()}Qt[e]=n}return n}function fn(e,t){var n=w(t.createElement(e)).appendTo(t.body),r=w.css(n[0],"display");n.remove();return r}function vn(e,t,n,r){var i;if(w.isArray(t)){w.each(t,function(t,i){if(n||cn.test(e)){r(e,i)}else{vn(e+"["+(typeof i==="object"?t:"")+"]",i,n,r)}})}else if(!n&&w.type(t)==="object"){for(i in t){vn(e+"["+i+"]",t[i],n,r)}}else{r(e,t)}}function _n(e){return function(t,n){if(typeof t!=="string"){n=t;t="*"}var r,i=0,s=t.toLowerCase().match(S)||[];if(w.isFunction(n)){while(r=s[i++]){if(r[0]==="+"){r=r.slice(1)||"*";(e[r]=e[r]||[]).unshift(n)}else{(e[r]=e[r]||[]).push(n)}}}}}function Dn(e,t,n,r){function o(u){var a;i[u]=true;w.each(e[u]||[],function(e,u){var f=u(t,n,r);if(typeof f==="string"&&!s&&!i[f]){t.dataTypes.unshift(f);o(f);return false}else if(s){return!(a=f)}});return a}var i={},s=e===An;return o(t.dataTypes[0])||!i["*"]&&o("*")}function Pn(e,n){var r,i,s=w.ajaxSettings.flatOptions||{};for(i in n){if(n[i]!==t){(s[i]?e:r||(r={}))[i]=n[i]}}if(r){w.extend(true,e,r)}return e}function Hn(e,n,r){var i,s,o,u,a=e.contents,f=e.dataTypes;while(f[0]==="*"){f.shift();if(s===t){s=e.mimeType||n.getResponseHeader("Content-Type")}}if(s){for(u in a){if(a[u]&&a[u].test(s)){f.unshift(u);break}}}if(f[0]in r){o=f[0]}else{for(u in r){if(!f[0]||e.converters[u+" "+f[0]]){o=u;break}if(!i){i=u}}o=o||i}if(o){if(o!==f[0]){f.unshift(o)}return r[o]}}function Bn(e,t,n,r){var i,s,o,u,a,f={},l=e.dataTypes.slice();if(l[1]){for(o in e.converters){f[o.toLowerCase()]=e.converters[o]}}s=l.shift();while(s){if(e.responseFields[s]){n[e.responseFields[s]]=t}if(!a&&r&&e.dataFilter){t=e.dataFilter(t,e.dataType)}a=s;s=l.shift();if(s){if(s==="*"){s=a}else if(a!=="*"&&a!==s){o=f[a+" "+s]||f["* "+s];if(!o){for(i in f){u=i.split(" ");if(u[1]===s){o=f[a+" "+u[0]]||f["* "+u[0]];if(o){if(o===true){o=f[i]}else if(f[i]!==true){s=u[0];l.unshift(u[1])}break}}}}if(o!==true){if(o&&e["throws"]){t=o(t)}else{try{t=o(t)}catch(c){return{state:"parsererror",error:o?c:"No conversion from "+a+" to "+s}}}}}}}return{state:"success",data:t}}function zn(){try{return new e.XMLHttpRequest}catch(t){}}function Wn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function Yn(){setTimeout(function(){Xn=t});return Xn=w.now()}function Zn(e,t,n){var r,i=(Gn[t]||[]).concat(Gn["*"]),s=0,o=i.length;for(;s)[^>]*|#([\w-]*))$/,N=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,C=/^[\],:{}\s]*$/,k=/(?:^|:|,)(?:\s*\[)+/g,L=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,O=/^-ms-/,M=/-([\da-z])/gi,_=function(e,t){return t.toUpperCase()},D=function(e){if(o.addEventListener||e.type==="load"||o.readyState==="complete"){P();w.ready()}},P=function(){if(o.addEventListener){o.removeEventListener("DOMContentLoaded",D,false);e.removeEventListener("load",D,false)}else{o.detachEvent("onreadystatechange",D);e.detachEvent("onload",D)}};w.fn=w.prototype={jquery:h,constructor:w,init:function(e,n,r){var i,s;if(!e){return this}if(typeof e==="string"){if(e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3){i=[null,e,null]}else{i=T.exec(e)}if(i&&(i[1]||!n)){if(i[1]){n=n instanceof w?n[0]:n;w.merge(this,w.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,true));if(N.test(i[1])&&w.isPlainObject(n)){for(i in n){if(w.isFunction(this[i])){this[i](n[i])}else{this.attr(i,n[i])}}}return this}else{s=o.getElementById(i[2]);if(s&&s.parentNode){if(s.id!==i[2]){return r.find(e)}this.length=1;this[0]=s}this.context=o;this.selector=e;return this}}else if(!n||n.jquery){return(n||r).find(e)}else{return this.constructor(n).find(e)}}else if(e.nodeType){this.context=this[0]=e;this.length=1;return this}else if(w.isFunction(e)){return r.ready(e)}if(e.selector!==t){this.selector=e.selector;this.context=e.context}return w.makeArray(e,this)},selector:"",length:0,toArray:function(){return v.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e){var t=w.merge(this.constructor(),e);t.prevObject=this;t.context=this.context;return t},each:function(e,t){return w.each(this,e,t)},ready:function(e){w.ready.promise().done(e);return this},slice:function(){return this.pushStack(v.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n0){return}n.resolveWith(o,[w]);if(w.fn.trigger){w(o).trigger("ready").off("ready")}},isFunction:function(e){return w.type(e)==="function"},isArray:Array.isArray||function(e){return w.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){if(e==null){return String(e)}return typeof e==="object"||typeof e==="function"?l[g.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||w.type(e)!=="object"||e.nodeType||w.isWindow(e)){return false}try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf")){return false}}catch(r){return false}if(w.support.ownLast){for(n in e){return y.call(e,n)}}for(n in e){}return n===t||y.call(e,n)},isEmptyObject:function(e){var t;for(t in e){return false}return true},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){if(!e||typeof e!=="string"){return null}if(typeof t==="boolean"){n=t;t=false}t=t||o;var r=N.exec(e),i=!n&&[];if(r){return[t.createElement(r[1])]}r=w.buildFragment([e],t,i);if(i){w(i).remove()}return w.merge([],r.childNodes)},parseJSON:function(t){if(e.JSON&&e.JSON.parse){return e.JSON.parse(t)}if(t===null){return t}if(typeof t==="string"){t=w.trim(t);if(t){if(C.test(t.replace(L,"@").replace(A,"]").replace(k,""))){return(new Function("return "+t))()}}}w.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!=="string"){return null}try{if(e.DOMParser){i=new DOMParser;r=i.parseFromString(n,"text/xml")}else{r=new ActiveXObject("Microsoft.XMLDOM");r.async="false";r.loadXML(n)}}catch(s){r=t}if(!r||!r.documentElement||r.getElementsByTagName("parsererror").length){w.error("Invalid XML: "+n)}return r},noop:function(){},globalEval:function(t){if(t&&w.trim(t)){(e.execScript||function(t){e["eval"].call(e,t)})(t)}},camelCase:function(e){return e.replace(O,"ms-").replace(M,_)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,s=e.length,o=H(e);if(n){if(o){for(;is.cacheLength){delete t[e.shift()]}return t[n]=r}var e=[];return t}function at(e){e[b]=true;return e}function ft(e){var t=h.createElement("div");try{return!!e(t)}catch(n){return false}finally{if(t.parentNode){t.parentNode.removeChild(t)}t=null}}function lt(e,t){var n=e.split("|"),r=e.length;while(r--){s.attrHandle[n[r]]=t}}function ct(e,t){var n=t&&e,r=n&&e.nodeType===1&&t.nodeType===1&&(~t.sourceIndex||O)-(~e.sourceIndex||O);if(r){return r}if(n){while(n=n.nextSibling){if(n===t){return-1}}}return e?1:-1}function ht(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function pt(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function dt(e){return at(function(t){t=+t;return at(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--){if(n[i=s[o]]){n[i]=!(r[i]=n[i])}}})})}function vt(){}function mt(e,t){var n,r,i,o,u,a,f,l=N[e+" "];if(l){return t?0:l.slice(0)}u=e;a=[];f=s.preFilter;while(u){if(!n||(r=X.exec(u))){if(r){u=u.slice(r[0].length)||u}a.push(i=[])}n=false;if(r=V.exec(u)){n=r.shift();i.push({value:n,type:r[0].replace(W," ")});u=u.slice(n.length)}for(o in s.filter){if((r=G[o].exec(u))&&(!f[o]||(r=f[o](r)))){n=r.shift();i.push({value:n,type:o,matches:r});u=u.slice(n.length)}}if(!n){break}}return t?u.length:u?ot.error(e):N(e,a).slice(0)}function gt(e){var t=0,n=e.length,r="";for(;t1?function(t,n,r){var i=e.length;while(i--){if(!e[i](t,n,r)){return false}}return true}:e[0]}function wt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u-1){s[f]=!(o[f]=c)}}}}else{g=wt(g===o?g.splice(d,g.length):g);if(i){i(null,o,g,a)}else{H.apply(o,g)}}})}function St(e){var t,n,r,i=e.length,o=s.relative[e[0].type],u=o||s.relative[" "],a=o?1:0,l=yt(function(e){return e===t},u,true),c=yt(function(e){return j.call(t,e)>-1},u,true),h=[function(e,n,r){return!o&&(r||n!==f)||((t=n).nodeType?l(e,n,r):c(e,n,r))}];for(;a1&&bt(h),a>1&>(e.slice(0,a-1).concat({value:e[a-2].type===" "?"*":""})).replace(W,"$1"),n,a0,o=e.length>0,u=function(u,a,l,c,p){var d,v,m,g=[],y=0,b="0",w=u&&[],E=p!=null,x=f,T=u||o&&s.find["TAG"]("*",p&&a.parentNode||a),N=S+=x==null?1:Math.random()||.1;if(E){f=a!==h&&a;i=n}for(;(d=T[b])!=null;b++){if(o&&d){v=0;while(m=e[v++]){if(m(d,a,l)){c.push(d);break}}if(E){S=N;i=++n}}if(r){if(d=!m&&d){y--}if(u){w.push(d)}}}y+=b;if(r&&b!==y){v=0;while(m=t[v++]){m(w,g,a,l)}if(u){if(y>0){while(b--){if(!(w[b]||g[b])){g[b]=D.call(c)}}}g=wt(g)}H.apply(c,g);if(E&&!u&&g.length>0&&y+t.length>1){ot.uniqueSort(c)}}if(E){S=N;f=x}return w};return r?at(u):u}function Tt(e,t,n){var r=0,i=t.length;for(;r2&&(f=u[0]).type==="ID"&&r.getById&&t.nodeType===9&&d&&s.relative[u[1].type]){t=(s.find["ID"](f.matches[0].replace(rt,it),t)||[])[0];if(!t){return n}e=e.slice(u.shift().value.length)}o=G["needsContext"].test(e)?0:u.length;while(o--){f=u[o];if(s.relative[l=f.type]){break}if(c=s.find[l]){if(i=c(f.matches[0].replace(rt,it),$.test(u[0].type)&&t.parentNode||t)){u.splice(o,1);e=i.length&>(u);if(!e){H.apply(n,i);return n}break}}}}}a(e,h)(i,t,!d,n,$.test(e));return n}var n,r,i,s,o,u,a,f,l,c,h,p,d,v,m,g,y,b="sizzle"+ -(new Date),E=e.document,S=0,x=0,T=ut(),N=ut(),C=ut(),k=false,L=function(e,t){if(e===t){k=true;return 0}return 0},A=typeof t,O=1<<31,M={}.hasOwnProperty,_=[],D=_.pop,P=_.push,H=_.push,B=_.slice,j=_.indexOf||function(e){var t=0,n=this.length;for(;t+~]|"+I+")"+I+"*"),$=new RegExp(I+"*[+~]"),J=new RegExp("="+I+"*([^\\]'\"]*)"+I+"*\\]","g"),K=new RegExp(z),Q=new RegExp("^"+R+"$"),G={ID:new RegExp("^#("+q+")"),CLASS:new RegExp("^\\.("+q+")"),TAG:new RegExp("^("+q.replace("w","w*")+")"),ATTR:new RegExp("^"+U),PSEUDO:new RegExp("^"+z),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+I+"*(even|odd|(([+-]|)(\\d*)n|)"+I+"*(?:([+-]|)"+I+"*(\\d+)|))"+I+"*\\)|)","i"),bool:new RegExp("^(?:"+F+")$","i"),needsContext:new RegExp("^"+I+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+I+"*((?:-\\d)?\\d*)"+I+"*\\)|)(?=[^-]|$)","i")},Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=new RegExp("\\\\([\\da-f]{1,6}"+I+"?|("+I+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,r&1023|56320)};try{H.apply(_=B.call(E.childNodes),E.childNodes);_[E.childNodes.length].nodeType}catch(st){H={apply:_.length?function(e,t){P.apply(e,B.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]){}e.length=n-1}}}u=ot.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":false};r=ot.support={};c=ot.setDocument=function(e){var t=e?e.ownerDocument||e:E,n=t.defaultView;if(t===h||t.nodeType!==9||!t.documentElement){return h}h=t;p=t.documentElement;d=!u(t);if(n&&n.attachEvent&&n!==n.top){n.attachEvent("onbeforeunload",function(){c()})}r.attributes=ft(function(e){e.className="i";return!e.getAttribute("className")});r.getElementsByTagName=ft(function(e){e.appendChild(t.createComment(""));return!e.getElementsByTagName("*").length});r.getElementsByClassName=ft(function(e){e.innerHTML="
";e.firstChild.className="i";return e.getElementsByClassName("i").length===2});r.getById=ft(function(e){p.appendChild(e).id=b;return!t.getElementsByName||!t.getElementsByName(b).length});if(r.getById){s.find["ID"]=function(e,t){if(typeof t.getElementById!==A&&d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}};s.filter["ID"]=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}}else{delete s.find["ID"];s.filter["ID"]=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}}s.find["TAG"]=r.getElementsByTagName?function(e,t){if(typeof t.getElementsByTagName!==A){return t.getElementsByTagName(e)}}:function(e,t){var n,r=[],i=0,s=t.getElementsByTagName(e);if(e==="*"){while(n=s[i++]){if(n.nodeType===1){r.push(n)}}return r}return s};s.find["CLASS"]=r.getElementsByClassName&&function(e,t){if(typeof t.getElementsByClassName!==A&&d){return t.getElementsByClassName(e)}};m=[];v=[];if(r.qsa=Y.test(t.querySelectorAll)){ft(function(e){e.innerHTML="";if(!e.querySelectorAll("[selected]").length){v.push("\\["+I+"*(?:value|"+F+")")}if(!e.querySelectorAll(":checked").length){v.push(":checked")}});ft(function(e){var n=t.createElement("input");n.setAttribute("type","hidden");e.appendChild(n).setAttribute("t","");if(e.querySelectorAll("[t^='']").length){v.push("[*^$]="+I+"*(?:''|\"\")")}if(!e.querySelectorAll(":enabled").length){v.push(":enabled",":disabled")}e.querySelectorAll("*,:x");v.push(",.*:")})}if(r.matchesSelector=Y.test(g=p.webkitMatchesSelector||p.mozMatchesSelector||p.oMatchesSelector||p.msMatchesSelector)){ft(function(e){r.disconnectedMatch=g.call(e,"div");g.call(e,"[s!='']:x");m.push("!=",z)})}v=v.length&&new RegExp(v.join("|"));m=m.length&&new RegExp(m.join("|"));y=Y.test(p.contains)||p.compareDocumentPosition?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&(n.contains?n.contains(r):e.compareDocumentPosition&&e.compareDocumentPosition(r)&16))}:function(e,t){if(t){while(t=t.parentNode){if(t===e){return true}}}return false};L=p.compareDocumentPosition?function(e,n){if(e===n){k=true;return 0}var i=n.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(n);if(i){if(i&1||!r.sortDetached&&n.compareDocumentPosition(e)===i){if(e===t||y(E,e)){return-1}if(n===t||y(E,n)){return 1}return l?j.call(l,e)-j.call(l,n):0}return i&4?-1:1}return e.compareDocumentPosition?-1:1}:function(e,n){var r,i=0,s=e.parentNode,o=n.parentNode,u=[e],a=[n];if(e===n){k=true;return 0}else if(!s||!o){return e===t?-1:n===t?1:s?-1:o?1:l?j.call(l,e)-j.call(l,n):0}else if(s===o){return ct(e,n)}r=e;while(r=r.parentNode){u.unshift(r)}r=n;while(r=r.parentNode){a.unshift(r)}while(u[i]===a[i]){i++}return i?ct(u[i],a[i]):u[i]===E?-1:a[i]===E?1:0};return t};ot.matches=function(e,t){return ot(e,null,null,t)};ot.matchesSelector=function(e,t){if((e.ownerDocument||e)!==h){c(e)}t=t.replace(J,"='$1']");if(r.matchesSelector&&d&&(!m||!m.test(t))&&(!v||!v.test(t))){try{var n=g.call(e,t);if(n||r.disconnectedMatch||e.document&&e.document.nodeType!==11){return n}}catch(i){}}return ot(t,h,null,[e]).length>0};ot.contains=function(e,t){if((e.ownerDocument||e)!==h){c(e)}return y(e,t)};ot.attr=function(e,n){if((e.ownerDocument||e)!==h){c(e)}var i=s.attrHandle[n.toLowerCase()],o=i&&M.call(s.attrHandle,n.toLowerCase())?i(e,n,!d):t;return o===t?r.attributes||!d?e.getAttribute(n):(o=e.getAttributeNode(n))&&o.specified?o.value:null:o};ot.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)};ot.uniqueSort=function(e){var t,n=[],i=0,s=0;k=!r.detectDuplicates;l=!r.sortStable&&e.slice(0);e.sort(L);if(k){while(t=e[s++]){if(t===e[s]){i=n.push(s)}}while(i--){e.splice(n[i],1)}}return e};o=ot.getText=function(e){var t,n="",r=0,i=e.nodeType;if(!i){for(;t=e[r];r++){n+=o(t)}}else if(i===1||i===9||i===11){if(typeof e.textContent==="string"){return e.textContent}else{for(e=e.firstChild;e;e=e.nextSibling){n+=o(e)}}}else if(i===3||i===4){return e.nodeValue}return n};s=ot.selectors={cacheLength:50,createPseudo:at,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:true}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:true},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){e[1]=e[1].replace(rt,it);e[3]=(e[4]||e[5]||"").replace(rt,it);if(e[2]==="~="){e[3]=" "+e[3]+" "}return e.slice(0,4)},CHILD:function(e){e[1]=e[1].toLowerCase();if(e[1].slice(0,3)==="nth"){if(!e[3]){ot.error(e[0])}e[4]=+(e[4]?e[5]+(e[6]||1):2*(e[3]==="even"||e[3]==="odd"));e[5]=+(e[7]+e[8]||e[3]==="odd")}else if(e[3]){ot.error(e[0])}return e},PSEUDO:function(e){var n,r=!e[5]&&e[2];if(G["CHILD"].test(e[0])){return null}if(e[3]&&e[4]!==t){e[2]=e[4]}else if(r&&K.test(r)&&(n=mt(r,true))&&(n=r.indexOf(")",r.length-n)-r.length)){e[0]=e[0].slice(0,n);e[2]=r.slice(0,n)}return e.slice(0,3)}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return e==="*"?function(){return true}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=T[e+" "];return t||(t=new RegExp("(^|"+I+")"+e+"("+I+"|$)"))&&T(e,function(e){return t.test(typeof e.className==="string"&&e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=ot.attr(r,e);if(i==null){return t==="!="}if(!t){return true}i+="";return t==="="?i===n:t==="!="?i!==n:t==="^="?n&&i.indexOf(n)===0:t==="*="?n&&i.indexOf(n)>-1:t==="$="?n&&i.slice(-n.length)===n:t==="~="?(" "+i+" ").indexOf(n)>-1:t==="|="?i===n||i.slice(0,n.length+1)===n+"-":false}},CHILD:function(e,t,n,r,i){var s=e.slice(0,3)!=="nth",o=e.slice(-4)!=="last",u=t==="of-type";return r===1&&i===0?function(e){return!!e.parentNode}:function(t,n,a){var f,l,c,h,p,d,v=s!==o?"nextSibling":"previousSibling",m=t.parentNode,g=u&&t.nodeName.toLowerCase(),y=!a&&!u;if(m){if(s){while(v){c=t;while(c=c[v]){if(u?c.nodeName.toLowerCase()===g:c.nodeType===1){return false}}d=v=e==="only"&&!d&&"nextSibling"}return true}d=[o?m.firstChild:m.lastChild];if(o&&y){l=m[b]||(m[b]={});f=l[e]||[];p=f[0]===S&&f[1];h=f[0]===S&&f[2];c=p&&m.childNodes[p];while(c=++p&&c&&c[v]||(h=p=0)||d.pop()){if(c.nodeType===1&&++h&&c===t){l[e]=[S,p,h];break}}}else if(y&&(f=(t[b]||(t[b]={}))[e])&&f[0]===S){h=f[1]}else{while(c=++p&&c&&c[v]||(h=p=0)||d.pop()){if((u?c.nodeName.toLowerCase()===g:c.nodeType===1)&&++h){if(y){(c[b]||(c[b]={}))[e]=[S,h]}if(c===t){break}}}}h-=i;return h===r||h%r===0&&h/r>=0}}},PSEUDO:function(e,t){var n,r=s.pseudos[e]||s.setFilters[e.toLowerCase()]||ot.error("unsupported pseudo: "+e);if(r[b]){return r(t)}if(r.length>1){n=[e,e,"",t];return s.setFilters.hasOwnProperty(e.toLowerCase())?at(function(e,n){var i,s=r(e,t),o=s.length;while(o--){i=j.call(e,s[o]);e[i]=!(n[i]=s[o])}}):function(e){return r(e,0,n)}}return r}},pseudos:{not:at(function(e){var t=[],n=[],r=a(e.replace(W,"$1"));return r[b]?at(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--){if(s=o[u]){e[u]=!(t[u]=s)}}}):function(e,i,s){t[0]=e;r(t,null,s,n);return!n.pop()}}),has:at(function(e){return function(t){return ot(e,t).length>0}}),contains:at(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:at(function(e){if(!Q.test(e||"")){ot.error("unsupported lang: "+e)}e=e.replace(rt,it).toLowerCase();return function(t){var n;do{if(n=d?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang")){n=n.toLowerCase();return n===e||n.indexOf(e+"-")===0}}while((t=t.parentNode)&&t.nodeType===1);return false}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===p},focus:function(e){return e===h.activeElement&&(!h.hasFocus||h.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===false},disabled:function(e){return e.disabled===true},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){if(e.parentNode){e.parentNode.selectedIndex}return e.selected===true},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling){if(e.nodeName>"@"||e.nodeType===3||e.nodeType===4){return false}}return true},parent:function(e){return!s.pseudos["empty"](e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},text:function(e){var t;return e.nodeName.toLowerCase()==="input"&&e.type==="text"&&((t=e.getAttribute("type"))==null||t.toLowerCase()===e.type)},first:dt(function(){return[0]}),last:dt(function(e,t){return[t-1]}),eq:dt(function(e,t,n){return[n<0?n+t:n]}),even:dt(function(e,t){var n=0;for(;n=0;){e.push(r)}return e}),gt:dt(function(e,t,n){var r=n<0?n+t:n;for(;++r";e.firstChild.setAttribute("value","");return e.firstChild.getAttribute("value")===""})){lt("value",function(e,t,n){if(!n&&e.nodeName.toLowerCase()==="input"){return e.defaultValue}})}if(!ft(function(e){return e.getAttribute("disabled")==null})){lt(F,function(e,t,n){var r;if(!n){return(r=e.getAttributeNode(t))&&r.specified?r.value:e[t]===true?t.toLowerCase():null}})}w.find=ot;w.expr=ot.selectors;w.expr[":"]=w.expr.pseudos;w.unique=ot.uniqueSort;w.text=ot.getText;w.isXMLDoc=ot.isXML;w.contains=ot.contains})(e);var B={};w.Callbacks=function(e){e=typeof e==="string"?B[e]||j(e):w.extend({},e);var n,r,i,s,o,u,a=[],f=!e.once&&[],l=function(t){r=e.memory&&t;i=true;o=u||0;u=0;s=a.length;n=true;for(;a&&o-1){a.splice(r,1);if(n){if(r<=s){s--}if(r<=o){o--}}}})}return this},has:function(e){return e?w.inArray(e,a)>-1:!!(a&&a.length)},empty:function(){a=[];s=0;return this},disable:function(){a=f=r=t;return this},disabled:function(){return!a},lock:function(){f=t;if(!r){c.disable()}return this},locked:function(){return!f},fireWith:function(e,t){if(a&&(!i||f)){t=t||[];t=[e,t.slice?t.slice():t];if(n){f.push(t)}else{l(t)}}return this},fire:function(){c.fireWith(this,arguments);return this},fired:function(){return!!i}};return c};w.extend({Deferred:function(e){var t=[["resolve","done",w.Callbacks("once memory"),"resolved"],["reject","fail",w.Callbacks("once memory"),"rejected"],["notify","progress",w.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){i.done(arguments).fail(arguments);return this},then:function(){var e=arguments;return w.Deferred(function(n){w.each(t,function(t,s){var o=s[0],u=w.isFunction(e[t])&&e[t];i[s[1]](function(){var e=u&&u.apply(this,arguments);if(e&&w.isFunction(e.promise)){e.promise().done(n.resolve).fail(n.reject).progress(n.notify)}else{n[o+"With"](this===r?n.promise():this,u?[e]:arguments)}})});e=null}).promise()},promise:function(e){return e!=null?w.extend(e,r):r}},i={};r.pipe=r.then;w.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add;if(u){o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock)}i[s[0]]=function(){i[s[0]+"With"](this===i?r:this,arguments);return this};i[s[0]+"With"]=o.fireWith});r.promise(i);if(e){e.call(i,i)}return i},when:function(e){var t=0,n=v.call(arguments),r=n.length,i=r!==1||e&&w.isFunction(e.promise)?r:0,s=i===1?e:w.Deferred(),o=function(e,t,n){return function(r){t[e]=this;n[e]=arguments.length>1?v.call(arguments):r;if(n===u){s.notifyWith(t,n)}else if(!--i){s.resolveWith(t,n)}}},u,a,f;if(r>1){u=new Array(r);a=new Array(r);f=new Array(r);for(;t
a";n=p.getElementsByTagName("*")||[];r=p.getElementsByTagName("a")[0];if(!r||!r.style||!n.length){return t}u=o.createElement("select");f=u.appendChild(o.createElement("option"));s=p.getElementsByTagName("input")[0];r.style.cssText="top:1px;float:left;opacity:.5";t.getSetAttribute=p.className!=="t";t.leadingWhitespace=p.firstChild.nodeType===3;t.tbody=!p.getElementsByTagName("tbody").length;t.htmlSerialize=!!p.getElementsByTagName("link").length;t.style=/top/.test(r.getAttribute("style"));t.hrefNormalized=r.getAttribute("href")==="/a";t.opacity=/^0.5/.test(r.style.opacity);t.cssFloat=!!r.style.cssFloat;t.checkOn=!!s.value;t.optSelected=f.selected;t.enctype=!!o.createElement("form").enctype;t.html5Clone=o.createElement("nav").cloneNode(true).outerHTML!=="<:nav>";t.inlineBlockNeedsLayout=false;t.shrinkWrapBlocks=false;t.pixelPosition=false;t.deleteExpando=true;t.noCloneEvent=true;t.reliableMarginRight=true;t.boxSizingReliable=true;s.checked=true;t.noCloneChecked=s.cloneNode(true).checked;u.disabled=true;t.optDisabled=!f.disabled;try{delete p.test}catch(d){t.deleteExpando=false}s=o.createElement("input");s.setAttribute("value","");t.input=s.getAttribute("value")==="";s.value="t";s.setAttribute("type","radio");t.radioValue=s.value==="t";s.setAttribute("checked","t");s.setAttribute("name","t");a=o.createDocumentFragment();a.appendChild(s);t.appendChecked=s.checked;t.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;if(p.attachEvent){p.attachEvent("onclick",function(){t.noCloneEvent=false});p.cloneNode(true).click()}for(h in{submit:true,change:true,focusin:true}){p.setAttribute(l="on"+h,"t");t[h+"Bubbles"]=l in e||p.attributes[l].expando===false}p.style.backgroundClip="content-box";p.cloneNode(true).style.backgroundClip="";t.clearCloneStyle=p.style.backgroundClip==="content-box";for(h in w(t)){break}t.ownLast=h!=="0";w(function(){var n,r,s,u="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",a=o.getElementsByTagName("body")[0];if(!a){return}n=o.createElement("div");n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";a.appendChild(n).appendChild(p);p.innerHTML="
t
";s=p.getElementsByTagName("td");s[0].style.cssText="padding:0;margin:0;border:0;display:none";c=s[0].offsetHeight===0;s[0].style.display="";s[1].style.display="none";t.reliableHiddenOffsets=c&&s[0].offsetHeight===0;p.innerHTML="";p.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";w.swap(a,a.style.zoom!=null?{zoom:1}:{},function(){t.boxSizing=p.offsetWidth===4});if(e.getComputedStyle){t.pixelPosition=(e.getComputedStyle(p,null)||{}).top!=="1%";t.boxSizingReliable=(e.getComputedStyle(p,null)||{width:"4px"}).width==="4px";r=p.appendChild(o.createElement("div"));r.style.cssText=p.style.cssText=u;r.style.marginRight=r.style.width="0";p.style.width="1px";t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)}if(typeof p.style.zoom!==i){p.innerHTML="";p.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1";t.inlineBlockNeedsLayout=p.offsetWidth===3;p.style.display="block";p.innerHTML="
";p.firstChild.style.width="5px";t.shrinkWrapBlocks=p.offsetWidth!==3;if(t.inlineBlockNeedsLayout){a.style.zoom=1}}a.removeChild(n);n=p=s=r=null});n=u=a=f=r=s=null;return t}({});var F=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;w.extend({cache:{},noData:{applet:true,embed:true,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){e=e.nodeType?w.cache[e[w.expando]]:e[w.expando];return!!e&&!z(e)},data:function(e,t,n){return q(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return q(e,t,n,true)},_removeData:function(e,t){return R(e,t,true)},acceptData:function(e){if(e.nodeType&&e.nodeType!==1&&e.nodeType!==9){return false}var t=e.nodeName&&w.noData[e.nodeName.toLowerCase()];return!t||t!==true&&e.getAttribute("classid")===t}});w.fn.extend({data:function(e,n){var r,i,s=null,o=0,u=this[0];if(e===t){if(this.length){s=w.data(u);if(u.nodeType===1&&!w._data(u,"parsedAttrs")){r=u.attributes;for(;o1?this.each(function(){w.data(this,e,n)}):u?U(u,e,w.data(u,e)):null},removeData:function(e){return this.each(function(){w.removeData(this,e)})}});w.extend({queue:function(e,t,n){var r;if(e){t=(t||"fx")+"queue";r=w._data(e,t);if(n){if(!r||w.isArray(n)){r=w._data(e,t,w.makeArray(n))}else{r.push(n)}}return r||[]}},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),s=w._queueHooks(e,t),o=function(){w.dequeue(e,t)};if(i==="inprogress"){i=n.shift();r--}if(i){if(t==="fx"){n.unshift("inprogress")}delete s.stop;i.call(e,o,s)}if(!r&&s){s.empty.fire()}},_queueHooks:function(e,t){var n=t+"queueHooks";return w._data(e,n)||w._data(e,n,{empty:w.Callbacks("once memory").add(function(){w._removeData(e,t+"queue");w._removeData(e,n)})})}});w.fn.extend({queue:function(e,n){var r=2;if(typeof e!=="string"){n=e;e="fx";r--}if(arguments.length1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})},prop:function(e,t){return w.access(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){e=w.propFix[e]||e;return this.each(function(){try{this[e]=t;delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o=0,u=this.length,a=typeof e==="string"&&e;if(w.isFunction(e)){return this.each(function(t){w(this).addClass(e.call(this,t,this.className))})}if(a){t=(e||"").match(S)||[];for(;o=0){r=r.replace(" "+i+" "," ")}}n.className=e?w.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e;if(typeof t==="boolean"&&n==="string"){return t?this.addClass(e):this.removeClass(e)}if(w.isFunction(e)){return this.each(function(n){w(this).toggleClass(e.call(this,n,this.className,t),t)})}return this.each(function(){if(n==="string"){var t,r=0,s=w(this),o=e.match(S)||[];while(t=o[r++]){if(s.hasClass(t)){s.removeClass(t)}else{s.addClass(t)}}}else if(n===i||n==="boolean"){if(this.className){w._data(this,"__className__",this.className)}this.className=this.className||e===false?"":w._data(this,"__className__")||""}})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n=0){return true}}return false},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s){r=w.valHooks[s.type]||w.valHooks[s.nodeName.toLowerCase()];if(r&&"get"in r&&(n=r.get(s,"value"))!==t){return n}n=s.value;return typeof n==="string"?n.replace($,""):n==null?"":n}return}i=w.isFunction(e);return this.each(function(n){var s;if(this.nodeType!==1){return}if(i){s=e.call(this,n,w(this).val())}else{s=e}if(s==null){s=""}else if(typeof s==="number"){s+=""}else if(w.isArray(s)){s=w.map(s,function(e){return e==null?"":e+""})}r=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()];if(!r||!("set"in r)||r.set(this,s,"value")===t){this.value=s}})}});w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return t!=null?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a=0){n=true}}if(!n){e.selectedIndex=-1}return s}}},attr:function(e,n,r){var s,o,u=e.nodeType;if(!e||u===3||u===8||u===2){return}if(typeof e.getAttribute===i){return w.prop(e,n,r)}if(u!==1||!w.isXMLDoc(e)){n=n.toLowerCase();s=w.attrHooks[n]||(w.expr.match.bool.test(n)?X:W)}if(r!==t){if(r===null){w.removeAttr(e,n)}else if(s&&"set"in s&&(o=s.set(e,r,n))!==t){return o}else{e.setAttribute(n,r+"");return r}}else if(s&&"get"in s&&(o=s.get(e,n))!==null){return o}else{o=w.find.attr(e,n);return o==null?t:o}},removeAttr:function(e,t){var n,r,i=0,s=t&&t.match(S);if(s&&e.nodeType===1){while(n=s[i++]){r=w.propFix[n]||n;if(w.expr.match.bool.test(n)){if(Y&&G||!Q.test(n)){e[r]=false}else{e[w.camelCase("default-"+n)]=e[r]=false}}else{w.attr(e,n,"")}e.removeAttribute(G?n:r)}}},attrHooks:{type:{set:function(e,t){if(!w.support.radioValue&&t==="radio"&&w.nodeName(e,"input")){var n=e.value;e.setAttribute("type",t);if(n){e.value=n}return t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,s,o,u=e.nodeType;if(!e||u===3||u===8||u===2){return}o=u!==1||!w.isXMLDoc(e);if(o){n=w.propFix[n]||n;s=w.propHooks[n]}if(r!==t){return s&&"set"in s&&(i=s.set(e,r,n))!==t?i:e[n]=r}else{return s&&"get"in s&&(i=s.get(e,n))!==null?i:e[n]}},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):J.test(e.nodeName)||K.test(e.nodeName)&&e.href?0:-1}}}});X={set:function(e,t,n){if(t===false){w.removeAttr(e,n)}else if(Y&&G||!Q.test(n)){e.setAttribute(!G&&w.propFix[n]||n,n)}else{e[w.camelCase("default-"+n)]=e[n]=true}return n}};w.each(w.expr.match.bool.source.match(/\w+/g),function(e,n){var r=w.expr.attrHandle[n]||w.find.attr;w.expr.attrHandle[n]=Y&&G||!Q.test(n)?function(e,n,i){var s=w.expr.attrHandle[n],o=i?t:(w.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;w.expr.attrHandle[n]=s;return o}:function(e,n,r){return r?t:e[w.camelCase("default-"+n)]?n.toLowerCase():null}});if(!Y||!G){w.attrHooks.value={set:function(e,t,n){if(w.nodeName(e,"input")){e.defaultValue=t}else{return W&&W.set(e,t,n)}}}}if(!G){W={set:function(e,n,r){var i=e.getAttributeNode(r);if(!i){e.setAttributeNode(i=e.ownerDocument.createAttribute(r))}i.value=n+="";return r==="value"||n===e.getAttribute(r)?n:t}};w.expr.attrHandle.id=w.expr.attrHandle.name=w.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.value!==""?i.value:null};w.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:W.set};w.attrHooks.contenteditable={set:function(e,t,n){W.set(e,t===""?false:t,n)}};w.each(["width","height"],function(e,t){w.attrHooks[t]={set:function(e,n){if(n===""){e.setAttribute(t,"auto");return n}}}})}if(!w.support.hrefNormalized){w.each(["href","src"],function(e,t){w.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})}if(!w.support.style){w.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}}if(!w.support.optSelected){w.propHooks.selected={get:function(e){var t=e.parentNode;if(t){t.selectedIndex;if(t.parentNode){t.parentNode.selectedIndex}}return null}}}w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});if(!w.support.enctype){w.propFix.enctype="encoding"}w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(w.isArray(t)){return e.checked=w.inArray(w(e).val(),t)>=0}}};if(!w.support.checkOn){w.valHooks[this].get=function(e){return e.getAttribute("value")===null?"on":e.value}}});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;w.event={global:{},add:function(e,n,r,s,o){var u,a,f,l,c,h,p,d,v,m,g,y=w._data(e);if(!y){return}if(r.handler){l=r;r=l.handler;o=l.selector}if(!r.guid){r.guid=w.guid++}if(!(a=y.events)){a=y.events={}}if(!(h=y.handle)){h=y.handle=function(e){return typeof w!==i&&(!e||w.event.triggered!==e.type)?w.event.dispatch.apply(h.elem,arguments):t};h.elem=e}n=(n||"").match(S)||[""];f=n.length;while(f--){u=rt.exec(n[f])||[];v=g=u[1];m=(u[2]||"").split(".").sort();if(!v){continue}c=w.event.special[v]||{};v=(o?c.delegateType:c.bindType)||v;c=w.event.special[v]||{};p=w.extend({type:v,origType:g,data:s,handler:r,guid:r.guid,selector:o,needsContext:o&&w.expr.match.needsContext.test(o),namespace:m.join(".")},l);if(!(d=a[v])){d=a[v]=[];d.delegateCount=0;if(!c.setup||c.setup.call(e,s,m,h)===false){if(e.addEventListener){e.addEventListener(v,h,false)}else if(e.attachEvent){e.attachEvent("on"+v,h)}}}if(c.add){c.add.call(e,p);if(!p.handler.guid){p.handler.guid=r.guid}}if(o){d.splice(d.delegateCount++,0,p)}else{d.push(p)}w.event.global[v]=true}e=null},remove:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,p,d,v,m=w.hasData(e)&&w._data(e);if(!m||!(l=m.events)){return}t=(t||"").match(S)||[""];f=t.length;while(f--){u=rt.exec(t[f])||[];p=v=u[1];d=(u[2]||"").split(".").sort();if(!p){for(p in l){w.event.remove(e,p+t[f],n,r,true)}continue}c=w.event.special[p]||{};p=(r?c.delegateType:c.bindType)||p;h=l[p]||[];u=u[2]&&new RegExp("(^|\\.)"+d.join("\\.(?:.*\\.|)")+"(\\.|$)");a=s=h.length;while(s--){o=h[s];if((i||v===o.origType)&&(!n||n.guid===o.guid)&&(!u||u.test(o.namespace))&&(!r||r===o.selector||r==="**"&&o.selector)){h.splice(s,1);if(o.selector){h.delegateCount--}if(c.remove){c.remove.call(e,o)}}}if(a&&!h.length){if(!c.teardown||c.teardown.call(e,d,m.handle)===false){w.removeEvent(e,p,m.handle)}delete l[p]}}if(w.isEmptyObject(l)){delete m.handle;w._removeData(e,"events")}},trigger:function(n,r,i,s){var u,a,f,l,c,h,p,d=[i||o],v=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];f=h=i=i||o;if(i.nodeType===3||i.nodeType===8){return}if(nt.test(v+w.event.triggered)){return}if(v.indexOf(".")>=0){m=v.split(".");v=m.shift();m.sort()}a=v.indexOf(":")<0&&"on"+v;n=n[w.expando]?n:new w.Event(v,typeof n==="object"&&n);n.isTrigger=s?2:3;n.namespace=m.join(".");n.namespace_re=n.namespace?new RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null;n.result=t;if(!n.target){n.target=i}r=r==null?[n]:w.makeArray(r,[n]);c=w.event.special[v]||{};if(!s&&c.trigger&&c.trigger.apply(i,r)===false){return}if(!s&&!c.noBubble&&!w.isWindow(i)){l=c.delegateType||v;if(!nt.test(l+v)){f=f.parentNode}for(;f;f=f.parentNode){d.push(f);h=f}if(h===(i.ownerDocument||o)){d.push(h.defaultView||h.parentWindow||e)}}p=0;while((f=d[p++])&&!n.isPropagationStopped()){n.type=p>1?l:c.bindType||v;u=(w._data(f,"events")||{})[n.type]&&w._data(f,"handle");if(u){u.apply(f,r)}u=a&&f[a];if(u&&w.acceptData(f)&&u.apply&&u.apply(f,r)===false){n.preventDefault()}}n.type=v;if(!s&&!n.isDefaultPrevented()){if((!c._default||c._default.apply(d.pop(),r)===false)&&w.acceptData(i)){if(a&&i[v]&&!w.isWindow(i)){h=i[a];if(h){i[a]=null}w.event.triggered=v;try{i[v]()}catch(g){}w.event.triggered=t;if(h){i[a]=h}}}}return n.result},dispatch:function(e){e=w.event.fix(e);var n,r,i,s,o,u=[],a=v.call(arguments),f=(w._data(this,"events")||{})[e.type]||[],l=w.event.special[e.type]||{};a[0]=e;e.delegateTarget=this;if(l.preDispatch&&l.preDispatch.call(this,e)===false){return}u=w.event.handlers.call(this,e,f);n=0;while((s=u[n++])&&!e.isPropagationStopped()){e.currentTarget=s.elem;o=0;while((i=s.handlers[o++])&&!e.isImmediatePropagationStopped()){if(!e.namespace_re||e.namespace_re.test(i.namespace)){e.handleObj=i;e.data=i.data;r=((w.event.special[i.origType]||{}).handle||i.handler).apply(s.elem,a);if(r!==t){if((e.result=r)===false){e.preventDefault();e.stopPropagation()}}}}}if(l.postDispatch){l.postDispatch.call(this,e)}return e.result},handlers:function(e,n){var r,i,s,o,u=[],a=n.delegateCount,f=e.target;if(a&&f.nodeType&&(!e.button||e.type!=="click")){for(;f!=this;f=f.parentNode||this){if(f.nodeType===1&&(f.disabled!==true||e.type!=="click")){s=[];for(o=0;o=0:w.find(r,this,null,[f]).length}if(s[r]){s.push(i)}}if(s.length){u.push({elem:f,handlers:s})}}}}if(a1?w.unique(n):n);n.selector=this.selector?this.selector+" "+e:e;return n},has:function(e){var t,n=w(e,this),r=n.length;return this.filter(function(){for(t=0;t-1:n.nodeType===1&&w.find.matchesSelector(n,e))){n=s.push(n);break}}}return this.pushStack(s.length>1?w.unique(s):s)},index:function(e){if(!e){return this[0]&&this[0].parentNode?this.first().prevAll().length:-1}if(typeof e==="string"){return w.inArray(this[0],w(e))}return w.inArray(e.jquery?e[0]:e,this)},add:function(e,t){var n=typeof e==="string"?w(e,t):w.makeArray(e&&e.nodeType?[e]:e),r=w.merge(this.get(),n);return this.pushStack(w.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}});w.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return w.dir(e,"parentNode")},parentsUntil:function(e,t,n){return w.dir(e,"parentNode",n)},next:function(e){return ct(e,"nextSibling")},prev:function(e){return ct(e,"previousSibling")},nextAll:function(e){return w.dir(e,"nextSibling")},prevAll:function(e){return w.dir(e,"previousSibling")},nextUntil:function(e,t,n){return w.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return w.dir(e,"previousSibling",n)},siblings:function(e){return w.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return w.sibling(e.firstChild)},contents:function(e){return w.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:w.merge([],e.childNodes)}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);if(e.slice(-5)!=="Until"){r=n}if(r&&typeof r==="string"){i=w.filter(r,i)}if(this.length>1){if(!lt[e]){i=w.unique(i)}if(at.test(e)){i=i.reverse()}}return this.pushStack(i)}});w.extend({filter:function(e,t,n){var r=t[0];if(n){e=":not("+e+")"}return t.length===1&&r.nodeType===1?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return e.nodeType===1}))},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!w(s).is(r))){if(s.nodeType===1){i.push(s)}s=s[n]}return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling){if(e.nodeType===1&&e!==t){n.push(e)}}return n}});var dt="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|"+"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",vt=/ jQuery\d+="(?:null|\d+)"/g,mt=new RegExp("<(?:"+dt+")[\\s/>]","i"),gt=/^\s+/,yt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,wt=/\s*$/g,Lt={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:w.support.htmlSerialize?[0,"",""]:[1,"X
","
"]},At=pt(o),Ot=At.appendChild(o.createElement("div"));Lt.optgroup=Lt.option;Lt.tbody=Lt.tfoot=Lt.colgroup=Lt.caption=Lt.thead;Lt.th=Lt.td;w.fn.extend({text:function(e){return w.access(this,function(e){return e===t?w.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(this.nodeType===1||this.nodeType===11||this.nodeType===9){var t=Mt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(this.nodeType===1||this.nodeType===11||this.nodeType===9){var t=Mt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){if(this.parentNode){this.parentNode.insertBefore(e,this)}})},after:function(){return this.domManip(arguments,function(e){if(this.parentNode){this.parentNode.insertBefore(e,this.nextSibling)}})},remove:function(e,t){var n,r=e?w.filter(e,this):this,i=0;for(;(n=r[i])!=null;i++){if(!t&&n.nodeType===1){w.cleanData(jt(n))}if(n.parentNode){if(t&&w.contains(n.ownerDocument,n)){Pt(jt(n,"script"))}n.parentNode.removeChild(n)}}return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){if(e.nodeType===1){w.cleanData(jt(e,false))}while(e.firstChild){e.removeChild(e.firstChild)}if(e.options&&w.nodeName(e,"select")){e.options.length=0}}return this},clone:function(e,t){e=e==null?false:e;t=t==null?e:t;return this.map(function(){return w.clone(this,e,t)})},html:function(e){return w.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t){return n.nodeType===1?n.innerHTML.replace(vt,""):t}if(typeof e==="string"&&!St.test(e)&&(w.support.htmlSerialize||!mt.test(e))&&(w.support.leadingWhitespace||!gt.test(e))&&!Lt[(bt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(yt,"<$1>");try{for(;r")){s=e.cloneNode(true)}else{Ot.innerHTML=e.outerHTML;Ot.removeChild(s=Ot.firstChild)}if((!w.support.noCloneEvent||!w.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!w.isXMLDoc(e)){r=jt(s);u=jt(e);for(o=0;(i=u[o])!=null;++o){if(r[o]){Bt(i,r[o])}}}if(t){if(n){u=u||jt(e);r=r||jt(s);for(o=0;(i=u[o])!=null;o++){Ht(i,r[o])}}else{Ht(e,s)}}r=jt(s,"script");if(r.length>0){Pt(r,!a&&jt(e,"script"))}r=u=i=null;return s},buildFragment:function(e,t,n,r){var i,s,o,u,a,f,l,c=e.length,h=pt(t),p=[],d=0;for(;d")+l[2];i=l[0];while(i--){u=u.lastChild}if(!w.support.leadingWhitespace&>.test(s)){p.push(t.createTextNode(gt.exec(s)[0]))}if(!w.support.tbody){s=a==="table"&&!wt.test(s)?u.firstChild:l[1]===""&&!wt.test(s)?u:0;i=s&&s.childNodes.length;while(i--){if(w.nodeName(f=s.childNodes[i],"tbody")&&!f.childNodes.length){s.removeChild(f)}}}w.merge(p,u.childNodes);u.textContent="";while(u.firstChild){u.removeChild(u.firstChild)}u=h.lastChild}}}if(u){h.removeChild(u)}if(!w.support.appendChecked){w.grep(jt(p,"input"),Ft)}d=0;while(s=p[d++]){if(r&&w.inArray(s,r)!==-1){continue}o=w.contains(s.ownerDocument,s);u=jt(h.appendChild(s),"script");if(o){Pt(u)}if(n){i=0;while(s=u[i++]){if(Nt.test(s.type||"")){n.push(s)}}}}u=null;return h},cleanData:function(e,t){var n,r,s,o,u=0,a=w.expando,f=w.cache,l=w.support.deleteExpando,h=w.event.special;for(;(n=e[u])!=null;u++){if(t||w.acceptData(n)){s=n[a];o=s&&f[s];if(o){if(o.events){for(r in o.events){if(h[r]){w.event.remove(n,r)}else{w.removeEvent(n,r,o.handle)}}}if(f[s]){delete f[s];if(l){delete n[a]}else if(typeof n.removeAttribute!==i){n.removeAttribute(a)}else{n[a]=null}c.push(s)}}}}},_evalUrl:function(e){return w.ajax({url:e,type:"GET",dataType:"script",async:false,global:false,"throws":true})}});w.fn.extend({wrapAll:function(e){if(w.isFunction(e)){return this.each(function(t){w(this).wrapAll(e.call(this,t))})}if(this[0]){var t=w(e,this[0].ownerDocument).eq(0).clone(true);if(this[0].parentNode){t.insertBefore(this[0])}t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1){e=e.firstChild}return e}).append(this)}return this},wrapInner:function(e){if(w.isFunction(e)){return this.each(function(t){w(this).wrapInner(e.call(this,t))})}return this.each(function(){var t=w(this),n=t.contents();if(n.length){n.wrapAll(e)}else{t.append(e)}})},wrap:function(e){var t=w.isFunction(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){if(!w.nodeName(this,"body")){w(this).replaceWith(this.childNodes)}}).end()}});var It,qt,Rt,Ut=/alpha\([^)]*\)/i,zt=/opacity\s*=\s*([^)]*)/,Wt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Vt=/^margin/,$t=new RegExp("^("+E+")(.*)$","i"),Jt=new RegExp("^("+E+")(?!px)[a-z%]+$","i"),Kt=new RegExp("^([+-])=("+E+")","i"),Qt={BODY:"block"},Gt={position:"absolute",visibility:"hidden",display:"block"},Yt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];w.fn.extend({css:function(e,n){return w.access(this,function(e,n,r){var i,s,o={},u=0;if(w.isArray(n)){s=qt(e);i=n.length;for(;u1)},show:function(){return rn(this,true)},hide:function(){return rn(this)},toggle:function(e){if(typeof e==="boolean"){return e?this.show():this.hide()}return this.each(function(){if(nn(this)){w(this).show()}else{w(this).hide()}})}});w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Rt(e,"opacity");return n===""?"1":n}}}},cssNumber:{columnCount:true,fillOpacity:true,fontWeight:true,lineHeight:true,opacity:true,order:true,orphans:true,widows:true,zIndex:true,zoom:true},cssProps:{"float":w.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style){return}var s,o,u,a=w.camelCase(n),f=e.style;n=w.cssProps[a]||(w.cssProps[a]=tn(f,a));u=w.cssHooks[n]||w.cssHooks[a];if(r!==t){o=typeof r;if(o==="string"&&(s=Kt.exec(r))){r=(s[1]+1)*s[2]+parseFloat(w.css(e,n));o="number"}if(r==null||o==="number"&&isNaN(r)){return}if(o==="number"&&!w.cssNumber[a]){r+="px"}if(!w.support.clearCloneStyle&&r===""&&n.indexOf("background")===0){f[n]="inherit"}if(!u||!("set"in u)||(r=u.set(e,r,i))!==t){try{f[n]=r}catch(l){}}}else{if(u&&"get"in u&&(s=u.get(e,false,i))!==t){return s}return f[n]}},css:function(e,n,r,i){var s,o,u,a=w.camelCase(n);n=w.cssProps[a]||(w.cssProps[a]=tn(e.style,a));u=w.cssHooks[n]||w.cssHooks[a];if(u&&"get"in u){o=u.get(e,true,r)}if(o===t){o=Rt(e,n,i)}if(o==="normal"&&n in Yt){o=Yt[n]}if(r===""||r){s=parseFloat(o);return r===true||w.isNumeric(s)?s||0:o}return o}});if(e.getComputedStyle){qt=function(t){return e.getComputedStyle(t,null)};Rt=function(e,n,r){var i,s,o,u=r||qt(e),a=u?u.getPropertyValue(n)||u[n]:t,f=e.style;if(u){if(a===""&&!w.contains(e.ownerDocument,e)){a=w.style(e,n)}if(Jt.test(a)&&Vt.test(n)){i=f.width;s=f.minWidth;o=f.maxWidth;f.minWidth=f.maxWidth=f.width=a;a=u.width;f.width=i;f.minWidth=s;f.maxWidth=o}}return a}}else if(o.documentElement.currentStyle){qt=function(e){return e.currentStyle};Rt=function(e,n,r){var i,s,o,u=r||qt(e),a=u?u[n]:t,f=e.style;if(a==null&&f&&f[n]){a=f[n]}if(Jt.test(a)&&!Wt.test(n)){i=f.left;s=e.runtimeStyle;o=s&&s.left;if(o){s.left=e.currentStyle.left}f.left=n==="fontSize"?"1em":a;a=f.pixelLeft+"px";f.left=i;if(o){s.left=o}}return a===""?"auto":a}}w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n){return e.offsetWidth===0&&Xt.test(w.css(e,"display"))?w.swap(e,Gt,function(){return un(e,t,r)}):un(e,t,r)}},set:function(e,n,r){var i=r&&qt(e);return sn(e,n,r?on(e,t,r,w.support.boxSizing&&w.css(e,"boxSizing",false,i)==="border-box",i):0)}}});if(!w.support.opacity){w.cssHooks.opacity={get:function(e,t){return zt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=w.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if((t>=1||t==="")&&w.trim(s.replace(Ut,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(t===""||r&&!r.filter){return}}n.filter=Ut.test(s)?s.replace(Ut,i):s+" "+i}}}w(function(){if(!w.support.reliableMarginRight){w.cssHooks.marginRight={get:function(e,t){if(t){return w.swap(e,{display:"inline-block"},Rt,[e,"marginRight"])}}}}if(!w.support.pixelPosition&&w.fn.position){w.each(["top","left"],function(e,t){w.cssHooks[t]={get:function(e,n){if(n){n=Rt(e,t);return Jt.test(n)?w(e).position()[t]+"px":n}}}})}});if(w.expr&&w.expr.filters){w.expr.filters.hidden=function(e){return e.offsetWidth<=0&&e.offsetHeight<=0||!w.support.reliableHiddenOffsets&&(e.style&&e.style.display||w.css(e,"display"))==="none"};w.expr.filters.visible=function(e){return!w.expr.filters.hidden(e)}}w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){var r=0,i={},s=typeof n==="string"?n.split(" "):[n];for(;r<4;r++){i[e+Zt[r]+t]=s[r]||s[r-2]||s[0]}return i}};if(!Vt.test(e)){w.cssHooks[e+t].set=sn}});var ln=/%20/g,cn=/\[\]$/,hn=/\r?\n/g,pn=/^(?:submit|button|image|reset|file)$/i,dn=/^(?:input|select|textarea|keygen)/i;w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&dn.test(this.nodeName)&&!pn.test(e)&&(this.checked||!xt.test(e))}).map(function(e,t){var n=w(this).val();return n==null?null:w.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(hn,"\r\n")}}):{name:t.name,value:n.replace(hn,"\r\n")}}).get()}});w.param=function(e,n){var r,i=[],s=function(e,t){t=w.isFunction(t)?t():t==null?"":t;i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t){n=w.ajaxSettings&&w.ajaxSettings.traditional}if(w.isArray(e)||e.jquery&&!w.isPlainObject(e)){w.each(e,function(){s(this.name,this.value)})}else{for(r in e){vn(r,e[r],n,s)}}return i.join("&").replace(ln,"+")};w.each(("blur focus focusin focusout load resize scroll unload click dblclick "+"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave "+"change select submit keydown keypress keyup error contextmenu").split(" "),function(e,t){w.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}});w.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return arguments.length===1?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,gn,yn=w.now(),bn=/\?/,wn=/#.*$/,En=/([?&])_=[^&]*/,Sn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,xn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Tn=/^(?:GET|HEAD)$/,Nn=/^\/\//,Cn=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,kn=w.fn.load,Ln={},An={},On="*/".concat("*");try{gn=s.href}catch(Mn){gn=o.createElement("a");gn.href="";gn=gn.href}mn=Cn.exec(gn.toLowerCase())||[];w.fn.load=function(e,n,r){if(typeof e!=="string"&&kn){return kn.apply(this,arguments)}var i,s,o,u=this,a=e.indexOf(" ");if(a>=0){i=e.slice(a,e.length);e=e.slice(0,a)}if(w.isFunction(n)){r=n;n=t}else if(n&&typeof n==="object"){o="POST"}if(u.length>0){w.ajax({url:e,type:o,dataType:"html",data:n}).done(function(e){s=arguments;u.html(i?w("
").append(w.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){u.each(r,s||[e.responseText,t,e])})}return this};w.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){w.fn[t]=function(e){return this.on(t,e)}});w.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:gn,type:"GET",isLocal:xn.test(mn[1]),global:true,processData:true,async:true,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":On,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":true,"text json":w.parseJSON,"text xml":w.parseXML},flatOptions:{url:true,context:true}},ajaxSetup:function(e,t){return t?Pn(Pn(e,w.ajaxSettings),t):Pn(w.ajaxSettings,e)},ajaxPrefilter:_n(Ln),ajaxTransport:_n(An),ajax:function(e,n){function N(e,n,r,i){var l,g,y,E,S,T=n;if(b===2){return}b=2;if(u){clearTimeout(u)}f=t;o=i||"";x.readyState=e>0?4:0;l=e>=200&&e<300||e===304;if(r){E=Hn(c,x,r)}E=Bn(c,E,x,l);if(l){if(c.ifModified){S=x.getResponseHeader("Last-Modified");if(S){w.lastModified[s]=S}S=x.getResponseHeader("etag");if(S){w.etag[s]=S}}if(e===204||c.type==="HEAD"){T="nocontent"}else if(e===304){T="notmodified"}else{T=E.state;g=E.data;y=E.error;l=!y}}else{y=T;if(e||!T){T="error";if(e<0){e=0}}}x.status=e;x.statusText=(n||T)+"";if(l){d.resolveWith(h,[g,T,x])}else{d.rejectWith(h,[x,T,y])}x.statusCode(m);m=t;if(a){p.trigger(l?"ajaxSuccess":"ajaxError",[x,c,l?g:y])}v.fireWith(h,[x,T]);if(a){p.trigger("ajaxComplete",[x,c]);if(!--w.active){w.event.trigger("ajaxStop")}}}if(typeof e==="object"){n=e;e=t}n=n||{};var r,i,s,o,u,a,f,l,c=w.ajaxSetup({},n),h=c.context||c,p=c.context&&(h.nodeType||h.jquery)?w(h):w.event,d=w.Deferred(),v=w.Callbacks("once memory"),m=c.statusCode||{},g={},y={},b=0,E="canceled",x={readyState:0,getResponseHeader:function(e){var t;if(b===2){if(!l){l={};while(t=Sn.exec(o)){l[t[1].toLowerCase()]=t[2]}}t=l[e.toLowerCase()]}return t==null?null:t},getAllResponseHeaders:function(){return b===2?o:null},setRequestHeader:function(e,t){var n=e.toLowerCase();if(!b){e=y[n]=y[n]||e;g[e]=t}return this},overrideMimeType:function(e){if(!b){c.mimeType=e}return this},statusCode:function(e){var t;if(e){if(b<2){for(t in e){m[t]=[m[t],e[t]]}}else{x.always(e[x.status])}}return this},abort:function(e){var t=e||E;if(f){f.abort(t)}N(0,t);return this}};d.promise(x).complete=v.add;x.success=x.done;x.error=x.fail;c.url=((e||c.url||gn)+"").replace(wn,"").replace(Nn,mn[1]+"//");c.type=n.method||n.type||c.method||c.type;c.dataTypes=w.trim(c.dataType||"*").toLowerCase().match(S)||[""];if(c.crossDomain==null){r=Cn.exec(c.url.toLowerCase());c.crossDomain=!!(r&&(r[1]!==mn[1]||r[2]!==mn[2]||(r[3]||(r[1]==="http:"?"80":"443"))!==(mn[3]||(mn[1]==="http:"?"80":"443"))))}if(c.data&&c.processData&&typeof c.data!=="string"){c.data=w.param(c.data,c.traditional)}Dn(Ln,c,n,x);if(b===2){return x}a=c.global;if(a&&w.active++===0){w.event.trigger("ajaxStart")}c.type=c.type.toUpperCase();c.hasContent=!Tn.test(c.type);s=c.url;if(!c.hasContent){if(c.data){s=c.url+=(bn.test(s)?"&":"?")+c.data;delete c.data}if(c.cache===false){c.url=En.test(s)?s.replace(En,"$1_="+yn++):s+(bn.test(s)?"&":"?")+"_="+yn++}}if(c.ifModified){if(w.lastModified[s]){x.setRequestHeader("If-Modified-Since",w.lastModified[s])}if(w.etag[s]){x.setRequestHeader("If-None-Match",w.etag[s])}}if(c.data&&c.hasContent&&c.contentType!==false||n.contentType){x.setRequestHeader("Content-Type",c.contentType)}x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+On+"; q=0.01":""):c.accepts["*"]);for(i in c.headers){x.setRequestHeader(i,c.headers[i])}if(c.beforeSend&&(c.beforeSend.call(h,x,c)===false||b===2)){return x.abort()}E="abort";for(i in{success:1,error:1,complete:1}){x[i](c[i])}f=Dn(An,c,n,x);if(!f){N(-1,"No Transport")}else{x.readyState=1;if(a){p.trigger("ajaxSend",[x,c])}if(c.async&&c.timeout>0){u=setTimeout(function(){x.abort("timeout")},c.timeout)}try{b=1;f.send(g,N)}catch(T){if(b<2){N(-1,T)}else{throw T}}}return x},getJSON:function(e,t,n){return w.get(e,t,n,"json")},getScript:function(e,n){return w.get(e,t,n,"script")}});w.each(["get","post"],function(e,n){w[n]=function(e,r,i,s){if(w.isFunction(r)){s=s||i;i=r;r=t}return w.ajax({url:e,type:n,dataType:s,data:r,success:i})}});w.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){w.globalEval(e);return e}}});w.ajaxPrefilter("script",function(e){if(e.cache===t){e.cache=false}if(e.crossDomain){e.type="GET";e.global=false}});w.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||w("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script");n.async=true;if(e.scriptCharset){n.charset=e.scriptCharset}n.src=e.url;n.onload=n.onreadystatechange=function(e,t){if(t||!n.readyState||/loaded|complete/.test(n.readyState)){n.onload=n.onreadystatechange=null;if(n.parentNode){n.parentNode.removeChild(n)}n=null;if(!t){i(200,"success")}}};r.insertBefore(n,r.firstChild)},abort:function(){if(n){n.onload(t,true)}}}}});var jn=[],Fn=/(=)\?(?=&|$)|\?\?/;w.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=jn.pop()||w.expando+"_"+yn++;this[e]=true;return e}});w.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.jsonp!==false&&(Fn.test(n.url)?"url":typeof n.data==="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Fn.test(n.data)&&"data");if(a||n.dataTypes[0]==="jsonp"){s=n.jsonpCallback=w.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback;if(a){n[a]=n[a].replace(Fn,"$1"+s)}else if(n.jsonp!==false){n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+s}n.converters["script json"]=function(){if(!u){w.error(s+" was not called")}return u[0]};n.dataTypes[0]="json";o=e[s];e[s]=function(){u=arguments};i.always(function(){e[s]=o;if(n[s]){n.jsonpCallback=r.jsonpCallback;jn.push(s)}if(u&&w.isFunction(o)){o(u[0])}u=o=t});return"script"}});var In,qn,Rn=0,Un=e.ActiveXObject&&function(){var e;for(e in In){In[e](t,true)}};w.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&zn()||Wn()}:zn;qn=w.ajaxSettings.xhr();w.support.cors=!!qn&&"withCredentials"in qn;qn=w.support.ajax=!!qn;if(qn){w.ajaxTransport(function(n){if(!n.crossDomain||w.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();if(n.username){a.open(n.type,n.url,n.async,n.username,n.password)}else{a.open(n.type,n.url,n.async)}if(n.xhrFields){for(u in n.xhrFields){a[u]=n.xhrFields[u]}}if(n.mimeType&&a.overrideMimeType){a.overrideMimeType(n.mimeType)}if(!n.crossDomain&&!i["X-Requested-With"]){i["X-Requested-With"]="XMLHttpRequest"}try{for(u in i){a.setRequestHeader(u,i[u])}}catch(f){}a.send(n.hasContent&&n.data||null);r=function(e,i){var u,f,l,c;try{if(r&&(i||a.readyState===4)){r=t;if(o){a.onreadystatechange=w.noop;if(Un){delete In[o]}}if(i){if(a.readyState!==4){a.abort()}}else{c={};u=a.status;f=a.getAllResponseHeaders();if(typeof a.responseText==="string"){c.text=a.responseText}try{l=a.statusText}catch(h){l=""}if(!u&&n.isLocal&&!n.crossDomain){u=c.text?200:404}else if(u===1223){u=204}}}}catch(p){if(!i){s(-1,p)}}if(c){s(u,l,c,f)}};if(!n.async){r()}else if(a.readyState===4){setTimeout(r)}else{o=++Rn;if(Un){if(!In){In={};w(e).unload(Un)}In[o]=r}a.onreadystatechange=r}},abort:function(){if(r){r(t,true)}}}}})}var Xn,Vn,$n=/^(?:toggle|show|hide)$/,Jn=new RegExp("^(?:([+-])=|)("+E+")([a-z%]*)$","i"),Kn=/queueHooks$/,Qn=[nr],Gn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Jn.exec(t),s=i&&i[3]||(w.cssNumber[e]?"":"px"),o=(w.cssNumber[e]||s!=="px"&&+r)&&Jn.exec(w.css(n.elem,e)),u=1,a=20;if(o&&o[3]!==s){s=s||o[3];i=i||[];o=+r||1;do{u=u||".5";o=o/u;w.style(n.elem,e,o+s)}while(u!==(u=n.cur()/r)&&u!==1&&--a)}if(i){o=n.start=+o||+r||0;n.unit=s;n.end=i[1]?o+(i[1]+1)*i[2]:+i[2]}return n}]};w.Animation=w.extend(er,{tweener:function(e,t){if(w.isFunction(e)){t=e;e=["*"]}else{e=e.split(" ")}var n,r=0,i=e.length;for(;r-1,f={},l={},c,h;if(a){l=i.position();c=l.top;h=l.left}else{c=parseFloat(o)||0;h=parseFloat(u)||0}if(w.isFunction(t)){t=t.call(e,n,s)}if(t.top!=null){f.top=t.top-s.top+c}if(t.left!=null){f.left=t.left-s.left+h}if("using"in t){t.using.call(e,f)}else{i.css(f)}}};w.fn.extend({position:function(){if(!this[0]){return}var e,t,n={top:0,left:0},r=this[0];if(w.css(r,"position")==="fixed"){t=r.getBoundingClientRect()}else{e=this.offsetParent();t=this.offset();if(!w.nodeName(e[0],"html")){n=e.offset()}n.top+=w.css(e[0],"borderTopWidth",true);n.left+=w.css(e[0],"borderLeftWidth",true)}return{top:t.top-n.top-w.css(r,"marginTop",true),left:t.left-n.left-w.css(r,"marginLeft",true)}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||u;while(e&&!w.nodeName(e,"html")&&w.css(e,"position")==="static"){e=e.offsetParent}return e||u})}});w.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);w.fn[e]=function(i){return w.access(this,function(e,i,s){var o=sr(e);if(s===t){return o?n in o?o[n]:o.document.documentElement[i]:e[i]}if(o){o.scrollTo(!r?s:w(o).scrollLeft(),r?s:w(o).scrollTop())}else{e[i]=s}},e,i,arguments.length,null)}});w.each({Height:"height",Width:"width"},function(e,n){w.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){w.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!=="boolean"),u=r||(i===true||s===true?"margin":"border");return w.access(this,function(n,r,i){var s;if(w.isWindow(n)){return n.document.documentElement["client"+e]}if(n.nodeType===9){s=n.documentElement;return Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])}return i===t?w.css(n,r,u):w.style(n,r,i,u)},n,o?i:t,o,null)}})});w.fn.size=function(){return this.length};w.fn.andSelf=w.fn.addBack;if(typeof module==="object"&&module&&typeof module.exports==="object"){module.exports=w}else{e.jQuery=e.$=w;if(typeof define==="function"&&define.amd){define("jquery",[],function(){return w})}}})(window);(function(){"use strict";function encodeHTMLSource(){var e={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"},t=/&(?!#?\w+;)|<|>|"|'|\//g;return function(){return this?this.replace(t,function(t){return e[t]||t}):this}}function resolveDefs(e,t,n){return(typeof t==="string"?t:t.toString()).replace(e.define||skip,function(t,r,i,s){if(r.indexOf("def.")===0){r=r.substring(4)}if(!(r in n)){if(i===":"){if(e.defineParams)s.replace(e.defineParams,function(e,t,i){n[r]={arg:t,text:i}});if(!(r in n))n[r]=s}else{(new Function("def","def['"+r+"']="+s))(n)}}return""}).replace(e.use||skip,function(t,r){if(e.useParams)r=r.replace(e.useParams,function(e,t,r,i){if(n[r]&&n[r].arg&&i){var s=(r+":"+i).replace(/'|\\/g,"_");n.__exp=n.__exp||{};n.__exp[s]=n[r].text.replace(new RegExp("(^|[^\\w$])"+n[r].arg+"([^\\w$])","g"),"$1"+i+"$2");return t+"def.__exp['"+s+"']"}});var i=(new Function("def","return "+r))(n);return i?resolveDefs(e,i,n):i})}function unescape(e){return e.replace(/\\('|\\)/g,"$1").replace(/[\r\t\n]/g," ")}var doT={version:"1.0.1-nanoui",templateSettings:{evaluate:/\{\{([\s\S]+?)\}\}/g,interpolate:/\{\{:([\s\S]+?)\}\}/g,encode:/\{\{>([\s\S]+?)\}\}/g,use:/\{\{#([\s\S]+?)\}\}/g,define:/\{\{##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\}\}/g,conditional:/\{\{\/?if\s*([\s\S]*?)\s*\}\}/g,conditionalElse:/\{\{else\s*([\s\S]*?)\s*\}\}/g,iterate:/\{\{\/?for\s*(?:\}\}|([\s\S]+?)\s*(?:\:\s*([\w$]+))?\s*(?:\:\s*([\w$]+))?\s*\}\})/g,props:/\{\{\/?props\s*(?:\}\}|([\s\S]+?)\s*(?:\:\s*([\w$]+))?\s*(?:\:\s*([\w$]+))?\s*\}\})/g,varname:"data, helper",strip:true,append:true,selfcontained:false},template:undefined,compile:undefined},global;if(typeof module!=="undefined"&&module.exports){module.exports=doT}else if(typeof define==="function"&&define.amd){define(function(){return doT})}else{global=function(){return this||(0,eval)("this")}();global.doT=doT}String.prototype.encodeHTML=encodeHTMLSource();var startend={append:{start:"'+(",end:")+'",endencode:"||'').toString().encodeHTML()+'"},split:{start:"';out+=(",end:");out+='",endencode:"||'').toString().encodeHTML();out+='"}},skip=/$^/;doT.template=function(e,t,n){t=t||doT.templateSettings;var r=t.append?startend.append:startend.split,i,s=0,o=t.use||t.define?resolveDefs(t,e,n||{}):e;o=("var out='"+(t.strip?o.replace(/(^|\r|\n)\t* +| +\t*(\r|\n|$)/g," ").replace(/\r|\n|\t|\/\*[\s\S]*?\*\//g,""):o).replace(/'|\\/g,"\\$&").replace(t.interpolate||skip,function(e,t){return r.start+unescape(t)+r.end}).replace(t.encode||skip,function(e,t){i=true;return r.start+unescape(t)+r.endencode}).replace(t.conditional||skip,function(e,t){return t?"';if("+unescape(t)+"){out+='":"';}out+='"}).replace(t.conditionalElse||skip,function(e,t){return t?"';}else if("+unescape(t)+"){out+='":"';}else{out+='"}).replace(t.iterate||skip,function(e,t,n,r){if(!t)return"';} } out+='";s+=1;n=n||"value";r=r||"index";t=unescape(t);var i="arr"+s;return"';var "+i+"="+t+";if("+i+"){var "+n+","+r+"=-1,l"+s+"="+i+".length-1;while("+r+"i&&i!==0||r.call(e,s)===false)jQuery.timer.remove(e,n,r)};u.timerID=r.timerID;o[n][r.timerID]||(o[n][r.timerID]=window.setInterval(u,t));this.global.push(e)}},remove:function(e,t,n){var r=jQuery.data(e,this.dataKey),i;if(r){if(t){if(r[t]){if(n){if(n.timerID){window.clearInterval(r[t][n.timerID]);delete r[t][n.timerID]}}else for(n in r[t]){window.clearInterval(r[t][n]);delete r[t][n]}for(i in r[t])break;if(!i){i=null;delete r[t]}}}else for(t in r)this.remove(e,t,n);for(i in r)break;i||jQuery.removeData(e,this.dataKey)}}}});jQuery(window).bind("unload",function(){jQuery.each(jQuery.timer.global,function(e,t){jQuery.timer.remove(t)})}) \ No newline at end of file diff --git a/nano/js/libraries/2-doT.js b/nano/js/libraries/2-doT.js new file mode 100644 index 0000000000..50c5e451fc --- /dev/null +++ b/nano/js/libraries/2-doT.js @@ -0,0 +1,153 @@ +(function () { + "use strict"; + + var doT = { + version: '1.0.1-nanoui', + templateSettings: { + evaluate: /\{\{([\s\S]+?)\}\}/g, + interpolate: /\{\{:([\s\S]+?)\}\}/g, + encode: /\{\{>([\s\S]+?)\}\}/g, + use: /\{\{#([\s\S]+?)\}\}/g, + define: /\{\{##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\}\}/g, + conditional: /\{\{\/?if\s*([\s\S]*?)\s*\}\}/g, + conditionalElse: /\{\{else\s*([\s\S]*?)\s*\}\}/g, + iterate: /\{\{\/?for\s*(?:\}\}|([\s\S]+?)\s*(?:\:\s*([\w$]+))?\s*(?:\:\s*([\w$]+))?\s*\}\})/g, + props: /\{\{\/?props\s*(?:\}\}|([\s\S]+?)\s*(?:\:\s*([\w$]+))?\s*(?:\:\s*([\w$]+))?\s*\}\})/g, + varname: 'data, helper', + strip: true, + append: true, + selfcontained: false + }, + template: undefined, //fn, compile template + compile: undefined //fn, for express + }, global; + + if (typeof module !== 'undefined' && module.exports) { + module.exports = doT; + } else if (typeof define === 'function' && define.amd) { + define(function () { + return doT; + }); + } else { + global = (function () { + return this || (0, eval)('this'); + }()); + global.doT = doT; + } + + function encodeHTMLSource() { + var encodeHTMLRules = { "&": "&", "<": "<", ">": ">", '"': '"', "'": ''', "/": '/' }, + matchHTML = /&(?!#?\w+;)|<|>|"|'|\//g; + return function () { + return this ? this.replace(matchHTML, function (m) { + return encodeHTMLRules[m] || m; + }) : this; + }; + } + + String.prototype.encodeHTML = encodeHTMLSource(); + + var startend = { + append: { start: "'+(", end: ")+'", endencode: "||'').toString().encodeHTML()+'" }, + split: { start: "';out+=(", end: ");out+='", endencode: "||'').toString().encodeHTML();out+='"} + }, skip = /$^/; + + function resolveDefs(c, block, def) { + return ((typeof block === 'string') ? block : block.toString()) + .replace(c.define || skip, function (m, code, assign, value) { + if (code.indexOf('def.') === 0) { + code = code.substring(4); + } + if (!(code in def)) { + if (assign === ':') { + if (c.defineParams) value.replace(c.defineParams, function (m, param, v) { + def[code] = {arg: param, text: v}; + }); + if (!(code in def)) def[code] = value; + } else { + new Function("def", "def['" + code + "']=" + value)(def); + } + } + return ''; + }) + .replace(c.use || skip, function (m, code) { + if (c.useParams) code = code.replace(c.useParams, function (m, s, d, param) { + if (def[d] && def[d].arg && param) { + var rw = (d + ":" + param).replace(/'|\\/g, '_'); + def.__exp = def.__exp || {}; + def.__exp[rw] = def[d].text.replace(new RegExp("(^|[^\\w$])" + def[d].arg + "([^\\w$])", "g"), "$1" + param + "$2"); + return s + "def.__exp['" + rw + "']"; + } + }); + var v = new Function("def", "return " + code)(def); + return v ? resolveDefs(c, v, def) : v; + }); + } + + function unescape(code) { + return code.replace(/\\('|\\)/g, "$1").replace(/[\r\t\n]/g, ' '); + } + + doT.template = function (tmpl, c, def) { + c = c || doT.templateSettings; + var cse = c.append ? startend.append : startend.split, needhtmlencode, sid = 0, + str = (c.use || c.define) ? resolveDefs(c, tmpl, def || {}) : tmpl; + + str = ("var out='" + (c.strip ? str.replace(/(^|\r|\n)\t* +| +\t*(\r|\n|$)/g, ' ') + .replace(/\r|\n|\t|\/\*[\s\S]*?\*\//g, '') : str) + .replace(/'|\\/g, '\\$&') + .replace(c.interpolate || skip, function (m, code) { + return cse.start + unescape(code) + cse.end; + }) + .replace(c.encode || skip, function (m, code) { + needhtmlencode = true; + return cse.start + unescape(code) + cse.endencode; + }) + .replace(c.conditional || skip, function (m, code) { + return (code ? "';if(" + unescape(code) + "){out+='" : "';}out+='"); + }) + .replace(c.conditionalElse || skip, function (m, code) { + return (code ? "';}else if(" + unescape(code) + "){out+='" : "';}else{out+='"); + }) + .replace(c.iterate || skip, function (m, iterate, vname, iname) { + if (!iterate) return "';} } out+='"; + sid += 1; + vname = vname || "value"; + iname = iname || "index"; + iterate = unescape(iterate); + var arrayName = "arr" + sid; + return "';var " + arrayName + "=" + iterate + ";if(" + arrayName + "){var " + vname + "," + iname + "=-1,l" + sid + "=" + arrayName + ".length-1;while(" + iname + "=|[<>%*:?\/]|(=))\s*|(!*?[#~]?[\w$.^]+)([([])?)|(,\s*)|(\(?)\\?(?:(')|("))|(?:\s*(([)\]])(?=\s*\.|\s*\^|\s*$)|[)\]])([([]?))|(\s+)/g, - // lftPrn0 lftPrn bound path operator err eq path2 prn comma lftPrn2 apos quot rtPrn rtPrnDot prn2 space - // (left paren? followed by (path? followed by operator) or (path followed by left paren?)) or comma or apos or quot or right paren or space - - rNewLine = /[ \t]*(\r\n|\n|\r)/g, - rUnescapeQuotes = /\\(['"])/g, - rEscapeQuotes = /['"\\]/g, // Escape quotes and \ character - rBuildHash = /\x08(~)?([^\x08]+)\x08/g, - rTestElseIf = /^if\s/, - rFirstElem = /<(\w+)[>\s]/, - rAttrEncode = /[\x00`><"'&]/g, // Includes > encoding since rConvertMarkers in JsViews does not skip > characters in attribute strings - rHtmlEncode = rAttrEncode, - autoTmplName = 0, - viewId = 0, - charEntities = { - "&": "&", - "<": "<", - ">": ">", - "\x00": "�", - "'": "'", - '"': """, - "`": "`" - }, - tmplAttr = "data-jsv-tmpl", - $render = {}, - jsvStores = { - template: { - compile: compileTmpl - }, - tag: { - compile: compileTag - }, - helper: {}, - converter: {} - }, - - // jsviews object ($.views if jQuery is loaded) - $views = { - jsviews: versionNumber, - render: $render, - settings: { - delimiters: $viewsDelimiters, - debugMode: true, - tryCatch: true - }, - sub: { - // subscription, e.g. JsViews integration - View: View, - Error: JsViewsError, - tmplFn: tmplFn, - parse: parseParams, - extend: $extend, - error: error, - syntaxError: syntaxError - }, - _cnvt: convertVal, - _tag: renderTag, - - _err: function(e) { - // Place a breakpoint here to intercept template rendering errors - return $viewsSettings.debugMode ? ("Error: " + (e.message || e)) + ". " : ''; - } - }; - - function JsViewsError(message, object) { - // Error exception type for JsViews/JsRender - // Override of $.views.sub.Error is possible - if (object && object.onError) { - if (object.onError(message) === false) { - return; - } - } - this.name = "JsRender Error"; - this.message = message || "JsRender error"; - } - - function $extend(target, source) { - var name; - target = target || {}; - for (name in source) { - target[name] = source[name]; - } - return target; - } - - (JsViewsError.prototype = new Error()).constructor = JsViewsError; - - //========================== Top-level functions ========================== - - //=================== - // jsviews.delimiters - //=================== - function $viewsDelimiters(openChars, closeChars, link) { - // Set the tag opening and closing delimiters and 'link' character. Default is "{{", "}}" and "^" - // openChars, closeChars: opening and closing strings, each with two characters - - if (!$viewsSub.rTag || openChars) { - delimOpenChar0 = openChars ? openChars.charAt(0) : delimOpenChar0; // Escape the characters - since they could be regex special characters - delimOpenChar1 = openChars ? openChars.charAt(1) : delimOpenChar1; - delimCloseChar0 = closeChars ? closeChars.charAt(0) : delimCloseChar0; - delimCloseChar1 = closeChars ? closeChars.charAt(1) : delimCloseChar1; - linkChar = link || linkChar; - openChars = "\\" + delimOpenChar0 + "(\\" + linkChar + ")?\\" + delimOpenChar1; // Default is "{^{" - closeChars = "\\" + delimCloseChar0 + "\\" + delimCloseChar1; // Default is "}}" - // Build regex with new delimiters - // tag (followed by / space or }) or cvtr+colon or html or code - rTag = "(?:(?:(\\w+(?=[\\/\\s\\" + delimCloseChar0 + "]))|(?:(\\w+)?(:)|(>)|!--((?:[^-]|-(?!-))*)--|(\\*)))" - + "\\s*((?:[^\\" + delimCloseChar0 + "]|\\" + delimCloseChar0 + "(?!\\" + delimCloseChar1 + "))*?)"; - - // make rTag available to JsViews (or other components) for parsing binding expressions - $viewsSub.rTag = rTag + ")"; - - rTag = new RegExp(openChars + rTag + "(\\/)?|(?:\\/(\\w+)))" + closeChars, "g"); - - // Default: bind tag converter colon html comment code params slash closeBlock - // /{(\^)?{(?:(?:(\w+(?=[\/\s}]))|(?:(\w+)?(:)|(>)|!--((?:[^-]|-(?!-))*)--|(\*)))\s*((?:[^}]|}(?!}))*?)(\/)?|(?:\/(\w+)))}}/g - - rTmplString = new RegExp("<.*>|([^\\\\]|^)[{}]|" + openChars + ".*" + closeChars); - // rTmplString looks for html tags or { or } char not preceded by \\, or JsRender tags {{xxx}}. Each of these strings are considered - // NOT to be jQuery selectors - } - return [delimOpenChar0, delimOpenChar1, delimCloseChar0, delimCloseChar1, linkChar]; - } - - //========= - // View.get - //========= - - function getView(inner, type) { //view.get(inner, type) - if (!type) { - // view.get(type) - type = inner; - inner = undefined; - } - - var views, i, l, found, - view = this, - root = !type || type === "root"; - // If type is undefined, returns root view (view under top view). - - if (inner) { - // Go through views - this one, and all nested ones, depth-first - and return first one with given type. - found = view.type === type ? view : undefined; - if (!found) { - views = view.views; - if (view._.useKey) { - for (i in views) { - if (found = views[i].get(inner, type)) { - break; - } - } - } else for (i = 0, l = views.length; !found && i < l; i++) { - found = views[i].get(inner, type); - } - } - } else if (root) { - // Find root view. (view whose parent is top view) - while (view.parent.parent) { - found = view = view.parent; - } - } else while (view && !found) { - // Go through views - this one, and all parent ones - and return first one with given type. - found = view.type === type ? view : undefined; - view = view.parent; - } - return found; - } - - function getNestedIndex() { - var view = this.get("item"); - return view ? view.index : undefined; - } - - getNestedIndex.depends = function() { - return [this.get("item"), "index"]; - }; - - function getIndex() { - return this.index; - } - - getIndex.depends = function() { - return ["index"]; - }; - - //========== - // View.hlp - //========== - - function getHelper(helper) { - // Helper method called as view.hlp(key) from compiled template, for helper functions or template parameters ~foo - var wrapped, - view = this, - ctx = view.linkCtx, - res = (view.ctx || {})[helper]; - - if (res === undefined && ctx && ctx.ctx) { - res = ctx.ctx[helper]; - } - if (res === undefined) { - res = $helpers[helper]; - } - - if (res) { - if (typeof res === "function") { - wrapped = function() { - // If it is of type function, we will wrap it, so if called with no this pointer it will be called with the view as 'this' context. - // If the helper ~foo() was in a data-link expression, the view will have a 'temporary' linkCtx property too. - // Note that helper functions on deeper paths will have specific this pointers, from the preceding path. - // For example, ~util.foo() will have the ~util object as 'this' pointer - return res.apply(this || view, arguments); - }; - $extend(wrapped, res); - } - } - return wrapped || res; - } - - //============== - // jsviews._cnvt - //============== - - function convertVal(converter, view, tagCtx) { - // self is template object or linkCtx object - var tmplConverter, tag, value, - boundTagCtx = +tagCtx === tagCtx && tagCtx, // if tagCtx is an integer, then it is the key for the boundTagCtx (compiled function to return the tagCtx) - linkCtx = view.linkCtx; // For data-link="{cvt:...}"... - - if (boundTagCtx) { - // This is a bound tag: {^{xx:yyy}}. Call compiled function which returns the tagCtxs for current data - tagCtx = (boundTagCtx = view.tmpl.bnds[boundTagCtx-1])(view.data, view, $views); - } - - value = tagCtx.args[0]; - - if (converter || boundTagCtx) { - tag = linkCtx && linkCtx.tag || { - _: { - inline: !linkCtx, - bnd: boundTagCtx - }, - tagName: converter + ":", - flow: true, - _is: "tag" - }; - - if (linkCtx) { - linkCtx.tag = tag; - tag.linkCtx = tag.linkCtx || linkCtx; - tagCtx.ctx = extendCtx(tagCtx.ctx, linkCtx.view.ctx); - } - tag.tagCtx = tagCtx; - tagCtx.view = view; - - tag.ctx = tagCtx.ctx || {}; - delete tagCtx.ctx; - // Provide this tag on view, for addBindingMarkers on bound tags to add the tag to view._.bnds, associated with the tag id, - view._.tag = tag; - - converter = converter !== "true" && converter; // If there is a convertBack but no convert, converter will be "true" - - if (converter && ((tmplConverter = view.getRsc("converters", converter)) || error("Unknown converter: {{"+ converter + ":"))) { - // A call to {{cnvt: ... }} or {^{cnvt: ... }} or data-link="{cnvt: ... }" - tag.depends = tmplConverter.depends; - value = tmplConverter.apply(tag, tagCtx.args); - } - // Call onRender (used by JsViews if present, to add binding annotations around rendered content) - value = boundTagCtx && view._.onRender - ? view._.onRender(value, view, boundTagCtx) - : value; - view._.tag = undefined; - } - return value; - } - - //============= - // jsviews._tag - //============= - - function getResource(resourceType, itemName) { - var res, store, - view = this; - while ((res === undefined) && view) { - store = view.tmpl[resourceType]; - res = store && store[itemName]; - view = view.parent; - } - return res || $views[resourceType][itemName]; - } - - function renderTag(tagName, parentView, tmpl, tagCtxs, isRefresh) { - // Called from within compiled template function, to render a template tag - // Returns the rendered tag - - var render, tag, tags, attr, parentTag, i, l, itemRet, tagCtx, tagCtxCtx, content, boundTagFn, tagDef, callInit, - ret = "", - boundTagKey = +tagCtxs === tagCtxs && tagCtxs, // if tagCtxs is an integer, then it is the boundTagKey - linkCtx = parentView.linkCtx || 0, - ctx = parentView.ctx, - parentTmpl = tmpl || parentView.tmpl, - parentView_ = parentView._; - - if (tagName._is === "tag") { - tag = tagName; - tagName = tag.tagName; - } - - // Provide tagCtx, linkCtx and ctx access from tag - if (boundTagKey) { - // if tagCtxs is an integer, we are data binding - // Call compiled function which returns the tagCtxs for current data - tagCtxs = (boundTagFn = parentTmpl.bnds[boundTagKey-1])(parentView.data, parentView, $views); - } - - l = tagCtxs.length; - tag = tag || linkCtx.tag; - for (i = 0; i < l; i++) { - tagCtx = tagCtxs[i]; - - // Set the tmpl property to the content of the block tag, unless set as an override property on the tag - content = tagCtx.tmpl; - content = tagCtx.content = content && parentTmpl.tmpls[content - 1]; - tmpl = tagCtx.props.tmpl; - if (!i && (!tmpl || !tag)) { - tagDef = parentView.getRsc("tags", tagName) || error("Unknown tag: {{"+ tagName + "}}"); - } - tmpl = tmpl || (tag ? tag : tagDef).template || content; - tmpl = "" + tmpl === tmpl // if a string - ? parentView.getRsc("templates", tmpl) || $templates(tmpl) - : tmpl; - - $extend(tagCtx, { - tmpl: tmpl, - render: renderContent, - index: i, - view: parentView, - ctx: extendCtx(tagCtx.ctx, ctx) // Extend parentView.ctx - }); // Extend parentView.ctx - - if (!tag) { - // This will only be hit for initial tagCtx (not for {{else}}) - if the tag instance does not exist yet - // Instantiate tag if it does not yet exist - if (tagDef._ctr) { - // If the tag has not already been instantiated, we will create a new instance. - // ~tag will access the tag, even within the rendering of the template content of this tag. - // From child/descendant tags, can access using ~tag.parent, or ~parentTags.tagName -// TODO provide error handling owned by the tag - using tag.onError -// try { - tag = new tagDef._ctr(); - callInit = !!tag.init; -// } -// catch(e) { -// tagDef.onError(e); -// } - // Set attr on linkCtx to ensure outputting to the correct target attribute. - tag.attr = tag.attr || tagDef.attr || undefined; - // Setting either linkCtx.attr or this.attr in the init() allows per-instance choice of target attrib. - } else { - // This is a simple tag declared as a function, or with init set to false. We won't instantiate a specific tag constructor - just a standard instance object. - tag = { - // tag instance object if no init constructor - render: tagDef.render - }; - } - tag._ = { - inline: !linkCtx - }; - if (linkCtx) { - // Set attr on linkCtx to ensure outputting to the correct target attribute. - linkCtx.attr = tag.attr = linkCtx.attr || tag.attr; - linkCtx.tag = tag; - tag.linkCtx = linkCtx; - } - if (tag._.bnd = boundTagFn || linkCtx.fn) { - // Bound if {^{tag...}} or data-link="{tag...}" - tag._.arrVws = {}; - } else if (tag.dataBoundOnly) { - error("{^{" + tagName + "}} tag must be data-bound"); - } - tag.tagName = tagName; - tag.parent = parentTag = ctx && ctx.tag; - tag._is = "tag"; - tag._def = tagDef; - //TODO better perf for childTags() - keep child tag.tags array, (and remove child, when disposed) - // tag.tags = []; - // Provide this tag on view, for addBindingMarkers on bound tags to add the tag to view._.bnds, associated with the tag id, - } - parentView_.tag = tag; - tagCtx.tag = tag; - tag.tagCtxs = tagCtxs; - if (!tag.flow) { - tagCtxCtx = tagCtx.ctx = tagCtx.ctx || {}; - - // tags hash: tag.ctx.tags, merged with parentView.ctx.tags, - tags = tag.parents = tagCtxCtx.parentTags = ctx && extendCtx(tagCtxCtx.parentTags, ctx.parentTags) || {}; - if (parentTag) { - tags[parentTag.tagName] = parentTag; - //TODO better perf for childTags: parentTag.tags.push(tag); - } - tagCtxCtx.tag = tag; - } - } - tag.rendering = {}; // Provide object for state during render calls to tag and elses. (Used by {{if}} and {{for}}...) - for (i = 0; i < l; i++) { - tagCtx = tag.tagCtx = tagCtxs[i]; - tag.ctx = tagCtx.ctx; - - if (!i && callInit) { - tag.init(tagCtx, linkCtx, tag.ctx); - callInit = undefined; - } - - itemRet = undefined; - if (render = tag.render) { - itemRet = render.apply(tag, tagCtx.args); - } - itemRet = itemRet !== undefined - ? itemRet // Return result of render function unless it is undefined, in which case return rendered template - : tagCtx.tmpl && tagCtx.render() || (isRefresh ? undefined : ""); - // No return value from render, and no template/content tagCtx.render(), so return undefined - ret = ret ? ret + (itemRet || "") : itemRet; // If no rendered content, this will be undefined - } - - delete tag.rendering; - - tag.tagCtx = tag.tagCtxs[0]; - tag.ctx= tag.tagCtx.ctx; - - if (tag._.inline && (attr = tag.attr) && attr !== "html") { - // inline tag with attr set to "text" will insert HTML-encoded content - as if it was element-based innerText - ret = attr === "text" - ? $converters.html(ret) - : ""; - } - return boundTagKey && parentView._.onRender - // Call onRender (used by JsViews if present, to add binding annotations around rendered content) - ? parentView._.onRender(ret, parentView, boundTagKey) - : ret; - } - - //================= - // View constructor - //================= - - function View(context, type, parentView, data, template, key, contentTmpl, onRender) { - // Constructor for view object in view hierarchy. (Augmented by JsViews if JsViews is loaded) - var views, parentView_, tag, - isArray = type === "array", - self_ = { - key: 0, - useKey: isArray ? 0 : 1, - id: "" + viewId++, - onRender: onRender, - bnds: {} - }, - self = { - data: data, - tmpl: template, - content: contentTmpl, - views: isArray ? [] : {}, - parent: parentView, - type: type, - // If the data is an array, this is an 'array view' with a views array for each child 'item view' - // If the data is not an array, this is an 'item view' with a views 'map' object for any child nested views - // ._.useKey is non zero if is not an 'array view' (owning a data array). Uuse this as next key for adding to child views map - get: getView, - getIndex: getIndex, - getRsc: getResource, - hlp: getHelper, - _: self_, - _is: "view" - }; - if (parentView) { - views = parentView.views; - parentView_ = parentView._; - if (parentView_.useKey) { - // Parent is an 'item view'. Add this view to its views object - // self._key = is the key in the parent view map - views[self_.key = "_" + parentView_.useKey++] = self; - self.index = $viewsSettings.debugMode ? noIndex : ""; - self.getIndex = getNestedIndex; - tag = parentView_.tag; - self_.bnd = isArray && (!tag || !!tag._.bnd && tag); // For array views that are data bound for collection change events, set the - // view._.bnd property to true for top-level link() or data-link="{for}", or to the tag instance for a data-bound tag, e.g. {^{for ...}} - } else { - // Parent is an 'array view'. Add this view to its views array - views.splice( - // self._.key = self.index - the index in the parent view array - self_.key = self.index = key, - 0, self); - } - // If no context was passed in, use parent context - // If context was passed in, it should have been merged already with parent context - self.ctx = context || parentView.ctx; - } else { - self.ctx = context; - } - return self; - } - - //============= - // Registration - //============= - - function compileChildResources(parentTmpl) { - var storeName, resources, resourceName, settings, compile; - for (storeName in jsvStores) { - settings = jsvStores[storeName]; - if ((compile = settings.compile) && (resources = parentTmpl[storeName + "s"])) { - for (resourceName in resources) { - // compile child resource declarations (templates, tags, converters or helpers) - resources[resourceName] = compile(resourceName, resources[resourceName], parentTmpl, storeName, settings); - } - } - } - } - - function compileTag(name, tagDef, parentTmpl) { - var init, tmpl; - if (typeof tagDef === "function") { - // Simple tag declared as function. No presenter instantation. - tagDef = { - depends: tagDef.depends, - render: tagDef - }; - } else { - // Tag declared as object, used as the prototype for tag instantiation (control/presenter) - if (tmpl = tagDef.template) { - tagDef.template = "" + tmpl === tmpl ? ($templates[tmpl] || $templates(tmpl)) : tmpl; - } - if (tagDef.init !== false) { - // Set int: false on tagDef if you want to provide just a render method, or render and template, but no constuctor or prototype. - // so equivalent to setting tag to render function, except you can also provide a template. - init = tagDef._ctr = function(tagCtx) {}; - (init.prototype = tagDef).constructor = init; - } - } - if (parentTmpl) { - tagDef._parentTmpl = parentTmpl; - } -//TODO tagDef.onError = function(e) { -// var error; -// if (error = this.prototype.onError) { -// error.call(this, e); -// } else { -// throw e; -// } -// } - return tagDef; - } - - function compileTmpl(name, tmpl, parentTmpl, storeName, storeSettings, options) { - // tmpl is either a template object, a selector for a template script block, the name of a compiled template, or a template object - - //==== nested functions ==== - function tmplOrMarkupFromStr(value) { - // If value is of type string - treat as selector, or name of compiled template - // Return the template object, if already compiled, or the markup string - - if (("" + value === value) || value.nodeType > 0) { - try { - elem = value.nodeType > 0 - ? value - : !rTmplString.test(value) - // If value is a string and does not contain HTML or tag content, then test as selector - && jQuery && jQuery(global.document).find(value)[0]; - // If selector is valid and returns at least one element, get first element - // If invalid, jQuery will throw. We will stay with the original string. - } catch (e) {} - - if (elem) { - // Generally this is a script element. - // However we allow it to be any element, so you can for example take the content of a div, - // use it as a template, and replace it by the same content rendered against data. - // e.g. for linking the content of a div to a container, and using the initial content as template: - // $.link("#content", model, {tmpl: "#content"}); - - value = elem.getAttribute(tmplAttr); - name = name || value; - value = $templates[value]; - if (!value) { - // Not already compiled and cached, so compile and cache the name - // Create a name for compiled template if none provided - name = name || "_" + autoTmplName++; - elem.setAttribute(tmplAttr, name); - // Use tmpl as options - value = $templates[name] = compileTmpl(name, elem.innerHTML, parentTmpl, storeName, storeSettings, options); - } - } - return value; - } - // If value is not a string, return undefined - } - - var tmplOrMarkup, elem; - - //==== Compile the template ==== - tmpl = tmpl || ""; - tmplOrMarkup = tmplOrMarkupFromStr(tmpl); - - // If options, then this was already compiled from a (script) element template declaration. - // If not, then if tmpl is a template object, use it for options - options = options || (tmpl.markup ? tmpl : {}); - options.tmplName = name; - if (parentTmpl) { - options._parentTmpl = parentTmpl; - } - // If tmpl is not a markup string or a selector string, then it must be a template object - // In that case, get it from the markup property of the object - if (!tmplOrMarkup && tmpl.markup && (tmplOrMarkup = tmplOrMarkupFromStr(tmpl.markup))) { - if (tmplOrMarkup.fn && (tmplOrMarkup.debug !== tmpl.debug || tmplOrMarkup.allowCode !== tmpl.allowCode)) { - // if the string references a compiled template object, but the debug or allowCode props are different, need to recompile - tmplOrMarkup = tmplOrMarkup.markup; - } - } - if (tmplOrMarkup !== undefined) { - if (name && !parentTmpl) { - $render[name] = function() { - return tmpl.render.apply(tmpl, arguments); - }; - } - if (tmplOrMarkup.fn || tmpl.fn) { - // tmpl is already compiled, so use it, or if different name is provided, clone it - if (tmplOrMarkup.fn) { - if (name && name !== tmplOrMarkup.tmplName) { - tmpl = extendCtx(options, tmplOrMarkup); - } else { - tmpl = tmplOrMarkup; - } - } - } else { - // tmplOrMarkup is a markup string, not a compiled template - // Create template object - tmpl = TmplObject(tmplOrMarkup, options); - // Compile to AST and then to compiled function - tmplFn(tmplOrMarkup.replace(rEscapeQuotes, "\\$&"), tmpl); - } - compileChildResources(options); - return tmpl; - } - } - //==== /end of function compile ==== - - function TmplObject(markup, options) { - // Template object constructor - var htmlTag, - wrapMap = $viewsSettings.wrapMap || {}, - tmpl = $extend( - { - markup: markup, - tmpls: [], - links: {}, // Compiled functions for link expressions - tags: {}, // Compiled functions for bound tag expressions - bnds: [], - _is: "template", - render: renderContent - }, - options - ); - - if (!options.htmlTag) { - // Set tmpl.tag to the top-level HTML tag used in the template, if any... - htmlTag = rFirstElem.exec(markup); - tmpl.htmlTag = htmlTag ? htmlTag[1].toLowerCase() : ""; - } - htmlTag = wrapMap[tmpl.htmlTag]; - if (htmlTag && htmlTag !== wrapMap.div) { - // When using JsViews, we trim templates which are inserted into HTML contexts where text nodes are not rendered (i.e. not 'Phrasing Content'). - // Currently not trimmed for
  • tag. (Not worth adding perf cost) - tmpl.markup = $.trim(tmpl.markup); - } - - return tmpl; - } - - function registerStore(storeName, storeSettings) { - - function theStore(name, item, parentTmpl) { - // The store is also the function used to add items to the store. e.g. $.templates, or $.views.tags - - // For store of name 'thing', Call as: - // $.views.things(items[, parentTmpl]), - // or $.views.things(name, item[, parentTmpl]) - - var onStore, compile, itemName, thisStore; - - if (name && "" + name !== name && !name.nodeType && !name.markup) { - // Call to $.views.things(items[, parentTmpl]), - - // Adding items to the store - // If name is a map, then item is parentTmpl. Iterate over map and call store for key. - for (itemName in name) { - theStore(itemName, name[itemName], item); - } - return $views; - } - // Adding a single unnamed item to the store - if (item === undefined) { - item = name; - name = undefined; - } - if (name && "" + name !== name) { // name must be a string - parentTmpl = item; - item = name; - name = undefined; - } - thisStore = parentTmpl ? parentTmpl[storeNames] = parentTmpl[storeNames] || {} : theStore; - compile = storeSettings.compile; - if (onStore = $viewsSub.onBeforeStoreItem) { - // e.g. provide an external compiler or preprocess the item. - compile = onStore(thisStore, name, item, compile) || compile; - } - if (!name) { - item = compile(undefined, item); - } else if (item === null) { - // If item is null, delete this entry - delete thisStore[name]; - } else { - thisStore[name] = compile ? (item = compile(name, item, parentTmpl, storeName, storeSettings)) : item; - } - if (compile && item) { - item._is = storeName; // Only do this for compiled objects (tags, templates...) - } - if (onStore = $viewsSub.onStoreItem) { - // e.g. JsViews integration - onStore(thisStore, name, item, compile); - } - return item; - } - - var storeNames = storeName + "s"; - - $views[storeNames] = theStore; - jsvStores[storeName] = storeSettings; - } - - //============== - // renderContent - //============== - - function renderContent(data, context, parentView, key, isLayout, onRender) { - // Render template against data as a tree of subviews (nested rendered template instances), or as a string (top-level template). - // If the data is the parent view, treat as layout template, re-render with the same data context. - var i, l, dataItem, newView, childView, itemResult, swapContent, tagCtx, contentTmpl, tag_, outerOnRender, tmplName, tmpl, - self = this, - allowDataLink = !self.attr || self.attr === "html", - result = ""; - - if (key === true) { - swapContent = true; - key = 0; - } - if (self.tag) { - // This is a call from renderTag or tagCtx.render() - tagCtx = self; - self = self.tag; - tag_ = self._; - tmplName = self.tagName; - tmpl = tagCtx.tmpl; - context = extendCtx(context, self.ctx); - contentTmpl = tagCtx.content; // The wrapped content - to be added to views, below - if (tagCtx.props.link === false) { - // link=false setting on block tag - // We will override inherited value of link by the explicit setting link=false taken from props - // The child views of an unlinked view are also unlinked. So setting child back to true will not have any effect. - context = context || {}; - context.link = false; - } - parentView = parentView || tagCtx.view; - data = data === undefined ? parentView : data; - } else { - tmpl = self.jquery && (self[0] || error('Unknown template: "' + self.selector + '"')) // This is a call from $(selector).render - || self; - } - if (tmpl) { - if (!parentView && data && data._is === "view") { - parentView = data; // When passing in a view to render or link (and not passing in a parent view) use the passed in view as parentView - } - if (parentView) { - contentTmpl = contentTmpl || parentView.content; // The wrapped content - to be added as #content property on views, below - onRender = onRender || parentView._.onRender; - if (data === parentView) { - // Inherit the data from the parent view. - // This may be the contents of an {{if}} block - // Set isLayout = true so we don't iterate the if block if the data is an array. - data = parentView.data; - isLayout = true; - } - context = extendCtx(context, parentView.ctx); - } - if (!parentView || parentView.data === undefined) { - (context = context || {}).root = data; // Provide ~root as shortcut to top-level data. - } - - // Set additional context on views created here, (as modified context inherited from the parent, and to be inherited by child views) - // Note: If no jQuery, $extend does not support chained copies - so limit extend() to two parameters - - if (!tmpl.fn) { - tmpl = $templates[tmpl] || $templates(tmpl); - } - - if (tmpl) { - onRender = (context && context.link) !== false && allowDataLink && onRender; - // If link===false, do not call onRender, so no data-linking marker nodes - outerOnRender = onRender; - if (onRender === true) { - // Used by view.refresh(). Don't create a new wrapper view. - outerOnRender = undefined; - onRender = parentView._.onRender; - } - context = tmpl.helpers - ? extendCtx(tmpl.helpers, context) - : context; - if ($.isArray(data) && !isLayout) { - // Create a view for the array, whose child views correspond to each data item. (Note: if key and parentView are passed in - // along with parent view, treat as insert -e.g. from view.addViews - so parentView is already the view item for array) - newView = swapContent - ? parentView : - (key !== undefined && parentView) || View(context, "array", parentView, data, tmpl, key, contentTmpl, onRender); - for (i = 0, l = data.length; i < l; i++) { - // Create a view for each data item. - dataItem = data[i]; - childView = View(context, "item", newView, dataItem, tmpl, (key || 0) + i, contentTmpl, onRender); - itemResult = tmpl.fn(dataItem, childView, $views); - result += newView._.onRender ? newView._.onRender(itemResult, childView) : itemResult; - } - } else { - // Create a view for singleton data object. The type of the view will be the tag name, e.g. "if" or "myTag" except for - // "item", "array" and "data" views. A "data" view is from programatic render(object) against a 'singleton'. - newView = swapContent ? parentView : View(context, tmplName||"data", parentView, data, tmpl, key, contentTmpl, onRender); - if (tag_ && !self.flow) { - newView.tag = self; - } - result += tmpl.fn(data, newView, $views); - } - return outerOnRender ? outerOnRender(result, newView) : result; - } - } - return ""; - } - - //=========================== - // Build and compile template - //=========================== - - // Generate a reusable function that will serve to render a template against data - // (Compile AST then build template function) - - function error(message) { - throw new $viewsSub.Error(message); - } - - function syntaxError(message) { - error("Syntax error\n" + message); - } - - function tmplFn(markup, tmpl, isLinkExpr, convertBack) { - // Compile markup to AST (abtract syntax tree) then build the template function code from the AST nodes - // Used for compiling templates, and also by JsViews to build functions for data link expressions - - //==== nested functions ==== - function pushprecedingContent(shift) { - shift -= loc; - if (shift) { - content.push(markup.substr(loc, shift).replace(rNewLine, "\\n")); - } - } - - function blockTagCheck(tagName) { - tagName && syntaxError('Unmatched or missing tag: "{{/' + tagName + '}}" in template:\n' + markup); - } - - function parseTag(all, bind, tagName, converter, colon, html, comment, codeTag, params, slash, closeBlock, index) { - - // bind tag converter colon html comment code params slash closeBlock - // /{(\^)?{(?:(?:(\w+(?=[\/\s}]))|(?:(\w+)?(:)|(>)|!--((?:[^-]|-(?!-))*)--|(\*)))\s*((?:[^}]|}(?!}))*?)(\/)?|(?:\/(\w+)))}}/g - // Build abstract syntax tree (AST): [tagName, converter, params, content, hash, bindings, contentMarkup] - if (html) { - colon = ":"; - converter = "html"; - } - slash = slash || isLinkExpr; - var noError, current0, - pathBindings = bind && [], - code = "", - hash = "", - passedCtx = "", - // Block tag if not self-closing and not {{:}} or {{>}} (special case) and not a data-link expression - block = !slash && !colon && !comment; - - //==== nested helper function ==== - tagName = tagName || colon; - pushprecedingContent(index); - loc = index + all.length; // location marker - parsed up to here - if (codeTag) { - if (allowCode) { - content.push(["*", "\n" + params.replace(rUnescapeQuotes, "$1") + "\n"]); - } - } else if (tagName) { - if (tagName === "else") { - if (rTestElseIf.test(params)) { - syntaxError('for "{{else if expr}}" use "{{else expr}}"'); - } - pathBindings = current[6]; - current[7] = markup.substring(current[7], index); // contentMarkup for block tag - current = stack.pop(); - content = current[3]; - block = true; - } - if (params) { - // remove newlines from the params string, to avoid compiled code errors for unterminated strings - params = params.replace(rNewLine, " "); - code = parseParams(params, pathBindings, tmpl) - .replace(rBuildHash, function(all, isCtx, keyValue) { - if (isCtx) { - passedCtx += keyValue + ","; - } else { - hash += keyValue + ","; - } - return ""; - }); - } - hash = hash.slice(0, -1); - code = code.slice(0, -1); - noError = hash && (hash.indexOf("noerror:true") + 1) && hash || ""; - - newNode = [ - tagName, - converter || !!convertBack || "", - code, - block && [], - 'params:"' + params + '",props:{' + hash + "}" - + (passedCtx ? ",ctx:{" + passedCtx.slice(0, -1) + "}" : ""), - noError, - pathBindings || 0 - ]; - content.push(newNode); - if (block) { - stack.push(current); - current = newNode; - current[7] = loc; // Store current location of open tag, to be able to add contentMarkup when we reach closing tag - } - } else if (closeBlock) { - current0 = current[0]; - blockTagCheck(closeBlock !== current0 && current0 !== "else" && closeBlock); - current[7] = markup.substring(current[7], index); // contentMarkup for block tag - current = stack.pop(); - } - blockTagCheck(!current && closeBlock); - content = current[3]; - } - //==== /end of nested functions ==== - - var newNode, - allowCode = tmpl && tmpl.allowCode, - astTop = [], - loc = 0, - stack = [], - content = astTop, - current = [, , , astTop]; - -//TODO result = tmplFnsCache[markup]; // Only cache if template is not named and markup length < ..., -//and there are no bindings or subtemplates?? Consider standard optimization for data-link="a.b.c" -// if (result) { -// tmpl.fn = result; -// } else { - -// result = markup; - - blockTagCheck(stack[0] && stack[0][3].pop()[0]); - // Build the AST (abstract syntax tree) under astTop - markup.replace(rTag, parseTag); - - pushprecedingContent(markup.length); - - if (loc = astTop[astTop.length - 1]) { - blockTagCheck("" + loc !== loc && (+loc[7] === loc[7]) && loc[0]); - } -// result = tmplFnsCache[markup] = buildCode(astTop, tmpl); -// } - return buildCode(astTop, isLinkExpr ? markup : tmpl, isLinkExpr); - } - - function buildCode(ast, tmpl, isLinkExpr) { - // Build the template function code from the AST nodes, and set as property on the passed-in template object - // Used for compiling templates, and also by JsViews to build functions for data link expressions - var i, node, tagName, converter, params, hash, hasTag, hasEncoder, getsVal, hasCnvt, useCnvt, tmplBindings, pathBindings, - nestedTmpls, tmplName, nestedTmpl, tagAndElses, content, markup, nextIsElse, oldCode, isElse, isGetVal, prm, tagCtxFn, - tmplBindingKey = 0, - code = "", - noError = "", - tmplOptions = {}, - l = ast.length; - - if ("" + tmpl === tmpl) { - tmplName = isLinkExpr ? 'data-link="' + tmpl.replace(rNewLine, " ").slice(1, -1) + '"' : tmpl; - tmpl = 0; - } else { - tmplName = tmpl.tmplName || "unnamed"; - if (tmpl.allowCode) { - tmplOptions.allowCode = true; - } - if (tmpl.debug) { - tmplOptions.debug = true; - } - tmplBindings = tmpl.bnds; - nestedTmpls = tmpl.tmpls; - } - for (i = 0; i < l; i++) { - // AST nodes: [tagName, converter, params, content, hash, noError, pathBindings, contentMarkup, link] - node = ast[i]; - - // Add newline for each callout to t() c() etc. and each markup string - if ("" + node === node) { - // a markup string to be inserted - code += '\nret+="' + node + '";'; - } else { - // a compiled tag expression to be inserted - tagName = node[0]; - if (tagName === "*") { - // Code tag: {{* }} - code += "" + node[1]; - } else { - converter = node[1]; - params = node[2]; - content = node[3]; - hash = node[4]; - noError = node[5]; - markup = node[7]; - - if (!(isElse = tagName === "else")) { - tmplBindingKey = 0; - if (tmplBindings && (pathBindings = node[6])) { // Array of paths, or false if not data-bound - tmplBindingKey = tmplBindings.push(pathBindings); - } - } - if (isGetVal = tagName === ":") { - if (converter) { - tagName = converter === "html" ? ">" : converter + tagName; - } - if (noError) { - // If the tag includes noerror=true, we will do a try catch around expressions for named or unnamed parameters - // passed to the tag, and return the empty string for each expression if it throws during evaluation - //TODO This does not work for general case - supporting noError on multiple expressions, e.g. tag args and properties. - //Consider replacing with try and return the value of the expression a.b.c(p,q) + a.d, or, if it throws, return xxx||'' (rather than always the empty string) - prm = "prm" + i; - noError = "try{var " + prm + "=[" + params + "][0];}catch(e){" + prm + '="";}\n'; - params = prm; - } - } else { - if (content) { - // Create template object for nested template - nestedTmpl = TmplObject(markup, tmplOptions); - nestedTmpl.tmplName = tmplName + "/" + tagName; - // Compile to AST and then to compiled function - buildCode(content, nestedTmpl); - nestedTmpls.push(nestedTmpl); - } - - if (!isElse) { - // This is not an else tag. - tagAndElses = tagName; - // Switch to a new code string for this bound tag (and its elses, if it has any) - for returning the tagCtxs array - oldCode = code; - code = ""; - } - nextIsElse = ast[i + 1]; - nextIsElse = nextIsElse && nextIsElse[0] === "else"; - } - - hash += ",args:[" + params + "]}"; - - if (isGetVal && pathBindings || converter && tagName !== ">") { - // For convertVal we need a compiled function to return the new tagCtx(s) - tagCtxFn = new Function("data,view,j,u", " // " - + tmplName + " " + tmplBindingKey + " " + tagName + "\n" + noError + "return {" + hash + ";"); - tagCtxFn.paths = pathBindings; - tagCtxFn._ctxs = tagName; - if (isLinkExpr) { - return tagCtxFn; - } - useCnvt = 1; - } - - code += (isGetVal - ? "\n" + (pathBindings ? "" : noError) + (isLinkExpr ? "return " : "ret+=") + (useCnvt // Call _cnvt if there is a converter: {{cnvt: ... }} or {^{cnvt: ... }} - ? (useCnvt = 0, hasCnvt = true, 'c("' + converter + '",view,' + (pathBindings - ? ((tmplBindings[tmplBindingKey - 1] = tagCtxFn), tmplBindingKey) // Store the compiled tagCtxFn in tmpl.bnds, and pass the key to convertVal() - : "{" + hash) + ");") - : tagName === ">" - ? (hasEncoder = true, "h(" + params + ");") - : (getsVal = true, "(v=" + params + ")!=" + (isLinkExpr ? "=" : "") + 'u?v:"";') // Strict equality just for data-link="title{:expr}" so expr=null will remove title attribute - ) - : (hasTag = true, "{view:view,tmpl:" // Add this tagCtx to the compiled code for the tagCtxs to be passed to renderTag() - + (content ? nestedTmpls.length: "0") + "," // For block tags, pass in the key (nestedTmpls.length) to the nested content template - + hash + ",")); - - if (tagAndElses && !nextIsElse) { - code = "[" + code.slice(0, -1) + "]"; // This is a data-link expression or the last {{else}} of an inline bound tag. We complete the code for returning the tagCtxs array - if (isLinkExpr || pathBindings) { - // This is a bound tag (data-link expression or inline bound tag {^{tag ...}}) so we store a compiled tagCtxs function in tmp.bnds - code = new Function("data,view,j,u", " // " + tmplName + " " + tmplBindingKey + " " + tagAndElses + "\nreturn " + code + ";"); - if (pathBindings) { - (tmplBindings[tmplBindingKey - 1] = code).paths = pathBindings; - } - code._ctxs = tagName; - if (isLinkExpr) { - return code; // For a data-link expression we return the compiled tagCtxs function - } - } - - // This is the last {{else}} for an inline tag. - // For a bound tag, pass the tagCtxs fn lookup key to renderTag. - // For an unbound tag, include the code directly for evaluating tagCtxs array - code = oldCode + '\nret+=t("' + tagAndElses + '",view,this,' + (tmplBindingKey || code) + ");"; - pathBindings = 0; - tagAndElses = 0; - } - } - } - } - // Include only the var references that are needed in the code - code = "// " + tmplName - + "\nvar j=j||" + (jQuery ? "jQuery." : "js") + "views" - + (getsVal ? ",v" : "") // gets value - + (hasTag ? ",t=j._tag" : "") // has tag - + (hasCnvt ? ",c=j._cnvt" : "") // converter - + (hasEncoder ? ",h=j.converters.html" : "") // html converter - + (isLinkExpr ? ";\n" : ',ret="";\n') - + ($viewsSettings.tryCatch ? "try{\n" : "") - + (tmplOptions.debug ? "debugger;" : "") - + code + (isLinkExpr ? "\n" : "\nreturn ret;\n") - + ($viewsSettings.tryCatch ? "\n}catch(e){return j._err(e);}" : ""); - try { - code = new Function("data,view,j,u", code); - } catch (e) { - syntaxError("Compiled template code:\n\n" + code, e); - } - if (tmpl) { - tmpl.fn = code; - } - return code; - } - - function parseParams(params, bindings, tmpl) { - - //function pushBindings() { // Consider structured path bindings - // if (bindings) { - // named ? bindings[named] = bindings.pop(): bindings.push(list = []); - // } - //} - - function parseTokens(all, lftPrn0, lftPrn, bound, path, operator, err, eq, path2, prn, comma, lftPrn2, apos, quot, rtPrn, rtPrnDot, prn2, space, index, full) { - //rParams = /(\()(?=\s*\()|(?:([([])\s*)?(?:(\^?)(!*?[#~]?[\w$.^]+)?\s*((\+\+|--)|\+|-|&&|\|\||===|!==|==|!=|<=|>=|[<>%*:?\/]|(=))\s*|(!*?[#~]?[\w$.^]+)([([])?)|(,\s*)|(\(?)\\?(?:(')|("))|(?:\s*(([)\]])(?=\s*\.|\s*\^)|[)\]])([([]?))|(\s+)/g, - // lftPrn0 lftPrn bound path operator err eq path2 prn comma lftPrn2 apos quot rtPrn rtPrnDot prn2 space - // (left paren? followed by (path? followed by operator) or (path followed by paren?)) or comma or apos or quot or right paren or space - var expr; - operator = operator || ""; - lftPrn = lftPrn || lftPrn0 || lftPrn2; - path = path || path2; - prn = prn || prn2 || ""; - - function parsePath(allPath, not, object, helper, view, viewProperty, pathTokens, leafToken) { - // rPath = /^(?:null|true|false|\d[\d.]*|(!*?)([\w$]+|\.|~([\w$]+)|#(view|([\w$]+))?)([\w$.^]*?)(?:[.[^]([\w$]+)\]?)?)$/g, - // none object helper view viewProperty pathTokens leafToken - if (object) { - if (bindings) { - if (named === "linkTo") { - bindto = bindings._jsvto = bindings._jsvto || []; - bindto.push(path); - } - if (!named || boundName) { - bindings.push(path.slice(not.length)); // Add path binding for paths on props and args, -// list.push(path); - } - } - if (object !== ".") { - var ret = (helper - ? 'view.hlp("' + helper + '")' - : view - ? "view" - : "data") - + (leafToken - ? (viewProperty - ? "." + viewProperty - : helper - ? "" - : (view ? "" : "." + object) - ) + (pathTokens || "") - : (leafToken = helper ? "" : view ? viewProperty || "" : object, "")); - - ret = ret + (leafToken ? "." + leafToken : ""); - - return not + (ret.slice(0, 9) === "view.data" - ? ret.slice(5) // convert #view.data... to data... - : ret); - } - } - return allPath; - } - - if (err) { - syntaxError(params); - } else { - if (bindings && rtPrnDot && !aposed && !quoted) { - // This is a binding to a path in which an object is returned by a helper/data function/expression, e.g. foo()^x.y or (a?b:c)^x.y - // We create a compiled function to get the object instance (which will be called when the dependent data of the subexpression changes, to return the new object, and trigger re-binding of the subsequent path) - if (!named || boundName || bindto) { - expr = pathStart[parenDepth]; - if (full.length - 1 > index - expr) { // We need to compile a subexpression - expr = full.slice(expr, index + 1); - rtPrnDot = delimOpenChar1 + ":" + expr + delimCloseChar0; // The parameter or function subexpression - //TODO Optimize along the lines of: - //var paths = []; - //rtPrnDot = tmplLinks[rtPrnDot] = tmplLinks[rtPrnDot] || tmplFn(delimOpenChar0 + rtPrnDot + delimCloseChar1, tmpl, true, paths); // Compile the expression (or use cached copy already in tmpl.links) - //rtPrnDot.paths = rtPrnDot.paths || paths; - - rtPrnDot = tmplLinks[rtPrnDot] = tmplLinks[rtPrnDot] || tmplFn(delimOpenChar0 + rtPrnDot + delimCloseChar1, tmpl, true); // Compile the expression (or use cached copy already in tmpl.links) - if (!rtPrnDot.paths) { - parseParams(expr, rtPrnDot.paths = [], tmpl); - } - (bindto || bindings).push({_jsvOb: rtPrnDot}); // Insert special object for in path bindings, to be used for binding the compiled sub expression () - //list.push({_jsvOb: rtPrnDot}); - } - } - } - return (aposed - // within single-quoted string - ? (aposed = !apos, (aposed ? all : '"')) - : quoted - // within double-quoted string - ? (quoted = !quot, (quoted ? all : '"')) - : - ( - (lftPrn - ? (parenDepth++, pathStart[parenDepth] = index++, lftPrn) - : "") - + (space - ? (parenDepth - ? "" - //: (pushBindings(), named - // : ",") - : named - ? (named = boundName = bindto = false, "\b") - : "," - ) - : eq - // named param - // Insert backspace \b (\x08) as separator for named params, used subsequently by rBuildHash - ? (parenDepth && syntaxError(params), named = path, boundName = bound, /*pushBindings(),*/ '\b' + path + ':') - : path - // path - ? (path.split("^").join(".").replace(rPath, parsePath) - + (prn - ? (fnCall[++parenDepth] = true, path.charAt(0) !== "." && (pathStart[parenDepth] = index), prn) - : operator) - ) - : operator - ? operator - : rtPrn - // function - ? ((fnCall[parenDepth--] = false, rtPrn) - + (prn - ? (fnCall[++parenDepth] = true, prn) - : "") - ) - : comma - ? (fnCall[parenDepth] || syntaxError(params), ",") // We don't allow top-level literal arrays or objects - : lftPrn0 - ? "" - : (aposed = apos, quoted = quot, '"') - )) - ); - } - } - - var named, bindto, boundName, // list, - tmplLinks = tmpl.links, - fnCall = {}, - pathStart = {0:-1}, - parenDepth = 0, - quoted = false, // boolean for string content in double quotes - aposed = false; // or in single quotes - - //pushBindings(); - - return (params + " ") - .replace(/\)\^/g, ").") // Treat "...foo()^bar..." as equivalent to "...foo().bar..." - //since preceding computed observables in the path will always be updated if their dependencies change - .replace(rParams, parseTokens); - } - - //========== - // Utilities - //========== - - // Merge objects, in particular contexts which inherit from parent contexts - function extendCtx(context, parentContext) { - // Return copy of parentContext, unless context is defined and is different, in which case return a new merged context - // If neither context nor parentContext are defined, return undefined - return context && context !== parentContext - ? (parentContext - ? $extend($extend({}, parentContext), context) - : context) - : parentContext && $extend({}, parentContext); - } - - // Get character entity for HTML and Attribute encoding - function getCharEntity(ch) { - return charEntities[ch] || (charEntities[ch] = "&#" + ch.charCodeAt(0) + ";"); - } - - //========================== Initialize ========================== - - for (jsvStoreName in jsvStores) { - registerStore(jsvStoreName, jsvStores[jsvStoreName]); - } - - var $templates = $views.templates, - $converters = $views.converters, - $helpers = $views.helpers, - $tags = $views.tags, - $viewsSub = $views.sub, - $viewsSettings = $views.settings, - noIndex = "Error: #index in nested view: use #getIndex()"; // Error string if debugMode, else empty - - if (jQuery) { - //////////////////////////////////////////////////////////////////////////////////////////////// - // jQuery is loaded, so make $ the jQuery object - $ = jQuery; - $.fn.render = renderContent; - - } else { - //////////////////////////////////////////////////////////////////////////////////////////////// - // jQuery is not loaded. - - $ = global.jsviews = {}; - - $.isArray = Array && Array.isArray || function(obj) { - return Object.prototype.toString.call(obj) === "[object Array]"; - }; - - // //========================== Future Node.js support ========================== - // if ((nodeJsModule = global.module) && nodeJsModule.exports) { - // nodeJsModule.exports = $; - // } - } - - $.render = $render; - $.views = $views; - $.templates = $templates = $views.templates; - - //========================== Register tags ========================== - - $tags({ - "else": function() {}, // Does nothing but ensures {{else}} tags are recognized as valid - "if": { - render: function(val) { - // This function is called once for {{if}} and once for each {{else}}. - // We will use the tag.rendering object for carrying rendering state across the calls. - // If not done (a previous block has not been rendered), look at expression for this block and render the block if expression is truthy - // Otherwise return "" - var self = this, - ret = (self.rendering.done || !val && (arguments.length || !self.tagCtx.index)) - ? "" - : (self.rendering.done = true, self.selected = self.tagCtx.index, - // Test is satisfied, so render content on current context. We call tagCtx.render() rather than return undefined - // (which would also render the tmpl/content on the current context but would iterate if it is an array) - self.tagCtx.render()); - return ret; - }, - onUpdate: function(ev, eventArgs, tagCtxs) { - var tci, prevArg, different; - for (tci = 0; (prevArg = this.tagCtxs[tci]) && prevArg.args.length; tci++) { - prevArg = prevArg.args[0]; - different = !prevArg !== !tagCtxs[tci].args[0]; - if (!!prevArg || different) { - return different; - // If newArg and prevArg are both truthy, return false to cancel update. (Even if values on later elses are different, we still don't want to update, since rendered output would be unchanged) - // If newArg and prevArg are different, return true, to update - // If newArg and prevArg are both falsey, move to the next {{else ...}} - } - } - // Boolean value of all args are unchanged (falsey), so return false to cancel update - return false; - }, - flow: true - }, - "for": { - render: renderForBlock, - //onUpdate: function(ev, eventArgs, tagCtxs) { - //Consider adding filtering for perf optimization. However the below prevents update on some scenarios which _should_ update - namely when there is another array on which for also depends. - //var i, l, tci, prevArg; - //for (tci = 0; (prevArg = this.tagCtxs[tci]) && prevArg.args.length; tci++) { - // if (prevArg.args[0] !== tagCtxs[tci].args[0]) { - // return true; - // } - //} - //return false; - //}, - onArrayChange: function(ev, eventArgs) { - var arrayView, - self = this, - change = eventArgs.change; - if (this.tagCtxs[1] && ( // There is an {{else}} - change === "insert" && ev.target.length === eventArgs.items.length // inserting, and new length is same as inserted length, so going from 0 to n - || change === "remove" && !ev.target.length // removing , and new length 0, so going from n to 0 - || change === "refresh" && !eventArgs.oldItems.length !== !ev.target.length // refreshing, and length is going from 0 to n or from n to 0 - )) { - this.refresh(); - } else { - for (arrayView in self._.arrVws) { - arrayView = self._.arrVws[arrayView]; - if (arrayView.data === ev.target) { - arrayView._.onArrayChange.apply(arrayView, arguments); - } - } - } - ev.done = true; - }, - flow: true - }, - props: { - prep: function(object) { - var key, - arr = []; - for (key in object) { - arr.push({key: key, prop: object[key]}); - } - return arr; - }, - render: renderForBlock, - flow: true - }, - include: { - flow: true - }, - "*": { - // {{* code... }} - Ignored if template.allowCode is false. Otherwise include code in compiled template - render: function(value) { - return value; // Include the code. - }, - flow: true - } - }); - - function renderForBlock(val) { - // This function is called once for {{for}} and once for each {{else}}. - // We will use the tag.rendering object for carrying rendering state across the calls. - var self = this, - tagCtx = self.tagCtx, - noArg = !arguments.length, - result = "", - done = noArg || 0; - - if (!self.rendering.done) { - if (noArg) { - result = undefined; - } else if (val !== undefined) { - val = self.prep ? self.prep(val) : val; - result += tagCtx.render(val); - done += $.isArray(val) ? val.length : 1; - } - if (self.rendering.done = done) { - self.selected = tagCtx.index; - } - // If nothing was rendered we will look at the next {{else}}. Otherwise, we are done. - } - return result; - } - //========================== Register converters ========================== - - $converters({ - html: function(text) { - // HTML encode: Replace < > & and ' and " by corresponding entities. - return text != undefined ? String(text).replace(rHtmlEncode, getCharEntity) : ""; // null and undefined return "" - }, - attr: function(text) { - // Attribute encode: Replace < > & ' and " by corresponding entities. - return text != undefined ? String(text).replace(rAttrEncode, getCharEntity) : text === null ? text : ""; // null returns null, e.g. to remove attribute. undefined returns "" - }, - url: function(text) { - // URL encoding helper. - return text != undefined ? encodeURI(String(text)) : text === null ? text : ""; // null returns null, e.g. to remove attribute. undefined returns "" - } - }); - - //========================== Define default delimiters ========================== - $viewsDelimiters(); - -})(this, this.jQuery); diff --git a/nano/js/nano_base_helpers.js b/nano/js/nano_base_helpers.js index ed3ce322f1..9b83dba6ba 100644 --- a/nano/js/nano_base_helpers.js +++ b/nano/js/nano_base_helpers.js @@ -14,7 +14,7 @@ NanoBaseHelpers = function () var initHelpers = function () { - $.views.helpers({ + NanoTemplate.addHelpers({ syndicateMode: function() { $('body').css("background-color","#8f1414"); @@ -26,7 +26,7 @@ NanoBaseHelpers = function () $('#uiTitleFluff').css("background-position","50% 50%"); $('#uiTitleFluff').css("background-repeat", "no-repeat"); - return ''; + return ''; }, // Generate a Byond link @@ -56,7 +56,7 @@ NanoBaseHelpers = function () return '
    ' + iconHtml + text + '
    '; } - return '
    ' + iconHtml + text + '
    '; + return '
    ' + iconHtml + text + '
    '; }, // Round a number to the nearest integer round: function(number) { @@ -91,12 +91,12 @@ NanoBaseHelpers = function () } return ''; }, - formatNumber: function(x) { - // From http://stackoverflow.com/questions/2901102/how-to-print-a-number-with-commas-as-thousands-separators-in-javascript - var parts = x.toString().split("."); - parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); - return parts.join("."); - }, + formatNumber: function(x) { + // From http://stackoverflow.com/questions/2901102/how-to-print-a-number-with-commas-as-thousands-separators-in-javascript + var parts = x.toString().split("."); + parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return parts.join("."); + }, // Display a bar. Used to show health, capacity, etc. displayBar: function(value, rangeMin, rangeMax, styleClass, showText) { @@ -172,7 +172,7 @@ NanoBaseHelpers = function () status = 'selected'; } - html += '' + html += '' index++; if (index % blockSize == 0 && index < characters.length) @@ -192,38 +192,7 @@ NanoBaseHelpers = function () return html; } }); - }; - - // generate a Byond href, combines _urlParameters with parameters - var generateHref = function (parameters) - { - var queryString = '?'; - - for (var key in _urlParameters) - { - if (_urlParameters.hasOwnProperty(key)) - { - if (queryString !== '?') - { - queryString += ';'; - } - queryString += key + '=' + _urlParameters[key]; - } - } - - for (var key in parameters) - { - if (parameters.hasOwnProperty(key)) - { - if (queryString !== '?') - { - queryString += ';'; - } - queryString += key + '=' + parameters[key]; - } - } - return queryString; - }; + }; return { init: function () diff --git a/nano/js/nano_template.js b/nano/js/nano_template.js new file mode 100644 index 0000000000..0bb02d762a --- /dev/null +++ b/nano/js/nano_template.js @@ -0,0 +1,65 @@ + +var NanoTemplate = function () { + + var _templates = {}; + var _compiledTemplates = {}; + + var _helpers = {}; + + var init = function () { + doT.templateSettings['varname'] = 'data'; + }; + + var compileTemplates = function () { + + for (var key in _templates) { + try { + _compiledTemplates[key] = doT.template(_templates[key], null, _templates) + } + catch (error) { + alert(error); + } + } + }; + + return { + init: function () { + init(); + }, + addTemplate: function (key, templateString) { + _templates[key] = templateString; + }, + parse: function (templateKey, data) { + if (!_compiledTemplates.hasOwnProperty(templateKey)) { + if (!_templates.hasOwnProperty(templateKey)) { + alert('ERROR: Template "' + templateKey + '" does not exist in _compiledTemplates!'); + return; + } + compileTemplates(); + } + return _compiledTemplates[templateKey].call(this, data, _helpers); + }, + addHelper: function (helperName, helperFunction) { + if (!jQuery.isFunction(helperFunction)) { + alert('NanoTemplate.addHelper failed to add ' + helperName + ' as it is not a function.'); + return; + } + + _helpers[helperName] = helperFunction; + }, + addHelpers: function (helpers) { + for (var helperName in helpers) { + if (!helpers.hasOwnProperty(helperName)) + { + continue; + } + NanoTemplate.addHelper(helperName, helpers[helperName]); + } + } + } +}(); + +$(document).ready(function () { + NanoTemplate.init(); +}); + diff --git a/nano/js/nano_update.js b/nano/js/nano_update.js index cb2eee021d..300e9fa00a 100644 --- a/nano/js/nano_update.js +++ b/nano/js/nano_update.js @@ -101,19 +101,15 @@ NanoUpdate = function () if (templateData.hasOwnProperty(key)) { $.when($.get(templateData[key])) - .done(function(templateMarkup) { - if (_templates == null) - { - _templates = {}; - } + .done(function(templateMarkup) { - templateMarkup = templateMarkup.replace(/ +\) *\}\}/g, ')}}'); + //templateMarkup = templateMarkup.replace(/ +\) *\}\}/g, ')}}'); - templateMarkup += '
    ' + templateMarkup += '
    '; try { - _templates[key] = $.templates(key, templateMarkup); + NanoTemplate.addTemplate(key, templateMarkup) templateCount--; @@ -130,8 +126,6 @@ NanoUpdate = function () _isInitialised = true; $('#uiNoJavaScript').hide(); } - - executeCallbacks(_afterUpdateCallbacks, _data); } catch(error) { @@ -161,11 +155,7 @@ NanoUpdate = function () if (_isInitialised) // all templates have been registered, so render them { - executeCallbacks(_beforeUpdateCallbacks, updateData); - renderTemplates(updateData); - - executeCallbacks(_afterUpdateCallbacks, updateData); } else { @@ -176,31 +166,35 @@ NanoUpdate = function () // This function renders the template with the latest data // It has to be done recursively as each piece of data is observed individually and needs to be updated individually var renderTemplates = function (data) - { - if (!_templates.hasOwnProperty("main")) + { + data = executeCallbacks(_beforeUpdateCallbacks, data); + + if (data === false) { - alert('Error: Main template not found.'); + return; // A beforeUpdateCallback returned a false value, this prevents the render from occuring } _data = data; try { - $("#mainTemplate").html(_templates["main"].render(_data)); + $("#mainTemplate").html(NanoTemplate.parse('main', _data)); } catch(error) { alert('ERROR: An error occurred while rendering the UI: ' + error.message); return; - } + } + + executeCallbacks(_afterUpdateCallbacks, _data); }; - // Execute all callbacks in the callbacks array/object provided, updateData is passed to them for processing + // Execute all callbacks in the callbacks array/object provided, updateData is passed to them for processing and potential modification var executeCallbacks = function (callbacks, updateData) - { + { for (var index in callbacks) { - callbacks[index].call(this, updateData); + updateData = callbacks[index].call(this, updateData); } return updateData; diff --git a/nano/js/nano_config.js b/nano/js/nano_utility.js similarity index 76% rename from nano/js/nano_config.js rename to nano/js/nano_utility.js index 8352b197cc..aaf3f13ff4 100644 --- a/nano/js/nano_config.js +++ b/nano/js/nano_utility.js @@ -1,5 +1,5 @@ -// NanoConfig is the place to store utility functions -var NanoConfig = function () +// NanoUtility is the place to store utility functions +var NanoUtility = function () { return { init: function () @@ -10,11 +10,41 @@ var NanoConfig = function () if (typeof $.views == 'undefined') { alert('ERROR: JSRender failed to load!'); } - } + }, + // generate a Byond href, combines _urlParameters with parameters + generateHref: function (parameters) + { + var queryString = '?'; + + for (var key in _urlParameters) + { + if (_urlParameters.hasOwnProperty(key)) + { + if (queryString !== '?') + { + queryString += ';'; + } + queryString += key + '=' + _urlParameters[key]; + } + } + + for (var key in parameters) + { + if (parameters.hasOwnProperty(key)) + { + if (queryString !== '?') + { + queryString += ';'; + } + queryString += key + '=' + parameters[key]; + } + } + return queryString; + } } } (); -NanoConfig.init(); +NanoUtility.init(); if (!Array.prototype.indexOf) { diff --git a/nano/templates/accounts_terminal.tmpl b/nano/templates/accounts_terminal.tmpl index 9903878ee6..ca7fe82752 100644 --- a/nano/templates/accounts_terminal.tmpl +++ b/nano/templates/accounts_terminal.tmpl @@ -3,7 +3,7 @@ Machine:
    • - {{:machine_id}} + {{:data.machine_id}}
    @@ -11,25 +11,25 @@ ID:
    - {{:~link(id_card, 'eject', {'choice' : "insert_card"}, null, id_inserted ? 'fixedLeftWidest' : 'fixedLeft')}} + {{:helper.link(data.id_card, 'eject', {'choice' : "insert_card"}, null, data.id_inserted ? 'fixedLeftWidest' : 'fixedLeft')}}
    -{{if access_level > 0}} +{{if data.access_level > 0}}

    Menu

    - {{:~link('Home', 'home', {'choice' : 'view_accounts_list'}, !creating_new_account && !detailed_account_view ? 'disabled' : null, 'fixedLeft')}} - {{:~link('New Account', 'gear', {'choice' : 'create_account'}, creating_new_account ? 'disabled' : null, 'fixedLeft')}} - {{:~link('Print', 'print', {'choice' : 'print'}, creating_new_account ? 'disabled' : null, 'fixedLeft')}} + {{:helper.link('Home', 'home', {'choice' : 'view_accounts_list'}, !data.creating_new_account && !data.detailed_account_view ? 'disabled' : null, 'fixedLeft')}} + {{:helper.link('New Account', 'gear', {'choice' : 'create_account'}, data.creating_new_account ? 'disabled' : null, 'fixedLeft')}} + {{:helper.link('Print', 'print', {'choice' : 'print'}, data.creating_new_account ? 'disabled' : null, 'fixedLeft')}} - {{if creating_new_account}} + {{if data.creating_new_account}}

    Create Account

    -
    - + +
    @@ -52,7 +52,7 @@
    {{else}} - {{if detailed_account_view}} + {{if data.detailed_account_view}}

    Account Details

    @@ -62,7 +62,7 @@ Account Number:
    - #{{:account_number}} + #{{:data.account_number}}
    @@ -71,7 +71,7 @@ Holder:
    - {{:owner_name}} + {{:data.owner_name}}
    @@ -80,7 +80,7 @@ Balance:
    - ${{:~formatNumber(money)}} + ${{:helper.formatNumber(money)}}
    @@ -89,17 +89,17 @@ Status:
    - - {{: suspended ? "Suspended" : "Active"}} + + {{:data.suspended ? "Suspended" : "Active"}}
    - {{:~link(suspended ? "Unsuspend" : "Suspend", 'gear', {'choice' : 'toggle_suspension'})}} + {{:helper.link(data.suspended ? "Unsuspend" : "Suspend", 'gear', {'choice' : 'toggle_suspension'})}}
    - {{if transactions}} + {{if data.transactions}}
    @@ -111,13 +111,13 @@ - {{for transactions}} + {{for data.transactions}} - - - - - + + + + + {{/for}} @@ -126,7 +126,6 @@ This account has no financial transactions on record for today. {{/if}} -

    CentCom Administrator

    @@ -134,15 +133,15 @@
    Payroll:
    - {{:~link('Revoke', 'transferthick-e-w', {'choice' : 'revoke_payroll'}, account_number == station_account_number ? 'disabled' : null, 'linkDanger')}} + {{:helper.link('Revoke', 'transferthick-e-w', {'choice' : 'revoke_payroll'}, data.account_number == data.station_account_number ? 'disabled' : null, 'linkDanger')}} - {{if access_level >= 2}} + {{if data.access_level >= 2}}
    Silent Fund Adjustment:
    - {{:~link('Add', 'plus', {'choice' : 'add_funds'})}} - {{:~link('Remove', 'minus', {'choice' : 'remove_funds'})}} + {{:helper.link('Add', 'plus', {'choice' : 'add_funds'})}} + {{:helper.link('Remove', 'minus', {'choice' : 'remove_funds'})}}
    {{/if}} {{else}} @@ -150,13 +149,13 @@

    NanoTrasen Accounts

    - {{if accounts}} + {{if data.accounts}}
    {{:date}} {{:time}}{{:target_name}}{{:purpose}}{{:amount}}{{:source_terminal}}{{:value.date}} {{:value.time}}{{:value.target_name}}{{:value.purpose}}{{:value.amount}}{{:value.source_terminal}}
    - {{for accounts}} - - - - + {{for data.accounts}} + + + + {{/for}}
    {{:~link('#' + account_number, '', {'choice' : 'view_account_detail', 'account_index' : account_index})}}{{:owner_name}}{{:suspended}}
    {{:helper.link('#' + value.account_number, '', {'choice' : 'view_account_detail', 'account_index' : value.account_index})}}{{:value.owner_name}}{{:value.suspended}}
    diff --git a/nano/templates/advanced_airlock_console.tmpl b/nano/templates/advanced_airlock_console.tmpl index 7f886657f6..90ef192731 100644 --- a/nano/templates/advanced_airlock_console.tmpl +++ b/nano/templates/advanced_airlock_console.tmpl @@ -4,9 +4,9 @@ External Pressure:
    - {{:~displayBar(external_pressure, 0, 200, external_pressure < 80 || external_pressure > 120 ? 'bad' : external_pressure < 95 || external_pressure > 110 ? 'average' : 'good')}} + {{:helper.displayBar(data.external_pressure, 0, 200, (data.external_pressure < 80 || data.external_pressure > 120) ? 'bad' : (data.external_pressure < 95 || data.external_pressure > 110) ? 'average' : 'good')}}
    - {{:external_pressure}} kPa + {{:data.external_pressure}} kPa
    @@ -15,9 +15,9 @@ Chamber Pressure:
    - {{:~displayBar(chamber_pressure, 0, 200, chamber_pressure < 80 || chamber_pressure > 120 ? 'bad' : chamber_pressure < 95 || chamber_pressure > 110 ? 'average' : 'good')}} + {{:helper.displayBar(data.chamber_pressure, 0, 200, (data.chamber_pressure < 80 || data.chamber_pressure > 120) ? 'bad' : (data.chamber_pressure < 95 || data.chamber_pressure > 110) ? 'average' : 'good')}}
    - {{:chamber_pressure}} kPa + {{:data.chamber_pressure}} kPa
    @@ -26,9 +26,9 @@ Internal Pressure:
    - {{:~displayBar(internal_pressure, 0, 200, internal_pressure < 80 || internal_pressure > 120 ? 'bad' : internal_pressure < 95 || internal_pressure > 110 ? 'average' : 'good')}} + {{:helper.displayBar(data.internal_pressure, 0, 200, (data.internal_pressure < 80 || data.internal_pressure > 120) ? 'bad' : (data.internal_pressure < 95 || data.internal_pressure > 110) ? 'average' : 'good')}}
    - {{:internal_pressure}} kPa + {{:data.internal_pressure}} kPa
    @@ -36,25 +36,25 @@
    - {{:~link('Cycle to Exterior', 'arrowthickstop-1-w', {'command' : 'cycle_ext'}, processing ? 'disabled' : null)}} - {{:~link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int'}, processing ? 'disabled' : null)}} + {{:helper.link('Cycle to Exterior', 'arrowthickstop-1-w', {'command' : 'cycle_ext'}, data.processing ? 'disabled' : null)}} + {{:helper.link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int'}, data.processing ? 'disabled' : null)}}
    - {{:~link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, processing ? 'yellowBackground' : null)}} - {{:~link('Force interior door', 'alert', {'command' : 'force_int'}, null, processing ? 'yellowBackground' : null)}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? 'yellowBackground' : null)}} + {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? 'yellowBackground' : null)}}
    - {{:~link('Purge', 'refresh', {'command' : 'purge'}, processing ? 'disabled' : null, purge ? 'linkOn' : null)}} + {{:helper.link('Purge', 'refresh', {'command' : 'purge'}, data.processing ? 'disabled' : null, data.purge ? 'linkOn' : null)}}
    - {{:~link('Secure', secure ? 'locked' : 'unlocked', {'command' : 'secure'}, processing ? 'disabled' : null, secure ? 'linkOn' : null)}} + {{:helper.link('Secure', data.secure ? 'locked' : 'unlocked', {'command' : 'secure'}, data.processing ? 'disabled' : null, data.secure ? 'linkOn' : null)}}
    - {{:~link('Abort', 'cancel', {'command' : 'abort'}, processing ? null : 'disabled', processing ? 'redBackground' : null)}} + {{:helper.link('Abort', 'cancel', {'command' : 'abort'}, data.processing ? null : 'disabled', data.processing ? 'redBackground' : null)}}
    \ No newline at end of file diff --git a/nano/templates/apc.tmpl b/nano/templates/apc.tmpl index 82dc2175a1..574e53cec6 100644 --- a/nano/templates/apc.tmpl +++ b/nano/templates/apc.tmpl @@ -1,14 +1,14 @@
    - {{if siliconUser}} + {{if data.siliconUser}}
    Interface Lock:
    - {{:~link('Engaged', 'locked', {'toggleaccess' : 1}, locked ? 'selected' : null)}}{{:~link('Disengaged', 'unlocked', {'toggleaccess' : 1}, malfStatus >= 2 ? 'linkOff' : (locked ? null : 'selected'))}} + {{:helper.link('Engaged', 'locked', {'toggleaccess' : 1}, data.locked ? 'selected' : null)}}{{:helper.link('Disengaged', 'unlocked', {'toggleaccess' : 1}, data.malfStatus >= 2 ? 'linkOff' : (data.locked ? null : 'selected'))}}
    {{else}} - {{if locked}} + {{if data.locked}} Swipe an ID card to unlock this interface. {{else}} Swipe an ID card to lock this interface. @@ -25,14 +25,14 @@ Main Breaker:
    - {{if locked && !siliconUser}} - {{if isOperating}} + {{if data.locked && !data.siliconUser}} + {{if data.isOperating}} On {{else}} Off {{/if}} {{else}} - {{:~link('On', 'power', {'breaker' : 1}, isOperating ? 'selected' : null)}}{{:~link('Off', 'close', {'breaker' : 1}, isOperating ? null : 'selected')}} + {{:helper.link('On', 'power', {'breaker' : 1}, data.isOperating ? 'selected' : null)}}{{:helper.link('Off', 'close', {'breaker' : 1}, data.isOperating ? null : 'selected')}} {{/if}}
    @@ -42,9 +42,9 @@ External Power:
    - {{if externalPower == 2}} + {{if data.externalPower == 2}} Good - {{else externalPower == 1}} + {{else data.externalPower == 1}} Low {{else}} None @@ -56,38 +56,38 @@
    Power Cell:
    - {{if powerCellStatus == null}} + {{if data.powerCellStatus == null}}
    Power cell removed.
    {{else}} - {{:~displayBar(powerCellStatus, 0, 100, powerCellStatus >= 50 ? 'good' : powerCellStatus >= 25 ? 'average' : 'bad')}} + {{:helper.displayBar(data.powerCellStatus, 0, 100, (data.powerCellStatus >= 50) ? 'good' : (data.powerCellStatus >= 25) ? 'average' : 'bad')}}
    - {{:~round(powerCellStatus*10)/10}}% + {{:helper.round(data.powerCellStatus*10)/10}}%
    {{/if}}
    - {{if powerCellStatus != null}} + {{if data.powerCellStatus != null}}
    Charge Mode:
    - {{if locked && !siliconUser}} - {{if chargeMode}} + {{if data.locked && !data.siliconUser}} + {{if data.chargeMode}} Auto {{else}} Off {{/if}} {{else}} - {{:~link('Auto', 'refresh', {'cmode' : 1}, chargeMode ? 'selected' : null)}}{{:~link('Off', 'close', {'cmode' : 1}, chargeMode ? null : 'selected')}} + {{:helper.link('Auto', 'refresh', {'cmode' : 1}, data.chargeMode ? 'selected' : null)}}{{:helper.link('Off', 'close', {'cmode' : 1}, data.chargeMode ? null : 'selected')}} {{/if}}   - {{if chargingStatus > 1}} + {{if data.chargingStatus > 1}} [Fully Charged] - {{else chargingStatus == 1}} + {{else data.chargingStatus == 1}} [Charging] {{else}} [Not Charging] @@ -99,32 +99,32 @@

    Power Channels

    - {{for powerChannels}} + {{for data.powerChannels}}
    - {{:title}}: + {{:value.title}}:
    - {{:powerLoad}} W + {{:value.powerLoad}} W
       - {{if status <= 1}} + {{if value.status <= 1}} Off - {{else status >= 2}} + {{else value.status >= 2}} On {{/if}} - {{if status == 1 || status == 3}} + {{if value.status == 1 || status == 3}} [Auto] {{else}} [Manual] {{/if}}
    - {{if !~root.locked || ~root.siliconUser}} + {{if !data.locked || data.siliconUser}}
    - {{:~link('Auto', 'refresh', topicParams.auto, (status == 1 || status == 3) ? 'selected' : null)}} - {{:~link('On', 'power', topicParams.on, (status == 2) ? 'selected' : null)}} - {{:~link('Off', 'close', topicParams.off, (status == 0) ? 'selected' : null)}} + {{:helper.link('Auto', 'refresh', value.topicParams.auto, (value.status == 1 || value.status == 3) ? 'selected' : null)}} + {{:helper.link('On', 'power', value.topicParams.on, (value.status == 2) ? 'selected' : null)}} + {{:helper.link('Off', 'close', value.topicParams.off, (value.status == 0) ? 'selected' : null)}}
    {{/if}}
    @@ -135,7 +135,7 @@ Total Load:
    - {{:totalLoad}} W + {{:data.totalLoad}} W
    @@ -146,26 +146,26 @@ Cover Lock:
    - {{if locked && !siliconUser}} - {{if coverLocked}} + {{if data.locked && !data.siliconUser}} + {{if data.coverLocked}} Engaged {{else}} Disengaged {{/if}} {{else}} - {{:~link('Engaged', 'locked', {'lock' : 1}, coverLocked ? 'selected' : null)}}{{:~link('Disengaged', 'unlocked', {'lock' : 1}, coverLocked ? null : 'selected')}} + {{:helper.link('Engaged', 'locked', {'lock' : 1}, data.coverLocked ? 'selected' : null)}}{{:helper.link('Disengaged', 'unlocked', {'lock' : 1}, data.coverLocked ? null : 'selected')}} {{/if}}
    - {{if siliconUser}} + {{if data.siliconUser}}

    System Overrides

    - {{:~link('Overload Lighting Circuit', 'lightbulb', {'overload' : 1})}} - {{if malfStatus == 1}} - {{:~link('Override Programming', 'script', {'malfhack' : 1})}} - {{else malfStatus > 1}} + {{:helper.link('Overload Lighting Circuit', 'lightbulb', {'overload' : 1})}} + {{if data.malfStatus == 1}} + {{:helper.link('Override Programming', 'script', {'malfhack' : 1})}} + {{else data.malfStatus > 1}}
    APC Hacked
    {{/if}}
    diff --git a/nano/templates/canister.tmpl b/nano/templates/canister.tmpl index 3bd69a4a9b..dd1f9a2e01 100644 --- a/nano/templates/canister.tmpl +++ b/nano/templates/canister.tmpl @@ -4,7 +4,7 @@ Tank Label:
    -
    {{:name}}
    {{:~link('Relabel', 'pencil', {'relabel' : 1}, (canLabel) ? null : 'disabled')}} +
    {{:data.name}}
    {{:helper.link('Relabel', 'pencil', {'relabel' : 1}, (canLabel) ? null : 'disabled')}}
    @@ -13,7 +13,7 @@ Tank Pressure:
    - {{:tankPressure}} kPa + {{:data.tankPressure}} kPa
    @@ -22,18 +22,18 @@ Port Status:
    - {{:portConnected ? 'Connected' : 'Disconnected'}} + {{:data.portConnected ? 'Connected' : 'Disconnected'}}

    Holding Tank Status

    -{{if hasHoldingTank}} +{{if data.hasHoldingTank}}
    Tank Label:
    -
    {{:holdingTank.name}}
    {{:~link('Eject', 'eject', {'remove_tank' : 1})}} +
    {{:data.holdingTank.name}}
    {{:helper.link('Eject', 'eject', {'remove_tank' : 1})}}
    @@ -42,7 +42,7 @@ Tank Pressure:
    - {{:holdingTank.tankPressure}} kPa + {{:data.holdingTank.tankPressure}} kPa
    {{else}} @@ -57,17 +57,17 @@ Release Pressure:
    - {{:~displayBar(releasePressure, minReleasePressure, maxReleasePressure)}} + {{:helper.displayBar(releasePressure, minReleasePressure, maxReleasePressure)}}
    - {{:~link('-', null, {'pressure_adj' : -1000}, (releasePressure > minReleasePressure) ? null : 'disabled')}} - {{:~link('-', null, {'pressure_adj' : -100}, (releasePressure > minReleasePressure) ? null : 'disabled')}} - {{:~link('-', null, {'pressure_adj' : -10}, (releasePressure > minReleasePressure) ? null : 'disabled')}} - {{:~link('-', null, {'pressure_adj' : -1}, (releasePressure > minReleasePressure) ? null : 'disabled')}} -
     {{:releasePressure}} kPa 
    - {{:~link('+', null, {'pressure_adj' : 1}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} - {{:~link('+', null, {'pressure_adj' : 10}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} - {{:~link('+', null, {'pressure_adj' : 100}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} - {{:~link('+', null, {'pressure_adj' : 1000}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} + {{:helper.link('-', null, {'pressure_adj' : -1000}, (releasePressure > minReleasePressure) ? null : 'disabled')}} + {{:helper.link('-', null, {'pressure_adj' : -100}, (releasePressure > minReleasePressure) ? null : 'disabled')}} + {{:helper.link('-', null, {'pressure_adj' : -10}, (releasePressure > minReleasePressure) ? null : 'disabled')}} + {{:helper.link('-', null, {'pressure_adj' : -1}, (releasePressure > minReleasePressure) ? null : 'disabled')}} +
     {{:data.releasePressure}} kPa 
    + {{:helper.link('+', null, {'pressure_adj' : 1}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} + {{:helper.link('+', null, {'pressure_adj' : 10}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} + {{:helper.link('+', null, {'pressure_adj' : 100}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} + {{:helper.link('+', null, {'pressure_adj' : 1000}, (releasePressure < maxReleasePressure) ? null : 'disabled')}}
    @@ -77,7 +77,7 @@ Release Valve:
    - {{:~link('Open', 'unlocked', {'toggle' : 1}, valveOpen ? 'selected' : null)}}{{:~link('Close', 'locked', {'toggle' : 1}, valveOpen ? null : 'selected')}} + {{:helper.link('Open', 'unlocked', {'toggle' : 1}, valveOpen ? 'selected' : null)}}{{:helper.link('Close', 'locked', {'toggle' : 1}, valveOpen ? null : 'selected')}}
    diff --git a/nano/templates/chem_dispenser.tmpl b/nano/templates/chem_dispenser.tmpl index c2b5e62ce1..4be8b89578 100644 --- a/nano/templates/chem_dispenser.tmpl +++ b/nano/templates/chem_dispenser.tmpl @@ -7,7 +7,7 @@ Used In File(s): \code\modules\reagents\Chemistry-Machinery.dm Energy:
    - {{:~displayBar(energy, 0, maxEnergy, 'good', energy + ' Units')}} + {{:helper.displayBar(energy, 0, maxEnergy, 'good', energy + ' Units')}}
    @@ -16,17 +16,17 @@ Used In File(s): \code\modules\reagents\Chemistry-Machinery.dm Dispense:
    - {{:~link('5', 'gear', {'amount' : 5}, (amount == 5) ? 'selected' : null)}} - {{:~link('10', 'gear', {'amount' : 10}, (amount == 10) ? 'selected' : null)}} - {{:~link('20', 'gear', {'amount' : 20}, (amount == 20) ? 'selected' : null)}} - {{:~link('30', 'gear', {'amount' : 30}, (amount == 30) ? 'selected' : null)}} - {{:~link('50', 'gear', {'amount' : 50}, (amount == 50) ? 'selected' : null)}} + {{:helper.link('5', 'gear', {'amount' : 5}, (amount == 5) ? 'selected' : null)}} + {{:helper.link('10', 'gear', {'amount' : 10}, (amount == 10) ? 'selected' : null)}} + {{:helper.link('20', 'gear', {'amount' : 20}, (amount == 20) ? 'selected' : null)}} + {{:helper.link('30', 'gear', {'amount' : 30}, (amount == 30) ? 'selected' : null)}} + {{:helper.link('50', 'gear', {'amount' : 50}, (amount == 50) ? 'selected' : null)}}
     
    - {{if glass}} + {{if data.glass}} Drink Dispenser {{else}} Chemical Dispenser @@ -35,8 +35,8 @@ Used In File(s): \code\modules\reagents\Chemistry-Machinery.dm
    - {{for chemicals}} - {{:~link(title, 'circle-arrow-s', commands, null, ~root.glass ? 'fixedLeftWide' : 'fixedLeft')}} + {{for data.chemicals}} + {{:helper.link(title, 'circle-arrow-s', commands, null, ~root.glass ? 'fixedLeftWide' : 'fixedLeft')}} {{/for}}
    @@ -44,26 +44,26 @@ Used In File(s): \code\modules\reagents\Chemistry-Machinery.dm
     
    - {{if glass}} + {{if data.glass}} Glass {{else}} Beaker {{/if}} Contents
    - {{:~link(glass ? 'Eject Glass' : 'Eject Beaker', 'eject', {'ejectBeaker' : 1}, isBeakerLoaded ? null : 'disabled', 'floatRight')}} + {{:helper.link(glass ? 'Eject Glass' : 'Eject Beaker', 'eject', {'ejectBeaker' : 1}, isBeakerLoaded ? null : 'disabled', 'floatRight')}}
    - {{if isBeakerLoaded}} - Volume: {{:beakerCurrentVolume}} / {{:beakerMaxVolume}}
    - {{for beakerContents}} - {{:volume}} units of {{:name}}
    + {{if data.isBeakerLoaded}} + Volume: {{:data.beakerCurrentVolume}} / {{:data.beakerMaxVolume}}
    + {{for data.beakerContents}} + {{:data.volume}} units of {{:data.name}}
    {{else}} - {{if glass}} + {{if data.glass}} Glass {{else}} Beaker @@ -72,7 +72,7 @@ Used In File(s): \code\modules\reagents\Chemistry-Machinery.dm {{/for}} {{else}} No - {{if glass}} + {{if data.glass}} Glass {{else}} Beaker diff --git a/nano/templates/crew_monitor.tmpl b/nano/templates/crew_monitor.tmpl index efa885f20f..bdaa9f973d 100644 --- a/nano/templates/crew_monitor.tmpl +++ b/nano/templates/crew_monitor.tmpl @@ -2,13 +2,13 @@ Crew Monitoring Computer interface --> - {{for crewmembers}} - {{if sensor_type == 1}} - - {{else sensor_type == 2}} - - {{else sensor_type == 3}} - + {{for data.crewmembers}} + {{if data.sensor_type == 1}} + + {{else data.sensor_type == 2}} + + {{else data.sensor_type == 3}} + {{/if}} {{/for}}
    {{:name}}{{:dead ? "Deceased" : "Living"}}Not Available
    {{:name}}{{:dead ? "Deceased" : "Living"}} ({{:oxy}}/{{:tox}}/{{:fire}}/{{:brute}})Not Available
    {{:name}}{{:dead ? "Deceased" : "Living"}} ({{:oxy}}/{{:tox}}/{{:fire}}/{{:brute}}){{:area}}({{:x}}, {{:y}})
    {{:data.name}}{{:data.dead ? "Deceased" : "Living"}}Not Available
    {{:data.name}}{{:data.dead ? "Deceased" : "Living"}} ({{:data.oxy}}/{{:data.tox}}/{{:data.fire}}/{{:data.brute}})Not Available
    {{:data.name}}{{:data.dead ? "Deceased" : "Living"}} ({{:data.oxy}}/{{:data.tox}}/{{:data.fire}}/{{:data.brute}}){{:data.area}}({{:data.x}}, {{:data.y}})
    \ No newline at end of file diff --git a/nano/templates/cryo.tmpl b/nano/templates/cryo.tmpl index c8c5610aa6..08102950f6 100644 --- a/nano/templates/cryo.tmpl +++ b/nano/templates/cryo.tmpl @@ -5,59 +5,59 @@ Used In File(s): \code\game\machinery\cryo.dm

    Cryo Cell Status

    - {{if !hasOccupant}} + {{if !data.hasOccupant}}
    Cell Unoccupied
    {{else}}
    - {{:occupant.name}} =>  - {{if occupant.stat == 0}} + {{:data.occupant.name}} =>  + {{if data.occupant.stat == 0}} Conscious - {{else occupant.stat == 1}} + {{else data.occupant.stat == 1}} Unconscious {{else}} DEAD {{/if}}
    - {{if occupant.stat < 2}} + {{if data.occupant.stat < 2}}
    Health:
    - {{if occupant.health >= 0}} - {{:~displayBar(occupant.health, 0, occupant.maxHealth, 'good')}} + {{if data.occupant.health >= 0}} + {{:helper.displayBar(occupant.health, 0, occupant.maxHealth, 'good')}} {{else}} - {{:~displayBar(occupant.health, 0, occupant.minHealth, 'average alignRight')}} + {{:helper.displayBar(occupant.health, 0, occupant.minHealth, 'average alignRight')}} {{/if}} -
    {{:~round(occupant.health)}}
    +
    {{:helper.round(occupant.health)}}
    => Brute Damage:
    - {{:~displayBar(occupant.bruteLoss, 0, occupant.maxHealth, 'bad')}} -
    {{:~round(occupant.bruteLoss)}}
    + {{:helper.displayBar(occupant.bruteLoss, 0, occupant.maxHealth, 'bad')}} +
    {{:helper.round(occupant.bruteLoss)}}
    => Resp. Damage:
    - {{:~displayBar(occupant.oxyLoss, 0, occupant.maxHealth, 'bad')}} -
    {{:~round(occupant.oxyLoss)}}
    + {{:helper.displayBar(occupant.oxyLoss, 0, occupant.maxHealth, 'bad')}} +
    {{:helper.round(occupant.oxyLoss)}}
    => Toxin Damage:
    - {{:~displayBar(occupant.toxLoss, 0, occupant.maxHealth, 'bad')}} -
    {{:~round(occupant.toxLoss)}}
    + {{:helper.displayBar(occupant.toxLoss, 0, occupant.maxHealth, 'bad')}} +
    {{:helper.round(occupant.toxLoss)}}
    => Burn Severity:
    - {{:~displayBar(occupant.fireLoss, 0, occupant.maxHealth, 'bad')}} -
    {{:~round(occupant.fireLoss)}}
    + {{:helper.displayBar(occupant.fireLoss, 0, occupant.maxHealth, 'bad')}} +
    {{:helper.round(occupant.fireLoss)}}
    {{/if}} {{/if}}
    Cell Temperature:
    - {{:~string('{1} K', cellTemperatureStatus, cellTemperature)}} + {{:helper.string('{1} K', cellTemperatureStatus, cellTemperature)}}
    @@ -67,10 +67,10 @@ Used In File(s): \code\game\machinery\cryo.dm Cryo Cell Status:
    - {{:~link('On', 'power', {'switchOn' : 1}, isOperating ? 'selected' : null)}}{{:~link('Off', 'close', {'switchOff' : 1}, isOperating ? null : 'selected')}} + {{:helper.link('On', 'power', {'switchOn' : 1}, isOperating ? 'selected' : null)}}{{:helper.link('Off', 'close', {'switchOff' : 1}, isOperating ? null : 'selected')}}
    - {{:~link('Eject Occupant', 'arrowreturnthick-1-s', {'ejectOccupant' : 1}, hasOccupant ? null : 'disabled')}} + {{:helper.link('Eject Occupant', 'arrowreturnthick-1-s', {'ejectOccupant' : 1}, hasOccupant ? null : 'disabled')}}
     
    @@ -79,10 +79,10 @@ Used In File(s): \code\game\machinery\cryo.dm Beaker:
    - {{if isBeakerLoaded}} - {{:beakerLabel ? beakerLabel : 'No label'}}
    - {{if beakerVolume}} - {{:beakerVolume}} units remaining
    + {{if data.isBeakerLoaded}} + {{:data.beakerLabel ? beakerLabel : 'No label'}}
    + {{if data.beakerVolume}} + {{:data.beakerVolume}} units remaining
    {{else}} Beaker is empty {{/if}} @@ -91,6 +91,6 @@ Used In File(s): \code\game\machinery\cryo.dm {{/if}}
    - {{:~link('Eject Beaker', 'eject', {'ejectBeaker' : 1}, isBeakerLoaded ? null : 'disabled')}} + {{:helper.link('Eject Beaker', 'eject', {'ejectBeaker' : 1}, isBeakerLoaded ? null : 'disabled')}}
    \ No newline at end of file diff --git a/nano/templates/disease_splicer.tmpl b/nano/templates/disease_splicer.tmpl index a7d76fb4f6..a3caad12de 100644 --- a/nano/templates/disease_splicer.tmpl +++ b/nano/templates/disease_splicer.tmpl @@ -1,13 +1,13 @@
    - {{:~link('Close', 'gear', {'close' : 1}, null, 'fixedLeft')}} + {{:helper.link('Close', 'gear', {'close' : 1}, null, 'fixedLeft')}}
    -{{if busy}} +{{if data.busy}}
    The Splicer is currently busy.
    -
    {{:busy}}
    +
    {{:data.busy}}

    Thank you for your patience! @@ -17,7 +17,7 @@

    Virus Dish

    - {{:~link('Eject Dish', 'eject', { 'eject' : 1 }, dish_inserted ? null : 'disabled')}} + {{:helper.link('Eject Dish', 'eject', { 'eject' : 1 }, dish_inserted ? null : 'disabled')}}
    @@ -25,26 +25,26 @@ Growth Density:
    - {{:~displayBar(growth, 0, 100, growth >= 50 ? 'good' : growth >= 25 ? 'average' : 'bad', growth + '%' )}} + {{:helper.displayBar(growth, 0, 100, growth >= 50 ? 'good' : growth >= 25 ? 'average' : 'bad', growth + '%' )}}
    - {{if !info}} + {{if !data.info}}
    Symptoms:
    {{/if}}
    - {{if info}} - {{:info}} + {{if data.info}} + {{:data.info}} {{else}} - {{for effects}} + {{for data.effects}}
    - ({{:stage}}) {{:name}} - {{if badness > 1}} + ({{:data.stage}}) {{:data.name}} + {{if data.badness > 1}} Dangerous {{/if}}
    @@ -53,18 +53,18 @@ {{/if}}
    - {{if affected_species && !info}} + {{if data.affected_species && !info}}
    Affected Species:
    - {{:affected_species}} + {{:data.affected_species}}
    {{/if}}
    - {{if effects}} + {{if data.effects}}
    CAUTION: Reverse engineering will destroy the viral sample.
    @@ -73,12 +73,12 @@ Reverse Engineering:
    - {{for effects}} - {{:~link(stage, 'transferthick-e-w', { 'grab' : reference })}} + {{for data.effects}} + {{:helper.link(stage, 'transferthick-e-w', { 'grab' : reference })}} {{/for}}
    - {{:~link('Species', 'transferthick-e-w', { 'affected_species' : 1 })}} + {{:helper.link('Species', 'transferthick-e-w', { 'affected_species' : 1 })}}
    {{/if}} @@ -92,17 +92,17 @@ Memory Buffer:
    - {{if buffer}} - {{:buffer.name}} ({{:buffer.stage}}) + {{if data.buffer}} + {{:data.buffer.name}} ({{:data.buffer.stage}}) {{else}} - {{if species_buffer}} - {{:species_buffer}} + {{if data.species_buffer}} + {{:data.species_buffer}} {{else}} Empty {{/if}} {{/if}}
    - {{:~link('Save To Disk', 'disk', { 'disk' : 1 }, (buffer || species_buffer) ? null : 'disabled')}} - {{:~link('Splice Onto Dish', 'pencil', { 'splice' : 1 }, (buffer || species_buffer) && !info ? null : 'disabled')}} + {{:helper.link('Save To Disk', 'disk', { 'disk' : 1 }, (buffer || species_buffer) ? null : 'disabled')}} + {{:helper.link('Splice Onto Dish', 'pencil', { 'splice' : 1 }, (buffer || species_buffer) && !info ? null : 'disabled')}} {{/if}} diff --git a/nano/templates/dish_incubator.tmpl b/nano/templates/dish_incubator.tmpl index 6ebff27698..5b06f924e6 100644 --- a/nano/templates/dish_incubator.tmpl +++ b/nano/templates/dish_incubator.tmpl @@ -1,6 +1,6 @@
    - {{:~link('Close', 'gear', {'close' : '1'}, null, 'fixedLeft')}} + {{:helper.link('Close', 'gear', {'close' : '1'}, null, 'fixedLeft')}}
    @@ -12,12 +12,12 @@ Power:
    - {{:~link('On', 'power', { 'power' : 1 }, !dish_inserted ? 'disabled' : on ? 'selected' : null)}}{{:~link('Off', 'close', { 'power' : 1 }, on ? null : 'selected')}} + {{:helper.link('On', 'power', { 'power' : 1 }, !dish_inserted ? 'disabled' : on ? 'selected' : null)}}{{:helper.link('Off', 'close', { 'power' : 1 }, on ? null : 'selected')}}
    - {{:~link('Add Radiation', 'radiation', {'rad' : 1})}} - {{:~link('Flush System', 'trash', {'flush' : 1}, system_in_use ? null : 'disabled')}} + {{:helper.link('Add Radiation', 'radiation', {'rad' : 1})}} + {{:helper.link('Flush System', 'trash', {'flush' : 1}, system_in_use ? null : 'disabled')}}
    @@ -26,7 +26,7 @@ Virus Food:
    - {{:~displayBar(food_supply, 0, 100, 'good', food_supply)}} + {{:helper.displayBar(food_supply, 0, 100, 'good', food_supply)}}
    @@ -34,9 +34,9 @@ Radiation Level:
    - {{:~displayBar(radiation, 0, 100, radiation >= 50 ? 'bad' : growth >= 25 ? 'average' : 'good')}} + {{:helper.displayBar(radiation, 0, 100, radiation >= 50 ? 'bad' : growth >= 25 ? 'average' : 'good')}}
    - {{:~formatNumber(radiation * 10000)}} µSv + {{:helper.formatNumber(radiation * 10000)}} µSv
    @@ -44,7 +44,7 @@ Toxicity:
    - {{:~displayBar(toxins, 0, 100, toxins >= 50 ? 'bad' : toxins >= 25 ? 'average' : 'good', toxins + '%')}} + {{:helper.displayBar(toxins, 0, 100, toxins >= 50 ? 'bad' : toxins >= 25 ? 'average' : 'good', toxins + '%')}}
    @@ -53,17 +53,17 @@

    Chemicals

    - {{:~link('Eject Chemicals', 'eject', { 'ejectchem' : 1 }, chemicals_inserted ? null : 'disabled')}} - {{:~link('Breed Virus', 'circle-arrow-s', { 'virus' : 1 }, can_breed_virus ? null : 'disabled')}} + {{:helper.link('Eject Chemicals', 'eject', { 'ejectchem' : 1 }, chemicals_inserted ? null : 'disabled')}} + {{:helper.link('Breed Virus', 'circle-arrow-s', { 'virus' : 1 }, can_breed_virus ? null : 'disabled')}}
    -{{if chemicals_inserted}} +{{if data.chemicals_inserted}}
    Volume:
    - {{:~displayBar(chemical_volume, 0, max_chemical_volume, 'good', chemical_volume + ' / ' + max_chemical_volume)}} + {{:helper.displayBar(chemical_volume, 0, max_chemical_volume, 'good', chemical_volume + ' / ' + max_chemical_volume)}}
    @@ -71,10 +71,10 @@ Breeding Environment:
    - - {{:!dish_inserted ? 'N/A' : can_breed_virus ? 'Suitable' : 'No hemolytic samples detected'}} + + {{:!data.dish_inserted ? 'N/A' : can_breed_virus ? 'Suitable' : 'No hemolytic samples detected'}} - {{if blood_already_infected}} + {{if data.blood_already_infected}}
    CAUTION: Viral infection detected in blood sample. {{/if}} @@ -90,17 +90,17 @@

    Virus Dish

    - {{:~link('Eject Dish', 'eject', {'ejectdish' : 1}, dish_inserted ? null : 'disabled')}} + {{:helper.link('Eject Dish', 'eject', {'ejectdish' : 1}, dish_inserted ? null : 'disabled')}}
    -{{if dish_inserted}} - {{if virus}} +{{if data.dish_inserted}} + {{if data.virus}}
    Growth Density:
    - {{:~displayBar(growth, 0, 100, growth >= 50 ? 'good' : growth >= 25 ? 'average' : 'bad', growth + '%' )}} + {{:helper.displayBar(growth, 0, 100, growth >= 50 ? 'good' : growth >= 25 ? 'average' : 'bad', growth + '%' )}}
    @@ -108,7 +108,7 @@ Infection Rate:
    - {{:analysed ? infection_rate : "Unknown"}} + {{:data.analysed ? infection_rate : "Unknown"}}
    {{else}} diff --git a/nano/templates/dna_modifier.tmpl b/nano/templates/dna_modifier.tmpl index b064de84b8..5efe73ce87 100644 --- a/nano/templates/dna_modifier.tmpl +++ b/nano/templates/dna_modifier.tmpl @@ -5,54 +5,54 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm

    Status

    - {{if !hasOccupant}} + {{if !data.hasOccupant}}
    Cell Unoccupied
    {{else}}
    - {{:occupant.name}} =>  - {{if occupant.stat == 0}} + {{:data.occupant.name}} =>  + {{if data.occupant.stat == 0}} Conscious - {{else occupant.stat == 1}} + {{else data.occupant.stat == 1}} Unconscious {{else}} DEAD {{/if}}
    - {{if !occupant.isViableSubject || !occupant.uniqueIdentity || !occupant.structuralEnzymes}} + {{if !data.occupant.isViableSubject || !occupant.uniqueIdentity || !occupant.structuralEnzymes}}
    The occupant's DNA structure is ruined beyond recognition, please insert a subject with an intact DNA structure.
    - {{else occupant.stat < 2}} + {{else data.occupant.stat < 2}}
    Health:
    - {{if occupant.health >= 0}} - {{:~displayBar(occupant.health, 0, occupant.maxHealth, 'good')}} + {{if data.occupant.health >= 0}} + {{:helper.displayBar(occupant.health, 0, occupant.maxHealth, 'good')}} {{else}} - {{:~displayBar(occupant.health, 0, occupant.minHealth, 'average alignRight')}} + {{:helper.displayBar(occupant.health, 0, occupant.minHealth, 'average alignRight')}} {{/if}} -
    {{:~round(occupant.health)}}
    +
    {{:helper.round(occupant.health)}}
    Radiation:
    - {{:~displayBar(occupant.radiationLevel, 0, 100, 'average')}} -
    {{:~round(occupant.radiationLevel)}}
    + {{:helper.displayBar(occupant.radiationLevel, 0, 100, 'average')}} +
    {{:helper.round(occupant.radiationLevel)}}
    Unique Enzymes:
    -
    {{:occupant.uniqueEnzymes ? occupant.uniqueEnzymes : 'Unknown'}}
    +
    {{:data.occupant.uniqueEnzymes ? occupant.uniqueEnzymes : 'Unknown'}}
    {{/if}} {{/if}} @@ -61,65 +61,65 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm

    Operations

    - {{:~link('Modify U.I.', 'link', {'selectMenuKey' : 'ui'}, selectedMenuKey == 'ui' ? 'selected' : null)}} - {{:~link('Modify S.E.', 'link', {'selectMenuKey' : 'se'}, selectedMenuKey == 'se' ? 'selected' : null)}} - {{:~link('Transfer Buffers', 'disk', {'selectMenuKey' : 'buffer'}, selectedMenuKey == 'buffer' ? 'selected' : null)}} - {{:~link('Rejuvenators', 'plusthick', {'selectMenuKey' : 'rejuvenators'}, selectedMenuKey == 'rejuvenators' ? 'selected' : null)}} + {{:helper.link('Modify U.I.', 'link', {'selectMenuKey' : 'ui'}, selectedMenuKey == 'ui' ? 'selected' : null)}} + {{:helper.link('Modify S.E.', 'link', {'selectMenuKey' : 'se'}, selectedMenuKey == 'se' ? 'selected' : null)}} + {{:helper.link('Transfer Buffers', 'disk', {'selectMenuKey' : 'buffer'}, selectedMenuKey == 'buffer' ? 'selected' : null)}} + {{:helper.link('Rejuvenators', 'plusthick', {'selectMenuKey' : 'rejuvenators'}, selectedMenuKey == 'rejuvenators' ? 'selected' : null)}}
     
    -{{if !selectedMenuKey || selectedMenuKey == 'ui'}} +{{if !data.selectedMenuKey || selectedMenuKey == 'ui'}}

    Modify Unique Identifier

    - {{:~displayDNABlocks(occupant.uniqueIdentity, selectedUIBlock, selectedUISubBlock, dnaBlockSize, 'UI')}} + {{:helper.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')}} + {{:helper.link('-', null, {'changeUITarget' : 0}, selectedUITarget > 0 ? null : 'disabled')}} +
     {{:data.selectedUITargetHex}} 
    + {{:helper.link('+', null, {'changeUITarget' : 1}, selectedUITarget < 15 ? null : 'disabled')}}
    - {{:~link('Irradiate Block', 'radiation', {'pulseUIRadiation' : 1}, !occupant.isViableSubject ? 'disabled' : null)}} + {{:helper.link('Irradiate Block', 'radiation', {'pulseUIRadiation' : 1}, !occupant.isViableSubject ? 'disabled' : null)}}
    -{{else selectedMenuKey == 'se'}} +{{else data.selectedMenuKey == 'se'}}

    Modify Structural Enzymes

    - {{:~displayDNABlocks(occupant.structuralEnzymes, selectedSEBlock, selectedSESubBlock, dnaBlockSize, 'SE')}} + {{:helper.displayDNABlocks(occupant.structuralEnzymes, selectedSEBlock, selectedSESubBlock, dnaBlockSize, 'SE')}}
    - {{:~link('Irradiate Block', 'radiation', {'pulseSERadiation' : 1}, !occupant.isViableSubject ? 'disabled' : null)}} + {{:helper.link('Irradiate Block', 'radiation', {'pulseSERadiation' : 1}, !occupant.isViableSubject ? 'disabled' : null)}}
    -{{else selectedMenuKey == 'buffer'}} +{{else data.selectedMenuKey == 'buffer'}}

    Transfer Buffers

    - {{for buffers}} -

    Buffer {{:#index + 1}}

    + {{for data.buffers}} +

    Buffer {{:data.#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)}} + {{:helper.link('Subject U.I.', 'link', {'bufferOption' : 'saveUI', 'bufferId' : (#index + 1)}, !~root.hasOccupant ? 'disabled' : null)}} + {{:helper.link('Subject U.I. + U.E.', 'link', {'bufferOption' : 'saveUIAndUE', 'bufferId' : (#index + 1)}, !~root.hasOccupant ? 'disabled' : null)}} + {{:helper.link('Subject S.E.', 'link', {'bufferOption' : 'saveSE', 'bufferId' : (#index + 1)}, !~root.hasOccupant ? 'disabled' : null)}} + {{:helper.link('From Disk', 'disk', {'bufferOption' : 'loadDisk', 'bufferId' : (#index + 1)}, !~root.hasDisk || !~root.disk.data ? 'disabled' : null)}}
    - {{if data}} + {{if data.data}}
    Label:
    - {{:~link(label, 'document-b', {'bufferOption' : 'changeLabel', 'bufferId' : (#parent.index + 1)})}} + {{:helper.link(label, 'document-b', {'bufferOption' : 'changeLabel', 'bufferId' : (#parent.index + 1)})}}
    @@ -127,7 +127,7 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm Subject:
    - {{:owner ? owner : 'Unknown'}} + {{:data.owner ? owner : 'Unknown'}}
    @@ -135,8 +135,8 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm Stored Data:
    - {{:data == 'ui' ? 'Unique Identifiers' : 'Structural Enzymes'}} - {{:ue ? ' + Unique Enzymes' : ''}} + {{:data.data == 'ui' ? 'Unique Identifiers' : 'Structural Enzymes'}} + {{:data.ue ? ' + Unique Enzymes' : ''}}
    {{else}} @@ -151,11 +151,11 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm Options:
    - {{:~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)}} + {{:helper.link('Clear', 'trash', {'bufferOption' : 'clear', 'bufferId' : (#index + 1)}, !data ? 'disabled' : null)}} + {{:helper.link('Injector', ~root.isInjectorReady ? 'pencil' : 'clock', {'bufferOption' : 'createInjector', 'bufferId' : (#index + 1)}, !~root.isInjectorReady || !data ? 'disabled' : null)}} + {{:helper.link('Block Injector', ~root.isInjectorReady ? 'pencil' : 'clock', {'bufferOption' : 'createInjector', 'bufferId' : (#index + 1), 'createBlockInjector' : 1}, !~root.isInjectorReady || !data ? 'disabled' : null)}} + {{:helper.link('Transfer', 'radiation', {'bufferOption' : 'transfer', 'bufferId' : (#index + 1)}, !~root.hasOccupant || !data ? 'disabled' : null)}} + {{:helper.link('Save To Disk', 'disk', {'bufferOption' : 'saveDisk', 'bufferId' : (#index + 1)}, !data || !~root.hasDisk ? 'disabled' : null)}}
    @@ -163,14 +163,14 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm

    Data Disk

    - {{if hasDisk}} - {{if disk.data}} + {{if data.hasDisk}} + {{if data.disk.data}}
    Label:
    - {{:disk.label ? disk.label : 'No Label'}} + {{:data.disk.label ? disk.label : 'No Label'}}
    @@ -178,7 +178,7 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm Subject:
    - {{:disk.owner ? disk.owner : 'Unknown'}} + {{:data.disk.owner ? disk.owner : 'Unknown'}}
    @@ -186,8 +186,8 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm Stored Data:
    - {{:disk.data == 'ui' ? 'Unique Identifiers' : 'Structural Enzymes'}} - {{:disk.ue ? ' + Unique Enzymes' : ''}} + {{:data.disk.data == 'ui' ? 'Unique Identifiers' : 'Structural Enzymes'}} + {{:data.disk.ue ? ' + Unique Enzymes' : ''}}
    {{else}} @@ -209,23 +209,23 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm Options:
    - {{:~link('Wipe Disk', 'trash', {'bufferOption' : 'wipeDisk'}, !hasDisk || !disk.data ? 'disabled' : null)}} - {{:~link('Eject Disk', 'eject', {'bufferOption' : 'ejectDisk'}, !hasDisk ? 'disabled' : null)}} + {{:helper.link('Wipe Disk', 'trash', {'bufferOption' : 'wipeDisk'}, !hasDisk || !disk.data ? 'disabled' : null)}} + {{:helper.link('Eject Disk', 'eject', {'bufferOption' : 'ejectDisk'}, !hasDisk ? 'disabled' : null)}}
    -{{else selectedMenuKey == 'rejuvenators'}} +{{else data.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)}} - {{:~link('30', 'pencil', {'injectRejuvenators' : 30}, !hasOccupant || !beakerVolume ? 'disabled' : null)}} - {{:~link('50', 'pencil', {'injectRejuvenators' : 50}, !hasOccupant || !beakerVolume ? 'disabled' : null)}} + {{:helper.link('5', 'pencil', {'injectRejuvenators' : 5}, !hasOccupant || !beakerVolume ? 'disabled' : null)}} + {{:helper.link('10', 'pencil', {'injectRejuvenators' : 10}, !hasOccupant || !beakerVolume ? 'disabled' : null)}} + {{:helper.link('20', 'pencil', {'injectRejuvenators' : 20}, !hasOccupant || !beakerVolume ? 'disabled' : null)}} + {{:helper.link('30', 'pencil', {'injectRejuvenators' : 30}, !hasOccupant || !beakerVolume ? 'disabled' : null)}} + {{:helper.link('50', 'pencil', {'injectRejuvenators' : 50}, !hasOccupant || !beakerVolume ? 'disabled' : null)}}
     
    @@ -234,10 +234,10 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm Beaker:
    - {{if isBeakerLoaded}} - {{:beakerLabel ? beakerLabel : 'No label'}}
    - {{if beakerVolume}} - {{:beakerVolume}} units remaining
    + {{if data.isBeakerLoaded}} + {{:data.beakerLabel ? beakerLabel : 'No label'}}
    + {{if data.beakerVolume}} + {{:data.beakerVolume}} units remaining
    {{else}} Beaker is empty {{/if}} @@ -246,23 +246,23 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm {{/if}}
    - {{:~link('Eject Beaker', 'eject', {'ejectBeaker' : 1}, isBeakerLoaded ? null : 'disabled')}} + {{:helper.link('Eject Beaker', 'eject', {'ejectBeaker' : 1}, isBeakerLoaded ? null : 'disabled')}}
    {{/if}}
     
    -{{if !selectedMenuKey || selectedMenuKey == 'ui' || selectedMenuKey == 'se'}} +{{if !data.selectedMenuKey || 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')}} + {{:helper.link('-', null, {'radiationIntensity' : 0}, radiationIntensity > 1 ? null : 'disabled')}} +
     {{:data.radiationIntensity}} 
    + {{:helper.link('+', null, {'radiationIntensity' : 1}, radiationIntensity < 10 ? null : 'disabled')}}
    @@ -270,9 +270,9 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm Duration:
    - {{:~link('-', null, {'radiationDuration' : 0}, radiationDuration > 2 ? null : 'disabled')}} -
     {{:radiationDuration}} 
    - {{:~link('+', null, {'radiationDuration' : 1}, radiationDuration < 20 ? null : 'disabled')}} + {{:helper.link('-', null, {'radiationDuration' : 0}, radiationDuration > 2 ? null : 'disabled')}} +
     {{:data.radiationDuration}} 
    + {{:helper.link('+', null, {'radiationDuration' : 1}, radiationDuration < 20 ? null : 'disabled')}}
    @@ -280,7 +280,7 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm  
    - {{:~link('Pulse Radiation', 'radiation', {'pulseRadiation' : 1}, !hasOccupant ? 'disabled' : null)}} + {{:helper.link('Pulse Radiation', 'radiation', {'pulseRadiation' : 1}, !hasOccupant ? 'disabled' : null)}}
    {{/if}} @@ -294,7 +294,7 @@ 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)}} + {{:helper.link('Eject Occupant', 'eject', {'ejectOccupant' : 1}, locked || !hasOccupant || irradiating ? 'disabled' : null)}}
    @@ -302,16 +302,16 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm Door Lock:
    - {{:~link('Engaged', 'locked', {'toggleLock' : 1}, locked ? 'selected' : !hasOccupant ? 'disabled' : null)}} - {{:~link('Disengaged', 'unlocked', {'toggleLock' : 1}, !locked ? 'selected' : irradiating ? 'disabled' : null)}} + {{:helper.link('Engaged', 'locked', {'toggleLock' : 1}, locked ? 'selected' : !hasOccupant ? 'disabled' : null)}} + {{:helper.link('Disengaged', 'unlocked', {'toggleLock' : 1}, !locked ? 'selected' : irradiating ? 'disabled' : null)}}
    -{{if irradiating}} +{{if data.irradiating}}

    Irradiating Subject

    -

    For {{:irradiating}} seconds.

    +

    For {{:data.irradiating}} seconds.

    {{/if}} diff --git a/nano/templates/docking_airlock_console.tmpl b/nano/templates/docking_airlock_console.tmpl index b19d13a3a6..4f69175a8d 100644 --- a/nano/templates/docking_airlock_console.tmpl +++ b/nano/templates/docking_airlock_console.tmpl @@ -3,53 +3,53 @@
    Docking Port Status:
    - {{if docking_status == "docked"}} + {{if data.docking_status == "docked"}}
    - {{if !override_enabled}} + {{if !data.override_enabled}} DOCKED {{else}} DOCKED-OVERRIDE ENABLED {{/if}} - {{:~link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}}
    - {{else docking_status == "docking"}} + {{else data.docking_status == "docking"}}
    - {{if !override_enabled}} + {{if !data.override_enabled}} DOCKING {{else}} DOCKING-OVERRIDE ENABLED {{/if}} - {{:~link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}}
    - {{else docking_status == "undocking"}} + {{else data.docking_status == "undocking"}}
    - {{if !override_enabled}} + {{if !data.override_enabled}} UNDOCKING {{else}} UNDOCKING-OVERRIDE ENABLED {{/if}} - {{:~link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}}
    - {{else docking_status == "undocked"}} + {{else data.docking_status == "undocked"}}
    - {{if !override_enabled}} + {{if !data.override_enabled}} NOT IN USE {{else}} OVERRIDE ENABLED {{/if}} - {{:~link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}}
    {{else}} ERROR - {{:~link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}} {{/if}} @@ -59,9 +59,9 @@ Chamber Pressure:
    - {{:~displayBar(chamber_pressure, 0, 200, chamber_pressure < 80 || chamber_pressure > 120 ? 'bad' : chamber_pressure < 95 || chamber_pressure > 110 ? 'average' : 'good')}} + {{:helper.displayBar(chamber_pressure, 0, 200, chamber_pressure < 80 || chamber_pressure > 120 ? 'bad' : chamber_pressure < 95 || chamber_pressure > 110 ? 'average' : 'good')}}
    - {{:chamber_pressure}} kPa + {{:data.chamber_pressure}} kPa
    @@ -69,28 +69,28 @@
    - {{:~link('Cycle to Exterior', 'arrowthickstop-1-w', {'command' : 'cycle_ext'}, (processing || airlock_disabled) ? 'disabled' : null)}} - {{:~link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int'}, (processing || airlock_disabled) ? 'disabled' : null)}} + {{:helper.link('Cycle to Exterior', 'arrowthickstop-1-w', {'command' : 'cycle_ext'}, (processing || airlock_disabled) ? 'disabled' : null)}} + {{:helper.link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int'}, (processing || airlock_disabled) ? 'disabled' : null)}}
    - {{if airlock_disabled}} - {{:~link('Force exterior door', 'alert', {'command' : 'force_ext'}, 'disabled', null)}} - {{:~link('Force interior door', 'alert', {'command' : 'force_int'}, 'disabled', null)}} + {{if data.airlock_disabled}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, 'disabled', null)}} + {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, 'disabled', null)}} {{else}} - {{if interior_status.state == "open"}} - {{:~link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, 'redBackground')}} + {{if data.interior_status.state == "open"}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, 'redBackground')}} {{else}} - {{:~link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, processing ? 'yellowBackground' : null)}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, processing ? 'yellowBackground' : null)}} {{/if}} - {{if exterior_status.state == "open"}} - {{:~link('Force interior door', 'alert', {'command' : 'force_int'}, null, 'redBackground')}} + {{if data.exterior_status.state == "open"}} + {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, 'redBackground')}} {{else}} - {{:~link('Force interior door', 'alert', {'command' : 'force_int'}, null, processing ? 'yellowBackground' : null)}} + {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, processing ? 'yellowBackground' : null)}} {{/if}} {{/if}}
    - {{:~link('Abort', 'cancel', {'command' : 'abort'}, (processing && !airlock_disabled) ? null : 'disabled', (processing && !airlock_disabled) ? 'redBackground' : null)}} + {{:helper.link('Abort', 'cancel', {'command' : 'abort'}, (processing && !airlock_disabled) ? null : 'disabled', (processing && !airlock_disabled) ? 'redBackground' : null)}}
    \ No newline at end of file diff --git a/nano/templates/door_access_console.tmpl b/nano/templates/door_access_console.tmpl index c755d7c806..ccbdc0f84a 100644 --- a/nano/templates/door_access_console.tmpl +++ b/nano/templates/door_access_console.tmpl @@ -4,7 +4,7 @@ Exterior Door Status:
    - {{if exterior_status.state == "closed"}} + {{if data.exterior_status.state == "closed"}} Locked {{else}} Open @@ -16,7 +16,7 @@ Interior Door Status:
    - {{if interior_status.state == "closed"}} + {{if data.interior_status.state == "closed"}} Locked {{else}} Open @@ -27,15 +27,15 @@
    - {{if exterior_status.state == "open"}} - {{:~link('Lock Exterior Door', 'alert', {'command' : 'force_ext'}, processing ? 'disabled' : null)}} + {{if data.exterior_status.state == "open"}} + {{:helper.link('Lock Exterior Door', 'alert', {'command' : 'force_ext'}, processing ? 'disabled' : null)}} {{else}} - {{:~link('Cycle to Exterior', 'arrowthickstop-1-w', {'command' : 'cycle_ext_door'}, processing ? 'disabled' : null)}} + {{:helper.link('Cycle to Exterior', 'arrowthickstop-1-w', {'command' : 'cycle_ext_door'}, processing ? 'disabled' : null)}} {{/if}} - {{if interior_status.state == "open"}} - {{:~link('Lock Interior Door', 'alert', {'command' : 'force_int'}, processing ? 'disabled' : null)}} + {{if data.interior_status.state == "open"}} + {{:helper.link('Lock Interior Door', 'alert', {'command' : 'force_int'}, processing ? 'disabled' : null)}} {{else}} - {{:~link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int_door'}, processing ? 'disabled' : null)}} + {{:helper.link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int_door'}, processing ? 'disabled' : null)}} {{/if}}
    diff --git a/nano/templates/escape_pod_console.tmpl b/nano/templates/escape_pod_console.tmpl index d81b20a576..3bab0ce7da 100644 --- a/nano/templates/escape_pod_console.tmpl +++ b/nano/templates/escape_pod_console.tmpl @@ -4,17 +4,17 @@ Escape Pod Status:
    - {{if docking_status == "docked"}} - {{if armed}} + {{if data.docking_status == "docked"}} + {{if data.armed}} ARMED {{else}} SYSTEMS OK {{/if}} - {{else docking_status == "undocking"}} + {{else data.docking_status == "undocking"}} EJECTING-STAND CLEAR! - {{else docking_status == "undocked"}} + {{else data.docking_status == "undocked"}} POD EJECTED - {{else docking_status == "docking"}} + {{else data.docking_status == "docking"}} INITIALIZING... {{else}} ERROR @@ -25,17 +25,17 @@
    - {{if armed}} - {{if docking_status == "docked"}} - {{:~link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', null)}} - {{:~link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}} + {{if data.armed}} + {{if data.docking_status == "docked"}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}} {{else}} - {{:~link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', override_enabled? 'redBackground' : null)}} - {{:~link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : 'yellowBackground')}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', override_enabled? 'redBackground' : null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : 'yellowBackground')}} {{/if}} {{else}} - {{:~link('Force exterior door', 'alert', {'command' : 'force_door'}, 'disabled', null)}} - {{:~link('Override', 'alert', {'command' : 'toggle_override'}, 'disabled', null)}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, 'disabled', null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, 'disabled', null)}} {{/if}}
    diff --git a/nano/templates/escape_shuttle_control_console.tmpl b/nano/templates/escape_shuttle_control_console.tmpl index ad2d682ade..b779ce5a10 100644 --- a/nano/templates/escape_shuttle_control_console.tmpl +++ b/nano/templates/escape_shuttle_control_console.tmpl @@ -1,7 +1,7 @@

    Shuttle Status

    - {{:shuttle_status}} + {{:data.shuttle_status}}
    @@ -10,11 +10,11 @@ Bluespace Drive:
    - {{if shuttle_state == "idle"}} + {{if data.shuttle_state == "idle"}} IDLE - {{else shuttle_state == "warmup"}} + {{else data.shuttle_state == "warmup"}} SPINNING UP - {{else shuttle_state == "in_transit"}} + {{else data.shuttle_state == "in_transit"}} ENGAGED {{else}} ERROR @@ -22,28 +22,28 @@
    -{{if has_docking}} +{{if data.has_docking}}
    Docking Status:
    - {{if docking_status == "docked"}} + {{if data.docking_status == "docked"}} DOCKED - {{else docking_status == "docking"}} - {{if !docking_override}} + {{else data.docking_status == "docking"}} + {{if !data.docking_override}} DOCKING {{else}} DOCKING-MANUAL {{/if}} - {{else docking_status == "undocking"}} - {{if !docking_override}} + {{else data.docking_status == "undocking"}} + {{if !data.docking_override}} UNDOCKING {{else}} UNDOCKING-MANUAL {{/if}} - {{else docking_status == "undocked"}} + {{else data.docking_status == "undocked"}} UNDOCKED {{else}} ERROR @@ -55,7 +55,7 @@

    Shuttle Authorization

    - {{if has_auth}} + {{if data.has_auth}} Access Granted. Shuttle controls unlocked. {{else}} Additional authorization required. @@ -63,8 +63,8 @@
    - {{for auth_list}} - {{:~link(auth_name, 'eject', {'auth' : auth_hash}, null, 'itemContentWide')}} + {{for data.auth_list}} + {{:helper.link(auth_name, 'eject', {'auth' : auth_hash}, null, 'itemContentWide')}} {{/for}}
    @@ -72,9 +72,9 @@
    - {{:~link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, can_launch? null : 'disabled' , null)}} - {{:~link('Cancel Launch', 'cancel', {'cancel' : '1'}, can_cancel? null : 'disabled' , null)}} - {{:~link('Force Launch', 'alert', {'force' : '1'}, can_force? null : 'disabled' , can_force? 'redBackground' : null)}} + {{:helper.link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, can_launch? null : 'disabled' , null)}} + {{:helper.link('Cancel Launch', 'cancel', {'cancel' : '1'}, can_cancel? null : 'disabled' , null)}} + {{:helper.link('Force Launch', 'alert', {'force' : '1'}, can_force? null : 'disabled' , can_force? 'redBackground' : null)}}
    \ No newline at end of file diff --git a/nano/templates/freezer.tmpl b/nano/templates/freezer.tmpl index 9e1c13edae..27cdc63214 100644 --- a/nano/templates/freezer.tmpl +++ b/nano/templates/freezer.tmpl @@ -3,7 +3,7 @@ Status:
    - {{:~link('On', 'power', {'toggleStatus' : 1}, on ? 'selected' : null)}}{{:~link('Off', 'close', {'toggleStatus' : 1}, on ? null : 'selected')}} + {{:helper.link('On', 'power', {'toggleStatus' : 1}, on ? 'selected' : null)}}{{:helper.link('Off', 'close', {'toggleStatus' : 1}, on ? null : 'selected')}}
    @@ -12,7 +12,7 @@ Gas Pressure:
    - {{:gasPressure}} kPa + {{:data.gasPressure}} kPa
    @@ -22,9 +22,9 @@ Current:
    - {{:~displayBar(gasTemperature, minGasTemperature, maxGasTemperature, gasTemperatureClass)}} + {{:helper.displayBar(gasTemperature, minGasTemperature, maxGasTemperature, gasTemperatureClass)}}
    - {{:gasTemperature}} K + {{:data.gasTemperature}} K
    @@ -34,15 +34,15 @@ Target:
    - {{:~displayBar(targetGasTemperature, minGasTemperature, maxGasTemperature)}} + {{:helper.displayBar(targetGasTemperature, minGasTemperature, maxGasTemperature)}}
    - {{:~link('-', null, {'temp' : -100}, (targetGasTemperature > minGasTemperature) ? null : 'disabled')}} - {{:~link('-', null, {'temp' : -10}, (targetGasTemperature > minGasTemperature) ? null : 'disabled')}} - {{:~link('-', null, {'temp' : -1}, (targetGasTemperature > minGasTemperature) ? null : 'disabled')}} -
     {{:targetGasTemperature}} K 
    - {{:~link('+', null, {'temp' : 1}, (targetGasTemperature < maxGasTemperature) ? null : 'disabled')}} - {{:~link('+', null, {'temp' : 10}, (targetGasTemperature < maxGasTemperature) ? null : 'disabled')}} - {{:~link('+', null, {'temp' : 100}, (targetGasTemperature < maxGasTemperature) ? null : 'disabled')}} + {{:helper.link('-', null, {'temp' : -100}, (targetGasTemperature > minGasTemperature) ? null : 'disabled')}} + {{:helper.link('-', null, {'temp' : -10}, (targetGasTemperature > minGasTemperature) ? null : 'disabled')}} + {{:helper.link('-', null, {'temp' : -1}, (targetGasTemperature > minGasTemperature) ? null : 'disabled')}} +
     {{:data.targetGasTemperature}} K 
    + {{:helper.link('+', null, {'temp' : 1}, (targetGasTemperature < maxGasTemperature) ? null : 'disabled')}} + {{:helper.link('+', null, {'temp' : 10}, (targetGasTemperature < maxGasTemperature) ? null : 'disabled')}} + {{:helper.link('+', null, {'temp' : 100}, (targetGasTemperature < maxGasTemperature) ? null : 'disabled')}}
    diff --git a/nano/templates/geoscanner.tmpl b/nano/templates/geoscanner.tmpl index d3205e2ebe..2a73f2847d 100644 --- a/nano/templates/geoscanner.tmpl +++ b/nano/templates/geoscanner.tmpl @@ -6,10 +6,10 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan

    Machine Status

    - {{:~link(scanning ? 'Halt Scan' : 'Begin Scan', 'signal-diag', {'scanItem' : 1}, null)}} + {{:helper.link(scanning ? 'Halt Scan' : 'Begin Scan', 'signal-diag', {'scanItem' : 1}, null)}}
    - {{:~link('Eject item', 'eject', {'ejectItem' : 1}, (scanned_item && !scanning) ? null : 'disabled')}} + {{:helper.link('Eject item', 'eject', {'ejectItem' : 1}, (scanned_item && !scanning) ? null : 'disabled')}}
    @@ -17,8 +17,8 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
    Item:
    - {{if scanned_item}} - {{:scanned_item}} + {{if data.scanned_item}} + {{:data.scanned_item}} {{else}} No item inserted {{/if}} @@ -27,8 +27,8 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
    Heuristic analysis:
    - {{if scanned_item_desc}} - {{:scanned_item_desc}} + {{if data.scanned_item_desc}} + {{:data.scanned_item_desc}} {{/if}}
    @@ -38,11 +38,11 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
    Scan progress:
    - {{:~displayBar(scan_progress, 0, 100, 'good')}} - {{:scan_progress}} % + {{:helper.displayBar(scan_progress, 0, 100, 'good')}} + {{:data.scan_progress}} %
    - {{if scan_progress >= 100}} + {{if data.scan_progress >= 100}} Scan completed successfully. {{/if}}
    @@ -50,11 +50,11 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
    Vacuum seal integrity:
    - {{:~displayBar(scanner_seal_integrity, 0, 100, (scanner_seal_integrity < 66 ? (scanner_seal_integrity < 33 ? 'bad' : 'average') : 'good'))}} - {{:scanner_seal_integrity}} % + {{:helper.displayBar(scanner_seal_integrity, 0, 100, (scanner_seal_integrity < 66 ? (scanner_seal_integrity < 33 ? 'bad' : 'average') : 'good'))}} + {{:data.scanner_seal_integrity}} %
    - {{if scanner_seal_integrity < 25}} + {{if data.scanner_seal_integrity < 25}} Warning! Vacuum seal breach will result in scan failure! {{/if}}
    @@ -64,11 +64,11 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
    MASER Efficiency:
    - {{:~displayBar(maser_efficiency, 1, 100, (maser_efficiency < 66 ? (maser_efficiency < 33 ? 'bad' : 'average') : 'good'))}} - {{:maser_efficiency}} % + {{:helper.displayBar(maser_efficiency, 1, 100, (maser_efficiency < 66 ? (maser_efficiency < 33 ? 'bad' : 'average') : 'good'))}} + {{:data.maser_efficiency}} %
    - {{if maser_efficiency < 50}} + {{if data.maser_efficiency < 50}} Match wavelengths to progress the scan. {{/if}}
    @@ -76,25 +76,25 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
    Optimal Wavelength:
    - {{:~displayBar(optimal_wavelength, 1, 10000, 'good')}} - {{:optimal_wavelength}} MHz + {{:helper.displayBar(optimal_wavelength, 1, 10000, 'good')}} + {{:data.optimal_wavelength}} MHz
    Current Wavelength:
    - {{:~displayBar(maser_wavelength, 1, 10000, 'good')}} - {{:maser_wavelength}} MHz + {{:helper.displayBar(maser_wavelength, 1, 10000, 'good')}} + {{:data.maser_wavelength}} MHz
    - {{:~link('-2 KHz', null, {'maserWavelength' : -2}, null)}} - {{:~link('-1 KHz', null, {'maserWavelength' : -1}, null)}} - {{:~link('-0.5 KHz', null, {'maserWavelength' : -0.5}, null)}} + {{:helper.link('-2 KHz', null, {'maserWavelength' : -2}, null)}} + {{:helper.link('-1 KHz', null, {'maserWavelength' : -1}, null)}} + {{:helper.link('-0.5 KHz', null, {'maserWavelength' : -0.5}, null)}}
    - {{:~link('+0.5 KHz', null, {'maserWavelength' : 0.5}, null)}} - {{:~link('+1 KHz', null, {'maserWavelength' : 1}, null)}} - {{:~link('+2 KHz', null, {'maserWavelength' : 2}, null)}} + {{:helper.link('+0.5 KHz', null, {'maserWavelength' : 0.5}, null)}} + {{:helper.link('+1 KHz', null, {'maserWavelength' : 1}, null)}} + {{:helper.link('+2 KHz', null, {'maserWavelength' : 2}, null)}}
    @@ -102,18 +102,18 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
    Centrifuge speed:
    - {{:~displayBar(scanner_rpm, 0, 1000, 'good')}} - {{:scanner_rpm}} RPM + {{:helper.displayBar(scanner_rpm, 0, 1000, 'good')}} + {{:data.scanner_rpm}} RPM
    Internal temperature:
    - {{:~displayBar(scanner_temperature, 0, 1273, (scanner_temperature > 250 ? (scanner_temperature > 1000 ? 'bad' : 'average') : 'good')))}} - {{:scanner_temperature}} K + {{:helper.displayBar(scanner_temperature, 0, 1273, (scanner_temperature > 250 ? (scanner_temperature > 1000 ? 'bad' : 'average') : 'good')))}} + {{:data.scanner_temperature}} K
    - {{if scanner_temperature > 1000}} + {{if data.scanner_temperature > 1000}} Warning! Exceeding 1200K will result in scan failure! {{/if}}
    @@ -123,12 +123,12 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
    Ambient radiation:
    - {{:~displayBar(radiation, 0, 100, (radiation > 15 ? (radiation > 65 ? 'bad' : 'average') : 'good'))}} - {{:radiation}} mSv + {{:helper.displayBar(radiation, 0, 100, (radiation > 15 ? (radiation > 65 ? 'bad' : 'average') : 'good'))}} + {{:data.radiation}} mSv
    - {{:~link(rad_shield_on ? 'Disable Radiation Shielding' : 'Enable Radiation Shielding', 'radiation', {'toggle_rad_shield' : 1}, null)}} - {{if rad_shield_on}} + {{:helper.link(rad_shield_on ? 'Disable Radiation Shielding' : 'Enable Radiation Shielding', 'radiation', {'toggle_rad_shield' : 1}, null)}} + {{if data.rad_shield_on}} Shield blocking scanner. {{/if}}
    @@ -138,11 +138,11 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
    Coolant remaining:
    - {{:~displayBar(unused_coolant_per, 0, 100, (unused_coolant_per < 66 ? (unused_coolant_per < 33 ? 'bad' : 'average') : 'good'))}} - {{:unused_coolant_abs}} u + {{:helper.displayBar(unused_coolant_per, 0, 100, (unused_coolant_per < 66 ? (unused_coolant_per < 33 ? 'bad' : 'average') : 'good'))}} + {{:data.unused_coolant_abs}} u
    - {{if unused_coolant_per < 20}} + {{if data.unused_coolant_per < 20}} Warning! Coolant stocks low! {{/if}}
    @@ -150,28 +150,28 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan
    Coolant flow rate:
    - {{:~displayBar(coolant_usage_rate, 0, 10, 'good')}} - {{:coolant_usage_rate}} u/s + {{:helper.displayBar(coolant_usage_rate, 0, 10, 'good')}} + {{:data.coolant_usage_rate}} u/s
    - {{:~link('Min u/s', null, {'coolantRate' : -10}, null)}} - {{:~link('-3 u/s', null, {'coolantRate' : -3}, null)}} - {{:~link('-1 u/s', null, {'coolantRate' : -1}, null)}} + {{:helper.link('Min u/s', null, {'coolantRate' : -10}, null)}} + {{:helper.link('-3 u/s', null, {'coolantRate' : -3}, null)}} + {{:helper.link('-1 u/s', null, {'coolantRate' : -1}, null)}}
    - {{:~link('+1 u/s', null, {'coolantRate' : 1}, null)}} - {{:~link('+3 u/s', null, {'coolantRate' : 3}, null)}} - {{:~link('Max u/s', null, {'coolantRate' : 10}, null)}} + {{:helper.link('+1 u/s', null, {'coolantRate' : 1}, null)}} + {{:helper.link('+3 u/s', null, {'coolantRate' : 3}, null)}} + {{:helper.link('Max u/s', null, {'coolantRate' : 10}, null)}}
    Coolant purity:
    - {{:~displayBar(coolant_purity, 0, 100, (coolant_purity < 66 ? (coolant_purity < 33 ? 'bad' : 'average') : 'good'))}} - {{:coolant_purity}} % + {{:helper.displayBar(coolant_purity, 0, 100, (coolant_purity < 66 ? (coolant_purity < 33 ? 'bad' : 'average') : 'good'))}} + {{:data.coolant_purity}} %
    - {{if coolant_purity < 0.5}} + {{if data.coolant_purity < 0.5}} Warning! Check coolant for contaminants! {{/if}}
    @@ -180,6 +180,6 @@ Used In File(s): \code\modules\research\xenoarchaeology\machinery\geosample_scan

    Latest Results

    - {{:last_scan_data}} + {{:data.last_scan_data}}
    diff --git a/nano/templates/identification_computer.tmpl b/nano/templates/identification_computer.tmpl index 3c52746ce8..ed6e6d125b 100644 --- a/nano/templates/identification_computer.tmpl +++ b/nano/templates/identification_computer.tmpl @@ -1,4 +1,4 @@ -{{if printing}} +{{if data.printing}}
    The computer is currently busy.
    Printing...
    @@ -7,23 +7,23 @@ Thank you for your patience!

    {{else}} - {{:~link('Access Modification', 'home', {'choice' : 'mode', 'mode_target' : 0}, !mode ? 'disabled' : null)}} - {{:~link('Crew Manifest', 'folder-open', {'choice' : 'mode', 'mode_target' : 1}, mode ? 'disabled' : null)}} - {{:~link('Print', 'print', {'choice' : 'print'}, (mode || has_modify) ? null : 'disabled')}} + {{:helper.link('Access Modification', 'home', {'choice' : 'mode', 'mode_target' : 0}, !mode ? 'disabled' : null)}} + {{:helper.link('Crew Manifest', 'folder-open', {'choice' : 'mode', 'mode_target' : 1}, mode ? 'disabled' : null)}} + {{:helper.link('Print', 'print', {'choice' : 'print'}, (mode || has_modify) ? null : 'disabled')}} - {{if mode}} + {{if data.mode}}

    Crew Manifest

    - {{:manifest}} + {{:data.manifest}}
    {{else}}

    Access Modification

    - {{if !authenticated}} + {{if !data.authenticated}} Please insert the IDs into the terminal to proceed.
    {{/if}} @@ -32,7 +32,7 @@ Target Identity:
    - {{:~link(target_name, 'eject', {'choice' : 'modify'})}} + {{:helper.link(target_name, 'eject', {'choice' : 'modify'})}}
    @@ -40,12 +40,12 @@ Authorized Identity:
    - {{:~link(scan_name, 'eject', {'choice' : 'scan'})}} + {{:helper.link(scan_name, 'eject', {'choice' : 'scan'})}}
    - {{if authenticated}} + {{if data.authenticated}} - {{if has_modify}} + {{if data.has_modify}}

    Details

    -
    +
    - + Registered Name:
    - +
    -
    +
    - + Account Number:
    - +
    @@ -115,7 +115,7 @@ Terminations:
    - {{:~link('Terminate ' + target_owner, 'gear', {'choice' : 'terminate'}, target_rank == "Terminated" ? 'disabled' : null, target_rank == "Terminated" ? 'disabled' : 'linkDanger')}} + {{:helper.link('Terminate ' + target_owner, 'gear', {'choice' : 'terminate'}, target_rank == "Terminated" ? 'disabled' : null, target_rank == "Terminated" ? 'disabled' : 'linkDanger')}}
    @@ -125,7 +125,7 @@
    - {{:target_rank}} + {{:data.target_rank}}
    @@ -137,63 +137,63 @@ Special - {{:~link("Captain", '', {'choice' : 'assign', 'assign_target' : 'Captain'}, target_rank == 'Captain' ? 'disabled' : null)}} - {{:~link("Custom", '', {'choice' : 'assign', 'assign_target' : 'Custom'})}} + {{:helper.link("Captain", '', {'choice' : 'assign', 'assign_target' : 'Captain'}, target_rank == 'Captain' ? 'disabled' : null)}} + {{:helper.link("Custom", '', {'choice' : 'assign', 'assign_target' : 'Custom'})}} Engineering - {{for engineering_jobs}} - {{:~link(display_name, '', {'choice' : 'assign', 'assign_target' : job}, target_rank == job ? 'disabled' : null)}} + {{for data.engineering_jobs}} + {{:helper.link(display_name, '', {'choice' : 'assign', 'assign_target' : job}, target_rank == job ? 'disabled' : null)}} {{/for}} Medical - {{for medical_jobs}} - {{:~link(display_name, '', {'choice' : 'assign', 'assign_target' : job}, target_rank == job ? 'disabled' : null)}} + {{for data.medical_jobs}} + {{:helper.link(display_name, '', {'choice' : 'assign', 'assign_target' : job}, target_rank == job ? 'disabled' : null)}} {{/for}} Science - {{for science_jobs}} - {{:~link(display_name, '', {'choice' : 'assign', 'assign_target' : job}, target_rank == job ? 'disabled' : null)}} + {{for data.science_jobs}} + {{:helper.link(display_name, '', {'choice' : 'assign', 'assign_target' : job}, target_rank == job ? 'disabled' : null)}} {{/for}} Security - {{for security_jobs}} - {{:~link(display_name, '', {'choice' : 'assign', 'assign_target' : job}, target_rank == job ? 'disabled' : null)}} + {{for data.security_jobs}} + {{:helper.link(display_name, '', {'choice' : 'assign', 'assign_target' : job}, target_rank == job ? 'disabled' : null)}} {{/for}} Civilian - {{for civilian_jobs}} - {{if #index && #index % 6 === 0}} + {{for data.civilian_jobs}} + {{if data.#index && #index % 6 === 0}} {{/if}} - {{:~link(display_name, '', {'choice' : 'assign', 'assign_target' : job}, target_rank == job ? 'disabled' : null)}} + {{:helper.link(display_name, '', {'choice' : 'assign', 'assign_target' : job}, target_rank == job ? 'disabled' : null)}} {{/for}} - {{if centcom_access}} + {{if data.centcom_access}} CentCom - {{for centcom_jobs}} - {{if #index % 6 === 0}} + {{for data.centcom_jobs}} + {{if data.#index % 6 === 0}} {{/if}} - {{:~link(display_name, '', {'choice' : 'assign', 'assign_target' : job}, target_rank == job ? 'disabled' : null)}} + {{:helper.link(display_name, '', {'choice' : 'assign', 'assign_target' : job}, target_rank == job ? 'disabled' : null)}} {{/for}} @@ -202,28 +202,28 @@
    - {{if centcom_access}} + {{if data.centcom_access}}

    Central Command

    - {{for all_centcom_access}} + {{for data.all_centcom_access}}
    - {{:~link(desc, '', {'choice' : 'access', 'access_target' : ref, 'allowed' : allowed}, null, allowed ? 'selected' : null)}} + {{:helper.link(desc, '', {'choice' : 'access', 'access_target' : ref, 'allowed' : allowed}, null, allowed ? 'selected' : null)}}
    {{/for}}
    {{else}}
    -

    {{:station_name}}

    +

    {{:data.station_name}}

    - {{for regions}} + {{for data.regions}}
    -
    {{:name}}
    - {{for accesses}} +
    {{:data.name}}
    + {{for data.accesses}}
    - {{:~link(desc, '', {'choice' : 'access', 'access_target' : ref, 'allowed' : allowed}, null, allowed ? 'selected' : null)}} + {{:helper.link(desc, '', {'choice' : 'access', 'access_target' : ref, 'allowed' : allowed}, null, allowed ? 'selected' : null)}}
    {{/for}}
    diff --git a/nano/templates/isolation_centrifuge.tmpl b/nano/templates/isolation_centrifuge.tmpl index 1c201ff9f5..1dcde36d31 100644 --- a/nano/templates/isolation_centrifuge.tmpl +++ b/nano/templates/isolation_centrifuge.tmpl @@ -1,45 +1,45 @@
    - {{:~link('Close', 'gear', {'close' : 1}, null, 'fixedLeft')}} - {{:~link('Print', 'print', { 'print' : 1 }, antibodies || pathogens ? null : 'disabled', 'fixedLeft')}} + {{:helper.link('Close', 'gear', {'close' : 1}, null, 'fixedLeft')}} + {{:helper.link('Print', 'print', { 'print' : 1 }, antibodies || pathogens ? null : 'disabled', 'fixedLeft')}}
    -{{if busy}} +{{if data.busy}}
    The Centrifuge is currently busy.
    -
    {{:busy}}
    +
    {{:data.busy}}

    Thank you for your patience!

    {{else}}
    -

    {{:is_antibody_sample ? 'Antibody Sample' : 'Blood Sample'}}

    +

    {{:data.is_antibody_sample ? 'Antibody Sample' : 'Blood Sample'}}

    - {{:~link('Eject Vial', 'eject', { 'action' : 'sample' }, sample_inserted ? null : 'disabled')}} + {{:helper.link('Eject Vial', 'eject', { 'action' : 'sample' }, sample_inserted ? null : 'disabled')}}
    - {{if sample_inserted}} - {{if antibodies || pathogens}} + {{if data.sample_inserted}} + {{if data.antibodies || pathogens}}
    - {{if antibodies}} + {{if data.antibodies}}
    Antibodies:
    - {{:antibodies}} + {{:data.antibodies}}
    {{/if}} - {{if pathogens}} + {{if data.pathogens}}
    Pathogens:
    - {{for pathogens}} + {{for data.pathogens}}
    - {{:name}} ({{:spread_type}}) + {{:data.name}} ({{:data.spread_type}})
    {{/for}}
    @@ -56,24 +56,24 @@ No vial detected.
    {{/if}} - {{if antibodies && !is_antibody_sample}} + {{if data.antibodies && !is_antibody_sample}}
    Isolate Antibodies:
    - {{:~link(antibodies, 'pencil', { 'action' : 'antibody' })}} + {{:helper.link(antibodies, 'pencil', { 'action' : 'antibody' })}}
    {{/if}} - {{if pathogens}} + {{if data.pathogens}}
    Isolate Strain:
    - {{for pathogens}} - {{:~link(name, 'pencil', { 'isolate' : reference })}} + {{for data.pathogens}} + {{:helper.link(name, 'pencil', { 'isolate' : reference })}} {{/for}}
    diff --git a/nano/templates/multi_docking_console.tmpl b/nano/templates/multi_docking_console.tmpl index 82cca2971b..98daca0c52 100644 --- a/nano/templates/multi_docking_console.tmpl +++ b/nano/templates/multi_docking_console.tmpl @@ -4,13 +4,13 @@ Docking Port Status:
    - {{if docking_status == "docked"}} + {{if data.docking_status == "docked"}} DOCKED - {{else docking_status == "docking"}} + {{else data.docking_status == "docking"}} DOCKING - {{else docking_status == "undocking"}} + {{else data.docking_status == "undocking"}} UNDOCKING - {{else docking_status == "undocked"}} + {{else data.docking_status == "undocked"}} NOT IN USE {{else}} ERROR @@ -19,14 +19,14 @@
    -{{for airlocks}} +{{for data.airlocks}}
    - {{:name}} + {{:data.name}}
    - {{if override_enabled}} + {{if data.override_enabled}} OVERRIDE ENABLED {{else}} STATUS OK diff --git a/nano/templates/omni_filter.tmpl b/nano/templates/omni_filter.tmpl index e1e805f1dd..92dbfd054e 100644 --- a/nano/templates/omni_filter.tmpl +++ b/nano/templates/omni_filter.tmpl @@ -1,51 +1,51 @@
    - {{:~link(power ? 'On' : 'Off', null, {'command' : 'power'}, null, power ? 'selected' : 'redBackground')}} + {{:helper.link(power ? 'On' : 'Off', null, {'command' : 'power'}, null, power ? 'selected' : 'redBackground')}}
    - {{:~link('Configure', null, {'command' : 'configure'}, null, config ? 'selected' : null)}} + {{:helper.link('Configure', null, {'command' : 'configure'}, null, config ? 'selected' : null)}}
    - {{if config}} + {{if data.config}}
    Port
    - {{for ports}} -
    {{:dir}} Port
    + {{for data.ports}} +
    {{:data.dir}} Port
    {{/for}}
    Input
    - {{for ports}} + {{for data.ports}}
    - {{:~link(' ', null, {'command' : 'switch_mode', 'mode' : 'in', 'dir' : dir}, null, input ? 'selected' : null)}} + {{:helper.link(' ', null, {'command' : 'switch_mode', 'mode' : 'in', 'dir' : dir}, null, input ? 'selected' : null)}}
    {{/for}}
    Output
    - {{for ports}} + {{for data.ports}}
    - {{:~link(' ', null, {'command' : 'switch_mode', 'mode' : 'out', 'dir' : dir}, null, output ? 'selected' : null)}} + {{:helper.link(' ', null, {'command' : 'switch_mode', 'mode' : 'out', 'dir' : dir}, null, output ? 'selected' : null)}}
    {{/for}}
    Filter
    - {{for ports}} + {{for data.ports}}
    - {{:~link(f_type ? f_type : 'None', null, {'command' : 'switch_filter', 'mode' : f_type, 'dir' : dir}, filter ? null : 'disabled', f_type ? 'selected' : null)}} + {{:helper.link(f_type ? f_type : 'None', null, {'command' : 'switch_filter', 'mode' : f_type, 'dir' : dir}, filter ? null : 'disabled', f_type ? 'selected' : null)}}
    {{/for}}
    - Target Output Pressure: {{:~round(pressure)}} kPa + Target Output Pressure: {{:helper.round(pressure)}} kPa
    - {{:~link('Set Target Pressure', null, {'command' : 'set_pressure'})}} + {{:helper.link('Set Target Pressure', null, {'command' : 'set_pressure'})}}
    {{else}} @@ -53,20 +53,20 @@
    Port
    - {{for ports}} -
    {{:dir}} Port
    + {{for data.ports}} +
    {{:data.dir}} Port
    {{/for}}
    Mode
    - {{for ports}} + {{for data.ports}}
    - {{if input}} + {{if data.input}} Input - {{else output}} + {{else data.output}} Output - {{else f_type}} - {{:f_type}} + {{else data.f_type}} + {{:data.f_type}} {{else}} Disabled {{/if}} @@ -76,7 +76,7 @@
    - Target Output Pressure: {{:~round(pressure)}} kPa + Target Output Pressure: {{:helper.round(pressure)}} kPa
    {{/if}}
    \ No newline at end of file diff --git a/nano/templates/omni_mixer.tmpl b/nano/templates/omni_mixer.tmpl index 4da662cfd1..ed128e0d8d 100644 --- a/nano/templates/omni_mixer.tmpl +++ b/nano/templates/omni_mixer.tmpl @@ -1,59 +1,59 @@
    - {{:~link(power ? 'On' : 'Off', null, {'command' : 'power'}, null, power ? 'selected' : 'redBackground')}} + {{:helper.link(power ? 'On' : 'Off', null, {'command' : 'power'}, null, power ? 'selected' : 'redBackground')}}
    - {{:~link('Configure', null, {'command' : 'configure'}, null, config ? 'selected' : null)}} + {{:helper.link('Configure', null, {'command' : 'configure'}, null, config ? 'selected' : null)}}
    - {{if config}} + {{if data.config}}
    Port
    - {{for ports}} -
    {{:dir}} Port
    + {{for data.ports}} +
    {{:data.dir}} Port
    {{/for}}
    Input
    - {{for ports}} + {{for data.ports}}
    - {{:~link(' ', null, input ? {'command' : 'switch_mode', 'mode' : 'none', 'dir' : dir} : {'command' : 'switch_mode', 'mode' : 'in', 'dir' : dir}, output ? 'disabled' : null, input ? 'selected' : null)}} + {{:helper.link(' ', null, input ? {'command' : 'switch_mode', 'mode' : 'none', 'dir' : dir} : {'command' : 'switch_mode', 'mode' : 'in', 'dir' : dir}, output ? 'disabled' : null, input ? 'selected' : null)}}
    {{/for}}
    Output
    - {{for ports}} + {{for data.ports}}
    - {{:~link(' ', null, output ? null : {'command' : 'switch_mode', 'mode' : 'out', 'dir' : dir}, null, output ? 'selected' : null)}} + {{:helper.link(' ', null, output ? null : {'command' : 'switch_mode', 'mode' : 'out', 'dir' : dir}, null, output ? 'selected' : null)}}
    {{/for}}
    Concentration
    - {{for ports}} + {{for data.ports}}
    - {{:~link( input ? ~round(concentration*100)+' %' : '-', null, {'command' : 'switch_con', 'dir' : dir}, input ? null : 'disabled')}} + {{:helper.link( input ? ~round(concentration*100)+' %' : '-', null, {'command' : 'switch_con', 'dir' : dir}, input ? null : 'disabled')}}
    {{/for}}
    Lock
    - {{for ports}} + {{for data.ports}}
    - {{:~link(' ', con_lock ? 'locked' : 'unlocked', {'command' : 'switch_conlock', 'dir' : dir}, input ? null : 'disabled', con_lock ? 'selected' : null)}} + {{:helper.link(' ', con_lock ? 'locked' : 'unlocked', {'command' : 'switch_conlock', 'dir' : dir}, input ? null : 'disabled', con_lock ? 'selected' : null)}}
    {{/for}}
    - Target Output Pressure: {{:~round(pressure)}} kPa + Target Output Pressure: {{:helper.round(pressure)}} kPa
    - {{:~link('Set Target Pressure', null, {'command' : 'set_pressure'})}} + {{:helper.link('Set Target Pressure', null, {'command' : 'set_pressure'})}}
    {{else}} @@ -61,17 +61,17 @@
    Port
    - {{for ports}} -
    {{:dir}} Port
    + {{for data.ports}} +
    {{:data.dir}} Port
    {{/for}}
    Mode
    - {{for ports}} + {{for data.ports}}
    - {{if input}} + {{if data.input}} Input - {{else output}} + {{else data.output}} Output {{else}} Disabled @@ -81,10 +81,10 @@
    Concentration
    - {{for ports}} + {{for data.ports}}
    - {{if input}} - {{:~round(concentration*100)}} % + {{if data.input}} + {{:helper.round(concentration*100)}} % {{else}} - {{/if}} @@ -94,7 +94,7 @@
    - Target Output Pressure: {{:~round(pressure)}} kPa + Target Output Pressure: {{:helper.round(pressure)}} kPa
    {{/if}}
    \ No newline at end of file diff --git a/nano/templates/pathogenic_isolator.tmpl b/nano/templates/pathogenic_isolator.tmpl index ad88151c3b..c48bcce166 100644 --- a/nano/templates/pathogenic_isolator.tmpl +++ b/nano/templates/pathogenic_isolator.tmpl @@ -2,17 +2,17 @@

    Menu

    - {{if !isolating}} - {{:~link('Home', 'home', {'home' : 1}, state == 'home' ? 'disabled' : null, 'fixedLeft')}} - {{:~link('List', 'note', {'list' : 1}, state == 'list' ? 'disabled' : null, 'fixedLeft')}} - {{:~link('Pathogen', 'folder-open', {'entry' : 1}, state == 'entry' ? 'disabled' : null, 'fixedLeft')}} + {{if !data.isolating}} + {{:helper.link('Home', 'home', {'home' : 1}, state == 'home' ? 'disabled' : null, 'fixedLeft')}} + {{:helper.link('List', 'note', {'list' : 1}, state == 'list' ? 'disabled' : null, 'fixedLeft')}} + {{:helper.link('Pathogen', 'folder-open', {'entry' : 1}, state == 'entry' ? 'disabled' : null, 'fixedLeft')}} {{/if}}
    - {{:~link('Close', 'gear', {'close' : 1}, null, 'fixedLeft')}} - {{:~link('Print', 'print', { 'print' : 1 }, can_print ? null : 'disabled', 'fixedLeft')}} + {{:helper.link('Close', 'gear', {'close' : 1}, null, 'fixedLeft')}} + {{:helper.link('Print', 'print', { 'print' : 1 }, can_print ? null : 'disabled', 'fixedLeft')}}
    -{{if isolating}} +{{if data.isolating}}
    The Isolator is currently busy.
    Isolating pathogens...
    @@ -21,22 +21,22 @@ Thank you for your patience!

    {{else}} - {{if state =="home"}} + {{if data.state =="home"}}

    Blood Sample

    - {{:~link('Eject Syringe', 'eject', { 'eject' : 1 }, syringe_inserted ? null : 'disabled')}} + {{:helper.link('Eject Syringe', 'eject', { 'eject' : 1 }, syringe_inserted ? null : 'disabled')}}
    - {{if syringe_inserted}} + {{if data.syringe_inserted}}
    Pathogens: - {{if pathogen_pool}} - {{for pathogen_pool}} + {{if data.pathogen_pool}} + {{for data.pathogen_pool}}
    - {{:#index + 1}}. #{{:unique_id}} {{:is_in_database ? "(Analysed)" : ""}}
    - {{:name}}: {{:dna}} + {{:data.#index + 1}}. #{{:data.unique_id}} {{:data.is_in_database ? "(Analysed)" : ""}}
    + {{:data.name}}: {{:data.dna}}
    {{/for}} {{else}} @@ -48,14 +48,14 @@ No syringe loaded.
    {{/if}} - {{if pathogen_pool}} + {{if data.pathogen_pool}}
    Isolate Pathogens:
    - {{for pathogen_pool}} - {{:~link('#' + unique_id, 'pencil', { 'isolate' : reference }, null, 'fixedLeft')}} + {{for data.pathogen_pool}} + {{:helper.link('#' + unique_id, 'pencil', { 'isolate' : reference }, null, 'fixedLeft')}} {{/for}}
    @@ -64,25 +64,25 @@ Database Lookup:
    - {{for pathogen_pool}} - {{if is_in_database}} - {{:~link('#' + unique_id, 'info', { 'entry' : 1, 'view' : record }, null, 'fixedLeft')}} + {{for data.pathogen_pool}} + {{if data.is_in_database}} + {{:helper.link('#' + unique_id, 'info', { 'entry' : 1, 'view' : record }, null, 'fixedLeft')}} {{/if}} {{/for}}
    {{/if}} {{else}} - {{if state == "list"}} + {{if data.state == "list"}}

    View Database

    - {{if database}} - {{for database}} + {{if data.database}} + {{for data.database}}
    -
    {{:name}}
    - {{:~link('Details', 'circle-arrow-s', { 'entry' : 1, 'view' : record }, null, 'fixedLeft')}} +
    {{:data.name}}
    + {{:helper.link('Details', 'circle-arrow-s', { 'entry' : 1, 'view' : record }, null, 'fixedLeft')}}
    {{/for}} {{else}} @@ -90,13 +90,13 @@ {{/if}}
    {{else}} - {{if state == "entry"}} - {{if entry}} + {{if data.state == "entry"}} + {{if data.entry}}
    -

    {{:entry.name}}

    +

    {{:data.entry.name}}

    - {{:entry.description}} + {{:data.entry.description}}
    {{else}} No virus selected. diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl index 088f1cec21..8b8431a30e 100644 --- a/nano/templates/pda.tmpl +++ b/nano/templates/pda.tmpl @@ -3,16 +3,16 @@ Title: PDA UI Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm --> -{{if owner}} +{{if data.owner}}
    Functions:
    - - {{:~link('Close', 'gear', {'choice' : "Close"}, null, 'fixedLeft')}} - {{if idInserted}} {{:~link('Update PDA Info', 'eject', {'choice' : "UpdateInfo"}, null, 'fixedLeftWide')}} {{/if}} - {{if mode != 0}} {{:~link('Return', 'arrowreturn-1-w', {'choice' : "Return"}, null, 'fixedLeft')}} {{/if}} + + {{: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}}

    @@ -21,17 +21,17 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Station Time:
    - {{:stationTime}} + {{:data.stationTime}}

    - {{if mode == 0}} + {{if data.mode == 0}}
    Owner:
    - {{:owner}}, {{:ownjob}} + {{:data.owner}}, {{:data.ownjob}}

    @@ -40,7 +40,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm ID:
    - {{:~link(idLink, 'eject', {'choice' : "Authenticate"}, idInserted ? null : 'disabled', idInserted ? 'fixedLeftWidest' : 'fixedLeft')}} + {{:helper.link(idLink, 'eject', {'choice' : "Authenticate"}, idInserted ? null : 'disabled', idInserted ? 'fixedLeftWidest' : 'fixedLeft')}}

    @@ -49,10 +49,10 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Cartridge:
    - {{if cart_loaded==1}} - {{:~link(cartridge.name, 'eject', {'choice' : "Eject"},null,null)}} + {{if data.cart_loaded==1}} + {{:helper.link(cartridge.name, 'eject', {'choice' : "Eject"},null,null)}} {{else}} - {{:~link('None', 'eject', {'choice' : "Eject"},'disabled',null)}} + {{:helper.link('None', 'eject', {'choice' : "Eject"},'disabled',null)}} {{/if}}
    @@ -64,68 +64,68 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm General:
    - {{:~link('Notekeeper', 'note', {'choice' : "1"}, null, 'fixedLeftWide')}} - {{:~link('Messenger', newMessage ? 'mail-closed' : 'mail-open', {'choice' : "2"}, null, 'fixedLeftWide')}} - {{:~link('Crew Manifest', 'contact', {'choice' : "41"}, null, 'fixedLeftWide')}} + {{:helper.link('Notekeeper', 'note', {'choice' : "1"}, null, 'fixedLeftWide')}} + {{:helper.link('Messenger', newMessage ? 'mail-closed' : 'mail-open', {'choice' : "2"}, null, 'fixedLeftWide')}} + {{:helper.link('Crew Manifest', 'contact', {'choice' : "41"}, null, 'fixedLeftWide')}}

    - {{if cartridge}} - {{if cartridge.access.access_clown == 1}} + {{if data.cartridge}} + {{if data.cartridge.access.access_clown == 1}}
    Clown:
    - {{:~link('Honk Synthesizer', 'gear', {'choice' : "Honk"}, null, 'fixedLeftWide')}} + {{:helper.link('Honk Synthesizer', 'gear', {'choice' : "Honk"}, null, 'fixedLeftWide')}}

    {{/if}} - {{if cartridge.access.access_engine == 1}} + {{if data.cartridge.access.access_engine == 1}}
    Engineering:
    - {{:~link('Power Monitor', 'alert', {'choice' : "43"}, null, 'fixedLeftWide')}} + {{:helper.link('Power Monitor', 'alert', {'choice' : "43"}, null, 'fixedLeftWide')}}

    {{/if}} - {{if cartridge.access.access_medical == 1}} + {{if data.cartridge.access.access_medical == 1}}
    Medical:
    - {{:~link('Medical Records', 'gear', {'choice' : "44"}, null, 'fixedLeftWide')}} - {{:~link(scanmode == 1 ? 'Disable Med Scanner' : 'Enable Med Scanner', 'gear', {'choice' : "Medical Scan"}, null , 'fixedLeftWide')}} + {{:helper.link('Medical Records', 'gear', {'choice' : "44"}, null, 'fixedLeftWide')}} + {{:helper.link(scanmode == 1 ? 'Disable Med Scanner' : 'Enable Med Scanner', 'gear', {'choice' : "Medical Scan"}, null , 'fixedLeftWide')}}

    {{/if}} - {{if cartridge.access.access_security == 1}} + {{if data.cartridge.access.access_security == 1}}
    Security:
    - {{:~link('Security Records', 'gear', {'choice' : "45"}, null, 'fixedLeftWide')}} - {{if cartridge.radio ==1}} {{:~link('Security Bot Access', 'gear', {'choice' : "46"}, null, 'fixedLeftWide')}} {{/if}} + {{:helper.link('Security Records', 'gear', {'choice' : "45"}, null, 'fixedLeftWide')}} + {{if data.cartridge.radio ==1}} {{:helper.link('Security Bot Access', 'gear', {'choice' : "46"}, null, 'fixedLeftWide')}} {{/if}}

    {{/if}} - {{if cartridge.access.access_quartermaster == 1}} + {{if data.cartridge.access.access_quartermaster == 1}}
    Quartermaster:
    - {{:~link('Supply Records', 'gear', {'choice' : "47"}, null, 'fixedLeftWide')}} - {{if cartridge.radio == 3}} {{:~link('Delivery Bot Control', 'gear', {'choice' : "48"}, null, 'fixedLeftWide')}} {{/if}} + {{:helper.link('Supply Records', 'gear', {'choice' : "47"}, null, 'fixedLeftWide')}} + {{if data.cartridge.radio == 3}} {{:helper.link('Delivery Bot Control', 'gear', {'choice' : "48"}, null, 'fixedLeftWide')}} {{/if}}
    @@ -138,32 +138,32 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Utilities:
    - {{if cartridge}} - {{if cartridge.access.access_status_display == 1}} {{:~link('Status Display', 'gear', {'choice' : "42"}, null, 'fixedLeftWide')}}{{/if}} - {{if cartridge.access.access_janitor==1}} {{:~link('Custodial Locator', 'gear', {'choice' : "49"}, null, 'fixedLeftWide')}} {{/if}} - {{if cartridge.radio == 2}} {{:~link('Signaler System', 'gear', {'choice' : "40"}, null, 'fixedLeftWide')}} {{/if}} - {{if cartridge.access.access_reagent_scanner==1}} {{:~link(scanmode == 3 ? 'Disable Reagent Scanner' : 'Enable Reagent Scanner', 'gear', {'choice' : "Reagent Scan"}, null, 'fixedLeftWider')}} {{/if}} - {{if cartridge.access.access_engine==1}} {{:~link(scanmode == 4 ? 'Disable Halogen Counter' : 'Enable Halogen Counter', 'gear', {'choice' : "Halogen Counter"}, null, 'fixedLeftWider')}} {{/if}} - {{if cartridge.access.access_atmos==1}} {{:~link(scanmode == 5 ? 'Disable Gas Scanner' : 'Enable Gas Scanner', 'gear', {'choice' : "Gas Scan"}, null, 'fixedLeftWide')}} {{/if}} - {{if cartridge.access.access_remote_door==1}}{{:~link('Toggle Door', 'gear', {'choice' : "Toggle Door"}, null, 'fixedLeftWide')}} {{/if}} + {{if data.cartridge}} + {{if data.cartridge.access.access_status_display == 1}} {{:helper.link('Status Display', 'gear', {'choice' : "42"}, null, 'fixedLeftWide')}}{{/if}} + {{if data.cartridge.access.access_janitor==1}} {{:helper.link('Custodial Locator', 'gear', {'choice' : "49"}, null, 'fixedLeftWide')}} {{/if}} + {{if data.cartridge.radio == 2}} {{:helper.link('Signaler System', 'gear', {'choice' : "40"}, null, 'fixedLeftWide')}} {{/if}} + {{if data.cartridge.access.access_reagent_scanner==1}} {{:helper.link(scanmode == 3 ? 'Disable Reagent Scanner' : 'Enable Reagent Scanner', 'gear', {'choice' : "Reagent Scan"}, null, 'fixedLeftWider')}} {{/if}} + {{if data.cartridge.access.access_engine==1}} {{:helper.link(scanmode == 4 ? 'Disable Halogen Counter' : 'Enable Halogen Counter', 'gear', {'choice' : "Halogen Counter"}, null, 'fixedLeftWider')}} {{/if}} + {{if data.cartridge.access.access_atmos==1}} {{:helper.link(scanmode == 5 ? 'Disable Gas Scanner' : 'Enable Gas Scanner', 'gear', {'choice' : "Gas Scan"}, null, 'fixedLeftWide')}} {{/if}} + {{if data.cartridge.access.access_remote_door==1}}{{:helper.link('Toggle Door', 'gear', {'choice' : "Toggle Door"}, null, 'fixedLeftWide')}} {{/if}} {{/if}} - {{:~link('Atmospheric Scan', 'gear', {'choice' : "3"}, null, 'fixedLeftWide')}} - {{:~link(fon==1 ? 'Disable Flashlight' : 'Enable Flashlight', 'lightbulb', {'choice' : "Light"}, null,'fixedLeftWide')}} + {{:helper.link('Atmospheric Scan', 'gear', {'choice' : "3"}, null, 'fixedLeftWide')}} + {{:helper.link(fon==1 ? 'Disable Flashlight' : 'Enable Flashlight', 'lightbulb', {'choice' : "Light"}, null,'fixedLeftWide')}}
    - {{if pai}} + {{if data.pai}}
    PAI Utilities:
    - {{:~link('Configuration', 'gear', {'choice' : "pai", 'option' : "1"}, null, 'fixedLeft')}} - {{:~link('Eject pAI', 'eject', {'choice' : "pai", 'option' : "2"}, null, 'fixedLeft')}} + {{:helper.link('Configuration', 'gear', {'choice' : "pai", 'option' : "1"}, null, 'fixedLeft')}} + {{:helper.link('Eject pAI', 'eject', {'choice' : "pai", 'option' : "2"}, null, 'fixedLeft')}}
    {{/if}} {{/if}} - {{if mode == 1}} + {{if data.mode == 1}}
    Notes: @@ -172,18 +172,18 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{:note}} + {{:data.note}}
    - {{:~link('Edit Notes', 'gear', {'choice' : "Edit"}, null, 'fixedLeft')}} + {{:helper.link('Edit Notes', 'gear', {'choice' : "Edit"}, null, 'fixedLeft')}}
    - {{else mode == 2}} + {{else data.mode == 2}}

    SpaceMessenger V4.0.1

    @@ -191,53 +191,53 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{:~link(silent==1 ? 'Ringer: Off' : 'Ringer: On', silent==1 ? 'volume-off' : 'volume-on', {'choice' : "Toggle Ringer"}, null, 'fixedLeftWide')}} - {{:~link(toff==1 ? 'Messenger: Off' : 'Messenger: On',toff==1 ? 'close':'check', {'choice' : "Toggle Messenger"}, null, 'fixedLeftWide')}} - {{:~link('Set Ringtone', 'comment', {'choice' : "Ringtone"}, null, 'fixedLeftWide')}} - {{:~link('Delete all Conversations', 'trash', {'choice' : "Clear", 'option' : "All"}, null, 'fixedLeftWider')}} + {{:helper.link(silent==1 ? 'Ringer: Off' : 'Ringer: On', silent==1 ? 'volume-off' : 'volume-on', {'choice' : "Toggle Ringer"}, null, 'fixedLeftWide')}} + {{:helper.link(toff==1 ? 'Messenger: Off' : 'Messenger: On',toff==1 ? 'close':'check', {'choice' : "Toggle Messenger"}, null, 'fixedLeftWide')}} + {{:helper.link('Set Ringtone', 'comment', {'choice' : "Ringtone"}, null, 'fixedLeftWide')}} + {{:helper.link('Delete all Conversations', 'trash', {'choice' : "Clear", 'option' : "All"}, null, 'fixedLeftWider')}}
    - {{if toff == 0}} + {{if data.toff == 0}}

    - {{if cartridge}} - {{if cartridge.charges}} + {{if data.cartridge}} + {{if data.cartridge.charges}}
    - {{:cartridge.charges}} - {{if cartridge.type == "/obj/item/weapon/cartridge/syndicate"}} detonation charges left. {{/if}} - {{if cartridge.type == "/obj/item/weapon/cartridge/clown" || cartridge.type == "/obj/item/weapon/cartridge/mime"}} viral files left. {{/if}} + {{:data.cartridge.charges}} + {{if data.cartridge.type == "/obj/item/weapon/cartridge/syndicate"}} detonation charges left. {{/if}} + {{if data.cartridge.type == "/obj/item/weapon/cartridge/clown" || cartridge.type == "/obj/item/weapon/cartridge/mime"}} viral files left. {{/if}}

    {{/if}} {{/if}} - {{if pda_count == 0}}No other PDAS located + {{if data.pda_count == 0}}No other PDAS located {{else}}

    Current Conversations

    - {{for convopdas}} + {{for data.convopdas}}
    - {{:~link(Name, 'circle-arrow-s', {'choice' : "Select Conversation", 'convo' : Reference } , null, fixedLeftWider)}} - {{if ~root.cartridge}} - {{if ~root.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && Detonate == 1}} {{:~link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} - {{if ~root.cartridge.type == "/obj/item/weapon/cartridge/clown"}} {{:~link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} - {{if ~root.cartridge.type == "/obj/item/weapon/cartridge/mime"}} {{:~link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} + {{:helper.link(Name, 'circle-arrow-s', {'choice' : "Select Conversation", 'convo' : Reference } , null, fixedLeftWider)}} + {{if data.~root.cartridge}} + {{if data.~root.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && Detonate == 1}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} + {{if data.~root.cartridge.type == "/obj/item/weapon/cartridge/clown"}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} + {{if data.~root.cartridge.type == "/obj/item/weapon/cartridge/mime"}} {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} {{/if}}
    {{/for}}

    Other PDAs

    - {{for pdas}} + {{for data.pdas}}
    - {{:~link(Name, 'circle-arrow-s', {'choice' : "Message", 'target' : Reference}, null, fixedLeftWider)}} - {{if ~root.cartridge}} - {{if ~root.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && Detonate == 1}} {{:~link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} - {{if ~root.cartridge.type == "/obj/item/weapon/cartridge/clown"}} {{:~link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} - {{if ~root.cartridge.type == "/obj/item/weapon/cartridge/mime"}} {{:~link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} + {{:helper.link(Name, 'circle-arrow-s', {'choice' : "Message", 'target' : Reference}, null, fixedLeftWider)}} + {{if data.~root.cartridge}} + {{if data.~root.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && Detonate == 1}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} + {{if data.~root.cartridge.type == "/obj/item/weapon/cartridge/clown"}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} + {{if data.~root.cartridge.type == "/obj/item/weapon/cartridge/mime"}} {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} {{/if}}
    {{/for}} {{/if}} {{/if}} - {{else mode == 21}} + {{else data.mode == 21}}

    SpaceMessenger V4.0.1

    @@ -245,20 +245,20 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{:~link('Delete Conversation', 'trash', {'choice' : "Clear", 'option' : "Convo"}, null, 'fixedLeftWide')}} + {{:helper.link('Delete Conversation', 'trash', {'choice' : "Clear", 'option' : "Convo"}, null, 'fixedLeftWide')}}


    -

    Conversation with: {{:convo_name}} ({{:convo_job}})

    +

    Conversation with: {{:data.convo_name}} ({{:data.convo_job}})

    - {{for messages}} - {{if ~root.active_conversation == target}} - {{if sent==0}} - Them: {{:message}}
    + {{for data.messages}} + {{if data.~root.active_conversation == target}} + {{if data.sent==0}} + Them: {{:data.message}}
    {{else}} - You: {{:message}}
    + You: {{:data.message}}
    {{/if}} {{/if}} {{/for}} @@ -266,132 +266,132 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{:~link('Reply', 'comment', {'choice' : "Message", 'target': active_conversation}, null, 'fixedLeft')}} + {{:helper.link('Reply', 'comment', {'choice' : "Message", 'target': active_conversation}, null, 'fixedLeft')}} - {{else mode== 41}} + {{else data.mode== 41}}
    - {{if manifest.heads.length}} + {{if data.manifest.heads.length}} - {{for manifest["heads"]}} - {{if rank == "Captain"}} - + {{for data.manifest["heads"]}} + {{if data.rank == "Captain"}} + {{else}} - + {{/if}} {{/for}} {{/if}} - {{if manifest.sec.length}} + {{if data.manifest.sec.length}} - {{for manifest["sec"]}} - {{if rank == "Head of Security"}} - + {{for data.manifest["sec"]}} + {{if data.rank == "Head of Security"}} + {{else}} - + {{/if}} {{/for}} {{/if}} - {{if manifest.eng.length}} + {{if data.manifest.eng.length}} - {{for manifest["eng"]}} - {{if rank == "Chief Engineer"}} - + {{for data.manifest["eng"]}} + {{if data.rank == "Chief Engineer"}} + {{else}} - + {{/if}} {{/for}} {{/if}} - {{if manifest.med.length}} + {{if data.manifest.med.length}} - {{for manifest["med"]}} - {{if rank == "Chief Medical Officer"}} - + {{for data.manifest["med"]}} + {{if data.rank == "Chief Medical Officer"}} + {{else}} - + {{/if}} {{/for}} {{/if}} - {{if manifest.sci.length}} + {{if data.manifest.sci.length}} - {{for manifest["sci"]}} - {{if rank == "Research Director"}} - + {{for data.manifest["sci"]}} + {{if data.rank == "Research Director"}} + {{else}} - + {{/if}} {{/for}} {{/if}} - {{if manifest.civ.length}} + {{if data.manifest.civ.length}} - {{for manifest["civ"]}} - {{if rank == "Head of Personnel"}} - + {{for data.manifest["civ"]}} + {{if data.rank == "Head of Personnel"}} + {{else}} - + {{/if}} {{/for}} {{/if}} - {{if manifest.misc.length}} + {{if data.manifest.misc.length}} - {{for manifest["misc"]}} - + {{for data.manifest["misc"]}} + {{/for}} {{/if}}
    Command
    {{:name}}{{:rank}}{{:active}}
    {{:data.name}}{{:data.rank}}{{:data.active}}
    {{:name}}{{:rank}}{{:active}}
    {{:data.name}}{{:data.rank}}{{:data.active}}
    Security
    {{:name}}{{:rank}}{{:active}}
    {{:data.name}}{{:data.rank}}{{:data.active}}
    {{:name}}{{:rank}}{{:active}}
    {{:data.name}}{{:data.rank}}{{:data.active}}
    Engineering
    {{:name}}{{:rank}}{{:active}}
    {{:data.name}}{{:data.rank}}{{:data.active}}
    {{:name}}{{:rank}}{{:active}}
    {{:data.name}}{{:data.rank}}{{:data.active}}
    Medical
    {{:name}}{{:rank}}{{:active}}
    {{:data.name}}{{:data.rank}}{{:data.active}}
    {{:name}}{{:rank}}{{:active}}
    {{:data.name}}{{:data.rank}}{{:data.active}}
    Science
    {{:name}}{{:rank}}{{:active}}
    {{:data.name}}{{:data.rank}}{{:data.active}}
    {{:name}}{{:rank}}{{:active}}
    {{:data.name}}{{:data.rank}}{{:data.active}}
    Civilian
    {{:name}}{{:rank}}{{:active}}
    {{:data.name}}{{:data.rank}}{{:data.active}}
    {{:name}}{{:rank}}{{:active}}
    {{:data.name}}{{:data.rank}}{{:data.active}}
    Misc
    {{:name}}{{:rank}}{{:active}}
    {{:data.name}}{{:data.rank}}{{:data.active}}
    - {{else mode == 3}} + {{else data.mode == 3}}

    Atmospheric Scan

    - {{if aircontents.reading == 1}} + {{if data.aircontents.reading == 1}}
    Pressure:
    - {{:~string('{1} kPa', aircontents.pressure < 80 || aircontents.pressure > 120 ? 'bad' : aircontents.pressure < 95 || aircontents.pressure > 110 ? 'average' : 'good' , aircontents.pressure)}} + {{:helper.string('{1} kPa', aircontents.pressure < 80 || aircontents.pressure > 120 ? 'bad' : aircontents.pressure < 95 || aircontents.pressure > 110 ? 'average' : 'good' , aircontents.pressure)}}
    Temperature:
    - {{:~string('{1} °C', aircontents.temp < 5 || aircontents.temp > 35 ? 'bad' : aircontents.temp < 15 || aircontents.temp > 25 ? 'average' : 'good' , aircontents.temp)}} + {{:helper.string('{1} °C', aircontents.temp < 5 || aircontents.temp > 35 ? 'bad' : aircontents.temp < 15 || aircontents.temp > 25 ? 'average' : 'good' , aircontents.temp)}}

    Oxygen:
    - {{:~string('{1}%', aircontents.oxygen < 17 ? 'bad' : aircontents.oxygen < 19 ? 'average' : 'good' , aircontents.oxygen)}} + {{:helper.string('{1}%', aircontents.oxygen < 17 ? 'bad' : aircontents.oxygen < 19 ? 'average' : 'good' , aircontents.oxygen)}}
    Nitrogen:
    - {{:~string('{1}%', aircontents.nitrogen > 82 ? 'bad' : aircontents.nitrogen > 80 ? 'average' : 'good' , aircontents.nitrogen)}} + {{:helper.string('{1}%', aircontents.nitrogen > 82 ? 'bad' : aircontents.nitrogen > 80 ? 'average' : 'good' , aircontents.nitrogen)}}
    Carbon Dioxide:
    - {{:~string('{1}%', aircontents.carbon_dioxide > 5 ? 'bad' : 'good' , aircontents.carbon_dioxide)}} + {{:helper.string('{1}%', aircontents.carbon_dioxide > 5 ? 'bad' : 'good' , aircontents.carbon_dioxide)}}
    Phoron:
    - {{:~string('{1}%', aircontents.phoron > 0 ? 'bad' : 'good' , aircontents.phoron)}} + {{:helper.string('{1}%', aircontents.phoron > 0 ? 'bad' : 'good' , aircontents.phoron)}}
    - {{if aircontents.other > 0}} + {{if data.aircontents.other > 0}}
    Unknown:
    - {{:aircontents.other}}% + {{:data.aircontents.other}}%
    {{/if}} {{else}} @@ -402,20 +402,20 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{else mode == 40}} + {{else data.mode == 40}}

    Remote Signaling System

    Frequency:
    - {{:records.signal_freq}} + {{:data.records.signal_freq}}
    -  {{:~link('-1', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "-10"}, null, null)}}  - {{:~link('-.2', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "-2"}, null, null)}}  +  {{:helper.link('-1', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "-10"}, null, null)}}  + {{:helper.link('-.2', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "-2"}, null, null)}}  - {{:~link('+.2', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "2"}, null, null)}}  - {{:~link('+1', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "10"}, null, null)}} + {{:helper.link('+.2', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "2"}, null, null)}}  + {{:helper.link('+1', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "10"}, null, null)}}


    @@ -425,28 +425,28 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{:records.signal_code}}
    + {{:data.records.signal_code}}
     - {{:~link('-5', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "-5"}, null, null)}} - {{:~link('-1', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "-1"}, null, null)}} - {{:~link('+1', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "1"}, null, null)}} - {{:~link('+5', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "5"}, null, null)}} + {{:helper.link('-5', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "-5"}, null, null)}} + {{:helper.link('-1', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "-1"}, null, null)}} + {{:helper.link('+1', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "1"}, null, null)}} + {{:helper.link('+5', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "5"}, null, null)}}
    - {{:~link('Send Signal', 'radiation', {'cartmenu' : "1", 'choice' : "Send Signal"}, null, null)}} + {{:helper.link('Send Signal', 'radiation', {'cartmenu' : "1", 'choice' : "Send Signal"}, null, null)}}
    - {{else mode == 42}} + {{else data.mode == 42}}

    Station Status Displays Interlink

    Code:
    - {{:~link('Clear', 'trash', {'cartmenu' : "1", 'choice' : "Status", 'statdisp' : "blank"}, null, null)}} - {{:~link('Shuttle ETA', 'gear', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "shuttle"}, null, null)}} - {{:~link('Message', 'gear', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "message"}, null, null)}} + {{:helper.link('Clear', 'trash', {'cartmenu' : "1", 'choice' : "Status", 'statdisp' : "blank"}, null, null)}} + {{:helper.link('Shuttle ETA', 'gear', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "shuttle"}, null, null)}} + {{:helper.link('Message', 'gear', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "message"}, null, null)}}

    @@ -455,7 +455,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Message line 1
    - {{:~link(records.message1 + ' (set)', 'pencil', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "setmsg1"}, null, null)}} + {{:helper.link(records.message1 + ' (set)', 'pencil', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "setmsg1"}, null, null)}}
    @@ -463,7 +463,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Message line 2
    - {{:~link(records.message2 + ' (set)', 'pencil', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "setmsg2"}, null, null)}} + {{:helper.link(records.message2 + ' (set)', 'pencil', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "setmsg2"}, null, null)}}
    @@ -473,33 +473,33 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm ALERT!:
    - {{:~link('None', 'alert', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "alert", 'alert' : "default"}, null, null)}} - {{:~link('Red Alert', 'alert', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "alert", 'alert' : "redalert"}, null, null)}} - {{:~link('Lockdown', 'caution', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "alert", 'alert' : "lockdown"}, null, null)}} - {{:~link('Biohazard', 'radiation', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "alert", 'alert' : "biohazard"}, null, null)}} + {{:helper.link('None', 'alert', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "alert", 'alert' : "default"}, null, null)}} + {{:helper.link('Red Alert', 'alert', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "alert", 'alert' : "redalert"}, null, null)}} + {{:helper.link('Lockdown', 'caution', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "alert", 'alert' : "lockdown"}, null, null)}} + {{:helper.link('Biohazard', 'radiation', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "alert", 'alert' : "biohazard"}, null, null)}}
    - {{else mode == 43}} + {{else data.mode == 43}}

    Station Powermonitors

    Select A power monitor:
    - {{for records.powermonitors}} + {{for data.records.powermonitors}}
    - {{:~link(Name, 'radiation', {'cartmenu' : "1", 'choice' : "Power Select",'target' : ref}, null, null)}} + {{:helper.link(Name, 'radiation', {'cartmenu' : "1", 'choice' : "Power Select",'target' : ref}, null, null)}}
    {{/for}} - {{else mode == 433}} + {{else data.mode == 433}}

    Powernet Status

    Current Load:
    - {{:records.powerload}} W + {{:data.records.powerload}} W
    @@ -507,72 +507,72 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Total Power:
    - {{:records.poweravail}} W + {{:data.records.poweravail}} W

    - {{for records.apcs}} - {{if #index % 20 === 0}} + {{for data.records.apcs}} + {{if data.#index % 20 === 0}} {{/if}} - - {{:~string('', Equipment==1 ? '#4f7529' : '#8f1414')}} - {{:~string('', Lights==1 ? '#4f7529' : '#8f1414')}} - {{:~string('', Environment==1 ? '#4f7529' : '#8f1414')}} - {{:~string('', CellStatus==1 ? '#4f7529' : '#8f1414', CellStatus==-1 ? 'No Cell' : CellPct + '%')}} + + {{:helper.string('', Equipment==1 ? '#4f7529' : '#8f1414')}} + {{:helper.string('', Lights==1 ? '#4f7529' : '#8f1414')}} + {{:helper.string('', Environment==1 ? '#4f7529' : '#8f1414')}} + {{:helper.string('', CellStatus==1 ? '#4f7529' : '#8f1414', CellStatus==-1 ? 'No Cell' : CellPct + '%')}} {{/for}}
     Area  Eqp.  Lgt.  Env  Cell 
    {{:Name}}   {1}
    {{:data.Name}}   {1}
    - {{else mode == 44}} + {{else data.mode == 44}}

    Medical Record List

    Select A record

    - {{for records.medical_records}} + {{for data.records.medical_records}}
    - {{:~link(Name, 'gear', {'cartmenu' : "1", 'choice' : "Medical Records",'target' : ref}, null, null)}} + {{:helper.link(Name, 'gear', {'cartmenu' : "1", 'choice' : "Medical Records",'target' : ref}, null, null)}}
    {{/for}} - {{else mode == 441}} + {{else data.mode == 441}}

    Medical Record

    - {{if records.general_exists == 1}} - Name: {{:records.general.name}}
    - Sex: {{:records.general.sex}}
    - Species: {{:records.general.species}}
    - Age: {{:records.general.age}}
    - Rank: {{:records.general.rank}}
    - Fingerprint: {{:records.general.fingerprint}}
    - Physical Status: {{:records.general.p_stat}}
    - Mental Status: {{:records.general.m_stat}}

    + {{if data.records.general_exists == 1}} + Name: {{:data.records.general.name}}
    + Sex: {{:data.records.general.sex}}
    + Species: {{:data.records.general.species}}
    + Age: {{:data.records.general.age}}
    + Rank: {{:data.records.general.rank}}
    + Fingerprint: {{:data.records.general.fingerprint}}
    + Physical Status: {{:data.records.general.p_stat}}
    + Mental Status: {{:data.records.general.m_stat}}

    {{else}} General Record Lost!

     {{/if}} - {{if records.medical_exists == 1}} + {{if data.records.medical_exists == 1}} Medical Data:
    - Blood Type: {{:records.medical.b_type}}

    - Minor Disabilities: {{:records.medical.mi_dis}}
    - Details: {{:records.medical.mi_dis_d}}

    - Major Disabilities: {{:records.medical.ma_dis}}
    - Details: {{:records.medical.ma_dis_d}}

    - Allergies: {{:records.medical.alg}}
    - Details: {{:records.medical.alg_d}}

    - Current Disease: {{:records.medical.cdi}}
    - Details: {{:records.medical.alg_d}}

    - Important Notes: {{:records.medical.notes}} + Blood Type: {{:data.records.medical.b_type}}

    + Minor Disabilities: {{:data.records.medical.mi_dis}}
    + Details: {{:data.records.medical.mi_dis_d}}

    + Major Disabilities: {{:data.records.medical.ma_dis}}
    + Details: {{:data.records.medical.ma_dis_d}}

    + Allergies: {{:data.records.medical.alg}}
    + Details: {{:data.records.medical.alg_d}}

    + Current Disease: {{:data.records.medical.cdi}}
    + Details: {{:data.records.medical.alg_d}}

    + Important Notes: {{:data.records.medical.notes}} {{else}} Medical Record Lost!

    @@ -583,47 +583,47 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{else mode == 45}} + {{else data.mode == 45}}

    Security Record List

    Select A record

    - {{for records.security_records}} + {{for data.records.security_records}}
    - {{:~link(Name, 'gear', {'cartmenu' : "1", 'choice' : "Security Records",'target' : ref}, null, null)}} + {{:helper.link(Name, 'gear', {'cartmenu' : "1", 'choice' : "Security Records",'target' : ref}, null, null)}}
    {{/for}} - {{else mode == 451}} + {{else data.mode == 451}}

    Security Record

    - {{if records.general_exists == 1}} - Name: {{:records.general.name}}
    - Sex: {{:records.general.sex}}
    - Species: {{:records.general.species}}
    - Age: {{:records.general.age}}
    - Rank: {{:records.general.rank}}
    - Fingerprint: {{:records.general.fingerprint}}
    - Physical Status: {{:records.general.p_stat}}
    - Mental Status: {{:records.general.m_stat}}

    + {{if data.records.general_exists == 1}} + Name: {{:data.records.general.name}}
    + Sex: {{:data.records.general.sex}}
    + Species: {{:data.records.general.species}}
    + Age: {{:data.records.general.age}}
    + Rank: {{:data.records.general.rank}}
    + Fingerprint: {{:data.records.general.fingerprint}}
    + Physical Status: {{:data.records.general.p_stat}}
    + Mental Status: {{:data.records.general.m_stat}}

    {{else}} General Record Lost!

     {{/if}} - {{if records.security_exists == 1}} + {{if data.records.security_exists == 1}} Security Data:
    - Criminal Status: {{:records.security.criminal}}

    - Minor Crimes: {{:records.security.mi_crim}}
    - Details: {{:records.security.mi_crim_d}}

    - Major Crimes: {{:records.security.ma_crim}}
    - Details: {{:records.security.ma_crim_d}}

    - Important Notes: {{:records.security.notes}} + Criminal Status: {{:data.records.security.criminal}}

    + Minor Crimes: {{:data.records.security.mi_crim}}
    + Details: {{:data.records.security.mi_crim_d}}

    + Major Crimes: {{:data.records.security.ma_crim}}
    + Details: {{:data.records.security.ma_crim_d}}

    + Important Notes: {{:data.records.security.notes}} {{else}} Security Record Lost!

    @@ -632,29 +632,29 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{else mode == 46}} + {{else data.mode == 46}}

    Security Bot Control

    - {{if records.beepsky.active == null || records.beepsky.active == 0}} - {{if records.beepsky.count == 0}} + {{if data.records.beepsky.active == null || records.beepsky.active == 0}} + {{if data.records.beepsky.count == 0}}

    No bots found.

    {{else}}
    Select A Bot.

    - {{for records.beepsky.bots}} + {{for data.records.beepsky.bots}}
    - {{:~link(Name, 'gear', {'radiomenu' : "1", 'op' : "control",'bot' : ref}, null, null)}} (Location: {{:Location}}) + {{:helper.link(Name, 'gear', {'radiomenu' : "1", 'op' : "control",'bot' : ref}, null, null)}} (Location: {{:data.Location}})
    {{/for}} {{/if}}
    - {{:~link('Scan for Bots','gear', {'radiomenu' : "1", 'op' : "scanbots"}, null, null)}} + {{:helper.link('Scan for Bots','gear', {'radiomenu' : "1", 'op' : "scanbots"}, null, null)}} {{else}} -

    {{:records.beepsky.active}}

    +

    {{:data.records.beepsky.active}}



    - {{if records.beepsky.botstatus.mode == -1}} + {{if data.records.beepsky.botstatus.mode == -1}}

    Waiting for response...

    {{else}}

    Status:

    @@ -664,7 +664,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Location:
    - {{:records.beepsky.botstatus.loca}} + {{:data.records.beepsky.botstatus.loca}}
    @@ -673,30 +673,30 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{if records.beepsky.botstatus.mode ==0}} Ready - {{else records.beepsky.botstatus.mode == 1}} + {{if data.records.beepsky.botstatus.mode ==0}} Ready + {{else data.records.beepsky.botstatus.mode == 1}} Apprehending target - {{else records.beepsky.botstatus.mode ==2 || records.beepsky.botstatus.mode == 3}} + {{else data.records.beepsky.botstatus.mode ==2 || records.beepsky.botstatus.mode == 3}} Arresting target - {{else records.beepsky.botstatus.mode ==4}} + {{else data.records.beepsky.botstatus.mode ==4}} Starting patrol - {{else records.beepsky.botstatus.mode ==5}} + {{else data.records.beepsky.botstatus.mode ==5}} On Patrol - {{else records.beepsky.botstatus.mode ==6}} + {{else data.records.beepsky.botstatus.mode ==6}} Responding to summons {{/if}}
    - {{:~link('Stop Patrol', 'gear', {'radiomenu' : "1", 'op' : "stop"}, null, null)}} - {{:~link('Start Patrol', 'gear', {'radiomenu' : "1", 'op' : "go"}, null, null)}} - {{:~link('Summon Bot', 'gear', {'radiomenu' : "1", 'op' : "summon"}, null, null)}} + {{:helper.link('Stop Patrol', 'gear', {'radiomenu' : "1", 'op' : "stop"}, null, null)}} + {{:helper.link('Start Patrol', 'gear', {'radiomenu' : "1", 'op' : "go"}, null, null)}} + {{:helper.link('Summon Bot', 'gear', {'radiomenu' : "1", 'op' : "summon"}, null, null)}}
    {{/if}} - {{:~link('Return to Bot list', 'gear', {'radiomenu' : "1", 'op' : "botlist"}, null, null)}} + {{:helper.link('Return to Bot list', 'gear', {'radiomenu' : "1", 'op' : "botlist"}, null, null)}} {{/if}} - {{else mode == 47}} + {{else data.mode == 47}}

    Supply Record Interlink

    @@ -704,10 +704,10 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{if records.supply.shuttle_moving}} - Moving to station ({{:records.supply.shuttle_eta}}) + {{if data.records.supply.shuttle_moving}} + Moving to station ({{:data.records.supply.shuttle_eta}}) {{else}} - Shuttle at {{:records.supply.shuttle_loc}} + Shuttle at {{:data.records.supply.shuttle_loc}} {{/if}}
    @@ -716,30 +716,30 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    Current Approved Orders
    - {{if records.supply.approved_count == 0}} + {{if data.records.supply.approved_count == 0}} No current approved orders

    {{else}} - {{for records.supply.approved}} - #{{:Number}} - {{:Name}} approved by {{:OrderedBy}}
    {{if Comment != ""}} {{:Comment}}
    {{/if}}
     + {{for data.records.supply.approved}} + #{{:data.Number}} - {{:data.Name}} approved by {{:data.OrderedBy}}
    {{if data.Comment != ""}} {{:data.Comment}}
    {{/if}}
     {{/for}} {{/if}}

    Current Requested Orders
    - {{if records.supply.requests_count == 0}} + {{if data.records.supply.requests_count == 0}} No current requested orders

    {{else}} - {{for records.supply.requests}} - #{{:Number}} - {{:Name}} requested by {{:OrderedBy}}
    {{if Comment != ""}} {{:Comment}}
    {{/if}}
     + {{for data.records.supply.requests}} + #{{:data.Number}} - {{:data.Name}} requested by {{:data.OrderedBy}}
    {{if data.Comment != ""}} {{:data.Comment}}
    {{/if}}
     {{/for}} {{/if}}
    - {{else mode == 48}} + {{else data.mode == 48}}

    Mule Control

    - {{if records.mulebot.active == null || records.mulebot.active == 0}} - {{if records.mulebot.count == 0}} + {{if data.records.mulebot.active == null || records.mulebot.active == 0}} + {{if data.records.mulebot.count == 0}}

    No bots found.

    {{else}} @@ -748,16 +748,16 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Select A Mulebot
    - {{for records.mulebot.bots}} + {{for data.records.mulebot.bots}}
    - {{:~link(Name, 'gear', {'radiomenu' : "1", 'op' : "control",'bot' : ref}, null, null)}} (Location: {{:Location}}) + {{:helper.link(Name, 'gear', {'radiomenu' : "1", 'op' : "control",'bot' : ref}, null, null)}} (Location: {{:data.Location}})
    {{/for}} {{/if}}
    - {{:~link('Scan for Bots','gear', {'radiomenu' : "1", 'op' : "scanbots"}, null, null)}} + {{:helper.link('Scan for Bots','gear', {'radiomenu' : "1", 'op' : "scanbots"}, null, null)}} {{else}} - {{if records.mulebot.botstatus.mode == -1}} + {{if data.records.mulebot.botstatus.mode == -1}}

    Waiting for response...

    {{else}}

    Status:

    @@ -767,7 +767,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Location:
    - {{:records.mulebot.botstatus.loca}} + {{:data.records.mulebot.botstatus.loca}}
    @@ -776,19 +776,19 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{if records.mulebot.botstatus.mode ==0}} Ready - {{else records.mulebot.botstatus.mode == 1}} + {{if data.records.mulebot.botstatus.mode ==0}} Ready + {{else data.records.mulebot.botstatus.mode == 1}} Loading/Unloading - {{else records.mulebot.botstatus.mode ==2}} + {{else data.records.mulebot.botstatus.mode ==2}} Navigating to Delivery Location - {{else records.mulebot.botstatus.mode == 3}} + {{else data.records.mulebot.botstatus.mode == 3}} Navigating to Home - {{else records.mulebot.botstatus.mode ==4}} + {{else data.records.mulebot.botstatus.mode ==4}} Waiting for Clear Path - {{else records.mulebot.botstatus.mode ==5 || records.mulebot.botstatus.mode == 6}} + {{else data.records.mulebot.botstatus.mode ==5 || records.mulebot.botstatus.mode == 6}} Calculating navigation Path - {{else records.mulebot.botstatus.mode ==7}} + {{else data.records.mulebot.botstatus.mode ==7}} Unable to locate destination {{/if}} @@ -800,7 +800,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{:~link(records.mulebot.botstatus.load == null ? 'None (Unload)' : records.mulebot.botstatus.load + ' (Unload)', 'gear', {'radiomenu' : "1", 'op' : "unload"},records.mulebot.botstatus.load == null ? 'disabled' : null, null)}} + {{:helper.link(records.mulebot.botstatus.load == null ? 'None (Unload)' : records.mulebot.botstatus.load + ' (Unload)', 'gear', {'radiomenu' : "1", 'op' : "unload"},records.mulebot.botstatus.load == null ? 'disabled' : null, null)}}
    @@ -810,7 +810,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{:records.mulebot.botstatus.powr}}% + {{:data.records.mulebot.botstatus.powr}}%
    @@ -820,7 +820,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Destination:
    - {{:~link(records.mulebot.botstatus.dest == null || records.mulebot.botstatus.dest == "" ? 'None (Set)': records.mulebot.botstatus.dest+ ' (Set)', 'gear', {'radiomenu' : "1", 'op' : "setdest"}, null, null)}} + {{:helper.link(records.mulebot.botstatus.dest == null || records.mulebot.botstatus.dest == "" ? 'None (Set)': records.mulebot.botstatus.dest+ ' (Set)', 'gear', {'radiomenu' : "1", 'op' : "setdest"}, null, null)}}
    @@ -829,7 +829,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Home:
    - {{if records.mulebot.botstatus.home == null}} None {{else}} {{:records.mulebot.botstatus.home}} {{/if}} + {{if data.records.mulebot.botstatus.home == null}} None {{else}} {{:data.records.mulebot.botstatus.home}} {{/if}}
    @@ -837,7 +837,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Auto Return:
    - {{:~link(records.mulebot.botstatus.retn == 1 ? 'ON' : 'OFF', 'gear', {'radiomenu' : "1", 'op' : records.mulebot.botstatus.retn==1 ? "retoff" : "reton"}, null, null)}} + {{:helper.link(records.mulebot.botstatus.retn == 1 ? 'ON' : 'OFF', 'gear', {'radiomenu' : "1", 'op' : records.mulebot.botstatus.retn==1 ? "retoff" : "reton"}, null, null)}}
    @@ -845,7 +845,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Auto Pickup:
    - {{:~link(records.mulebot.botstatus.pick==1? 'ON' : 'OFF', 'gear', {'radiomenu' : "1", 'op' : records.mulebot.botstatus.pick==1 ? "pickoff" : "pickon"}, null, null)}} + {{:helper.link(records.mulebot.botstatus.pick==1? 'ON' : 'OFF', 'gear', {'radiomenu' : "1", 'op' : records.mulebot.botstatus.pick==1 ? "pickoff" : "pickon"}, null, null)}}
    @@ -853,13 +853,13 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Functions:
    - {{:~link('Stop', 'gear', {'radiomenu' : "1", 'op' : "stop"}, null, null)}} - {{:~link('Proceed', 'gear', {'radiomenu' : "1", 'op' : "go"}, null, null)}} - {{:~link('Return Home', 'gear', {'radiomenu' : "1", 'op' : "home"}, null, null)}} + {{:helper.link('Stop', 'gear', {'radiomenu' : "1", 'op' : "stop"}, null, null)}} + {{:helper.link('Proceed', 'gear', {'radiomenu' : "1", 'op' : "go"}, null, null)}} + {{:helper.link('Return Home', 'gear', {'radiomenu' : "1", 'op' : "home"}, null, null)}}


    - {{:~link('Return to Bot list', 'gear', {'radiomenu' : "1", 'op' : "botlist"}, null, null)}} + {{:helper.link('Return to Bot list', 'gear', {'radiomenu' : "1", 'op' : "botlist"}, null, null)}} {{/if}} @@ -867,54 +867,54 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm - {{else mode == 49}} + {{else data.mode == 49}}

    Janatorial Supplies Locator

    Current Location: - {{if records.janitor.user_loc.x == 0}} + {{if data.records.janitor.user_loc.x == 0}} Unknown {{else}} - {{:records.janitor.user_loc.x}} / {{:records.janitor.user_loc.y}} + {{:data.records.janitor.user_loc.x}} / {{:data.records.janitor.user_loc.y}} {{/if}}
    - {{for records.janitor.mops}} - {{if x==0}} + {{for data.records.janitor.mops}} + {{if data.x==0}} Unable to locate Mop {{else}} Mop Location: - ({{:x}} / {{:y}}) - {{:dir}} - Status: {{:status}}
    + ({{:data.x}} / {{:data.y}}) - {{:data.dir}} - Status: {{:data.status}}
    {{/if}} {{/for}}
    - {{for records.janitor.buckets}} - {{if x==0}} + {{for data.records.janitor.buckets}} + {{if data.x==0}} Unable to locate Water Buckets {{else}} Water Buckets Location: - ({{:x}} / {{:y}}) - {{:dir}} - Water Level: {{:status}}
    + ({{:data.x}} / {{:data.y}}) - {{:data.dir}} - Water Level: {{:data.status}}
    {{/if}} {{/for}}
    - {{for records.janitor.cleanbots}} - {{if x==0}} + {{for data.records.janitor.cleanbots}} + {{if data.x==0}} Unable to locate Clean Bots {{else}} Clean Bots Location: - ({{:x}} / {{:y}}) - {{:dir}} - Status: {{:status}}
    + ({{:data.x}} / {{:data.y}}) - {{:data.dir}} - Status: {{:data.status}}
    {{/if}} {{/for}}
    - {{for records.janitor.carts}} - {{if x==0}} + {{for data.records.janitor.carts}} + {{if data.x==0}} Unable to locate Janitorial Cart {{else}} Janitorial cart Location: - ({{:x}} / {{:y}}) - {{:dir}} - Status: {{:status}}
    + ({{:data.x}} / {{:data.y}}) - {{:data.dir}} - Status: {{:data.status}}
    {{/if}} {{/for}} diff --git a/nano/templates/shuttle_control_console.tmpl b/nano/templates/shuttle_control_console.tmpl index 59f4079959..a1b30c0eb9 100644 --- a/nano/templates/shuttle_control_console.tmpl +++ b/nano/templates/shuttle_control_console.tmpl @@ -1,7 +1,7 @@

    Shuttle Status

    - {{:shuttle_status}} + {{:data.shuttle_status}}
    @@ -10,11 +10,11 @@ Bluespace Drive:
    - {{if shuttle_state == "idle"}} + {{if data.shuttle_state == "idle"}} IDLE - {{else shuttle_state == "warmup"}} + {{else data.shuttle_state == "warmup"}} SPINNING UP - {{else shuttle_state == "in_transit"}} + {{else data.shuttle_state == "in_transit"}} ENGAGED {{else}} ERROR @@ -22,28 +22,28 @@
    -{{if has_docking}} +{{if data.has_docking}}
    Docking Status:
    - {{if docking_status == "docked"}} + {{if data.docking_status == "docked"}} DOCKED - {{else docking_status == "docking"}} - {{if !docking_override}} + {{else data.docking_status == "docking"}} + {{if !data.docking_override}} DOCKING {{else}} DOCKING-MANUAL {{/if}} - {{else docking_status == "undocking"}} - {{if !docking_override}} + {{else data.docking_status == "undocking"}} + {{if !data.docking_override}} UNDOCKING {{else}} UNDOCKING-MANUAL {{/if}} - {{else docking_status == "undocked"}} + {{else data.docking_status == "undocked"}} UNDOCKED {{else}} ERROR @@ -58,9 +58,9 @@
    - {{:~link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, can_launch? null : 'disabled' , null)}} - {{:~link('Cancel Launch', 'cancel', {'cancel' : '1'}, can_cancel? null : 'disabled' , null)}} - {{:~link('Force Launch', 'alert', {'force' : '1'}, can_force? null : 'disabled' , can_force? 'redBackground' : null)}} + {{:helper.link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, can_launch? null : 'disabled' , null)}} + {{:helper.link('Cancel Launch', 'cancel', {'cancel' : '1'}, can_cancel? null : 'disabled' , null)}} + {{:helper.link('Force Launch', 'alert', {'force' : '1'}, can_force? null : 'disabled' , can_force? 'redBackground' : null)}}
    \ No newline at end of file diff --git a/nano/templates/simple_airlock_console.tmpl b/nano/templates/simple_airlock_console.tmpl index 9975295859..177e37b3f1 100644 --- a/nano/templates/simple_airlock_console.tmpl +++ b/nano/templates/simple_airlock_console.tmpl @@ -4,9 +4,9 @@ Chamber Pressure:
    - {{:~displayBar(chamber_pressure, 0, 200, chamber_pressure < 80 || chamber_pressure > 120 ? 'bad' : chamber_pressure < 95 || chamber_pressure > 110 ? 'average' : 'good')}} + {{:helper.displayBar(chamber_pressure, 0, 200, chamber_pressure < 80 || chamber_pressure > 120 ? 'bad' : chamber_pressure < 95 || chamber_pressure > 110 ? 'average' : 'good')}}
    - {{:chamber_pressure}} kPa + {{:data.chamber_pressure}} kPa
    @@ -14,23 +14,23 @@
    - {{:~link('Cycle to Exterior', 'arrowthickstop-1-w', {'command' : 'cycle_ext'}, processing ? 'disabled' : null)}} - {{:~link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int'}, processing ? 'disabled' : null)}} + {{:helper.link('Cycle to Exterior', 'arrowthickstop-1-w', {'command' : 'cycle_ext'}, processing ? 'disabled' : null)}} + {{:helper.link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int'}, processing ? 'disabled' : null)}}
    - {{if interior_status.state == "open"}} - {{:~link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, 'redBackground')}} + {{if data.interior_status.state == "open"}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, 'redBackground')}} {{else}} - {{:~link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, processing ? 'yellowBackground' : null)}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, processing ? 'yellowBackground' : null)}} {{/if}} - {{if exterior_status.state == "open"}} - {{:~link('Force interior door', 'alert', {'command' : 'force_int'}, null, 'redBackground')}} + {{if data.exterior_status.state == "open"}} + {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, 'redBackground')}} {{else}} - {{:~link('Force interior door', 'alert', {'command' : 'force_int'}, null, processing ? 'yellowBackground' : null)}} + {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, processing ? 'yellowBackground' : null)}} {{/if}}
    - {{:~link('Abort', 'cancel', {'command' : 'abort'}, processing ? null : 'disabled', processing ? 'redBackground' : null)}} + {{:helper.link('Abort', 'cancel', {'command' : 'abort'}, processing ? null : 'disabled', processing ? 'redBackground' : null)}}
    \ No newline at end of file diff --git a/nano/templates/simple_docking_console.tmpl b/nano/templates/simple_docking_console.tmpl index 0d5ce1fc69..feb8cf53e1 100644 --- a/nano/templates/simple_docking_console.tmpl +++ b/nano/templates/simple_docking_console.tmpl @@ -4,26 +4,26 @@ Docking Port Status:
    - {{if docking_status == "docked"}} - {{if !override_enabled}} + {{if data.docking_status == "docked"}} + {{if !data.override_enabled}} DOCKED {{else}} DOCKED-OVERRIDE ENABLED {{/if}} - {{else docking_status == "docking"}} - {{if !override_enabled}} + {{else data.docking_status == "docking"}} + {{if !data.override_enabled}} DOCKING {{else}} DOCKING-OVERRIDE ENABLED {{/if}} - {{else docking_status == "undocking"}} - {{if !override_enabled}} + {{else data.docking_status == "undocking"}} + {{if !data.override_enabled}} UNDOCKING {{else}} UNDOCKING-OVERRIDE ENABLED {{/if}} - {{else docking_status == "undocked"}} - {{if !override_enabled}} + {{else data.docking_status == "undocked"}} + {{if !data.override_enabled}} NOT IN USE {{else}} OVERRIDE ENABLED @@ -40,40 +40,40 @@ Docking Hatch:
    - {{if docking_status == "docked"}} - {{if door_state == "open"}} + {{if data.docking_status == "docked"}} + {{if data.door_state == "open"}} OPEN - {{else door_state == "closed"}} + {{else data.door_state == "closed"}} CLOSED {{else}} ERROR {{/if}} - {{else docking_status == "docking"}} - {{if door_state == "open"}} + {{else data.docking_status == "docking"}} + {{if data.door_state == "open"}} OPEN - {{else door_state == "closed" && door_lock == "locked"}} + {{else data.door_state == "closed" && door_lock == "locked"}} SECURED - {{else door_state == "closed" && door_lock == "unlocked"}} + {{else data.door_state == "closed" && door_lock == "unlocked"}} UNSECURED {{else}} ERROR {{/if}} - {{else docking_status == "undocking"}} - {{if door_state == "open"}} + {{else data.docking_status == "undocking"}} + {{if data.door_state == "open"}} OPEN - {{else door_state == "closed" && door_lock == "locked"}} + {{else data.door_state == "closed" && door_lock == "locked"}} SECURED - {{else door_state == "closed" && door_lock == "unlocked"}} + {{else data.door_state == "closed" && door_lock == "unlocked"}} UNSECURED {{else}} ERROR {{/if}} - {{else docking_status == "undocked"}} - {{if door_state == "open"}} + {{else data.docking_status == "undocked"}} + {{if data.door_state == "open"}} OPEN - {{else door_state == "closed" && door_lock == "locked"}} + {{else data.door_state == "closed" && door_lock == "locked"}} SECURED - {{else door_state == "closed" && door_lock == "unlocked"}} + {{else data.door_state == "closed" && door_lock == "unlocked"}} UNSECURED {{else}} ERROR @@ -87,12 +87,12 @@
    - {{if docking_status == "docked"}} - {{:~link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', null)}} - {{:~link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}} + {{if data.docking_status == "docked"}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}} {{else}} - {{:~link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', override_enabled? 'redBackground' : null)}} - {{:~link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : 'yellowBackground')}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', override_enabled? 'redBackground' : null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : 'yellowBackground')}} {{/if}}
    diff --git a/nano/templates/simple_docking_console_pod.tmpl b/nano/templates/simple_docking_console_pod.tmpl index 520d073907..bca867b56e 100644 --- a/nano/templates/simple_docking_console_pod.tmpl +++ b/nano/templates/simple_docking_console_pod.tmpl @@ -4,26 +4,26 @@ Docking Port Status:
    - {{if docking_status == "docked"}} - {{if !override_enabled}} + {{if data.docking_status == "docked"}} + {{if !data.override_enabled}} DOCKED {{else}} DOCKED-OVERRIDE ENABLED {{/if}} - {{else docking_status == "docking"}} - {{if !override_enabled}} + {{else data.docking_status == "docking"}} + {{if !data.override_enabled}} DOCKING {{else}} DOCKING-OVERRIDE ENABLED {{/if}} - {{else docking_status == "undocking"}} - {{if !override_enabled}} + {{else data.docking_status == "undocking"}} + {{if !data.override_enabled}} UNDOCKING {{else}} UNDOCKING-OVERRIDE ENABLED {{/if}} - {{else docking_status == "undocked"}} - {{if !override_enabled}} + {{else data.docking_status == "undocked"}} + {{if !data.override_enabled}} NOT IN USE {{else}} OVERRIDE ENABLED @@ -40,40 +40,40 @@ Docking Hatch:
    - {{if docking_status == "docked"}} - {{if door_state == "open"}} + {{if data.docking_status == "docked"}} + {{if data.door_state == "open"}} OPEN - {{else door_state == "closed"}} + {{else data.door_state == "closed"}} CLOSED {{else}} ERROR {{/if}} - {{else docking_status == "docking"}} - {{if door_state == "open"}} + {{else data.docking_status == "docking"}} + {{if data.door_state == "open"}} OPEN - {{else door_state == "closed" && door_lock == "locked"}} + {{else data.door_state == "closed" && door_lock == "locked"}} SECURED - {{else door_state == "closed" && door_lock == "unlocked"}} + {{else data.door_state == "closed" && door_lock == "unlocked"}} UNSECURED {{else}} ERROR {{/if}} - {{else docking_status == "undocking"}} - {{if door_state == "open"}} + {{else data.docking_status == "undocking"}} + {{if data.door_state == "open"}} OPEN - {{else door_state == "closed" && door_lock == "locked"}} + {{else data.door_state == "closed" && door_lock == "locked"}} SECURED - {{else door_state == "closed" && door_lock == "unlocked"}} + {{else data.door_state == "closed" && door_lock == "unlocked"}} UNSECURED {{else}} ERROR {{/if}} - {{else docking_status == "undocked"}} - {{if door_state == "open"}} + {{else data.docking_status == "undocked"}} + {{if data.door_state == "open"}} OPEN - {{else door_state == "closed" && door_lock == "locked"}} + {{else data.door_state == "closed" && door_lock == "locked"}} SECURED - {{else door_state == "closed" && door_lock == "unlocked"}} + {{else data.door_state == "closed" && door_lock == "unlocked"}} UNSECURED {{else}} ERROR @@ -87,14 +87,14 @@
    - {{if docking_status == "docked"}} - {{:~link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', null)}} - {{:~link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}} - {{:~link('MANUAL EJECT', 'alert', {'command' : 'toggle_override'}, 'disabled', null)}} + {{if data.docking_status == "docked"}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}} + {{:helper.link('MANUAL EJECT', 'alert', {'command' : 'toggle_override'}, 'disabled', null)}} {{else}} - {{:~link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', override_enabled? 'redBackground' : null)}} - {{:~link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : 'yellowBackground')}} - {{:~link('MANUAL EJECT', 'alert', {'command' : 'toggle_override'}, can_force ? null : 'disabled', can_force ? 'redBackground' : null)}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', override_enabled? 'redBackground' : null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : 'yellowBackground')}} + {{:helper.link('MANUAL EJECT', 'alert', {'command' : 'toggle_override'}, can_force ? null : 'disabled', can_force ? 'redBackground' : null)}} {{/if}}
    diff --git a/nano/templates/smartfridge.tmpl b/nano/templates/smartfridge.tmpl index 9e50bab96d..b9a7e85948 100644 --- a/nano/templates/smartfridge.tmpl +++ b/nano/templates/smartfridge.tmpl @@ -1,35 +1,35 @@
    - {{:~link('Close', 'gear', {'close' : 1}, null, 'fixedLeft')}} + {{:helper.link('Close', 'gear', {'close' : 1}, null, 'fixedLeft')}}

    Storage

    - {{if secure}} + {{if data.secure}} - {{:locked == -1 ? "Sec.re ACC_** //):securi_nt.diag=>##'or 1=1'%($..." : "Secure Access: Please have your identification ready."}} + {{:data.locked == -1 ? "Sec.re ACC_** //):securi_nt.diag=>##'or 1=1'%($..." : "Secure Access: Please have your identification ready."}} {{/if}}
    - {{if contents}} - {{for contents}} + {{if data.contents}} + {{for data.contents}}
    - {{:display_name}} ({{:quantity}}): + {{:data.display_name}} ({{:data.quantity}}):
    - {{:~link('Vend', 'circle-arrow-s', { "vend" : vend, "amount" : 1 }, null, 'statusValue')}} - {{if quantity >= 5}} - {{:~link('x5', 'circle-arrow-s', { "vend" : vend, "amount" : 5 }, null, 'statusValue')}} + {{:helper.link('Vend', 'circle-arrow-s', { "vend" : vend, "amount" : 1 }, null, 'statusValue')}} + {{if data.quantity >= 5}} + {{:helper.link('x5', 'circle-arrow-s', { "vend" : vend, "amount" : 5 }, null, 'statusValue')}} {{/if}} - {{if quantity >= 10}} - {{:~link('x10', 'circle-arrow-s', { "vend" : vend, "amount" : 10 }, null, 'statusValue')}} + {{if data.quantity >= 10}} + {{:helper.link('x10', 'circle-arrow-s', { "vend" : vend, "amount" : 10 }, null, 'statusValue')}} {{/if}} - {{if quantity >= 25}} - {{:~link('x25', 'circle-arrow-s', { "vend" : vend, "amount" : 25 }, null, 'statusValue')}} + {{if data.quantity >= 25}} + {{:helper.link('x25', 'circle-arrow-s', { "vend" : vend, "amount" : 25 }, null, 'statusValue')}} {{/if}} - {{if quantity > 1}} - {{:~link('All', 'circle-arrow-s', { "vend" : vend, "amount" : quantity }, null, 'statusValue')}} + {{if data.quantity > 1}} + {{:helper.link('All', 'circle-arrow-s', { "vend" : vend, "amount" : quantity }, null, 'statusValue')}} {{/if}}
    @@ -39,7 +39,7 @@ {{/if}}
    -{{if panel_open}} +{{if data.panel_open}}

    Access Panel

    @@ -48,17 +48,17 @@ Wires:
    - {{for wires}} + {{for data.wires}}
    -
    - {{:wire}} wire: +
    + {{:data.wire}} wire:
    - {{if cut}} - {{:~link('Mend', 'plus', {'cutwire' : index})}} + {{if data.cut}} + {{:helper.link('Mend', 'plus', {'cutwire' : index})}} {{else}} - {{:~link('Cut', 'minus', {'cutwire' : index})}} - {{:~link('Pulse', 'signal-diag', {'pulsewire' : index})}} + {{:helper.link('Cut', 'minus', {'cutwire' : index})}} + {{:helper.link('Pulse', 'signal-diag', {'pulsewire' : index})}} {{/if}}
    @@ -67,12 +67,12 @@
    - The orange light is {{:electrified ? "on" : "off"}}.
    - The red light is {{:shoot_inventory ? "on" : "off"}}.
    - {{if secure}} + The orange light is {{:data.electrified ? "on" : "off"}}.
    + The red light is {{:data.shoot_inventory ? "on" : "off"}}.
    + {{if data.secure}} The green light is - - {{:locked == 1 ? "off" : locked == -1 ? "blinking" : "on"}} + + {{:data.locked == 1 ? "off" : locked == -1 ? "blinking" : "on"}} .
    {{/if}}
    diff --git a/nano/templates/smes.tmpl b/nano/templates/smes.tmpl index 760228e4cd..e2bf4c92f0 100644 --- a/nano/templates/smes.tmpl +++ b/nano/templates/smes.tmpl @@ -3,9 +3,9 @@ Stored Capacity:
    - {{:~displayBar(storedCapacity, 0, 100, charging ? 'good' : 'average')}} + {{:helper.displayBar(storedCapacity, 0, 100, charging ? 'good' : 'average')}}
    - {{:~round(storedCapacity)}}% + {{:helper.round(storedCapacity)}}%
    @@ -16,9 +16,9 @@ Charge Mode:
    - {{:~link('Auto', 'refresh', {'cmode' : 1}, chargeMode ? 'selected' : null)}}{{:~link('Off', 'close', {'cmode' : 1}, chargeMode ? null : 'selected')}} + {{:helper.link('Auto', 'refresh', {'cmode' : 1}, chargeMode ? 'selected' : null)}}{{:helper.link('Off', 'close', {'cmode' : 1}, chargeMode ? null : 'selected')}}   - {{if charging}} + {{if data.charging}} [Charging] {{else}} [Not Charging] @@ -31,12 +31,12 @@ Input Level:
    - {{:~displayBar(chargeLevel, 0, chargeMax)}} + {{:helper.displayBar(chargeLevel, 0, chargeMax)}}
    - {{:~link('MIN', null, {'input' : 'min'}, (chargeLevel > 0) ? null : 'disabled')}} - {{:~link('SET', null, {'input' : 'set'}, null)}} - {{:~link('MAX', null, {'input' : 'max'}, (chargeLevel < chargeMax) ? null : 'disabled')}} -
     {{:chargeLevel}} W 
    + {{:helper.link('MIN', null, {'input' : 'min'}, (chargeLevel > 0) ? null : 'disabled')}} + {{:helper.link('SET', null, {'input' : 'set'}, null)}} + {{:helper.link('MAX', null, {'input' : 'max'}, (chargeLevel < chargeMax) ? null : 'disabled')}} +
     {{:data.chargeLevel}} W 
    @@ -47,7 +47,7 @@ Output Status:
    - {{:~link('Online', 'power', {'online' : 1}, outputOnline ? 'selected' : null)}}{{:~link('Offline', 'close', {'online' : 1}, outputOnline ? null : 'selected')}} + {{:helper.link('Online', 'power', {'online' : 1}, outputOnline ? 'selected' : null)}}{{:helper.link('Offline', 'close', {'online' : 1}, outputOnline ? null : 'selected')}}
    @@ -56,12 +56,12 @@ Output Level:
    - {{:~displayBar(outputLevel, 0, outputMax)}} + {{:helper.displayBar(outputLevel, 0, outputMax)}}
    - {{:~link('MIN', null, {'output' : 'min'}, (outputLevel > 0) ? null : 'disabled')}} - {{:~link('SET', null, {'output' : 'set'}, null)}} - {{:~link('MAX', null, {'output' : 'max'}, (outputLevel < outputMax) ? null : 'disabled')}} -
     {{:outputLevel}} W 
    + {{:helper.link('MIN', null, {'output' : 'min'}, (outputLevel > 0) ? null : 'disabled')}} + {{:helper.link('SET', null, {'output' : 'set'}, null)}} + {{:helper.link('MAX', null, {'output' : 'max'}, (outputLevel < outputMax) ? null : 'disabled')}} +
     {{:data.outputLevel}} W 
    @@ -71,9 +71,9 @@ Output Load:
    - {{:~displayBar(outputLoad, 0, outputMax, (outputLoad < outputLevel) ? 'good' : 'average')}} + {{:helper.displayBar(outputLoad, 0, outputMax, (outputLoad < outputLevel) ? 'good' : 'average')}}
    - {{:outputLoad}} W + {{:data.outputLoad}} W
    \ No newline at end of file diff --git a/nano/templates/tanks.tmpl b/nano/templates/tanks.tmpl index af7ab874f6..ab64597b21 100644 --- a/nano/templates/tanks.tmpl +++ b/nano/templates/tanks.tmpl @@ -1,4 +1,4 @@ -{{if maskConnected}} +{{if data.maskConnected}}
    This tank is connected to a mask.
    {{else}}
    This tank is NOT connected to a mask.
    @@ -9,9 +9,9 @@ Tank Pressure:
    - {{:~displayBar(tankPressure, 0, 1013, (tankPressure > 200) ? 'good' : (tankPressure > 100) ? 'average' : 'bad'))}} + {{:helper.displayBar(tankPressure, 0, 1013, (tankPressure > 200) ? 'good' : (tankPressure > 100) ? 'average' : 'bad'))}}
    - {{:tankPressure}} kPa + {{:data.tankPressure}} kPa
    @@ -23,15 +23,15 @@ Mask Release Pressure:
    - {{:~displayBar(releasePressure, 0, maxReleasePressure, (releasePressure >= 23) ? null : ((releasePressure >= 17) ? 'average' : 'bad'))}} + {{:helper.displayBar(releasePressure, 0, maxReleasePressure, (releasePressure >= 23) ? null : ((releasePressure >= 17) ? 'average' : 'bad'))}}
    - {{:~link('-', null, {'dist_p' : -10}, (releasePressure > 0) ? null : 'disabled')}} - {{:~link('-', null, {'dist_p' : -1}, (releasePressure > 0) ? null : 'disabled')}} -
     {{:releasePressure}} kPa 
    - {{:~link('+', null, {'dist_p' : 1}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} - {{:~link('+', null, {'dist_p' : 10}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} - {{:~link('Max', null, {'dist_p' : 'max'}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} - {{:~link('Reset', null, {'dist_p' : 'reset'}, (releasePressure != defaultReleasePressure) ? null : 'disabled')}} + {{:helper.link('-', null, {'dist_p' : -10}, (releasePressure > 0) ? null : 'disabled')}} + {{:helper.link('-', null, {'dist_p' : -1}, (releasePressure > 0) ? null : 'disabled')}} +
     {{:data.releasePressure}} kPa 
    + {{:helper.link('+', null, {'dist_p' : 1}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} + {{:helper.link('+', null, {'dist_p' : 10}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} + {{:helper.link('Max', null, {'dist_p' : 'max'}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} + {{:helper.link('Reset', null, {'dist_p' : 'reset'}, (releasePressure != defaultReleasePressure) ? null : 'disabled')}}
    @@ -41,7 +41,7 @@ Mask Release Valve:
    - {{:~link('Open', 'unlocked', {'stat' : 1}, (!maskConnected) ? 'disabled' : (valveOpen ? 'selected' : null))}}{{:~link('Close', 'locked', {'stat' : 1}, valveOpen ? null : 'selected')}} + {{:helper.link('Open', 'unlocked', {'stat' : 1}, (!maskConnected) ? 'disabled' : (valveOpen ? 'selected' : null))}}{{:helper.link('Close', 'locked', {'stat' : 1}, valveOpen ? null : 'selected')}}
    diff --git a/nano/templates/telescience_console.tmpl b/nano/templates/telescience_console.tmpl index bd88dc4586..5906a4e38e 100644 --- a/nano/templates/telescience_console.tmpl +++ b/nano/templates/telescience_console.tmpl @@ -5,16 +5,16 @@ Used In File(s): \code\modules\telesci\telesci_computer.dm
    Coordinates:
    - {{:~link('X: ' + coordx, 'gear', {'setx': 1})}} - {{:~link('Y: ' + coordy, 'gear', {'sety': 1})}} - {{:~link('Z: ' + coordz, 'gear', {'setz': 1})}} + {{:helper.link('X: ' + coordx, 'gear', {'setx': 1})}} + {{:helper.link('Y: ' + coordy, 'gear', {'sety': 1})}} + {{:helper.link('Z: ' + coordz, 'gear', {'setz': 1})}}
    Controls:
    - {{:~link('Send', 'gear', {'send': 1}, null, (coordx != null && coordy != null && coordz != null) ? '' : 'disabled')}} - {{:~link('Receive', 'gear', {'receive': 1}, null, (coordx != null && coordy != null && coordz != null) ? '' : 'disabled')}} - {{:~link('Recalibrate', 'gear', {'recal': 1})}} + {{:helper.link('Send', 'gear', {'send': 1}, null, (coordx != null && coordy != null && coordz != null) ? '' : 'disabled')}} + {{:helper.link('Receive', 'gear', {'receive': 1}, null, (coordx != null && coordy != null && coordz != null) ? '' : 'disabled')}} + {{:helper.link('Recalibrate', 'gear', {'recal': 1})}}
    diff --git a/nano/templates/transfer_valve.tmpl b/nano/templates/transfer_valve.tmpl index 6c5cca62ff..470a097469 100644 --- a/nano/templates/transfer_valve.tmpl +++ b/nano/templates/transfer_valve.tmpl @@ -3,12 +3,12 @@ Attachment One:
    - {{if attachmentOne}} - {{:attachmentOne}} + {{if data.attachmentOne}} + {{:data.attachmentOne}} {{else}} None {{/if}} - {{:~link('Remove', 'eject', {'tankone' : 1}, attachmentOne ? null : 'disabled')}} + {{:helper.link('Remove', 'eject', {'tankone' : 1}, attachmentOne ? null : 'disabled')}}
    @@ -17,12 +17,12 @@ Attachment Two:
    - {{if attachmentTwo}} - {{:attachmentTwo}} + {{if data.attachmentTwo}} + {{:data.attachmentTwo}} {{else}} None {{/if}} - {{:~link('Remove', 'eject', {'tanktwo' : 1}, attachmentTwo ? null : 'disabled')}} + {{:helper.link('Remove', 'eject', {'tanktwo' : 1}, attachmentTwo ? null : 'disabled')}}
    @@ -31,14 +31,14 @@ Valve Attachment:
    - {{if valveAttachment}} - {{:valveAttachment}} + {{if data.valveAttachment}} + {{:data.valveAttachment}} {{else}} None {{/if}} - {{:~link('Remove', 'eject', {'rem_device' : 1}, valveAttachment ? null : 'disabled')}} - {{if valveAttachment}} - {{:~link('View', 'wrench', {'device' : 1})}} + {{:helper.link('Remove', 'eject', {'rem_device' : 1}, valveAttachment ? null : 'disabled')}} + {{if data.valveAttachment}} + {{:helper.link('View', 'wrench', {'device' : 1})}} {{/if}}
    @@ -50,7 +50,7 @@ Valve Status:
    - {{:~link('Open', 'unlocked', {'open' : 1}, (!attachmentOne || !attachmentTwo) ? 'disabled' : (valveOpen ? 'selected' : null))}}{{:~link('Close', 'locked', {'open' : 1}, (!attachmentOne || !attachmentTwo) ? 'disabled' : (valveOpen ? null : 'selected'))}} + {{:helper.link('Open', 'unlocked', {'open' : 1}, (!attachmentOne || !attachmentTwo) ? 'disabled' : (valveOpen ? 'selected' : null))}}{{:helper.link('Close', 'locked', {'open' : 1}, (!attachmentOne || !attachmentTwo) ? 'disabled' : (valveOpen ? null : 'selected'))}}
    diff --git a/nano/templates/uplink.tmpl b/nano/templates/uplink.tmpl index 34188899a5..d11160772e 100644 --- a/nano/templates/uplink.tmpl +++ b/nano/templates/uplink.tmpl @@ -3,15 +3,15 @@ Title: Syndicate Uplink, uses some javascript to change nanoUI up a bit. Used In File(s): \code\game\objects\items\devices\uplinks.dm --> -{{:~syndicateMode()}} -

    {{:welcome}}

    +{{:helper.syndicateMode()}} +

    {{:data.welcome}}


    Functions:
    - {{:~link('Close', 'gear', {'lock' : "1"}, null, 'fixedLeft')}} + {{:helper.link('Close', 'gear', {'lock' : "1"}, null, 'fixedLeft')}}

    @@ -20,20 +20,20 @@ Used In File(s): \code\game\objects\items\devices\uplinks.dm Tele-Crystals:
    - {{:crystals}} + {{:data.crystals}}

    Request items:


    Each item costs a number of tele-crystals as indicated by the number following their name.

    -{{for nano_items}} +{{for data.nano_items}}
    -

    {{:Category}}

    +

    {{:data.Category}}

    - {{for items}} + {{for data.items}}
    - {{:~link( Name, 'gear', {'buy_item' : obj_path, 'cost' : Cost}, Cost > ~root.crystals ? 'disabled' : null, null)}} - {{:Cost}} + {{:helper.link( Name, 'gear', {'buy_item' : obj_path, 'cost' : Cost}, Cost > ~root.crystals ? 'disabled' : null, null)}} - {{:data.Cost}}
    {{/for}}
    @@ -41,6 +41,6 @@ Used In File(s): \code\game\objects\items\devices\uplinks.dm {{/for}}
    - {{:~link('Buy Random (??)' , 'gear', {'buy_item' : 'random'}, null, 'fixedLeftWidest')}} + {{:helper.link('Buy Random (??)' , 'gear', {'buy_item' : 'random'}, null, 'fixedLeftWidest')}}
    From 1b8d865061a71d010c5042d4d05e6fb592fdf7c5 Mon Sep 17 00:00:00 2001 From: Mark Aherne Date: Mon, 7 Jul 2014 02:05:39 +0100 Subject: [PATCH 03/88] Work in progress on a major revision of the NanoUI templating system. --- code/modules/nano/nanoui.dm | 1 + nano/js/nano_base_helpers.js | 6 +----- nano/js/nano_template.js | 2 +- nano/js/nano_update.js | 19 +++++++++++++++---- nano/js/nano_utility.js | 16 +++++++++++----- nano/templates/apc.tmpl | 2 +- 6 files changed, 30 insertions(+), 16 deletions(-) diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 3cfec37fa5..5e382c38c8 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -93,6 +93,7 @@ nanoui is used to open and update nano browser uis /datum/nanoui/proc/add_common_assets() add_script("libraries.min.js") // A JS file comprising of jQuery, doT.js and jQuery Timer libraries (compressed together) add_script("nano_utility.js") // The NanoUtility JS, this is used to store utility functions. + add_script("nano_template.js") // The NanoTemplate JS, this is used to render templates. add_script("nano_update.js") // The NanoUpdate JS, this is used to receive updates and apply them. add_script("nano_base_helpers.js") // The NanoBaseHelpers JS, this is used to set up template helpers which are common to all templates add_stylesheet("shared.css") // this CSS sheet is common to all UIs diff --git a/nano/js/nano_base_helpers.js b/nano/js/nano_base_helpers.js index 9b83dba6ba..e9c49f5df0 100644 --- a/nano/js/nano_base_helpers.js +++ b/nano/js/nano_base_helpers.js @@ -1,13 +1,9 @@ // NanoBaseHelpers is where the base template helpers (common to all templates) are stored NanoBaseHelpers = function () { - var _urlParameters = {}; // This is populated with the base url parameters (used by all links), which is probaby just the "src" parameter - var init = function () { - var body = $('body'); // We store data in the body tag, it's as good a place as any - - _urlParameters = body.data('urlParameters'); + initHelpers(); }; diff --git a/nano/js/nano_template.js b/nano/js/nano_template.js index 0bb02d762a..cde883329d 100644 --- a/nano/js/nano_template.js +++ b/nano/js/nano_template.js @@ -7,7 +7,7 @@ var NanoTemplate = function () { var _helpers = {}; var init = function () { - doT.templateSettings['varname'] = 'data'; + }; var compileTemplates = function () { diff --git a/nano/js/nano_update.js b/nano/js/nano_update.js index 300e9fa00a..bbb868a530 100644 --- a/nano/js/nano_update.js +++ b/nano/js/nano_update.js @@ -100,7 +100,12 @@ NanoUpdate = function () { if (templateData.hasOwnProperty(key)) { - $.when($.get(templateData[key])) + $.when($.ajax({ + url: templateData[key], + cache: false, + dataType: 'text' + })) + //$.when($.get(templateData[key])) .done(function(templateMarkup) { //templateMarkup = templateMarkup.replace(/ +\) *\}\}/g, ')}}'); @@ -132,7 +137,10 @@ NanoUpdate = function () alert('ERROR: An error occurred while loading the UI: ' + error.message); return; } - }); + }) + .fail(function () { + alert('Loading template ' + key + '(' + templateData[key] + ') failed!'); + });; } } }; @@ -192,9 +200,12 @@ NanoUpdate = function () // Execute all callbacks in the callbacks array/object provided, updateData is passed to them for processing and potential modification var executeCallbacks = function (callbacks, updateData) { - for (var index in callbacks) + for (var key in callbacks) { - updateData = callbacks[index].call(this, updateData); + if (callbacks.hasOwnProperty(key) && jQuery.isFunction(callbacks[key])) + { + updateData = callbacks[key].call(this, updateData); + } } return updateData; diff --git a/nano/js/nano_utility.js b/nano/js/nano_utility.js index aaf3f13ff4..6d93829883 100644 --- a/nano/js/nano_utility.js +++ b/nano/js/nano_utility.js @@ -1,15 +1,21 @@ // NanoUtility is the place to store utility functions var NanoUtility = function () { - return { + var _urlParameters = {}; // This is populated with the base url parameters (used by all links), which is probaby just the "src" parameter + + return { init: function () { if (typeof jQuery == 'undefined') { - alert('ERROR: jQuery failed to load!'); + alert('ERROR: Javascript library failed to load!'); } - if (typeof $.views == 'undefined') { - alert('ERROR: JSRender failed to load!'); - } + if (typeof doT == 'undefined') { + alert('ERROR: Template engine failed to load!'); + } + + var body = $('body'); // We store data in the body tag, it's as good a place as any + + _urlParameters = body.data('urlParameters'); }, // generate a Byond href, combines _urlParameters with parameters generateHref: function (parameters) diff --git a/nano/templates/apc.tmpl b/nano/templates/apc.tmpl index 574e53cec6..0fbba9fe86 100644 --- a/nano/templates/apc.tmpl +++ b/nano/templates/apc.tmpl @@ -114,7 +114,7 @@ {{else value.status >= 2}} On {{/if}} - {{if value.status == 1 || status == 3}} + {{if value.status == 1 || value.status == 3}} [Auto] {{else}} [Manual] From 728ba52af062e2714a9e5030e53f485e0be1d4ac Mon Sep 17 00:00:00 2001 From: Mark Aherne Date: Mon, 7 Jul 2014 10:03:13 +0100 Subject: [PATCH 04/88] Work in progress on a major revision of the NanoUI templating system. --- nano/js/nano_base_helpers.js | 6 +----- nano/js/nano_template.js | 5 +---- nano/js/nano_update.js | 6 +----- nano/js/nano_utility.js | 24 +++++++++++++++--------- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/nano/js/nano_base_helpers.js b/nano/js/nano_base_helpers.js index e9c49f5df0..90b29da1e0 100644 --- a/nano/js/nano_base_helpers.js +++ b/nano/js/nano_base_helpers.js @@ -197,11 +197,7 @@ NanoBaseHelpers = function () } }; } (); - -$(document).ready(function() -{ - NanoBaseHelpers.init(); -}); + diff --git a/nano/js/nano_template.js b/nano/js/nano_template.js index cde883329d..13588f9f72 100644 --- a/nano/js/nano_template.js +++ b/nano/js/nano_template.js @@ -58,8 +58,5 @@ var NanoTemplate = function () { } } }(); - -$(document).ready(function () { - NanoTemplate.init(); -}); + diff --git a/nano/js/nano_update.js b/nano/js/nano_update.js index bbb868a530..9b9e7a4cf6 100644 --- a/nano/js/nano_update.js +++ b/nano/js/nano_update.js @@ -234,8 +234,4 @@ NanoUpdate = function () } }; } (); - -$(document).ready(function() -{ - NanoUpdate.init(); -}); \ No newline at end of file + \ No newline at end of file diff --git a/nano/js/nano_utility.js b/nano/js/nano_utility.js index 6d93829883..d54857a347 100644 --- a/nano/js/nano_utility.js +++ b/nano/js/nano_utility.js @@ -6,13 +6,6 @@ var NanoUtility = function () return { init: function () { - if (typeof jQuery == 'undefined') { - alert('ERROR: Javascript library failed to load!'); - } - if (typeof doT == 'undefined') { - alert('ERROR: Template engine failed to load!'); - } - var body = $('body'); // We store data in the body tag, it's as good a place as any _urlParameters = body.data('urlParameters'); @@ -48,9 +41,22 @@ var NanoUtility = function () return queryString; } } -} (); +} (); -NanoUtility.init(); +if (typeof jQuery == 'undefined') { + alert('ERROR: Javascript library failed to load!'); +} +if (typeof doT == 'undefined') { + alert('ERROR: Template engine failed to load!'); +} + +// All scripts are initialised here, this allows control of init order +$(document).ready(function () { + NanoUtility.init(); + NanoTemplate.init(); + NanoBaseHelpers.init(); + NanoUpdate.init(); +}); if (!Array.prototype.indexOf) { From 0e1d549ff13c9c3b01b65347dd4994a5a1064595 Mon Sep 17 00:00:00 2001 From: John-Michael O'Brien Date: Mon, 7 Jul 2014 22:57:37 -0600 Subject: [PATCH 05/88] Update PDA.dm Patched the comment to match the actual, final behavior (Doh!) --- code/game/objects/items/devices/PDA/PDA.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index f524826b7c..818326b806 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -1214,8 +1214,9 @@ var/global/list/obj/item/device/pda/PDAs = list() user << "\blue Tank is empty!" if (!scanmode && istype(A, /obj/item/weapon/paper) && owner) - // JMO 20140705: Makes scanned document show up in edit window if you edit notes. Not pretty for formatted documents, - // as this will clobber the HTML, but at least it lets you scan a document and add notes after the end. + // JMO 20140705: Makes scanned document show up properly in the notes. Not pretty for formatted documents, + // as this will clobber the HTML, but at least it lets you scan a document. You can restore the original + // notes by editing the note again. (Was going to allow you to edit, but scanned documents are too long.) var/raw_scan = (A:info) var/formatted_scan = "" // Scrub out the tags (replacing a few formatting ones along the way) From 9297b56b7ac813a5577fd02412c0740b6097c67a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 8 Jul 2014 16:01:44 -0400 Subject: [PATCH 06/88] Cyborgs now understand all languages besides vox-pidgin --- code/modules/mob/living/silicon/robot/robot_modules.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 94346fa374..0eadb02860 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -41,7 +41,15 @@ modules += O /obj/item/weapon/robot_module/proc/add_languages(var/mob/living/silicon/robot/R) + //full set of languages + R.add_language("Sol Common", 0) + R.add_language("Sinta'unathi", 0) + R.add_language("Siik'maas", 0) + R.add_language("Siik'tajr", 0) + R.add_language("Skrellian", 0) + R.add_language("Rootspeak", 0) R.add_language("Tradeband", 0) + R.add_language("Gutter", 0) /obj/item/weapon/robot_module/standard name = "standard robot module" From b583754f3ec97fbecfccbb9bdeb7a53070140cca Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 9 Jul 2014 17:05:54 +0930 Subject: [PATCH 07/88] Neatened a few oversights with the suit cycler up. --- code/game/machinery/suit_storage_unit.dm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 58da1b1d9e..9095bee17c 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -1036,8 +1036,11 @@ return switch(target_species) - if("Human" || "Skrell") - if(helmet) helmet.species_restricted = list("exclude","Unathi","Tajaran","Diona","Vox") + if("Skrell") + if(helmet) helmet.species_restricted = list("Skrell") + if(suit) suit.species_restricted = list("exclude","Unathi","Tajaran","Diona","Vox") + if("Human") + if(helmet) helmet.species_restricted = list("exclude","Unathi","Tajaran","Diona","Vox","Skrell") if(suit) suit.species_restricted = list("exclude","Unathi","Tajaran","Diona","Vox") if("Unathi") if(helmet) helmet.species_restricted = list("Unathi") @@ -1106,4 +1109,7 @@ if(suit) suit.name = "blood-red hardsuit" suit.item_state = "syndie_hardsuit" - suit.icon_state = "rig-syndie" \ No newline at end of file + suit.icon_state = "rig-syndie" + + if(helmet) helmet.name = "refitted [helmet.name]" + if(suit) suit.name = "refitted [suit.name]" \ No newline at end of file From b2033c0825f75a2c9686db94c2622806987b025a Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 9 Jul 2014 17:55:25 +0930 Subject: [PATCH 08/88] Adjusted suit cycler code, added cyclers to EVA, Engineering and Mining. --- code/game/machinery/suit_storage_unit.dm | 51 ++++++++++++++---- maps/tgstation2.dmm | 68 ++++++++++++------------ 2 files changed, 74 insertions(+), 45 deletions(-) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 9095bee17c..7e6f1e3f7e 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -575,7 +575,7 @@ /obj/machinery/suit_cycler name = "suit cycler" - desc = "An industrial machine for repairing, painting and equipping hardsuits." + desc = "An industrial machine for painting and refitting hardsuits." anchored = 1 density = 1 @@ -591,6 +591,7 @@ var/model_text = "" // Some flavour text for the topic box. var/locked = 1 // If locked, nothing can be taken from or added to the cycler. var/panel_open = 0 // Hacking! + var/can_repair // If set, the cycler can repair hardsuits. // Wiring bollocks. var/wires = 15 @@ -604,26 +605,54 @@ //Species that the suits can be configured to fit. var/list/species = list("Human","Skrell","Unathi","Tajaran") - var/target_department = "Engineering" - var/target_species = "Human" + var/target_department + var/target_species var/mob/living/carbon/human/occupant = null var/obj/item/clothing/suit/space/rig/suit = null var/obj/item/clothing/head/helmet/space/helmet = null +/obj/machinery/suit_cycler/New() + ..() + target_department = departments[1] + target_species = species[1] + if(!target_department || !target_species) del(src) + /obj/machinery/suit_cycler/engineering name = "Engineering suit cycler" model_text = "Engineering" req_access = list(access_construction) departments = list("Engineering","Atmos") - species = list("Human","Unathi","Tajaran") + species = list("Human","Tajaran") //Add Unathi when sprites exist for their suits. /obj/machinery/suit_cycler/mining name = "Mining suit cycler" model_text = "Mining" req_access = list(access_mining) departments = list("Mining") - species = list("Human","Unathi","Tajaran") + species = list("Human","Tajaran") + +/obj/machinery/suit_cycler/security + name = "Security suit cycler" + model_text = "Security" + req_access = list(access_security) + departments = list("Security") + species = list("Human","Tajaran") + +/obj/machinery/suit_cycler/medical + name = "Medical suit cycler" + model_text = "Medical" + req_access = list(access_medical) + departments = list("Medical") + species = list("Human","Tajaran") + +/obj/machinery/suit_cycler/syndicate + name = "Nonstandard suit cycler" + model_text = "Nonstandard" + req_access = list(access_syndicate) + departments = list("Mercenary") + species = list("Human","Tajaran","Unathi","Skrell") + can_repair = 1 /obj/machinery/suit_cycler/attack_ai(mob/user as mob) return src.attack_hand(user) @@ -780,7 +809,7 @@ dat += "Helmet: [helmet ? "\the [helmet]" : "no helmet stored" ]. \[eject\]
    " dat += "Suit: [suit ? "\the [suit]" : "no suit stored" ]. \[eject\]" - if(suit && istype(suit)) + if(can_repair && suit && istype(suit)) dat += "[(suit.damage ? " \[repair\]" : "")]" dat += "
    UV decontamination systems: SYSTEM ERROR" : "green'>READY"]
    " @@ -839,7 +868,7 @@ radiation_level = input("Please select the desired radiation level.","Suit cycler",null) as null|anything in choices else if(href_list["repair_suit"]) - if(!suit) return + if(!suit || !can_repair) return active = 1 spawn(100) repair_suit() @@ -943,7 +972,7 @@ /obj/machinery/suit_cycler/proc/finished_job() var/turf/T = get_turf(src) - T.visible_message("\The [src] pings loudly.") + T.visible_message("\icon[src] \blue The [src] pings loudly.") icon_state = initial(icon_state) active = 0 src.updateUsrDialog() @@ -1100,7 +1129,7 @@ suit.name = "atmospherics hardsuit" suit.icon_state = "rig-atmos" suit.item_state = "atmos_hardsuit" - if("^%###^%$") + if("^%###^%$" || "Mercenary") if(helmet) helmet.name = "blood-red hardsuit helmet" helmet.icon_state = "rig0-syndie" @@ -1111,5 +1140,5 @@ suit.item_state = "syndie_hardsuit" suit.icon_state = "rig-syndie" - if(helmet) helmet.name = "refitted [helmet.name]" - if(suit) suit.name = "refitted [suit.name]" \ No newline at end of file + if(helmet) helmet.name = "refitted [helmet.name]" + if(suit) suit.name = "refitted [suit.name]" \ No newline at end of file diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index fcbe24ca1b..cc72b6ed6a 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -109,7 +109,7 @@ "ace" = (/turf/simulated/wall,/area/security/main) "acf" = (/turf/simulated/wall/r_wall,/area/security/main) "acg" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/security/brig) -"ach" = (/obj/machinery/computer/security/telescreen{desc = "Used for watching Prison Wing holding areas."; name = "Prison Monitor"; network = list("Prison"); pixel_x = 0; pixel_y = 30},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/security/prison) +"ach" = (/obj/machinery/suit_cycler/mining,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva) "aci" = (/obj/machinery/door_timer/cell_1{dir = 4; pixel_x = 32; pixel_y = 0},/obj/machinery/light/small{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/security/brig) "acj" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/light_switch{pixel_x = -25; pixel_y = 0},/turf/simulated/floor{icon_state = "dark"},/area/security/brig) "ack" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/security/brig) @@ -1270,7 +1270,7 @@ "ayv" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/library) "ayw" = (/turf/simulated/floor{dir = 5; icon_state = "warning"},/area/ai_monitored/storage/eva) "ayx" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_security{name = "Security Hardsuits"; req_access_txt = "1"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) -"ayy" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) +"ayy" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/camera{c_tag = "EVA South"; dir = 1},/obj/structure/dispenser/oxygen,/turf/simulated/floor,/area/ai_monitored/storage/eva) "ayz" = (/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/fore) "ayA" = (/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/fore) "ayB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/hydroponics,/obj/machinery/light{tag = "icon-tube1 (NORTH)"; icon_state = "tube1"; dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/hydroponics) @@ -1315,8 +1315,8 @@ "azo" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "azp" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "azq" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/quartermaster/storage) -"azr" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/table/reinforced,/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) -"azs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) +"azr" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) +"azs" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) "azt" = (/obj/structure/rack,/obj/item/clothing/suit/space/rig/security,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/security,/obj/item/clothing/shoes/magboots,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva) "azu" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/fore) "azv" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "neutralcorner"; dir = 2},/area/crew_quarters/sleep) @@ -1545,7 +1545,7 @@ "aDK" = (/obj/structure/table/woodentable,/obj/item/weapon/deck,/turf/simulated/floor{icon_state = "grimy"},/area/hallway/secondary/entry) "aDL" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/fpmaint) "aDM" = (/obj/item/device/radio/intercom{freerange = 1; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/table/reinforced,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) -"aDN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) +"aDN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/door/firedoor/border_only{dir = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) "aDO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) "aDP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/hallway/primary/starboard) "aDQ" = (/obj/machinery/suit_storage_unit/standard_unit,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva) @@ -1622,9 +1622,9 @@ "aFj" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/stool/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) "aFk" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/port) "aFl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/bridge/meeting_room) -"aFm" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva) -"aFn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) -"aFo" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) +"aFm" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) +"aFn" = (/obj/machinery/suit_cycler/medical,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva) +"aFo" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_command{name = "E.V.A. Cycler Access"; req_access_txt = "0"; req_one_access_txt = "1;5;11;18;24"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "aFp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/storage/emergency2) "aFq" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 5; icon_state = "green"},/area/hydroponics) "aFr" = (/obj/machinery/light_switch{pixel_y = 28},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/bridge/meeting_room) @@ -1715,7 +1715,7 @@ "aGY" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/wall/r_wall,/area/turret_protected/ai) "aGZ" = (/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/door/airlock/glass{name = "Holodeck Door"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/turf/simulated/floor,/area/crew_quarters/fitness) "aHa" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/wall/r_wall,/area/crew_quarters/captain) -"aHb" = (/obj/machinery/light/small{dir = 8},/obj/structure/dispenser/oxygen,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva) +"aHb" = (/obj/machinery/suit_cycler/engineering,/obj/machinery/light/small{dir = 8},/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva) "aHc" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor,/area/storage/tools) "aHd" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/head/helmet/space/skrell/black,/obj/item/clothing/mask/breath,/obj/item/clothing/suit/space/skrell/black,/obj/item/clothing/head/helmet/space/skrell/white,/obj/item/clothing/mask/breath,/obj/item/clothing/suit/space/skrell/white,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva) "aHe" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{icon_state = "blue"; dir = 10},/area/bridge) @@ -1796,12 +1796,12 @@ "aIB" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/central) "aIC" = (/obj/structure/table/woodentable,/obj/machinery/recharger{pixel_y = 0},/turf/simulated/floor/plating,/area/security/vacantoffice) "aID" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/stool/bed,/obj/item/weapon/bedsheet/mime,/turf/simulated/floor/carpet{icon_state = "carpetnoconnect"},/area/crew_quarters/sleep/bedrooms) -"aIE" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva) +"aIE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/table/reinforced,/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) "aIF" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) "aIG" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/ai_monitored/storage/eva) "aIH" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) -"aII" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/camera{c_tag = "EVA South"; dir = 1},/turf/simulated/floor,/area/ai_monitored/storage/eva) -"aIJ" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) +"aII" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) +"aIJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) "aIK" = (/obj/machinery/door/firedoor/border_only{dir = 2},/obj/structure/cable,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) "aIL" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "aIM" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/head/helmet/space/unathi/helmet_cheap,/obj/item/clothing/mask/breath,/obj/item/clothing/suit/space/unathi/rig_cheap,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva) @@ -2463,7 +2463,7 @@ "aVs" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aVt" = (/obj/structure/lattice,/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1380; master_tag = "escape_dock_north_airlock"; name = "exterior access button"; pixel_x = 5; pixel_y = 25; req_access_txt = "0"; req_one_access_txt = "13"},/turf/space,/area) "aVu" = (/obj/structure/table,/obj/machinery/reagentgrinder,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) -"aVv" = (/obj/machinery/door/firedoor/border_only{dir = 2},/obj/structure/cable,/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) +"aVv" = (/obj/machinery/suit_cycler/security,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva) "aVw" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall,/area/hallway/primary/fore) "aVx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/wall,/area/crew_quarters/toilet) "aVy" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet) @@ -3300,7 +3300,7 @@ "blx" = (/obj/structure/table/reinforced,/obj/machinery/ignition_switch{id = "Xenobio"; pixel_x = -6; pixel_y = 4},/obj/machinery/atmospherics/pipe/manifold/visible{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/rnd/misc_lab) "bly" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor{icon_state = "red"},/area/security/checkpoint2) "blz" = (/obj/structure/table/reinforced,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/turf/simulated/floor{icon_state = "white"},/area/rnd/misc_lab) -"blA" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/device/modkit/tajaran,/obj/item/device/modkit/tajaran,/obj/item/device/modkit/tajaran,/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/ai_monitored/storage/eva) +"blA" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/table/reinforced,/obj/item/stack/sheet/rglass{amount = 50},/obj/item/stack/rods{amount = 50},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/camera{c_tag = "EVA East"; dir = 8},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) "blB" = (/obj/machinery/atmospherics/pipe/simple{dir = 6; icon_state = "intact"; level = 2},/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/medical/sleeper) "blC" = (/obj/machinery/atmospherics/unary/cryo_cell,/turf/simulated/floor{icon_state = "red"; dir = 9},/area/medical/sleeper) "blD" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact"; level = 2},/turf/simulated/floor,/area/medical/sleeper) @@ -3386,7 +3386,7 @@ "bnf" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor{dir = 4; icon_state = "arrival"},/area/hallway/secondary/entry) "bng" = (/turf/simulated/wall,/area/rnd/mixing) "bnh" = (/obj/machinery/requests_console{department = "EVA"; pixel_x = -32; pixel_y = 0},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/table/reinforced,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/item/device/multitool,/obj/machinery/camera/motion{c_tag = "EVA Motion Sensor"; dir = 4},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) -"bni" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/table/reinforced,/obj/item/stack/sheet/rglass{amount = 50},/obj/item/stack/rods{amount = 50},/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/camera{c_tag = "EVA East"; dir = 8},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) +"bni" = (/obj/structure/table/reinforced,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) "bnj" = (/turf/simulated/floor/plating/airless,/area/rnd/mixing) "bnk" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 6},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bnl" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/door/airlock/external{frequency = 1379; icon_state = "door_locked"; id_tag = "toxin_test_inner"; locked = 1; name = "Engineering External Access"; req_access = null; req_access_txt = "13"},/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -3516,7 +3516,7 @@ "bpF" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor{icon_state = "white"},/area/assembly/robotics) "bpG" = (/obj/structure/closet/firecloset,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{dir = 10; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "bpH" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{dir = 6; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) -"bpI" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/table/reinforced,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) +"bpI" = (/obj/machinery/camera{c_tag = "Engineering EVA Storage"; dir = 1; network = list("SS13")},/obj/machinery/suit_cycler/engineering,/turf/simulated/floor,/area/engine/engine_eva) "bpJ" = (/obj/machinery/gateway,/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/obj/effect/landmark{name = "JoinLateGateway"},/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/gateway) "bpK" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/door/airlock/external{name = "Toxins Test Chamber"; req_access_txt = "0"},/turf/simulated/floor/plating/airless,/area/rnd/test_area) "bpL" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/plating/airless,/area/rnd/test_area) @@ -6383,7 +6383,7 @@ "csM" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig/atmos,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/atmos,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/northleft{name = "Atmospherics Hardsuits"; req_access_txt = "24"},/turf/simulated/floor,/area/engine/engine_eva) "csN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/light/small{dir = 4},/obj/structure/disposalpipe/junction{dir = 1; icon_state = "pipe-j2"},/turf/simulated/floor{icon_state = "floorgrime"},/area/engine/engine_eva_maintenance) "csO" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "floorgrime"},/area/engine/engine_eva_maintenance) -"csP" = (/obj/machinery/camera{c_tag = "Engineering EVA Storage"; dir = 1; network = list("SS13")},/obj/structure/table/reinforced{icon_state = "table"},/obj/item/device/modkit/tajaran,/turf/simulated/floor,/area/engine/engine_eva) +"csP" = (/obj/machinery/suit_cycler/mining,/turf/simulated/floor,/area/mine/eva) "csQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "csR" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "csS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) @@ -9544,6 +9544,7 @@ "dBB" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/wall/r_wall,/area/research_outpost/iso3) "dBC" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{name = "Isolation room two"; req_access_txt = "65"},/turf/simulated/floor,/area/research_outpost/iso2) "dBD" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/research_outpost/entry) +"dBE" = (/obj/machinery/alarm{pixel_y = 24},/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor,/area/mine/production) "dBF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor,/area/research_outpost/entry) "dBG" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{dir = 5; icon_state = "whitehall"},/area/research_outpost/hallway) "dBH" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor{dir = 5; icon_state = "whitehall"},/area/research_outpost/hallway) @@ -9665,9 +9666,12 @@ "dDT" = (/obj/structure/cable,/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/item/weapon/storage/toolbox/mechanical,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/turf/simulated/floor{dir = 2; icon_state = "cmo"},/area/research_outpost/entry) "dDU" = (/obj/machinery/recharge_station,/obj/machinery/light_switch{pixel_x = 0; pixel_y = 27},/turf/simulated/floor/plating,/area/engine/drone_fabrication) "dDV" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor,/area/research_outpost/gearstore) +"dDW" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor,/area/mine/eva) "dDX" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/med) "dDY" = (/turf/simulated/wall,/area/research_outpost/tempstorage) +"dDZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/structure/table,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/pickaxe,/turf/simulated/floor,/area/mine/production) "dEa" = (/obj/machinery/conveyor{dir = 1; id = "anosample"},/obj/structure/plasticflaps/mining,/turf/simulated/floor/plating,/area/research_outpost/maint) +"dEb" = (/obj/structure/table,/obj/item/weapon/storage/backpack/satchel,/turf/simulated/floor,/area/mine/production) "dEc" = (/obj/machinery/computer/security/telescreen{desc = "Used for watching the isolation room cameras."; layer = 4; name = "Isolation Room Telescreen"; network = list("Anomaly Isolation"); pixel_x = 32; pixel_y = 0},/obj/machinery/atmospherics/binary/pump{dir = 8},/turf/simulated/floor/plating,/area/research_outpost/maint) "dEd" = (/obj/machinery/shower{icon_state = "shower"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/research_outpost/hallway) "dEe" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall,/area/research_outpost/hallway) @@ -9966,7 +9970,6 @@ "dKm" = (/turf/simulated/floor,/area/mine/living_quarters) "dKn" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor,/area/mine/living_quarters) "dKo" = (/obj/structure/rack,/obj/item/clothing/suit/space/rig/mining,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/mining,/turf/simulated/floor,/area/mine/eva) -"dKp" = (/obj/structure/rack,/obj/item/weapon/storage/backpack/satchel,/obj/item/weapon/pickaxe,/obj/item/weapon/storage/belt/utility,/turf/simulated/floor,/area/mine/eva) "dKq" = (/obj/machinery/light,/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored) "dKr" = (/obj/structure/table,/obj/item/weapon/storage/backpack/satchel,/obj/item/clothing/glasses/meson,/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/mine/west_outpost) "dKs" = (/obj/machinery/door/airlock/glass_mining{name = "Break Room"; req_access_txt = "54"},/turf/simulated/floor,/area/mine/west_outpost) @@ -9996,7 +9999,6 @@ "dKW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/mine/living_quarters) "dKX" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/mine/living_quarters) "dKY" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/mine/production) -"dKZ" = (/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor,/area/mine/production) "dLa" = (/turf/simulated/floor,/area/mine/production) "dLb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor,/area/medical/surgeryprep) "dLc" = (/obj/machinery/door/firedoor/border_only{dir = 4; layer = 2.6; name = "Firelock East"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/research_outpost/hallway) @@ -10085,9 +10087,7 @@ "dMM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 2},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/mine/west_outpost) "dMN" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor,/area/mine/west_outpost) "dMO" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only{dir = 2},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plating,/area/mine/living_quarters) -"dMQ" = (/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor,/area/mine/eva) "dMR" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only{dir = 2},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/mine/eva) -"dMS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor,/area/mine/production) "dMT" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only{dir = 2},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/mine/eva) "dMU" = (/obj/structure/dispenser/oxygen,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor,/area/mine/eva) "dMV" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor,/area/mine/eva) @@ -10823,7 +10823,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaafaaiabKaaPabIabJaaPabSabRabMabMabNaaPabOaaiaafaafaagaafaafabPabuabsabuabPaafaagaaaaaaaafaagaagaagaafaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacaacaacaaaaacaacaacaacaacaaaaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaadaadaadaadaadaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaiabKaaPabIabQaaPabLabHaaaaaaaaaaaPabTabTabTabTabTaafaafabUabsabuabsabVaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacaacaacaaaaacaacaacaacaacaaaaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaadaadaadaadaadaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaiamSaaPabXabYaaiamTamUaaiaaaaaaabTabTacbaccacdabTabTaafaaVabsabsabuaaVaceaceaceaceaceaceapRapRapRapRapRapRaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaagaaiamXachancamZaneandanfaaPaaaabTabTapeacoacoacoapVabTabTaaVacqabsacraaVaceacsactaqNacvacwapRavoavoavoavoapRaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaagaaiamXahSancamZaneandanfaaPaaaabTabTapeacoacoacoapVabTabTaaVacqabsacraaVaceacsactaqNacvacwapRavoavoavoavoapRaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaiacxamvalBamuamnamkacDaaPaaaabTacEalbacGacoacHalaacJabTacKacLacMacNacOaceacsacPamJapjapjapnanKarLasvaejapRaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaiaaiaaiaaiakAamIamDamCaaPaaPaaPaaPaaaabTacYalbacZacoacHalaadaabTadbadcaddadeadfaceacsactapQacRaqcapRapCavgatFaurapRaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiadiadjadkadlaldalcaloalhaavadqadraaPaaaabTadsalbadtacoacHalaaduabTadvadwadxadyalGaceaceaceakSakWaceapRaqnaqPaqWarfapRaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -10862,15 +10862,15 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatHavsavtavuatHavsavtavuatHaYnaYgaXWaXWaXWaXWaYQaYHarwaaaaaaalPaaaaafaaaaafaafaaaaaaavAaaaaaaaafaaaaaaaafaaaalPaafaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaagapxapxapxapxaHDapxarbarbarbarbarbaYRaHIaHHaHGaHGaHGaHGaHKaHJaNqapEaJmalNaIjaIkaIhaIiaHYaIfaHNaHVaNQaLlavPavRavRaTIavRaKSavVavWavhaKPaviaviaKPaLcaKXaLaawbasRasRasRasRasRawbawcawdaweaaaalQalQalPaaaaaaaafaaaaaaaoPaaaaafaafaafaafalPalPalPaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaasSatHaZAawgasSatHaZyawgasSatKaZzatKatKatKatKatKaZeaspaaaaaaalPalPalPaaaaaaaafaaaawjawkawjaafaafaafaafalPalPalPaafapxapxapxapxawlawmawmawmawmawmawmawmawnapxapxawoawpawqapxawrawsaNJawwaZCaJfaJfaJfaJfaJfaZBaJfaJpaLDaJfaJfaJeaJeaJlaIYaJaaJnahmaIxaIAaIDaITaIvaHravdaIwawLawLbcxawMawNaVcawLauiawPawQaLQayMayMayMayMaMdaMmaMqawUasRasRasRasRasRawUawVawdaweaaaaaaaaaaafaafaaaaafaaaaaaawWaaaaaaaafaaaaaaaafaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawXawYbaUawYawZawYaZOawYbaRaxcbaiaxbaxbaxbbaVatKbbEaspaaaaafaafaaaaaaaaaaaaaafaaaaxgbbFaKgaafaaaaafaaaaaaaaaaaaaaaapxapaapaaxjapaapaapaapaapaapaapaapaaxkaxlaxmaxnaxnaxnaxnaxnaxnaxoaJBaMMaxraxraxraxraxsaJAaxraMIaxraxsaxraxraxraxraxwaxxaxyaKdaKaaHxaJRaJRaJRaHrauhaJQawLawOawMaxCawMaVeaxEaWraxGaxHaMuaMmaMmaMmaMBaMEaMGaMHaJwasRasRasRasRasRaJxaJyaxNaxOaaaaaaaaaaaaaafaaaaafaaaaxPaxQaxPaaaaafaaaaaaaafaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxRaxSaxTaxUaxVaxTaxTaxWaxUaxTaxXaxYaxZaxZbmzatKbbEatLaafaafaaaaaaaaaaaaaaaaafaybaycaydbdBayfaaaaafaaaaaaaaaaaaaaaapxapaapxaygayhayiayiayiayiayiayiayiayjaygaykaylaylaylaylaylaylaylaQnaynaxrayoaypayqayrbdCbbraPaaPdaywayxaypayyaxrayzapEayAalNaQvaNFaNIbdEaHqaHravdbdFayDaxFaxFayEayFayGbeDayIavVbdHbdcbbUbbUbbUbaNbaTaPnbavbdGasRasRasRasRasRbdIasPasPasPaaaaaaaaaaafaafaafaafaaaaySbmRaySaaaaafaaaaaaaafaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafatHayUayVayUayWaxTaxTayXayUayVayUayYaxSaxVbnfatHbbEatKatKazaatOatOatOatOatPatKazbazcazdazeazbapxapxawoawpawqapxapxapxapaaryaygaaaaafaaaaafaaaaafaaaaafaaaaygaykaylazfazgazhaziazjaylaQnapaaxrazkazkazlazmaznazoaPpaBdazrazsaztaztaxrayzapEazualNaQvaNFaHybdEaHqaHrauhazvbbOazxazyazzazAazBazBazCazBasPbeXbfGbeFbeGbeHbeObeEasPbdLasRasRasRasRasRbdKasPaafaaaaaaaaaaaaaafaafaaaaafazLazMbdMazOazPaafaaaaaaaafaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafazQasSazRavtazSazTazUazVazWazSavtazXazYasSazZbnnatHbnPboUboUboUboUboUboUaYHbezaAeazbaAfaAgaAhazbbghapaapaapaapaapaapaapaapaaAjaygaafaAkaAkaAkaAkaAkaAkaAkaafaygaykaylaAlaAmaAnaAoaAlaylaQnaApaxraxraxraxrbnhaAraypaAsaArbniaxraxraxraxrayzapEaAualNaQvaNFaHybdEaHqaHravdaEhazBazBazBazBazBazBaAwaAxaAyazBasPasPasPasPbgobgrasPasPbdKasRasRasRasRasRbdKasPaaaaaaaaaaaeaaaaaaaaaaaaaafaAAaABbdTaADaAAaafaaaaaaaafaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxRayVaAEaAFaAFaAFaAFaAGayVaxRaAHasSaAIbqOaAKaAKaAKaAKaAKaAKaAKaAKaZebfxbfzazbbckaANaAOazbaAPaAQaAPaAPaAPaAPaAPaAPaAPaAPaARaaaaAkaASaATaAUbbTaAWaAkaaaaygaykaylaAlbqMbpJbqBaAlaylaQnapxaxraBaaBbazlbpdaBdazoazpaBdbpIazsaBfaBfaxrayzapEayAalNbdZaIkaIhbdEbejbelavdaEiaHraBiaAxaBjaBjazBaAwaBkaAyazBaBlaBmaBnaBobhDaULaBqaafbfBbfdbfdbfdbfdbfdbfgaafaaaaaaaaaaaaaaaaaaaaaaaaaafaAAaBuaBvaBwaAAaafaaaaaaaBqaBqaBqaBqaBqbhqbhCaBqaBqaBqaBqaBqaBqaBqbgHaBFaBFaBFaBGaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaBHaBIaBJaBIaBIaDRaDSaBIaBIaBJaBMaBNasSbewbeAaQlbebbeuaBSaBTaBUaxeaAKaZeaPOatKazbazbaBXaBYaARaBZaCaaCbaCcaCdaCeaCfaCgaXEaCiaARaafaAkaQmaCkaClaCmaCnaAkaafaygaykaylbfCaAlbfFaAlaCraylaQnaCsaxrayoaypaCtaCuaAraCvaAsaAraCwaCxaypaCyaxrayzapEayAalNaQvaIAaIDaQxaIvaHraCAaEoaHraEpaAxaAxaAxazCaCDaCEaCFazBaCGaCHaCIaCJaYFaULaBqaaaaafaaaaafaaaaafaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaAAaZbaCMaCNaAAaBqaCOaCPaBqaQSaQDaQDaQDaQDaQDaQDaQFaRdaRdaRdaRdaRfaRdaRdaRdaRhaDaaafaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaBHaBMaBIaDbaDcaDcaDdaDeaDfaDgaDhaDcaDcaDiaDjayUayWaZuaAKbgsbiraDnaDoaDnaBVaDpbfVaDsaqYaZnaDuaDvaAcaDwaDxaDyaDzaDzaDzaDAaDzaDzaDBbjWaARaaaaAkaRAaRTaRVaCmaSaaAkaaaaygaykaylbjgbjoaDIbjobjVaylaQnaDLaxraxraxraxraDMaAraypaDNaBdaDOaTuaypaDQaVHaVzaVAaVpaVwaKJaVGaShaShaShaSEaScaFRbjYaTnbabaSPaSPaSPaUgaSPaTFaTTaTUaTVaUkaUGaVQaULaBqaBqaBqaBqaBqaBqaBqaBqaBqaCOaCPaBqaBqaBqaCOaEjaEkaBqaBqaAAaAAaElaEmaAAaEnaVqaVoaVoaVsaEsaEsaEsaEsaEsaWyaVraEuaEuaEuaEuaUNaEuaEyaEyaVnaEyaEyaEyaEyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaDiaEBaECaEDaDcaEEaDcaEEaDcaEEaDcaEEaDcaEFaEGazSayWaEHaAKblwblyaEKaELaEMaENaAKbjZbkiaAcaEQaAcaERaqYaAPaESaDBaDzaDzaDzaDzaDzaDzaETaWjaWgaVJaVIaWMaWNaWKaWLaWJaAkaafaygaWIaWpblGaWxaWqaWsblEaWpaZdaZcaxraFmaypazlaFnaBdazoaFoaAraCwaVvaypblAaVHaWTaFsaFtaXcbdZagjagjagjagjaVEaVFaWSaVxaVybazaVxaXfaVxaXeaVxaXgaXhaFGaFHaFIaBoaXjaXmaXXaXVaXVaXCaYcaXYaXYaXYaXYaXYbaCaXYaXYaYwaYeaXnaRdaRdaYGaYxblNaWPaWQaWQaWQaWRaEsaEsaGeaEsaGfaGgaGhaEsaEuaWUaEuaGjaXlaXkaGmaGnaGoaIbasHaGraGsaGtaGuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJGaJGaJGaJGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGvaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXoaDcaDcaBJaDcaEEaDcaEEaGxaEEaDcaEEaDcaEFaEGazSayWaGyaAKaAKblVaYKaYPaYKaQlaQlaYJaYNaYOaYLaYMaYLaYLbakbajaGKaGLaGLaGLaGMaGLaGLaGNaGOaARaaaaZXaAkayJbmqayJaAkaAkaaaaygavOaylbmjaZIaZiaZqaZDaZEaZhbglaxraHbaypaCxaCuaAraypaAsaAraCwaZgaypaHdawGaYhaHfaHgaUnaYfalNalNalNalNalNaHjaYbazBaHlaAxazBaHmazBaHnazBaHobcvbcwbcNbczbdNbcXaYUbdlbdmbbvbdAbbwbbvbbvbbxbbzbbybbAbbybbybbybbibcubcbbawbawbawbmxbaSbawbaxbawbaWaYIaHOaHPaHQaHRaHSaHTaEsaHUbaXaEuaHWaHXaYiaHZaGnaIaaIbasHaIcaEyaEyaEyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJGaJGaJGaJGaJGaJGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaDiaIdaECaEDaDcaEEaDcaEEaDcaEEaDcaEEaDcaEFaEGazSaIeawzawyawxawuawuawuawzawCawDawzawAaImaInawBauKauKaAPaGOaIpaCaaIqaBOaGOaIraIsaItaIuaARaaaawaaaaavMavNavMaaaaafaaaaygavOaylaAZaAXavZaBeaBcaylaAtaAJaxraIEaypazlaIFaIGazoaIHaIIaIJaIKaILaIMawGaBsaIOaIPaAqaBKaISaaaaaaaUnaIUaIVaBLazBaIXaAxaAxaAxaCEaAxaAxaAxauOaBoaKyaBoaBoavJaBoaJcaBoaJdavHavGaJgaJhaJiaJjaJkavFaJjaJjaJjaJjaJjavDaJjaJjaJjaJjaJjaJjaJjaJjasIayRayvaAzaAiaBraBpazHbMsazIavpavlavmavnazFayNayPazDazEasHaIbaJDaJEaJFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJGaJGaJGaJGaJGaJGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxRaxSaxTaxUaxVaxTaxTaxWaxUaxTaxXaxYaxZaxZbmzatKbbEatLaafaafaaaaaaaaaaaaaaaaafaybaycaydbdBayfaaaaafaaaaaaaaaaaaaaaapxapaapxaygayhayiayiayiayiayiayiayiayjaygaykaylaylaylaylaylaylaylaQnaynaxrayoaypayqayrbdCbbraPaaPdaywayxaypaztaxrayzapEayAalNaQvaNFaNIbdEaHqaHravdbdFayDaxFaxFayEayFayGbeDayIavVbdHbdcbbUbbUbbUbaNbaTaPnbavbdGasRasRasRasRasRbdIasPasPasPaaaaaaaaaaafaafaafaafaaaaySbmRaySaaaaafaaaaaaaafaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafatHayUayVayUayWaxTaxTayXayUayVayUayYaxSaxVbnfatHbbEatKatKazaatOatOatOatOatPatKazbazcazdazeazbapxapxawoawpawqapxapxapxapaaryaygaaaaafaaaaafaaaaafaaaaafaaaaygaykaylazfazgazhaziazjaylaQnapaaxrazkazkazlazmaznazoaPpaBdaIEaIIaypaztaxrayzapEazualNaQvaNFaHybdEaHqaHrauhazvbbOazxazyazzazAazBazBazCazBasPbeXbfGbeFbeGbeHbeObeEasPbdLasRasRasRasRasRbdKasPaafaaaaaaaaaaaaaafaafaaaaafazLazMbdMazOazPaafaaaaaaaafaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafazQasSazRavtazSazTazUazVazWazSavtazXazYasSazZbnnatHbnPboUboUboUboUboUboUaYHbezaAeazbaAfaAgaAhazbbghapaapaapaapaapaapaapaapaaAjaygaafaAkaAkaAkaAkaAkaAkaAkaafaygaykaylaAlaAmaAnaAoaAlaylaQnaApaxraxraxraxrbnhaAraypaAsaArblAaIJaypaVvaxrayzapEaAualNaQvaNFaHybdEaHqaHravdaEhazBazBazBazBazBazBaAwaAxaAyazBasPasPasPasPbgobgrasPasPbdKasRasRasRasRasRbdKasPaaaaaaaaaaaeaaaaaaaaaaaaaafaAAaABbdTaADaAAaafaaaaaaaafaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxRayVaAEaAFaAFaAFaAFaAGayVaxRaAHasSaAIbqOaAKaAKaAKaAKaAKaAKaAKaAKaZebfxbfzazbbckaANaAOazbaAPaAQaAPaAPaAPaAPaAPaAPaAPaAPaARaaaaAkaASaATaAUbbTaAWaAkaaaaygaykaylaAlbqMbpJbqBaAlaylaQnapxaxraBaaBbazlbpdaBdazoazpaBdbniaxraxraxraxrayzapEayAalNbdZaIkaIhbdEbejbelavdaEiaHraBiaAxaBjaBjazBaAwaBkaAyazBaBlaBmaBnaBobhDaULaBqaafbfBbfdbfdbfdbfdbfdbfgaafaaaaaaaaaaaaaaaaaaaaaaaaaafaAAaBuaBvaBwaAAaafaaaaaaaBqaBqaBqaBqaBqbhqbhCaBqaBqaBqaBqaBqaBqaBqbgHaBFaBFaBFaBGaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaBHaBIaBJaBIaBIaDRaDSaBIaBIaBJaBMaBNasSbewbeAaQlbebbeuaBSaBTaBUaxeaAKaZeaPOatKazbazbaBXaBYaARaBZaCaaCbaCcaCdaCeaCfaCgaXEaCiaARaafaAkaQmaCkaClaCmaCnaAkaafaygaykaylbfCaAlbfFaAlaCraylaQnaCsaxrayoaypaCtaCuaAraCvaAsaArazsaDNaBfaBfaxrayzapEayAalNaQvaIAaIDaQxaIvaHraCAaEoaHraEpaAxaAxaAxazCaCDaCEaCFazBaCGaCHaCIaCJaYFaULaBqaaaaafaaaaafaaaaafaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaAAaZbaCMaCNaAAaBqaCOaCPaBqaQSaQDaQDaQDaQDaQDaQDaQFaRdaRdaRdaRdaRfaRdaRdaRdaRhaDaaafaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaBHaBMaBIaDbaDcaDcaDdaDeaDfaDgaDhaDcaDcaDiaDjayUayWaZuaAKbgsbiraDnaDoaDnaBVaDpbfVaDsaqYaZnaDuaDvaAcaDwaDxaDyaDzaDzaDzaDAaDzaDzaDBbjWaARaaaaAkaRAaRTaRVaCmaSaaAkaaaaygaykaylbjgbjoaDIbjobjVaylaQnaDLaxraxraxraxraDMaAraypaAsaAraCwaCxaypaCyaVHaVzaVAaVpaVwaKJaVGaShaShaShaSEaScaFRbjYaTnbabaSPaSPaSPaUgaSPaTFaTTaTUaTVaUkaUGaVQaULaBqaBqaBqaBqaBqaBqaBqaBqaBqaCOaCPaBqaBqaBqaCOaEjaEkaBqaBqaAAaAAaElaEmaAAaEnaVqaVoaVoaVsaEsaEsaEsaEsaEsaWyaVraEuaEuaEuaEuaUNaEuaEyaEyaVnaEyaEyaEyaEyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaDiaEBaECaEDaDcaEEaDcaEEaDcaEEaDcaEEaDcaEFaEGazSayWaEHaAKblwblyaEKaELaEMaENaAKbjZbkiaAcaEQaAcaERaqYaAPaESaDBaDzaDzaDzaDzaDzaDzaETaWjaWgaVJaVIaWMaWNaWKaWLaWJaAkaafaygaWIaWpblGaWxaWqaWsblEaWpaZdaZcaxraFnaypazlaFmaBdazoazpaBdaDOaTuaypaDQaVHaWTaFsaFtaXcbdZagjagjagjagjaVEaVFaWSaVxaVybazaVxaXfaVxaXeaVxaXgaXhaFGaFHaFIaBoaXjaXmaXXaXVaXVaXCaYcaXYaXYaXYaXYaXYbaCaXYaXYaYwaYeaXnaRdaRdaYGaYxblNaWPaWQaWQaWQaWRaEsaEsaGeaEsaGfaGgaGhaEsaEuaWUaEuaGjaXlaXkaGmaGnaGoaIbasHaGraGsaGtaGuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJGaJGaJGaJGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGvaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXoaDcaDcaBJaDcaEEaDcaEEaGxaEEaDcaEEaDcaEFaEGazSayWaGyaAKaAKblVaYKaYPaYKaQlaQlaYJaYNaYOaYLaYMaYLaYLbakbajaGKaGLaGLaGLaGMaGLaGLaGNaGOaARaaaaZXaAkayJbmqayJaAkaAkaaaaygavOaylbmjaZIaZiaZqaZDaZEaZhbglaxraHbaypaFoaCuaAraypaAsaAraCwaZgaypaHdawGaYhaHfaHgaUnaYfalNalNalNalNalNaHjaYbazBaHlaAxazBaHmazBaHnazBaHobcvbcwbcNbczbdNbcXaYUbdlbdmbbvbdAbbwbbvbbvbbxbbzbbybbAbbybbybbybbibcubcbbawbawbawbmxbaSbawbaxbawbaWaYIaHOaHPaHQaHRaHSaHTaEsaHUbaXaEuaHWaHXaYiaHZaGnaIaaIbasHaIcaEyaEyaEyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJGaJGaJGaJGaJGaJGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaDiaIdaECaEDaDcaEEaDcaEEaDcaEEaDcaEEaDcaEFaEGazSaIeawzawyawxawuawuawuawzawCawDawzawAaImaInawBauKauKaAPaGOaIpaCaaIqaBOaGOaIraIsaItaIuaARaaaawaaaaavMavNavMaaaaafaaaaygavOaylaAZaAXavZaBeaBcaylaAtaAJaxrachaypazlaIFaIGazoaIHayyazraIKaILaIMawGaBsaIOaIPaAqaBKaISaaaaaaaUnaIUaIVaBLazBaIXaAxaAxaAxaCEaAxaAxaAxauOaBoaKyaBoaBoavJaBoaJcaBoaJdavHavGaJgaJhaJiaJjaJkavFaJjaJjaJjaJjaJjavDaJjaJjaJjaJjaJjaJjaJjaJjasIayRayvaAzaAiaBraBpazHbMsazIavpavlavmavnazFayNayPazDazEasHaIbaJDaJEaJFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJGaJGaJGaJGaJGaJGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJHaJIaBIaDbaDcaDcaDcaJJaDcaDcaJKaDcaDcaDiaJLaJMayWaxTaJNaJOaJOaJOaJOaJOaJOaJOaJPasDatKatKavkatKatKaAPaJSaJTaJUaJVaJVaJVaJVaJWaJXaJYaARaJZavaaKbaKcavbaKeaKbaKbaKfaygavcaylaylazJaAbaAaayLawGaUnazGaxraxraxraxraKlaKmaCxaCxaKnayHawGawGaxraxraIOaIOaIOaIOaKpaKqaKraKsaUnaKtaIVaKuazBazBazBazBazBazBazBazBazBauOaKwaKvaKxaIZauMavIaKBaKCaJdauyauWauXaKGaKHaJjayOayQayZayCaIyaPbayKaxDaxJayaayBaxBaJbaxfaDqaJjauwauvaKYaJraxdaxaaJuaysaEsaLbauuaLdavfauoaveaunaEuaEyaLhasHaIbaLiaLjaLkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJGaJGaJGaJGaJGaJGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJHaBIaBJaBIaBIaDRaDSaBIaBIaBJaJIaLmasSaLnaxTawXaLoaLoaLpaLoaLqatHaLraLsasDaLtaLuaACaLwazwaLyaLzaLAaLzaLzaLzaLzaLzaLzaLzaLBaLCazNaAdaLFaLFayTaLHaLFaLFaLFaLIazKaLJaLKaLzaxtaNmaLOaLPaIOaIBaMkaLSaLWaLUaLTaLTaLTaLTaLTaLTaOraLVaOAaLXaLYaLZaMaaMbaMcaIOaIOaIOaOBaMeaMfaMeaMgaMhaLSaMjaIzaMkaGQaBoaMlaxMaOOaMoaMnaMpaxKaMraMsaMtaJdaxLaMvaMwaMwaMxaJjaGwaFTaEJaEJaEJaEJaEJaFqaFNaEOaEUaHLaEJaEJaHMaJjasIarZaHPaHPaCXaDFaHPaHPaEsaMOaMPaEuaytaMRaHZavTaEuaMSaymayeaIbaEyaEyaEyaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaJGaJGaJGaJGaJGaJGaJGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawXayVaMVaAFaAFaAFaAFaMWayVawXaAHasSaAIaMXaMYaDKavSaNbaNbaNcatHaNdaLsaxAaNfaLuaxzaNhaNiaNjaNkaNlaLzaLzaLzaLzaLzaLzaLzaxhaxiaxuaLzaLzaLzaxpayuaLzaLzaLzaLzaxvaLzaLzaLzaxtaNmaLuaLPaIOaIOaIOaIOaIOaIOaIOaIOaIOaIOaIOaIOaNsaNtaNuaNvaNwaNxaNyaNzaNAaIOaIOaIOaLPaIOaIOaIOaIOaIOaIOaIOaIOaNBbNwaCjaCWaCQaMpaNEaMpaMpawEaNGaMsaCoaJdawFawJawSaNLaNMaJjaDraDHaCpaCpaCpaCpaCpaCqaCTaDlaDmaCpaCpaDJaNRaJjasIarZaNVaHPaHPaNWaHPaNXaEsaEuaEuaEuaEuaEuaEuavQaEuaIbaIbasHaIbaNZaOaaEyaaaaafaaaaaaaaaaaaaaaaaaaaaaJGaJGaJGaJGaJGaJGaJGaJGaJGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -10921,7 +10921,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaafaafaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafbSFbSGcnjcngcnhcnQbSFdgmdgldgkdgjcrEcrCcrrcrrcrucnEcnEcnDcnFbAkbYpbjqbjxcnCbwMcnzctfcnBcnwcnxcnybfNbtVcnpcnqdTTbfNbkjbqZdZLdZOdZOdZMdZNbqZdYtdgpdZQbiDdZTdZRdZSdZHbiDdZGbtBcrVbwUbxPbtKbxQbiKdZKdZJbiKcrXbPwbiddgCbssdZVdZWbidbfMdWwdXGbGKaaaaafaaaaaabwwctuctjdgrdgqdgtdgsdgvdgudgxdgwdgzdgydgodgAdfQdfQdgBdgodgodgodgndfTbYUcoebYWbYUaaaaaaaaaaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafcrLbEQbEQbFgbtybtybjBbjBbjBbjBbEOaafaafaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaafaafaafbTebTebTebTebTebTebTebTebTebTebTebTebTeaaaaaacmobSGbSGbSGbSGcmAbSFdfNdfMdfLdfKcqdcpVcqccpVcpUcpTcpScpQcpOcpLcqjcqwcmCdfPbgXbgXbgXbgXbgXbgXbgXbfNbfNcmBbfNbfNbfNbkjbqZbqZdZrdZsdZtdZubqZdfUcqDcqTbiDbkdbiDbiDbiDbiDbwUdZydZzbwUcqXcqWcqXbiKbXLdZBbiKbPybPybiddZDbssbidbidbidbfMcpWcmNbGKaaaaafaaaaaedfXdfVdfWdgbdgadfZdfYdggdgfdgedgcdfQdfQdfQdfQdgidghdfQdfQdfQdfRdfSdfTcqQcmGbZVbYUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaaaaaaaaaaaaaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaaabTecnScqacnSbTecnOcpYcnObTecnMcpZcnMbTeaaaaaacphbSGcpXbSGbSGcpRbSFcFVcFUcQKcFXcRqcRpcFMcFKcFRbqVbqVcFTbqVbqKcFIcFJbjxcpCcpDcpucpucpEdgZdhadgGdhbdhcdhddhedhfdgGbkjbEaeaxbMXbMXeaveaweaDeaEdLbdPueazeaAeayeaeeaeeaudXBbwUbwUbwUdhtcZLdhubiKbiKbiKbiKbPybPybiddZDbsseareasbidbfMbGKbGKbGKaaaaafaaaaaadhqdhrdhsdhldhkdhmcWQdQSdhgdhidhhdfQdfQdfQdfQdhodhndfQdhpdfQdfRdghdfTcaycqbcaAbYUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaaabTecnScnRcnSbTecnOcnPcnObTecnMcnNcnMbTeaaaaaacphbSGbSGbSGcpicoIcoHcsOcsNcvgcuVcsWcsPcsMcsEcsmcoycoEcoDdgFbAkbYpcpdcpbcpccpgcpfcpecpfdgIcoWdgGdgHdgKdgLdgJdgHdgGbkjbEaeabbMXbOsbMXeaaeageahcCNeajeaceadeaeeafeaeeandXBciZboNcDacEycExdgYcFGboNboNboNboNcEzbidbidbidbidbidbidbfMbGKaafaafaafcbfaafaafdgRdgPdgQdgQdgQccQbudcCKcyldgTdgSdgMdgMdgMdgXdgWdgWdgVdgMdgMdgNdgOdfTcbjcpjcblbYUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaaabTecnScnRcnSbTecnOcnPcnObTecnMcnNcnMbTeaaaaaacphbSGbSGbSGcpicoIcoHcsOcsNcvgcuVcsWbpIcsMcsEcsmcoycoEcoDdgFbAkbYpcpdcpbcpccpgcpfcpecpfdgIcoWdgGdgHdgKdgLdgJdgHdgGbkjbEaeabbMXbOsbMXeaaeageahcCNeajeaceadeaeeafeaeeandXBciZboNcDacEycExdgYcFGboNboNboNboNcEzbidbidbidbidbidbidbfMbGKaafaafaafcbfaafaafdgRdgPdgQdgQdgQccQbudcCKcyldgTdgSdgMdgMdgMdgXdgWdgWdgVdgMdgMdgNdgOdfTcbjcpjcblbYUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaaabTecrgcnicrebTecrccnfcrbbTecracnccqZbTeaaaaafcphcrdbSGbSGcqqbWbbSFdPYdPVcvgcvgdPTcvgcvgcvgcvgcrzbYpcrxcrybAkbYpdRPcrlbyOcrhcricrkcridhIcrqdhKdhLdhGdhHdgGdgGdgGbkjbEadhOebrdBIebpebqebiebjdQhebhebmebnebkdBNebcdhNebadQabJNebfdQedQddhMbCTbyDbXPbXQbGKbvKboNboNboNboNboNboNciNbGKaaaaaaaaaaafaaaaaabwwdhWdhUdBXdhTbuddQidQSdQRdfTdhVbyYbyYbyYdhPcvudhQdhSbyYbyYbyYdhYdfTdhXcrNcccccdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaafaafbTecqocdMcqpbTecdWcdMcdXbTecdLcdMcdNbTeaaaaafcqrbSGbSGbSIcqqcqybSFdPAdPvcqvcqucqtcqscqAcqAdhvcqBcqAcmpcqzbAkbAkbjqcqIcqJcpDcqCcqCcqHdhBdhCdgGdhAdhydhzdhwdhxdgGbkjbEadhDeaMdCpeaOeaPbEaeaFdPDeaHdXBeaIeaJdCqeaSdhEdXBbfMbPydXFeaUeaTeaQdXFaaaaaaaaabGKbGKbGKbXObXPbXPbXQbGKbGKbGKaaaaaaaaabudbudbudbudbudbudbudbudbuddPHdPSdPPdfTdfTbZPbOwcdqdfTdfTdfTdfTcoTbOwcdqdfTdfTccSdhFccSaafaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaachdaafaafaafaaaaafcsLaafcsLaafcdmaafcdlaafcdmaafcdlaafaafaaabSFcsKbUXcsIdbicszbQGcsBcsAbQGcsCcsDcmJcmJdTDcmJchBcsGcsFchBcsHcstcsucsvcswcaOcaOcaOcaOcsxcsycaOcjXcjXcjXcjXcjXcjXbkjbEaebRdibdCyebNebObEaeaFdTLebMdXBebKebIdCzdiaebGdXBbfMbPydXFebFebEdhZdXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaabudcnbcmXcmYdTJdTKcdydTHcfcdTIdTFdTEdTGcrHaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaafcebceccebaafaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -11967,9 +11967,9 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndH aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHVdHVdHVdHVdHVdHVdHVdHVdHndHndHndHndHndHndHndHVdHVdHVdHVdHVdHVdHndHndHndHndHndHndHndHndHndCidCidCidCidCidCidCidCidJjdJkdJldCidCidCidBvdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadqTdqTdqTdBvdBvdBvdBvdBvdBvdBvdqTdqTdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadIPdJmdIPdIPdIPdIPdIPdIPdMvdJndCidCidCidCidCidCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaadqTdqTdqTdqTdqTdDQdysdMCdytdytdyudCidIedHIdHJdCidCidCidCidCidCidCidGpdGpdBvdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadsadsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHVdHVdHVdHVdHVdHVdHndHndHndHndHndHndHndHVdHVdHVdHVdHVdHVdHndHndHndHndCidCidJodJodJodJodJodJodJpdJqdJrdJodJodJodJodJodCidCidCidBvdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadqTdqTdqTdqTdBvdBvdCidCidCidCidCidBvdBvdBvdBvdBvdqTdqTdqTdqTdqTdqTdqTdsadsadsadsadIPdIPdIPdIPdJsdJtdJudIPdITdJvdIPdRxdIPdIPdIPdJwdJxdJydIPdCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaadqTdqTdqTdBvdDQdyndFpdyodyodOsdCidHEdHOdHGdCidCidCidCidCidCidCidCidCidBvdBvdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadqTdsadsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHVdHVdHVdHVdHVdHVdHndHndHndHndHndHndHndHVdHVdHVdHVdHVdHndHndBvdCidCidCidJodJzdwgdJBdJCdJDdMfdMcdMtdMpdMudJJdJKdJLdHJdCidCidBvdBvdBvdBvdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadqTdqTdqTdBvdBvdCidCidCidCidCidCidCidCidCidCidBvdBvdBvdBvdBvdqTdqTdqTdqTdsadsadsadIPdJMdJNdJOdJPdJNdJNdIPdIXdIYdJQdMvdIPdJRdJSdJTdJTdJTdJedCidCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaadBvdBvdBvdDQdwydNbdwkdwkdHGdCidCidJUdJVdJWdJXdJVdJVdCidCidCidCidCidCidBvdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHndHVdHVdHVdHndHndHndHndHndHndHndHndHVdHVdHVdHndHndqTdBvdCidCidCidJodJYdJAdJZdKadJAdMydJAdJAdMwdKddKedJKdKfdKgdCidCidCidCidCidBvdBvdBvdqTdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadqTdqTdBvdBvdDQdCidCidCidCidCidCidCidCidCidCidCidCidCidCidCidBvdBvdqTdqTdqTdqTdqTdqTdIPdTwdJNdKidTxdKkdKldIPdIPdIPdIPdMvdIPdJRdKmdKmdKndKmdJidCidCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaadCidCidCidCidCidCidCidCidCidCidCidJUdKodKodKodKpdJVdCidKqdCidCidCidEudDQdBvdqTdqTdsadsadsadsadsadsadsadsadsadsadqTdqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHndHVdHVdHVdHndHndHndHndHndHndHndHndHVdHVdHVdHndHndqTdBvdCidCidCidJodJYdJAdJZdKadJAdMydJAdJAdMwdKddKedJKdKfdKgdCidCidCidCidCidBvdBvdBvdqTdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadqTdqTdBvdBvdDQdCidCidCidCidCidCidCidCidCidCidCidCidCidCidCidBvdBvdqTdqTdqTdqTdqTdqTdIPdTwdJNdKidTxdKkdKldIPdIPdIPdIPdMvdIPdJRdKmdKmdKndKmdJidCidCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaadCidCidCidCidCidCidCidCidCidCidCidJUdKodKodKocsPdJVdCidKqdCidCidCidEudDQdBvdqTdqTdsadsadsadsadsadsadsadsadsadsadqTdqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHVdHVdHVdHndHndHndHndHndHndHndHndHndHndHndHndHndqTdBvdCidCidCidJodKrdJAdJAdKsdJAdMydJAdJAdMEdMFdwzdKvdJLdHGdCidCidCidCidCidCidCidBvdBvdBvdBvdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadqTdqTdBvdBvdCidJfdCidCidCidCidCidCidCidCidCidCidCidCidCidCidCidCidBvdBvdBvdBvdqTdqTdqTdIPdKwdJNdKxdJNdKydJNdKzdKndKAdKBdMHdIPdJRdKmdKDdMIdwIdJndCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadCidCidCidCidCidKFdKFdKGdKHdJUdMJdMLdMKdKLdJVdJVdJVdJVdCidCidCidCidBvdBvdqTdqTdsadsadsadsadsadsadsadsadsadqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHndHndHndHndHndHndHndHndHndHndHndHndHndsadsadBvdBvdCidCidJodKMdJAdKNdMMdMpdMNdKRdJAdJodJodJodJodJodJodIedHJdCidCidCidCidCidCidCidCidBvdBvdBvdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadqTdqTdqTdBvdCidCidCidCidCidCidCidCidCidCidCidIedHJdCidCidCidCidCidCidCidCidCidBvdBvdqTdqTdIPdIPdIPdIPdIPdIPdIPdKSdMOdKUdKSdMOdIPdIPdIPdIPdwJdIPdIPdIPdKWdKXdCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadCidCidKYdKHdKZdLadMSdMRdMQdLedMVdMUdMTdLidLjdLkdHJdCidCidCidDPdBvdqTdqTdsadsadsadsadsadsadsadqTdqTdqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHndHndHndHndHndHndHndHndHndHndHndHndHndsadsadBvdBvdCidCidJodKMdJAdKNdMMdMpdMNdKRdJAdJodJodJodJodJodJodIedHJdCidCidCidCidCidCidCidCidBvdBvdBvdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadqTdqTdqTdBvdCidCidCidCidCidCidCidCidCidCidCidIedHJdCidCidCidCidCidCidCidCidCidBvdBvdqTdqTdIPdIPdIPdIPdIPdIPdIPdKSdMOdKUdKSdMOdIPdIPdIPdIPdwJdIPdIPdIPdKWdKXdCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadCidCidKYdKHdBEdEbdDZdMRdDWdLedMVdMUdMTdLidLjdLkdHJdCidCidCidDPdBvdqTdqTdsadsadsadsadsadsadsadqTdqTdqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHndHndHndHndHndHndHndHndHndsadsadqTdBvdCidCidJodLldJAdLmdKadOFdLodLpdJAdLqdLrdLsdLtdLudLvdIkdIldIcdIcdIcdIcdIcdIbdCidCidCidCidBvdBvdBvdqTdqTdqTdqTdqTdsadsadsadqTdqTdqTdqTdBvdBvdCidCidIhdIcdIcdIcdIcdIcdIcdIcdIcdIkdIldIcdIcdIcdIcdIbdCidCidCidCidCidBvdqTdqTdqTdqTdqTdIPdLwdLxdLydKmdMIdLzdKndMIdKzdRudwNdLCdMIdwKdKmdKmdLDdLEdJxdJydLFdLGdLGdLGdLGdLGdLGdLGdLHdLHdLHdLHdLHdLHdLHdKGdLIdLJdLKdLadLLdMYdLNdLOdLedMXdLPdLQdLRdLSdLTdLUdCidCidCidDPdBvdqTdqTdsadsadsadsadsadsadqTdqTdqTdsadsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHndHndsadsadqTdBvdCidCidJodJodJodJodJodNldLWdLXdJodJodLYdJodJodJodJodHEdHGdCidCidCidCidCidHSdCidCidCidCidBvdCidBvdBvdqTdqTdqTdqTdqTdqTdqTdqTdqTdqTdBvdBvdCidCidCidHSdCidCidCidCidCidCidCidCidHEdHGdCidCidCidCidHSdCidCidCidCidCidBvdBvdDQdBvdBvdqTdIPdIPdIPdIPdLZdMIdMadOkdNWdKBdMddMedMedNKdNKdMgdMedMhdMidMedMidMjdMjdMjdMjdMjdMjdMjdMjdMkdMkdMkdMkdMkdMkdMkdMldMmdMldMndMmdModNGdMqdUtdMsdNCdNrdNndwOdMxdLkdHGdCidCidCidCidBvdBvdqTdqTdsadsadsadsadsadqTdqTdqTdsadsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndsadsadqTdBvdBvdCidCidCidCidCidJodOndMzdMAdwPdJodMCdMDdFrdCidCidCidCidCidHUdCidCidCidIadIcdIcdIbdCidCidCidCidBvdqTdqTdqTdqTdqTdqTdqTdqTdqTdqTdBvdCidCidIhdIcdIidCidCidCidCidBvdCidCidHUdCidCidCidCidCidCidHSdCidCidCidCidCidCidCidJfdCidBvdBvdBvdBvdBvdIPdKmdPLdPEdPJdPJdPEdPCdPzdPydPJdPIdPGdPzdOSdPadOQdORdOodOodOodOodOodOodOodOodOLdOLdOLdOLdOLdOLdPRdPOdPXdPWdQldQbdPNdPMdMZdKFdKFdKFdKFdKFdKFdKFdKFdNadNbdNcdNbdFrdDPdBvdqTdqTdsadsadsadsadqTdqTdqTdqTdsadsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa From 5ace6d3bc03901f0c4255099c12544f0c0461671 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 9 Jul 2014 19:12:32 +0930 Subject: [PATCH 09/88] Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs. --- baystation12.dme | 1 + code/controllers/master_controller.dm | 8 ++- code/controllers/verbs.dm | 21 ++++++ code/modules/admin/admin_verbs.dm | 18 ++--- code/modules/mining/drilling/distribution.dm | 73 +++++++++++--------- code/modules/mining/drilling/drill.dm | 6 +- code/modules/mining/drilling/scanner.dm | 54 +++++++++++++++ maps/tgstation2.dmm | 4 +- 8 files changed, 137 insertions(+), 48 deletions(-) create mode 100644 code/modules/mining/drilling/scanner.dm diff --git a/baystation12.dme b/baystation12.dme index df06cf606b..de02865c78 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -884,6 +884,7 @@ #include "code\modules\mining\satchel_ore_boxdm.dm" #include "code\modules\mining\drilling\distribution.dm" #include "code\modules\mining\drilling\drill.dm" +#include "code\modules\mining\drilling\scanner.dm" #include "code\modules\mob\abilities.dm" #include "code\modules\mob\death.dm" #include "code\modules\mob\emote.dm" diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index cb52b2252f..171bef7c69 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -33,7 +33,9 @@ datum/controller/game_controller var/mob/list/expensive_mobs = list() var/rebuild_active_areas = 0 - var/list/shuttle_list //for debugging and VV + var/list/shuttle_list // For debugging and VV + var/datum/ore_distribution/asteroid_ore_map // For debugging and VV. + datum/controller/game_controller/New() //There can be only one master_controller. Out with the old and in with the new. @@ -80,8 +82,8 @@ datum/controller/game_controller/proc/setup() make_mining_asteroid_secret() //Create the mining ore distribution map. - var/datum/ore_distribution/O = new() - O.populate_distribution_map() + asteroid_ore_map = new /datum/ore_distribution() + asteroid_ore_map.populate_distribution_map() //Set up spawn points. populate_spawn_points() diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm index e8785482a9..a331dab556 100644 --- a/code/controllers/verbs.dm +++ b/code/controllers/verbs.dm @@ -1,6 +1,27 @@ //TODO: rewrite and standardise all controller datums to the datum/controller type //TODO: allow all controllers to be deleted for clean restarts (see WIP master controller stuff) - MC done - lighting done +/client/proc/show_distribution_map() + set category = "Debug" + set name = "Show Distribution Map" + set desc = "Print the asteroid ore distribution map to the world." + + if(!holder) return + + if(master_controller && master_controller.asteroid_ore_map) + master_controller.asteroid_ore_map.print_distribution_map() + +/client/proc/remake_distribution_map() + set category = "Debug" + set name = "Remake Distribution Map" + set desc = "Rebuild the asteroid ore distribution map." + + if(!holder) return + + if(master_controller && master_controller.asteroid_ore_map) + master_controller.asteroid_ore_map = new /datum/ore_distribution() + master_controller.asteroid_ore_map.populate_distribution_map() + /client/proc/restart_controller(controller in list("Master","Failsafe","Lighting","Supply")) set category = "Debug" set name = "Restart Controller" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 21a3047ce3..bf6c555997 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -144,8 +144,10 @@ var/list/admin_verbs_debug = list( /client/proc/cmd_debug_tog_aliens, /client/proc/air_report, /client/proc/reload_admins, - /client/proc/reload_mentors, + /client/proc/reload_mentors, /client/proc/restart_controller, + /client/proc/remake_distribution_map, + /client/proc/show_distribution_map, /client/proc/enable_debug_verbs, /client/proc/callproc, /client/proc/toggledebuglogs, @@ -585,22 +587,22 @@ var/list/admin_verbs_mentor = list( feedback_add_details("admin_verb","GD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] gave [key_name(T)] the disease [D].") message_admins("\blue [key_name_admin(usr)] gave [key_name(T)] the disease [D].", 1) - + /client/proc/give_disease2(mob/T as mob in mob_list) // -- Giacom set category = "Fun" set name = "Give Disease" set desc = "Gives a Disease to a mob." - + var/datum/disease2/disease/D = new /datum/disease2/disease() - + var/greater = ((input("Is this a lesser or greater disease?", "Give Disease") in list("Lesser", "Greater")) == "Greater") - + D.makerandom(greater) if (!greater) D.infectionchance = 1 - + D.infectionchance = input("How virulent is this disease? (1-100)", "Give Disease", D.infectionchance) as num - + if(istype(T,/mob/living/carbon/human)) var/mob/living/carbon/human/H = T if (H.species) @@ -609,7 +611,7 @@ var/list/admin_verbs_mentor = list( var/mob/living/carbon/monkey/M = T D.affected_species = list(M.greaterform) infect_virus2(T,D,1) - + feedback_add_details("admin_verb","GD2") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] gave [key_name(T)] a [(greater)? "greater":"lesser"] disease2 with infection chance [D.infectionchance].") message_admins("\blue [key_name_admin(usr)] gave [key_name(T)] a [(greater)? "greater":"lesser"] disease2 with infection chance [D.infectionchance].", 1) diff --git a/code/modules/mining/drilling/distribution.dm b/code/modules/mining/drilling/distribution.dm index 2ca9a3f685..72a288a8c3 100644 --- a/code/modules/mining/drilling/distribution.dm +++ b/code/modules/mining/drilling/distribution.dm @@ -18,9 +18,9 @@ #define MAX_DEEP_COUNT 300 #define ITERATE_BEFORE_FAIL 200 -#define RESOURCE_HIGH_MAX 3 -#define RESOURCE_HIGH_MIN 0 -#define RESOURCE_MID_MAX 2 +#define RESOURCE_HIGH_MAX 4 +#define RESOURCE_HIGH_MIN 2 +#define RESOURCE_MID_MAX 3 #define RESOURCE_MID_MIN 1 #define RESOURCE_LOW_MAX 1 #define RESOURCE_LOW_MIN 0 @@ -106,6 +106,14 @@ Deep minerals: for(var/y = 1, y <= real_size, y++) map[MAP_CELL] = 0 +/datum/ore_distribution/proc/print_distribution_map() + var/line = "" + for(var/x = 1, x <= real_size, x++) + for(var/y = 1, y <= real_size, y++) + line += num2text(round(map[MAP_CELL]/25.5)) + world << line + line = "" + /datum/ore_distribution/proc/generate_distribution_map(var/x,var/y,var/input_size) var/size = input_size @@ -160,36 +168,37 @@ Deep minerals: if(target_turf && target_turf.has_resources) target_turf.resources = list() - target_turf.resources["silicates"] = rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX) - target_turf.resources["carbonaceous rock"] = rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX) + target_turf.resources["silicates"] = rand(3,5) + target_turf.resources["carbonaceous rock"] = rand(3,5) - if(map[MAP_CELL] > (range*0.60)) - target_turf.resources["iron"] = 0 - target_turf.resources["gold"] = 0 - target_turf.resources["silver"] = 0 - target_turf.resources["uranium"] = rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX) - target_turf.resources["diamond"] = rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX) - target_turf.resources["phoron"] = rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX) - target_turf.resources["osmium"] = rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX) - target_turf.resources["hydrogen"] = rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX) - else if(map[MAP_CELL] > (range*0.40)) - target_turf.resources["iron"] = rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX) - target_turf.resources["gold"] = rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX) - target_turf.resources["silver"] = rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX) - target_turf.resources["uranium"] = rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX) - target_turf.resources["diamond"] = rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX) - target_turf.resources["phoron"] = rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX) - target_turf.resources["osmium"] = rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX) - target_turf.resources["hydrogen"] = rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX) - else - target_turf.resources["iron"] = rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX) - target_turf.resources["gold"] = rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX) - target_turf.resources["silver"] = rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX) - target_turf.resources["uranium"] = rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX) - target_turf.resources["diamond"] = rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX) - target_turf.resources["phoron"] = 0 - target_turf.resources["osmium"] = 0 - target_turf.resources["hydrogen"] = 0 + switch(map[MAP_CELL]) + if(0 to 100) + target_turf.resources["iron"] = rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX) + target_turf.resources["gold"] = rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX) + target_turf.resources["silver"] = rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX) + target_turf.resources["uranium"] = rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX) + target_turf.resources["diamond"] = 0 + target_turf.resources["phoron"] = 0 + target_turf.resources["osmium"] = 0 + target_turf.resources["hydrogen"] = 0 + if(100 to 124) + target_turf.resources["iron"] = 0 + target_turf.resources["gold"] = rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX) + target_turf.resources["silver"] = rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX) + target_turf.resources["uranium"] = rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX) + target_turf.resources["diamond"] = 0 + target_turf.resources["phoron"] = rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX) + target_turf.resources["osmium"] = rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX) + target_turf.resources["hydrogen"] = 0 + if(125 to 255) + target_turf.resources["iron"] = 0 + target_turf.resources["gold"] = 0 + target_turf.resources["silver"] = 0 + target_turf.resources["uranium"] = rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX) + target_turf.resources["diamond"] = rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX) + target_turf.resources["phoron"] = rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX) + target_turf.resources["osmium"] = rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX) + target_turf.resources["hydrogen"] = rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX) tx += chunk_size tx = origin_x diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index cbfdd53f9a..f02434beb4 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -265,13 +265,13 @@ update_icon() /obj/machinery/mining/drill/proc/get_harvest_capacity() - return 3 * (cutter ? cutter.rating : 0) + return (cutter ? cutter.rating : 0) /obj/machinery/mining/drill/proc/get_storage_capacity() - return 100 * (storage ? storage.rating : 0) + return 200 * (storage ? storage.rating : 0) /obj/machinery/mining/drill/proc/get_charge_use() - return 100 - (20 * (cellmount ? cellmount.rating : 0)) + return 50 - (10 * (cellmount ? cellmount.rating : 0)) /obj/machinery/mining/drill/proc/get_resource_field() diff --git a/code/modules/mining/drilling/scanner.dm b/code/modules/mining/drilling/scanner.dm new file mode 100644 index 0000000000..5b19064160 --- /dev/null +++ b/code/modules/mining/drilling/scanner.dm @@ -0,0 +1,54 @@ +/obj/item/weapon/mining_scanner + name = "ore detector" + desc = "A complex device used to locate ore deep underground." + icon = 'icons/obj/device.dmi' + icon_state = "forensic0-old" //GET A BETTER SPRITE. + item_state = "electronic" + matter = list("metal" = 150) + + origin_tech = "magnets=1;engineering=1" + +/obj/item/weapon/mining_scanner/attack_self(mob/user as mob) + + user << "You begin sweeping \the [src] about, scanning for metal deposits." + + if(!do_after(user,50)) return + + if(!user || !src) return + + var/list/metals = list( + "surface minerals" = 0, + "precious metals" = 0, + "nuclear fuel" = 0, + "exotic matter" = 0 + ) + + for(var/turf/T in oview(3,get_turf(user))) + + if(!T.has_resources) + continue + + for(var/metal in T.resources) + + var/ore_type + + switch(metal) + if("silicates" || "carbonaceous rock" || "iron") ore_type = "surface minerals" + if("gold" || "silver" || "diamond") ore_type = "precious metals" + if("uranium") ore_type = "nuclear fuel" + if("phoron" || "osmium" || "hydrogen") ore_type = "exotic matter" + + if(ore_type) metals[ore_type] += T.resources[metal] + + user << "\icon[src] \blue The scanner beeps and displays a readout." + + for(var/ore_type in metals) + + var/result = "no sign" + + switch(metals[ore_type]) + if(1 to 50) result = "trace amounts" + if(51 to 150) result = "significant amounts" + if(151 to INFINITY) result = "huge quantities" + + user << "- [result] of [ore_type]." \ No newline at end of file diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index fcbe24ca1b..19ef7f5bc8 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -9544,6 +9544,7 @@ "dBB" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/wall/r_wall,/area/research_outpost/iso3) "dBC" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{name = "Isolation room two"; req_access_txt = "65"},/turf/simulated/floor,/area/research_outpost/iso2) "dBD" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/research_outpost/entry) +"dBE" = (/obj/structure/rack,/obj/item/clothing/suit/space/rig/mining,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/mining,/obj/item/weapon/mining_scanner,/turf/simulated/floor,/area/mine/eva) "dBF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor,/area/research_outpost/entry) "dBG" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{dir = 5; icon_state = "whitehall"},/area/research_outpost/hallway) "dBH" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor{dir = 5; icon_state = "whitehall"},/area/research_outpost/hallway) @@ -9965,7 +9966,6 @@ "dKl" = (/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "bar"},/area/mine/living_quarters) "dKm" = (/turf/simulated/floor,/area/mine/living_quarters) "dKn" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor,/area/mine/living_quarters) -"dKo" = (/obj/structure/rack,/obj/item/clothing/suit/space/rig/mining,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/mining,/turf/simulated/floor,/area/mine/eva) "dKp" = (/obj/structure/rack,/obj/item/weapon/storage/backpack/satchel,/obj/item/weapon/pickaxe,/obj/item/weapon/storage/belt/utility,/turf/simulated/floor,/area/mine/eva) "dKq" = (/obj/machinery/light,/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored) "dKr" = (/obj/structure/table,/obj/item/weapon/storage/backpack/satchel,/obj/item/clothing/glasses/meson,/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/mine/west_outpost) @@ -11967,7 +11967,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndH aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHVdHVdHVdHVdHVdHVdHVdHVdHndHndHndHndHndHndHndHVdHVdHVdHVdHVdHVdHndHndHndHndHndHndHndHndHndCidCidCidCidCidCidCidCidJjdJkdJldCidCidCidBvdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadqTdqTdqTdBvdBvdBvdBvdBvdBvdBvdqTdqTdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadIPdJmdIPdIPdIPdIPdIPdIPdMvdJndCidCidCidCidCidCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaadqTdqTdqTdqTdqTdDQdysdMCdytdytdyudCidIedHIdHJdCidCidCidCidCidCidCidGpdGpdBvdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadsadsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHVdHVdHVdHVdHVdHVdHndHndHndHndHndHndHndHVdHVdHVdHVdHVdHVdHndHndHndHndCidCidJodJodJodJodJodJodJpdJqdJrdJodJodJodJodJodCidCidCidBvdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadqTdqTdqTdqTdBvdBvdCidCidCidCidCidBvdBvdBvdBvdBvdqTdqTdqTdqTdqTdqTdqTdsadsadsadsadIPdIPdIPdIPdJsdJtdJudIPdITdJvdIPdRxdIPdIPdIPdJwdJxdJydIPdCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaadqTdqTdqTdBvdDQdyndFpdyodyodOsdCidHEdHOdHGdCidCidCidCidCidCidCidCidCidBvdBvdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadqTdsadsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHVdHVdHVdHVdHVdHVdHndHndHndHndHndHndHndHVdHVdHVdHVdHVdHndHndBvdCidCidCidJodJzdwgdJBdJCdJDdMfdMcdMtdMpdMudJJdJKdJLdHJdCidCidBvdBvdBvdBvdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadqTdqTdqTdBvdBvdCidCidCidCidCidCidCidCidCidCidBvdBvdBvdBvdBvdqTdqTdqTdqTdsadsadsadIPdJMdJNdJOdJPdJNdJNdIPdIXdIYdJQdMvdIPdJRdJSdJTdJTdJTdJedCidCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaadBvdBvdBvdDQdwydNbdwkdwkdHGdCidCidJUdJVdJWdJXdJVdJVdCidCidCidCidCidCidBvdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHndHVdHVdHVdHndHndHndHndHndHndHndHndHVdHVdHVdHndHndqTdBvdCidCidCidJodJYdJAdJZdKadJAdMydJAdJAdMwdKddKedJKdKfdKgdCidCidCidCidCidBvdBvdBvdqTdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadqTdqTdBvdBvdDQdCidCidCidCidCidCidCidCidCidCidCidCidCidCidCidBvdBvdqTdqTdqTdqTdqTdqTdIPdTwdJNdKidTxdKkdKldIPdIPdIPdIPdMvdIPdJRdKmdKmdKndKmdJidCidCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaadCidCidCidCidCidCidCidCidCidCidCidJUdKodKodKodKpdJVdCidKqdCidCidCidEudDQdBvdqTdqTdsadsadsadsadsadsadsadsadsadsadqTdqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHndHVdHVdHVdHndHndHndHndHndHndHndHndHVdHVdHVdHndHndqTdBvdCidCidCidJodJYdJAdJZdKadJAdMydJAdJAdMwdKddKedJKdKfdKgdCidCidCidCidCidBvdBvdBvdqTdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadqTdqTdBvdBvdDQdCidCidCidCidCidCidCidCidCidCidCidCidCidCidCidBvdBvdqTdqTdqTdqTdqTdqTdIPdTwdJNdKidTxdKkdKldIPdIPdIPdIPdMvdIPdJRdKmdKmdKndKmdJidCidCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaadCidCidCidCidCidCidCidCidCidCidCidJUdBEdBEdBEdKpdJVdCidKqdCidCidCidEudDQdBvdqTdqTdsadsadsadsadsadsadsadsadsadsadqTdqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHVdHVdHVdHndHndHndHndHndHndHndHndHndHndHndHndHndqTdBvdCidCidCidJodKrdJAdJAdKsdJAdMydJAdJAdMEdMFdwzdKvdJLdHGdCidCidCidCidCidCidCidBvdBvdBvdBvdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadqTdqTdBvdBvdCidJfdCidCidCidCidCidCidCidCidCidCidCidCidCidCidCidCidBvdBvdBvdBvdqTdqTdqTdIPdKwdJNdKxdJNdKydJNdKzdKndKAdKBdMHdIPdJRdKmdKDdMIdwIdJndCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadCidCidCidCidCidKFdKFdKGdKHdJUdMJdMLdMKdKLdJVdJVdJVdJVdCidCidCidCidBvdBvdqTdqTdsadsadsadsadsadsadsadsadsadqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHndHndHndHndHndHndHndHndHndHndHndHndHndsadsadBvdBvdCidCidJodKMdJAdKNdMMdMpdMNdKRdJAdJodJodJodJodJodJodIedHJdCidCidCidCidCidCidCidCidBvdBvdBvdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadqTdqTdqTdBvdCidCidCidCidCidCidCidCidCidCidCidIedHJdCidCidCidCidCidCidCidCidCidBvdBvdqTdqTdIPdIPdIPdIPdIPdIPdIPdKSdMOdKUdKSdMOdIPdIPdIPdIPdwJdIPdIPdIPdKWdKXdCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadCidCidKYdKHdKZdLadMSdMRdMQdLedMVdMUdMTdLidLjdLkdHJdCidCidCidDPdBvdqTdqTdsadsadsadsadsadsadsadqTdqTdqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHndHndHndHndHndHndHndHndHndsadsadqTdBvdCidCidJodLldJAdLmdKadOFdLodLpdJAdLqdLrdLsdLtdLudLvdIkdIldIcdIcdIcdIcdIcdIbdCidCidCidCidBvdBvdBvdqTdqTdqTdqTdqTdsadsadsadqTdqTdqTdqTdBvdBvdCidCidIhdIcdIcdIcdIcdIcdIcdIcdIcdIkdIldIcdIcdIcdIcdIbdCidCidCidCidCidBvdqTdqTdqTdqTdqTdIPdLwdLxdLydKmdMIdLzdKndMIdKzdRudwNdLCdMIdwKdKmdKmdLDdLEdJxdJydLFdLGdLGdLGdLGdLGdLGdLGdLHdLHdLHdLHdLHdLHdLHdKGdLIdLJdLKdLadLLdMYdLNdLOdLedMXdLPdLQdLRdLSdLTdLUdCidCidCidDPdBvdqTdqTdsadsadsadsadsadsadqTdqTdqTdsadsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa From d5784c653c2d01086ca325c983d37be1a6a057f0 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 10 Jul 2014 20:13:59 +0930 Subject: [PATCH 10/88] Reapplied scanners to map, stopped braces working on drill turfs with no resources. --- code/modules/mining/drilling/drill.dm | 5 +++++ maps/tgstation2.dmm | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index f02434beb4..4ed2cd0867 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -346,6 +346,11 @@ /obj/machinery/mining/brace/proc/connect() var/turf/T = get_step(get_turf(src), src.dir) + + if(!T.has_resources) + src.visible_message("\red The terrain near the brace is unsuitable!") + return + for(var/thing in T.contents) if(istype(thing,/obj/machinery/mining/drill)) connected = thing diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index cc72b6ed6a..4318e1b6ff 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -9679,6 +9679,7 @@ "dEg" = (/obj/machinery/door_control{id = "rbath"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = 0; pixel_y = -25; req_access_txt = "0"; specialfunctions = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/research_outpost/hallway) "dEh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating,/area/research_outpost/maintstore2) "dEi" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/research_outpost/hallway) +"dEj" = (/obj/structure/rack,/obj/item/clothing/suit/space/rig/mining,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/mining,/obj/item/weapon/mining_scanner,/turf/simulated/floor,/area/mine/eva) "dEk" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/research_outpost/longtermstorage) "dEl" = (/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/research_outpost/longtermstorage) "dEm" = (/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/research_outpost/longtermstorage) @@ -9969,7 +9970,6 @@ "dKl" = (/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "bar"},/area/mine/living_quarters) "dKm" = (/turf/simulated/floor,/area/mine/living_quarters) "dKn" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor,/area/mine/living_quarters) -"dKo" = (/obj/structure/rack,/obj/item/clothing/suit/space/rig/mining,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/mining,/turf/simulated/floor,/area/mine/eva) "dKq" = (/obj/machinery/light,/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored) "dKr" = (/obj/structure/table,/obj/item/weapon/storage/backpack/satchel,/obj/item/clothing/glasses/meson,/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/mine/west_outpost) "dKs" = (/obj/machinery/door/airlock/glass_mining{name = "Break Room"; req_access_txt = "54"},/turf/simulated/floor,/area/mine/west_outpost) @@ -11967,7 +11967,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndH aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHVdHVdHVdHVdHVdHVdHVdHVdHndHndHndHndHndHndHndHVdHVdHVdHVdHVdHVdHndHndHndHndHndHndHndHndHndCidCidCidCidCidCidCidCidJjdJkdJldCidCidCidBvdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadqTdqTdqTdBvdBvdBvdBvdBvdBvdBvdqTdqTdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadIPdJmdIPdIPdIPdIPdIPdIPdMvdJndCidCidCidCidCidCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaadqTdqTdqTdqTdqTdDQdysdMCdytdytdyudCidIedHIdHJdCidCidCidCidCidCidCidGpdGpdBvdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadsadsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHVdHVdHVdHVdHVdHVdHndHndHndHndHndHndHndHVdHVdHVdHVdHVdHVdHndHndHndHndCidCidJodJodJodJodJodJodJpdJqdJrdJodJodJodJodJodCidCidCidBvdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadqTdqTdqTdqTdBvdBvdCidCidCidCidCidBvdBvdBvdBvdBvdqTdqTdqTdqTdqTdqTdqTdsadsadsadsadIPdIPdIPdIPdJsdJtdJudIPdITdJvdIPdRxdIPdIPdIPdJwdJxdJydIPdCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaadqTdqTdqTdBvdDQdyndFpdyodyodOsdCidHEdHOdHGdCidCidCidCidCidCidCidCidCidBvdBvdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadqTdsadsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHVdHVdHVdHVdHVdHVdHndHndHndHndHndHndHndHVdHVdHVdHVdHVdHndHndBvdCidCidCidJodJzdwgdJBdJCdJDdMfdMcdMtdMpdMudJJdJKdJLdHJdCidCidBvdBvdBvdBvdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadsadqTdqTdqTdBvdBvdCidCidCidCidCidCidCidCidCidCidBvdBvdBvdBvdBvdqTdqTdqTdqTdsadsadsadIPdJMdJNdJOdJPdJNdJNdIPdIXdIYdJQdMvdIPdJRdJSdJTdJTdJTdJedCidCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaadBvdBvdBvdDQdwydNbdwkdwkdHGdCidCidJUdJVdJWdJXdJVdJVdCidCidCidCidCidCidBvdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHndHVdHVdHVdHndHndHndHndHndHndHndHndHVdHVdHVdHndHndqTdBvdCidCidCidJodJYdJAdJZdKadJAdMydJAdJAdMwdKddKedJKdKfdKgdCidCidCidCidCidBvdBvdBvdqTdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadqTdqTdBvdBvdDQdCidCidCidCidCidCidCidCidCidCidCidCidCidCidCidBvdBvdqTdqTdqTdqTdqTdqTdIPdTwdJNdKidTxdKkdKldIPdIPdIPdIPdMvdIPdJRdKmdKmdKndKmdJidCidCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaadCidCidCidCidCidCidCidCidCidCidCidJUdKodKodKocsPdJVdCidKqdCidCidCidEudDQdBvdqTdqTdsadsadsadsadsadsadsadsadsadsadqTdqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHndHVdHVdHVdHndHndHndHndHndHndHndHndHVdHVdHVdHndHndqTdBvdCidCidCidJodJYdJAdJZdKadJAdMydJAdJAdMwdKddKedJKdKfdKgdCidCidCidCidCidBvdBvdBvdqTdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadsadsadsadqTdqTdBvdBvdDQdCidCidCidCidCidCidCidCidCidCidCidCidCidCidCidBvdBvdqTdqTdqTdqTdqTdqTdIPdTwdJNdKidTxdKkdKldIPdIPdIPdIPdMvdIPdJRdKmdKmdKndKmdJidCidCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaadCidCidCidCidCidCidCidCidCidCidCidJUdEjdEjdEjcsPdJVdCidKqdCidCidCidEudDQdBvdqTdqTdsadsadsadsadsadsadsadsadsadsadqTdqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHVdHVdHVdHndHndHndHndHndHndHndHndHndHndHndHndHndqTdBvdCidCidCidJodKrdJAdJAdKsdJAdMydJAdJAdMEdMFdwzdKvdJLdHGdCidCidCidCidCidCidCidBvdBvdBvdBvdqTdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadsadsadqTdqTdBvdBvdCidJfdCidCidCidCidCidCidCidCidCidCidCidCidCidCidCidCidBvdBvdBvdBvdqTdqTdqTdIPdKwdJNdKxdJNdKydJNdKzdKndKAdKBdMHdIPdJRdKmdKDdMIdwIdJndCidCidCidCidCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadCidCidCidCidCidKFdKFdKGdKHdJUdMJdMLdMKdKLdJVdJVdJVdJVdCidCidCidCidBvdBvdqTdqTdsadsadsadsadsadsadsadsadsadqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHndHndHndHndHndHndHndHndHndHndHndHndHndsadsadBvdBvdCidCidJodKMdJAdKNdMMdMpdMNdKRdJAdJodJodJodJodJodJodIedHJdCidCidCidCidCidCidCidCidBvdBvdBvdqTdqTdqTdqTdqTdsadsadsadsadsadsadsadqTdqTdqTdBvdCidCidCidCidCidCidCidCidCidCidCidIedHJdCidCidCidCidCidCidCidCidCidBvdBvdqTdqTdIPdIPdIPdIPdIPdIPdIPdKSdMOdKUdKSdMOdIPdIPdIPdIPdwJdIPdIPdIPdKWdKXdCidCiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadCidCidKYdKHdBEdEbdDZdMRdDWdLedMVdMUdMTdLidLjdLkdHJdCidCidCidDPdBvdqTdqTdsadsadsadsadsadsadsadqTdqTdqTdsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadHndHndHndHndHndHndHndHndHndHndHndsadsadqTdBvdCidCidJodLldJAdLmdKadOFdLodLpdJAdLqdLrdLsdLtdLudLvdIkdIldIcdIcdIcdIcdIcdIbdCidCidCidCidBvdBvdBvdqTdqTdqTdqTdqTdsadsadsadqTdqTdqTdqTdBvdBvdCidCidIhdIcdIcdIcdIcdIcdIcdIcdIcdIkdIldIcdIcdIcdIcdIbdCidCidCidCidCidBvdqTdqTdqTdqTdqTdIPdLwdLxdLydKmdMIdLzdKndMIdKzdRudwNdLCdMIdwKdKmdKmdLDdLEdJxdJydLFdLGdLGdLGdLGdLGdLGdLGdLHdLHdLHdLHdLHdLHdLHdKGdLIdLJdLKdLadLLdMYdLNdLOdLedMXdLPdLQdLRdLSdLTdLUdCidCidCidDPdBvdqTdqTdsadsadsadsadsadsadqTdqTdqTdsadsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa From 5b3f7b30c09ad1e37570154bec7792ff54e8c65e Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 10 Jul 2014 12:50:20 +0200 Subject: [PATCH 11/88] fixes #5548 missing range check for Alt click on laptops --- code/WorkInProgress/computer3/laptop.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/WorkInProgress/computer3/laptop.dm b/code/WorkInProgress/computer3/laptop.dm index 1868f82c83..cce4e7032c 100644 --- a/code/WorkInProgress/computer3/laptop.dm +++ b/code/WorkInProgress/computer3/laptop.dm @@ -58,7 +58,8 @@ del src AltClick() - open_computer() + if(Adjacent(usr)) + open_computer() /obj/machinery/computer3/laptop name = "Laptop Computer" @@ -133,5 +134,5 @@ AltClick() - close_computer() - + if(Adjacent(usr)) + close_computer() From e1a8e95081a3859f6ca942cdbd002cd0e4262941 Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 10 Jul 2014 16:24:38 +0200 Subject: [PATCH 12/88] fixes rangecheck on laptop verbs --- code/WorkInProgress/computer3/laptop.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/WorkInProgress/computer3/laptop.dm b/code/WorkInProgress/computer3/laptop.dm index cce4e7032c..377d9363ac 100644 --- a/code/WorkInProgress/computer3/laptop.dm +++ b/code/WorkInProgress/computer3/laptop.dm @@ -33,7 +33,11 @@ set name = "open laptop" set category = "Object" set src in view(1) - + + if(!Adjacent(usr)) + usr << "You can't reach it." + return + if(!istype(loc,/turf)) usr << "[src] is too bulky! You'll have to set it down." return @@ -82,7 +86,11 @@ set name = "Close Laptop" set category = "Object" set src in view(1) - + + if(!Adjacent(usr)) + usr << "You can't reach it." + return + if(istype(loc,/obj/item/device/laptop)) testing("Close closed computer") return From cd0c49ab819d817709f775be8acb81db16e866cb Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 10 Jul 2014 16:31:29 +0200 Subject: [PATCH 13/88] another laptop verb range fix --- code/WorkInProgress/computer3/computer.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/WorkInProgress/computer3/computer.dm b/code/WorkInProgress/computer3/computer.dm index 95824e555e..5b9e88bd71 100644 --- a/code/WorkInProgress/computer3/computer.dm +++ b/code/WorkInProgress/computer3/computer.dm @@ -75,6 +75,11 @@ set name = "Reset Computer" set category = "Object" set src in view(1) + + if(!Adjacent(usr)) + usr << "You can't reach it." + return + Reset() New(var/L, var/built = 0) @@ -446,4 +451,4 @@ icon_state = "wallframe" density = 0 pixel_y = -3 - show_keyboard = 0 \ No newline at end of file + show_keyboard = 0 From 323ced2803f29a75aa6cbf47d23108fd12ac5117 Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 10 Jul 2014 16:55:23 +0200 Subject: [PATCH 14/88] part 1 of fixing #5521 --- code/WorkInProgress/computer3/computer.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/WorkInProgress/computer3/computer.dm b/code/WorkInProgress/computer3/computer.dm index 5b9e88bd71..093f7b5ed7 100644 --- a/code/WorkInProgress/computer3/computer.dm +++ b/code/WorkInProgress/computer3/computer.dm @@ -76,6 +76,10 @@ set category = "Object" set src in view(1) + if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) + usr << "\red You can't do that." + return + if(!Adjacent(usr)) usr << "You can't reach it." return From 6bff77c0ba9e2acaca512558f300c462ef53e586 Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 10 Jul 2014 16:55:38 +0200 Subject: [PATCH 15/88] part 2 of fixing #5521 --- code/WorkInProgress/computer3/laptop.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/WorkInProgress/computer3/laptop.dm b/code/WorkInProgress/computer3/laptop.dm index 377d9363ac..bff5a116f3 100644 --- a/code/WorkInProgress/computer3/laptop.dm +++ b/code/WorkInProgress/computer3/laptop.dm @@ -34,6 +34,10 @@ set category = "Object" set src in view(1) + if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) + usr << "\red You can't do that." + return + if(!Adjacent(usr)) usr << "You can't reach it." return @@ -87,6 +91,10 @@ set category = "Object" set src in view(1) + if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) + usr << "\red You can't do that." + return + if(!Adjacent(usr)) usr << "You can't reach it." return From a36d0b3ff4519cf62bdb9e147c22b57388af41c4 Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 10 Jul 2014 17:04:27 +0200 Subject: [PATCH 16/88] part 3 of fixing #5521 --- code/WorkInProgress/computer3/computers/law.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/WorkInProgress/computer3/computers/law.dm b/code/WorkInProgress/computer3/computers/law.dm index 8f7a639ae2..409552cc79 100644 --- a/code/WorkInProgress/computer3/computers/law.dm +++ b/code/WorkInProgress/computer3/computers/law.dm @@ -13,7 +13,7 @@ set category = "Object" set name = "Access Computer's Internals" set src in oview(1) - if(get_dist(src, usr) > 1 || usr.restrained() || usr.lying || usr.stat || istype(usr, /mob/living/silicon)) + if(!Adjacent(usr) || usr.restrained() || usr.lying || usr.stat || istype(usr, /mob/living/silicon) || !istype(usr, /mob/living)) return opened = !opened From 0ff5d021de8730f0df95c9d59b0b5139b8c92700 Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 10 Jul 2014 18:21:00 +0200 Subject: [PATCH 17/88] fixes #5449 missing variable updating lead to APCs stuck in green status during powersinks. --- code/modules/power/apc.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 42ab0a1812..a1796aa5c3 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1288,6 +1288,7 @@ chargecount++ else chargecount = 0 + charging = 0 if(chargecount == 10) From 5289776e337081b16777bf440d78904b3cc89d28 Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 10 Jul 2014 19:47:59 +0200 Subject: [PATCH 18/88] removes sharpness from forks too commonly available to enjoy the sharp bonus. --- code/game/objects/items/weapons/kitchen.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 7244d45520..12af48f6c8 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -66,7 +66,6 @@ name = "fork" desc = "It's a fork. Sure is pointy." icon_state = "fork" - sharp = 1 /obj/item/weapon/kitchen/utensil/pfork name = "plastic fork" @@ -456,4 +455,4 @@ for(var/i = 1, i <= rand(1,2), i++) if(I) step(I, pick(NORTH,SOUTH,EAST,WEST)) - sleep(rand(2,4)) + sleep(rand(2,4)) From 9827838917b3bdd7b90f86605f3392584a7e009c Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 10 Jul 2014 19:58:01 +0200 Subject: [PATCH 19/88] shrapnel check for human get_visible_implants() --- code/modules/mob/living/carbon/human/human.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f4edb30e24..dc23eecd03 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1166,7 +1166,7 @@ var/list/visible_implants = list() for(var/datum/organ/external/organ in src.organs) for(var/obj/item/weapon/O in organ.implants) - if(!istype(O,/obj/item/weapon/implant) && O.w_class > class) + if(!istype(O,/obj/item/weapon/implant) && (O.w_class > class) && !istype(O,/obj/item/weapon/shard/shrapnel)) visible_implants += O return(visible_implants) From 10ab66aa40b10fc94d45260f603806eccfdb361f Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 10 Jul 2014 19:58:16 +0200 Subject: [PATCH 20/88] adjusts verb for w_class 1 yankability --- code/modules/mob/mob.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 37b69afdaa..d12a6df238 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -950,7 +950,7 @@ mob/proc/yank_out_object() if(S == U) self = 1 // Removing object from yourself. - valid_objects = get_visible_implants(1) + valid_objects = get_visible_implants(0) if(!valid_objects.len) if(self) src << "You have nothing stuck in your body that is large enough to remove." @@ -961,9 +961,9 @@ mob/proc/yank_out_object() var/obj/item/weapon/selection = input("What do you want to yank out?", "Embedded objects") in valid_objects if(self) - src << "You attempt to get a good grip on the [selection] in your body." + src << "You attempt to get a good grip on [selection] in your body." else - U << "You attempt to get a good grip on the [selection] in [S]'s body." + U << "You attempt to get a good grip on [selection] in [S]'s body." if(!do_after(U, 80)) return From a3cc178ad69091beba599945aac5b6c5e9ed8ae4 Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 10 Jul 2014 19:58:20 +0200 Subject: [PATCH 21/88] adjusts examine for w_class 1 yankability --- code/modules/mob/living/carbon/human/examine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 6ce436e12a..026ef891a9 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -388,7 +388,7 @@ if(display_gloves) msg += "[src] has blood running from under [t_his] gloves!\n" - for(var/implant in get_visible_implants(1)) + for(var/implant in get_visible_implants(0)) msg += "[src] has \a [implant] sticking out of [t_his] flesh!\n" if(digitalcamo) msg += "[t_He] [t_is] repulsively uncanny!\n" From 81f27320f3ade2cc0898146d15215b2de16895b5 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 11 Jul 2014 08:52:09 +0930 Subject: [PATCH 22/88] Removes vox as a spawn race. --- code/modules/mob/living/carbon/species.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index c2ecf6d539..b67f78c2e9 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -200,7 +200,7 @@ breath_type = "nitrogen" poison_type = "oxygen" - flags = NO_SCAN | IS_WHITELISTED + flags = NO_SCAN blood_color = "#2299FC" flesh_color = "#808D11" From 7e7e6cd8ac9d91a71ed1deeacf3e85ffea2c80a4 Mon Sep 17 00:00:00 2001 From: Mark Aherne Date: Fri, 11 Jul 2014 10:48:42 +0100 Subject: [PATCH 23/88] Continued work in progress on a major revision of the NanoUI templating system. --- .../components/omni_devices/filter.dm | 4 +- .../components/omni_devices/mixer.dm | 4 +- .../overmap/ships/computers/engine_control.dm | 4 +- .../Chinsky/overmap/ships/computers/helm.dm | 4 +- .../overmap/ships/computers/shuttle.dm | 4 +- code/game/dna/dna_modifier.dm | 4 +- code/game/gamemodes/gameticker.dm | 2 +- code/game/machinery/Freezer.dm | 8 +- code/game/machinery/atmoalter/canister.dm | 4 +- code/game/machinery/computer/card.dm | 4 +- code/game/machinery/computer/crew.dm | 4 +- code/game/machinery/cryo.dm | 4 +- .../airlock_controllers.dm | 12 +- .../airlock_docking_controller.dm | 4 +- .../airlock_docking_controller_multi.dm | 8 +- .../escape_pod_docking_controller.dm | 8 +- .../simple_docking_controller.dm | 4 +- code/game/machinery/kitchen/smartfridge.dm | 4 +- code/game/objects/items/devices/PDA/PDA.dm | 4 +- .../objects/items/devices/transfer_valve.dm | 4 +- code/game/objects/items/devices/uplinks.dm | 4 +- .../game/objects/items/weapons/tanks/tanks.dm | 4 +- code/modules/economy/Accounts_DB.dm | 4 +- code/modules/nano/nanoexternal.dm | 5 +- code/modules/nano/nanomanager.dm | 40 ++- code/modules/nano/nanoui.dm | 103 +++++-- code/modules/power/apc.dm | 30 +- code/modules/power/smes.dm | 4 +- code/modules/reagents/Chemistry-Machinery.dm | 8 +- .../machinery/geosample_scanner.dm | 4 +- code/modules/shuttles/shuttle_console.dm | 4 +- code/modules/shuttles/shuttle_emergency.dm | 4 +- code/modules/virus2/centrifuge.dm | 4 +- code/modules/virus2/diseasesplicer.dm | 4 +- code/modules/virus2/dishincubator.dm | 4 +- code/modules/virus2/isolator.dm | 4 +- nano/To BYOND Cache.bat | 4 + nano/css/shared.css | 19 +- nano/js/libraries.min.js | 2 +- nano/js/libraries/2-doT.js | 10 +- nano/js/nano_base_callbacks.js | 85 ++++++ nano/js/nano_base_helpers.js | 33 +- nano/js/nano_state.js | 69 +++++ nano/js/nano_state_default.js | 14 + nano/js/nano_state_manager.js | 227 ++++++++++++++ nano/js/nano_template.js | 72 ++++- nano/js/nano_update.js | 237 --------------- nano/js/nano_utility.js | 12 +- nano/templates/apc.tmpl | 16 +- nano/templates/canister.tmpl | 22 +- nano/templates/chem_dispenser.tmpl | 50 ++-- nano/templates/crew_monitor.tmpl | 12 +- nano/templates/cryo.tmpl | 38 +-- nano/templates/disease_splicer.tmpl | 14 +- nano/templates/dish_incubator.tmpl | 26 +- nano/templates/dna_modifier.tmpl | 108 +++---- nano/templates/docking_airlock_console.tmpl | 22 +- nano/templates/door_access_console.tmpl | 8 +- nano/templates/engines_control.tmpl | 42 +-- nano/templates/escape_pod_berth_console.tmpl | 26 +- nano/templates/escape_pod_console.tmpl | 54 ++-- .../escape_shuttle_control_console.tmpl | 8 +- nano/templates/freezer.tmpl | 18 +- nano/templates/geoscanner.tmpl | 28 +- nano/templates/helm.tmpl | 62 ++-- nano/templates/identification_computer.tmpl | 50 ++-- nano/templates/isolation_centrifuge.tmpl | 14 +- nano/templates/multi_docking_console.tmpl | 4 +- nano/templates/omni_filter.tmpl | 140 ++++----- nano/templates/omni_mixer.tmpl | 173 +++++------ nano/templates/pathogenic_isolator.tmpl | 22 +- nano/templates/pda.tmpl | 281 +++++++++--------- nano/templates/smartfridge.tmpl | 48 ++- 73 files changed, 1367 insertions(+), 1031 deletions(-) create mode 100644 nano/To BYOND Cache.bat create mode 100644 nano/js/nano_base_callbacks.js create mode 100644 nano/js/nano_state.js create mode 100644 nano/js/nano_state_default.js create mode 100644 nano/js/nano_state_manager.js delete mode 100644 nano/js/nano_update.js diff --git a/code/ATMOSPHERICS/components/omni_devices/filter.dm b/code/ATMOSPHERICS/components/omni_devices/filter.dm index d52090b0c7..1d1d335cb8 100644 --- a/code/ATMOSPHERICS/components/omni_devices/filter.dm +++ b/code/ATMOSPHERICS/components/omni_devices/filter.dm @@ -112,14 +112,14 @@ return -/obj/machinery/atmospherics/omni/filter/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/omni/filter/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) usr.set_machine(src) var/list/data = new() data = build_uidata() - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "omni_filter.tmpl", "Omni Filter Control", 330, 330) diff --git a/code/ATMOSPHERICS/components/omni_devices/mixer.dm b/code/ATMOSPHERICS/components/omni_devices/mixer.dm index 64af4057b0..3b5dd1780f 100644 --- a/code/ATMOSPHERICS/components/omni_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/omni_devices/mixer.dm @@ -137,14 +137,14 @@ return 1 -/obj/machinery/atmospherics/omni/mixer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/omni/mixer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) usr.set_machine(src) var/list/data = new() data = build_uidata() - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "omni_mixer.tmpl", "Omni Mixer Control", 360, 330) diff --git a/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm b/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm index 07d6a4579b..41f2c4cdf9 100644 --- a/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm +++ b/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm @@ -30,7 +30,7 @@ ui_interact(user) -/obj/machinery/computer/engines/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/computer/engines/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) if(!linked) return @@ -50,7 +50,7 @@ data["engines_info"] = enginfo - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "engines_control.tmpl", "[linked.name] Engines Control", 380, 530) ui.set_initial_data(data) diff --git a/code/WorkInProgress/Chinsky/overmap/ships/computers/helm.dm b/code/WorkInProgress/Chinsky/overmap/ships/computers/helm.dm index f81e569abc..d78934f574 100644 --- a/code/WorkInProgress/Chinsky/overmap/ships/computers/helm.dm +++ b/code/WorkInProgress/Chinsky/overmap/ships/computers/helm.dm @@ -70,7 +70,7 @@ ui_interact(user) -/obj/machinery/computer/helm/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/computer/helm/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) if(!linked) return @@ -101,7 +101,7 @@ data["locations"] = locations - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "helm.tmpl", "[linked.name] Helm Control", 380, 530) ui.set_initial_data(data) diff --git a/code/WorkInProgress/Chinsky/overmap/ships/computers/shuttle.dm b/code/WorkInProgress/Chinsky/overmap/ships/computers/shuttle.dm index c63ad2d763..4ebc9469da 100644 --- a/code/WorkInProgress/Chinsky/overmap/ships/computers/shuttle.dm +++ b/code/WorkInProgress/Chinsky/overmap/ships/computers/shuttle.dm @@ -44,7 +44,7 @@ var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag] return shuttle && destination && get_dist(home, destination) <= shuttle.range -/obj/machinery/computer/shuttle_control/explore/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/computer/shuttle_control/explore/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag] if (!istype(shuttle)) @@ -103,7 +103,7 @@ "can_force" = can_go && shuttle.can_force(), ) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "shuttle_control_console_exploration.tmpl", "[shuttle_tag] Shuttle Control", 470, 310) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 3e19f0bfc1..ff699083ca 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -345,7 +345,7 @@ * * @return nothing */ -/obj/machinery/computer/scan_consolenew/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/computer/scan_consolenew/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) if(user == connected.occupant || user.stat) return @@ -425,7 +425,7 @@ data["beakerVolume"] += R.volume // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 0c8a7aa8bd..6038e8be27 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -48,7 +48,7 @@ var/global/datum/controller/gameticker/ticker 'sound/music/clouds.s3m',\ 'sound/music/space_oddity.ogg') //Ground Control to Major Tom, this song is cool, what's going on? do - pregame_timeleft = 180 + pregame_timeleft = 20 world << "Welcome to the pre-game lobby!" world << "Please, setup your character and select ready. Game will start in [pregame_timeleft] seconds" while(current_state == GAME_STATE_PREGAME) diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm index 7de58c6f22..3b3cfe8754 100644 --- a/code/game/machinery/Freezer.dm +++ b/code/game/machinery/Freezer.dm @@ -44,7 +44,7 @@ /obj/machinery/atmospherics/unary/cold_sink/freezer/attack_hand(mob/user as mob) src.ui_interact(user) -/obj/machinery/atmospherics/unary/cold_sink/freezer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/unary/cold_sink/freezer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) // this is the data which will be sent to the ui var/data[0] data["on"] = on ? 1 : 0 @@ -62,7 +62,7 @@ data["gasTemperatureClass"] = temp_class // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm @@ -137,7 +137,7 @@ /obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_hand(mob/user as mob) src.ui_interact(user) -/obj/machinery/atmospherics/unary/heat_reservoir/heater/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/unary/heat_reservoir/heater/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) // this is the data which will be sent to the ui var/data[0] data["on"] = on ? 1 : 0 @@ -153,7 +153,7 @@ data["gasTemperatureClass"] = temp_class // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 3557f1f655..96152823ca 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -241,7 +241,7 @@ update_flag /obj/machinery/portable_atmospherics/canister/attack_hand(var/mob/user as mob) return src.ui_interact(user) -/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) if (src.destroyed) return @@ -261,7 +261,7 @@ update_flag data["holdingTank"] = list("name" = holding.name, "tankPressure" = round(holding.air_contents.return_pressure())) // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index fd11787363..b40f511a3b 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -80,7 +80,7 @@ if(stat & (NOPOWER|BROKEN)) return ui_interact(user) -/obj/machinery/computer/card/ui_interact(mob/user, ui_key="main", datum/nanoui/ui=null) +/obj/machinery/computer/card/ui_interact(mob/user, ui_key="main", var/datum/nanoui/ui = null, var/force_open = 1) user.set_machine(src) var/data[0] @@ -133,7 +133,7 @@ data["regions"] = regions - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "identification_computer.tmpl", src.name, 600, 700) ui.set_initial_data(data) diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 528815ad07..d7595e1a29 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -57,7 +57,7 @@ /obj/machinery/computer/crew/interact(mob/user) ui_interact(user) -/obj/machinery/computer/crew/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/computer/crew/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) if(stat & (BROKEN|NOPOWER)) return user.set_machine(src) @@ -97,7 +97,7 @@ data["crewmembers"] = crewmembers - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if(!ui) ui = new(user, src, ui_key, "crew_monitor.tmpl", "Crew Monitoring Computer", 900, 600) ui.set_initial_data(data) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index b909404a1c..a82828311c 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -73,7 +73,7 @@ * * @return nothing */ -/obj/machinery/atmospherics/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) if(user == occupant || user.stat) return @@ -121,7 +121,7 @@ data["beakerVolume"] += R.volume // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/machinery/embedded_controller/airlock_controllers.dm b/code/game/machinery/embedded_controller/airlock_controllers.dm index 4a48558f87..96177f9a9d 100644 --- a/code/game/machinery/embedded_controller/airlock_controllers.dm +++ b/code/game/machinery/embedded_controller/airlock_controllers.dm @@ -17,7 +17,7 @@ /obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller name = "Advanced Airlock Controller" -/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] data = list( @@ -29,7 +29,7 @@ "secure" = program.memory["secure"] ) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "advanced_airlock_console.tmpl", name, 470, 290) @@ -75,7 +75,7 @@ name = "Airlock Controller" tag_secure = 1 -/obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] data = list( @@ -85,7 +85,7 @@ "processing" = program.memory["processing"], ) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "simple_airlock_console.tmpl", name, 470, 290) @@ -140,7 +140,7 @@ else icon_state = "access_control_off" -/obj/machinery/embedded_controller/radio/airlock/access_controller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/embedded_controller/radio/airlock/access_controller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] data = list( @@ -149,7 +149,7 @@ "processing" = program.memory["processing"] ) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "door_access_console.tmpl", name, 330, 220) diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller.dm b/code/game/machinery/embedded_controller/airlock_docking_controller.dm index 0e9877d797..cb69c4d5bf 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller.dm @@ -11,7 +11,7 @@ docking_program = new/datum/computer/file/embedded_program/docking/airlock(src, airlock_program) program = docking_program -/obj/machinery/embedded_controller/radio/airlock/docking_port/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/embedded_controller/radio/airlock/docking_port/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] data = list( @@ -24,7 +24,7 @@ "override_enabled" = docking_program.override_enabled, ) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "docking_airlock_console.tmpl", name, 470, 290) diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm index 99c7bf5784..d03bffcbae 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm @@ -22,7 +22,7 @@ child_names[tags[i]] = names[i] -/obj/machinery/embedded_controller/radio/docking_port_multi/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/embedded_controller/radio/docking_port_multi/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] var/list/airlocks[child_names.len] @@ -35,7 +35,7 @@ "airlocks" = airlocks, ) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "multi_docking_console.tmpl", name, 470, 290) @@ -60,7 +60,7 @@ airlock_program = new/datum/computer/file/embedded_program/airlock/multi_docking(src) program = airlock_program -/obj/machinery/embedded_controller/radio/airlock/docking_port_multi/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/embedded_controller/radio/airlock/docking_port_multi/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] data = list( @@ -73,7 +73,7 @@ "override_enabled" = airlock_program.override_enabled, ) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "docking_airlock_console.tmpl", name, 470, 290) diff --git a/code/game/machinery/embedded_controller/escape_pod_docking_controller.dm b/code/game/machinery/embedded_controller/escape_pod_docking_controller.dm index f84fbf0b32..7a14c9edc2 100644 --- a/code/game/machinery/embedded_controller/escape_pod_docking_controller.dm +++ b/code/game/machinery/embedded_controller/escape_pod_docking_controller.dm @@ -2,7 +2,7 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod var/datum/shuttle/ferry/escape_pod/pod -/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] data = list( @@ -14,7 +14,7 @@ "is_armed" = pod.arming_controller.armed, ) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "escape_pod_console.tmpl", name, 470, 290) @@ -44,7 +44,7 @@ docking_program = new/datum/computer/file/embedded_program/docking/simple/escape_pod(src) program = docking_program -/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] var/armed = null @@ -58,7 +58,7 @@ "armed" = armed, ) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "escape_pod_berth_console.tmpl", name, 470, 290) diff --git a/code/game/machinery/embedded_controller/simple_docking_controller.dm b/code/game/machinery/embedded_controller/simple_docking_controller.dm index 877247799b..9eee569ae6 100644 --- a/code/game/machinery/embedded_controller/simple_docking_controller.dm +++ b/code/game/machinery/embedded_controller/simple_docking_controller.dm @@ -9,7 +9,7 @@ docking_program = new/datum/computer/file/embedded_program/docking/simple(src) program = docking_program -/obj/machinery/embedded_controller/radio/simple_docking_controller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/embedded_controller/radio/simple_docking_controller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] data = list( @@ -19,7 +19,7 @@ "door_lock" = docking_program.memory["door_status"]["lock"], ) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "simple_docking_console.tmpl", name, 470, 290) diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index 6242626bc7..36e555a558 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -225,7 +225,7 @@ * SmartFridge Menu ********************/ -/obj/machinery/smartfridge/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/smartfridge/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) user.set_machine(src) var/is_secure = istype(src,/obj/machinery/smartfridge/secure) @@ -269,7 +269,7 @@ if (vendor_wires.len > 0) data["wires"] = vendor_wires - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "smartfridge.tmpl", src.name, 400, 500) ui.set_initial_data(data) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index bc402a7a39..b2b03cb0fc 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -328,7 +328,7 @@ var/global/list/obj/item/device/pda/PDAs = list() return -/obj/item/device/pda/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/item/device/pda/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) ui_tick++ var/datum/nanoui/old_ui = nanomanager.get_open_ui(user, src, "main") var/auto_update = 1 @@ -462,7 +462,7 @@ var/global/list/obj/item/device/pda/PDAs = list() data["aircontents"] = list("reading" = 0) // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 2fa75536ec..1e7c459756 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -67,7 +67,7 @@ /obj/item/device/transfer_valve/attack_self(mob/user as mob) ui_interact(user) -/obj/item/device/transfer_valve/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/item/device/transfer_valve/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) // this is the data which will be sent to the ui var/data[0] @@ -77,7 +77,7 @@ data["valveOpen"] = valve_open ? 1 : 0 // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 41ae746739..aa01d0454d 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -340,7 +340,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid /* NANO UI FOR UPLINK WOOP WOOP */ -/obj/item/device/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/item/device/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/title = "Syndicate Uplink" var/data[0] @@ -349,7 +349,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid data["welcome"] = welcome // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 8b883f818a..e0a3bcb592 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -127,7 +127,7 @@ ui_interact(user) -/obj/item/weapon/tank/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/item/weapon/tank/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/using_internal if(istype(loc,/mob/living/carbon)) @@ -150,7 +150,7 @@ data["maskConnected"] = 1 // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm index f94766f16c..19ea76ed4e 100644 --- a/code/modules/economy/Accounts_DB.dm +++ b/code/modules/economy/Accounts_DB.dm @@ -59,7 +59,7 @@ if(stat & (NOPOWER|BROKEN)) return ui_interact(user) -/obj/machinery/account_database/ui_interact(mob/user, ui_key="main", datum/nanoui/ui=null) +/obj/machinery/account_database/ui_interact(mob/user, ui_key="main", var/datum/nanoui/ui = null, var/force_open = 1) user.set_machine(src) var/data[0] @@ -105,7 +105,7 @@ if (accounts.len > 0) data["accounts"] = accounts - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "accounts_terminal.tmpl", src.name, 400, 640) ui.set_initial_data(data) diff --git a/code/modules/nano/nanoexternal.dm b/code/modules/nano/nanoexternal.dm index 2331debd9b..50e2b706f8 100644 --- a/code/modules/nano/nanoexternal.dm +++ b/code/modules/nano/nanoexternal.dm @@ -32,11 +32,12 @@ * * @param user /mob The mob who is interacting with this ui * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main") - * @param ui /datum/nanoui This parameter is passed by the nanoui process() proc when updating an open ui + * @param ui /datum/nanoui This parameter is passed by the nanoui process() proc when updating an open ui + * @param force_open boolean Force the UI to (re)open, even if it's already open * * @return nothing */ -/atom/movable/proc/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/atom/movable/proc/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) return // Used by the Nano UI Manager (/datum/nanomanager) to track UIs opened by this mob diff --git a/code/modules/nano/nanomanager.dm b/code/modules/nano/nanomanager.dm index a10965a448..a9c004fa5f 100644 --- a/code/modules/nano/nanomanager.dm +++ b/code/modules/nano/nanomanager.dm @@ -39,19 +39,23 @@ * @param ui_key string A string key used for the ui * @param ui /datum/nanoui An existing instance of the ui (can be null) * @param data list The data to be passed to the ui, if it exists + * @param force_open boolean The ui is being forced to (re)open, so close ui if it exists (instead of updating) * * @return /nanoui Returns the found ui, for null if none exists */ -/datum/nanomanager/proc/try_update_ui(var/mob/user, src_object, ui_key, var/datum/nanoui/ui, data) +/datum/nanomanager/proc/try_update_ui(var/mob/user, src_object, ui_key, var/datum/nanoui/ui, data, var/force_open = 0) if (isnull(ui)) // no ui has been passed, so we'll search for one { ui = get_open_ui(user, src_object, ui_key) - } + } if (!isnull(ui)) - // The UI is already open so push the data to it - ui.push_data(data) - return ui - + // The UI is already open + if (!force_open) + ui.push_data(data) + return ui + else + testing("nanomanager/try_update_ui mob [user.name] [src_object:name] [ui_key] [force_open] - forcing opening of ui") + ui.close() return null /** @@ -66,14 +70,17 @@ /datum/nanomanager/proc/get_open_ui(var/mob/user, src_object, ui_key) var/src_object_key = "\ref[src_object]" if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list)) + testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - there are no uis open") return null - else if (isnull(open_uis[src_object_key][ui_key]) || !istype(open_uis[src_object_key][ui_key], /list)) + else if (isnull(open_uis[src_object_key][ui_key]) || !istype(open_uis[src_object_key][ui_key], /list)) + testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - there are no uis open for this object") return null for (var/datum/nanoui/ui in open_uis[src_object_key][ui_key]) if (ui.user == user) return ui - + + testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - ui not found") return null /** @@ -83,7 +90,7 @@ * * @return int The number of uis updated */ -/datum/nanomanager/proc/update_uis(src_object) +/datum/nanomanager/proc/update_uis(src_object) var/src_object_key = "\ref[src_object]" if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list)) return 0 @@ -128,7 +135,8 @@ */ /datum/nanomanager/proc/close_user_uis(var/mob/user, src_object = null, ui_key = null) if (isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0) - return 0 // has no open uis + testing("nanomanager/close_user_uis mob [user.name] has no open uis") + return 0 // has no open uis var/close_count = 0 for (var/datum/nanoui/ui in user.open_uis) @@ -136,6 +144,8 @@ ui.close() close_count++ + testing("nanomanager/close_user_uis mob [user.name] closed [open_uis.len] of [close_count] uis") + return close_count /** @@ -157,6 +167,7 @@ var/list/uis = open_uis[src_object_key][ui.ui_key] uis.Add(ui) processing_uis.Add(ui) + testing("nanomanager/ui_opened mob [ui.user.name] [ui.src_object:name] [ui.ui_key] - user.open_uis [ui.user.open_uis.len] | uis [uis.len] | processing_uis [processing_uis.len]") /** * Remove a /nanoui ui from the list of open uis @@ -176,7 +187,11 @@ processing_uis.Remove(ui) ui.user.open_uis.Remove(ui) var/list/uis = open_uis[src_object_key][ui.ui_key] - return uis.Remove(ui) + uis.Remove(ui) + + testing("nanomanager/ui_closed mob [ui.user.name] [ui.src_object:name] [ui.ui_key] - user.open_uis [ui.user.open_uis.len] | uis [uis.len] | processing_uis [processing_uis.len]") + + return 1 /** * This is called on user logout @@ -189,6 +204,7 @@ // /datum/nanomanager/proc/user_logout(var/mob/user) + testing("nanomanager/user_logout user [user.name]") return close_user_uis(user) /** @@ -201,7 +217,9 @@ * @return nothing */ /datum/nanomanager/proc/user_transferred(var/mob/oldMob, var/mob/newMob) + testing("nanomanager/user_transferred from mob [oldMob.name] to mob [newMob.name]") if (isnull(oldMob.open_uis) || !istype(oldMob.open_uis, /list) || open_uis.len == 0) + testing("nanomanager/user_transferred mob [oldMob.name] has no open uis") return 0 // has no open uis if (isnull(newMob.open_uis) || !istype(newMob.open_uis, /list)) diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 5e382c38c8..ebdd6a6db8 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -41,6 +41,8 @@ nanoui is used to open and update nano browser uis // the body content for this ui, do not change unless you know what you're doing // the #mainTemplate div will contain the compiled "main" template html var/content = "
    " + // the title of this ui + var/state_key = "default" // initial data, containing the full data structure, must be sent to the ui (the data structure cannot be extended later on) var/list/initial_data[0] // set to 1 to update the ui automatically every master_controller tick @@ -94,7 +96,10 @@ nanoui is used to open and update nano browser uis add_script("libraries.min.js") // A JS file comprising of jQuery, doT.js and jQuery Timer libraries (compressed together) add_script("nano_utility.js") // The NanoUtility JS, this is used to store utility functions. add_script("nano_template.js") // The NanoTemplate JS, this is used to render templates. - add_script("nano_update.js") // The NanoUpdate JS, this is used to receive updates and apply them. + add_script("nano_state_manager.js") // The + add_script("nano_state.js") // The + add_script("nano_state_default.js") // The + add_script("nano_base_callbacks.js") // The add_script("nano_base_helpers.js") // The NanoBaseHelpers JS, this is used to set up template helpers which are common to all templates add_stylesheet("shared.css") // this CSS sheet is common to all UIs add_stylesheet("icons.css") // this CSS sheet is common to all UIs @@ -108,12 +113,15 @@ nanoui is used to open and update nano browser uis * @return nothing */ /datum/nanoui/proc/set_status(state, push_update) - if (state != status) - status = state - if (push_update || !status) - push_data(list(), 1) // Update the UI, force the update in case the status is 0 - else - status = state + if (state != status) // Only update if it is different + if (status == STATUS_DISABLED) + status = state + if (push_update) + update() + else + status = state + if (push_update || status == 0) + push_data(null, 1) // Update the UI, force the update in case the status is 0, data is null so that previous data is used /** * Update the status (visibility) of this ui based on the user's status @@ -122,7 +130,7 @@ nanoui is used to open and update nano browser uis * * @return nothing */ -/datum/nanoui/proc/update_status(push_update = 0) +/datum/nanoui/proc/update_status(var/push_update = 0) if (istype(user, /mob/living/silicon/ai)) set_status(STATUS_INTERACTIVE, push_update) // interactive (green visibility) else if (istype(user, /mob/living/silicon/robot)) @@ -170,21 +178,39 @@ nanoui is used to open and update nano browser uis * @return nothing */ /datum/nanoui/proc/set_initial_data(list/data) - initial_data = add_default_data(data) + initial_data = data /** - * Add default data to the data being sent to the ui. + * Get config data to sent to the ui. * - * @param data /list The list of data to be modified - * - * @return /list modified data + * @return /list config data */ -/datum/nanoui/proc/add_default_data(list/data) - data["ui"] = list( +/datum/nanoui/proc/get_config_data() + var/list/config_data = list( + "title" = title, + "srcObject" = list("name" = src_object.name), + "stateKey" = state_key, "status" = status, "user" = list("name" = user.name) ) - return data + return config_data + + /** + * Get data to sent to the ui. + * + * @param data /list The list of general data for this ui (can be null to use previous data sent) + * + * @return /list data to send to the ui + */ +/datum/nanoui/proc/get_send_data(var/list/data) + var/list/config_data = get_config_data() + + var/list/send_data = list("config" = config_data) + + if (!isnull(data)) + send_data["data"] = data + + return send_data /** * Set the browser window options for this ui @@ -240,7 +266,17 @@ nanoui is used to open and update nano browser uis * @return nothing */ /datum/nanoui/proc/set_content(ncontent) - content = ncontent + content = ncontent + + /** + * Set the state key for use in the frontend Javascript + * + * @param nstate_key string The new HTML content for this UI + * + * @return nothing + */ +/datum/nanoui/proc/set_state_key(nstate_key) + state_key = nstate_key /** * Set whether or not to use the "old" on close logic (mainly unset_machine()) @@ -274,9 +310,8 @@ nanoui is used to open and update nano browser uis if (templatel_data.len > 0) template_data_json = list2json(templatel_data) - var/initial_data_json = "{}" // An empty JSON object - if (initial_data.len > 0) - initial_data_json = list2json(initial_data) + var/list/send_data = get_send_data(initial_data) + var/initial_data_json = list2json(send_data) var/url_parameters_json = list2json(list("src" = "\ref[src]")) @@ -287,11 +322,11 @@ nanoui is used to open and update nano browser uis @@ -301,7 +336,12 @@ nanoui is used to open and update nano browser uis
    [title ? "
    [title]
    " : ""]
    -
    Initiating...
    +
    Initiating...
    + "} /** @@ -378,9 +418,10 @@ nanoui is used to open and update nano browser uis if (status == STATUS_DISABLED && !force_push) return // Cannot update UI, no visibility - data = add_default_data(data) + var/list/send_data = get_send_data(data) + //user << list2json(data) // used for debugging - user << output(list2params(list(list2json(data))),"[window_id].browser:receiveUpdateData") + user << output(list2params(list(list2json(send_data))),"[window_id].browser:receiveUpdateData") /** * This Topic() proc is called whenever a user clicks on a link within a Nano UI @@ -411,7 +452,15 @@ nanoui is used to open and update nano browser uis return if (status && (update || is_auto_updating)) - src_object.ui_interact(user, ui_key, src) // Update the UI (update_status() is called whenever a UI is updated) + update() // Update the UI (update_status() is called whenever a UI is updated) else update_status(1) // Not updating UI, so lets check here if status has changed + + /** + * Update the UI + * + * @return nothing + */ +/datum/nanoui/proc/update(var/force_open = 0) + src_object.ui_interact(user, ui_key, src, force_open) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 42ab0a1812..bd703732e9 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -673,7 +673,7 @@ return // do APC interaction - user.set_machine(src) + //user.set_machine(src) src.interact(user) /obj/machinery/power/apc/attack_alien(mob/living/carbon/alien/humanoid/user) @@ -741,7 +741,7 @@ else return 0 // 0 = User is not a Malf AI -/obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) if(!user) return @@ -752,7 +752,7 @@ "powerCellStatus" = cell ? cell.percent() : null, "chargeMode" = chargemode, "chargingStatus" = charging, - "totalLoad" = lastused_equip + lastused_light + lastused_environ, + "totalLoad" = round(lastused_equip + lastused_light + lastused_environ), "coverLocked" = coverlocked, "siliconUser" = istype(user, /mob/living/silicon), "malfStatus" = get_malf_status(user), @@ -760,7 +760,7 @@ "powerChannels" = list( list( "title" = "Equipment", - "powerLoad" = lastused_equip, + "powerLoad" = round(lastused_equip), "status" = equipment, "topicParams" = list( "auto" = list("eqp" = 3), @@ -770,7 +770,7 @@ ), list( "title" = "Lighting", - "powerLoad" = lastused_light, + "powerLoad" = round(lastused_light), "status" = lighting, "topicParams" = list( "auto" = list("lgt" = 3), @@ -780,7 +780,7 @@ ), list( "title" = "Environment", - "powerLoad" = lastused_environ, + "powerLoad" = round(lastused_environ), "status" = environ, "topicParams" = list( "auto" = list("env" = 3), @@ -792,7 +792,7 @@ ) // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm @@ -961,14 +961,14 @@ /obj/machinery/power/apc/Topic(href, href_list, var/usingUI = 1) if(!(isrobot(usr) && (href_list["apcwires"] || href_list["pulse"]))) if(!can_use(usr, 1)) - return + return 0 src.add_fingerprint(usr) if (href_list["apcwires"]) var/t1 = text2num(href_list["apcwires"]) if (!( istype(usr.get_active_hand(), /obj/item/weapon/wirecutters) )) usr << "You need wirecutters!" - return + return 0 if (src.isWireColorCut(t1)) src.mend(t1) else @@ -977,10 +977,10 @@ var/t1 = text2num(href_list["pulse"]) if (!istype(usr.get_active_hand(), /obj/item/device/multitool)) usr << "You need a multitool!" - return + return 0 if (src.isWireColorCut(t1)) usr << "You can't pulse a cut wire." - return + return 0 else src.pulse(t1) else if (href_list["lock"]) @@ -1027,11 +1027,11 @@ else if( href_list["close"] ) nanomanager.close_user_uis(usr, src) - return + return 0 else if (href_list["close2"]) usr << browse(null, "window=apcwires") - return + return 0 else if (href_list["overload"]) if( istype(usr, /mob/living/silicon) && !src.aidisabled ) @@ -1042,7 +1042,7 @@ if( istype(malfai, /mob/living/silicon/ai) && !src.aidisabled ) if (malfai.malfhacking) malfai << "You are already hacking an APC." - return + return 0 malfai << "Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process." malfai.malfhack = src malfai.malfhacking = 1 @@ -1071,7 +1071,7 @@ if(usingUI) src.updateDialog() - return + return 1 /*/obj/machinery/power/apc/proc/malfoccupy(var/mob/living/silicon/ai/malf) if(!istype(malf)) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 9baafac676..92e7f8240a 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -250,7 +250,7 @@ building_terminal = 0 -/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) if(stat & BROKEN) return @@ -269,7 +269,7 @@ data["outputLoad"] = round(loaddemand) // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 37703e0912..17ff42ed65 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -104,7 +104,7 @@ * * @return nothing */ -/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main",var/datum/nanoui/ui = null) +/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main",var/datum/nanoui/ui = null, var/force_open = 1) if(broken_requirements.len) user << "[src] is broken. [broken_requirements[broken_requirements[1]]]" return @@ -114,8 +114,8 @@ // this is the data which will be sent to the ui var/data[0] data["amount"] = amount - data["energy"] = energy - data["maxEnergy"] = max_energy + data["energy"] = round(energy) + data["maxEnergy"] = round(max_energy) data["isBeakerLoaded"] = beaker ? 1 : 0 data["glass"] = accept_glass var beakerContents[0] @@ -141,7 +141,7 @@ data["chemicals"] = chemicals // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm index bddd133ade..6a44fbe72d 100644 --- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm @@ -114,7 +114,7 @@ if(total_purity && fresh_coolant) coolant_purity = total_purity / fresh_coolant -/obj/machinery/radiocarbon_spectrometer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/radiocarbon_spectrometer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) if(user.stat) return @@ -146,7 +146,7 @@ data["rad_shield_on"] = rad_shield // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index 5b13f0e66b..a5b08a0bf7 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -18,7 +18,7 @@ ui_interact(user) -/obj/machinery/computer/shuttle_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/computer/shuttle_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag] if (!istype(shuttle)) @@ -57,7 +57,7 @@ "can_force" = shuttle.can_force(), ) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "shuttle_control_console.tmpl", "[shuttle_tag] Shuttle Control", 470, 310) diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index a16b98db1e..98f0223247 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -153,7 +153,7 @@ read_authorization(W) ..() -/obj/machinery/computer/shuttle_control/emergency/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/computer/shuttle_control/emergency/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] var/datum/shuttle/ferry/emergency/shuttle = shuttle_controller.shuttles[shuttle_tag] if (!istype(shuttle)) @@ -211,7 +211,7 @@ "user" = debug? user : null, ) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "escape_shuttle_control_console.tmpl", "Shuttle Control", 470, 420) diff --git a/code/modules/virus2/centrifuge.dm b/code/modules/virus2/centrifuge.dm index 0a239f82df..b36e63ff3a 100644 --- a/code/modules/virus2/centrifuge.dm +++ b/code/modules/virus2/centrifuge.dm @@ -36,7 +36,7 @@ if(..()) return ui_interact(user) -/obj/machinery/computer/centrifuge/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/computer/centrifuge/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) user.set_machine(src) var/data[0] @@ -70,7 +70,7 @@ data["antibodies"] = A && A.data["antibodies"] ? antigens2string(A.data["antibodies"]) : null data["is_antibody_sample"] = 1 - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "isolation_centrifuge.tmpl", src.name, 400, 500) ui.set_initial_data(data) diff --git a/code/modules/virus2/diseasesplicer.dm b/code/modules/virus2/diseasesplicer.dm index a8ba0af399..47a4402ab4 100644 --- a/code/modules/virus2/diseasesplicer.dm +++ b/code/modules/virus2/diseasesplicer.dm @@ -43,7 +43,7 @@ if(..()) return ui_interact(user) -/obj/machinery/computer/diseasesplicer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/computer/diseasesplicer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) user.set_machine(src) var/data[0] @@ -81,7 +81,7 @@ else data["info"] = "No dish loaded." - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "disease_splicer.tmpl", src.name, 400, 600) ui.set_initial_data(data) diff --git a/code/modules/virus2/dishincubator.dm b/code/modules/virus2/dishincubator.dm index 53f6688ef8..f3f339f895 100644 --- a/code/modules/virus2/dishincubator.dm +++ b/code/modules/virus2/dishincubator.dm @@ -50,7 +50,7 @@ if(stat & (NOPOWER|BROKEN)) return ui_interact(user) -/obj/machinery/disease2/incubator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/disease2/incubator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) user.set_machine(src) var/data[0] @@ -82,7 +82,7 @@ for (var/ID in virus) data["blood_already_infected"] = virus[ID] - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "dish_incubator.tmpl", src.name, 400, 600) ui.set_initial_data(data) diff --git a/code/modules/virus2/isolator.dm b/code/modules/virus2/isolator.dm index e3a68c9949..09f07793c9 100644 --- a/code/modules/virus2/isolator.dm +++ b/code/modules/virus2/isolator.dm @@ -49,7 +49,7 @@ if(stat & (NOPOWER|BROKEN)) return ui_interact(user) -/obj/machinery/disease2/isolator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/disease2/isolator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) user.set_machine(src) var/data[0] @@ -100,7 +100,7 @@ "name" = entry.fields["name"], \ "description" = replacetext(desc, "\n", "")) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "pathogenic_isolator.tmpl", src.name, 400, 500) ui.set_initial_data(data) diff --git a/nano/To BYOND Cache.bat b/nano/To BYOND Cache.bat new file mode 100644 index 0000000000..ececbd1eac --- /dev/null +++ b/nano/To BYOND Cache.bat @@ -0,0 +1,4 @@ +copy css\* C:\Users\Mark\Documents\BYOND\cache /y +copy images\* C:\Users\Mark\Documents\BYOND\cache /y +copy js\* C:\Users\Mark\Documents\BYOND\cache /y +copy templates\* C:\Users\Mark\Documents\BYOND\cache /y \ No newline at end of file diff --git a/nano/css/shared.css b/nano/css/shared.css index ac4657db34..3dbe05bc1f 100644 --- a/nano/css/shared.css +++ b/nano/css/shared.css @@ -149,7 +149,7 @@ h4 { clear: both; padding: 8px; } -#uiNoJavaScript { +#uiLoadingNotice { position: relative; background: url(uiNoticeBackground.jpg) 50% 50%; color: #000000; @@ -159,6 +159,22 @@ h4 { padding: 3px 4px 3px 4px; margin: 4px 0 4px 0; } +#uiNoScript { + position: fixed; + top: 50%; + left: 50%; + margin: -60px 0 0 -150px; + width: 280px; + height: 120px; + background: #ffffff; + border: 2px solid #ff0000; + color: #000000; + font-size: 10px; + font-weight: bold; + z-index: 9999; + padding: 0px 10px; + text-align: center; +} .white { color: white; @@ -261,7 +277,6 @@ div.notice { color: #e9c183; } - .itemContentWide { float: left; width: 79%; diff --git a/nano/js/libraries.min.js b/nano/js/libraries.min.js index 0c7a0f598a..7b19cd3a5d 100644 --- a/nano/js/libraries.min.js +++ b/nano/js/libraries.min.js @@ -1 +1 @@ -(function(e,t){function H(e){var t=e.length,n=w.type(e);if(w.isWindow(e)){return false}if(e.nodeType===1&&t){return true}return n==="array"||n!=="function"&&(t===0||typeof t==="number"&&t>0&&t-1 in e)}function j(e){var t=B[e]={};w.each(e.match(S)||[],function(e,n){t[n]=true});return t}function q(e,n,r,i){if(!w.acceptData(e)){return}var s,o,u=w.expando,a=e.nodeType,f=a?w.cache:e,l=a?e[u]:e[u]&&u;if((!l||!f[l]||!i&&!f[l].data)&&r===t&&typeof n==="string"){return}if(!l){if(a){l=e[u]=c.pop()||w.guid++}else{l=u}}if(!f[l]){f[l]=a?{}:{toJSON:w.noop}}if(typeof n==="object"||typeof n==="function"){if(i){f[l]=w.extend(f[l],n)}else{f[l].data=w.extend(f[l].data,n)}}o=f[l];if(!i){if(!o.data){o.data={}}o=o.data}if(r!==t){o[w.camelCase(n)]=r}if(typeof n==="string"){s=o[n];if(s==null){s=o[w.camelCase(n)]}}else{s=o}return s}function R(e,t,n){if(!w.acceptData(e)){return}var r,i,s=e.nodeType,o=s?w.cache:e,u=s?e[w.expando]:w.expando;if(!o[u]){return}if(t){r=n?o[u]:o[u].data;if(r){if(!w.isArray(t)){if(t in r){t=[t]}else{t=w.camelCase(t);if(t in r){t=[t]}else{t=t.split(" ")}}}else{t=t.concat(w.map(t,w.camelCase))}i=t.length;while(i--){delete r[t[i]]}if(n?!z(r):!w.isEmptyObject(r)){return}}}if(!n){delete o[u].data;if(!z(o[u])){return}}if(s){w.cleanData([e],true)}else if(w.support.deleteExpando||o!=o.window){delete o[u]}else{o[u]=null}}function U(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(I,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r==="string"){try{r=r==="true"?true:r==="false"?false:r==="null"?null:+r+""===r?+r:F.test(r)?w.parseJSON(r):r}catch(s){}w.data(e,n,r)}else{r=t}}return r}function z(e){var t;for(t in e){if(t==="data"&&w.isEmptyObject(e[t])){continue}if(t!=="toJSON"){return false}}return true}function it(){return true}function st(){return false}function ot(){try{return o.activeElement}catch(e){}}function ct(e,t){do{e=e[t]}while(e&&e.nodeType!==1);return e}function ht(e,t,n){if(w.isFunction(t)){return w.grep(e,function(e,r){return!!t.call(e,r,e)!==n})}if(t.nodeType){return w.grep(e,function(e){return e===t!==n})}if(typeof t==="string"){if(ut.test(t)){return w.filter(t,e,n)}t=w.filter(t,e)}return w.grep(e,function(e){return w.inArray(e,t)>=0!==n})}function pt(e){var t=dt.split("|"),n=e.createDocumentFragment();if(n.createElement){while(t.length){n.createElement(t.pop())}}return n}function Mt(e,t){return w.nodeName(e,"table")&&w.nodeName(t.nodeType===1?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function _t(e){e.type=(w.find.attr(e,"type")!==null)+"/"+e.type;return e}function Dt(e){var t=Ct.exec(e.type);if(t){e.type=t[1]}else{e.removeAttribute("type")}return e}function Pt(e,t){var n,r=0;for(;(n=e[r])!=null;r++){w._data(n,"globalEval",!t||w._data(t[r],"globalEval"))}}function Ht(e,t){if(t.nodeType!==1||!w.hasData(e)){return}var n,r,i,s=w._data(e),o=w._data(t,s),u=s.events;if(u){delete o.handle;o.events={};for(n in u){for(r=0,i=u[n].length;r").css("cssText","display:block !important")).appendTo(t.documentElement);t=(It[0].contentWindow||It[0].contentDocument).document;t.write("");t.close();n=fn(e,t);It.detach()}Qt[e]=n}return n}function fn(e,t){var n=w(t.createElement(e)).appendTo(t.body),r=w.css(n[0],"display");n.remove();return r}function vn(e,t,n,r){var i;if(w.isArray(t)){w.each(t,function(t,i){if(n||cn.test(e)){r(e,i)}else{vn(e+"["+(typeof i==="object"?t:"")+"]",i,n,r)}})}else if(!n&&w.type(t)==="object"){for(i in t){vn(e+"["+i+"]",t[i],n,r)}}else{r(e,t)}}function _n(e){return function(t,n){if(typeof t!=="string"){n=t;t="*"}var r,i=0,s=t.toLowerCase().match(S)||[];if(w.isFunction(n)){while(r=s[i++]){if(r[0]==="+"){r=r.slice(1)||"*";(e[r]=e[r]||[]).unshift(n)}else{(e[r]=e[r]||[]).push(n)}}}}}function Dn(e,t,n,r){function o(u){var a;i[u]=true;w.each(e[u]||[],function(e,u){var f=u(t,n,r);if(typeof f==="string"&&!s&&!i[f]){t.dataTypes.unshift(f);o(f);return false}else if(s){return!(a=f)}});return a}var i={},s=e===An;return o(t.dataTypes[0])||!i["*"]&&o("*")}function Pn(e,n){var r,i,s=w.ajaxSettings.flatOptions||{};for(i in n){if(n[i]!==t){(s[i]?e:r||(r={}))[i]=n[i]}}if(r){w.extend(true,e,r)}return e}function Hn(e,n,r){var i,s,o,u,a=e.contents,f=e.dataTypes;while(f[0]==="*"){f.shift();if(s===t){s=e.mimeType||n.getResponseHeader("Content-Type")}}if(s){for(u in a){if(a[u]&&a[u].test(s)){f.unshift(u);break}}}if(f[0]in r){o=f[0]}else{for(u in r){if(!f[0]||e.converters[u+" "+f[0]]){o=u;break}if(!i){i=u}}o=o||i}if(o){if(o!==f[0]){f.unshift(o)}return r[o]}}function Bn(e,t,n,r){var i,s,o,u,a,f={},l=e.dataTypes.slice();if(l[1]){for(o in e.converters){f[o.toLowerCase()]=e.converters[o]}}s=l.shift();while(s){if(e.responseFields[s]){n[e.responseFields[s]]=t}if(!a&&r&&e.dataFilter){t=e.dataFilter(t,e.dataType)}a=s;s=l.shift();if(s){if(s==="*"){s=a}else if(a!=="*"&&a!==s){o=f[a+" "+s]||f["* "+s];if(!o){for(i in f){u=i.split(" ");if(u[1]===s){o=f[a+" "+u[0]]||f["* "+u[0]];if(o){if(o===true){o=f[i]}else if(f[i]!==true){s=u[0];l.unshift(u[1])}break}}}}if(o!==true){if(o&&e["throws"]){t=o(t)}else{try{t=o(t)}catch(c){return{state:"parsererror",error:o?c:"No conversion from "+a+" to "+s}}}}}}}return{state:"success",data:t}}function zn(){try{return new e.XMLHttpRequest}catch(t){}}function Wn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function Yn(){setTimeout(function(){Xn=t});return Xn=w.now()}function Zn(e,t,n){var r,i=(Gn[t]||[]).concat(Gn["*"]),s=0,o=i.length;for(;s)[^>]*|#([\w-]*))$/,N=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,C=/^[\],:{}\s]*$/,k=/(?:^|:|,)(?:\s*\[)+/g,L=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,O=/^-ms-/,M=/-([\da-z])/gi,_=function(e,t){return t.toUpperCase()},D=function(e){if(o.addEventListener||e.type==="load"||o.readyState==="complete"){P();w.ready()}},P=function(){if(o.addEventListener){o.removeEventListener("DOMContentLoaded",D,false);e.removeEventListener("load",D,false)}else{o.detachEvent("onreadystatechange",D);e.detachEvent("onload",D)}};w.fn=w.prototype={jquery:h,constructor:w,init:function(e,n,r){var i,s;if(!e){return this}if(typeof e==="string"){if(e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3){i=[null,e,null]}else{i=T.exec(e)}if(i&&(i[1]||!n)){if(i[1]){n=n instanceof w?n[0]:n;w.merge(this,w.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,true));if(N.test(i[1])&&w.isPlainObject(n)){for(i in n){if(w.isFunction(this[i])){this[i](n[i])}else{this.attr(i,n[i])}}}return this}else{s=o.getElementById(i[2]);if(s&&s.parentNode){if(s.id!==i[2]){return r.find(e)}this.length=1;this[0]=s}this.context=o;this.selector=e;return this}}else if(!n||n.jquery){return(n||r).find(e)}else{return this.constructor(n).find(e)}}else if(e.nodeType){this.context=this[0]=e;this.length=1;return this}else if(w.isFunction(e)){return r.ready(e)}if(e.selector!==t){this.selector=e.selector;this.context=e.context}return w.makeArray(e,this)},selector:"",length:0,toArray:function(){return v.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e){var t=w.merge(this.constructor(),e);t.prevObject=this;t.context=this.context;return t},each:function(e,t){return w.each(this,e,t)},ready:function(e){w.ready.promise().done(e);return this},slice:function(){return this.pushStack(v.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n0){return}n.resolveWith(o,[w]);if(w.fn.trigger){w(o).trigger("ready").off("ready")}},isFunction:function(e){return w.type(e)==="function"},isArray:Array.isArray||function(e){return w.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){if(e==null){return String(e)}return typeof e==="object"||typeof e==="function"?l[g.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||w.type(e)!=="object"||e.nodeType||w.isWindow(e)){return false}try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf")){return false}}catch(r){return false}if(w.support.ownLast){for(n in e){return y.call(e,n)}}for(n in e){}return n===t||y.call(e,n)},isEmptyObject:function(e){var t;for(t in e){return false}return true},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){if(!e||typeof e!=="string"){return null}if(typeof t==="boolean"){n=t;t=false}t=t||o;var r=N.exec(e),i=!n&&[];if(r){return[t.createElement(r[1])]}r=w.buildFragment([e],t,i);if(i){w(i).remove()}return w.merge([],r.childNodes)},parseJSON:function(t){if(e.JSON&&e.JSON.parse){return e.JSON.parse(t)}if(t===null){return t}if(typeof t==="string"){t=w.trim(t);if(t){if(C.test(t.replace(L,"@").replace(A,"]").replace(k,""))){return(new Function("return "+t))()}}}w.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!=="string"){return null}try{if(e.DOMParser){i=new DOMParser;r=i.parseFromString(n,"text/xml")}else{r=new ActiveXObject("Microsoft.XMLDOM");r.async="false";r.loadXML(n)}}catch(s){r=t}if(!r||!r.documentElement||r.getElementsByTagName("parsererror").length){w.error("Invalid XML: "+n)}return r},noop:function(){},globalEval:function(t){if(t&&w.trim(t)){(e.execScript||function(t){e["eval"].call(e,t)})(t)}},camelCase:function(e){return e.replace(O,"ms-").replace(M,_)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,s=e.length,o=H(e);if(n){if(o){for(;is.cacheLength){delete t[e.shift()]}return t[n]=r}var e=[];return t}function at(e){e[b]=true;return e}function ft(e){var t=h.createElement("div");try{return!!e(t)}catch(n){return false}finally{if(t.parentNode){t.parentNode.removeChild(t)}t=null}}function lt(e,t){var n=e.split("|"),r=e.length;while(r--){s.attrHandle[n[r]]=t}}function ct(e,t){var n=t&&e,r=n&&e.nodeType===1&&t.nodeType===1&&(~t.sourceIndex||O)-(~e.sourceIndex||O);if(r){return r}if(n){while(n=n.nextSibling){if(n===t){return-1}}}return e?1:-1}function ht(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function pt(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function dt(e){return at(function(t){t=+t;return at(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--){if(n[i=s[o]]){n[i]=!(r[i]=n[i])}}})})}function vt(){}function mt(e,t){var n,r,i,o,u,a,f,l=N[e+" "];if(l){return t?0:l.slice(0)}u=e;a=[];f=s.preFilter;while(u){if(!n||(r=X.exec(u))){if(r){u=u.slice(r[0].length)||u}a.push(i=[])}n=false;if(r=V.exec(u)){n=r.shift();i.push({value:n,type:r[0].replace(W," ")});u=u.slice(n.length)}for(o in s.filter){if((r=G[o].exec(u))&&(!f[o]||(r=f[o](r)))){n=r.shift();i.push({value:n,type:o,matches:r});u=u.slice(n.length)}}if(!n){break}}return t?u.length:u?ot.error(e):N(e,a).slice(0)}function gt(e){var t=0,n=e.length,r="";for(;t1?function(t,n,r){var i=e.length;while(i--){if(!e[i](t,n,r)){return false}}return true}:e[0]}function wt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u-1){s[f]=!(o[f]=c)}}}}else{g=wt(g===o?g.splice(d,g.length):g);if(i){i(null,o,g,a)}else{H.apply(o,g)}}})}function St(e){var t,n,r,i=e.length,o=s.relative[e[0].type],u=o||s.relative[" "],a=o?1:0,l=yt(function(e){return e===t},u,true),c=yt(function(e){return j.call(t,e)>-1},u,true),h=[function(e,n,r){return!o&&(r||n!==f)||((t=n).nodeType?l(e,n,r):c(e,n,r))}];for(;a1&&bt(h),a>1&>(e.slice(0,a-1).concat({value:e[a-2].type===" "?"*":""})).replace(W,"$1"),n,a0,o=e.length>0,u=function(u,a,l,c,p){var d,v,m,g=[],y=0,b="0",w=u&&[],E=p!=null,x=f,T=u||o&&s.find["TAG"]("*",p&&a.parentNode||a),N=S+=x==null?1:Math.random()||.1;if(E){f=a!==h&&a;i=n}for(;(d=T[b])!=null;b++){if(o&&d){v=0;while(m=e[v++]){if(m(d,a,l)){c.push(d);break}}if(E){S=N;i=++n}}if(r){if(d=!m&&d){y--}if(u){w.push(d)}}}y+=b;if(r&&b!==y){v=0;while(m=t[v++]){m(w,g,a,l)}if(u){if(y>0){while(b--){if(!(w[b]||g[b])){g[b]=D.call(c)}}}g=wt(g)}H.apply(c,g);if(E&&!u&&g.length>0&&y+t.length>1){ot.uniqueSort(c)}}if(E){S=N;f=x}return w};return r?at(u):u}function Tt(e,t,n){var r=0,i=t.length;for(;r2&&(f=u[0]).type==="ID"&&r.getById&&t.nodeType===9&&d&&s.relative[u[1].type]){t=(s.find["ID"](f.matches[0].replace(rt,it),t)||[])[0];if(!t){return n}e=e.slice(u.shift().value.length)}o=G["needsContext"].test(e)?0:u.length;while(o--){f=u[o];if(s.relative[l=f.type]){break}if(c=s.find[l]){if(i=c(f.matches[0].replace(rt,it),$.test(u[0].type)&&t.parentNode||t)){u.splice(o,1);e=i.length&>(u);if(!e){H.apply(n,i);return n}break}}}}}a(e,h)(i,t,!d,n,$.test(e));return n}var n,r,i,s,o,u,a,f,l,c,h,p,d,v,m,g,y,b="sizzle"+ -(new Date),E=e.document,S=0,x=0,T=ut(),N=ut(),C=ut(),k=false,L=function(e,t){if(e===t){k=true;return 0}return 0},A=typeof t,O=1<<31,M={}.hasOwnProperty,_=[],D=_.pop,P=_.push,H=_.push,B=_.slice,j=_.indexOf||function(e){var t=0,n=this.length;for(;t+~]|"+I+")"+I+"*"),$=new RegExp(I+"*[+~]"),J=new RegExp("="+I+"*([^\\]'\"]*)"+I+"*\\]","g"),K=new RegExp(z),Q=new RegExp("^"+R+"$"),G={ID:new RegExp("^#("+q+")"),CLASS:new RegExp("^\\.("+q+")"),TAG:new RegExp("^("+q.replace("w","w*")+")"),ATTR:new RegExp("^"+U),PSEUDO:new RegExp("^"+z),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+I+"*(even|odd|(([+-]|)(\\d*)n|)"+I+"*(?:([+-]|)"+I+"*(\\d+)|))"+I+"*\\)|)","i"),bool:new RegExp("^(?:"+F+")$","i"),needsContext:new RegExp("^"+I+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+I+"*((?:-\\d)?\\d*)"+I+"*\\)|)(?=[^-]|$)","i")},Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=new RegExp("\\\\([\\da-f]{1,6}"+I+"?|("+I+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,r&1023|56320)};try{H.apply(_=B.call(E.childNodes),E.childNodes);_[E.childNodes.length].nodeType}catch(st){H={apply:_.length?function(e,t){P.apply(e,B.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]){}e.length=n-1}}}u=ot.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":false};r=ot.support={};c=ot.setDocument=function(e){var t=e?e.ownerDocument||e:E,n=t.defaultView;if(t===h||t.nodeType!==9||!t.documentElement){return h}h=t;p=t.documentElement;d=!u(t);if(n&&n.attachEvent&&n!==n.top){n.attachEvent("onbeforeunload",function(){c()})}r.attributes=ft(function(e){e.className="i";return!e.getAttribute("className")});r.getElementsByTagName=ft(function(e){e.appendChild(t.createComment(""));return!e.getElementsByTagName("*").length});r.getElementsByClassName=ft(function(e){e.innerHTML="
    ";e.firstChild.className="i";return e.getElementsByClassName("i").length===2});r.getById=ft(function(e){p.appendChild(e).id=b;return!t.getElementsByName||!t.getElementsByName(b).length});if(r.getById){s.find["ID"]=function(e,t){if(typeof t.getElementById!==A&&d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}};s.filter["ID"]=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}}else{delete s.find["ID"];s.filter["ID"]=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}}s.find["TAG"]=r.getElementsByTagName?function(e,t){if(typeof t.getElementsByTagName!==A){return t.getElementsByTagName(e)}}:function(e,t){var n,r=[],i=0,s=t.getElementsByTagName(e);if(e==="*"){while(n=s[i++]){if(n.nodeType===1){r.push(n)}}return r}return s};s.find["CLASS"]=r.getElementsByClassName&&function(e,t){if(typeof t.getElementsByClassName!==A&&d){return t.getElementsByClassName(e)}};m=[];v=[];if(r.qsa=Y.test(t.querySelectorAll)){ft(function(e){e.innerHTML="";if(!e.querySelectorAll("[selected]").length){v.push("\\["+I+"*(?:value|"+F+")")}if(!e.querySelectorAll(":checked").length){v.push(":checked")}});ft(function(e){var n=t.createElement("input");n.setAttribute("type","hidden");e.appendChild(n).setAttribute("t","");if(e.querySelectorAll("[t^='']").length){v.push("[*^$]="+I+"*(?:''|\"\")")}if(!e.querySelectorAll(":enabled").length){v.push(":enabled",":disabled")}e.querySelectorAll("*,:x");v.push(",.*:")})}if(r.matchesSelector=Y.test(g=p.webkitMatchesSelector||p.mozMatchesSelector||p.oMatchesSelector||p.msMatchesSelector)){ft(function(e){r.disconnectedMatch=g.call(e,"div");g.call(e,"[s!='']:x");m.push("!=",z)})}v=v.length&&new RegExp(v.join("|"));m=m.length&&new RegExp(m.join("|"));y=Y.test(p.contains)||p.compareDocumentPosition?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&(n.contains?n.contains(r):e.compareDocumentPosition&&e.compareDocumentPosition(r)&16))}:function(e,t){if(t){while(t=t.parentNode){if(t===e){return true}}}return false};L=p.compareDocumentPosition?function(e,n){if(e===n){k=true;return 0}var i=n.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(n);if(i){if(i&1||!r.sortDetached&&n.compareDocumentPosition(e)===i){if(e===t||y(E,e)){return-1}if(n===t||y(E,n)){return 1}return l?j.call(l,e)-j.call(l,n):0}return i&4?-1:1}return e.compareDocumentPosition?-1:1}:function(e,n){var r,i=0,s=e.parentNode,o=n.parentNode,u=[e],a=[n];if(e===n){k=true;return 0}else if(!s||!o){return e===t?-1:n===t?1:s?-1:o?1:l?j.call(l,e)-j.call(l,n):0}else if(s===o){return ct(e,n)}r=e;while(r=r.parentNode){u.unshift(r)}r=n;while(r=r.parentNode){a.unshift(r)}while(u[i]===a[i]){i++}return i?ct(u[i],a[i]):u[i]===E?-1:a[i]===E?1:0};return t};ot.matches=function(e,t){return ot(e,null,null,t)};ot.matchesSelector=function(e,t){if((e.ownerDocument||e)!==h){c(e)}t=t.replace(J,"='$1']");if(r.matchesSelector&&d&&(!m||!m.test(t))&&(!v||!v.test(t))){try{var n=g.call(e,t);if(n||r.disconnectedMatch||e.document&&e.document.nodeType!==11){return n}}catch(i){}}return ot(t,h,null,[e]).length>0};ot.contains=function(e,t){if((e.ownerDocument||e)!==h){c(e)}return y(e,t)};ot.attr=function(e,n){if((e.ownerDocument||e)!==h){c(e)}var i=s.attrHandle[n.toLowerCase()],o=i&&M.call(s.attrHandle,n.toLowerCase())?i(e,n,!d):t;return o===t?r.attributes||!d?e.getAttribute(n):(o=e.getAttributeNode(n))&&o.specified?o.value:null:o};ot.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)};ot.uniqueSort=function(e){var t,n=[],i=0,s=0;k=!r.detectDuplicates;l=!r.sortStable&&e.slice(0);e.sort(L);if(k){while(t=e[s++]){if(t===e[s]){i=n.push(s)}}while(i--){e.splice(n[i],1)}}return e};o=ot.getText=function(e){var t,n="",r=0,i=e.nodeType;if(!i){for(;t=e[r];r++){n+=o(t)}}else if(i===1||i===9||i===11){if(typeof e.textContent==="string"){return e.textContent}else{for(e=e.firstChild;e;e=e.nextSibling){n+=o(e)}}}else if(i===3||i===4){return e.nodeValue}return n};s=ot.selectors={cacheLength:50,createPseudo:at,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:true}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:true},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){e[1]=e[1].replace(rt,it);e[3]=(e[4]||e[5]||"").replace(rt,it);if(e[2]==="~="){e[3]=" "+e[3]+" "}return e.slice(0,4)},CHILD:function(e){e[1]=e[1].toLowerCase();if(e[1].slice(0,3)==="nth"){if(!e[3]){ot.error(e[0])}e[4]=+(e[4]?e[5]+(e[6]||1):2*(e[3]==="even"||e[3]==="odd"));e[5]=+(e[7]+e[8]||e[3]==="odd")}else if(e[3]){ot.error(e[0])}return e},PSEUDO:function(e){var n,r=!e[5]&&e[2];if(G["CHILD"].test(e[0])){return null}if(e[3]&&e[4]!==t){e[2]=e[4]}else if(r&&K.test(r)&&(n=mt(r,true))&&(n=r.indexOf(")",r.length-n)-r.length)){e[0]=e[0].slice(0,n);e[2]=r.slice(0,n)}return e.slice(0,3)}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return e==="*"?function(){return true}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=T[e+" "];return t||(t=new RegExp("(^|"+I+")"+e+"("+I+"|$)"))&&T(e,function(e){return t.test(typeof e.className==="string"&&e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=ot.attr(r,e);if(i==null){return t==="!="}if(!t){return true}i+="";return t==="="?i===n:t==="!="?i!==n:t==="^="?n&&i.indexOf(n)===0:t==="*="?n&&i.indexOf(n)>-1:t==="$="?n&&i.slice(-n.length)===n:t==="~="?(" "+i+" ").indexOf(n)>-1:t==="|="?i===n||i.slice(0,n.length+1)===n+"-":false}},CHILD:function(e,t,n,r,i){var s=e.slice(0,3)!=="nth",o=e.slice(-4)!=="last",u=t==="of-type";return r===1&&i===0?function(e){return!!e.parentNode}:function(t,n,a){var f,l,c,h,p,d,v=s!==o?"nextSibling":"previousSibling",m=t.parentNode,g=u&&t.nodeName.toLowerCase(),y=!a&&!u;if(m){if(s){while(v){c=t;while(c=c[v]){if(u?c.nodeName.toLowerCase()===g:c.nodeType===1){return false}}d=v=e==="only"&&!d&&"nextSibling"}return true}d=[o?m.firstChild:m.lastChild];if(o&&y){l=m[b]||(m[b]={});f=l[e]||[];p=f[0]===S&&f[1];h=f[0]===S&&f[2];c=p&&m.childNodes[p];while(c=++p&&c&&c[v]||(h=p=0)||d.pop()){if(c.nodeType===1&&++h&&c===t){l[e]=[S,p,h];break}}}else if(y&&(f=(t[b]||(t[b]={}))[e])&&f[0]===S){h=f[1]}else{while(c=++p&&c&&c[v]||(h=p=0)||d.pop()){if((u?c.nodeName.toLowerCase()===g:c.nodeType===1)&&++h){if(y){(c[b]||(c[b]={}))[e]=[S,h]}if(c===t){break}}}}h-=i;return h===r||h%r===0&&h/r>=0}}},PSEUDO:function(e,t){var n,r=s.pseudos[e]||s.setFilters[e.toLowerCase()]||ot.error("unsupported pseudo: "+e);if(r[b]){return r(t)}if(r.length>1){n=[e,e,"",t];return s.setFilters.hasOwnProperty(e.toLowerCase())?at(function(e,n){var i,s=r(e,t),o=s.length;while(o--){i=j.call(e,s[o]);e[i]=!(n[i]=s[o])}}):function(e){return r(e,0,n)}}return r}},pseudos:{not:at(function(e){var t=[],n=[],r=a(e.replace(W,"$1"));return r[b]?at(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--){if(s=o[u]){e[u]=!(t[u]=s)}}}):function(e,i,s){t[0]=e;r(t,null,s,n);return!n.pop()}}),has:at(function(e){return function(t){return ot(e,t).length>0}}),contains:at(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:at(function(e){if(!Q.test(e||"")){ot.error("unsupported lang: "+e)}e=e.replace(rt,it).toLowerCase();return function(t){var n;do{if(n=d?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang")){n=n.toLowerCase();return n===e||n.indexOf(e+"-")===0}}while((t=t.parentNode)&&t.nodeType===1);return false}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===p},focus:function(e){return e===h.activeElement&&(!h.hasFocus||h.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===false},disabled:function(e){return e.disabled===true},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){if(e.parentNode){e.parentNode.selectedIndex}return e.selected===true},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling){if(e.nodeName>"@"||e.nodeType===3||e.nodeType===4){return false}}return true},parent:function(e){return!s.pseudos["empty"](e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},text:function(e){var t;return e.nodeName.toLowerCase()==="input"&&e.type==="text"&&((t=e.getAttribute("type"))==null||t.toLowerCase()===e.type)},first:dt(function(){return[0]}),last:dt(function(e,t){return[t-1]}),eq:dt(function(e,t,n){return[n<0?n+t:n]}),even:dt(function(e,t){var n=0;for(;n=0;){e.push(r)}return e}),gt:dt(function(e,t,n){var r=n<0?n+t:n;for(;++r";e.firstChild.setAttribute("value","");return e.firstChild.getAttribute("value")===""})){lt("value",function(e,t,n){if(!n&&e.nodeName.toLowerCase()==="input"){return e.defaultValue}})}if(!ft(function(e){return e.getAttribute("disabled")==null})){lt(F,function(e,t,n){var r;if(!n){return(r=e.getAttributeNode(t))&&r.specified?r.value:e[t]===true?t.toLowerCase():null}})}w.find=ot;w.expr=ot.selectors;w.expr[":"]=w.expr.pseudos;w.unique=ot.uniqueSort;w.text=ot.getText;w.isXMLDoc=ot.isXML;w.contains=ot.contains})(e);var B={};w.Callbacks=function(e){e=typeof e==="string"?B[e]||j(e):w.extend({},e);var n,r,i,s,o,u,a=[],f=!e.once&&[],l=function(t){r=e.memory&&t;i=true;o=u||0;u=0;s=a.length;n=true;for(;a&&o-1){a.splice(r,1);if(n){if(r<=s){s--}if(r<=o){o--}}}})}return this},has:function(e){return e?w.inArray(e,a)>-1:!!(a&&a.length)},empty:function(){a=[];s=0;return this},disable:function(){a=f=r=t;return this},disabled:function(){return!a},lock:function(){f=t;if(!r){c.disable()}return this},locked:function(){return!f},fireWith:function(e,t){if(a&&(!i||f)){t=t||[];t=[e,t.slice?t.slice():t];if(n){f.push(t)}else{l(t)}}return this},fire:function(){c.fireWith(this,arguments);return this},fired:function(){return!!i}};return c};w.extend({Deferred:function(e){var t=[["resolve","done",w.Callbacks("once memory"),"resolved"],["reject","fail",w.Callbacks("once memory"),"rejected"],["notify","progress",w.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){i.done(arguments).fail(arguments);return this},then:function(){var e=arguments;return w.Deferred(function(n){w.each(t,function(t,s){var o=s[0],u=w.isFunction(e[t])&&e[t];i[s[1]](function(){var e=u&&u.apply(this,arguments);if(e&&w.isFunction(e.promise)){e.promise().done(n.resolve).fail(n.reject).progress(n.notify)}else{n[o+"With"](this===r?n.promise():this,u?[e]:arguments)}})});e=null}).promise()},promise:function(e){return e!=null?w.extend(e,r):r}},i={};r.pipe=r.then;w.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add;if(u){o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock)}i[s[0]]=function(){i[s[0]+"With"](this===i?r:this,arguments);return this};i[s[0]+"With"]=o.fireWith});r.promise(i);if(e){e.call(i,i)}return i},when:function(e){var t=0,n=v.call(arguments),r=n.length,i=r!==1||e&&w.isFunction(e.promise)?r:0,s=i===1?e:w.Deferred(),o=function(e,t,n){return function(r){t[e]=this;n[e]=arguments.length>1?v.call(arguments):r;if(n===u){s.notifyWith(t,n)}else if(!--i){s.resolveWith(t,n)}}},u,a,f;if(r>1){u=new Array(r);a=new Array(r);f=new Array(r);for(;t
    a";n=p.getElementsByTagName("*")||[];r=p.getElementsByTagName("a")[0];if(!r||!r.style||!n.length){return t}u=o.createElement("select");f=u.appendChild(o.createElement("option"));s=p.getElementsByTagName("input")[0];r.style.cssText="top:1px;float:left;opacity:.5";t.getSetAttribute=p.className!=="t";t.leadingWhitespace=p.firstChild.nodeType===3;t.tbody=!p.getElementsByTagName("tbody").length;t.htmlSerialize=!!p.getElementsByTagName("link").length;t.style=/top/.test(r.getAttribute("style"));t.hrefNormalized=r.getAttribute("href")==="/a";t.opacity=/^0.5/.test(r.style.opacity);t.cssFloat=!!r.style.cssFloat;t.checkOn=!!s.value;t.optSelected=f.selected;t.enctype=!!o.createElement("form").enctype;t.html5Clone=o.createElement("nav").cloneNode(true).outerHTML!=="<:nav>";t.inlineBlockNeedsLayout=false;t.shrinkWrapBlocks=false;t.pixelPosition=false;t.deleteExpando=true;t.noCloneEvent=true;t.reliableMarginRight=true;t.boxSizingReliable=true;s.checked=true;t.noCloneChecked=s.cloneNode(true).checked;u.disabled=true;t.optDisabled=!f.disabled;try{delete p.test}catch(d){t.deleteExpando=false}s=o.createElement("input");s.setAttribute("value","");t.input=s.getAttribute("value")==="";s.value="t";s.setAttribute("type","radio");t.radioValue=s.value==="t";s.setAttribute("checked","t");s.setAttribute("name","t");a=o.createDocumentFragment();a.appendChild(s);t.appendChecked=s.checked;t.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;if(p.attachEvent){p.attachEvent("onclick",function(){t.noCloneEvent=false});p.cloneNode(true).click()}for(h in{submit:true,change:true,focusin:true}){p.setAttribute(l="on"+h,"t");t[h+"Bubbles"]=l in e||p.attributes[l].expando===false}p.style.backgroundClip="content-box";p.cloneNode(true).style.backgroundClip="";t.clearCloneStyle=p.style.backgroundClip==="content-box";for(h in w(t)){break}t.ownLast=h!=="0";w(function(){var n,r,s,u="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",a=o.getElementsByTagName("body")[0];if(!a){return}n=o.createElement("div");n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";a.appendChild(n).appendChild(p);p.innerHTML="
    t
    ";s=p.getElementsByTagName("td");s[0].style.cssText="padding:0;margin:0;border:0;display:none";c=s[0].offsetHeight===0;s[0].style.display="";s[1].style.display="none";t.reliableHiddenOffsets=c&&s[0].offsetHeight===0;p.innerHTML="";p.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";w.swap(a,a.style.zoom!=null?{zoom:1}:{},function(){t.boxSizing=p.offsetWidth===4});if(e.getComputedStyle){t.pixelPosition=(e.getComputedStyle(p,null)||{}).top!=="1%";t.boxSizingReliable=(e.getComputedStyle(p,null)||{width:"4px"}).width==="4px";r=p.appendChild(o.createElement("div"));r.style.cssText=p.style.cssText=u;r.style.marginRight=r.style.width="0";p.style.width="1px";t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)}if(typeof p.style.zoom!==i){p.innerHTML="";p.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1";t.inlineBlockNeedsLayout=p.offsetWidth===3;p.style.display="block";p.innerHTML="
    ";p.firstChild.style.width="5px";t.shrinkWrapBlocks=p.offsetWidth!==3;if(t.inlineBlockNeedsLayout){a.style.zoom=1}}a.removeChild(n);n=p=s=r=null});n=u=a=f=r=s=null;return t}({});var F=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;w.extend({cache:{},noData:{applet:true,embed:true,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){e=e.nodeType?w.cache[e[w.expando]]:e[w.expando];return!!e&&!z(e)},data:function(e,t,n){return q(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return q(e,t,n,true)},_removeData:function(e,t){return R(e,t,true)},acceptData:function(e){if(e.nodeType&&e.nodeType!==1&&e.nodeType!==9){return false}var t=e.nodeName&&w.noData[e.nodeName.toLowerCase()];return!t||t!==true&&e.getAttribute("classid")===t}});w.fn.extend({data:function(e,n){var r,i,s=null,o=0,u=this[0];if(e===t){if(this.length){s=w.data(u);if(u.nodeType===1&&!w._data(u,"parsedAttrs")){r=u.attributes;for(;o1?this.each(function(){w.data(this,e,n)}):u?U(u,e,w.data(u,e)):null},removeData:function(e){return this.each(function(){w.removeData(this,e)})}});w.extend({queue:function(e,t,n){var r;if(e){t=(t||"fx")+"queue";r=w._data(e,t);if(n){if(!r||w.isArray(n)){r=w._data(e,t,w.makeArray(n))}else{r.push(n)}}return r||[]}},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),s=w._queueHooks(e,t),o=function(){w.dequeue(e,t)};if(i==="inprogress"){i=n.shift();r--}if(i){if(t==="fx"){n.unshift("inprogress")}delete s.stop;i.call(e,o,s)}if(!r&&s){s.empty.fire()}},_queueHooks:function(e,t){var n=t+"queueHooks";return w._data(e,n)||w._data(e,n,{empty:w.Callbacks("once memory").add(function(){w._removeData(e,t+"queue");w._removeData(e,n)})})}});w.fn.extend({queue:function(e,n){var r=2;if(typeof e!=="string"){n=e;e="fx";r--}if(arguments.length1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})},prop:function(e,t){return w.access(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){e=w.propFix[e]||e;return this.each(function(){try{this[e]=t;delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o=0,u=this.length,a=typeof e==="string"&&e;if(w.isFunction(e)){return this.each(function(t){w(this).addClass(e.call(this,t,this.className))})}if(a){t=(e||"").match(S)||[];for(;o=0){r=r.replace(" "+i+" "," ")}}n.className=e?w.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e;if(typeof t==="boolean"&&n==="string"){return t?this.addClass(e):this.removeClass(e)}if(w.isFunction(e)){return this.each(function(n){w(this).toggleClass(e.call(this,n,this.className,t),t)})}return this.each(function(){if(n==="string"){var t,r=0,s=w(this),o=e.match(S)||[];while(t=o[r++]){if(s.hasClass(t)){s.removeClass(t)}else{s.addClass(t)}}}else if(n===i||n==="boolean"){if(this.className){w._data(this,"__className__",this.className)}this.className=this.className||e===false?"":w._data(this,"__className__")||""}})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n=0){return true}}return false},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s){r=w.valHooks[s.type]||w.valHooks[s.nodeName.toLowerCase()];if(r&&"get"in r&&(n=r.get(s,"value"))!==t){return n}n=s.value;return typeof n==="string"?n.replace($,""):n==null?"":n}return}i=w.isFunction(e);return this.each(function(n){var s;if(this.nodeType!==1){return}if(i){s=e.call(this,n,w(this).val())}else{s=e}if(s==null){s=""}else if(typeof s==="number"){s+=""}else if(w.isArray(s)){s=w.map(s,function(e){return e==null?"":e+""})}r=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()];if(!r||!("set"in r)||r.set(this,s,"value")===t){this.value=s}})}});w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return t!=null?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a=0){n=true}}if(!n){e.selectedIndex=-1}return s}}},attr:function(e,n,r){var s,o,u=e.nodeType;if(!e||u===3||u===8||u===2){return}if(typeof e.getAttribute===i){return w.prop(e,n,r)}if(u!==1||!w.isXMLDoc(e)){n=n.toLowerCase();s=w.attrHooks[n]||(w.expr.match.bool.test(n)?X:W)}if(r!==t){if(r===null){w.removeAttr(e,n)}else if(s&&"set"in s&&(o=s.set(e,r,n))!==t){return o}else{e.setAttribute(n,r+"");return r}}else if(s&&"get"in s&&(o=s.get(e,n))!==null){return o}else{o=w.find.attr(e,n);return o==null?t:o}},removeAttr:function(e,t){var n,r,i=0,s=t&&t.match(S);if(s&&e.nodeType===1){while(n=s[i++]){r=w.propFix[n]||n;if(w.expr.match.bool.test(n)){if(Y&&G||!Q.test(n)){e[r]=false}else{e[w.camelCase("default-"+n)]=e[r]=false}}else{w.attr(e,n,"")}e.removeAttribute(G?n:r)}}},attrHooks:{type:{set:function(e,t){if(!w.support.radioValue&&t==="radio"&&w.nodeName(e,"input")){var n=e.value;e.setAttribute("type",t);if(n){e.value=n}return t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,s,o,u=e.nodeType;if(!e||u===3||u===8||u===2){return}o=u!==1||!w.isXMLDoc(e);if(o){n=w.propFix[n]||n;s=w.propHooks[n]}if(r!==t){return s&&"set"in s&&(i=s.set(e,r,n))!==t?i:e[n]=r}else{return s&&"get"in s&&(i=s.get(e,n))!==null?i:e[n]}},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):J.test(e.nodeName)||K.test(e.nodeName)&&e.href?0:-1}}}});X={set:function(e,t,n){if(t===false){w.removeAttr(e,n)}else if(Y&&G||!Q.test(n)){e.setAttribute(!G&&w.propFix[n]||n,n)}else{e[w.camelCase("default-"+n)]=e[n]=true}return n}};w.each(w.expr.match.bool.source.match(/\w+/g),function(e,n){var r=w.expr.attrHandle[n]||w.find.attr;w.expr.attrHandle[n]=Y&&G||!Q.test(n)?function(e,n,i){var s=w.expr.attrHandle[n],o=i?t:(w.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;w.expr.attrHandle[n]=s;return o}:function(e,n,r){return r?t:e[w.camelCase("default-"+n)]?n.toLowerCase():null}});if(!Y||!G){w.attrHooks.value={set:function(e,t,n){if(w.nodeName(e,"input")){e.defaultValue=t}else{return W&&W.set(e,t,n)}}}}if(!G){W={set:function(e,n,r){var i=e.getAttributeNode(r);if(!i){e.setAttributeNode(i=e.ownerDocument.createAttribute(r))}i.value=n+="";return r==="value"||n===e.getAttribute(r)?n:t}};w.expr.attrHandle.id=w.expr.attrHandle.name=w.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.value!==""?i.value:null};w.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:W.set};w.attrHooks.contenteditable={set:function(e,t,n){W.set(e,t===""?false:t,n)}};w.each(["width","height"],function(e,t){w.attrHooks[t]={set:function(e,n){if(n===""){e.setAttribute(t,"auto");return n}}}})}if(!w.support.hrefNormalized){w.each(["href","src"],function(e,t){w.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})}if(!w.support.style){w.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}}if(!w.support.optSelected){w.propHooks.selected={get:function(e){var t=e.parentNode;if(t){t.selectedIndex;if(t.parentNode){t.parentNode.selectedIndex}}return null}}}w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});if(!w.support.enctype){w.propFix.enctype="encoding"}w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(w.isArray(t)){return e.checked=w.inArray(w(e).val(),t)>=0}}};if(!w.support.checkOn){w.valHooks[this].get=function(e){return e.getAttribute("value")===null?"on":e.value}}});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;w.event={global:{},add:function(e,n,r,s,o){var u,a,f,l,c,h,p,d,v,m,g,y=w._data(e);if(!y){return}if(r.handler){l=r;r=l.handler;o=l.selector}if(!r.guid){r.guid=w.guid++}if(!(a=y.events)){a=y.events={}}if(!(h=y.handle)){h=y.handle=function(e){return typeof w!==i&&(!e||w.event.triggered!==e.type)?w.event.dispatch.apply(h.elem,arguments):t};h.elem=e}n=(n||"").match(S)||[""];f=n.length;while(f--){u=rt.exec(n[f])||[];v=g=u[1];m=(u[2]||"").split(".").sort();if(!v){continue}c=w.event.special[v]||{};v=(o?c.delegateType:c.bindType)||v;c=w.event.special[v]||{};p=w.extend({type:v,origType:g,data:s,handler:r,guid:r.guid,selector:o,needsContext:o&&w.expr.match.needsContext.test(o),namespace:m.join(".")},l);if(!(d=a[v])){d=a[v]=[];d.delegateCount=0;if(!c.setup||c.setup.call(e,s,m,h)===false){if(e.addEventListener){e.addEventListener(v,h,false)}else if(e.attachEvent){e.attachEvent("on"+v,h)}}}if(c.add){c.add.call(e,p);if(!p.handler.guid){p.handler.guid=r.guid}}if(o){d.splice(d.delegateCount++,0,p)}else{d.push(p)}w.event.global[v]=true}e=null},remove:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,p,d,v,m=w.hasData(e)&&w._data(e);if(!m||!(l=m.events)){return}t=(t||"").match(S)||[""];f=t.length;while(f--){u=rt.exec(t[f])||[];p=v=u[1];d=(u[2]||"").split(".").sort();if(!p){for(p in l){w.event.remove(e,p+t[f],n,r,true)}continue}c=w.event.special[p]||{};p=(r?c.delegateType:c.bindType)||p;h=l[p]||[];u=u[2]&&new RegExp("(^|\\.)"+d.join("\\.(?:.*\\.|)")+"(\\.|$)");a=s=h.length;while(s--){o=h[s];if((i||v===o.origType)&&(!n||n.guid===o.guid)&&(!u||u.test(o.namespace))&&(!r||r===o.selector||r==="**"&&o.selector)){h.splice(s,1);if(o.selector){h.delegateCount--}if(c.remove){c.remove.call(e,o)}}}if(a&&!h.length){if(!c.teardown||c.teardown.call(e,d,m.handle)===false){w.removeEvent(e,p,m.handle)}delete l[p]}}if(w.isEmptyObject(l)){delete m.handle;w._removeData(e,"events")}},trigger:function(n,r,i,s){var u,a,f,l,c,h,p,d=[i||o],v=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];f=h=i=i||o;if(i.nodeType===3||i.nodeType===8){return}if(nt.test(v+w.event.triggered)){return}if(v.indexOf(".")>=0){m=v.split(".");v=m.shift();m.sort()}a=v.indexOf(":")<0&&"on"+v;n=n[w.expando]?n:new w.Event(v,typeof n==="object"&&n);n.isTrigger=s?2:3;n.namespace=m.join(".");n.namespace_re=n.namespace?new RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null;n.result=t;if(!n.target){n.target=i}r=r==null?[n]:w.makeArray(r,[n]);c=w.event.special[v]||{};if(!s&&c.trigger&&c.trigger.apply(i,r)===false){return}if(!s&&!c.noBubble&&!w.isWindow(i)){l=c.delegateType||v;if(!nt.test(l+v)){f=f.parentNode}for(;f;f=f.parentNode){d.push(f);h=f}if(h===(i.ownerDocument||o)){d.push(h.defaultView||h.parentWindow||e)}}p=0;while((f=d[p++])&&!n.isPropagationStopped()){n.type=p>1?l:c.bindType||v;u=(w._data(f,"events")||{})[n.type]&&w._data(f,"handle");if(u){u.apply(f,r)}u=a&&f[a];if(u&&w.acceptData(f)&&u.apply&&u.apply(f,r)===false){n.preventDefault()}}n.type=v;if(!s&&!n.isDefaultPrevented()){if((!c._default||c._default.apply(d.pop(),r)===false)&&w.acceptData(i)){if(a&&i[v]&&!w.isWindow(i)){h=i[a];if(h){i[a]=null}w.event.triggered=v;try{i[v]()}catch(g){}w.event.triggered=t;if(h){i[a]=h}}}}return n.result},dispatch:function(e){e=w.event.fix(e);var n,r,i,s,o,u=[],a=v.call(arguments),f=(w._data(this,"events")||{})[e.type]||[],l=w.event.special[e.type]||{};a[0]=e;e.delegateTarget=this;if(l.preDispatch&&l.preDispatch.call(this,e)===false){return}u=w.event.handlers.call(this,e,f);n=0;while((s=u[n++])&&!e.isPropagationStopped()){e.currentTarget=s.elem;o=0;while((i=s.handlers[o++])&&!e.isImmediatePropagationStopped()){if(!e.namespace_re||e.namespace_re.test(i.namespace)){e.handleObj=i;e.data=i.data;r=((w.event.special[i.origType]||{}).handle||i.handler).apply(s.elem,a);if(r!==t){if((e.result=r)===false){e.preventDefault();e.stopPropagation()}}}}}if(l.postDispatch){l.postDispatch.call(this,e)}return e.result},handlers:function(e,n){var r,i,s,o,u=[],a=n.delegateCount,f=e.target;if(a&&f.nodeType&&(!e.button||e.type!=="click")){for(;f!=this;f=f.parentNode||this){if(f.nodeType===1&&(f.disabled!==true||e.type!=="click")){s=[];for(o=0;o=0:w.find(r,this,null,[f]).length}if(s[r]){s.push(i)}}if(s.length){u.push({elem:f,handlers:s})}}}}if(a1?w.unique(n):n);n.selector=this.selector?this.selector+" "+e:e;return n},has:function(e){var t,n=w(e,this),r=n.length;return this.filter(function(){for(t=0;t-1:n.nodeType===1&&w.find.matchesSelector(n,e))){n=s.push(n);break}}}return this.pushStack(s.length>1?w.unique(s):s)},index:function(e){if(!e){return this[0]&&this[0].parentNode?this.first().prevAll().length:-1}if(typeof e==="string"){return w.inArray(this[0],w(e))}return w.inArray(e.jquery?e[0]:e,this)},add:function(e,t){var n=typeof e==="string"?w(e,t):w.makeArray(e&&e.nodeType?[e]:e),r=w.merge(this.get(),n);return this.pushStack(w.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}});w.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return w.dir(e,"parentNode")},parentsUntil:function(e,t,n){return w.dir(e,"parentNode",n)},next:function(e){return ct(e,"nextSibling")},prev:function(e){return ct(e,"previousSibling")},nextAll:function(e){return w.dir(e,"nextSibling")},prevAll:function(e){return w.dir(e,"previousSibling")},nextUntil:function(e,t,n){return w.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return w.dir(e,"previousSibling",n)},siblings:function(e){return w.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return w.sibling(e.firstChild)},contents:function(e){return w.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:w.merge([],e.childNodes)}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);if(e.slice(-5)!=="Until"){r=n}if(r&&typeof r==="string"){i=w.filter(r,i)}if(this.length>1){if(!lt[e]){i=w.unique(i)}if(at.test(e)){i=i.reverse()}}return this.pushStack(i)}});w.extend({filter:function(e,t,n){var r=t[0];if(n){e=":not("+e+")"}return t.length===1&&r.nodeType===1?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return e.nodeType===1}))},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!w(s).is(r))){if(s.nodeType===1){i.push(s)}s=s[n]}return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling){if(e.nodeType===1&&e!==t){n.push(e)}}return n}});var dt="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|"+"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",vt=/ jQuery\d+="(?:null|\d+)"/g,mt=new RegExp("<(?:"+dt+")[\\s/>]","i"),gt=/^\s+/,yt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,wt=/\s*$/g,Lt={option:[1,""],legend:[1,"
    ","
    "],area:[1,"",""],param:[1,"",""],thead:[1,"","
    "],tr:[2,"","
    "],col:[2,"","
    "],td:[3,"","
    "],_default:w.support.htmlSerialize?[0,"",""]:[1,"X
    ","
    "]},At=pt(o),Ot=At.appendChild(o.createElement("div"));Lt.optgroup=Lt.option;Lt.tbody=Lt.tfoot=Lt.colgroup=Lt.caption=Lt.thead;Lt.th=Lt.td;w.fn.extend({text:function(e){return w.access(this,function(e){return e===t?w.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(this.nodeType===1||this.nodeType===11||this.nodeType===9){var t=Mt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(this.nodeType===1||this.nodeType===11||this.nodeType===9){var t=Mt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){if(this.parentNode){this.parentNode.insertBefore(e,this)}})},after:function(){return this.domManip(arguments,function(e){if(this.parentNode){this.parentNode.insertBefore(e,this.nextSibling)}})},remove:function(e,t){var n,r=e?w.filter(e,this):this,i=0;for(;(n=r[i])!=null;i++){if(!t&&n.nodeType===1){w.cleanData(jt(n))}if(n.parentNode){if(t&&w.contains(n.ownerDocument,n)){Pt(jt(n,"script"))}n.parentNode.removeChild(n)}}return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){if(e.nodeType===1){w.cleanData(jt(e,false))}while(e.firstChild){e.removeChild(e.firstChild)}if(e.options&&w.nodeName(e,"select")){e.options.length=0}}return this},clone:function(e,t){e=e==null?false:e;t=t==null?e:t;return this.map(function(){return w.clone(this,e,t)})},html:function(e){return w.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t){return n.nodeType===1?n.innerHTML.replace(vt,""):t}if(typeof e==="string"&&!St.test(e)&&(w.support.htmlSerialize||!mt.test(e))&&(w.support.leadingWhitespace||!gt.test(e))&&!Lt[(bt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(yt,"<$1>");try{for(;r")){s=e.cloneNode(true)}else{Ot.innerHTML=e.outerHTML;Ot.removeChild(s=Ot.firstChild)}if((!w.support.noCloneEvent||!w.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!w.isXMLDoc(e)){r=jt(s);u=jt(e);for(o=0;(i=u[o])!=null;++o){if(r[o]){Bt(i,r[o])}}}if(t){if(n){u=u||jt(e);r=r||jt(s);for(o=0;(i=u[o])!=null;o++){Ht(i,r[o])}}else{Ht(e,s)}}r=jt(s,"script");if(r.length>0){Pt(r,!a&&jt(e,"script"))}r=u=i=null;return s},buildFragment:function(e,t,n,r){var i,s,o,u,a,f,l,c=e.length,h=pt(t),p=[],d=0;for(;d")+l[2];i=l[0];while(i--){u=u.lastChild}if(!w.support.leadingWhitespace&>.test(s)){p.push(t.createTextNode(gt.exec(s)[0]))}if(!w.support.tbody){s=a==="table"&&!wt.test(s)?u.firstChild:l[1]===""&&!wt.test(s)?u:0;i=s&&s.childNodes.length;while(i--){if(w.nodeName(f=s.childNodes[i],"tbody")&&!f.childNodes.length){s.removeChild(f)}}}w.merge(p,u.childNodes);u.textContent="";while(u.firstChild){u.removeChild(u.firstChild)}u=h.lastChild}}}if(u){h.removeChild(u)}if(!w.support.appendChecked){w.grep(jt(p,"input"),Ft)}d=0;while(s=p[d++]){if(r&&w.inArray(s,r)!==-1){continue}o=w.contains(s.ownerDocument,s);u=jt(h.appendChild(s),"script");if(o){Pt(u)}if(n){i=0;while(s=u[i++]){if(Nt.test(s.type||"")){n.push(s)}}}}u=null;return h},cleanData:function(e,t){var n,r,s,o,u=0,a=w.expando,f=w.cache,l=w.support.deleteExpando,h=w.event.special;for(;(n=e[u])!=null;u++){if(t||w.acceptData(n)){s=n[a];o=s&&f[s];if(o){if(o.events){for(r in o.events){if(h[r]){w.event.remove(n,r)}else{w.removeEvent(n,r,o.handle)}}}if(f[s]){delete f[s];if(l){delete n[a]}else if(typeof n.removeAttribute!==i){n.removeAttribute(a)}else{n[a]=null}c.push(s)}}}}},_evalUrl:function(e){return w.ajax({url:e,type:"GET",dataType:"script",async:false,global:false,"throws":true})}});w.fn.extend({wrapAll:function(e){if(w.isFunction(e)){return this.each(function(t){w(this).wrapAll(e.call(this,t))})}if(this[0]){var t=w(e,this[0].ownerDocument).eq(0).clone(true);if(this[0].parentNode){t.insertBefore(this[0])}t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1){e=e.firstChild}return e}).append(this)}return this},wrapInner:function(e){if(w.isFunction(e)){return this.each(function(t){w(this).wrapInner(e.call(this,t))})}return this.each(function(){var t=w(this),n=t.contents();if(n.length){n.wrapAll(e)}else{t.append(e)}})},wrap:function(e){var t=w.isFunction(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){if(!w.nodeName(this,"body")){w(this).replaceWith(this.childNodes)}}).end()}});var It,qt,Rt,Ut=/alpha\([^)]*\)/i,zt=/opacity\s*=\s*([^)]*)/,Wt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Vt=/^margin/,$t=new RegExp("^("+E+")(.*)$","i"),Jt=new RegExp("^("+E+")(?!px)[a-z%]+$","i"),Kt=new RegExp("^([+-])=("+E+")","i"),Qt={BODY:"block"},Gt={position:"absolute",visibility:"hidden",display:"block"},Yt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];w.fn.extend({css:function(e,n){return w.access(this,function(e,n,r){var i,s,o={},u=0;if(w.isArray(n)){s=qt(e);i=n.length;for(;u1)},show:function(){return rn(this,true)},hide:function(){return rn(this)},toggle:function(e){if(typeof e==="boolean"){return e?this.show():this.hide()}return this.each(function(){if(nn(this)){w(this).show()}else{w(this).hide()}})}});w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Rt(e,"opacity");return n===""?"1":n}}}},cssNumber:{columnCount:true,fillOpacity:true,fontWeight:true,lineHeight:true,opacity:true,order:true,orphans:true,widows:true,zIndex:true,zoom:true},cssProps:{"float":w.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style){return}var s,o,u,a=w.camelCase(n),f=e.style;n=w.cssProps[a]||(w.cssProps[a]=tn(f,a));u=w.cssHooks[n]||w.cssHooks[a];if(r!==t){o=typeof r;if(o==="string"&&(s=Kt.exec(r))){r=(s[1]+1)*s[2]+parseFloat(w.css(e,n));o="number"}if(r==null||o==="number"&&isNaN(r)){return}if(o==="number"&&!w.cssNumber[a]){r+="px"}if(!w.support.clearCloneStyle&&r===""&&n.indexOf("background")===0){f[n]="inherit"}if(!u||!("set"in u)||(r=u.set(e,r,i))!==t){try{f[n]=r}catch(l){}}}else{if(u&&"get"in u&&(s=u.get(e,false,i))!==t){return s}return f[n]}},css:function(e,n,r,i){var s,o,u,a=w.camelCase(n);n=w.cssProps[a]||(w.cssProps[a]=tn(e.style,a));u=w.cssHooks[n]||w.cssHooks[a];if(u&&"get"in u){o=u.get(e,true,r)}if(o===t){o=Rt(e,n,i)}if(o==="normal"&&n in Yt){o=Yt[n]}if(r===""||r){s=parseFloat(o);return r===true||w.isNumeric(s)?s||0:o}return o}});if(e.getComputedStyle){qt=function(t){return e.getComputedStyle(t,null)};Rt=function(e,n,r){var i,s,o,u=r||qt(e),a=u?u.getPropertyValue(n)||u[n]:t,f=e.style;if(u){if(a===""&&!w.contains(e.ownerDocument,e)){a=w.style(e,n)}if(Jt.test(a)&&Vt.test(n)){i=f.width;s=f.minWidth;o=f.maxWidth;f.minWidth=f.maxWidth=f.width=a;a=u.width;f.width=i;f.minWidth=s;f.maxWidth=o}}return a}}else if(o.documentElement.currentStyle){qt=function(e){return e.currentStyle};Rt=function(e,n,r){var i,s,o,u=r||qt(e),a=u?u[n]:t,f=e.style;if(a==null&&f&&f[n]){a=f[n]}if(Jt.test(a)&&!Wt.test(n)){i=f.left;s=e.runtimeStyle;o=s&&s.left;if(o){s.left=e.currentStyle.left}f.left=n==="fontSize"?"1em":a;a=f.pixelLeft+"px";f.left=i;if(o){s.left=o}}return a===""?"auto":a}}w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n){return e.offsetWidth===0&&Xt.test(w.css(e,"display"))?w.swap(e,Gt,function(){return un(e,t,r)}):un(e,t,r)}},set:function(e,n,r){var i=r&&qt(e);return sn(e,n,r?on(e,t,r,w.support.boxSizing&&w.css(e,"boxSizing",false,i)==="border-box",i):0)}}});if(!w.support.opacity){w.cssHooks.opacity={get:function(e,t){return zt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=w.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if((t>=1||t==="")&&w.trim(s.replace(Ut,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(t===""||r&&!r.filter){return}}n.filter=Ut.test(s)?s.replace(Ut,i):s+" "+i}}}w(function(){if(!w.support.reliableMarginRight){w.cssHooks.marginRight={get:function(e,t){if(t){return w.swap(e,{display:"inline-block"},Rt,[e,"marginRight"])}}}}if(!w.support.pixelPosition&&w.fn.position){w.each(["top","left"],function(e,t){w.cssHooks[t]={get:function(e,n){if(n){n=Rt(e,t);return Jt.test(n)?w(e).position()[t]+"px":n}}}})}});if(w.expr&&w.expr.filters){w.expr.filters.hidden=function(e){return e.offsetWidth<=0&&e.offsetHeight<=0||!w.support.reliableHiddenOffsets&&(e.style&&e.style.display||w.css(e,"display"))==="none"};w.expr.filters.visible=function(e){return!w.expr.filters.hidden(e)}}w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){var r=0,i={},s=typeof n==="string"?n.split(" "):[n];for(;r<4;r++){i[e+Zt[r]+t]=s[r]||s[r-2]||s[0]}return i}};if(!Vt.test(e)){w.cssHooks[e+t].set=sn}});var ln=/%20/g,cn=/\[\]$/,hn=/\r?\n/g,pn=/^(?:submit|button|image|reset|file)$/i,dn=/^(?:input|select|textarea|keygen)/i;w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&dn.test(this.nodeName)&&!pn.test(e)&&(this.checked||!xt.test(e))}).map(function(e,t){var n=w(this).val();return n==null?null:w.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(hn,"\r\n")}}):{name:t.name,value:n.replace(hn,"\r\n")}}).get()}});w.param=function(e,n){var r,i=[],s=function(e,t){t=w.isFunction(t)?t():t==null?"":t;i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t){n=w.ajaxSettings&&w.ajaxSettings.traditional}if(w.isArray(e)||e.jquery&&!w.isPlainObject(e)){w.each(e,function(){s(this.name,this.value)})}else{for(r in e){vn(r,e[r],n,s)}}return i.join("&").replace(ln,"+")};w.each(("blur focus focusin focusout load resize scroll unload click dblclick "+"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave "+"change select submit keydown keypress keyup error contextmenu").split(" "),function(e,t){w.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}});w.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return arguments.length===1?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,gn,yn=w.now(),bn=/\?/,wn=/#.*$/,En=/([?&])_=[^&]*/,Sn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,xn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Tn=/^(?:GET|HEAD)$/,Nn=/^\/\//,Cn=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,kn=w.fn.load,Ln={},An={},On="*/".concat("*");try{gn=s.href}catch(Mn){gn=o.createElement("a");gn.href="";gn=gn.href}mn=Cn.exec(gn.toLowerCase())||[];w.fn.load=function(e,n,r){if(typeof e!=="string"&&kn){return kn.apply(this,arguments)}var i,s,o,u=this,a=e.indexOf(" ");if(a>=0){i=e.slice(a,e.length);e=e.slice(0,a)}if(w.isFunction(n)){r=n;n=t}else if(n&&typeof n==="object"){o="POST"}if(u.length>0){w.ajax({url:e,type:o,dataType:"html",data:n}).done(function(e){s=arguments;u.html(i?w("
    ").append(w.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){u.each(r,s||[e.responseText,t,e])})}return this};w.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){w.fn[t]=function(e){return this.on(t,e)}});w.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:gn,type:"GET",isLocal:xn.test(mn[1]),global:true,processData:true,async:true,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":On,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":true,"text json":w.parseJSON,"text xml":w.parseXML},flatOptions:{url:true,context:true}},ajaxSetup:function(e,t){return t?Pn(Pn(e,w.ajaxSettings),t):Pn(w.ajaxSettings,e)},ajaxPrefilter:_n(Ln),ajaxTransport:_n(An),ajax:function(e,n){function N(e,n,r,i){var l,g,y,E,S,T=n;if(b===2){return}b=2;if(u){clearTimeout(u)}f=t;o=i||"";x.readyState=e>0?4:0;l=e>=200&&e<300||e===304;if(r){E=Hn(c,x,r)}E=Bn(c,E,x,l);if(l){if(c.ifModified){S=x.getResponseHeader("Last-Modified");if(S){w.lastModified[s]=S}S=x.getResponseHeader("etag");if(S){w.etag[s]=S}}if(e===204||c.type==="HEAD"){T="nocontent"}else if(e===304){T="notmodified"}else{T=E.state;g=E.data;y=E.error;l=!y}}else{y=T;if(e||!T){T="error";if(e<0){e=0}}}x.status=e;x.statusText=(n||T)+"";if(l){d.resolveWith(h,[g,T,x])}else{d.rejectWith(h,[x,T,y])}x.statusCode(m);m=t;if(a){p.trigger(l?"ajaxSuccess":"ajaxError",[x,c,l?g:y])}v.fireWith(h,[x,T]);if(a){p.trigger("ajaxComplete",[x,c]);if(!--w.active){w.event.trigger("ajaxStop")}}}if(typeof e==="object"){n=e;e=t}n=n||{};var r,i,s,o,u,a,f,l,c=w.ajaxSetup({},n),h=c.context||c,p=c.context&&(h.nodeType||h.jquery)?w(h):w.event,d=w.Deferred(),v=w.Callbacks("once memory"),m=c.statusCode||{},g={},y={},b=0,E="canceled",x={readyState:0,getResponseHeader:function(e){var t;if(b===2){if(!l){l={};while(t=Sn.exec(o)){l[t[1].toLowerCase()]=t[2]}}t=l[e.toLowerCase()]}return t==null?null:t},getAllResponseHeaders:function(){return b===2?o:null},setRequestHeader:function(e,t){var n=e.toLowerCase();if(!b){e=y[n]=y[n]||e;g[e]=t}return this},overrideMimeType:function(e){if(!b){c.mimeType=e}return this},statusCode:function(e){var t;if(e){if(b<2){for(t in e){m[t]=[m[t],e[t]]}}else{x.always(e[x.status])}}return this},abort:function(e){var t=e||E;if(f){f.abort(t)}N(0,t);return this}};d.promise(x).complete=v.add;x.success=x.done;x.error=x.fail;c.url=((e||c.url||gn)+"").replace(wn,"").replace(Nn,mn[1]+"//");c.type=n.method||n.type||c.method||c.type;c.dataTypes=w.trim(c.dataType||"*").toLowerCase().match(S)||[""];if(c.crossDomain==null){r=Cn.exec(c.url.toLowerCase());c.crossDomain=!!(r&&(r[1]!==mn[1]||r[2]!==mn[2]||(r[3]||(r[1]==="http:"?"80":"443"))!==(mn[3]||(mn[1]==="http:"?"80":"443"))))}if(c.data&&c.processData&&typeof c.data!=="string"){c.data=w.param(c.data,c.traditional)}Dn(Ln,c,n,x);if(b===2){return x}a=c.global;if(a&&w.active++===0){w.event.trigger("ajaxStart")}c.type=c.type.toUpperCase();c.hasContent=!Tn.test(c.type);s=c.url;if(!c.hasContent){if(c.data){s=c.url+=(bn.test(s)?"&":"?")+c.data;delete c.data}if(c.cache===false){c.url=En.test(s)?s.replace(En,"$1_="+yn++):s+(bn.test(s)?"&":"?")+"_="+yn++}}if(c.ifModified){if(w.lastModified[s]){x.setRequestHeader("If-Modified-Since",w.lastModified[s])}if(w.etag[s]){x.setRequestHeader("If-None-Match",w.etag[s])}}if(c.data&&c.hasContent&&c.contentType!==false||n.contentType){x.setRequestHeader("Content-Type",c.contentType)}x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+On+"; q=0.01":""):c.accepts["*"]);for(i in c.headers){x.setRequestHeader(i,c.headers[i])}if(c.beforeSend&&(c.beforeSend.call(h,x,c)===false||b===2)){return x.abort()}E="abort";for(i in{success:1,error:1,complete:1}){x[i](c[i])}f=Dn(An,c,n,x);if(!f){N(-1,"No Transport")}else{x.readyState=1;if(a){p.trigger("ajaxSend",[x,c])}if(c.async&&c.timeout>0){u=setTimeout(function(){x.abort("timeout")},c.timeout)}try{b=1;f.send(g,N)}catch(T){if(b<2){N(-1,T)}else{throw T}}}return x},getJSON:function(e,t,n){return w.get(e,t,n,"json")},getScript:function(e,n){return w.get(e,t,n,"script")}});w.each(["get","post"],function(e,n){w[n]=function(e,r,i,s){if(w.isFunction(r)){s=s||i;i=r;r=t}return w.ajax({url:e,type:n,dataType:s,data:r,success:i})}});w.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){w.globalEval(e);return e}}});w.ajaxPrefilter("script",function(e){if(e.cache===t){e.cache=false}if(e.crossDomain){e.type="GET";e.global=false}});w.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||w("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script");n.async=true;if(e.scriptCharset){n.charset=e.scriptCharset}n.src=e.url;n.onload=n.onreadystatechange=function(e,t){if(t||!n.readyState||/loaded|complete/.test(n.readyState)){n.onload=n.onreadystatechange=null;if(n.parentNode){n.parentNode.removeChild(n)}n=null;if(!t){i(200,"success")}}};r.insertBefore(n,r.firstChild)},abort:function(){if(n){n.onload(t,true)}}}}});var jn=[],Fn=/(=)\?(?=&|$)|\?\?/;w.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=jn.pop()||w.expando+"_"+yn++;this[e]=true;return e}});w.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.jsonp!==false&&(Fn.test(n.url)?"url":typeof n.data==="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Fn.test(n.data)&&"data");if(a||n.dataTypes[0]==="jsonp"){s=n.jsonpCallback=w.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback;if(a){n[a]=n[a].replace(Fn,"$1"+s)}else if(n.jsonp!==false){n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+s}n.converters["script json"]=function(){if(!u){w.error(s+" was not called")}return u[0]};n.dataTypes[0]="json";o=e[s];e[s]=function(){u=arguments};i.always(function(){e[s]=o;if(n[s]){n.jsonpCallback=r.jsonpCallback;jn.push(s)}if(u&&w.isFunction(o)){o(u[0])}u=o=t});return"script"}});var In,qn,Rn=0,Un=e.ActiveXObject&&function(){var e;for(e in In){In[e](t,true)}};w.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&zn()||Wn()}:zn;qn=w.ajaxSettings.xhr();w.support.cors=!!qn&&"withCredentials"in qn;qn=w.support.ajax=!!qn;if(qn){w.ajaxTransport(function(n){if(!n.crossDomain||w.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();if(n.username){a.open(n.type,n.url,n.async,n.username,n.password)}else{a.open(n.type,n.url,n.async)}if(n.xhrFields){for(u in n.xhrFields){a[u]=n.xhrFields[u]}}if(n.mimeType&&a.overrideMimeType){a.overrideMimeType(n.mimeType)}if(!n.crossDomain&&!i["X-Requested-With"]){i["X-Requested-With"]="XMLHttpRequest"}try{for(u in i){a.setRequestHeader(u,i[u])}}catch(f){}a.send(n.hasContent&&n.data||null);r=function(e,i){var u,f,l,c;try{if(r&&(i||a.readyState===4)){r=t;if(o){a.onreadystatechange=w.noop;if(Un){delete In[o]}}if(i){if(a.readyState!==4){a.abort()}}else{c={};u=a.status;f=a.getAllResponseHeaders();if(typeof a.responseText==="string"){c.text=a.responseText}try{l=a.statusText}catch(h){l=""}if(!u&&n.isLocal&&!n.crossDomain){u=c.text?200:404}else if(u===1223){u=204}}}}catch(p){if(!i){s(-1,p)}}if(c){s(u,l,c,f)}};if(!n.async){r()}else if(a.readyState===4){setTimeout(r)}else{o=++Rn;if(Un){if(!In){In={};w(e).unload(Un)}In[o]=r}a.onreadystatechange=r}},abort:function(){if(r){r(t,true)}}}}})}var Xn,Vn,$n=/^(?:toggle|show|hide)$/,Jn=new RegExp("^(?:([+-])=|)("+E+")([a-z%]*)$","i"),Kn=/queueHooks$/,Qn=[nr],Gn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Jn.exec(t),s=i&&i[3]||(w.cssNumber[e]?"":"px"),o=(w.cssNumber[e]||s!=="px"&&+r)&&Jn.exec(w.css(n.elem,e)),u=1,a=20;if(o&&o[3]!==s){s=s||o[3];i=i||[];o=+r||1;do{u=u||".5";o=o/u;w.style(n.elem,e,o+s)}while(u!==(u=n.cur()/r)&&u!==1&&--a)}if(i){o=n.start=+o||+r||0;n.unit=s;n.end=i[1]?o+(i[1]+1)*i[2]:+i[2]}return n}]};w.Animation=w.extend(er,{tweener:function(e,t){if(w.isFunction(e)){t=e;e=["*"]}else{e=e.split(" ")}var n,r=0,i=e.length;for(;r-1,f={},l={},c,h;if(a){l=i.position();c=l.top;h=l.left}else{c=parseFloat(o)||0;h=parseFloat(u)||0}if(w.isFunction(t)){t=t.call(e,n,s)}if(t.top!=null){f.top=t.top-s.top+c}if(t.left!=null){f.left=t.left-s.left+h}if("using"in t){t.using.call(e,f)}else{i.css(f)}}};w.fn.extend({position:function(){if(!this[0]){return}var e,t,n={top:0,left:0},r=this[0];if(w.css(r,"position")==="fixed"){t=r.getBoundingClientRect()}else{e=this.offsetParent();t=this.offset();if(!w.nodeName(e[0],"html")){n=e.offset()}n.top+=w.css(e[0],"borderTopWidth",true);n.left+=w.css(e[0],"borderLeftWidth",true)}return{top:t.top-n.top-w.css(r,"marginTop",true),left:t.left-n.left-w.css(r,"marginLeft",true)}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||u;while(e&&!w.nodeName(e,"html")&&w.css(e,"position")==="static"){e=e.offsetParent}return e||u})}});w.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);w.fn[e]=function(i){return w.access(this,function(e,i,s){var o=sr(e);if(s===t){return o?n in o?o[n]:o.document.documentElement[i]:e[i]}if(o){o.scrollTo(!r?s:w(o).scrollLeft(),r?s:w(o).scrollTop())}else{e[i]=s}},e,i,arguments.length,null)}});w.each({Height:"height",Width:"width"},function(e,n){w.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){w.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!=="boolean"),u=r||(i===true||s===true?"margin":"border");return w.access(this,function(n,r,i){var s;if(w.isWindow(n)){return n.document.documentElement["client"+e]}if(n.nodeType===9){s=n.documentElement;return Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])}return i===t?w.css(n,r,u):w.style(n,r,i,u)},n,o?i:t,o,null)}})});w.fn.size=function(){return this.length};w.fn.andSelf=w.fn.addBack;if(typeof module==="object"&&module&&typeof module.exports==="object"){module.exports=w}else{e.jQuery=e.$=w;if(typeof define==="function"&&define.amd){define("jquery",[],function(){return w})}}})(window);(function(){"use strict";function encodeHTMLSource(){var e={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"},t=/&(?!#?\w+;)|<|>|"|'|\//g;return function(){return this?this.replace(t,function(t){return e[t]||t}):this}}function resolveDefs(e,t,n){return(typeof t==="string"?t:t.toString()).replace(e.define||skip,function(t,r,i,s){if(r.indexOf("def.")===0){r=r.substring(4)}if(!(r in n)){if(i===":"){if(e.defineParams)s.replace(e.defineParams,function(e,t,i){n[r]={arg:t,text:i}});if(!(r in n))n[r]=s}else{(new Function("def","def['"+r+"']="+s))(n)}}return""}).replace(e.use||skip,function(t,r){if(e.useParams)r=r.replace(e.useParams,function(e,t,r,i){if(n[r]&&n[r].arg&&i){var s=(r+":"+i).replace(/'|\\/g,"_");n.__exp=n.__exp||{};n.__exp[s]=n[r].text.replace(new RegExp("(^|[^\\w$])"+n[r].arg+"([^\\w$])","g"),"$1"+i+"$2");return t+"def.__exp['"+s+"']"}});var i=(new Function("def","return "+r))(n);return i?resolveDefs(e,i,n):i})}function unescape(e){return e.replace(/\\('|\\)/g,"$1").replace(/[\r\t\n]/g," ")}var doT={version:"1.0.1-nanoui",templateSettings:{evaluate:/\{\{([\s\S]+?)\}\}/g,interpolate:/\{\{:([\s\S]+?)\}\}/g,encode:/\{\{>([\s\S]+?)\}\}/g,use:/\{\{#([\s\S]+?)\}\}/g,define:/\{\{##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\}\}/g,conditional:/\{\{\/?if\s*([\s\S]*?)\s*\}\}/g,conditionalElse:/\{\{else\s*([\s\S]*?)\s*\}\}/g,iterate:/\{\{\/?for\s*(?:\}\}|([\s\S]+?)\s*(?:\:\s*([\w$]+))?\s*(?:\:\s*([\w$]+))?\s*\}\})/g,props:/\{\{\/?props\s*(?:\}\}|([\s\S]+?)\s*(?:\:\s*([\w$]+))?\s*(?:\:\s*([\w$]+))?\s*\}\})/g,varname:"data, helper",strip:true,append:true,selfcontained:false},template:undefined,compile:undefined},global;if(typeof module!=="undefined"&&module.exports){module.exports=doT}else if(typeof define==="function"&&define.amd){define(function(){return doT})}else{global=function(){return this||(0,eval)("this")}();global.doT=doT}String.prototype.encodeHTML=encodeHTMLSource();var startend={append:{start:"'+(",end:")+'",endencode:"||'').toString().encodeHTML()+'"},split:{start:"';out+=(",end:");out+='",endencode:"||'').toString().encodeHTML();out+='"}},skip=/$^/;doT.template=function(e,t,n){t=t||doT.templateSettings;var r=t.append?startend.append:startend.split,i,s=0,o=t.use||t.define?resolveDefs(t,e,n||{}):e;o=("var out='"+(t.strip?o.replace(/(^|\r|\n)\t* +| +\t*(\r|\n|$)/g," ").replace(/\r|\n|\t|\/\*[\s\S]*?\*\//g,""):o).replace(/'|\\/g,"\\$&").replace(t.interpolate||skip,function(e,t){return r.start+unescape(t)+r.end}).replace(t.encode||skip,function(e,t){i=true;return r.start+unescape(t)+r.endencode}).replace(t.conditional||skip,function(e,t){return t?"';if("+unescape(t)+"){out+='":"';}out+='"}).replace(t.conditionalElse||skip,function(e,t){return t?"';}else if("+unescape(t)+"){out+='":"';}else{out+='"}).replace(t.iterate||skip,function(e,t,n,r){if(!t)return"';} } out+='";s+=1;n=n||"value";r=r||"index";t=unescape(t);var i="arr"+s;return"';var "+i+"="+t+";if("+i+"){var "+n+","+r+"=-1,l"+s+"="+i+".length-1;while("+r+"i&&i!==0||r.call(e,s)===false)jQuery.timer.remove(e,n,r)};u.timerID=r.timerID;o[n][r.timerID]||(o[n][r.timerID]=window.setInterval(u,t));this.global.push(e)}},remove:function(e,t,n){var r=jQuery.data(e,this.dataKey),i;if(r){if(t){if(r[t]){if(n){if(n.timerID){window.clearInterval(r[t][n.timerID]);delete r[t][n.timerID]}}else for(n in r[t]){window.clearInterval(r[t][n]);delete r[t][n]}for(i in r[t])break;if(!i){i=null;delete r[t]}}}else for(t in r)this.remove(e,t,n);for(i in r)break;i||jQuery.removeData(e,this.dataKey)}}}});jQuery(window).bind("unload",function(){jQuery.each(jQuery.timer.global,function(e,t){jQuery.timer.remove(t)})}) \ No newline at end of file +(function(e,t){function H(e){var t=e.length,n=w.type(e);if(w.isWindow(e)){return false}if(e.nodeType===1&&t){return true}return n==="array"||n!=="function"&&(t===0||typeof t==="number"&&t>0&&t-1 in e)}function j(e){var t=B[e]={};w.each(e.match(S)||[],function(e,n){t[n]=true});return t}function q(e,n,r,i){if(!w.acceptData(e)){return}var s,o,u=w.expando,a=e.nodeType,f=a?w.cache:e,l=a?e[u]:e[u]&&u;if((!l||!f[l]||!i&&!f[l].data)&&r===t&&typeof n==="string"){return}if(!l){if(a){l=e[u]=c.pop()||w.guid++}else{l=u}}if(!f[l]){f[l]=a?{}:{toJSON:w.noop}}if(typeof n==="object"||typeof n==="function"){if(i){f[l]=w.extend(f[l],n)}else{f[l].data=w.extend(f[l].data,n)}}o=f[l];if(!i){if(!o.data){o.data={}}o=o.data}if(r!==t){o[w.camelCase(n)]=r}if(typeof n==="string"){s=o[n];if(s==null){s=o[w.camelCase(n)]}}else{s=o}return s}function R(e,t,n){if(!w.acceptData(e)){return}var r,i,s=e.nodeType,o=s?w.cache:e,u=s?e[w.expando]:w.expando;if(!o[u]){return}if(t){r=n?o[u]:o[u].data;if(r){if(!w.isArray(t)){if(t in r){t=[t]}else{t=w.camelCase(t);if(t in r){t=[t]}else{t=t.split(" ")}}}else{t=t.concat(w.map(t,w.camelCase))}i=t.length;while(i--){delete r[t[i]]}if(n?!z(r):!w.isEmptyObject(r)){return}}}if(!n){delete o[u].data;if(!z(o[u])){return}}if(s){w.cleanData([e],true)}else if(w.support.deleteExpando||o!=o.window){delete o[u]}else{o[u]=null}}function U(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(I,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r==="string"){try{r=r==="true"?true:r==="false"?false:r==="null"?null:+r+""===r?+r:F.test(r)?w.parseJSON(r):r}catch(s){}w.data(e,n,r)}else{r=t}}return r}function z(e){var t;for(t in e){if(t==="data"&&w.isEmptyObject(e[t])){continue}if(t!=="toJSON"){return false}}return true}function it(){return true}function st(){return false}function ot(){try{return o.activeElement}catch(e){}}function ct(e,t){do{e=e[t]}while(e&&e.nodeType!==1);return e}function ht(e,t,n){if(w.isFunction(t)){return w.grep(e,function(e,r){return!!t.call(e,r,e)!==n})}if(t.nodeType){return w.grep(e,function(e){return e===t!==n})}if(typeof t==="string"){if(ut.test(t)){return w.filter(t,e,n)}t=w.filter(t,e)}return w.grep(e,function(e){return w.inArray(e,t)>=0!==n})}function pt(e){var t=dt.split("|"),n=e.createDocumentFragment();if(n.createElement){while(t.length){n.createElement(t.pop())}}return n}function Mt(e,t){return w.nodeName(e,"table")&&w.nodeName(t.nodeType===1?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function _t(e){e.type=(w.find.attr(e,"type")!==null)+"/"+e.type;return e}function Dt(e){var t=Ct.exec(e.type);if(t){e.type=t[1]}else{e.removeAttribute("type")}return e}function Pt(e,t){var n,r=0;for(;(n=e[r])!=null;r++){w._data(n,"globalEval",!t||w._data(t[r],"globalEval"))}}function Ht(e,t){if(t.nodeType!==1||!w.hasData(e)){return}var n,r,i,s=w._data(e),o=w._data(t,s),u=s.events;if(u){delete o.handle;o.events={};for(n in u){for(r=0,i=u[n].length;r").css("cssText","display:block !important")).appendTo(t.documentElement);t=(It[0].contentWindow||It[0].contentDocument).document;t.write("");t.close();n=fn(e,t);It.detach()}Qt[e]=n}return n}function fn(e,t){var n=w(t.createElement(e)).appendTo(t.body),r=w.css(n[0],"display");n.remove();return r}function vn(e,t,n,r){var i;if(w.isArray(t)){w.each(t,function(t,i){if(n||cn.test(e)){r(e,i)}else{vn(e+"["+(typeof i==="object"?t:"")+"]",i,n,r)}})}else if(!n&&w.type(t)==="object"){for(i in t){vn(e+"["+i+"]",t[i],n,r)}}else{r(e,t)}}function _n(e){return function(t,n){if(typeof t!=="string"){n=t;t="*"}var r,i=0,s=t.toLowerCase().match(S)||[];if(w.isFunction(n)){while(r=s[i++]){if(r[0]==="+"){r=r.slice(1)||"*";(e[r]=e[r]||[]).unshift(n)}else{(e[r]=e[r]||[]).push(n)}}}}}function Dn(e,t,n,r){function o(u){var a;i[u]=true;w.each(e[u]||[],function(e,u){var f=u(t,n,r);if(typeof f==="string"&&!s&&!i[f]){t.dataTypes.unshift(f);o(f);return false}else if(s){return!(a=f)}});return a}var i={},s=e===An;return o(t.dataTypes[0])||!i["*"]&&o("*")}function Pn(e,n){var r,i,s=w.ajaxSettings.flatOptions||{};for(i in n){if(n[i]!==t){(s[i]?e:r||(r={}))[i]=n[i]}}if(r){w.extend(true,e,r)}return e}function Hn(e,n,r){var i,s,o,u,a=e.contents,f=e.dataTypes;while(f[0]==="*"){f.shift();if(s===t){s=e.mimeType||n.getResponseHeader("Content-Type")}}if(s){for(u in a){if(a[u]&&a[u].test(s)){f.unshift(u);break}}}if(f[0]in r){o=f[0]}else{for(u in r){if(!f[0]||e.converters[u+" "+f[0]]){o=u;break}if(!i){i=u}}o=o||i}if(o){if(o!==f[0]){f.unshift(o)}return r[o]}}function Bn(e,t,n,r){var i,s,o,u,a,f={},l=e.dataTypes.slice();if(l[1]){for(o in e.converters){f[o.toLowerCase()]=e.converters[o]}}s=l.shift();while(s){if(e.responseFields[s]){n[e.responseFields[s]]=t}if(!a&&r&&e.dataFilter){t=e.dataFilter(t,e.dataType)}a=s;s=l.shift();if(s){if(s==="*"){s=a}else if(a!=="*"&&a!==s){o=f[a+" "+s]||f["* "+s];if(!o){for(i in f){u=i.split(" ");if(u[1]===s){o=f[a+" "+u[0]]||f["* "+u[0]];if(o){if(o===true){o=f[i]}else if(f[i]!==true){s=u[0];l.unshift(u[1])}break}}}}if(o!==true){if(o&&e["throws"]){t=o(t)}else{try{t=o(t)}catch(c){return{state:"parsererror",error:o?c:"No conversion from "+a+" to "+s}}}}}}}return{state:"success",data:t}}function zn(){try{return new e.XMLHttpRequest}catch(t){}}function Wn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function Yn(){setTimeout(function(){Xn=t});return Xn=w.now()}function Zn(e,t,n){var r,i=(Gn[t]||[]).concat(Gn["*"]),s=0,o=i.length;for(;s)[^>]*|#([\w-]*))$/,N=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,C=/^[\],:{}\s]*$/,k=/(?:^|:|,)(?:\s*\[)+/g,L=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,O=/^-ms-/,M=/-([\da-z])/gi,_=function(e,t){return t.toUpperCase()},D=function(e){if(o.addEventListener||e.type==="load"||o.readyState==="complete"){P();w.ready()}},P=function(){if(o.addEventListener){o.removeEventListener("DOMContentLoaded",D,false);e.removeEventListener("load",D,false)}else{o.detachEvent("onreadystatechange",D);e.detachEvent("onload",D)}};w.fn=w.prototype={jquery:h,constructor:w,init:function(e,n,r){var i,s;if(!e){return this}if(typeof e==="string"){if(e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3){i=[null,e,null]}else{i=T.exec(e)}if(i&&(i[1]||!n)){if(i[1]){n=n instanceof w?n[0]:n;w.merge(this,w.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,true));if(N.test(i[1])&&w.isPlainObject(n)){for(i in n){if(w.isFunction(this[i])){this[i](n[i])}else{this.attr(i,n[i])}}}return this}else{s=o.getElementById(i[2]);if(s&&s.parentNode){if(s.id!==i[2]){return r.find(e)}this.length=1;this[0]=s}this.context=o;this.selector=e;return this}}else if(!n||n.jquery){return(n||r).find(e)}else{return this.constructor(n).find(e)}}else if(e.nodeType){this.context=this[0]=e;this.length=1;return this}else if(w.isFunction(e)){return r.ready(e)}if(e.selector!==t){this.selector=e.selector;this.context=e.context}return w.makeArray(e,this)},selector:"",length:0,toArray:function(){return v.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e){var t=w.merge(this.constructor(),e);t.prevObject=this;t.context=this.context;return t},each:function(e,t){return w.each(this,e,t)},ready:function(e){w.ready.promise().done(e);return this},slice:function(){return this.pushStack(v.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n0){return}n.resolveWith(o,[w]);if(w.fn.trigger){w(o).trigger("ready").off("ready")}},isFunction:function(e){return w.type(e)==="function"},isArray:Array.isArray||function(e){return w.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){if(e==null){return String(e)}return typeof e==="object"||typeof e==="function"?l[g.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||w.type(e)!=="object"||e.nodeType||w.isWindow(e)){return false}try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf")){return false}}catch(r){return false}if(w.support.ownLast){for(n in e){return y.call(e,n)}}for(n in e){}return n===t||y.call(e,n)},isEmptyObject:function(e){var t;for(t in e){return false}return true},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){if(!e||typeof e!=="string"){return null}if(typeof t==="boolean"){n=t;t=false}t=t||o;var r=N.exec(e),i=!n&&[];if(r){return[t.createElement(r[1])]}r=w.buildFragment([e],t,i);if(i){w(i).remove()}return w.merge([],r.childNodes)},parseJSON:function(t){if(e.JSON&&e.JSON.parse){return e.JSON.parse(t)}if(t===null){return t}if(typeof t==="string"){t=w.trim(t);if(t){if(C.test(t.replace(L,"@").replace(A,"]").replace(k,""))){return(new Function("return "+t))()}}}w.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!=="string"){return null}try{if(e.DOMParser){i=new DOMParser;r=i.parseFromString(n,"text/xml")}else{r=new ActiveXObject("Microsoft.XMLDOM");r.async="false";r.loadXML(n)}}catch(s){r=t}if(!r||!r.documentElement||r.getElementsByTagName("parsererror").length){w.error("Invalid XML: "+n)}return r},noop:function(){},globalEval:function(t){if(t&&w.trim(t)){(e.execScript||function(t){e["eval"].call(e,t)})(t)}},camelCase:function(e){return e.replace(O,"ms-").replace(M,_)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,s=e.length,o=H(e);if(n){if(o){for(;is.cacheLength){delete t[e.shift()]}return t[n]=r}var e=[];return t}function at(e){e[b]=true;return e}function ft(e){var t=h.createElement("div");try{return!!e(t)}catch(n){return false}finally{if(t.parentNode){t.parentNode.removeChild(t)}t=null}}function lt(e,t){var n=e.split("|"),r=e.length;while(r--){s.attrHandle[n[r]]=t}}function ct(e,t){var n=t&&e,r=n&&e.nodeType===1&&t.nodeType===1&&(~t.sourceIndex||O)-(~e.sourceIndex||O);if(r){return r}if(n){while(n=n.nextSibling){if(n===t){return-1}}}return e?1:-1}function ht(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function pt(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function dt(e){return at(function(t){t=+t;return at(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--){if(n[i=s[o]]){n[i]=!(r[i]=n[i])}}})})}function vt(){}function mt(e,t){var n,r,i,o,u,a,f,l=N[e+" "];if(l){return t?0:l.slice(0)}u=e;a=[];f=s.preFilter;while(u){if(!n||(r=X.exec(u))){if(r){u=u.slice(r[0].length)||u}a.push(i=[])}n=false;if(r=V.exec(u)){n=r.shift();i.push({value:n,type:r[0].replace(W," ")});u=u.slice(n.length)}for(o in s.filter){if((r=G[o].exec(u))&&(!f[o]||(r=f[o](r)))){n=r.shift();i.push({value:n,type:o,matches:r});u=u.slice(n.length)}}if(!n){break}}return t?u.length:u?ot.error(e):N(e,a).slice(0)}function gt(e){var t=0,n=e.length,r="";for(;t1?function(t,n,r){var i=e.length;while(i--){if(!e[i](t,n,r)){return false}}return true}:e[0]}function wt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u-1){s[f]=!(o[f]=c)}}}}else{g=wt(g===o?g.splice(d,g.length):g);if(i){i(null,o,g,a)}else{H.apply(o,g)}}})}function St(e){var t,n,r,i=e.length,o=s.relative[e[0].type],u=o||s.relative[" "],a=o?1:0,l=yt(function(e){return e===t},u,true),c=yt(function(e){return j.call(t,e)>-1},u,true),h=[function(e,n,r){return!o&&(r||n!==f)||((t=n).nodeType?l(e,n,r):c(e,n,r))}];for(;a1&&bt(h),a>1&>(e.slice(0,a-1).concat({value:e[a-2].type===" "?"*":""})).replace(W,"$1"),n,a0,o=e.length>0,u=function(u,a,l,c,p){var d,v,m,g=[],y=0,b="0",w=u&&[],E=p!=null,x=f,T=u||o&&s.find["TAG"]("*",p&&a.parentNode||a),N=S+=x==null?1:Math.random()||.1;if(E){f=a!==h&&a;i=n}for(;(d=T[b])!=null;b++){if(o&&d){v=0;while(m=e[v++]){if(m(d,a,l)){c.push(d);break}}if(E){S=N;i=++n}}if(r){if(d=!m&&d){y--}if(u){w.push(d)}}}y+=b;if(r&&b!==y){v=0;while(m=t[v++]){m(w,g,a,l)}if(u){if(y>0){while(b--){if(!(w[b]||g[b])){g[b]=D.call(c)}}}g=wt(g)}H.apply(c,g);if(E&&!u&&g.length>0&&y+t.length>1){ot.uniqueSort(c)}}if(E){S=N;f=x}return w};return r?at(u):u}function Tt(e,t,n){var r=0,i=t.length;for(;r2&&(f=u[0]).type==="ID"&&r.getById&&t.nodeType===9&&d&&s.relative[u[1].type]){t=(s.find["ID"](f.matches[0].replace(rt,it),t)||[])[0];if(!t){return n}e=e.slice(u.shift().value.length)}o=G["needsContext"].test(e)?0:u.length;while(o--){f=u[o];if(s.relative[l=f.type]){break}if(c=s.find[l]){if(i=c(f.matches[0].replace(rt,it),$.test(u[0].type)&&t.parentNode||t)){u.splice(o,1);e=i.length&>(u);if(!e){H.apply(n,i);return n}break}}}}}a(e,h)(i,t,!d,n,$.test(e));return n}var n,r,i,s,o,u,a,f,l,c,h,p,d,v,m,g,y,b="sizzle"+ -(new Date),E=e.document,S=0,x=0,T=ut(),N=ut(),C=ut(),k=false,L=function(e,t){if(e===t){k=true;return 0}return 0},A=typeof t,O=1<<31,M={}.hasOwnProperty,_=[],D=_.pop,P=_.push,H=_.push,B=_.slice,j=_.indexOf||function(e){var t=0,n=this.length;for(;t+~]|"+I+")"+I+"*"),$=new RegExp(I+"*[+~]"),J=new RegExp("="+I+"*([^\\]'\"]*)"+I+"*\\]","g"),K=new RegExp(z),Q=new RegExp("^"+R+"$"),G={ID:new RegExp("^#("+q+")"),CLASS:new RegExp("^\\.("+q+")"),TAG:new RegExp("^("+q.replace("w","w*")+")"),ATTR:new RegExp("^"+U),PSEUDO:new RegExp("^"+z),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+I+"*(even|odd|(([+-]|)(\\d*)n|)"+I+"*(?:([+-]|)"+I+"*(\\d+)|))"+I+"*\\)|)","i"),bool:new RegExp("^(?:"+F+")$","i"),needsContext:new RegExp("^"+I+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+I+"*((?:-\\d)?\\d*)"+I+"*\\)|)(?=[^-]|$)","i")},Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=new RegExp("\\\\([\\da-f]{1,6}"+I+"?|("+I+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,r&1023|56320)};try{H.apply(_=B.call(E.childNodes),E.childNodes);_[E.childNodes.length].nodeType}catch(st){H={apply:_.length?function(e,t){P.apply(e,B.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]){}e.length=n-1}}}u=ot.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":false};r=ot.support={};c=ot.setDocument=function(e){var t=e?e.ownerDocument||e:E,n=t.defaultView;if(t===h||t.nodeType!==9||!t.documentElement){return h}h=t;p=t.documentElement;d=!u(t);if(n&&n.attachEvent&&n!==n.top){n.attachEvent("onbeforeunload",function(){c()})}r.attributes=ft(function(e){e.className="i";return!e.getAttribute("className")});r.getElementsByTagName=ft(function(e){e.appendChild(t.createComment(""));return!e.getElementsByTagName("*").length});r.getElementsByClassName=ft(function(e){e.innerHTML="
    ";e.firstChild.className="i";return e.getElementsByClassName("i").length===2});r.getById=ft(function(e){p.appendChild(e).id=b;return!t.getElementsByName||!t.getElementsByName(b).length});if(r.getById){s.find["ID"]=function(e,t){if(typeof t.getElementById!==A&&d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}};s.filter["ID"]=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}}else{delete s.find["ID"];s.filter["ID"]=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}}s.find["TAG"]=r.getElementsByTagName?function(e,t){if(typeof t.getElementsByTagName!==A){return t.getElementsByTagName(e)}}:function(e,t){var n,r=[],i=0,s=t.getElementsByTagName(e);if(e==="*"){while(n=s[i++]){if(n.nodeType===1){r.push(n)}}return r}return s};s.find["CLASS"]=r.getElementsByClassName&&function(e,t){if(typeof t.getElementsByClassName!==A&&d){return t.getElementsByClassName(e)}};m=[];v=[];if(r.qsa=Y.test(t.querySelectorAll)){ft(function(e){e.innerHTML="";if(!e.querySelectorAll("[selected]").length){v.push("\\["+I+"*(?:value|"+F+")")}if(!e.querySelectorAll(":checked").length){v.push(":checked")}});ft(function(e){var n=t.createElement("input");n.setAttribute("type","hidden");e.appendChild(n).setAttribute("t","");if(e.querySelectorAll("[t^='']").length){v.push("[*^$]="+I+"*(?:''|\"\")")}if(!e.querySelectorAll(":enabled").length){v.push(":enabled",":disabled")}e.querySelectorAll("*,:x");v.push(",.*:")})}if(r.matchesSelector=Y.test(g=p.webkitMatchesSelector||p.mozMatchesSelector||p.oMatchesSelector||p.msMatchesSelector)){ft(function(e){r.disconnectedMatch=g.call(e,"div");g.call(e,"[s!='']:x");m.push("!=",z)})}v=v.length&&new RegExp(v.join("|"));m=m.length&&new RegExp(m.join("|"));y=Y.test(p.contains)||p.compareDocumentPosition?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&(n.contains?n.contains(r):e.compareDocumentPosition&&e.compareDocumentPosition(r)&16))}:function(e,t){if(t){while(t=t.parentNode){if(t===e){return true}}}return false};L=p.compareDocumentPosition?function(e,n){if(e===n){k=true;return 0}var i=n.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(n);if(i){if(i&1||!r.sortDetached&&n.compareDocumentPosition(e)===i){if(e===t||y(E,e)){return-1}if(n===t||y(E,n)){return 1}return l?j.call(l,e)-j.call(l,n):0}return i&4?-1:1}return e.compareDocumentPosition?-1:1}:function(e,n){var r,i=0,s=e.parentNode,o=n.parentNode,u=[e],a=[n];if(e===n){k=true;return 0}else if(!s||!o){return e===t?-1:n===t?1:s?-1:o?1:l?j.call(l,e)-j.call(l,n):0}else if(s===o){return ct(e,n)}r=e;while(r=r.parentNode){u.unshift(r)}r=n;while(r=r.parentNode){a.unshift(r)}while(u[i]===a[i]){i++}return i?ct(u[i],a[i]):u[i]===E?-1:a[i]===E?1:0};return t};ot.matches=function(e,t){return ot(e,null,null,t)};ot.matchesSelector=function(e,t){if((e.ownerDocument||e)!==h){c(e)}t=t.replace(J,"='$1']");if(r.matchesSelector&&d&&(!m||!m.test(t))&&(!v||!v.test(t))){try{var n=g.call(e,t);if(n||r.disconnectedMatch||e.document&&e.document.nodeType!==11){return n}}catch(i){}}return ot(t,h,null,[e]).length>0};ot.contains=function(e,t){if((e.ownerDocument||e)!==h){c(e)}return y(e,t)};ot.attr=function(e,n){if((e.ownerDocument||e)!==h){c(e)}var i=s.attrHandle[n.toLowerCase()],o=i&&M.call(s.attrHandle,n.toLowerCase())?i(e,n,!d):t;return o===t?r.attributes||!d?e.getAttribute(n):(o=e.getAttributeNode(n))&&o.specified?o.value:null:o};ot.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)};ot.uniqueSort=function(e){var t,n=[],i=0,s=0;k=!r.detectDuplicates;l=!r.sortStable&&e.slice(0);e.sort(L);if(k){while(t=e[s++]){if(t===e[s]){i=n.push(s)}}while(i--){e.splice(n[i],1)}}return e};o=ot.getText=function(e){var t,n="",r=0,i=e.nodeType;if(!i){for(;t=e[r];r++){n+=o(t)}}else if(i===1||i===9||i===11){if(typeof e.textContent==="string"){return e.textContent}else{for(e=e.firstChild;e;e=e.nextSibling){n+=o(e)}}}else if(i===3||i===4){return e.nodeValue}return n};s=ot.selectors={cacheLength:50,createPseudo:at,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:true}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:true},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){e[1]=e[1].replace(rt,it);e[3]=(e[4]||e[5]||"").replace(rt,it);if(e[2]==="~="){e[3]=" "+e[3]+" "}return e.slice(0,4)},CHILD:function(e){e[1]=e[1].toLowerCase();if(e[1].slice(0,3)==="nth"){if(!e[3]){ot.error(e[0])}e[4]=+(e[4]?e[5]+(e[6]||1):2*(e[3]==="even"||e[3]==="odd"));e[5]=+(e[7]+e[8]||e[3]==="odd")}else if(e[3]){ot.error(e[0])}return e},PSEUDO:function(e){var n,r=!e[5]&&e[2];if(G["CHILD"].test(e[0])){return null}if(e[3]&&e[4]!==t){e[2]=e[4]}else if(r&&K.test(r)&&(n=mt(r,true))&&(n=r.indexOf(")",r.length-n)-r.length)){e[0]=e[0].slice(0,n);e[2]=r.slice(0,n)}return e.slice(0,3)}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return e==="*"?function(){return true}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=T[e+" "];return t||(t=new RegExp("(^|"+I+")"+e+"("+I+"|$)"))&&T(e,function(e){return t.test(typeof e.className==="string"&&e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=ot.attr(r,e);if(i==null){return t==="!="}if(!t){return true}i+="";return t==="="?i===n:t==="!="?i!==n:t==="^="?n&&i.indexOf(n)===0:t==="*="?n&&i.indexOf(n)>-1:t==="$="?n&&i.slice(-n.length)===n:t==="~="?(" "+i+" ").indexOf(n)>-1:t==="|="?i===n||i.slice(0,n.length+1)===n+"-":false}},CHILD:function(e,t,n,r,i){var s=e.slice(0,3)!=="nth",o=e.slice(-4)!=="last",u=t==="of-type";return r===1&&i===0?function(e){return!!e.parentNode}:function(t,n,a){var f,l,c,h,p,d,v=s!==o?"nextSibling":"previousSibling",m=t.parentNode,g=u&&t.nodeName.toLowerCase(),y=!a&&!u;if(m){if(s){while(v){c=t;while(c=c[v]){if(u?c.nodeName.toLowerCase()===g:c.nodeType===1){return false}}d=v=e==="only"&&!d&&"nextSibling"}return true}d=[o?m.firstChild:m.lastChild];if(o&&y){l=m[b]||(m[b]={});f=l[e]||[];p=f[0]===S&&f[1];h=f[0]===S&&f[2];c=p&&m.childNodes[p];while(c=++p&&c&&c[v]||(h=p=0)||d.pop()){if(c.nodeType===1&&++h&&c===t){l[e]=[S,p,h];break}}}else if(y&&(f=(t[b]||(t[b]={}))[e])&&f[0]===S){h=f[1]}else{while(c=++p&&c&&c[v]||(h=p=0)||d.pop()){if((u?c.nodeName.toLowerCase()===g:c.nodeType===1)&&++h){if(y){(c[b]||(c[b]={}))[e]=[S,h]}if(c===t){break}}}}h-=i;return h===r||h%r===0&&h/r>=0}}},PSEUDO:function(e,t){var n,r=s.pseudos[e]||s.setFilters[e.toLowerCase()]||ot.error("unsupported pseudo: "+e);if(r[b]){return r(t)}if(r.length>1){n=[e,e,"",t];return s.setFilters.hasOwnProperty(e.toLowerCase())?at(function(e,n){var i,s=r(e,t),o=s.length;while(o--){i=j.call(e,s[o]);e[i]=!(n[i]=s[o])}}):function(e){return r(e,0,n)}}return r}},pseudos:{not:at(function(e){var t=[],n=[],r=a(e.replace(W,"$1"));return r[b]?at(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--){if(s=o[u]){e[u]=!(t[u]=s)}}}):function(e,i,s){t[0]=e;r(t,null,s,n);return!n.pop()}}),has:at(function(e){return function(t){return ot(e,t).length>0}}),contains:at(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:at(function(e){if(!Q.test(e||"")){ot.error("unsupported lang: "+e)}e=e.replace(rt,it).toLowerCase();return function(t){var n;do{if(n=d?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang")){n=n.toLowerCase();return n===e||n.indexOf(e+"-")===0}}while((t=t.parentNode)&&t.nodeType===1);return false}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===p},focus:function(e){return e===h.activeElement&&(!h.hasFocus||h.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===false},disabled:function(e){return e.disabled===true},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){if(e.parentNode){e.parentNode.selectedIndex}return e.selected===true},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling){if(e.nodeName>"@"||e.nodeType===3||e.nodeType===4){return false}}return true},parent:function(e){return!s.pseudos["empty"](e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},text:function(e){var t;return e.nodeName.toLowerCase()==="input"&&e.type==="text"&&((t=e.getAttribute("type"))==null||t.toLowerCase()===e.type)},first:dt(function(){return[0]}),last:dt(function(e,t){return[t-1]}),eq:dt(function(e,t,n){return[n<0?n+t:n]}),even:dt(function(e,t){var n=0;for(;n=0;){e.push(r)}return e}),gt:dt(function(e,t,n){var r=n<0?n+t:n;for(;++r";e.firstChild.setAttribute("value","");return e.firstChild.getAttribute("value")===""})){lt("value",function(e,t,n){if(!n&&e.nodeName.toLowerCase()==="input"){return e.defaultValue}})}if(!ft(function(e){return e.getAttribute("disabled")==null})){lt(F,function(e,t,n){var r;if(!n){return(r=e.getAttributeNode(t))&&r.specified?r.value:e[t]===true?t.toLowerCase():null}})}w.find=ot;w.expr=ot.selectors;w.expr[":"]=w.expr.pseudos;w.unique=ot.uniqueSort;w.text=ot.getText;w.isXMLDoc=ot.isXML;w.contains=ot.contains})(e);var B={};w.Callbacks=function(e){e=typeof e==="string"?B[e]||j(e):w.extend({},e);var n,r,i,s,o,u,a=[],f=!e.once&&[],l=function(t){r=e.memory&&t;i=true;o=u||0;u=0;s=a.length;n=true;for(;a&&o-1){a.splice(r,1);if(n){if(r<=s){s--}if(r<=o){o--}}}})}return this},has:function(e){return e?w.inArray(e,a)>-1:!!(a&&a.length)},empty:function(){a=[];s=0;return this},disable:function(){a=f=r=t;return this},disabled:function(){return!a},lock:function(){f=t;if(!r){c.disable()}return this},locked:function(){return!f},fireWith:function(e,t){if(a&&(!i||f)){t=t||[];t=[e,t.slice?t.slice():t];if(n){f.push(t)}else{l(t)}}return this},fire:function(){c.fireWith(this,arguments);return this},fired:function(){return!!i}};return c};w.extend({Deferred:function(e){var t=[["resolve","done",w.Callbacks("once memory"),"resolved"],["reject","fail",w.Callbacks("once memory"),"rejected"],["notify","progress",w.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){i.done(arguments).fail(arguments);return this},then:function(){var e=arguments;return w.Deferred(function(n){w.each(t,function(t,s){var o=s[0],u=w.isFunction(e[t])&&e[t];i[s[1]](function(){var e=u&&u.apply(this,arguments);if(e&&w.isFunction(e.promise)){e.promise().done(n.resolve).fail(n.reject).progress(n.notify)}else{n[o+"With"](this===r?n.promise():this,u?[e]:arguments)}})});e=null}).promise()},promise:function(e){return e!=null?w.extend(e,r):r}},i={};r.pipe=r.then;w.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add;if(u){o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock)}i[s[0]]=function(){i[s[0]+"With"](this===i?r:this,arguments);return this};i[s[0]+"With"]=o.fireWith});r.promise(i);if(e){e.call(i,i)}return i},when:function(e){var t=0,n=v.call(arguments),r=n.length,i=r!==1||e&&w.isFunction(e.promise)?r:0,s=i===1?e:w.Deferred(),o=function(e,t,n){return function(r){t[e]=this;n[e]=arguments.length>1?v.call(arguments):r;if(n===u){s.notifyWith(t,n)}else if(!--i){s.resolveWith(t,n)}}},u,a,f;if(r>1){u=new Array(r);a=new Array(r);f=new Array(r);for(;t
    a";n=p.getElementsByTagName("*")||[];r=p.getElementsByTagName("a")[0];if(!r||!r.style||!n.length){return t}u=o.createElement("select");f=u.appendChild(o.createElement("option"));s=p.getElementsByTagName("input")[0];r.style.cssText="top:1px;float:left;opacity:.5";t.getSetAttribute=p.className!=="t";t.leadingWhitespace=p.firstChild.nodeType===3;t.tbody=!p.getElementsByTagName("tbody").length;t.htmlSerialize=!!p.getElementsByTagName("link").length;t.style=/top/.test(r.getAttribute("style"));t.hrefNormalized=r.getAttribute("href")==="/a";t.opacity=/^0.5/.test(r.style.opacity);t.cssFloat=!!r.style.cssFloat;t.checkOn=!!s.value;t.optSelected=f.selected;t.enctype=!!o.createElement("form").enctype;t.html5Clone=o.createElement("nav").cloneNode(true).outerHTML!=="<:nav>";t.inlineBlockNeedsLayout=false;t.shrinkWrapBlocks=false;t.pixelPosition=false;t.deleteExpando=true;t.noCloneEvent=true;t.reliableMarginRight=true;t.boxSizingReliable=true;s.checked=true;t.noCloneChecked=s.cloneNode(true).checked;u.disabled=true;t.optDisabled=!f.disabled;try{delete p.test}catch(d){t.deleteExpando=false}s=o.createElement("input");s.setAttribute("value","");t.input=s.getAttribute("value")==="";s.value="t";s.setAttribute("type","radio");t.radioValue=s.value==="t";s.setAttribute("checked","t");s.setAttribute("name","t");a=o.createDocumentFragment();a.appendChild(s);t.appendChecked=s.checked;t.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;if(p.attachEvent){p.attachEvent("onclick",function(){t.noCloneEvent=false});p.cloneNode(true).click()}for(h in{submit:true,change:true,focusin:true}){p.setAttribute(l="on"+h,"t");t[h+"Bubbles"]=l in e||p.attributes[l].expando===false}p.style.backgroundClip="content-box";p.cloneNode(true).style.backgroundClip="";t.clearCloneStyle=p.style.backgroundClip==="content-box";for(h in w(t)){break}t.ownLast=h!=="0";w(function(){var n,r,s,u="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",a=o.getElementsByTagName("body")[0];if(!a){return}n=o.createElement("div");n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";a.appendChild(n).appendChild(p);p.innerHTML="
    t
    ";s=p.getElementsByTagName("td");s[0].style.cssText="padding:0;margin:0;border:0;display:none";c=s[0].offsetHeight===0;s[0].style.display="";s[1].style.display="none";t.reliableHiddenOffsets=c&&s[0].offsetHeight===0;p.innerHTML="";p.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";w.swap(a,a.style.zoom!=null?{zoom:1}:{},function(){t.boxSizing=p.offsetWidth===4});if(e.getComputedStyle){t.pixelPosition=(e.getComputedStyle(p,null)||{}).top!=="1%";t.boxSizingReliable=(e.getComputedStyle(p,null)||{width:"4px"}).width==="4px";r=p.appendChild(o.createElement("div"));r.style.cssText=p.style.cssText=u;r.style.marginRight=r.style.width="0";p.style.width="1px";t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)}if(typeof p.style.zoom!==i){p.innerHTML="";p.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1";t.inlineBlockNeedsLayout=p.offsetWidth===3;p.style.display="block";p.innerHTML="
    ";p.firstChild.style.width="5px";t.shrinkWrapBlocks=p.offsetWidth!==3;if(t.inlineBlockNeedsLayout){a.style.zoom=1}}a.removeChild(n);n=p=s=r=null});n=u=a=f=r=s=null;return t}({});var F=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;w.extend({cache:{},noData:{applet:true,embed:true,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){e=e.nodeType?w.cache[e[w.expando]]:e[w.expando];return!!e&&!z(e)},data:function(e,t,n){return q(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return q(e,t,n,true)},_removeData:function(e,t){return R(e,t,true)},acceptData:function(e){if(e.nodeType&&e.nodeType!==1&&e.nodeType!==9){return false}var t=e.nodeName&&w.noData[e.nodeName.toLowerCase()];return!t||t!==true&&e.getAttribute("classid")===t}});w.fn.extend({data:function(e,n){var r,i,s=null,o=0,u=this[0];if(e===t){if(this.length){s=w.data(u);if(u.nodeType===1&&!w._data(u,"parsedAttrs")){r=u.attributes;for(;o1?this.each(function(){w.data(this,e,n)}):u?U(u,e,w.data(u,e)):null},removeData:function(e){return this.each(function(){w.removeData(this,e)})}});w.extend({queue:function(e,t,n){var r;if(e){t=(t||"fx")+"queue";r=w._data(e,t);if(n){if(!r||w.isArray(n)){r=w._data(e,t,w.makeArray(n))}else{r.push(n)}}return r||[]}},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),s=w._queueHooks(e,t),o=function(){w.dequeue(e,t)};if(i==="inprogress"){i=n.shift();r--}if(i){if(t==="fx"){n.unshift("inprogress")}delete s.stop;i.call(e,o,s)}if(!r&&s){s.empty.fire()}},_queueHooks:function(e,t){var n=t+"queueHooks";return w._data(e,n)||w._data(e,n,{empty:w.Callbacks("once memory").add(function(){w._removeData(e,t+"queue");w._removeData(e,n)})})}});w.fn.extend({queue:function(e,n){var r=2;if(typeof e!=="string"){n=e;e="fx";r--}if(arguments.length1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})},prop:function(e,t){return w.access(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){e=w.propFix[e]||e;return this.each(function(){try{this[e]=t;delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o=0,u=this.length,a=typeof e==="string"&&e;if(w.isFunction(e)){return this.each(function(t){w(this).addClass(e.call(this,t,this.className))})}if(a){t=(e||"").match(S)||[];for(;o=0){r=r.replace(" "+i+" "," ")}}n.className=e?w.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e;if(typeof t==="boolean"&&n==="string"){return t?this.addClass(e):this.removeClass(e)}if(w.isFunction(e)){return this.each(function(n){w(this).toggleClass(e.call(this,n,this.className,t),t)})}return this.each(function(){if(n==="string"){var t,r=0,s=w(this),o=e.match(S)||[];while(t=o[r++]){if(s.hasClass(t)){s.removeClass(t)}else{s.addClass(t)}}}else if(n===i||n==="boolean"){if(this.className){w._data(this,"__className__",this.className)}this.className=this.className||e===false?"":w._data(this,"__className__")||""}})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n=0){return true}}return false},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s){r=w.valHooks[s.type]||w.valHooks[s.nodeName.toLowerCase()];if(r&&"get"in r&&(n=r.get(s,"value"))!==t){return n}n=s.value;return typeof n==="string"?n.replace($,""):n==null?"":n}return}i=w.isFunction(e);return this.each(function(n){var s;if(this.nodeType!==1){return}if(i){s=e.call(this,n,w(this).val())}else{s=e}if(s==null){s=""}else if(typeof s==="number"){s+=""}else if(w.isArray(s)){s=w.map(s,function(e){return e==null?"":e+""})}r=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()];if(!r||!("set"in r)||r.set(this,s,"value")===t){this.value=s}})}});w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return t!=null?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a=0){n=true}}if(!n){e.selectedIndex=-1}return s}}},attr:function(e,n,r){var s,o,u=e.nodeType;if(!e||u===3||u===8||u===2){return}if(typeof e.getAttribute===i){return w.prop(e,n,r)}if(u!==1||!w.isXMLDoc(e)){n=n.toLowerCase();s=w.attrHooks[n]||(w.expr.match.bool.test(n)?X:W)}if(r!==t){if(r===null){w.removeAttr(e,n)}else if(s&&"set"in s&&(o=s.set(e,r,n))!==t){return o}else{e.setAttribute(n,r+"");return r}}else if(s&&"get"in s&&(o=s.get(e,n))!==null){return o}else{o=w.find.attr(e,n);return o==null?t:o}},removeAttr:function(e,t){var n,r,i=0,s=t&&t.match(S);if(s&&e.nodeType===1){while(n=s[i++]){r=w.propFix[n]||n;if(w.expr.match.bool.test(n)){if(Y&&G||!Q.test(n)){e[r]=false}else{e[w.camelCase("default-"+n)]=e[r]=false}}else{w.attr(e,n,"")}e.removeAttribute(G?n:r)}}},attrHooks:{type:{set:function(e,t){if(!w.support.radioValue&&t==="radio"&&w.nodeName(e,"input")){var n=e.value;e.setAttribute("type",t);if(n){e.value=n}return t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,s,o,u=e.nodeType;if(!e||u===3||u===8||u===2){return}o=u!==1||!w.isXMLDoc(e);if(o){n=w.propFix[n]||n;s=w.propHooks[n]}if(r!==t){return s&&"set"in s&&(i=s.set(e,r,n))!==t?i:e[n]=r}else{return s&&"get"in s&&(i=s.get(e,n))!==null?i:e[n]}},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):J.test(e.nodeName)||K.test(e.nodeName)&&e.href?0:-1}}}});X={set:function(e,t,n){if(t===false){w.removeAttr(e,n)}else if(Y&&G||!Q.test(n)){e.setAttribute(!G&&w.propFix[n]||n,n)}else{e[w.camelCase("default-"+n)]=e[n]=true}return n}};w.each(w.expr.match.bool.source.match(/\w+/g),function(e,n){var r=w.expr.attrHandle[n]||w.find.attr;w.expr.attrHandle[n]=Y&&G||!Q.test(n)?function(e,n,i){var s=w.expr.attrHandle[n],o=i?t:(w.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;w.expr.attrHandle[n]=s;return o}:function(e,n,r){return r?t:e[w.camelCase("default-"+n)]?n.toLowerCase():null}});if(!Y||!G){w.attrHooks.value={set:function(e,t,n){if(w.nodeName(e,"input")){e.defaultValue=t}else{return W&&W.set(e,t,n)}}}}if(!G){W={set:function(e,n,r){var i=e.getAttributeNode(r);if(!i){e.setAttributeNode(i=e.ownerDocument.createAttribute(r))}i.value=n+="";return r==="value"||n===e.getAttribute(r)?n:t}};w.expr.attrHandle.id=w.expr.attrHandle.name=w.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.value!==""?i.value:null};w.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:W.set};w.attrHooks.contenteditable={set:function(e,t,n){W.set(e,t===""?false:t,n)}};w.each(["width","height"],function(e,t){w.attrHooks[t]={set:function(e,n){if(n===""){e.setAttribute(t,"auto");return n}}}})}if(!w.support.hrefNormalized){w.each(["href","src"],function(e,t){w.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})}if(!w.support.style){w.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}}if(!w.support.optSelected){w.propHooks.selected={get:function(e){var t=e.parentNode;if(t){t.selectedIndex;if(t.parentNode){t.parentNode.selectedIndex}}return null}}}w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});if(!w.support.enctype){w.propFix.enctype="encoding"}w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(w.isArray(t)){return e.checked=w.inArray(w(e).val(),t)>=0}}};if(!w.support.checkOn){w.valHooks[this].get=function(e){return e.getAttribute("value")===null?"on":e.value}}});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;w.event={global:{},add:function(e,n,r,s,o){var u,a,f,l,c,h,p,d,v,m,g,y=w._data(e);if(!y){return}if(r.handler){l=r;r=l.handler;o=l.selector}if(!r.guid){r.guid=w.guid++}if(!(a=y.events)){a=y.events={}}if(!(h=y.handle)){h=y.handle=function(e){return typeof w!==i&&(!e||w.event.triggered!==e.type)?w.event.dispatch.apply(h.elem,arguments):t};h.elem=e}n=(n||"").match(S)||[""];f=n.length;while(f--){u=rt.exec(n[f])||[];v=g=u[1];m=(u[2]||"").split(".").sort();if(!v){continue}c=w.event.special[v]||{};v=(o?c.delegateType:c.bindType)||v;c=w.event.special[v]||{};p=w.extend({type:v,origType:g,data:s,handler:r,guid:r.guid,selector:o,needsContext:o&&w.expr.match.needsContext.test(o),namespace:m.join(".")},l);if(!(d=a[v])){d=a[v]=[];d.delegateCount=0;if(!c.setup||c.setup.call(e,s,m,h)===false){if(e.addEventListener){e.addEventListener(v,h,false)}else if(e.attachEvent){e.attachEvent("on"+v,h)}}}if(c.add){c.add.call(e,p);if(!p.handler.guid){p.handler.guid=r.guid}}if(o){d.splice(d.delegateCount++,0,p)}else{d.push(p)}w.event.global[v]=true}e=null},remove:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,p,d,v,m=w.hasData(e)&&w._data(e);if(!m||!(l=m.events)){return}t=(t||"").match(S)||[""];f=t.length;while(f--){u=rt.exec(t[f])||[];p=v=u[1];d=(u[2]||"").split(".").sort();if(!p){for(p in l){w.event.remove(e,p+t[f],n,r,true)}continue}c=w.event.special[p]||{};p=(r?c.delegateType:c.bindType)||p;h=l[p]||[];u=u[2]&&new RegExp("(^|\\.)"+d.join("\\.(?:.*\\.|)")+"(\\.|$)");a=s=h.length;while(s--){o=h[s];if((i||v===o.origType)&&(!n||n.guid===o.guid)&&(!u||u.test(o.namespace))&&(!r||r===o.selector||r==="**"&&o.selector)){h.splice(s,1);if(o.selector){h.delegateCount--}if(c.remove){c.remove.call(e,o)}}}if(a&&!h.length){if(!c.teardown||c.teardown.call(e,d,m.handle)===false){w.removeEvent(e,p,m.handle)}delete l[p]}}if(w.isEmptyObject(l)){delete m.handle;w._removeData(e,"events")}},trigger:function(n,r,i,s){var u,a,f,l,c,h,p,d=[i||o],v=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];f=h=i=i||o;if(i.nodeType===3||i.nodeType===8){return}if(nt.test(v+w.event.triggered)){return}if(v.indexOf(".")>=0){m=v.split(".");v=m.shift();m.sort()}a=v.indexOf(":")<0&&"on"+v;n=n[w.expando]?n:new w.Event(v,typeof n==="object"&&n);n.isTrigger=s?2:3;n.namespace=m.join(".");n.namespace_re=n.namespace?new RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null;n.result=t;if(!n.target){n.target=i}r=r==null?[n]:w.makeArray(r,[n]);c=w.event.special[v]||{};if(!s&&c.trigger&&c.trigger.apply(i,r)===false){return}if(!s&&!c.noBubble&&!w.isWindow(i)){l=c.delegateType||v;if(!nt.test(l+v)){f=f.parentNode}for(;f;f=f.parentNode){d.push(f);h=f}if(h===(i.ownerDocument||o)){d.push(h.defaultView||h.parentWindow||e)}}p=0;while((f=d[p++])&&!n.isPropagationStopped()){n.type=p>1?l:c.bindType||v;u=(w._data(f,"events")||{})[n.type]&&w._data(f,"handle");if(u){u.apply(f,r)}u=a&&f[a];if(u&&w.acceptData(f)&&u.apply&&u.apply(f,r)===false){n.preventDefault()}}n.type=v;if(!s&&!n.isDefaultPrevented()){if((!c._default||c._default.apply(d.pop(),r)===false)&&w.acceptData(i)){if(a&&i[v]&&!w.isWindow(i)){h=i[a];if(h){i[a]=null}w.event.triggered=v;try{i[v]()}catch(g){}w.event.triggered=t;if(h){i[a]=h}}}}return n.result},dispatch:function(e){e=w.event.fix(e);var n,r,i,s,o,u=[],a=v.call(arguments),f=(w._data(this,"events")||{})[e.type]||[],l=w.event.special[e.type]||{};a[0]=e;e.delegateTarget=this;if(l.preDispatch&&l.preDispatch.call(this,e)===false){return}u=w.event.handlers.call(this,e,f);n=0;while((s=u[n++])&&!e.isPropagationStopped()){e.currentTarget=s.elem;o=0;while((i=s.handlers[o++])&&!e.isImmediatePropagationStopped()){if(!e.namespace_re||e.namespace_re.test(i.namespace)){e.handleObj=i;e.data=i.data;r=((w.event.special[i.origType]||{}).handle||i.handler).apply(s.elem,a);if(r!==t){if((e.result=r)===false){e.preventDefault();e.stopPropagation()}}}}}if(l.postDispatch){l.postDispatch.call(this,e)}return e.result},handlers:function(e,n){var r,i,s,o,u=[],a=n.delegateCount,f=e.target;if(a&&f.nodeType&&(!e.button||e.type!=="click")){for(;f!=this;f=f.parentNode||this){if(f.nodeType===1&&(f.disabled!==true||e.type!=="click")){s=[];for(o=0;o=0:w.find(r,this,null,[f]).length}if(s[r]){s.push(i)}}if(s.length){u.push({elem:f,handlers:s})}}}}if(a1?w.unique(n):n);n.selector=this.selector?this.selector+" "+e:e;return n},has:function(e){var t,n=w(e,this),r=n.length;return this.filter(function(){for(t=0;t-1:n.nodeType===1&&w.find.matchesSelector(n,e))){n=s.push(n);break}}}return this.pushStack(s.length>1?w.unique(s):s)},index:function(e){if(!e){return this[0]&&this[0].parentNode?this.first().prevAll().length:-1}if(typeof e==="string"){return w.inArray(this[0],w(e))}return w.inArray(e.jquery?e[0]:e,this)},add:function(e,t){var n=typeof e==="string"?w(e,t):w.makeArray(e&&e.nodeType?[e]:e),r=w.merge(this.get(),n);return this.pushStack(w.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}});w.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return w.dir(e,"parentNode")},parentsUntil:function(e,t,n){return w.dir(e,"parentNode",n)},next:function(e){return ct(e,"nextSibling")},prev:function(e){return ct(e,"previousSibling")},nextAll:function(e){return w.dir(e,"nextSibling")},prevAll:function(e){return w.dir(e,"previousSibling")},nextUntil:function(e,t,n){return w.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return w.dir(e,"previousSibling",n)},siblings:function(e){return w.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return w.sibling(e.firstChild)},contents:function(e){return w.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:w.merge([],e.childNodes)}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);if(e.slice(-5)!=="Until"){r=n}if(r&&typeof r==="string"){i=w.filter(r,i)}if(this.length>1){if(!lt[e]){i=w.unique(i)}if(at.test(e)){i=i.reverse()}}return this.pushStack(i)}});w.extend({filter:function(e,t,n){var r=t[0];if(n){e=":not("+e+")"}return t.length===1&&r.nodeType===1?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return e.nodeType===1}))},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!w(s).is(r))){if(s.nodeType===1){i.push(s)}s=s[n]}return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling){if(e.nodeType===1&&e!==t){n.push(e)}}return n}});var dt="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|"+"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",vt=/ jQuery\d+="(?:null|\d+)"/g,mt=new RegExp("<(?:"+dt+")[\\s/>]","i"),gt=/^\s+/,yt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,wt=/\s*$/g,Lt={option:[1,""],legend:[1,"
    ","
    "],area:[1,"",""],param:[1,"",""],thead:[1,"","
    "],tr:[2,"","
    "],col:[2,"","
    "],td:[3,"","
    "],_default:w.support.htmlSerialize?[0,"",""]:[1,"X
    ","
    "]},At=pt(o),Ot=At.appendChild(o.createElement("div"));Lt.optgroup=Lt.option;Lt.tbody=Lt.tfoot=Lt.colgroup=Lt.caption=Lt.thead;Lt.th=Lt.td;w.fn.extend({text:function(e){return w.access(this,function(e){return e===t?w.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(this.nodeType===1||this.nodeType===11||this.nodeType===9){var t=Mt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(this.nodeType===1||this.nodeType===11||this.nodeType===9){var t=Mt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){if(this.parentNode){this.parentNode.insertBefore(e,this)}})},after:function(){return this.domManip(arguments,function(e){if(this.parentNode){this.parentNode.insertBefore(e,this.nextSibling)}})},remove:function(e,t){var n,r=e?w.filter(e,this):this,i=0;for(;(n=r[i])!=null;i++){if(!t&&n.nodeType===1){w.cleanData(jt(n))}if(n.parentNode){if(t&&w.contains(n.ownerDocument,n)){Pt(jt(n,"script"))}n.parentNode.removeChild(n)}}return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){if(e.nodeType===1){w.cleanData(jt(e,false))}while(e.firstChild){e.removeChild(e.firstChild)}if(e.options&&w.nodeName(e,"select")){e.options.length=0}}return this},clone:function(e,t){e=e==null?false:e;t=t==null?e:t;return this.map(function(){return w.clone(this,e,t)})},html:function(e){return w.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t){return n.nodeType===1?n.innerHTML.replace(vt,""):t}if(typeof e==="string"&&!St.test(e)&&(w.support.htmlSerialize||!mt.test(e))&&(w.support.leadingWhitespace||!gt.test(e))&&!Lt[(bt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(yt,"<$1>");try{for(;r")){s=e.cloneNode(true)}else{Ot.innerHTML=e.outerHTML;Ot.removeChild(s=Ot.firstChild)}if((!w.support.noCloneEvent||!w.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!w.isXMLDoc(e)){r=jt(s);u=jt(e);for(o=0;(i=u[o])!=null;++o){if(r[o]){Bt(i,r[o])}}}if(t){if(n){u=u||jt(e);r=r||jt(s);for(o=0;(i=u[o])!=null;o++){Ht(i,r[o])}}else{Ht(e,s)}}r=jt(s,"script");if(r.length>0){Pt(r,!a&&jt(e,"script"))}r=u=i=null;return s},buildFragment:function(e,t,n,r){var i,s,o,u,a,f,l,c=e.length,h=pt(t),p=[],d=0;for(;d")+l[2];i=l[0];while(i--){u=u.lastChild}if(!w.support.leadingWhitespace&>.test(s)){p.push(t.createTextNode(gt.exec(s)[0]))}if(!w.support.tbody){s=a==="table"&&!wt.test(s)?u.firstChild:l[1]===""&&!wt.test(s)?u:0;i=s&&s.childNodes.length;while(i--){if(w.nodeName(f=s.childNodes[i],"tbody")&&!f.childNodes.length){s.removeChild(f)}}}w.merge(p,u.childNodes);u.textContent="";while(u.firstChild){u.removeChild(u.firstChild)}u=h.lastChild}}}if(u){h.removeChild(u)}if(!w.support.appendChecked){w.grep(jt(p,"input"),Ft)}d=0;while(s=p[d++]){if(r&&w.inArray(s,r)!==-1){continue}o=w.contains(s.ownerDocument,s);u=jt(h.appendChild(s),"script");if(o){Pt(u)}if(n){i=0;while(s=u[i++]){if(Nt.test(s.type||"")){n.push(s)}}}}u=null;return h},cleanData:function(e,t){var n,r,s,o,u=0,a=w.expando,f=w.cache,l=w.support.deleteExpando,h=w.event.special;for(;(n=e[u])!=null;u++){if(t||w.acceptData(n)){s=n[a];o=s&&f[s];if(o){if(o.events){for(r in o.events){if(h[r]){w.event.remove(n,r)}else{w.removeEvent(n,r,o.handle)}}}if(f[s]){delete f[s];if(l){delete n[a]}else if(typeof n.removeAttribute!==i){n.removeAttribute(a)}else{n[a]=null}c.push(s)}}}}},_evalUrl:function(e){return w.ajax({url:e,type:"GET",dataType:"script",async:false,global:false,"throws":true})}});w.fn.extend({wrapAll:function(e){if(w.isFunction(e)){return this.each(function(t){w(this).wrapAll(e.call(this,t))})}if(this[0]){var t=w(e,this[0].ownerDocument).eq(0).clone(true);if(this[0].parentNode){t.insertBefore(this[0])}t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1){e=e.firstChild}return e}).append(this)}return this},wrapInner:function(e){if(w.isFunction(e)){return this.each(function(t){w(this).wrapInner(e.call(this,t))})}return this.each(function(){var t=w(this),n=t.contents();if(n.length){n.wrapAll(e)}else{t.append(e)}})},wrap:function(e){var t=w.isFunction(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){if(!w.nodeName(this,"body")){w(this).replaceWith(this.childNodes)}}).end()}});var It,qt,Rt,Ut=/alpha\([^)]*\)/i,zt=/opacity\s*=\s*([^)]*)/,Wt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Vt=/^margin/,$t=new RegExp("^("+E+")(.*)$","i"),Jt=new RegExp("^("+E+")(?!px)[a-z%]+$","i"),Kt=new RegExp("^([+-])=("+E+")","i"),Qt={BODY:"block"},Gt={position:"absolute",visibility:"hidden",display:"block"},Yt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];w.fn.extend({css:function(e,n){return w.access(this,function(e,n,r){var i,s,o={},u=0;if(w.isArray(n)){s=qt(e);i=n.length;for(;u1)},show:function(){return rn(this,true)},hide:function(){return rn(this)},toggle:function(e){if(typeof e==="boolean"){return e?this.show():this.hide()}return this.each(function(){if(nn(this)){w(this).show()}else{w(this).hide()}})}});w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Rt(e,"opacity");return n===""?"1":n}}}},cssNumber:{columnCount:true,fillOpacity:true,fontWeight:true,lineHeight:true,opacity:true,order:true,orphans:true,widows:true,zIndex:true,zoom:true},cssProps:{"float":w.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style){return}var s,o,u,a=w.camelCase(n),f=e.style;n=w.cssProps[a]||(w.cssProps[a]=tn(f,a));u=w.cssHooks[n]||w.cssHooks[a];if(r!==t){o=typeof r;if(o==="string"&&(s=Kt.exec(r))){r=(s[1]+1)*s[2]+parseFloat(w.css(e,n));o="number"}if(r==null||o==="number"&&isNaN(r)){return}if(o==="number"&&!w.cssNumber[a]){r+="px"}if(!w.support.clearCloneStyle&&r===""&&n.indexOf("background")===0){f[n]="inherit"}if(!u||!("set"in u)||(r=u.set(e,r,i))!==t){try{f[n]=r}catch(l){}}}else{if(u&&"get"in u&&(s=u.get(e,false,i))!==t){return s}return f[n]}},css:function(e,n,r,i){var s,o,u,a=w.camelCase(n);n=w.cssProps[a]||(w.cssProps[a]=tn(e.style,a));u=w.cssHooks[n]||w.cssHooks[a];if(u&&"get"in u){o=u.get(e,true,r)}if(o===t){o=Rt(e,n,i)}if(o==="normal"&&n in Yt){o=Yt[n]}if(r===""||r){s=parseFloat(o);return r===true||w.isNumeric(s)?s||0:o}return o}});if(e.getComputedStyle){qt=function(t){return e.getComputedStyle(t,null)};Rt=function(e,n,r){var i,s,o,u=r||qt(e),a=u?u.getPropertyValue(n)||u[n]:t,f=e.style;if(u){if(a===""&&!w.contains(e.ownerDocument,e)){a=w.style(e,n)}if(Jt.test(a)&&Vt.test(n)){i=f.width;s=f.minWidth;o=f.maxWidth;f.minWidth=f.maxWidth=f.width=a;a=u.width;f.width=i;f.minWidth=s;f.maxWidth=o}}return a}}else if(o.documentElement.currentStyle){qt=function(e){return e.currentStyle};Rt=function(e,n,r){var i,s,o,u=r||qt(e),a=u?u[n]:t,f=e.style;if(a==null&&f&&f[n]){a=f[n]}if(Jt.test(a)&&!Wt.test(n)){i=f.left;s=e.runtimeStyle;o=s&&s.left;if(o){s.left=e.currentStyle.left}f.left=n==="fontSize"?"1em":a;a=f.pixelLeft+"px";f.left=i;if(o){s.left=o}}return a===""?"auto":a}}w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n){return e.offsetWidth===0&&Xt.test(w.css(e,"display"))?w.swap(e,Gt,function(){return un(e,t,r)}):un(e,t,r)}},set:function(e,n,r){var i=r&&qt(e);return sn(e,n,r?on(e,t,r,w.support.boxSizing&&w.css(e,"boxSizing",false,i)==="border-box",i):0)}}});if(!w.support.opacity){w.cssHooks.opacity={get:function(e,t){return zt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=w.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if((t>=1||t==="")&&w.trim(s.replace(Ut,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(t===""||r&&!r.filter){return}}n.filter=Ut.test(s)?s.replace(Ut,i):s+" "+i}}}w(function(){if(!w.support.reliableMarginRight){w.cssHooks.marginRight={get:function(e,t){if(t){return w.swap(e,{display:"inline-block"},Rt,[e,"marginRight"])}}}}if(!w.support.pixelPosition&&w.fn.position){w.each(["top","left"],function(e,t){w.cssHooks[t]={get:function(e,n){if(n){n=Rt(e,t);return Jt.test(n)?w(e).position()[t]+"px":n}}}})}});if(w.expr&&w.expr.filters){w.expr.filters.hidden=function(e){return e.offsetWidth<=0&&e.offsetHeight<=0||!w.support.reliableHiddenOffsets&&(e.style&&e.style.display||w.css(e,"display"))==="none"};w.expr.filters.visible=function(e){return!w.expr.filters.hidden(e)}}w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){var r=0,i={},s=typeof n==="string"?n.split(" "):[n];for(;r<4;r++){i[e+Zt[r]+t]=s[r]||s[r-2]||s[0]}return i}};if(!Vt.test(e)){w.cssHooks[e+t].set=sn}});var ln=/%20/g,cn=/\[\]$/,hn=/\r?\n/g,pn=/^(?:submit|button|image|reset|file)$/i,dn=/^(?:input|select|textarea|keygen)/i;w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&dn.test(this.nodeName)&&!pn.test(e)&&(this.checked||!xt.test(e))}).map(function(e,t){var n=w(this).val();return n==null?null:w.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(hn,"\r\n")}}):{name:t.name,value:n.replace(hn,"\r\n")}}).get()}});w.param=function(e,n){var r,i=[],s=function(e,t){t=w.isFunction(t)?t():t==null?"":t;i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t){n=w.ajaxSettings&&w.ajaxSettings.traditional}if(w.isArray(e)||e.jquery&&!w.isPlainObject(e)){w.each(e,function(){s(this.name,this.value)})}else{for(r in e){vn(r,e[r],n,s)}}return i.join("&").replace(ln,"+")};w.each(("blur focus focusin focusout load resize scroll unload click dblclick "+"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave "+"change select submit keydown keypress keyup error contextmenu").split(" "),function(e,t){w.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}});w.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return arguments.length===1?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,gn,yn=w.now(),bn=/\?/,wn=/#.*$/,En=/([?&])_=[^&]*/,Sn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,xn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Tn=/^(?:GET|HEAD)$/,Nn=/^\/\//,Cn=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,kn=w.fn.load,Ln={},An={},On="*/".concat("*");try{gn=s.href}catch(Mn){gn=o.createElement("a");gn.href="";gn=gn.href}mn=Cn.exec(gn.toLowerCase())||[];w.fn.load=function(e,n,r){if(typeof e!=="string"&&kn){return kn.apply(this,arguments)}var i,s,o,u=this,a=e.indexOf(" ");if(a>=0){i=e.slice(a,e.length);e=e.slice(0,a)}if(w.isFunction(n)){r=n;n=t}else if(n&&typeof n==="object"){o="POST"}if(u.length>0){w.ajax({url:e,type:o,dataType:"html",data:n}).done(function(e){s=arguments;u.html(i?w("
    ").append(w.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){u.each(r,s||[e.responseText,t,e])})}return this};w.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){w.fn[t]=function(e){return this.on(t,e)}});w.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:gn,type:"GET",isLocal:xn.test(mn[1]),global:true,processData:true,async:true,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":On,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":true,"text json":w.parseJSON,"text xml":w.parseXML},flatOptions:{url:true,context:true}},ajaxSetup:function(e,t){return t?Pn(Pn(e,w.ajaxSettings),t):Pn(w.ajaxSettings,e)},ajaxPrefilter:_n(Ln),ajaxTransport:_n(An),ajax:function(e,n){function N(e,n,r,i){var l,g,y,E,S,T=n;if(b===2){return}b=2;if(u){clearTimeout(u)}f=t;o=i||"";x.readyState=e>0?4:0;l=e>=200&&e<300||e===304;if(r){E=Hn(c,x,r)}E=Bn(c,E,x,l);if(l){if(c.ifModified){S=x.getResponseHeader("Last-Modified");if(S){w.lastModified[s]=S}S=x.getResponseHeader("etag");if(S){w.etag[s]=S}}if(e===204||c.type==="HEAD"){T="nocontent"}else if(e===304){T="notmodified"}else{T=E.state;g=E.data;y=E.error;l=!y}}else{y=T;if(e||!T){T="error";if(e<0){e=0}}}x.status=e;x.statusText=(n||T)+"";if(l){d.resolveWith(h,[g,T,x])}else{d.rejectWith(h,[x,T,y])}x.statusCode(m);m=t;if(a){p.trigger(l?"ajaxSuccess":"ajaxError",[x,c,l?g:y])}v.fireWith(h,[x,T]);if(a){p.trigger("ajaxComplete",[x,c]);if(!--w.active){w.event.trigger("ajaxStop")}}}if(typeof e==="object"){n=e;e=t}n=n||{};var r,i,s,o,u,a,f,l,c=w.ajaxSetup({},n),h=c.context||c,p=c.context&&(h.nodeType||h.jquery)?w(h):w.event,d=w.Deferred(),v=w.Callbacks("once memory"),m=c.statusCode||{},g={},y={},b=0,E="canceled",x={readyState:0,getResponseHeader:function(e){var t;if(b===2){if(!l){l={};while(t=Sn.exec(o)){l[t[1].toLowerCase()]=t[2]}}t=l[e.toLowerCase()]}return t==null?null:t},getAllResponseHeaders:function(){return b===2?o:null},setRequestHeader:function(e,t){var n=e.toLowerCase();if(!b){e=y[n]=y[n]||e;g[e]=t}return this},overrideMimeType:function(e){if(!b){c.mimeType=e}return this},statusCode:function(e){var t;if(e){if(b<2){for(t in e){m[t]=[m[t],e[t]]}}else{x.always(e[x.status])}}return this},abort:function(e){var t=e||E;if(f){f.abort(t)}N(0,t);return this}};d.promise(x).complete=v.add;x.success=x.done;x.error=x.fail;c.url=((e||c.url||gn)+"").replace(wn,"").replace(Nn,mn[1]+"//");c.type=n.method||n.type||c.method||c.type;c.dataTypes=w.trim(c.dataType||"*").toLowerCase().match(S)||[""];if(c.crossDomain==null){r=Cn.exec(c.url.toLowerCase());c.crossDomain=!!(r&&(r[1]!==mn[1]||r[2]!==mn[2]||(r[3]||(r[1]==="http:"?"80":"443"))!==(mn[3]||(mn[1]==="http:"?"80":"443"))))}if(c.data&&c.processData&&typeof c.data!=="string"){c.data=w.param(c.data,c.traditional)}Dn(Ln,c,n,x);if(b===2){return x}a=c.global;if(a&&w.active++===0){w.event.trigger("ajaxStart")}c.type=c.type.toUpperCase();c.hasContent=!Tn.test(c.type);s=c.url;if(!c.hasContent){if(c.data){s=c.url+=(bn.test(s)?"&":"?")+c.data;delete c.data}if(c.cache===false){c.url=En.test(s)?s.replace(En,"$1_="+yn++):s+(bn.test(s)?"&":"?")+"_="+yn++}}if(c.ifModified){if(w.lastModified[s]){x.setRequestHeader("If-Modified-Since",w.lastModified[s])}if(w.etag[s]){x.setRequestHeader("If-None-Match",w.etag[s])}}if(c.data&&c.hasContent&&c.contentType!==false||n.contentType){x.setRequestHeader("Content-Type",c.contentType)}x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+On+"; q=0.01":""):c.accepts["*"]);for(i in c.headers){x.setRequestHeader(i,c.headers[i])}if(c.beforeSend&&(c.beforeSend.call(h,x,c)===false||b===2)){return x.abort()}E="abort";for(i in{success:1,error:1,complete:1}){x[i](c[i])}f=Dn(An,c,n,x);if(!f){N(-1,"No Transport")}else{x.readyState=1;if(a){p.trigger("ajaxSend",[x,c])}if(c.async&&c.timeout>0){u=setTimeout(function(){x.abort("timeout")},c.timeout)}try{b=1;f.send(g,N)}catch(T){if(b<2){N(-1,T)}else{throw T}}}return x},getJSON:function(e,t,n){return w.get(e,t,n,"json")},getScript:function(e,n){return w.get(e,t,n,"script")}});w.each(["get","post"],function(e,n){w[n]=function(e,r,i,s){if(w.isFunction(r)){s=s||i;i=r;r=t}return w.ajax({url:e,type:n,dataType:s,data:r,success:i})}});w.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){w.globalEval(e);return e}}});w.ajaxPrefilter("script",function(e){if(e.cache===t){e.cache=false}if(e.crossDomain){e.type="GET";e.global=false}});w.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||w("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script");n.async=true;if(e.scriptCharset){n.charset=e.scriptCharset}n.src=e.url;n.onload=n.onreadystatechange=function(e,t){if(t||!n.readyState||/loaded|complete/.test(n.readyState)){n.onload=n.onreadystatechange=null;if(n.parentNode){n.parentNode.removeChild(n)}n=null;if(!t){i(200,"success")}}};r.insertBefore(n,r.firstChild)},abort:function(){if(n){n.onload(t,true)}}}}});var jn=[],Fn=/(=)\?(?=&|$)|\?\?/;w.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=jn.pop()||w.expando+"_"+yn++;this[e]=true;return e}});w.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.jsonp!==false&&(Fn.test(n.url)?"url":typeof n.data==="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Fn.test(n.data)&&"data");if(a||n.dataTypes[0]==="jsonp"){s=n.jsonpCallback=w.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback;if(a){n[a]=n[a].replace(Fn,"$1"+s)}else if(n.jsonp!==false){n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+s}n.converters["script json"]=function(){if(!u){w.error(s+" was not called")}return u[0]};n.dataTypes[0]="json";o=e[s];e[s]=function(){u=arguments};i.always(function(){e[s]=o;if(n[s]){n.jsonpCallback=r.jsonpCallback;jn.push(s)}if(u&&w.isFunction(o)){o(u[0])}u=o=t});return"script"}});var In,qn,Rn=0,Un=e.ActiveXObject&&function(){var e;for(e in In){In[e](t,true)}};w.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&zn()||Wn()}:zn;qn=w.ajaxSettings.xhr();w.support.cors=!!qn&&"withCredentials"in qn;qn=w.support.ajax=!!qn;if(qn){w.ajaxTransport(function(n){if(!n.crossDomain||w.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();if(n.username){a.open(n.type,n.url,n.async,n.username,n.password)}else{a.open(n.type,n.url,n.async)}if(n.xhrFields){for(u in n.xhrFields){a[u]=n.xhrFields[u]}}if(n.mimeType&&a.overrideMimeType){a.overrideMimeType(n.mimeType)}if(!n.crossDomain&&!i["X-Requested-With"]){i["X-Requested-With"]="XMLHttpRequest"}try{for(u in i){a.setRequestHeader(u,i[u])}}catch(f){}a.send(n.hasContent&&n.data||null);r=function(e,i){var u,f,l,c;try{if(r&&(i||a.readyState===4)){r=t;if(o){a.onreadystatechange=w.noop;if(Un){delete In[o]}}if(i){if(a.readyState!==4){a.abort()}}else{c={};u=a.status;f=a.getAllResponseHeaders();if(typeof a.responseText==="string"){c.text=a.responseText}try{l=a.statusText}catch(h){l=""}if(!u&&n.isLocal&&!n.crossDomain){u=c.text?200:404}else if(u===1223){u=204}}}}catch(p){if(!i){s(-1,p)}}if(c){s(u,l,c,f)}};if(!n.async){r()}else if(a.readyState===4){setTimeout(r)}else{o=++Rn;if(Un){if(!In){In={};w(e).unload(Un)}In[o]=r}a.onreadystatechange=r}},abort:function(){if(r){r(t,true)}}}}})}var Xn,Vn,$n=/^(?:toggle|show|hide)$/,Jn=new RegExp("^(?:([+-])=|)("+E+")([a-z%]*)$","i"),Kn=/queueHooks$/,Qn=[nr],Gn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Jn.exec(t),s=i&&i[3]||(w.cssNumber[e]?"":"px"),o=(w.cssNumber[e]||s!=="px"&&+r)&&Jn.exec(w.css(n.elem,e)),u=1,a=20;if(o&&o[3]!==s){s=s||o[3];i=i||[];o=+r||1;do{u=u||".5";o=o/u;w.style(n.elem,e,o+s)}while(u!==(u=n.cur()/r)&&u!==1&&--a)}if(i){o=n.start=+o||+r||0;n.unit=s;n.end=i[1]?o+(i[1]+1)*i[2]:+i[2]}return n}]};w.Animation=w.extend(er,{tweener:function(e,t){if(w.isFunction(e)){t=e;e=["*"]}else{e=e.split(" ")}var n,r=0,i=e.length;for(;r-1,f={},l={},c,h;if(a){l=i.position();c=l.top;h=l.left}else{c=parseFloat(o)||0;h=parseFloat(u)||0}if(w.isFunction(t)){t=t.call(e,n,s)}if(t.top!=null){f.top=t.top-s.top+c}if(t.left!=null){f.left=t.left-s.left+h}if("using"in t){t.using.call(e,f)}else{i.css(f)}}};w.fn.extend({position:function(){if(!this[0]){return}var e,t,n={top:0,left:0},r=this[0];if(w.css(r,"position")==="fixed"){t=r.getBoundingClientRect()}else{e=this.offsetParent();t=this.offset();if(!w.nodeName(e[0],"html")){n=e.offset()}n.top+=w.css(e[0],"borderTopWidth",true);n.left+=w.css(e[0],"borderLeftWidth",true)}return{top:t.top-n.top-w.css(r,"marginTop",true),left:t.left-n.left-w.css(r,"marginLeft",true)}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||u;while(e&&!w.nodeName(e,"html")&&w.css(e,"position")==="static"){e=e.offsetParent}return e||u})}});w.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);w.fn[e]=function(i){return w.access(this,function(e,i,s){var o=sr(e);if(s===t){return o?n in o?o[n]:o.document.documentElement[i]:e[i]}if(o){o.scrollTo(!r?s:w(o).scrollLeft(),r?s:w(o).scrollTop())}else{e[i]=s}},e,i,arguments.length,null)}});w.each({Height:"height",Width:"width"},function(e,n){w.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){w.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!=="boolean"),u=r||(i===true||s===true?"margin":"border");return w.access(this,function(n,r,i){var s;if(w.isWindow(n)){return n.document.documentElement["client"+e]}if(n.nodeType===9){s=n.documentElement;return Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])}return i===t?w.css(n,r,u):w.style(n,r,i,u)},n,o?i:t,o,null)}})});w.fn.size=function(){return this.length};w.fn.andSelf=w.fn.addBack;if(typeof module==="object"&&module&&typeof module.exports==="object"){module.exports=w}else{e.jQuery=e.$=w;if(typeof define==="function"&&define.amd){define("jquery",[],function(){return w})}}})(window);(function(){"use strict";function encodeHTMLSource(){var e={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"},t=/&(?!#?\w+;)|<|>|"|'|\//g;return function(){return this?this.replace(t,function(t){return e[t]||t}):this}}function resolveDefs(e,t,n){return(typeof t==="string"?t:t.toString()).replace(e.define||skip,function(t,r,i,s){if(r.indexOf("def.")===0){r=r.substring(4)}if(!(r in n)){if(i===":"){if(e.defineParams)s.replace(e.defineParams,function(e,t,i){n[r]={arg:t,text:i}});if(!(r in n))n[r]=s}else{(new Function("def","def['"+r+"']="+s))(n)}}return""}).replace(e.use||skip,function(t,r){if(e.useParams)r=r.replace(e.useParams,function(e,t,r,i){if(n[r]&&n[r].arg&&i){var s=(r+":"+i).replace(/'|\\/g,"_");n.__exp=n.__exp||{};n.__exp[s]=n[r].text.replace(new RegExp("(^|[^\\w$])"+n[r].arg+"([^\\w$])","g"),"$1"+i+"$2");return t+"def.__exp['"+s+"']"}});var i=(new Function("def","return "+r))(n);return i?resolveDefs(e,i,n):i})}function unescape(e){return e.replace(/\\('|\\)/g,"$1").replace(/[\r\t\n]/g," ")}var doT={version:"1.0.1-nanoui",templateSettings:{evaluate:/\{\{([\s\S]+?)\}\}/g,interpolate:/\{\{:([\s\S]+?)\}\}/g,encode:/\{\{>([\s\S]+?)\}\}/g,use:/\{\{#([\s\S]+?)\}\}/g,define:/\{\{##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\}\}/g,conditional:/\{\{\/?if\s*([\s\S]*?)\s*\}\}/g,conditionalElse:/\{\{else\s*([\s\S]*?)\s*\}\}/g,iterate:/\{\{\/?for\s*(?:\}\}|([\s\S]+?)\s*(?:\:\s*([\w$]+))?\s*(?:\:\s*([\w$]+))?\s*\}\})/g,props:/\{\{\/?props\s*(?:\}\}|([\s\S]+?)\s*(?:\:\s*([\w$]+))?\s*(?:\:\s*([\w$]+))?\s*\}\})/g,empty:/\{\{empty\}\}/g,varname:"data, config, helper",strip:true,append:true,selfcontained:false},template:undefined,compile:undefined},global;if(typeof module!=="undefined"&&module.exports){module.exports=doT}else if(typeof define==="function"&&define.amd){define(function(){return doT})}else{global=function(){return this||(0,eval)("this")}();global.doT=doT}String.prototype.encodeHTML=encodeHTMLSource();var startend={append:{start:"'+(",end:")+'",endencode:"||'').toString().encodeHTML()+'"},split:{start:"';out+=(",end:");out+='",endencode:"||'').toString().encodeHTML();out+='"}},skip=/$^/;doT.template=function(e,t,n){t=t||doT.templateSettings;var r=t.append?startend.append:startend.split,i,s=0,o=t.use||t.define?resolveDefs(t,e,n||{}):e;o=("var out='"+(t.strip?o.replace(/(^|\r|\n)\t* +| +\t*(\r|\n|$)/g," ").replace(/\r|\n|\t|\/\*[\s\S]*?\*\//g,""):o).replace(/'|\\/g,"\\$&").replace(t.interpolate||skip,function(e,t){return r.start+unescape(t)+r.end}).replace(t.encode||skip,function(e,t){i=true;return r.start+unescape(t)+r.endencode}).replace(t.conditional||skip,function(e,t){return t?"';if("+unescape(t)+"){out+='":"';}out+='"}).replace(t.conditionalElse||skip,function(e,t){return t?"';}else if("+unescape(t)+"){out+='":"';}else{out+='"}).replace(t.iterate||skip,function(e,t,n,r){if(!t)return"';} } out+='";s+=1;n=n||"value";r=r||"index";t=unescape(t);var i="arr"+s;return"';var "+i+"="+t+";if("+i+" && "+i+".length > 0){var "+n+","+r+"=-1,l"+s+"="+i+".length-1;while("+r+" 0){var "+n+";for( var "+r+" in "+i+"){ if (!"+i+".hasOwnProperty("+r+")) continue; "+n+"="+i+"["+r+"];out+='"}).replace(t.empty||skip,function(e){return"';}}else{if(true){out+='"}).replace(t.evaluate||skip,function(e,t){return"';"+unescape(t)+"out+='"})+"';return out;").replace(/\n/g,"\\n").replace(/\t/g,"\\t").replace(/\r/g,"\\r").replace(/(\s|;|\}|^|\{)out\+='';/g,"$1").replace(/\+''/g,"").replace(/(\s|;|\}|^|\{)out\+=''\+/g,"$1out+=");if(i&&t.selfcontained){o="String.prototype.encodeHTML=("+encodeHTMLSource.toString()+"());"+o}try{return new Function(t.varname,o)}catch(u){if(typeof console!=="undefined")console.log("Could not create a template function: "+o);throw u}};doT.compile=function(e,t){return doT.template(e,null,t)}})();jQuery.fn.extend({everyTime:function(e,t,n,r){return this.each(function(){jQuery.timer.add(this,e,t,n,r)})},oneTime:function(e,t,n){return this.each(function(){jQuery.timer.add(this,e,t,n,1)})},stopTime:function(e,t){return this.each(function(){jQuery.timer.remove(this,e,t)})}});jQuery.extend({timer:{global:[],guid:1,dataKey:"jQuery.timer",regex:/^([0-9]+(?:\.[0-9]*)?)\s*(.*s)?$/,powers:{ms:1,cs:10,ds:100,s:1e3,das:1e4,hs:1e5,ks:1e6},timeParse:function(e){if(e==undefined||e==null)return null;var t=this.regex.exec(jQuery.trim(e.toString()));return t[2]?parseFloat(t[1])*(this.powers[t[2]]||1):e},add:function(e,t,n,r,i){var s=0;if(jQuery.isFunction(n)){i||(i=r);r=n;n=t}t=jQuery.timer.timeParse(t);if(!(typeof t!="number"||isNaN(t)||t<0)){if(typeof i!="number"||isNaN(i)||i<0)i=0;i=i||0;var o=jQuery.data(e,this.dataKey)||jQuery.data(e,this.dataKey,{});o[n]||(o[n]={});r.timerID=r.timerID||this.guid++;var u=function(){if(++s>i&&i!==0||r.call(e,s)===false)jQuery.timer.remove(e,n,r)};u.timerID=r.timerID;o[n][r.timerID]||(o[n][r.timerID]=window.setInterval(u,t));this.global.push(e)}},remove:function(e,t,n){var r=jQuery.data(e,this.dataKey),i;if(r){if(t){if(r[t]){if(n){if(n.timerID){window.clearInterval(r[t][n.timerID]);delete r[t][n.timerID]}}else for(n in r[t]){window.clearInterval(r[t][n]);delete r[t][n]}for(i in r[t])break;if(!i){i=null;delete r[t]}}}else for(t in r)this.remove(e,t,n);for(i in r)break;i||jQuery.removeData(e,this.dataKey)}}}});jQuery(window).bind("unload",function(){jQuery.each(jQuery.timer.global,function(e,t){jQuery.timer.remove(t)})}) \ No newline at end of file diff --git a/nano/js/libraries/2-doT.js b/nano/js/libraries/2-doT.js index 50c5e451fc..a0ec5520c0 100644 --- a/nano/js/libraries/2-doT.js +++ b/nano/js/libraries/2-doT.js @@ -13,7 +13,8 @@ conditionalElse: /\{\{else\s*([\s\S]*?)\s*\}\}/g, iterate: /\{\{\/?for\s*(?:\}\}|([\s\S]+?)\s*(?:\:\s*([\w$]+))?\s*(?:\:\s*([\w$]+))?\s*\}\})/g, props: /\{\{\/?props\s*(?:\}\}|([\s\S]+?)\s*(?:\:\s*([\w$]+))?\s*(?:\:\s*([\w$]+))?\s*\}\})/g, - varname: 'data, helper', + empty: /\{\{empty\}\}/g, + varname: 'data, config, helper', strip: true, append: true, selfcontained: false @@ -116,7 +117,7 @@ iname = iname || "index"; iterate = unescape(iterate); var arrayName = "arr" + sid; - return "';var " + arrayName + "=" + iterate + ";if(" + arrayName + "){var " + vname + "," + iname + "=-1,l" + sid + "=" + arrayName + ".length-1;while(" + iname + " 0){var " + vname + "," + iname + "=-1,l" + sid + "=" + arrayName + ".length-1;while(" + iname + " 0){var " + vname + ";for( var " + iname + " in " + objectName + "){ if (!" + objectName + ".hasOwnProperty(" + iname + ")) continue; " + vname + "=" + objectName + "[" + iname + "];out+='"; + }) + .replace(c.empty || skip, function (m) { + return "';}}else{if(true){out+='"; // The "if(true)" condition is required to account for the for tag closing with two brackets }) .replace(c.evaluate || skip, function (m, code) { return "';" + unescape(code) + "out+='"; diff --git a/nano/js/nano_base_callbacks.js b/nano/js/nano_base_callbacks.js new file mode 100644 index 0000000000..3770dae7ec --- /dev/null +++ b/nano/js/nano_base_callbacks.js @@ -0,0 +1,85 @@ +// NanoBaseCallbacks is where the base callbacks (common to all templates) are stored +NanoBaseCallbacks = function () +{ + // _canClick is used to disable clicks for a short period after each click (to avoid mis-clicks) + var _canClick = true; + + var _baseBeforeUpdateCallbacks = {} + + var _baseAfterUpdateCallbacks = { + // this callback is triggered after new data is processed + // it updates the status/visibility icon and adds click event handling to buttons/links + status: function (updateData) { + var uiStatusClass; + if (updateData['config']['status'] == 2) + { + uiStatusClass = 'icon24 uiStatusGood'; + $('.linkActive').removeClass('inactive'); + } + else if (updateData['config']['status'] == 1) + { + uiStatusClass = 'icon24 uiStatusAverage'; + $('.linkActive').addClass('inactive'); + } + else + { + uiStatusClass = 'icon24 uiStatusBad' + $('.linkActive').addClass('inactive'); + } + $('#uiStatusIcon').attr('class', uiStatusClass); + + $('.linkActive').stopTime('linkPending'); + $('.linkActive').removeClass('linkPending'); + + $('.linkActive').off('click'); + $('.linkActive').on('click', function (event) { + event.preventDefault(); + var href = $(this).data('href'); + if (href != null && _canClick) + { + _canClick = false; + $('body').oneTime(300, 'enableClick', function () { + _canClick = true; + }); + if (updateData['config']['status'] == 2) + { + $(this).oneTime(300, 'linkPending', function () { + $(this).addClass('linkPending'); + }); + } + window.location.href = href; + } + }); + } + }; + + return { + addCallbacks: function () { + NanoStateManager.addBeforeUpdateCallbacks(_baseBeforeUpdateCallbacks); + NanoStateManager.addAfterUpdateCallbacks(_baseAfterUpdateCallbacks); + }, + removeCallbacks: function () { + for (var callbackKey in _baseBeforeUpdateCallbacks) + { + if (_baseBeforeUpdateCallbacks.hasOwnProperty(callbackKey)) + { + NanoStateManager.removeBeforeUpdateCallback(callbackKey); + } + } + for (var callbackKey in _baseAfterUpdateCallbacks) + { + if (_baseAfterUpdateCallbacks.hasOwnProperty(callbackKey)) + { + NanoStateManager.removeAfterUpdateCallback(callbackKey); + } + } + } + }; +} (); + + + + + + + diff --git a/nano/js/nano_base_helpers.js b/nano/js/nano_base_helpers.js index 90b29da1e0..98275b247d 100644 --- a/nano/js/nano_base_helpers.js +++ b/nano/js/nano_base_helpers.js @@ -1,17 +1,8 @@ // NanoBaseHelpers is where the base template helpers (common to all templates) are stored NanoBaseHelpers = function () { - var init = function () - { - - - initHelpers(); - }; - - var initHelpers = function () - { - NanoTemplate.addHelpers({ - + var _baseHelpers = { + // change ui styling to "syndicate mode" syndicateMode: function() { $('body').css("background-color","#8f1414"); $('body').css("background-image","url('uiBackground-Syndicate.png')"); @@ -24,7 +15,6 @@ NanoBaseHelpers = function () return ''; }, - // Generate a Byond link link: function( text, icon, parameters, status, elementClass, elementId) { @@ -187,13 +177,22 @@ NanoBaseHelpers = function () return html; } - }); - }; - + }; + return { - init: function () + addHelpers: function () { - init(); + NanoTemplate.addHelpers(_baseHelpers); + }, + removeHelpers: function () + { + for (var helperKey in _baseHelpers) + { + if (_baseHelpers.hasOwnProperty(helperKey)) + { + NanoTemplate.removeHelper(helperKey); + } + } } }; } (); diff --git a/nano/js/nano_state.js b/nano/js/nano_state.js new file mode 100644 index 0000000000..7a3dcfdf03 --- /dev/null +++ b/nano/js/nano_state.js @@ -0,0 +1,69 @@ +// This is the base state class, it is not to be used directly + +function NanoStateClass() { + /*if (typeof this.key != 'string' || !this.key.length) + { + alert('ERROR: Tried to create a state with an invalid state key: ' + this.key); + return; + } + + this.key = this.key.toLowerCase(); + + NanoStateManager.addState(this);*/ +} + +NanoStateClass.prototype.key = null; + +NanoStateClass.prototype.isCurrent = function () { + return NanoStateManager.getCurrentState() == this; +}; + +NanoStateClass.prototype.onAdd = function (previousState) { + // Do not add code here, add it to the 'default' state (nano_state_defaut.js) or create a new state and override this function + + NanoBaseCallbacks.addCallbacks(); + NanoBaseHelpers.addHelpers(); +}; + +NanoStateClass.prototype.onRemove = function (nextState) { + // Do not add code here, add it to the 'default' state (nano_state_defaut.js) or create a new state and override this function + + NanoBaseCallbacks.removeCallbacks(); + NanoBaseHelpers.removeHelpers(); +}; + +NanoStateClass.prototype.onBeforeUpdate = function (data) { + // Do not add code here, add it to the 'default' state (nano_state_defaut.js) or create a new state and override this function + + data = NanoStateManager.executeBeforeUpdateCallbacks(data); + + return data; // Return data to continue, return false to prevent onUpdate and onAfterUpdate +}; + +NanoStateClass.prototype.onUpdate = function (data) { + // Do not add code here, add it to the 'default' state (nano_state_defaut.js) or create a new state and override this function + + try + { + $("#mainTemplate").html(NanoTemplate.parse('main', data)); // render the 'mail' template to the #mainTemplate div + } + catch(error) + { + alert('ERROR: An error occurred while rendering the UI: ' + error.message); + return; + } +}; + +NanoStateClass.prototype.onAfterUpdate = function (data) { + // Do not add code here, add it to the 'default' state (nano_state_defaut.js) or create a new state and override this function + + NanoStateManager.executeAfterUpdateCallbacks(data); +}; + +NanoStateClass.prototype.alertText = function (text) { + // Do not add code here, add it to the 'default' state (nano_state_defaut.js) or create a new state and override this function + + alert(text); +}; + + diff --git a/nano/js/nano_state_default.js b/nano/js/nano_state_default.js new file mode 100644 index 0000000000..65493b8c87 --- /dev/null +++ b/nano/js/nano_state_default.js @@ -0,0 +1,14 @@ + +NanoStateDefaultClass.inheritsFrom(NanoStateClass); +var NanoStateDefault = new NanoStateDefaultClass(); + +function NanoStateDefaultClass() { + + this.key = 'default'; + + //this.parent.constructor.call(this); + + this.key = this.key.toLowerCase(); + + NanoStateManager.addState(this); +} \ No newline at end of file diff --git a/nano/js/nano_state_manager.js b/nano/js/nano_state_manager.js new file mode 100644 index 0000000000..0cbdb2e48a --- /dev/null +++ b/nano/js/nano_state_manager.js @@ -0,0 +1,227 @@ +// NanoStateManager handles data from the server and uses it to render templates +NanoStateManager = function () +{ + // _isInitialised is set to true when all of this ui's templates have been processed/rendered + var _isInitialised = false; + + // the array of template names to use for this ui + var _templates = null; + // the data for this ui + var _data = null; + // new data which arrives before _isInitialised is true is stored here for processing later + var _earlyUpdateData = null; + + // this is an array of callbacks which are called when new data arrives, before it is processed + var _beforeUpdateCallbacks = {}; + // this is an array of callbacks which are called when new data arrives, before it is processed + var _afterUpdateCallbacks = {}; + + // this is an array of state objects, these can be used to provide custom javascript logic + var _states = {}; + + var _currentState = null; + + // the init function is called when the ui has loaded + // this function sets up the templates and base functionality + var init = function () + { + $('#uiLoadingNotice').html('Loading...'); + + // We store initialData and templateData in the body tag, it's as good a place as any + _data = $('body').data('initialData'); + + if (_data == null || !_data.hasOwnProperty('config') || !_data.hasOwnProperty('data')) + { + alert('Error: Initial data did not load correctly.'); + } + + var stateKey = 'default'; + if (_data['config'].hasOwnProperty('stateKey') && _data['config']['stateKey']) + { + stateKey = _data['config']['stateKey'].toLowerCase(); + } + + NanoStateManager.setCurrentState(stateKey); + + $(document).on('templatesLoaded', function () { + doUpdate(_data); + + _isInitialised = true; + $('#uiLoadingNotice').hide(); + }); + }; + + // Receive update data from the server + var receiveUpdateData = function (jsonString) + { + var updateData; + try + { + // parse the JSON string from the server into a JSON object + updateData = jQuery.parseJSON(jsonString); + } + catch (error) + { + alert(error.Message); + return; + } + + if (!updateData.hasOwnProperty('data')) + { + if (_data && _data.hasOwnProperty('data')) + { + updateData['data'] = _data['data']; + } + else + { + updateData['data'] = {}; + } + } + + if (_isInitialised) // all templates have been registered, so render them + { + doUpdate(updateData); + } + else + { + _data = updateData; // all templates have not been registered. We set _data directly here which will be applied after the template is loaded with the initial data + } + }; + + // This function does the update by calling the methods on the current state + var doUpdate = function (data) + { + if (_currentState == null) + { + return; + } + + data = _currentState.onBeforeUpdate(data); + + if (data === false) + { + alert('data is false, return'); + return; // A beforeUpdateCallback returned a false value, this prevents the render from occuring + } + + _data = data; + + _currentState.onUpdate(_data); + + _currentState.onAfterUpdate(_data); + }; + + // Execute all callbacks in the callbacks array/object provided, updateData is passed to them for processing and potential modification + var executeCallbacks = function (callbacks, data) + { + for (var key in callbacks) + { + if (callbacks.hasOwnProperty(key) && jQuery.isFunction(callbacks[key])) + { + data = callbacks[key].call(this, data); + } + } + + return data; + }; + + return { + init: function () + { + init(); + }, + receiveUpdateData: function (jsonString) + { + receiveUpdateData(jsonString); + }, + addBeforeUpdateCallback: function (key, callbackFunction) + { + _beforeUpdateCallbacks[key] = callbackFunction; + }, + addBeforeUpdateCallbacks: function (callbacks) { + for (var callbackKey in callbacks) { + if (!callbacks.hasOwnProperty(callbackKey)) + { + continue; + } + NanoStateManager.addBeforeUpdateCallback(callbackKey, callbacks[callbackKey]); + } + }, + removeBeforeUpdateCallback: function (key) + { + if (_beforeUpdateCallbacks.hasOwnProperty(key)) + { + delete _beforeUpdateCallbacks[key]; + } + }, + executeBeforeUpdateCallbacks: function (data) { + return executeCallbacks(_beforeUpdateCallbacks, data); + }, + addAfterUpdateCallback: function (key, callbackFunction) + { + _afterUpdateCallbacks[key] = callbackFunction; + }, + addAfterUpdateCallbacks: function (callbacks) { + for (var callbackKey in callbacks) { + if (!callbacks.hasOwnProperty(callbackKey)) + { + continue; + } + NanoStateManager.addAfterUpdateCallback(callbackKey, callbacks[callbackKey]); + } + }, + removeAfterUpdateCallback: function (key) + { + if (_afterUpdateCallbacks.hasOwnProperty(key)) + { + delete _afterUpdateCallbacks[key]; + } + }, + executeAfterUpdateCallbacks: function (data) { + return executeCallbacks(_afterUpdateCallbacks, data); + }, + addState: function (state) + { + if (!(state instanceof NanoStateClass)) + { + alert('ERROR: Attempted to add a state which is not instanceof NanoStateClass'); + return; + } + if (!state.key) + { + alert('ERROR: Attempted to add a state with an invalid stateKey'); + return; + } + _states[state.key] = state; + }, + setCurrentState: function (stateKey) + { + if (typeof stateKey == 'undefined' || !stateKey) { + alert('ERROR: No state key was passed!'); + return false; + } + if (!_states.hasOwnProperty(stateKey)) + { + alert('ERROR: Attempted to set a current state which does not exist: ' + stateKey); + return false; + } + + var previousState = _currentState; + + _currentState = _states[stateKey]; + + if (previousState != null) { + previousState.onRemove(_currentState); + } + + _currentState.onAdd(previousState); + + return true; + }, + getCurrentState: function () + { + return _currentState; + } + }; +} (); + \ No newline at end of file diff --git a/nano/js/nano_template.js b/nano/js/nano_template.js index 13588f9f72..23e2ac0837 100644 --- a/nano/js/nano_template.js +++ b/nano/js/nano_template.js @@ -7,7 +7,69 @@ var NanoTemplate = function () { var _helpers = {}; var init = function () { - + // We store initialData and templateData in the body tag, it's as good a place as any + var templateData = $('body').data('templateData'); + + if (templateData == null) + { + alert('Error: Template data did not load correctly.'); + } + + // we count the number of templates for this ui so that we know when they've all been rendered + var templateCount = 0; + for (var key in templateData) + { + if (templateData.hasOwnProperty(key)) + { + templateCount++; + } + } + + if (!templateCount) + { + alert('ERROR: No templates listed!'); + } + + // load markup for each template and register it + for (var key in templateData) + { + if (!templateData.hasOwnProperty(key)) + { + continue; + } + + $.when($.ajax({ + url: templateData[key], + cache: false, + dataType: 'text' + })) + .done(function(templateMarkup) { + + //templateMarkup = templateMarkup.replace(/ +\) *\}\}/g, ')}}'); + + templateMarkup += '
    '; + + try + { + NanoTemplate.addTemplate(key, templateMarkup) + + templateCount--; + + if (templateCount <= 0) + { + $(document).trigger('templatesLoaded'); + } + } + catch(error) + { + alert('ERROR: An error occurred while loading the UI: ' + error.message); + return; + } + }) + .fail(function () { + alert('ERROR: Loading template ' + key + '(' + templateData[key] + ') failed!'); + });; + } }; var compileTemplates = function () { @@ -37,7 +99,7 @@ var NanoTemplate = function () { } compileTemplates(); } - return _compiledTemplates[templateKey].call(this, data, _helpers); + return _compiledTemplates[templateKey].call(this, data['data'], data['config'], _helpers); }, addHelper: function (helperName, helperFunction) { if (!jQuery.isFunction(helperFunction)) { @@ -55,6 +117,12 @@ var NanoTemplate = function () { } NanoTemplate.addHelper(helperName, helpers[helperName]); } + }, + removeHelper: function (helperName) { + if (helpers.hasOwnProperty(helperName)) + { + delete _helpers[helperName]; + } } } }(); diff --git a/nano/js/nano_update.js b/nano/js/nano_update.js deleted file mode 100644 index 9b9e7a4cf6..0000000000 --- a/nano/js/nano_update.js +++ /dev/null @@ -1,237 +0,0 @@ -// NanoUpdate handles data from the server and uses it to render templates -NanoUpdate = function () -{ - // _isInitialised is set to true when all of this ui's templates have been processed/rendered - var _isInitialised = false; - - // the array of template names to use for this ui - var _templates = null; - // the data for this ui - var _data = null; - // new data which arrives before _isInitialised is true is stored here for processing later - var _earlyUpdateData = null; - - // this is an array of callbacks which are called when new data arrives, before it is processed - var _beforeUpdateCallbacks = []; - // this is an array of callbacks which are called when new data arrives, before it is processed - var _afterUpdateCallbacks = []; - - // _canClick is used to disable clicks for a short period after each click (to avoid mis-clicks) - var _canClick = true; - - // the init function is called when the ui has loaded - // this function sets up the templates and base functionality - var init = function () - { - $('#uiNoJavaScript').html('Loading...'); - - // this callback is triggered after new data is processed - // it updates the status/visibility icon and adds click event handling to buttons/links - NanoUpdate.addAfterUpdateCallback(function (updateData) { - var uiStatusClass; - if (updateData['ui']['status'] == 2) - { - uiStatusClass = 'icon24 uiStatusGood'; - $('.linkActive').removeClass('inactive'); - } - else if (updateData['ui']['status'] == 1) - { - uiStatusClass = 'icon24 uiStatusAverage'; - $('.linkActive').addClass('inactive'); - } - else - { - uiStatusClass = 'icon24 uiStatusBad' - $('.linkActive').addClass('inactive'); - } - $('#uiStatusIcon').attr('class', uiStatusClass); - - $('.linkActive').stopTime('linkPending'); - $('.linkActive').removeClass('linkPending'); - - $('.linkActive').off('click'); - $('.linkActive').on('click', function (event) { - event.preventDefault(); - var href = $(this).data('href'); - if (href != null && _canClick) - { - _canClick = false; - $('body').oneTime(300, 'enableClick', function () { - _canClick = true; - }); - if (updateData['ui']['status'] == 2) - { - $(this).oneTime(300, 'linkPending', function () { - $(this).addClass('linkPending'); - }); - } - window.location.href = href; - } - }); - }); - - // We store initialData and templateData in the body tag, it's as good a place as any - var body = $('body'); - var templateData = body.data('templateData'); - var initialData = body.data('initialData'); - - if (templateData == null || !initialData == null) - { - alert('Error: Initial data did not load correctly.'); - } - - // we count the number of templates for this ui so that we know when they've all been rendered - var templateCount = 0; - for (var key in templateData) - { - if (templateData.hasOwnProperty(key)) - { - templateCount++; - } - } - - if (!templateCount) - { - alert('ERROR: No templates listed!'); - } - - // load markup for each template and register it - for (var key in templateData) - { - if (templateData.hasOwnProperty(key)) - { - $.when($.ajax({ - url: templateData[key], - cache: false, - dataType: 'text' - })) - //$.when($.get(templateData[key])) - .done(function(templateMarkup) { - - //templateMarkup = templateMarkup.replace(/ +\) *\}\}/g, ')}}'); - - templateMarkup += '
    '; - - try - { - NanoTemplate.addTemplate(key, templateMarkup) - - templateCount--; - - if (templateCount <= 0) - { - if (_earlyUpdateData !== null) // Newer data has already arrived, so update - { - renderTemplates(_earlyUpdateData); - } - else - { - renderTemplates(initialData); - } - _isInitialised = true; - $('#uiNoJavaScript').hide(); - } - } - catch(error) - { - alert('ERROR: An error occurred while loading the UI: ' + error.message); - return; - } - }) - .fail(function () { - alert('Loading template ' + key + '(' + templateData[key] + ') failed!'); - });; - } - } - }; - - // Receive update data from the server - var receiveUpdateData = function (jsonString) - { - var updateData; - try - { - // parse the JSON string from the server into a JSON object - updateData = jQuery.parseJSON(jsonString); - } - catch (error) - { - alert(error.Message); - return; - } - - - if (_isInitialised) // all templates have been registered, so render them - { - renderTemplates(updateData); - } - else - { - _earlyUpdateData = updateData; // all templates have not been registered. We set _earlyUpdateData which will be applied after the template is loaded with the initial data - } - }; - - // This function renders the template with the latest data - // It has to be done recursively as each piece of data is observed individually and needs to be updated individually - var renderTemplates = function (data) - { - data = executeCallbacks(_beforeUpdateCallbacks, data); - - if (data === false) - { - return; // A beforeUpdateCallback returned a false value, this prevents the render from occuring - } - - _data = data; - - try - { - $("#mainTemplate").html(NanoTemplate.parse('main', _data)); - } - catch(error) - { - alert('ERROR: An error occurred while rendering the UI: ' + error.message); - return; - } - - executeCallbacks(_afterUpdateCallbacks, _data); - }; - - // Execute all callbacks in the callbacks array/object provided, updateData is passed to them for processing and potential modification - var executeCallbacks = function (callbacks, updateData) - { - for (var key in callbacks) - { - if (callbacks.hasOwnProperty(key) && jQuery.isFunction(callbacks[key])) - { - updateData = callbacks[key].call(this, updateData); - } - } - - return updateData; - }; - - return { - init: function () - { - init(); - }, - isInitialised: function () - { - return _isInitialised; - }, - receiveUpdateData: function (jsonString) - { - receiveUpdateData(jsonString); - }, - addBeforeUpdateCallback: function (callbackFunction) - { - _beforeUpdateCallbacks.push(callbackFunction); - }, - addAfterUpdateCallback: function (callbackFunction) - { - _afterUpdateCallbacks.push(callbackFunction); - } - }; -} (); - \ No newline at end of file diff --git a/nano/js/nano_utility.js b/nano/js/nano_utility.js index d54857a347..40cd827d13 100644 --- a/nano/js/nano_utility.js +++ b/nano/js/nano_utility.js @@ -53,9 +53,8 @@ if (typeof doT == 'undefined') { // All scripts are initialised here, this allows control of init order $(document).ready(function () { NanoUtility.init(); + NanoStateManager.init(); NanoTemplate.init(); - NanoBaseHelpers.init(); - NanoUpdate.init(); }); if (!Array.prototype.indexOf) @@ -139,4 +138,11 @@ String.prototype.toTitleCase = function () { $.ajaxSetup({ cache: false -}); \ No newline at end of file +}); + +Function.prototype.inheritsFrom = function (parentClassOrObject) { + this.prototype = new parentClassOrObject; + this.prototype.constructor = this; + this.prototype.parent = parentClassOrObject.prototype; + return this; +}; \ No newline at end of file diff --git a/nano/templates/apc.tmpl b/nano/templates/apc.tmpl index 0fbba9fe86..1db3cb3dda 100644 --- a/nano/templates/apc.tmpl +++ b/nano/templates/apc.tmpl @@ -9,9 +9,9 @@
    {{else}} {{if data.locked}} - Swipe an ID card to unlock this interface. + Swipe an ID card to unlock this interface {{else}} - Swipe an ID card to lock this interface. + Swipe an ID card to lock this interface {{/if}} {{/if}}
    @@ -114,11 +114,13 @@ {{else value.status >= 2}} On {{/if}} - {{if value.status == 1 || value.status == 3}} - [Auto] - {{else}} - [Manual] - {{/if}} + {{if data.locked}} + {{if value.status == 1 || value.status == 3}} +   Auto + {{else}} +   Manual + {{/if}} + {{/if}} {{if !data.locked || data.siliconUser}}
    diff --git a/nano/templates/canister.tmpl b/nano/templates/canister.tmpl index dd1f9a2e01..dd72102232 100644 --- a/nano/templates/canister.tmpl +++ b/nano/templates/canister.tmpl @@ -4,7 +4,7 @@ Tank Label:
    -
    {{:data.name}}
    {{:helper.link('Relabel', 'pencil', {'relabel' : 1}, (canLabel) ? null : 'disabled')}} +
    {{:data.name}}
    {{:helper.link('Relabel', 'pencil', {'relabel' : 1}, (data.canLabel) ? null : 'disabled')}}
    @@ -57,17 +57,17 @@ Release Pressure:
    - {{:helper.displayBar(releasePressure, minReleasePressure, maxReleasePressure)}} + {{:helper.displayBar(data.releasePressure, data.minReleasePressure, data.maxReleasePressure)}}
    - {{:helper.link('-', null, {'pressure_adj' : -1000}, (releasePressure > minReleasePressure) ? null : 'disabled')}} - {{:helper.link('-', null, {'pressure_adj' : -100}, (releasePressure > minReleasePressure) ? null : 'disabled')}} - {{:helper.link('-', null, {'pressure_adj' : -10}, (releasePressure > minReleasePressure) ? null : 'disabled')}} - {{:helper.link('-', null, {'pressure_adj' : -1}, (releasePressure > minReleasePressure) ? null : 'disabled')}} + {{:helper.link('-', null, {'pressure_adj' : -1000}, (data.releasePressure > data.minReleasePressure) ? null : 'disabled')}} + {{:helper.link('-', null, {'pressure_adj' : -100}, (data.releasePressure > data.minReleasePressure) ? null : 'disabled')}} + {{:helper.link('-', null, {'pressure_adj' : -10}, (data.releasePressure > data.minReleasePressure) ? null : 'disabled')}} + {{:helper.link('-', null, {'pressure_adj' : -1}, (data.releasePressure > data.minReleasePressure) ? null : 'disabled')}}
     {{:data.releasePressure}} kPa 
    - {{:helper.link('+', null, {'pressure_adj' : 1}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} - {{:helper.link('+', null, {'pressure_adj' : 10}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} - {{:helper.link('+', null, {'pressure_adj' : 100}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} - {{:helper.link('+', null, {'pressure_adj' : 1000}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} + {{:helper.link('+', null, {'pressure_adj' : 1}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}} + {{:helper.link('+', null, {'pressure_adj' : 10}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}} + {{:helper.link('+', null, {'pressure_adj' : 100}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}} + {{:helper.link('+', null, {'pressure_adj' : 1000}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}}
    @@ -77,7 +77,7 @@ Release Valve:
    - {{:helper.link('Open', 'unlocked', {'toggle' : 1}, valveOpen ? 'selected' : null)}}{{:helper.link('Close', 'locked', {'toggle' : 1}, valveOpen ? null : 'selected')}} + {{:helper.link('Open', 'unlocked', {'toggle' : 1}, data.valveOpen ? 'selected' : null)}}{{:helper.link('Close', 'locked', {'toggle' : 1}, data.valveOpen ? null : 'selected')}}
    diff --git a/nano/templates/chem_dispenser.tmpl b/nano/templates/chem_dispenser.tmpl index 4be8b89578..1dd960f9c8 100644 --- a/nano/templates/chem_dispenser.tmpl +++ b/nano/templates/chem_dispenser.tmpl @@ -7,7 +7,7 @@ Used In File(s): \code\modules\reagents\Chemistry-Machinery.dm Energy:
    - {{:helper.displayBar(energy, 0, maxEnergy, 'good', energy + ' Units')}} + {{:helper.displayBar(data.energy, 0, data.maxEnergy, 'good', data.energy + ' Units')}}
    @@ -16,11 +16,11 @@ Used In File(s): \code\modules\reagents\Chemistry-Machinery.dm Dispense:
    - {{:helper.link('5', 'gear', {'amount' : 5}, (amount == 5) ? 'selected' : null)}} - {{:helper.link('10', 'gear', {'amount' : 10}, (amount == 10) ? 'selected' : null)}} - {{:helper.link('20', 'gear', {'amount' : 20}, (amount == 20) ? 'selected' : null)}} - {{:helper.link('30', 'gear', {'amount' : 30}, (amount == 30) ? 'selected' : null)}} - {{:helper.link('50', 'gear', {'amount' : 50}, (amount == 50) ? 'selected' : null)}} + {{:helper.link('5', 'gear', {'amount' : 5}, (data.amount == 5) ? 'selected' : null)}} + {{:helper.link('10', 'gear', {'amount' : 10}, (data.amount == 10) ? 'selected' : null)}} + {{:helper.link('20', 'gear', {'amount' : 20}, (data.amount == 20) ? 'selected' : null)}} + {{:helper.link('30', 'gear', {'amount' : 30}, (data.amount == 30) ? 'selected' : null)}} + {{:helper.link('50', 'gear', {'amount' : 50}, (data.amount == 50) ? 'selected' : null)}}
     
    @@ -36,7 +36,7 @@ Used In File(s): \code\modules\reagents\Chemistry-Machinery.dm
    {{for data.chemicals}} - {{:helper.link(title, 'circle-arrow-s', commands, null, ~root.glass ? 'fixedLeftWide' : 'fixedLeft')}} + {{:helper.link(value.title, 'circle-arrow-s', value.commands, null, data.glass ? 'fixedLeftWide' : 'fixedLeft')}} {{/for}}
    @@ -51,32 +51,36 @@ Used In File(s): \code\modules\reagents\Chemistry-Machinery.dm {{/if}} Contents
    - {{:helper.link(glass ? 'Eject Glass' : 'Eject Beaker', 'eject', {'ejectBeaker' : 1}, isBeakerLoaded ? null : 'disabled', 'floatRight')}} + {{:helper.link(data.glass ? 'Eject Glass' : 'Eject Beaker', 'eject', {'ejectBeaker' : 1}, data.isBeakerLoaded ? null : 'disabled', 'floatRight')}}
    -
    +
    {{if data.isBeakerLoaded}} Volume: {{:data.beakerCurrentVolume}} / {{:data.beakerMaxVolume}}
    {{for data.beakerContents}} - {{:data.volume}} units of {{:data.name}}
    - {{else}} + {{:value.volume}} units of {{:value.name}}
    + {{empty}} - {{if data.glass}} - Glass - {{else}} - Beaker - {{/if}} - is empty + {{if data.glass}} + Glass + {{else}} + Beaker + {{/if}} + is empty + {{/for}} {{else}} - No - {{if data.glass}} - Glass - {{else}} - Beaker - {{/if}} loaded + + No + {{if data.glass}} + Glass + {{else}} + Beaker + {{/if}} + loaded + {{/if}}
    diff --git a/nano/templates/crew_monitor.tmpl b/nano/templates/crew_monitor.tmpl index bdaa9f973d..f789f6052c 100644 --- a/nano/templates/crew_monitor.tmpl +++ b/nano/templates/crew_monitor.tmpl @@ -3,12 +3,12 @@ Crew Monitoring Computer interface -->
    {{for data.crewmembers}} - {{if data.sensor_type == 1}} - - {{else data.sensor_type == 2}} - - {{else data.sensor_type == 3}} - + {{if value.sensor_type == 1}} + + {{else value.sensor_type == 2}} + + {{else value.sensor_type == 3}} + {{/if}} {{/for}}
    {{:data.name}}{{:data.dead ? "Deceased" : "Living"}}Not Available
    {{:data.name}}{{:data.dead ? "Deceased" : "Living"}} ({{:data.oxy}}/{{:data.tox}}/{{:data.fire}}/{{:data.brute}})Not Available
    {{:data.name}}{{:data.dead ? "Deceased" : "Living"}} ({{:data.oxy}}/{{:data.tox}}/{{:data.fire}}/{{:data.brute}}){{:data.area}}({{:data.x}}, {{:data.y}})
    {{:value.name}}{{:value.dead ? "Deceased" : "Living"}}Not Available
    {{:value.name}}{{:value.dead ? "Deceased" : "Living"}} ({{:value.oxy}}/{{:value.tox}}/{{:value.fire}}/{{:value.brute}})Not Available
    {{:value.name}}{{:value.dead ? "Deceased" : "Living"}} ({{:value.oxy}}/{{:value.tox}}/{{:value.fire}}/{{:value.brute}}){{:value.area}}({{:value.x}}, {{:value.y}})
    \ No newline at end of file diff --git a/nano/templates/cryo.tmpl b/nano/templates/cryo.tmpl index 08102950f6..e8302b07df 100644 --- a/nano/templates/cryo.tmpl +++ b/nano/templates/cryo.tmpl @@ -23,42 +23,44 @@ Used In File(s): \code\game\machinery\cryo.dm
    Health:
    {{if data.occupant.health >= 0}} - {{:helper.displayBar(occupant.health, 0, occupant.maxHealth, 'good')}} + {{:helper.displayBar(data.occupant.health, 0, data.occupant.maxHealth, 'good')}} {{else}} - {{:helper.displayBar(occupant.health, 0, occupant.minHealth, 'average alignRight')}} + {{:helper.displayBar(data.occupant.health, 0, data.occupant.minHealth, 'average alignRight')}} {{/if}} -
    {{:helper.round(occupant.health)}}
    +
    {{:helper.round(data.occupant.health)}}
    => Brute Damage:
    - {{:helper.displayBar(occupant.bruteLoss, 0, occupant.maxHealth, 'bad')}} -
    {{:helper.round(occupant.bruteLoss)}}
    + {{:helper.displayBar(data.occupant.bruteLoss, 0, data.occupant.maxHealth, 'bad')}} +
    {{:helper.round(data.occupant.bruteLoss)}}
    => Resp. Damage:
    - {{:helper.displayBar(occupant.oxyLoss, 0, occupant.maxHealth, 'bad')}} -
    {{:helper.round(occupant.oxyLoss)}}
    + {{:helper.displayBar(data.occupant.oxyLoss, 0, data.occupant.maxHealth, 'bad')}} +
    {{:helper.round(data.occupant.oxyLoss)}}
    => Toxin Damage:
    - {{:helper.displayBar(occupant.toxLoss, 0, occupant.maxHealth, 'bad')}} -
    {{:helper.round(occupant.toxLoss)}}
    + {{:helper.displayBar(data.occupant.toxLoss, 0, data.occupant.maxHealth, 'bad')}} +
    {{:helper.round(data.occupant.toxLoss)}}
    => Burn Severity:
    - {{:helper.displayBar(occupant.fireLoss, 0, occupant.maxHealth, 'bad')}} -
    {{:helper.round(occupant.fireLoss)}}
    + {{:helper.displayBar(data.occupant.fireLoss, 0, data.occupant.maxHealth, 'bad')}} +
    {{:helper.round(data.occupant.fireLoss)}}
    {{/if}} {{/if}}
    -
    Cell Temperature:
    - {{:helper.string('{1} K', cellTemperatureStatus, cellTemperature)}} -
    +
    +
    Cell Temperature:
    + {{:data.cellTemperature}} K +
    +

    Cryo Cell Operation

    @@ -67,10 +69,10 @@ Used In File(s): \code\game\machinery\cryo.dm Cryo Cell Status:
    - {{:helper.link('On', 'power', {'switchOn' : 1}, isOperating ? 'selected' : null)}}{{:helper.link('Off', 'close', {'switchOff' : 1}, isOperating ? null : 'selected')}} + {{:helper.link('On', 'power', {'switchOn' : 1}, data.isOperating ? 'selected' : null)}}{{:helper.link('Off', 'close', {'switchOff' : 1}, data.isOperating ? null : 'selected')}}
    - {{:helper.link('Eject Occupant', 'arrowreturnthick-1-s', {'ejectOccupant' : 1}, hasOccupant ? null : 'disabled')}} + {{:helper.link('Eject Occupant', 'arrowreturnthick-1-s', {'ejectOccupant' : 1}, data.hasOccupant ? null : 'disabled')}}
     
    @@ -80,7 +82,7 @@ Used In File(s): \code\game\machinery\cryo.dm
    {{if data.isBeakerLoaded}} - {{:data.beakerLabel ? beakerLabel : 'No label'}}
    + {{:data.beakerLabel ? data.beakerLabel : 'No label'}}
    {{if data.beakerVolume}} {{:data.beakerVolume}} units remaining
    {{else}} @@ -91,6 +93,6 @@ Used In File(s): \code\game\machinery\cryo.dm {{/if}}
    - {{:helper.link('Eject Beaker', 'eject', {'ejectBeaker' : 1}, isBeakerLoaded ? null : 'disabled')}} + {{:helper.link('Eject Beaker', 'eject', {'ejectBeaker' : 1}, data.isBeakerLoaded ? null : 'disabled')}}
    \ No newline at end of file diff --git a/nano/templates/disease_splicer.tmpl b/nano/templates/disease_splicer.tmpl index a3caad12de..0277fbe342 100644 --- a/nano/templates/disease_splicer.tmpl +++ b/nano/templates/disease_splicer.tmpl @@ -17,7 +17,7 @@

    Virus Dish

    - {{:helper.link('Eject Dish', 'eject', { 'eject' : 1 }, dish_inserted ? null : 'disabled')}} + {{:helper.link('Eject Dish', 'eject', { 'eject' : 1 }, data.dish_inserted ? null : 'disabled')}}
    @@ -25,7 +25,7 @@ Growth Density:
    - {{:helper.displayBar(growth, 0, 100, growth >= 50 ? 'good' : growth >= 25 ? 'average' : 'bad', growth + '%' )}} + {{:helper.displayBar(data.growth, 0, 100, (data.growth >= 50) ? 'good' : data.growth >= 25 ? 'average' : 'bad', data.growth + '%' )}}
    @@ -53,7 +53,7 @@ {{/if}} - {{if data.affected_species && !info}} + {{if data.affected_species && !data.info}}
    Affected Species: @@ -74,7 +74,7 @@
    {{for data.effects}} - {{:helper.link(stage, 'transferthick-e-w', { 'grab' : reference })}} + {{:helper.link(data.stage, 'transferthick-e-w', { 'grab' : data.reference })}} {{/for}}
    @@ -93,7 +93,7 @@
    {{if data.buffer}} - {{:data.buffer.name}} ({{:data.buffer.stage}}) + {{:data.buffer.name}} ({{:data.buffer.stage}}) {{else}} {{if data.species_buffer}} {{:data.species_buffer}} @@ -103,6 +103,6 @@ {{/if}}
    - {{:helper.link('Save To Disk', 'disk', { 'disk' : 1 }, (buffer || species_buffer) ? null : 'disabled')}} - {{:helper.link('Splice Onto Dish', 'pencil', { 'splice' : 1 }, (buffer || species_buffer) && !info ? null : 'disabled')}} + {{:helper.link('Save To Disk', 'disk', { 'disk' : 1 }, (data.buffer || data.species_buffer) ? null : 'disabled')}} + {{:helper.link('Splice Onto Dish', 'pencil', { 'splice' : 1 }, ((data.buffer || data.species_buffer) && !data.info) ? null : 'disabled')}} {{/if}} diff --git a/nano/templates/dish_incubator.tmpl b/nano/templates/dish_incubator.tmpl index 5b06f924e6..ae887e6986 100644 --- a/nano/templates/dish_incubator.tmpl +++ b/nano/templates/dish_incubator.tmpl @@ -12,12 +12,12 @@ Power:
    - {{:helper.link('On', 'power', { 'power' : 1 }, !dish_inserted ? 'disabled' : on ? 'selected' : null)}}{{:helper.link('Off', 'close', { 'power' : 1 }, on ? null : 'selected')}} + {{:helper.link('On', 'power', { 'power' : 1 }, !data.dish_inserted ? 'disabled' : data.on ? 'selected' : null)}}{{:helper.link('Off', 'close', { 'power' : 1 }, data.on ? null : 'selected')}}
    {{:helper.link('Add Radiation', 'radiation', {'rad' : 1})}} - {{:helper.link('Flush System', 'trash', {'flush' : 1}, system_in_use ? null : 'disabled')}} + {{:helper.link('Flush System', 'trash', {'flush' : 1}, data.system_in_use ? null : 'disabled')}}
    @@ -26,7 +26,7 @@ Virus Food:
    - {{:helper.displayBar(food_supply, 0, 100, 'good', food_supply)}} + {{:helper.displayBar(data.food_supply, 0, 100, 'good', data.food_supply)}}
    @@ -34,9 +34,9 @@ Radiation Level:
    - {{:helper.displayBar(radiation, 0, 100, radiation >= 50 ? 'bad' : growth >= 25 ? 'average' : 'good')}} + {{:helper.displayBar(data.radiation, 0, 100, (data.radiation >= 50) ? 'bad' : (data.growth >= 25) ? 'average' : 'good')}}
    - {{:helper.formatNumber(radiation * 10000)}} µSv + {{:helper.formatNumber(data.radiation * 10000)}} µSv
    @@ -44,7 +44,7 @@ Toxicity:
    - {{:helper.displayBar(toxins, 0, 100, toxins >= 50 ? 'bad' : toxins >= 25 ? 'average' : 'good', toxins + '%')}} + {{:helper.displayBar(data.toxins, 0, 100, (data.toxins >= 50) ? 'bad' : (data.toxins >= 25) ? 'average' : 'good', data.toxins + '%')}}
    @@ -53,8 +53,8 @@

    Chemicals

    - {{:helper.link('Eject Chemicals', 'eject', { 'ejectchem' : 1 }, chemicals_inserted ? null : 'disabled')}} - {{:helper.link('Breed Virus', 'circle-arrow-s', { 'virus' : 1 }, can_breed_virus ? null : 'disabled')}} + {{:helper.link('Eject Chemicals', 'eject', { 'ejectchem' : 1 }, data.chemicals_inserted ? null : 'disabled')}} + {{:helper.link('Breed Virus', 'circle-arrow-s', { 'virus' : 1 }, data.can_breed_virus ? null : 'disabled')}}
    {{if data.chemicals_inserted}} @@ -63,7 +63,7 @@ Volume:
    - {{:helper.displayBar(chemical_volume, 0, max_chemical_volume, 'good', chemical_volume + ' / ' + max_chemical_volume)}} + {{:helper.displayBar(data.chemical_volume, 0, data.max_chemical_volume, 'good', data.chemical_volume + ' / ' + data.max_chemical_volume)}}
    @@ -72,7 +72,7 @@
    - {{:!data.dish_inserted ? 'N/A' : can_breed_virus ? 'Suitable' : 'No hemolytic samples detected'}} + {{:!data.dish_inserted ? 'N/A' : data.can_breed_virus ? 'Suitable' : 'No hemolytic samples detected'}} {{if data.blood_already_infected}}
    @@ -90,7 +90,7 @@

    Virus Dish

    - {{:helper.link('Eject Dish', 'eject', {'ejectdish' : 1}, dish_inserted ? null : 'disabled')}} + {{:helper.link('Eject Dish', 'eject', {'ejectdish' : 1}, data.dish_inserted ? null : 'disabled')}}
    {{if data.dish_inserted}} @@ -100,7 +100,7 @@ Growth Density:
    - {{:helper.displayBar(growth, 0, 100, growth >= 50 ? 'good' : growth >= 25 ? 'average' : 'bad', growth + '%' )}} + {{:helper.displayBar(data.growth, 0, 100, (data.growth >= 50) ? 'good' : (data.growth >= 25) ? 'average' : 'bad', data.growth + '%' )}}
    @@ -108,7 +108,7 @@ Infection Rate:
    - {{:data.analysed ? infection_rate : "Unknown"}} + {{:data.analysed ? data.infection_rate : "Unknown"}}
    {{else}} diff --git a/nano/templates/dna_modifier.tmpl b/nano/templates/dna_modifier.tmpl index 5efe73ce87..9a2804ba98 100644 --- a/nano/templates/dna_modifier.tmpl +++ b/nano/templates/dna_modifier.tmpl @@ -19,7 +19,7 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm {{/if}} - {{if !data.occupant.isViableSubject || !occupant.uniqueIdentity || !occupant.structuralEnzymes}} + {{if !data.occupant.isViableSubject || !data.occupant.uniqueIdentity || !data.occupant.structuralEnzymes}}
    The occupant's DNA structure is ruined beyond recognition, please insert a subject with an intact DNA structure.
    @@ -27,22 +27,22 @@ Used In File(s): D:\Development\SS13-BS12\code\game\dna\dna_modifier.dm
    Health:
    {{if data.occupant.health >= 0}} - {{:helper.displayBar(occupant.health, 0, occupant.maxHealth, 'good')}} + {{:helper.displayBar(data.occupant.health, 0, data.occupant.maxHealth, 'good')}} {{else}} - {{:helper.displayBar(occupant.health, 0, occupant.minHealth, 'average alignRight')}} + {{:helper.displayBar(data.occupant.health, 0, data.occupant.minHealth, 'average alignRight')}} {{/if}} -
    {{:helper.round(occupant.health)}}
    +
    {{:helper.round(data.occupant.health)}}
    Radiation:
    - {{:helper.displayBar(occupant.radiationLevel, 0, 100, 'average')}} -
    {{:helper.round(occupant.radiationLevel)}}
    + {{:helper.displayBar(data.occupant.radiationLevel, 0, 100, 'average')}} +
    {{:helper.round(data.occupant.radiationLevel)}}
    Unique Enzymes:
    -
    {{:data.occupant.uniqueEnzymes ? occupant.uniqueEnzymes : 'Unknown'}}
    +
    {{:data.occupant.uniqueEnzymes ? data.occupant.uniqueEnzymes : 'Unknown'}}
    @@ -11,7 +11,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{:helper.link('Close', 'gear', {'choice' : "Close"}, null, 'fixedLeft')}} - {{if data.idInserted}} {{:helper.link('Update PDA Info', 'eject', {'choice' : "UpdateInfo"}, null, 'fixedLeftWide')}} {{/if}} + {{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}}
    @@ -40,7 +40,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm ID:
    - {{:helper.link(idLink, 'eject', {'choice' : "Authenticate"}, idInserted ? null : 'disabled', idInserted ? 'fixedLeftWidest' : 'fixedLeft')}} + {{:helper.link(data.idLink, 'eject', {'choice' : "Authenticate"}, data.idInserted ? null : 'disabled', data.idInserted ? 'fixedLeftWidest' : 'fixedLeft')}}

    @@ -50,9 +50,9 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{if data.cart_loaded==1}} - {{:helper.link(cartridge.name, 'eject', {'choice' : "Eject"},null,null)}} + {{:helper.link(data.cartridge.name, 'eject', {'choice' : "Eject"},null,null)}} {{else}} - {{:helper.link('None', 'eject', {'choice' : "Eject"},'disabled',null)}} + {{:helper.link('None', 'eject', {'choice' : "Eject"},'disabled',null)}} {{/if}}
    @@ -65,7 +65,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{:helper.link('Notekeeper', 'note', {'choice' : "1"}, null, 'fixedLeftWide')}} - {{:helper.link('Messenger', newMessage ? 'mail-closed' : 'mail-open', {'choice' : "2"}, null, 'fixedLeftWide')}} + {{:helper.link('Messenger', data.newMessage ? 'mail-closed' : 'mail-open', {'choice' : "2"}, null, 'fixedLeftWide')}} {{:helper.link('Crew Manifest', 'contact', {'choice' : "41"}, null, 'fixedLeftWide')}}
    @@ -100,7 +100,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{:helper.link('Medical Records', 'gear', {'choice' : "44"}, null, 'fixedLeftWide')}} - {{:helper.link(scanmode == 1 ? 'Disable Med Scanner' : 'Enable Med Scanner', 'gear', {'choice' : "Medical Scan"}, null , 'fixedLeftWide')}} + {{:helper.link(data.scanmode == 1 ? 'Disable Med Scanner' : 'Enable Med Scanner', 'gear', {'choice' : "Medical Scan"}, null , 'fixedLeftWide')}}

    @@ -138,30 +138,44 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Utilities:
    - {{if data.cartridge}} - {{if data.cartridge.access.access_status_display == 1}} {{:helper.link('Status Display', 'gear', {'choice' : "42"}, null, 'fixedLeftWide')}}{{/if}} - {{if data.cartridge.access.access_janitor==1}} {{:helper.link('Custodial Locator', 'gear', {'choice' : "49"}, null, 'fixedLeftWide')}} {{/if}} - {{if data.cartridge.radio == 2}} {{:helper.link('Signaler System', 'gear', {'choice' : "40"}, null, 'fixedLeftWide')}} {{/if}} - {{if data.cartridge.access.access_reagent_scanner==1}} {{:helper.link(scanmode == 3 ? 'Disable Reagent Scanner' : 'Enable Reagent Scanner', 'gear', {'choice' : "Reagent Scan"}, null, 'fixedLeftWider')}} {{/if}} - {{if data.cartridge.access.access_engine==1}} {{:helper.link(scanmode == 4 ? 'Disable Halogen Counter' : 'Enable Halogen Counter', 'gear', {'choice' : "Halogen Counter"}, null, 'fixedLeftWider')}} {{/if}} - {{if data.cartridge.access.access_atmos==1}} {{:helper.link(scanmode == 5 ? 'Disable Gas Scanner' : 'Enable Gas Scanner', 'gear', {'choice' : "Gas Scan"}, null, 'fixedLeftWide')}} {{/if}} - {{if data.cartridge.access.access_remote_door==1}}{{:helper.link('Toggle Door', 'gear', {'choice' : "Toggle Door"}, null, 'fixedLeftWide')}} {{/if}} - {{/if}} - {{:helper.link('Atmospheric Scan', 'gear', {'choice' : "3"}, null, 'fixedLeftWide')}} - {{:helper.link(fon==1 ? 'Disable Flashlight' : 'Enable Flashlight', 'lightbulb', {'choice' : "Light"}, null,'fixedLeftWide')}} -
    - - {{if data.pai}} -
    -
    - PAI Utilities: -
    -
    - {{:helper.link('Configuration', 'gear', {'choice' : "pai", 'option' : "1"}, null, 'fixedLeft')}} - {{:helper.link('Eject pAI', 'eject', {'choice' : "pai", 'option' : "2"}, null, 'fixedLeft')}} + {{if data.cartridge}} + {{if data.cartridge.access.access_status_display == 1}} + {{:helper.link('Status Display', 'gear', {'choice' : "42"}, null, 'fixedLeftWide')}} + {{/if}} + {{if data.cartridge.access.access_janitor==1}} + {{:helper.link('Custodial Locator', 'gear', {'choice' : "49"}, null, 'fixedLeftWide')}} + {{/if}} + {{if data.cartridge.radio == 2}} + {{:helper.link('Signaler System', 'gear', {'choice' : "40"}, null, 'fixedLeftWide')}} + {{/if}} + {{if data.cartridge.access.access_reagent_scanner==1}} + {{:helper.link(data.scanmode == 3 ? 'Disable Reagent Scanner' : 'Enable Reagent Scanner', 'gear', {'choice' : "Reagent Scan"}, null, 'fixedLeftWider')}} + {{/if}} + {{if data.cartridge.access.access_engine==1}} + {{:helper.link(data.scanmode == 4 ? 'Disable Halogen Counter' : 'Enable Halogen Counter', 'gear', {'choice' : "Halogen Counter"}, null, 'fixedLeftWider')}} + {{/if}} + {{if data.cartridge.access.access_atmos==1}} + {{:helper.link(data.scanmode == 5 ? 'Disable Gas Scanner' : 'Enable Gas Scanner', 'gear', {'choice' : "Gas Scan"}, null, 'fixedLeftWide')}} + {{/if}} + {{if data.cartridge.access.access_remote_door==1}} + {{:helper.link('Toggle Door', 'gear', {'choice' : "Toggle Door"}, null, 'fixedLeftWide')}} + {{/if}} + {{/if}} + {{:helper.link('Atmospheric Scan', 'gear', {'choice' : "3"}, null, 'fixedLeftWide')}} + {{:helper.link(fon==1 ? 'Disable Flashlight' : 'Enable Flashlight', 'lightbulb', {'choice' : "Light"}, null,'fixedLeftWide')}}
    - {{/if}} + {{if data.pai}} +
    +
    + PAI Utilities: +
    +
    + {{:helper.link('Configuration', 'gear', {'choice' : "pai", 'option' : "1"}, null, 'fixedLeft')}} + {{:helper.link('Eject pAI', 'eject', {'choice' : "pai", 'option' : "2"}, null, 'fixedLeft')}} +
    +
    + {{/if}} {{/if}} {{if data.mode == 1}}
    @@ -182,7 +196,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - + {{else data.mode == 2}}

    SpaceMessenger V4.0.1

    @@ -191,8 +205,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{:helper.link(silent==1 ? 'Ringer: Off' : 'Ringer: On', silent==1 ? 'volume-off' : 'volume-on', {'choice' : "Toggle Ringer"}, null, 'fixedLeftWide')}} - {{:helper.link(toff==1 ? 'Messenger: Off' : 'Messenger: On',toff==1 ? 'close':'check', {'choice' : "Toggle Messenger"}, null, 'fixedLeftWide')}} + {{:helper.link(data.silent==1 ? 'Ringer: Off' : 'Ringer: On', data.silent==1 ? 'volume-off' : 'volume-on', {'choice' : "Toggle Ringer"}, null, 'fixedLeftWide')}} + {{:helper.link(data.toff==1 ? 'Messenger: Off' : 'Messenger: On',data.toff==1 ? 'close':'check', {'choice' : "Toggle Messenger"}, null, 'fixedLeftWide')}} {{:helper.link('Set Ringtone', 'comment', {'choice' : "Ringtone"}, null, 'fixedLeftWide')}} {{:helper.link('Delete all Conversations', 'trash', {'choice' : "Clear", 'option' : "All"}, null, 'fixedLeftWider')}}
    @@ -200,37 +214,37 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{if data.toff == 0}}

    {{if data.cartridge}} - {{if data.cartridge.charges}} + {{if data.cartridge.charges}}
    {{:data.cartridge.charges}} {{if data.cartridge.type == "/obj/item/weapon/cartridge/syndicate"}} detonation charges left. {{/if}} - {{if data.cartridge.type == "/obj/item/weapon/cartridge/clown" || cartridge.type == "/obj/item/weapon/cartridge/mime"}} viral files left. {{/if}} + {{if data.cartridge.type == "/obj/item/weapon/cartridge/clown" || data.cartridge.type == "/obj/item/weapon/cartridge/mime"}} viral files left. {{/if}}

    {{/if}} {{/if}} - + {{if data.pda_count == 0}}No other PDAS located - {{else}} + {{else}}

    Current Conversations

    {{for data.convopdas}}
    - {{:helper.link(Name, 'circle-arrow-s', {'choice' : "Select Conversation", 'convo' : Reference } , null, fixedLeftWider)}} - {{if data.~root.cartridge}} - {{if data.~root.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && Detonate == 1}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} - {{if data.~root.cartridge.type == "/obj/item/weapon/cartridge/clown"}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} - {{if data.~root.cartridge.type == "/obj/item/weapon/cartridge/mime"}} {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} + {{:helper.link(Name, 'circle-arrow-s', {'choice' : "Select Conversation", 'convo' : data.Reference } , null, fixedLeftWider)}} + {{if data.cartridge}} + {{if data.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && data.Detonate == 1}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : data.Reference}, null, 'fixedLeft')}} {{/if}} + {{if data.cartridge.type == "/obj/item/weapon/cartridge/clown"}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : data.Reference}, null, 'fixedLeft')}} {{/if}} + {{if data.cartridge.type == "/obj/item/weapon/cartridge/mime"}} {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : data.Reference}, null, 'fixedLeft')}} {{/if}} {{/if}}
    {{/for}}

    Other PDAs

    {{for data.pdas}}
    - {{:helper.link(Name, 'circle-arrow-s', {'choice' : "Message", 'target' : Reference}, null, fixedLeftWider)}} - {{if data.~root.cartridge}} - {{if data.~root.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && Detonate == 1}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} - {{if data.~root.cartridge.type == "/obj/item/weapon/cartridge/clown"}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} - {{if data.~root.cartridge.type == "/obj/item/weapon/cartridge/mime"}} {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : Reference}, null, 'fixedLeft')}} {{/if}} + {{:helper.link(Name, 'circle-arrow-s', {'choice' : "Message", 'target' : value.Reference}, null, fixedLeftWider)}} + {{if value.cartridge}} + {{if value.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && value.Detonate == 1}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} + {{if value.cartridge.type == "/obj/item/weapon/cartridge/clown"}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} + {{if value.cartridge.type == "/obj/item/weapon/cartridge/mime"}} {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} {{/if}}
    {{/for}} @@ -254,19 +268,19 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{for data.messages}} - {{if data.~root.active_conversation == target}} - {{if data.sent==0}} - Them: {{:data.message}}
    - {{else}} - You: {{:data.message}}
    - {{/if}} + {{if data.active_conversation == value.target}} + {{if value.sent==0}} + Them: {{:value.message}}
    + {{else}} + You: {{:value.message}}
    + {{/if}} {{/if}} - {{/for}} - + {{/for}} +
    - {{:helper.link('Reply', 'comment', {'choice' : "Message", 'target': active_conversation}, null, 'fixedLeft')}} + {{:helper.link('Reply', 'comment', {'choice' : "Message", 'target': data.active_conversation}, null, 'fixedLeft')}} {{else data.mode== 41}}
    @@ -274,30 +288,30 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{if data.manifest.heads.length}} Command {{for data.manifest["heads"]}} - {{if data.rank == "Captain"}} - {{:data.name}}{{:data.rank}}{{:data.active}} + {{if value.rank == "Captain"}} + {{:value.name}}{{:value.rank}}{{:value.active}} {{else}} - {{:data.name}}{{:data.rank}}{{:data.active}} + {{:value.name}}{{:value.rank}}{{:value.active}} {{/if}} {{/for}} {{/if}} {{if data.manifest.sec.length}} Security {{for data.manifest["sec"]}} - {{if data.rank == "Head of Security"}} - {{:data.name}}{{:data.rank}}{{:data.active}} + {{if value.rank == "Head of Security"}} + {{:value.name}}{{:value.rank}}{{:value.active}} {{else}} - {{:data.name}}{{:data.rank}}{{:data.active}} + {{:value.name}}{{:value.rank}}{{:value.active}} {{/if}} {{/for}} {{/if}} {{if data.manifest.eng.length}} Engineering {{for data.manifest["eng"]}} - {{if data.rank == "Chief Engineer"}} - {{:data.name}}{{:data.rank}}{{:data.active}} + {{if value.rank == "Chief Engineer"}} + {{:value.name}}{{:value.rank}}{{:value.active}} {{else}} - {{:data.name}}{{:data.rank}}{{:data.active}} + {{:value.name}}{{:value.rank}}{{:value.active}} {{/if}} {{/for}} @@ -305,37 +319,37 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{if data.manifest.med.length}} Medical {{for data.manifest["med"]}} - {{if data.rank == "Chief Medical Officer"}} - {{:data.name}}{{:data.rank}}{{:data.active}} + {{if value.rank == "Chief Medical Officer"}} + {{:value.name}}{{:value.rank}}{{:value.active}} {{else}} - {{:data.name}}{{:data.rank}}{{:data.active}} + {{:value.name}}{{:value.rank}}{{:value.active}} {{/if}} {{/for}} {{/if}} {{if data.manifest.sci.length}} Science {{for data.manifest["sci"]}} - {{if data.rank == "Research Director"}} - {{:data.name}}{{:data.rank}}{{:data.active}} + {{if value.rank == "Research Director"}} + {{:value.name}}{{:value.rank}}{{:value.active}} {{else}} - {{:data.name}}{{:data.rank}}{{:data.active}} + {{:value.name}}{{:value.rank}}{{:value.active}} {{/if}} {{/for}} {{/if}} {{if data.manifest.civ.length}} Civilian {{for data.manifest["civ"]}} - {{if data.rank == "Head of Personnel"}} - {{:data.name}}{{:data.rank}}{{:data.active}} + {{if value.rank == "Head of Personnel"}} + {{:value.name}}{{:value.rank}}{{:value.active}} {{else}} - {{:data.name}}{{:data.rank}}{{:data.active}} + {{:value.name}}{{:value.rank}}{{:value.active}} {{/if}} {{/for}} {{/if}} {{if data.manifest.misc.length}} Misc {{for data.manifest["misc"]}} - {{:data.name}}{{:data.rank}}{{:data.active}} + {{:value.name}}{{:value.rank}}{{:value.active}} {{/for}} {{/if}} @@ -352,38 +366,38 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Pressure:
    - {{:helper.string('{1} kPa', aircontents.pressure < 80 || aircontents.pressure > 120 ? 'bad' : aircontents.pressure < 95 || aircontents.pressure > 110 ? 'average' : 'good' , aircontents.pressure)}} + {{:helper.string('{1} kPa', data.aircontents.pressure < 80 || data.aircontents.pressure > 120 ? 'bad' : data.aircontents.pressure < 95 || data.aircontents.pressure > 110 ? 'average' : 'good' , data.aircontents.pressure)}}
    Temperature:
    - {{:helper.string('{1} °C', aircontents.temp < 5 || aircontents.temp > 35 ? 'bad' : aircontents.temp < 15 || aircontents.temp > 25 ? 'average' : 'good' , aircontents.temp)}} + {{:helper.string('{1} °C', data.aircontents.temp < 5 || data.aircontents.temp > 35 ? 'bad' : data.aircontents.temp < 15 || data.aircontents.temp > 25 ? 'average' : 'good' , data.aircontents.temp)}}

    Oxygen:
    - {{:helper.string('{1}%', aircontents.oxygen < 17 ? 'bad' : aircontents.oxygen < 19 ? 'average' : 'good' , aircontents.oxygen)}} + {{:helper.string('{1}%', data.aircontents.oxygen < 17 ? 'bad' : data.aircontents.oxygen < 19 ? 'average' : 'good' , data.aircontents.oxygen)}}
    Nitrogen:
    - {{:helper.string('{1}%', aircontents.nitrogen > 82 ? 'bad' : aircontents.nitrogen > 80 ? 'average' : 'good' , aircontents.nitrogen)}} + {{:helper.string('{1}%', data.aircontents.nitrogen > 82 ? 'bad' : data.aircontents.nitrogen > 80 ? 'average' : 'good' , data.aircontents.nitrogen)}}
    Carbon Dioxide:
    - {{:helper.string('{1}%', aircontents.carbon_dioxide > 5 ? 'bad' : 'good' , aircontents.carbon_dioxide)}} + {{:helper.string('{1}%', data.aircontents.carbon_dioxide > 5 ? 'bad' : 'good' , data.aircontents.carbon_dioxide)}}
    Phoron:
    - {{:helper.string('{1}%', aircontents.phoron > 0 ? 'bad' : 'good' , aircontents.phoron)}} + {{:helper.string('{1}%', data.aircontents.phoron > 0 ? 'bad' : 'good' , data.aircontents.phoron)}}
    {{if data.aircontents.other > 0}} @@ -416,7 +430,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{:helper.link('+.2', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "2"}, null, null)}}  {{:helper.link('+1', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "10"}, null, null)}} - +

    @@ -429,9 +443,9 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{:helper.link('-5', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "-5"}, null, null)}} {{:helper.link('-1', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "-1"}, null, null)}} - {{:helper.link('+1', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "1"}, null, null)}} + {{:helper.link('+1', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "1"}, null, null)}} {{:helper.link('+5', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "5"}, null, null)}} -
    +
    {{:helper.link('Send Signal', 'radiation', {'cartmenu' : "1", 'choice' : "Send Signal"}, null, null)}} @@ -450,12 +464,12 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm

    -
    +
    Message line 1
    - {{:helper.link(records.message1 + ' (set)', 'pencil', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "setmsg1"}, null, null)}} + {{:helper.link(data.records.message1 + ' (set)', 'pencil', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "setmsg1"}, null, null)}}
    @@ -463,13 +477,13 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Message line 2
    - {{:helper.link(records.message2 + ' (set)', 'pencil', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "setmsg2"}, null, null)}} + {{:helper.link(data.records.message2 + ' (set)', 'pencil', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "setmsg2"}, null, null)}}

    -
    +
    ALERT!:
    @@ -481,14 +495,14 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{else data.mode == 43}} - +

    Station Powermonitors

    Select A power monitor:
    {{for data.records.powermonitors}}
    - {{:helper.link(Name, 'radiation', {'cartmenu' : "1", 'choice' : "Power Select",'target' : ref}, null, null)}} + {{:helper.link(value.Name, 'radiation', {'cartmenu' : "1", 'choice' : "Power Select",'target' : value.ref}, null, null)}}
    {{/for}} @@ -514,15 +528,15 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{for data.records.apcs}} - {{if data.#index % 20 === 0}} + {{if index % 20 === 0}} {{/if}} - - - {{:helper.string('', Equipment==1 ? '#4f7529' : '#8f1414')}} - {{:helper.string('', Lights==1 ? '#4f7529' : '#8f1414')}} - {{:helper.string('', Environment==1 ? '#4f7529' : '#8f1414')}} - {{:helper.string('', CellStatus==1 ? '#4f7529' : '#8f1414', CellStatus==-1 ? 'No Cell' : CellPct + '%')}} + + + {{:helper.string('', value.Equipment==1 ? '#4f7529' : '#8f1414')}} + {{:helper.string('', value.Lights==1 ? '#4f7529' : '#8f1414')}} + {{:helper.string('', value.Environment==1 ? '#4f7529' : '#8f1414')}} + {{:helper.string('', value.CellStatus==1 ? '#4f7529' : '#8f1414', value.CellStatus==-1 ? 'No Cell' : CellPct + '%')}} {{/for}}
     Area  Eqp.  Lgt.  Env  Cell 
    {{:data.Name}}   {1}
    {{:value.Name}}   {1}
    @@ -536,11 +550,11 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{for data.records.medical_records}}
    - {{:helper.link(Name, 'gear', {'cartmenu' : "1", 'choice' : "Medical Records",'target' : ref}, null, null)}} + {{:helper.link(value.Name, 'gear', {'cartmenu' : "1", 'choice' : "Medical Records",'target' : value.ref}, null, null)}}
    {{/for}} - + {{else data.mode == 441}}

    Medical Record

    @@ -591,7 +605,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{for data.records.security_records}}
    - {{:helper.link(Name, 'gear', {'cartmenu' : "1", 'choice' : "Security Records",'target' : ref}, null, null)}} + {{:helper.link(value.Name, 'gear', {'cartmenu' : "1", 'choice' : "Security Records",'target' : value.ref}, null, null)}}
    {{/for}} @@ -634,7 +648,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{else data.mode == 46}}

    Security Bot Control

    - {{if data.records.beepsky.active == null || records.beepsky.active == 0}} + {{if data.records.beepsky.active == null || data.records.beepsky.active == 0}} {{if data.records.beepsky.count == 0}}

    No bots found.

    {{else}} @@ -644,7 +658,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{for data.records.beepsky.bots}}
    - {{:helper.link(Name, 'gear', {'radiomenu' : "1", 'op' : "control",'bot' : ref}, null, null)}} (Location: {{:data.Location}}) + {{:helper.link(value.Name, 'gear', {'radiomenu' : "1", 'op' : "control",'bot' : value.ref}, null, null)}} (Location: {{:value.Location}})
    {{/for}} {{/if}} @@ -676,7 +690,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{if data.records.beepsky.botstatus.mode ==0}} Ready {{else data.records.beepsky.botstatus.mode == 1}} Apprehending target - {{else data.records.beepsky.botstatus.mode ==2 || records.beepsky.botstatus.mode == 3}} + {{else data.records.beepsky.botstatus.mode ==2 || data.records.beepsky.botstatus.mode == 3}} Arresting target {{else data.records.beepsky.botstatus.mode ==4}} Starting patrol @@ -689,12 +703,12 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{:helper.link('Stop Patrol', 'gear', {'radiomenu' : "1", 'op' : "stop"}, null, null)}} + {{:helper.link('Stop Patrol', 'gear', {'radiomenu' : "1", 'op' : "stop"}, null, null)}} {{:helper.link('Start Patrol', 'gear', {'radiomenu' : "1", 'op' : "go"}, null, null)}} {{:helper.link('Summon Bot', 'gear', {'radiomenu' : "1", 'op' : "summon"}, null, null)}}
    - {{/if}} - {{:helper.link('Return to Bot list', 'gear', {'radiomenu' : "1", 'op' : "botlist"}, null, null)}} + {{/if}} + {{:helper.link('Return to Bot list', 'gear', {'radiomenu' : "1", 'op' : "botlist"}, null, null)}} {{/if}} {{else data.mode == 47}}

    Supply Record Interlink

    @@ -720,7 +734,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm No current approved orders

    {{else}} {{for data.records.supply.approved}} - #{{:data.Number}} - {{:data.Name}} approved by {{:data.OrderedBy}}
    {{if data.Comment != ""}} {{:data.Comment}}
    {{/if}}
     + #{{:value.Number}} - {{:value.Name}} approved by {{:value.OrderedBy}}
    {{if value.Comment != ""}} {{:value.Comment}}
    {{/if}}
     {{/for}} {{/if}}

    @@ -729,19 +743,19 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm No current requested orders

    {{else}} {{for data.records.supply.requests}} - #{{:data.Number}} - {{:data.Name}} requested by {{:data.OrderedBy}}
    {{if data.Comment != ""}} {{:data.Comment}}
    {{/if}}
     + #{{:value.Number}} - {{:value.Name}} requested by {{:value.OrderedBy}}
    {{if value.Comment != ""}} {{:value.Comment}}
    {{/if}}
     {{/for}} {{/if}} - + {{else data.mode == 48}}

    Mule Control

    - {{if data.records.mulebot.active == null || records.mulebot.active == 0}} + {{if data.records.mulebot.active == null || data.records.mulebot.active == 0}} {{if data.records.mulebot.count == 0}}

    No bots found.

    - + {{else}}

    Mule List

    @@ -750,7 +764,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{for data.records.mulebot.bots}}
    - {{:helper.link(Name, 'gear', {'radiomenu' : "1", 'op' : "control",'bot' : ref}, null, null)}} (Location: {{:data.Location}}) + {{:helper.link(value.Name, 'gear', {'radiomenu' : "1", 'op' : "control",'bot' : value.ref}, null, null)}} (Location: {{:value.Location}})
    {{/for}} {{/if}} @@ -785,7 +799,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Navigating to Home {{else data.records.mulebot.botstatus.mode ==4}} Waiting for Clear Path - {{else data.records.mulebot.botstatus.mode ==5 || records.mulebot.botstatus.mode == 6}} + {{else data.records.mulebot.botstatus.mode ==5 || data.records.mulebot.botstatus.mode == 6}} Calculating navigation Path {{else data.records.mulebot.botstatus.mode ==7}} @@ -800,7 +814,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    - {{:helper.link(records.mulebot.botstatus.load == null ? 'None (Unload)' : records.mulebot.botstatus.load + ' (Unload)', 'gear', {'radiomenu' : "1", 'op' : "unload"},records.mulebot.botstatus.load == null ? 'disabled' : null, null)}} + {{:helper.link(data.records.mulebot.botstatus.load == null ? 'None (Unload)' : data.records.mulebot.botstatus.load + ' (Unload)', 'gear', {'radiomenu' : "1", 'op' : "unload"},data.records.mulebot.botstatus.load == null ? 'disabled' : null, null)}}
    @@ -820,9 +834,9 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Destination:
    - {{:helper.link(records.mulebot.botstatus.dest == null || records.mulebot.botstatus.dest == "" ? 'None (Set)': records.mulebot.botstatus.dest+ ' (Set)', 'gear', {'radiomenu' : "1", 'op' : "setdest"}, null, null)}} + {{:helper.link(data.records.mulebot.botstatus.dest == null || data.records.mulebot.botstatus.dest == "" ? 'None (Set)': data.records.mulebot.botstatus.dest+ ' (Set)', 'gear', {'radiomenu' : "1", 'op' : "setdest"}, null, null)}}
    - +
    @@ -837,7 +851,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Auto Return:
    - {{:helper.link(records.mulebot.botstatus.retn == 1 ? 'ON' : 'OFF', 'gear', {'radiomenu' : "1", 'op' : records.mulebot.botstatus.retn==1 ? "retoff" : "reton"}, null, null)}} + {{:helper.link(data.records.mulebot.botstatus.retn == 1 ? 'ON' : 'OFF', 'gear', {'radiomenu' : "1", 'op' : data.records.mulebot.botstatus.retn==1 ? "retoff" : "reton"}, null, null)}}
    @@ -845,7 +859,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Auto Pickup:
    - {{:helper.link(records.mulebot.botstatus.pick==1? 'ON' : 'OFF', 'gear', {'radiomenu' : "1", 'op' : records.mulebot.botstatus.pick==1 ? "pickoff" : "pickon"}, null, null)}} + {{:helper.link(data.records.mulebot.botstatus.pick==1? 'ON' : 'OFF', 'gear', {'radiomenu' : "1", 'op' : data.records.mulebot.botstatus.pick==1 ? "pickoff" : "pickon"}, null, null)}}
    @@ -860,13 +874,13 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm


    {{:helper.link('Return to Bot list', 'gear', {'radiomenu' : "1", 'op' : "botlist"}, null, null)}} - + {{/if}} {{/if}} - - + + {{else data.mode == 49}}

    Janatorial Supplies Locator

    @@ -879,42 +893,41 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{for data.records.janitor.mops}} - {{if data.x==0}} + {{if value.x==0}} Unable to locate Mop {{else}} Mop Location: - ({{:data.x}} / {{:data.y}}) - {{:data.dir}} - Status: {{:data.status}}
    + ({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Status: {{:value.status}}
    {{/if}} {{/for}} -
    +
    {{for data.records.janitor.buckets}} - {{if data.x==0}} + {{if value.x==0}} Unable to locate Water Buckets {{else}} Water Buckets Location: - ({{:data.x}} / {{:data.y}}) - {{:data.dir}} - Water Level: {{:data.status}}
    + ({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Water Level: {{:value.status}}
    {{/if}} {{/for}}
    {{for data.records.janitor.cleanbots}} - {{if data.x==0}} - Unable to locate Clean Bots - {{else}} - Clean Bots Location: - ({{:data.x}} / {{:data.y}}) - {{:data.dir}} - Status: {{:data.status}}
    - {{/if}} - + {{if value.x==0}} + Unable to locate Clean Bots + {{else}} + Clean Bots Location: + ({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Status: {{:value.status}}
    + {{/if}} {{/for}}
    {{for data.records.janitor.carts}} - {{if data.x==0}} + {{if value.x==0}} Unable to locate Janitorial Cart {{else}} Janitorial cart Location: - ({{:data.x}} / {{:data.y}}) - {{:data.dir}} - Status: {{:data.status}}
    + ({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Status: {{:value.status}}
    {{/if}} {{/for}} diff --git a/nano/templates/smartfridge.tmpl b/nano/templates/smartfridge.tmpl index b9a7e85948..b371baaef3 100644 --- a/nano/templates/smartfridge.tmpl +++ b/nano/templates/smartfridge.tmpl @@ -14,24 +14,20 @@ {{if data.contents}} {{for data.contents}}
    -
    - {{:data.display_name}} ({{:data.quantity}}): -
    -
    - {{:helper.link('Vend', 'circle-arrow-s', { "vend" : vend, "amount" : 1 }, null, 'statusValue')}} - {{if data.quantity >= 5}} - {{:helper.link('x5', 'circle-arrow-s', { "vend" : vend, "amount" : 5 }, null, 'statusValue')}} - {{/if}} - {{if data.quantity >= 10}} - {{:helper.link('x10', 'circle-arrow-s', { "vend" : vend, "amount" : 10 }, null, 'statusValue')}} - {{/if}} - {{if data.quantity >= 25}} - {{:helper.link('x25', 'circle-arrow-s', { "vend" : vend, "amount" : 25 }, null, 'statusValue')}} - {{/if}} - {{if data.quantity > 1}} - {{:helper.link('All', 'circle-arrow-s', { "vend" : vend, "amount" : quantity }, null, 'statusValue')}} - {{/if}} -
    + {{:value.display_name}} ({{:value.quantity}} available) +
    Vend: 
    {{:helper.link('x1', 'circle-arrow-s', { "vend" : value.vend, "amount" : 1 }, null, 'statusValue')}} + {{if value.quantity >= 5}} + {{:helper.link('x5', 'circle-arrow-s', { "vend" : value.vend, "amount" : 5 }, null, 'statusValue')}} + {{/if}} + {{if value.quantity >= 10}} + {{:helper.link('x10', 'circle-arrow-s', { "vend" : value.vend, "amount" : 10 }, null, 'statusValue')}} + {{/if}} + {{if value.quantity >= 25}} + {{:helper.link('x25', 'circle-arrow-s', { "vend" : value.vend, "amount" : 25 }, null, 'statusValue')}} + {{/if}} + {{if value.quantity > 1}} + {{:helper.link('All', 'circle-arrow-s', { "vend" : value.vend, "amount" : value.quantity }, null, 'statusValue')}} + {{/if}}
    {{/for}} {{else}} @@ -50,15 +46,15 @@
    {{for data.wires}}
    -
    - {{:data.wire}} wire: +
    + {{:value.wire}} wire:
    - {{if data.cut}} - {{:helper.link('Mend', 'plus', {'cutwire' : index})}} + {{if value.cut}} + {{:helper.link('Mend', 'plus', {'cutwire' : value.index})}} {{else}} - {{:helper.link('Cut', 'minus', {'cutwire' : index})}} - {{:helper.link('Pulse', 'signal-diag', {'pulsewire' : index})}} + {{:helper.link('Cut', 'minus', {'cutwire' : value.index})}} + {{:helper.link('Pulse', 'signal-diag', {'pulsewire' : value.index})}} {{/if}}
    @@ -71,8 +67,8 @@ The red light is {{:data.shoot_inventory ? "on" : "off"}}.
    {{if data.secure}} The green light is - - {{:data.locked == 1 ? "off" : locked == -1 ? "blinking" : "on"}} + + {{:data.locked == 1 ? "off" : data.locked == -1 ? "blinking" : "on"}} .
    {{/if}}
    From 008981c8317c5a1cc3913204f0f714a00eeef7af Mon Sep 17 00:00:00 2001 From: mwerezak Date: Fri, 11 Jul 2014 10:29:52 -0400 Subject: [PATCH 24/88] Moves misplaced var from airlock_control.dm Moved explosion_resistance from airlock_control.dm to airlock.dm proper. --- code/game/machinery/doors/airlock.dm | 1 + code/game/machinery/doors/airlock_control.dm | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 83d58a975d..7c34359236 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -77,6 +77,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }. icon_state = "door_closed" power_channel = ENVIRON + explosion_resistance = 15 var/aiControlDisabled = 0 //If 1, AI control is disabled until the AI hacks back in and disables the lock. If 2, the AI has bypassed the lock. If -1, the control is enabled but the AI had bypassed it earlier, so if it is disabled again the AI would have no trouble getting back in. var/hackProof = 0 // if 1, this door can't be hacked by the AI var/secondsMainPowerLost = 0 //The number of seconds until power is restored. diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index 59ed905a0a..733124a73c 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -6,7 +6,6 @@ obj/machinery/door/airlock var/frequency var/shockedby = list() var/datum/radio_frequency/radio_connection - explosion_resistance = 15 obj/machinery/door/airlock/proc/can_radio() if( !arePowerSystemsOn() || (stat & NOPOWER) || isWireCut(AIRLOCK_WIRE_AI_CONTROL) ) From d1fc362032ceddc663c29c9805591baa446e9e81 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Fri, 11 Jul 2014 10:49:41 -0400 Subject: [PATCH 25/88] Doors now retry if they fail to complete commands --- code/game/machinery/doors/airlock_control.dm | 41 +++++++++++++++++++- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index 733124a73c..afd2f72529 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -6,12 +6,16 @@ obj/machinery/door/airlock var/frequency var/shockedby = list() var/datum/radio_frequency/radio_connection + var/cur_command = null //the command the door is currently attempting to complete obj/machinery/door/airlock/proc/can_radio() if( !arePowerSystemsOn() || (stat & NOPOWER) || isWireCut(AIRLOCK_WIRE_AI_CONTROL) ) return 0 return 1 +obj/machinery/door/airlock/process() + ..() + execute_current_command() obj/machinery/door/airlock/receive_signal(datum/signal/signal) if (!can_radio()) return @@ -20,7 +24,19 @@ obj/machinery/door/airlock/receive_signal(datum/signal/signal) if(id_tag != signal.data["tag"] || !signal.data["command"]) return - switch(signal.data["command"]) + cur_command = signal.data["command"] + execute_current_command() + +obj/machinery/door/airlock/proc/execute_current_command() + if (!cur_command) + return + + do_command(cur_command) + if (command_completed(cur_command)) + cur_command = null + +obj/machinery/door/airlock/proc/do_command(var/command) + switch(command) if("open") open() @@ -47,9 +63,30 @@ obj/machinery/door/airlock/receive_signal(datum/signal/signal) lock() sleep(2) - + send_status() +obj/machinery/door/airlock/proc/command_completed(var/command) + switch(command) + if("open") + return (!density) + + if("close") + return density + + if("unlock") + return !locked + + if("lock") + return locked + + if("secure_open") + return (locked && !density) + + if("secure_close") + return (locked && density) + + return 1 //Unknown command. Just assume it's completed. obj/machinery/door/airlock/proc/send_status() if(radio_connection) From 9a73ad64bc800764b3313cc5449d6490495441d0 Mon Sep 17 00:00:00 2001 From: Mark Aherne Date: Fri, 11 Jul 2014 22:55:04 +0100 Subject: [PATCH 26/88] Reformatted the PDA template as it was a mess. --- nano/templates/pda.tmpl | 1548 +++++++++++++++++++-------------------- 1 file changed, 763 insertions(+), 785 deletions(-) diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl index 525db467b9..912ea28aad 100644 --- a/nano/templates/pda.tmpl +++ b/nano/templates/pda.tmpl @@ -26,597 +26,590 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm

    {{if data.mode == 0}} -
    -
    - Owner: -
    -
    - {{:data.owner}}, {{:data.ownjob}} -
    -
    -
    -
    -
    - ID: -
    -
    - {{:helper.link(data.idLink, 'eject', {'choice' : "Authenticate"}, data.idInserted ? null : 'disabled', data.idInserted ? 'fixedLeftWidest' : 'fixedLeft')}} -
    -
    -
    -
    -
    - Cartridge: -
    -
    - {{if data.cart_loaded==1}} - {{:helper.link(data.cartridge.name, 'eject', {'choice' : "Eject"},null,null)}} - {{else}} - {{:helper.link('None', 'eject', {'choice' : "Eject"},'disabled',null)}} - {{/if}} -
    -
    -
    -

    Functions

    -
    -
    -
    - General: -
    -
    - {{:helper.link('Notekeeper', 'note', {'choice' : "1"}, null, 'fixedLeftWide')}} - {{:helper.link('Messenger', data.newMessage ? 'mail-closed' : 'mail-open', {'choice' : "2"}, null, 'fixedLeftWide')}} - {{:helper.link('Crew Manifest', 'contact', {'choice' : "41"}, null, 'fixedLeftWide')}} -
    -
    -
    - {{if data.cartridge}} - {{if data.cartridge.access.access_clown == 1}}
    -
    +
    + Owner: +
    +
    + {{:data.owner}}, {{:data.ownjob}} +
    +
    +
    +
    +
    + ID: +
    +
    + {{:helper.link(data.idLink, 'eject', {'choice' : "Authenticate"}, data.idInserted ? null : 'disabled', data.idInserted ? 'fixedLeftWidest' : 'fixedLeft')}} +
    +
    +
    +
    +
    + Cartridge: +
    +
    + {{if data.cart_loaded==1}} + {{:helper.link(data.cartridge.name, 'eject', {'choice' : "Eject"},null,null)}} + {{else}} + {{:helper.link('None', 'eject', {'choice' : "Eject"},'disabled',null)}} + {{/if}} +
    +
    +
    +

    Functions

    +
    +
    +
    + General: +
    +
    + {{:helper.link('Notekeeper', 'note', {'choice' : "1"}, null, 'fixedLeftWide')}} + {{:helper.link('Messenger', data.newMessage ? 'mail-closed' : 'mail-open', {'choice' : "2"}, null, 'fixedLeftWide')}} + {{:helper.link('Crew Manifest', 'contact', {'choice' : "41"}, null, 'fixedLeftWide')}} +
    +
    +
    + {{if data.cartridge}} + {{if data.cartridge.access.access_clown == 1}} +
    +
    Clown: -
    -
    +
    +
    {{:helper.link('Honk Synthesizer', 'gear', {'choice' : "Honk"}, null, 'fixedLeftWide')}} +
    -
    -
    - {{/if}} - {{if data.cartridge.access.access_engine == 1}} -
    -
    +
    + {{/if}} + {{if data.cartridge.access.access_engine == 1}} +
    +
    Engineering: -
    -
    +
    +
    {{:helper.link('Power Monitor', 'alert', {'choice' : "43"}, null, 'fixedLeftWide')}} +
    -
    -
    - {{/if}} - {{if data.cartridge.access.access_medical == 1}} -
    -
    - Medical: +
    + {{/if}} + {{if data.cartridge.access.access_medical == 1}} +
    +
    + Medical: +
    +
    + {{:helper.link('Medical Records', 'gear', {'choice' : "44"}, null, 'fixedLeftWide')}} + {{:helper.link(data.scanmode == 1 ? 'Disable Med Scanner' : 'Enable Med Scanner', 'gear', {'choice' : "Medical Scan"}, null , 'fixedLeftWide')}} +
    -
    - {{:helper.link('Medical Records', 'gear', {'choice' : "44"}, null, 'fixedLeftWide')}} - {{:helper.link(data.scanmode == 1 ? 'Disable Med Scanner' : 'Enable Med Scanner', 'gear', {'choice' : "Medical Scan"}, null , 'fixedLeftWide')}} -
    -
    -
    - {{/if}} - {{if data.cartridge.access.access_security == 1}} -
    -
    - Security: -
    -
    +
    + {{/if}} + {{if data.cartridge.access.access_security == 1}} +
    +
    + Security: +
    +
    {{:helper.link('Security Records', 'gear', {'choice' : "45"}, null, 'fixedLeftWide')}} - {{if data.cartridge.radio ==1}} {{:helper.link('Security Bot Access', 'gear', {'choice' : "46"}, null, 'fixedLeftWide')}} {{/if}} -
    + {{if data.cartridge.radio ==1}} {{:helper.link('Security Bot Access', 'gear', {'choice' : "46"}, null, 'fixedLeftWide')}} {{/if}} +
    +
    -
    -
    - {{/if}} - {{if data.cartridge.access.access_quartermaster == 1}} -
    -
    +
    + {{/if}} + {{if data.cartridge.access.access_quartermaster == 1}} +
    +
    Quartermaster: -
    -
    +
    +
    {{:helper.link('Supply Records', 'gear', {'choice' : "47"}, null, 'fixedLeftWide')}} {{if data.cartridge.radio == 3}} {{:helper.link('Delivery Bot Control', 'gear', {'choice' : "48"}, null, 'fixedLeftWide')}} {{/if}} -
    +
    +
    -
    -
    - {{/if}} - {{/if}} -
    -
    -
    - Utilities: -
    -
    - {{if data.cartridge}} - {{if data.cartridge.access.access_status_display == 1}} - {{:helper.link('Status Display', 'gear', {'choice' : "42"}, null, 'fixedLeftWide')}} - {{/if}} - {{if data.cartridge.access.access_janitor==1}} - {{:helper.link('Custodial Locator', 'gear', {'choice' : "49"}, null, 'fixedLeftWide')}} - {{/if}} - {{if data.cartridge.radio == 2}} - {{:helper.link('Signaler System', 'gear', {'choice' : "40"}, null, 'fixedLeftWide')}} - {{/if}} - {{if data.cartridge.access.access_reagent_scanner==1}} - {{:helper.link(data.scanmode == 3 ? 'Disable Reagent Scanner' : 'Enable Reagent Scanner', 'gear', {'choice' : "Reagent Scan"}, null, 'fixedLeftWider')}} - {{/if}} - {{if data.cartridge.access.access_engine==1}} - {{:helper.link(data.scanmode == 4 ? 'Disable Halogen Counter' : 'Enable Halogen Counter', 'gear', {'choice' : "Halogen Counter"}, null, 'fixedLeftWider')}} - {{/if}} - {{if data.cartridge.access.access_atmos==1}} - {{:helper.link(data.scanmode == 5 ? 'Disable Gas Scanner' : 'Enable Gas Scanner', 'gear', {'choice' : "Gas Scan"}, null, 'fixedLeftWide')}} - {{/if}} - {{if data.cartridge.access.access_remote_door==1}} - {{:helper.link('Toggle Door', 'gear', {'choice' : "Toggle Door"}, null, 'fixedLeftWide')}} - {{/if}} +
    {{/if}} - {{:helper.link('Atmospheric Scan', 'gear', {'choice' : "3"}, null, 'fixedLeftWide')}} - {{:helper.link(fon==1 ? 'Disable Flashlight' : 'Enable Flashlight', 'lightbulb', {'choice' : "Light"}, null,'fixedLeftWide')}} -
    -
    - {{if data.pai}} + {{/if}} +
    - PAI Utilities: + Utilities:
    - {{:helper.link('Configuration', 'gear', {'choice' : "pai", 'option' : "1"}, null, 'fixedLeft')}} - {{:helper.link('Eject pAI', 'eject', {'choice' : "pai", 'option' : "2"}, null, 'fixedLeft')}} + {{if data.cartridge}} + {{if data.cartridge.access.access_status_display == 1}} + {{:helper.link('Status Display', 'gear', {'choice' : "42"}, null, 'fixedLeftWide')}} + {{/if}} + {{if data.cartridge.access.access_janitor==1}} + {{:helper.link('Custodial Locator', 'gear', {'choice' : "49"}, null, 'fixedLeftWide')}} + {{/if}} + {{if data.cartridge.radio == 2}} + {{:helper.link('Signaler System', 'gear', {'choice' : "40"}, null, 'fixedLeftWide')}} + {{/if}} + {{if data.cartridge.access.access_reagent_scanner==1}} + {{:helper.link(data.scanmode == 3 ? 'Disable Reagent Scanner' : 'Enable Reagent Scanner', 'gear', {'choice' : "Reagent Scan"}, null, 'fixedLeftWider')}} + {{/if}} + {{if data.cartridge.access.access_engine==1}} + {{:helper.link(data.scanmode == 4 ? 'Disable Halogen Counter' : 'Enable Halogen Counter', 'gear', {'choice' : "Halogen Counter"}, null, 'fixedLeftWider')}} + {{/if}} + {{if data.cartridge.access.access_atmos==1}} + {{:helper.link(data.scanmode == 5 ? 'Disable Gas Scanner' : 'Enable Gas Scanner', 'gear', {'choice' : "Gas Scan"}, null, 'fixedLeftWide')}} + {{/if}} + {{if data.cartridge.access.access_remote_door==1}} + {{:helper.link('Toggle Door', 'gear', {'choice' : "Toggle Door"}, null, 'fixedLeftWide')}} + {{/if}} + {{/if}} + {{:helper.link('Atmospheric Scan', 'gear', {'choice' : "3"}, null, 'fixedLeftWide')}} + {{:helper.link(fon==1 ? 'Disable Flashlight' : 'Enable Flashlight', 'lightbulb', {'choice' : "Light"}, null,'fixedLeftWide')}}
    - {{/if}} - {{/if}} - {{if data.mode == 1}} -
    -
    - Notes: -
    -
    -
    -
    -
    - {{:data.note}} -
    -
    -
    -
    -
    - {{:helper.link('Edit Notes', 'gear', {'choice' : "Edit"}, null, 'fixedLeft')}} + {{if data.pai}} +
    +
    + PAI Utilities:
    +
    + {{:helper.link('Configuration', 'gear', {'choice' : "pai", 'option' : "1"}, null, 'fixedLeft')}} + {{:helper.link('Eject pAI', 'eject', {'choice' : "pai", 'option' : "2"}, null, 'fixedLeft')}} +
    +
    + {{/if}} + {{else data.mode == 1}} +
    +
    + Notes: +
    +
    +
    +
    +
    + {{:data.note}} +
    +
    +
    +
    +
    + {{:helper.link('Edit Notes', 'gear', {'choice' : "Edit"}, null, 'fixedLeft')}} +
    - {{else data.mode == 2}} -

    SpaceMessenger V4.0.1

    + {{else data.mode == 2}} +

    SpaceMessenger V4.0.1

    -
    - Messenger Functions: -
    +
    + Messenger Functions: +
    +
    + {{:helper.link(data.silent==1 ? 'Ringer: Off' : 'Ringer: On', data.silent==1 ? 'volume-off' : 'volume-on', {'choice' : "Toggle Ringer"}, null, 'fixedLeftWide')}} + {{:helper.link(data.toff==1 ? 'Messenger: Off' : 'Messenger: On',data.toff==1 ? 'close':'check', {'choice' : "Toggle Messenger"}, null, 'fixedLeftWide')}} + {{:helper.link('Set Ringtone', 'comment', {'choice' : "Ringtone"}, null, 'fixedLeftWide')}} + {{:helper.link('Delete all Conversations', 'trash', {'choice' : "Clear", 'option' : "All"}, null, 'fixedLeftWider')}} +
    +
    + {{if data.toff == 0}} +

    + {{if data.cartridge}} + {{if data.cartridge.charges}} +
    + {{:data.cartridge.charges}} + {{if data.cartridge.type == "/obj/item/weapon/cartridge/syndicate"}} detonation charges left. {{/if}} + {{if data.cartridge.type == "/obj/item/weapon/cartridge/clown" || data.cartridge.type == "/obj/item/weapon/cartridge/mime"}} viral files left. {{/if}} + +

    +
    + {{/if}} + {{/if}} -
    - {{:helper.link(data.silent==1 ? 'Ringer: Off' : 'Ringer: On', data.silent==1 ? 'volume-off' : 'volume-on', {'choice' : "Toggle Ringer"}, null, 'fixedLeftWide')}} - {{:helper.link(data.toff==1 ? 'Messenger: Off' : 'Messenger: On',data.toff==1 ? 'close':'check', {'choice' : "Toggle Messenger"}, null, 'fixedLeftWide')}} - {{:helper.link('Set Ringtone', 'comment', {'choice' : "Ringtone"}, null, 'fixedLeftWide')}} - {{:helper.link('Delete all Conversations', 'trash', {'choice' : "Clear", 'option' : "All"}, null, 'fixedLeftWider')}} -
    -
    - {{if data.toff == 0}} -

    - {{if data.cartridge}} - {{if data.cartridge.charges}} -
    - {{:data.cartridge.charges}} - {{if data.cartridge.type == "/obj/item/weapon/cartridge/syndicate"}} detonation charges left. {{/if}} - {{if data.cartridge.type == "/obj/item/weapon/cartridge/clown" || data.cartridge.type == "/obj/item/weapon/cartridge/mime"}} viral files left. {{/if}} -

    -
    - {{/if}} - {{/if}} - - {{if data.pda_count == 0}}No other PDAS located - {{else}} -

    Current Conversations

    - {{for data.convopdas}} -
    - {{:helper.link(Name, 'circle-arrow-s', {'choice' : "Select Conversation", 'convo' : data.Reference } , null, fixedLeftWider)}} - {{if data.cartridge}} - {{if data.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && data.Detonate == 1}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : data.Reference}, null, 'fixedLeft')}} {{/if}} - {{if data.cartridge.type == "/obj/item/weapon/cartridge/clown"}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : data.Reference}, null, 'fixedLeft')}} {{/if}} - {{if data.cartridge.type == "/obj/item/weapon/cartridge/mime"}} {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : data.Reference}, null, 'fixedLeft')}} {{/if}} - {{/if}} -
    - {{/for}} -

    Other PDAs

    - {{for data.pdas}} -
    - {{:helper.link(Name, 'circle-arrow-s', {'choice' : "Message", 'target' : value.Reference}, null, fixedLeftWider)}} - {{if value.cartridge}} - {{if value.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && value.Detonate == 1}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} - {{if value.cartridge.type == "/obj/item/weapon/cartridge/clown"}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} - {{if value.cartridge.type == "/obj/item/weapon/cartridge/mime"}} {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} - {{/if}} -
    - {{/for}} - {{/if}} - {{/if}} + {{if data.pda_count == 0}} + No other PDAS located + {{else}} +

    Current Conversations

    + {{for data.convopdas}} +
    + {{:helper.link(Name, 'circle-arrow-s', {'choice' : "Select Conversation", 'convo' : data.Reference } , null, fixedLeftWider)}} + {{if data.cartridge}} + {{if data.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && data.Detonate == 1}} + {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : data.Reference}, null, 'fixedLeft')}} + {{/if}} + {{if data.cartridge.type == "/obj/item/weapon/cartridge/clown"}} + {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : data.Reference}, null, 'fixedLeft')}} + {{/if}} + {{if data.cartridge.type == "/obj/item/weapon/cartridge/mime"}} + {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : data.Reference}, null, 'fixedLeft')}} + {{/if}} + {{/if}} +
    + {{/for}} +

    Other PDAs

    + {{for data.pdas}} +
    + {{:helper.link(Name, 'circle-arrow-s', {'choice' : "Message", 'target' : value.Reference}, null, fixedLeftWider)}} + {{if value.cartridge}} + {{if value.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && value.Detonate == 1}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} + {{if value.cartridge.type == "/obj/item/weapon/cartridge/clown"}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} + {{if value.cartridge.type == "/obj/item/weapon/cartridge/mime"}} {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : value.Reference}, null, 'fixedLeft')}} {{/if}} + {{/if}} +
    + {{/for}} + {{/if}} + {{/if}} {{else data.mode == 21}} -

    SpaceMessenger V4.0.1

    -
    -
    - Messenger Functions: -
    - -
    - {{:helper.link('Delete Conversation', 'trash', {'choice' : "Clear", 'option' : "Convo"}, null, 'fixedLeftWide')}} -
    -
    -

    -

    Conversation with: {{:data.convo_name}} ({{:data.convo_job}})

    +

    SpaceMessenger V4.0.1

    +
    +
    + Messenger Functions: +
    +
    + {{:helper.link('Delete Conversation', 'trash', {'choice' : "Clear", 'option' : "Convo"}, null, 'fixedLeftWide')}} +
    +
    +
    +
    +

    Conversation with: {{:data.convo_name}} ({{:data.convo_job}})

    -
    -
    - {{for data.messages}} - {{if data.active_conversation == value.target}} - {{if value.sent==0}} - Them: {{:value.message}}
    - {{else}} - You: {{:value.message}}
    +
    +
    + {{for data.messages}} + {{if data.active_conversation == value.target}} + {{if value.sent==0}} + Them: {{:value.message}}
    + {{else}} + You: {{:value.message}}
    + {{/if}} {{/if}} - {{/if}} - {{/for}} - -
    -
    -
    - {{:helper.link('Reply', 'comment', {'choice' : "Message", 'target': data.active_conversation}, null, 'fixedLeft')}} - + {{/for}} +
    +
    +
    + {{:helper.link('Reply', 'comment', {'choice' : "Message", 'target': data.active_conversation}, null, 'fixedLeft')}} {{else data.mode== 41}} -
    -
    - {{if data.manifest.heads.length}} - - {{for data.manifest["heads"]}} - {{if value.rank == "Captain"}} - - {{else}} - - {{/if}} - {{/for}} - {{/if}} - {{if data.manifest.sec.length}} - - {{for data.manifest["sec"]}} - {{if value.rank == "Head of Security"}} - - {{else}} - - {{/if}} - {{/for}} - {{/if}} - {{if data.manifest.eng.length}} - - {{for data.manifest["eng"]}} - {{if value.rank == "Chief Engineer"}} - - {{else}} - - {{/if}} - - {{/for}} +
    +
    Command
    {{:value.name}}{{:value.rank}}{{:value.active}}
    {{:value.name}}{{:value.rank}}{{:value.active}}
    Security
    {{:value.name}}{{:value.rank}}{{:value.active}}
    {{:value.name}}{{:value.rank}}{{:value.active}}
    Engineering
    {{:value.name}}{{:value.rank}}{{:value.active}}
    {{:value.name}}{{:value.rank}}{{:value.active}}
    + {{if data.manifest.heads.length}} + + {{for data.manifest["heads"]}} + {{if value.rank == "Captain"}} + + {{else}} + {{/if}} - {{if data.manifest.med.length}} - - {{for data.manifest["med"]}} - {{if value.rank == "Chief Medical Officer"}} - - {{else}} - - {{/if}} - {{/for}} - {{/if}} - {{if data.manifest.sci.length}} - - {{for data.manifest["sci"]}} - {{if value.rank == "Research Director"}} - - {{else}} - - {{/if}} - {{/for}} - {{/if}} - {{if data.manifest.civ.length}} - - {{for data.manifest["civ"]}} - {{if value.rank == "Head of Personnel"}} - - {{else}} - - {{/if}} - {{/for}} - {{/if}} - {{if data.manifest.misc.length}} - - {{for data.manifest["misc"]}} - - {{/for}} - {{/if}} - - -
    Command
    {{:value.name}}{{:value.rank}}{{:value.active}}
    {{:value.name}}{{:value.rank}}{{:value.active}}
    Medical
    {{:value.name}}{{:value.rank}}{{:value.active}}
    {{:value.name}}{{:value.rank}}{{:value.active}}
    Science
    {{:value.name}}{{:value.rank}}{{:value.active}}
    {{:value.name}}{{:value.rank}}{{:value.active}}
    Civilian
    {{:value.name}}{{:value.rank}}{{:value.active}}
    {{:value.name}}{{:value.rank}}{{:value.active}}
    Misc
    {{:value.name}}{{:value.rank}}{{:value.active}}
    -
    + {{/for}} + {{/if}} + {{if data.manifest.sec.length}} + Security + {{for data.manifest["sec"]}} + {{if value.rank == "Head of Security"}} + {{:value.name}}{{:value.rank}}{{:value.active}} + {{else}} + {{:value.name}}{{:value.rank}}{{:value.active}} + {{/if}} + {{/for}} + {{/if}} + {{if data.manifest.eng.length}} + Engineering + {{for data.manifest["eng"]}} + {{if value.rank == "Chief Engineer"}} + {{:value.name}}{{:value.rank}}{{:value.active}} + {{else}} + {{:value.name}}{{:value.rank}}{{:value.active}} + {{/if}} + {{/for}} + {{/if}} + {{if data.manifest.med.length}} + Medical + {{for data.manifest["med"]}} + {{if value.rank == "Chief Medical Officer"}} + {{:value.name}}{{:value.rank}}{{:value.active}} + {{else}} + {{:value.name}}{{:value.rank}}{{:value.active}} + {{/if}} + {{/for}} + {{/if}} + {{if data.manifest.sci.length}} + Science + {{for data.manifest["sci"]}} + {{if value.rank == "Research Director"}} + {{:value.name}}{{:value.rank}}{{:value.active}} + {{else}} + {{:value.name}}{{:value.rank}}{{:value.active}} + {{/if}} + {{/for}} + {{/if}} + {{if data.manifest.civ.length}} + Civilian + {{for data.manifest["civ"]}} + {{if value.rank == "Head of Personnel"}} + {{:value.name}}{{:value.rank}}{{:value.active}} + {{else}} + {{:value.name}}{{:value.rank}}{{:value.active}} + {{/if}} + {{/for}} + {{/if}} + {{if data.manifest.misc.length}} + Misc + {{for data.manifest["misc"]}} + {{:value.name}}{{:value.rank}}{{:value.active}} + {{/for}} + {{/if}} + +
    {{else data.mode == 3}}

    Atmospheric Scan

    -
    +
    {{if data.aircontents.reading == 1}} -
    - Pressure: -
    -
    - {{:helper.string('{1} kPa', data.aircontents.pressure < 80 || data.aircontents.pressure > 120 ? 'bad' : data.aircontents.pressure < 95 || data.aircontents.pressure > 110 ? 'average' : 'good' , data.aircontents.pressure)}} -
    -
    - Temperature: -
    -
    - {{:helper.string('{1} °C', data.aircontents.temp < 5 || data.aircontents.temp > 35 ? 'bad' : data.aircontents.temp < 15 || data.aircontents.temp > 25 ? 'average' : 'good' , data.aircontents.temp)}} -
    -
    -
    - Oxygen: -
    -
    - {{:helper.string('{1}%', data.aircontents.oxygen < 17 ? 'bad' : data.aircontents.oxygen < 19 ? 'average' : 'good' , data.aircontents.oxygen)}} -
    -
    - Nitrogen: -
    -
    - {{:helper.string('{1}%', data.aircontents.nitrogen > 82 ? 'bad' : data.aircontents.nitrogen > 80 ? 'average' : 'good' , data.aircontents.nitrogen)}} -
    -
    - Carbon Dioxide: -
    -
    - {{:helper.string('{1}%', data.aircontents.carbon_dioxide > 5 ? 'bad' : 'good' , data.aircontents.carbon_dioxide)}} -
    -
    - Phoron: -
    -
    - {{:helper.string('{1}%', data.aircontents.phoron > 0 ? 'bad' : 'good' , data.aircontents.phoron)}} +
    + Pressure: +
    +
    + {{:helper.string('{1} kPa', data.aircontents.pressure < 80 || data.aircontents.pressure > 120 ? 'bad' : data.aircontents.pressure < 95 || data.aircontents.pressure > 110 ? 'average' : 'good' , data.aircontents.pressure)}} +
    +
    + Temperature: +
    +
    + {{:helper.string('{1} °C', data.aircontents.temp < 5 || data.aircontents.temp > 35 ? 'bad' : data.aircontents.temp < 15 || data.aircontents.temp > 25 ? 'average' : 'good' , data.aircontents.temp)}} +
    +
    +
    + Oxygen: +
    +
    + {{:helper.string('{1}%', data.aircontents.oxygen < 17 ? 'bad' : data.aircontents.oxygen < 19 ? 'average' : 'good' , data.aircontents.oxygen)}} +
    +
    + Nitrogen: +
    +
    + {{:helper.string('{1}%', data.aircontents.nitrogen > 82 ? 'bad' : data.aircontents.nitrogen > 80 ? 'average' : 'good' , data.aircontents.nitrogen)}} +
    +
    + Carbon Dioxide: +
    +
    + {{:helper.string('{1}%', data.aircontents.carbon_dioxide > 5 ? 'bad' : 'good' , data.aircontents.carbon_dioxide)}} +
    +
    + Phoron: +
    +
    + {{:helper.string('{1}%', data.aircontents.phoron > 0 ? 'bad' : 'good' , data.aircontents.phoron)}} -
    - {{if data.aircontents.other > 0}} +
    + {{if data.aircontents.other > 0}}
    - Unknown: + Unknown:
    - {{:data.aircontents.other}}% + {{:data.aircontents.other}}%
    - {{/if}} + {{/if}} {{else}} -
    - Unable to get air reading -
    +
    + Unable to get air reading +
    {{/if}} -
    - +
    {{else data.mode == 40}} -

    Remote Signaling System

    -
    -
    - Frequency: -
    -
    - {{:data.records.signal_freq}} -
    -  {{:helper.link('-1', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "-10"}, null, null)}}  - {{:helper.link('-.2', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "-2"}, null, null)}}  - - {{:helper.link('+.2', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "2"}, null, null)}}  - {{:helper.link('+1', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "10"}, null, null)}} -
    -
    -

    -
    -
    - Code: -
    -
    - - {{:data.records.signal_code}}
    -     - {{:helper.link('-5', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "-5"}, null, null)}} - {{:helper.link('-1', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "-1"}, null, null)}} - {{:helper.link('+1', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "1"}, null, null)}} - {{:helper.link('+5', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "5"}, null, null)}} -
    -
    -
    - {{:helper.link('Send Signal', 'radiation', {'cartmenu' : "1", 'choice' : "Send Signal"}, null, null)}} -
    - - {{else data.mode == 42}} -

    Station Status Displays Interlink

    +

    Remote Signaling System

    -
    - Code: -
    -
    - {{:helper.link('Clear', 'trash', {'cartmenu' : "1", 'choice' : "Status", 'statdisp' : "blank"}, null, null)}} - {{:helper.link('Shuttle ETA', 'gear', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "shuttle"}, null, null)}} - {{:helper.link('Message', 'gear', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "message"}, null, null)}} -
    -
    -
    -
    -
    - Message line 1 -
    -
    - {{:helper.link(data.records.message1 + ' (set)', 'pencil', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "setmsg1"}, null, null)}} -
    -
    +
    + Frequency: +
    +
    + {{:data.records.signal_freq}} +
    +   + {{:helper.link('-1', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "-10"}, null, null)}}  + {{:helper.link('-.2', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "-2"}, null, null)}}  + + {{:helper.link('+.2', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "2"}, null, null)}}  + {{:helper.link('+1', null, {'cartmenu' : "1", 'choice' : "Signal Frequency", 'sfreq' : "10"}, null, null)}} +
    +
    +
    +
    -
    - Message line 2 -
    -
    - {{:helper.link(data.records.message2 + ' (set)', 'pencil', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "setmsg2"}, null, null)}} -
    +
    + Code: +
    +
    + + {{:data.records.signal_code}}
    +     + {{:helper.link('-5', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "-5"}, null, null)}} + {{:helper.link('-1', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "-1"}, null, null)}} + {{:helper.link('+1', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "1"}, null, null)}} + {{:helper.link('+5', null, {'cartmenu' : "1", 'choice' : "Signal Code", 'scode' : "5"}, null, null)}} +
    +
    +
    + {{:helper.link('Send Signal', 'radiation', {'cartmenu' : "1", 'choice' : "Send Signal"}, null, null)}}
    -
    -
    -
    - ALERT!: -
    -
    - {{:helper.link('None', 'alert', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "alert", 'alert' : "default"}, null, null)}} + {{else data.mode == 42}} +

    Station Status Displays Interlink

    +
    +
    + Code: +
    +
    + {{:helper.link('Clear', 'trash', {'cartmenu' : "1", 'choice' : "Status", 'statdisp' : "blank"}, null, null)}} + {{:helper.link('Shuttle ETA', 'gear', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "shuttle"}, null, null)}} + {{:helper.link('Message', 'gear', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "message"}, null, null)}} +
    +
    +
    +
    +
    + Message line 1 +
    +
    + {{:helper.link(data.records.message1 + ' (set)', 'pencil', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "setmsg1"}, null, null)}} +
    +
    +
    +
    + Message line 2 +
    +
    + {{:helper.link(data.records.message2 + ' (set)', 'pencil', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "setmsg2"}, null, null)}} +
    +
    + +
    +
    +
    + ALERT!: +
    +
    + {{:helper.link('None', 'alert', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "alert", 'alert' : "default"}, null, null)}} {{:helper.link('Red Alert', 'alert', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "alert", 'alert' : "redalert"}, null, null)}} {{:helper.link('Lockdown', 'caution', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "alert", 'alert' : "lockdown"}, null, null)}} {{:helper.link('Biohazard', 'radiation', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "alert", 'alert' : "biohazard"}, null, null)}} -
    -
    - +
    +
    {{else data.mode == 43}} -

    Station Powermonitors

    +

    Station Powermonitors

    - Select A power monitor: -
    - {{for data.records.powermonitors}} -
    - {{:helper.link(value.Name, 'radiation', {'cartmenu' : "1", 'choice' : "Power Select",'target' : value.ref}, null, null)}} -
    - {{/for}} - - {{else data.mode == 433}} -

    Powernet Status

    -
    -
    - Current Load: -
    -
    - {{:data.records.powerload}} W -
    + Select A power monitor:
    -
    -
    - Total Power: -
    -
    - {{:data.records.poweravail}} W -
    + {{for data.records.powermonitors}} +
    + {{:helper.link(value.Name, 'radiation', {'cartmenu' : "1", 'choice' : "Power Select",'target' : value.ref}, null, null)}} +
    + {{/for}} + + {{else data.mode == 433}} +

    Powernet Status

    +
    +
    + Current Load: +
    +
    + {{:data.records.powerload}} W +
    +
    +
    +
    + Total Power: +
    +
    + {{:data.records.poweravail}} W +
    +
    +
    +
    + + {{for data.records.apcs}} + {{if index % 20 === 0}} + + {{/if}} + + {{:helper.string('', value.Equipment==1 ? '#4f7529' : '#8f1414')}} + {{:helper.string('', value.Lights==1 ? '#4f7529' : '#8f1414')}} + {{:helper.string('', value.Environment==1 ? '#4f7529' : '#8f1414')}} + {{:helper.string('', value.CellStatus==1 ? '#4f7529' : '#8f1414', value.CellStatus==-1 ? 'No Cell' : CellPct + '%')}} + + {{/for}} +
     Area  Eqp.  Lgt.  Env  Cell 
    {{:value.Name}}   {1}
    -
    -
    - - {{for data.records.apcs}} - {{if index % 20 === 0}} - - {{/if}} - - - {{:helper.string('', value.Equipment==1 ? '#4f7529' : '#8f1414')}} - {{:helper.string('', value.Lights==1 ? '#4f7529' : '#8f1414')}} - {{:helper.string('', value.Environment==1 ? '#4f7529' : '#8f1414')}} - {{:helper.string('', value.CellStatus==1 ? '#4f7529' : '#8f1414', value.CellStatus==-1 ? 'No Cell' : CellPct + '%')}} - - {{/for}} -
     Area  Eqp.  Lgt.  Env  Cell 
    {{:value.Name}}   {1}
    -
    - {{else data.mode == 44}} -

    Medical Record List

    +

    Medical Record List

    - Select A record -
    -
    + Select A record +
    +
    {{for data.records.medical_records}} -
    - {{:helper.link(value.Name, 'gear', {'cartmenu' : "1", 'choice' : "Medical Records",'target' : value.ref}, null, null)}} -
    +
    + {{:helper.link(value.Name, 'gear', {'cartmenu' : "1", 'choice' : "Medical Records",'target' : value.ref}, null, null)}} +
    {{/for}} - - - {{else data.mode == 441}} -

    Medical Record

    -
    -
    -
    - {{if data.records.general_exists == 1}} - Name: {{:data.records.general.name}}
    - Sex: {{:data.records.general.sex}}
    - Species: {{:data.records.general.species}}
    - Age: {{:data.records.general.age}}
    - Rank: {{:data.records.general.rank}}
    - Fingerprint: {{:data.records.general.fingerprint}}
    - Physical Status: {{:data.records.general.p_stat}}
    - Mental Status: {{:data.records.general.m_stat}}

    - {{else}} - - General Record Lost!

    -     - {{/if}} - {{if data.records.medical_exists == 1}} - Medical Data:
    - Blood Type: {{:data.records.medical.b_type}}

    - Minor Disabilities: {{:data.records.medical.mi_dis}}
    - Details: {{:data.records.medical.mi_dis_d}}

    - Major Disabilities: {{:data.records.medical.ma_dis}}
    - Details: {{:data.records.medical.ma_dis_d}}

    - Allergies: {{:data.records.medical.alg}}
    - Details: {{:data.records.medical.alg_d}}

    - Current Disease: {{:data.records.medical.cdi}}
    - Details: {{:data.records.medical.alg_d}}

    - Important Notes: {{:data.records.medical.notes}} - {{else}} - - Medical Record Lost!

    -     - {{/if}} -
    +

    Medical Record

    +
    +
    +
    + {{if data.records.general_exists == 1}} + Name: {{:data.records.general.name}}
    + Sex: {{:data.records.general.sex}}
    + Species: {{:data.records.general.species}}
    + Age: {{:data.records.general.age}}
    + Rank: {{:data.records.general.rank}}
    + Fingerprint: {{:data.records.general.fingerprint}}
    + Physical Status: {{:data.records.general.p_stat}}
    + Mental Status: {{:data.records.general.m_stat}}

    + {{else}} + + General Record Lost!

    +     + {{/if}} + {{if data.records.medical_exists == 1}} + Medical Data:
    + Blood Type: {{:data.records.medical.b_type}}

    + Minor Disabilities: {{:data.records.medical.mi_dis}}
    + Details: {{:data.records.medical.mi_dis_d}}

    + Major Disabilities: {{:data.records.medical.ma_dis}}
    + Details: {{:data.records.medical.ma_dis_d}}

    + Allergies: {{:data.records.medical.alg}}
    + Details: {{:data.records.medical.alg_d}}

    + Current Disease: {{:data.records.medical.cdi}}
    + Details: {{:data.records.medical.alg_d}}

    + Important Notes: {{:data.records.medical.notes}} + {{else}} + + Medical Record Lost! +
    +
    +     + {{/if}}
    +
    - - {{else data.mode == 45}}

    Security Record List

    - Select A record + Select A record

    - {{for data.records.security_records}} -
    - {{:helper.link(value.Name, 'gear', {'cartmenu' : "1", 'choice' : "Security Records",'target' : value.ref}, null, null)}} -
    - {{/for}} - - - - {{else data.mode == 451}} + {{for data.records.security_records}} +
    + {{:helper.link(value.Name, 'gear', {'cartmenu' : "1", 'choice' : "Security Records",'target' : value.ref}, null, null)}} +
    + {{/for}} + {{else data.mode == 451}}

    Security Record

    -
    -
    -
    - {{if data.records.general_exists == 1}} +
    +
    +
    + {{if data.records.general_exists == 1}} Name: {{:data.records.general.name}}
    Sex: {{:data.records.general.sex}}
    Species: {{:data.records.general.species}}
    @@ -625,322 +618,307 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm Fingerprint: {{:data.records.general.fingerprint}}
    Physical Status: {{:data.records.general.p_stat}}
    Mental Status: {{:data.records.general.m_stat}}

    - {{else}} - - General Record Lost!

    -     - {{/if}} - {{if data.records.security_exists == 1}} + {{else}} + + General Record Lost!

    +     + {{/if}} + {{if data.records.security_exists == 1}} Security Data:
    Criminal Status: {{:data.records.security.criminal}}

    - Minor Crimes: {{:data.records.security.mi_crim}}
    - Details: {{:data.records.security.mi_crim_d}}

    - Major Crimes: {{:data.records.security.ma_crim}}
    + Minor Crimes: {{:data.records.security.mi_crim}}
    + Details: {{:data.records.security.mi_crim_d}}

    + Major Crimes: {{:data.records.security.ma_crim}}
    Details: {{:data.records.security.ma_crim_d}}

    - Important Notes: {{:data.records.security.notes}} - {{else}} - - Security Record Lost!

    -     - {{/if}} -
    + Important Notes: {{:data.records.security.notes}} + {{else}} + + Security Record Lost!

    +     + {{/if}}
    +
    {{else data.mode == 46}} -

    Security Bot Control

    +

    Security Bot Control

    {{if data.records.beepsky.active == null || data.records.beepsky.active == 0}} {{if data.records.beepsky.count == 0}}

    No bots found.

    {{else}} -
    +
    Select A Bot. -
    -
    - {{for data.records.beepsky.bots}} +
    +
    + {{for data.records.beepsky.bots}}
    - {{:helper.link(value.Name, 'gear', {'radiomenu' : "1", 'op' : "control",'bot' : value.ref}, null, null)}} (Location: {{:value.Location}}) + {{:helper.link(value.Name, 'gear', {'radiomenu' : "1", 'op' : "control",'bot' : value.ref}, null, null)}} (Location: {{:value.Location}})
    - {{/for}} + {{/for}} {{/if}}
    - {{:helper.link('Scan for Bots','gear', {'radiomenu' : "1", 'op' : "scanbots"}, null, null)}} - + {{:helper.link('Scan for Bots','gear', {'radiomenu' : "1", 'op' : "scanbots"}, null, null)}} {{else}}

    {{:data.records.beepsky.active}}



    {{if data.records.beepsky.botstatus.mode == -1}} -

    Waiting for response...

    +

    Waiting for response...

    {{else}} -

    Status:

    -
    -
    -
    - Location: -
    -
    - {{:data.records.beepsky.botstatus.loca}} -
    -
    -
    -
    - Mode: -
    -
    - - {{if data.records.beepsky.botstatus.mode ==0}} Ready - {{else data.records.beepsky.botstatus.mode == 1}} - Apprehending target - {{else data.records.beepsky.botstatus.mode ==2 || data.records.beepsky.botstatus.mode == 3}} - Arresting target - {{else data.records.beepsky.botstatus.mode ==4}} - Starting patrol - {{else data.records.beepsky.botstatus.mode ==5}} - On Patrol - {{else data.records.beepsky.botstatus.mode ==6}} - Responding to summons - {{/if}} - -
    -
    -
    - {{:helper.link('Stop Patrol', 'gear', {'radiomenu' : "1", 'op' : "stop"}, null, null)}} - {{:helper.link('Start Patrol', 'gear', {'radiomenu' : "1", 'op' : "go"}, null, null)}} - {{:helper.link('Summon Bot', 'gear', {'radiomenu' : "1", 'op' : "summon"}, null, null)}} -
    +

    Status:

    +
    +
    +
    + Location: +
    +
    + {{:data.records.beepsky.botstatus.loca}} +
    +
    +
    +
    + Mode: +
    +
    + + {{if data.records.beepsky.botstatus.mode ==0}} + Ready + {{else data.records.beepsky.botstatus.mode == 1}} + Apprehending target + {{else data.records.beepsky.botstatus.mode ==2 || data.records.beepsky.botstatus.mode == 3}} + Arresting target + {{else data.records.beepsky.botstatus.mode ==4}} + Starting patrol + {{else data.records.beepsky.botstatus.mode ==5}} + On Patrol + {{else data.records.beepsky.botstatus.mode ==6}} + Responding to summons + {{/if}} + +
    +
    +
    + {{:helper.link('Stop Patrol', 'gear', {'radiomenu' : "1", 'op' : "stop"}, null, null)}} + {{:helper.link('Start Patrol', 'gear', {'radiomenu' : "1", 'op' : "go"}, null, null)}} + {{:helper.link('Summon Bot', 'gear', {'radiomenu' : "1", 'op' : "summon"}, null, null)}} +
    {{/if}} {{:helper.link('Return to Bot list', 'gear', {'radiomenu' : "1", 'op' : "botlist"}, null, null)}} {{/if}} {{else data.mode == 47}}

    Supply Record Interlink

    -
    +
    Location:
    {{if data.records.supply.shuttle_moving}} - Moving to station ({{:data.records.supply.shuttle_eta}}) + Moving to station ({{:data.records.supply.shuttle_eta}}) {{else}} - Shuttle at {{:data.records.supply.shuttle_loc}} + Shuttle at {{:data.records.supply.shuttle_loc}} {{/if}}
    -
    -
    - Current Approved Orders
    - {{if data.records.supply.approved_count == 0}} - No current approved orders

    - {{else}} - {{for data.records.supply.approved}} - #{{:value.Number}} - {{:value.Name}} approved by {{:value.OrderedBy}}
    {{if value.Comment != ""}} {{:value.Comment}}
    {{/if}}
     - {{/for}} - {{/if}} -

    - Current Requested Orders
    - {{if data.records.supply.requests_count == 0}} - No current requested orders

    - {{else}} - {{for data.records.supply.requests}} - #{{:value.Number}} - {{:value.Name}} requested by {{:value.OrderedBy}}
    {{if value.Comment != ""}} {{:value.Comment}}
    {{/if}}
     - {{/for}} - {{/if}} +
    +
    + Current Approved Orders
    + {{if data.records.supply.approved_count == 0}} + No current approved orders

    + {{else}} + {{for data.records.supply.approved}} + #{{:value.Number}} - {{:value.Name}} approved by {{:value.OrderedBy}}
    {{if value.Comment != ""}} {{:value.Comment}}
    {{/if}}
     + {{/for}} + {{/if}} +

    + Current Requested Orders
    + {{if data.records.supply.requests_count == 0}} + No current requested orders

    + {{else}} + {{for data.records.supply.requests}} + #{{:value.Number}} - {{:value.Name}} requested by {{:value.OrderedBy}}
    {{if value.Comment != ""}} {{:value.Comment}}
    {{/if}}
     + {{/for}} + {{/if}}
    - {{else data.mode == 48}}

    Mule Control

    - {{if data.records.mulebot.active == null || data.records.mulebot.active == 0}} - {{if data.records.mulebot.count == 0}} -

    No bots found.

    - - {{else}} -

    Mule List

    -
    - Select A Mulebot -
    -
    - {{for data.records.mulebot.bots}} -
    - {{:helper.link(value.Name, 'gear', {'radiomenu' : "1", 'op' : "control",'bot' : value.ref}, null, null)}} (Location: {{:value.Location}}) -
    - {{/for}} - {{/if}} -
    - {{:helper.link('Scan for Bots','gear', {'radiomenu' : "1", 'op' : "scanbots"}, null, null)}} - {{else}} - {{if data.records.mulebot.botstatus.mode == -1}} -

    Waiting for response...

    - {{else}} -

    Status:

    -
    -
    -
    - Location: -
    -
    - {{:data.records.mulebot.botstatus.loca}} -
    -
    -
    -
    - Mode: -
    -
    - - {{if data.records.mulebot.botstatus.mode ==0}} Ready - {{else data.records.mulebot.botstatus.mode == 1}} - Loading/Unloading - {{else data.records.mulebot.botstatus.mode ==2}} - Navigating to Delivery Location - {{else data.records.mulebot.botstatus.mode == 3}} - Navigating to Home - {{else data.records.mulebot.botstatus.mode ==4}} - Waiting for Clear Path - {{else data.records.mulebot.botstatus.mode ==5 || data.records.mulebot.botstatus.mode == 6}} - Calculating navigation Path - - {{else data.records.mulebot.botstatus.mode ==7}} - Unable to locate destination - {{/if}} - -
    -
    -
    -
    - Current Load: -
    -
    - - {{:helper.link(data.records.mulebot.botstatus.load == null ? 'None (Unload)' : data.records.mulebot.botstatus.load + ' (Unload)', 'gear', {'radiomenu' : "1", 'op' : "unload"},data.records.mulebot.botstatus.load == null ? 'disabled' : null, null)}} - -
    -
    -
    -
    - Power: -
    -
    - - {{:data.records.mulebot.botstatus.powr}}% - -
    -
    - -
    -
    - Destination: -
    -
    - {{:helper.link(data.records.mulebot.botstatus.dest == null || data.records.mulebot.botstatus.dest == "" ? 'None (Set)': data.records.mulebot.botstatus.dest+ ' (Set)', 'gear', {'radiomenu' : "1", 'op' : "setdest"}, null, null)}} -
    - -
    -
    -
    - Home: -
    -
    - {{if data.records.mulebot.botstatus.home == null}} None {{else}} {{:data.records.mulebot.botstatus.home}} {{/if}} -
    -
    -
    -
    - Auto Return: -
    -
    - {{:helper.link(data.records.mulebot.botstatus.retn == 1 ? 'ON' : 'OFF', 'gear', {'radiomenu' : "1", 'op' : data.records.mulebot.botstatus.retn==1 ? "retoff" : "reton"}, null, null)}} -
    -
    -
    -
    - Auto Pickup: -
    -
    - {{:helper.link(data.records.mulebot.botstatus.pick==1? 'ON' : 'OFF', 'gear', {'radiomenu' : "1", 'op' : data.records.mulebot.botstatus.pick==1 ? "pickoff" : "pickon"}, null, null)}} -
    -
    -
    -
    - Functions: -
    -
    - {{:helper.link('Stop', 'gear', {'radiomenu' : "1", 'op' : "stop"}, null, null)}} - {{:helper.link('Proceed', 'gear', {'radiomenu' : "1", 'op' : "go"}, null, null)}} - {{:helper.link('Return Home', 'gear', {'radiomenu' : "1", 'op' : "home"}, null, null)}} -
    -
    -

    - {{:helper.link('Return to Bot list', 'gear', {'radiomenu' : "1", 'op' : "botlist"}, null, null)}} - - - {{/if}} - {{/if}} - - - - {{else data.mode == 49}} -

    Janatorial Supplies Locator

    -
    - Current Location: - {{if data.records.janitor.user_loc.x == 0}} - Unknown - {{else}} - {{:data.records.janitor.user_loc.x}} / {{:data.records.janitor.user_loc.y}} - {{/if}} -
    -
    - {{for data.records.janitor.mops}} - {{if value.x==0}} - Unable to locate Mop - {{else}} - Mop Location: - ({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Status: {{:value.status}}
    - {{/if}} + {{if data.records.mulebot.active == null || data.records.mulebot.active == 0}} + {{if data.records.mulebot.count == 0}} +

    No bots found.

    + {{else}} +

    Mule List

    +
    + Select A Mulebot +
    +
    + {{for data.records.mulebot.bots}} +
    + {{:helper.link(value.Name, 'gear', {'radiomenu' : "1", 'op' : "control",'bot' : value.ref}, null, null)}} (Location: {{:value.Location}}) +
    {{/for}} + {{/if}} +
    + {{:helper.link('Scan for Bots','gear', {'radiomenu' : "1", 'op' : "scanbots"}, null, null)}} + {{else}} + {{if data.records.mulebot.botstatus.mode == -1}} +

    Waiting for response...

    + {{else}} +

    Status:

    +
    +
    +
    + Location: +
    +
    + {{:data.records.mulebot.botstatus.loca}} +
    +
    +
    +
    + Mode: +
    +
    + + {{if data.records.mulebot.botstatus.mode ==0}} + Ready + {{else data.records.mulebot.botstatus.mode == 1}} + Loading/Unloading + {{else data.records.mulebot.botstatus.mode ==2}} + Navigating to Delivery Location + {{else data.records.mulebot.botstatus.mode == 3}} + Navigating to Home + {{else data.records.mulebot.botstatus.mode ==4}} + Waiting for Clear Path + {{else data.records.mulebot.botstatus.mode ==5 || data.records.mulebot.botstatus.mode == 6}} + Calculating navigation Path + {{else data.records.mulebot.botstatus.mode ==7}} + Unable to locate destination + {{/if}} + +
    +
    +
    +
    + Current Load: +
    +
    + + {{:helper.link(data.records.mulebot.botstatus.load == null ? 'None (Unload)' : data.records.mulebot.botstatus.load + ' (Unload)', 'gear', {'radiomenu' : "1", 'op' : "unload"},data.records.mulebot.botstatus.load == null ? 'disabled' : null, null)}} + +
    +
    +
    +
    + Power: +
    +
    + + {{:data.records.mulebot.botstatus.powr}}% + +
    +
    +
    +
    + Destination: +
    +
    + {{:helper.link(data.records.mulebot.botstatus.dest == null || data.records.mulebot.botstatus.dest == "" ? 'None (Set)': data.records.mulebot.botstatus.dest+ ' (Set)', 'gear', {'radiomenu' : "1", 'op' : "setdest"}, null, null)}} +
    +
    +
    +
    + Home: +
    +
    + {{if data.records.mulebot.botstatus.home == null}} None {{else}} {{:data.records.mulebot.botstatus.home}} {{/if}} +
    +
    +
    +
    + Auto Return: +
    +
    + {{:helper.link(data.records.mulebot.botstatus.retn == 1 ? 'ON' : 'OFF', 'gear', {'radiomenu' : "1", 'op' : data.records.mulebot.botstatus.retn==1 ? "retoff" : "reton"}, null, null)}} +
    +
    +
    +
    + Auto Pickup: +
    +
    + {{:helper.link(data.records.mulebot.botstatus.pick==1? 'ON' : 'OFF', 'gear', {'radiomenu' : "1", 'op' : data.records.mulebot.botstatus.pick==1 ? "pickoff" : "pickon"}, null, null)}} +
    +
    +
    +
    + Functions: +
    +
    + {{:helper.link('Stop', 'gear', {'radiomenu' : "1", 'op' : "stop"}, null, null)}} + {{:helper.link('Proceed', 'gear', {'radiomenu' : "1", 'op' : "go"}, null, null)}} + {{:helper.link('Return Home', 'gear', {'radiomenu' : "1", 'op' : "home"}, null, null)}} +
    +
    +

    + {{:helper.link('Return to Bot list', 'gear', {'radiomenu' : "1", 'op' : "botlist"}, null, null)}} + {{/if}} + {{/if}} + {{else data.mode == 49}} +

    Janatorial Supplies Locator

    +
    + Current Location: + {{if data.records.janitor.user_loc.x == 0}} + Unknown + {{else}} + {{:data.records.janitor.user_loc.x}} / {{:data.records.janitor.user_loc.y}} + {{/if}}
    -
    - {{for data.records.janitor.buckets}} - {{if value.x==0}} - Unable to locate Water Buckets - {{else}} - Water Buckets Location: - ({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Water Level: {{:value.status}}
    - {{/if}} - {{/for}} -
    -
    - {{for data.records.janitor.cleanbots}} - {{if value.x==0}} - Unable to locate Clean Bots +
    + {{for data.records.janitor.mops}} + {{if value.x==0}} + Unable to locate Mop {{else}} - Clean Bots Location: + Mop Location: ({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Status: {{:value.status}}
    {{/if}} {{/for}} -
    +
    - {{for data.records.janitor.carts}} - {{if value.x==0}} - Unable to locate Janitorial Cart - {{else}} - Janitorial cart Location: - ({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Status: {{:value.status}}
    - {{/if}} - - {{/for}} + {{for data.records.janitor.buckets}} + {{if value.x==0}} + Unable to locate Water Buckets + {{else}} + Water Buckets Location: + ({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Water Level: {{:value.status}}
    + {{/if}} + {{/for}}
    - - - - - {{/if}} - - +
    + {{for data.records.janitor.cleanbots}} + {{if value.x==0}} + Unable to locate Clean Bots + {{else}} + Clean Bots Location: + ({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Status: {{:value.status}}
    + {{/if}} + {{/for}} +
    +
    + {{for data.records.janitor.carts}} + {{if value.x==0}} + Unable to locate Janitorial Cart + {{else}} + Janitorial cart Location: + ({{:value.x}} / {{:value.y}}) - {{:value.dir}} - Status: {{:value.status}}
    + {{/if}} + {{/for}} +
    + {{/if}} {{else}} -







    No Owner information found, please swipe ID -
    +
    +






    No Owner information found, please swipe ID +
    {{/if}} From 8894796b935fead0f7cde425408293e58b1849d2 Mon Sep 17 00:00:00 2001 From: Mark Aherne Date: Fri, 11 Jul 2014 22:57:27 +0100 Subject: [PATCH 27/88] Added some spacing between mode sections on the PDA template. --- nano/templates/pda.tmpl | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl index 912ea28aad..6cf52f8749 100644 --- a/nano/templates/pda.tmpl +++ b/nano/templates/pda.tmpl @@ -25,6 +25,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm

    + + {{if data.mode == 0}}
    @@ -176,6 +178,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{/if}} + + {{else data.mode == 1}}
    @@ -257,6 +261,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{/if}} {{/if}} + {{else data.mode == 21}}

    SpaceMessenger V4.0.1

    @@ -286,6 +291,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{:helper.link('Reply', 'comment', {'choice' : "Message", 'target': data.active_conversation}, null, 'fixedLeft')}} + + {{else data.mode== 41}}
    @@ -357,8 +364,9 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{/if}}
    - {{else data.mode == 3}} + + {{else data.mode == 3}}

    Atmospheric Scan

    @@ -416,6 +424,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{/if}}
    + + {{else data.mode == 40}}

    Remote Signaling System

    @@ -453,6 +463,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{:helper.link('Send Signal', 'radiation', {'cartmenu' : "1", 'choice' : "Send Signal"}, null, null)}}
    + {{else data.mode == 42}}

    Station Status Displays Interlink

    @@ -495,8 +506,9 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{:helper.link('Biohazard', 'radiation', {'cartmenu' : "1", 'choice' : "Status",'statdisp' : "alert", 'alert' : "biohazard"}, null, null)}}
    - {{else data.mode == 43}} + + {{else data.mode == 43}}

    Station Powermonitors

    Select A power monitor: @@ -507,6 +519,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    {{/for}} + {{else data.mode == 433}}

    Powernet Status

    @@ -541,6 +554,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{/for}}
    + + {{else data.mode == 44}}

    Medical Record List

    @@ -552,6 +567,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{:helper.link(value.Name, 'gear', {'cartmenu' : "1", 'choice' : "Medical Records",'target' : value.ref}, null, null)}}
    {{/for}} + + {{else data.mode == 441}}

    Medical Record

    @@ -593,6 +610,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    + + {{else data.mode == 45}}

    Security Record List

    @@ -604,6 +623,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{:helper.link(value.Name, 'gear', {'cartmenu' : "1", 'choice' : "Security Records",'target' : value.ref}, null, null)}}
    {{/for}} + + {{else data.mode == 451}}

    Security Record

    @@ -639,6 +660,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    + + {{else data.mode == 46}}

    Security Bot Control

    {{if data.records.beepsky.active == null || data.records.beepsky.active == 0}} @@ -703,6 +726,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{/if}} {{:helper.link('Return to Bot list', 'gear', {'radiomenu' : "1", 'op' : "botlist"}, null, null)}} {{/if}} + + {{else data.mode == 47}}

    Supply Record Interlink

    @@ -742,6 +767,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
    + + {{else data.mode == 48}}

    Mule Control

    {{if data.records.mulebot.active == null || data.records.mulebot.active == 0}} @@ -865,6 +892,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{:helper.link('Return to Bot list', 'gear', {'radiomenu' : "1", 'op' : "botlist"}, null, null)}} {{/if}} {{/if}} + + {{else data.mode == 49}}

    Janatorial Supplies Locator

    From 02a93c8f428c2b2d0b6b36c18b60e8e671d9b8f9 Mon Sep 17 00:00:00 2001 From: Mark Aherne Date: Fri, 11 Jul 2014 23:28:07 +0100 Subject: [PATCH 28/88] Continued work in progress on a major revision of the NanoUI templating system. --- code/modules/nano/nanoui.dm | 10 +++--- nano/templates/pda.tmpl | 2 +- nano/templates/shuttle_control_console.tmpl | 6 ++-- .../shuttle_control_console_exploration.tmpl | 35 +++++++++---------- nano/templates/simple_airlock_console.tmpl | 12 +++---- nano/templates/simple_docking_console.tmpl | 20 +++++------ .../templates/simple_docking_console_pod.tmpl | 20 +++++------ nano/templates/smes.tmpl | 22 ++++++------ nano/templates/tanks.tmpl | 18 +++++----- nano/templates/telescience_console.tmpl | 10 +++--- nano/templates/transfer_valve.tmpl | 8 ++--- nano/templates/uplink.tmpl | 31 ++++++++-------- 12 files changed, 97 insertions(+), 97 deletions(-) diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index ebdd6a6db8..b3262ee297 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -337,10 +337,12 @@ nanoui is used to open and update nano browser uis [title ? "
    [title]
    " : ""]
    Initiating...
    -

    - + {{if data.mode == 0}}
    diff --git a/nano/templates/shuttle_control_console.tmpl b/nano/templates/shuttle_control_console.tmpl index a1b30c0eb9..71ee78f056 100644 --- a/nano/templates/shuttle_control_console.tmpl +++ b/nano/templates/shuttle_control_console.tmpl @@ -58,9 +58,9 @@
    - {{:helper.link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, can_launch? null : 'disabled' , null)}} - {{:helper.link('Cancel Launch', 'cancel', {'cancel' : '1'}, can_cancel? null : 'disabled' , null)}} - {{:helper.link('Force Launch', 'alert', {'force' : '1'}, can_force? null : 'disabled' , can_force? 'redBackground' : null)}} + {{:helper.link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, data.can_launch? null : 'disabled' , null)}} + {{:helper.link('Cancel Launch', 'cancel', {'cancel' : '1'}, data.can_cancel ? null : 'disabled' , null)}} + {{:helper.link('Force Launch', 'alert', {'force' : '1'}, data.can_force? null : 'disabled' , can_force? 'redBackground' : null)}}
    \ No newline at end of file diff --git a/nano/templates/shuttle_control_console_exploration.tmpl b/nano/templates/shuttle_control_console_exploration.tmpl index 443b3190a9..507a2b4bda 100644 --- a/nano/templates/shuttle_control_console_exploration.tmpl +++ b/nano/templates/shuttle_control_console_exploration.tmpl @@ -1,7 +1,7 @@

    Shuttle Status

    - {{:shuttle_status}} + {{:data.shuttle_status}}
    @@ -10,11 +10,11 @@ Drive:
    - {{if shuttle_state == "idle"}} + {{if data.shuttle_state == "idle"}} IDLE - {{else shuttle_state == "warmup"}} + {{else data.shuttle_state == "warmup"}} SPINNING UP - {{else shuttle_state == "in_transit"}} + {{else data.shuttle_state == "in_transit"}} ENGAGED {{else}} ERROR @@ -22,53 +22,52 @@
    -{{if has_docking}} +{{if data.has_docking}}
    Docking Status:
    - {{if docking_status == "docked"}} + {{if data.docking_status == "docked"}} DOCKED - {{else docking_status == "docking"}} - {{if !docking_override}} + {{else data.docking_status == "docking"}} + {{if !data.docking_override}} DOCKING {{else}} DOCKING-MANUAL {{/if}} - {{else docking_status == "undocking"}} - {{if !docking_override}} + {{else data.docking_status == "undocking"}} + {{if !data.docking_override}} UNDOCKING {{else}} UNDOCKING-MANUAL {{/if}} - {{else docking_status == "undocked"}} + {{else data.docking_status == "undocked"}} UNDOCKED {{else}} ERROR {{/if}} -
    {{/if}}
    - Current Destination: + Current Destination:
    - {{:destination_name}} + {{:data.destination_name}}
    - {{:~link('Choose Destination', 'arrowreturn-1-s', {'pick' : '1'}, can_pick? null : 'disabled' , null)}} + {{:data.~link('Choose Destination', 'arrowreturn-1-s', {'pick' : '1'}, data.can_pick ? null : 'disabled' , null)}}

    Shuttle Control

    - {{:~link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, can_launch? null : 'disabled' , null)}} - {{:~link('Cancel Launch', 'cancel', {'cancel' : '1'}, can_cancel? null : 'disabled' , null)}} - {{:~link('Force Launch', 'alert', {'force' : '1'}, can_force? null : 'disabled' , can_force? 'redBackground' : null)}} + {{:data.~link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, data.can_launch ? null : 'disabled' , null)}} + {{:data.~link('Cancel Launch', 'cancel', {'cancel' : '1'}, data.can_cancel ? null : 'disabled' , null)}} + {{:data.~link('Force Launch', 'alert', {'force' : '1'}, data.can_force ? null : 'disabled' , can_force? 'redBackground' : null)}}
    \ No newline at end of file diff --git a/nano/templates/simple_airlock_console.tmpl b/nano/templates/simple_airlock_console.tmpl index 177e37b3f1..45e256574c 100644 --- a/nano/templates/simple_airlock_console.tmpl +++ b/nano/templates/simple_airlock_console.tmpl @@ -4,7 +4,7 @@ Chamber Pressure:
    - {{:helper.displayBar(chamber_pressure, 0, 200, chamber_pressure < 80 || chamber_pressure > 120 ? 'bad' : chamber_pressure < 95 || chamber_pressure > 110 ? 'average' : 'good')}} + {{:helper.displayBar(chamber_pressure, 0, 200, (chamber_pressure < 80) || (chamber_pressure > 120) ? 'bad' : (chamber_pressure < 95) || (chamber_pressure > 110) ? 'average' : 'good')}}
    {{:data.chamber_pressure}} kPa
    @@ -14,23 +14,23 @@
    - {{:helper.link('Cycle to Exterior', 'arrowthickstop-1-w', {'command' : 'cycle_ext'}, processing ? 'disabled' : null)}} - {{:helper.link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int'}, processing ? 'disabled' : null)}} + {{:helper.link('Cycle to Exterior', 'arrowthickstop-1-w', {'command' : 'cycle_ext'}, data.processing ? 'disabled' : null)}} + {{:helper.link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int'}, data.processing ? 'disabled' : null)}}
    {{if data.interior_status.state == "open"}} {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, 'redBackground')}} {{else}} - {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, processing ? 'yellowBackground' : null)}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? 'yellowBackground' : null)}} {{/if}} {{if data.exterior_status.state == "open"}} {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, 'redBackground')}} {{else}} - {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, processing ? 'yellowBackground' : null)}} + {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? 'yellowBackground' : null)}} {{/if}}
    - {{:helper.link('Abort', 'cancel', {'command' : 'abort'}, processing ? null : 'disabled', processing ? 'redBackground' : null)}} + {{:helper.link('Abort', 'cancel', {'command' : 'abort'}, data.processing ? null : 'disabled', data.processing ? 'redBackground' : null)}}
    \ No newline at end of file diff --git a/nano/templates/simple_docking_console.tmpl b/nano/templates/simple_docking_console.tmpl index feb8cf53e1..89d7684996 100644 --- a/nano/templates/simple_docking_console.tmpl +++ b/nano/templates/simple_docking_console.tmpl @@ -51,9 +51,9 @@ {{else data.docking_status == "docking"}} {{if data.door_state == "open"}} OPEN - {{else data.door_state == "closed" && door_lock == "locked"}} + {{else data.door_state == "closed" && data.door_lock == "locked"}} SECURED - {{else data.door_state == "closed" && door_lock == "unlocked"}} + {{else data.door_state == "closed" && data.door_lock == "unlocked"}} UNSECURED {{else}} ERROR @@ -61,9 +61,9 @@ {{else data.docking_status == "undocking"}} {{if data.door_state == "open"}} OPEN - {{else data.door_state == "closed" && door_lock == "locked"}} + {{else data.door_state == "closed" && data.door_lock == "locked"}} SECURED - {{else data.door_state == "closed" && door_lock == "unlocked"}} + {{else data.door_state == "closed" && data.door_lock == "unlocked"}} UNSECURED {{else}} ERROR @@ -71,9 +71,9 @@ {{else data.docking_status == "undocked"}} {{if data.door_state == "open"}} OPEN - {{else data.door_state == "closed" && door_lock == "locked"}} + {{else data.door_state == "closed" && data.door_lock == "locked"}} SECURED - {{else data.door_state == "closed" && door_lock == "unlocked"}} + {{else data.door_state == "closed" && data.door_lock == "unlocked"}} UNSECURED {{else}} ERROR @@ -88,11 +88,11 @@
    {{if data.docking_status == "docked"}} - {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', null)}} - {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : null)}} {{else}} - {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', override_enabled? 'redBackground' : null)}} - {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : 'yellowBackground')}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', data.override_enabled ? 'redBackground' : null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : 'yellowBackground')}} {{/if}}
    diff --git a/nano/templates/simple_docking_console_pod.tmpl b/nano/templates/simple_docking_console_pod.tmpl index bca867b56e..ca8ed973f5 100644 --- a/nano/templates/simple_docking_console_pod.tmpl +++ b/nano/templates/simple_docking_console_pod.tmpl @@ -51,9 +51,9 @@ {{else data.docking_status == "docking"}} {{if data.door_state == "open"}} OPEN - {{else data.door_state == "closed" && door_lock == "locked"}} + {{else data.door_state == "closed" && data.door_lock == "locked"}} SECURED - {{else data.door_state == "closed" && door_lock == "unlocked"}} + {{else data.door_state == "closed" && data.door_lock == "unlocked"}} UNSECURED {{else}} ERROR @@ -61,9 +61,9 @@ {{else data.docking_status == "undocking"}} {{if data.door_state == "open"}} OPEN - {{else data.door_state == "closed" && door_lock == "locked"}} + {{else data.door_state == "closed" && data.door_lock == "locked"}} SECURED - {{else data.door_state == "closed" && door_lock == "unlocked"}} + {{else data.door_state == "closed" && data.door_lock == "unlocked"}} UNSECURED {{else}} ERROR @@ -71,9 +71,9 @@ {{else data.docking_status == "undocked"}} {{if data.door_state == "open"}} OPEN - {{else data.door_state == "closed" && door_lock == "locked"}} + {{else data.door_state == "closed" && data.door_lock == "locked"}} SECURED - {{else data.door_state == "closed" && door_lock == "unlocked"}} + {{else data.door_state == "closed" && data.door_lock == "unlocked"}} UNSECURED {{else}} ERROR @@ -88,12 +88,12 @@
    {{if data.docking_status == "docked"}} - {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', null)}} - {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : null)}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : null)}} {{:helper.link('MANUAL EJECT', 'alert', {'command' : 'toggle_override'}, 'disabled', null)}} {{else}} - {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, override_enabled ? null : 'disabled', override_enabled? 'redBackground' : null)}} - {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, override_enabled ? 'redBackground' : 'yellowBackground')}} + {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', data.override_enabled ? 'redBackground' : null)}} + {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : 'yellowBackground')}} {{:helper.link('MANUAL EJECT', 'alert', {'command' : 'toggle_override'}, can_force ? null : 'disabled', can_force ? 'redBackground' : null)}} {{/if}}
    diff --git a/nano/templates/smes.tmpl b/nano/templates/smes.tmpl index e2bf4c92f0..04b93b4148 100644 --- a/nano/templates/smes.tmpl +++ b/nano/templates/smes.tmpl @@ -3,9 +3,9 @@ Stored Capacity:
    - {{:helper.displayBar(storedCapacity, 0, 100, charging ? 'good' : 'average')}} + {{:helper.displayBar(data.storedCapacity, 0, 100, data.charging ? 'good' : 'average')}}
    - {{:helper.round(storedCapacity)}}% + {{:helper.round(data.storedCapacity)}}%
    @@ -16,7 +16,7 @@ Charge Mode:
    - {{:helper.link('Auto', 'refresh', {'cmode' : 1}, chargeMode ? 'selected' : null)}}{{:helper.link('Off', 'close', {'cmode' : 1}, chargeMode ? null : 'selected')}} + {{:helper.link('Auto', 'refresh', {'cmode' : 1}, data.chargeMode ? 'selected' : null)}}{{:helper.link('Off', 'close', {'cmode' : 1}, data.chargeMode ? null : 'selected')}}   {{if data.charging}} [Charging] @@ -31,11 +31,11 @@ Input Level:
    - {{:helper.displayBar(chargeLevel, 0, chargeMax)}} + {{:helper.displayBar(data.chargeLevel, 0, data.chargeMax)}}
    - {{:helper.link('MIN', null, {'input' : 'min'}, (chargeLevel > 0) ? null : 'disabled')}} + {{:helper.link('MIN', null, {'input' : 'min'}, (data.chargeLevel > 0) ? null : 'disabled')}} {{:helper.link('SET', null, {'input' : 'set'}, null)}} - {{:helper.link('MAX', null, {'input' : 'max'}, (chargeLevel < chargeMax) ? null : 'disabled')}} + {{:helper.link('MAX', null, {'input' : 'max'}, (data.chargeLevel < data.chargeMax) ? null : 'disabled')}}
     {{:data.chargeLevel}} W 
    @@ -47,7 +47,7 @@ Output Status:
    - {{:helper.link('Online', 'power', {'online' : 1}, outputOnline ? 'selected' : null)}}{{:helper.link('Offline', 'close', {'online' : 1}, outputOnline ? null : 'selected')}} + {{:helper.link('Online', 'power', {'online' : 1}, data.outputOnline ? 'selected' : null)}}{{:helper.link('Offline', 'close', {'online' : 1}, data.outputOnline ? null : 'selected')}}
    @@ -56,11 +56,11 @@ Output Level:
    - {{:helper.displayBar(outputLevel, 0, outputMax)}} + {{:helper.displayBar(data.outputLevel, 0, data.outputMax)}}
    - {{:helper.link('MIN', null, {'output' : 'min'}, (outputLevel > 0) ? null : 'disabled')}} + {{:helper.link('MIN', null, {'output' : 'min'}, (data.outputLevel > 0) ? null : 'disabled')}} {{:helper.link('SET', null, {'output' : 'set'}, null)}} - {{:helper.link('MAX', null, {'output' : 'max'}, (outputLevel < outputMax) ? null : 'disabled')}} + {{:helper.link('MAX', null, {'output' : 'max'}, (data.outputLevel < data.outputMax) ? null : 'disabled')}}
     {{:data.outputLevel}} W 
    @@ -71,7 +71,7 @@ Output Load:
    - {{:helper.displayBar(outputLoad, 0, outputMax, (outputLoad < outputLevel) ? 'good' : 'average')}} + {{:helper.displayBar(data.outputLoad, 0, data.outputMax, (data.outputLoad < data.outputLevel) ? 'good' : 'average')}}
    {{:data.outputLoad}} W
    diff --git a/nano/templates/tanks.tmpl b/nano/templates/tanks.tmpl index ab64597b21..a1929dbe4e 100644 --- a/nano/templates/tanks.tmpl +++ b/nano/templates/tanks.tmpl @@ -9,7 +9,7 @@ Tank Pressure:
    - {{:helper.displayBar(tankPressure, 0, 1013, (tankPressure > 200) ? 'good' : (tankPressure > 100) ? 'average' : 'bad'))}} + {{:helper.displayBar(data.tankPressure, 0, 1013, (data.tankPressure > 200) ? 'good' : (data.tankPressure > 100) ? 'average' : 'bad'))}}
    {{:data.tankPressure}} kPa
    @@ -23,15 +23,15 @@ Mask Release Pressure:
    - {{:helper.displayBar(releasePressure, 0, maxReleasePressure, (releasePressure >= 23) ? null : ((releasePressure >= 17) ? 'average' : 'bad'))}} + {{:helper.displayBar(data.releasePressure, 0, data.maxReleasePressure, (data.releasePressure >= 23) ? null : ((data.releasePressure >= 17) ? 'average' : 'bad'))}}
    - {{:helper.link('-', null, {'dist_p' : -10}, (releasePressure > 0) ? null : 'disabled')}} - {{:helper.link('-', null, {'dist_p' : -1}, (releasePressure > 0) ? null : 'disabled')}} + {{:helper.link('-', null, {'dist_p' : -10}, (data.releasePressure > 0) ? null : 'disabled')}} + {{:helper.link('-', null, {'dist_p' : -1}, (data.releasePressure > 0) ? null : 'disabled')}}
     {{:data.releasePressure}} kPa 
    - {{:helper.link('+', null, {'dist_p' : 1}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} - {{:helper.link('+', null, {'dist_p' : 10}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} - {{:helper.link('Max', null, {'dist_p' : 'max'}, (releasePressure < maxReleasePressure) ? null : 'disabled')}} - {{:helper.link('Reset', null, {'dist_p' : 'reset'}, (releasePressure != defaultReleasePressure) ? null : 'disabled')}} + {{:helper.link('+', null, {'dist_p' : 1}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}} + {{:helper.link('+', null, {'dist_p' : 10}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}} + {{:helper.link('Max', null, {'dist_p' : 'max'}, (data.releasePressure < data.maxReleasePressure) ? null : 'disabled')}} + {{:helper.link('Reset', null, {'dist_p' : 'reset'}, (data.releasePressure != data.defaultReleasePressure) ? null : 'disabled')}}
    @@ -41,7 +41,7 @@ Mask Release Valve:
    - {{:helper.link('Open', 'unlocked', {'stat' : 1}, (!maskConnected) ? 'disabled' : (valveOpen ? 'selected' : null))}}{{:helper.link('Close', 'locked', {'stat' : 1}, valveOpen ? null : 'selected')}} + {{:helper.link('Open', 'unlocked', {'stat' : 1}, (!data.maskConnected) ? 'disabled' : (data.valveOpen ? 'selected' : null))}}{{:helper.link('Close', 'locked', {'stat' : 1}, data.valveOpen ? null : 'selected')}}
    diff --git a/nano/templates/telescience_console.tmpl b/nano/templates/telescience_console.tmpl index 5906a4e38e..4f88267510 100644 --- a/nano/templates/telescience_console.tmpl +++ b/nano/templates/telescience_console.tmpl @@ -5,16 +5,16 @@ Used In File(s): \code\modules\telesci\telesci_computer.dm
    Coordinates:
    - {{:helper.link('X: ' + coordx, 'gear', {'setx': 1})}} - {{:helper.link('Y: ' + coordy, 'gear', {'sety': 1})}} - {{:helper.link('Z: ' + coordz, 'gear', {'setz': 1})}} + {{:helper.link('X: ' + data.coordx, 'gear', {'setx': 1})}} + {{:helper.link('Y: ' + data.coordy, 'gear', {'sety': 1})}} + {{:helper.link('Z: ' + data.coordz, 'gear', {'setz': 1})}}
    Controls:
    - {{:helper.link('Send', 'gear', {'send': 1}, null, (coordx != null && coordy != null && coordz != null) ? '' : 'disabled')}} - {{:helper.link('Receive', 'gear', {'receive': 1}, null, (coordx != null && coordy != null && coordz != null) ? '' : 'disabled')}} + {{:helper.link('Send', 'gear', {'send': 1}, null, (data.coordx != null && data.coordy != null && data.coordz != null) ? '' : 'disabled')}} + {{:helper.link('Receive', 'gear', {'receive': 1}, null, (data.coordx != null && data.coordy != null && data.coordz != null) ? '' : 'disabled')}} {{:helper.link('Recalibrate', 'gear', {'recal': 1})}}
    diff --git a/nano/templates/transfer_valve.tmpl b/nano/templates/transfer_valve.tmpl index 470a097469..f839583999 100644 --- a/nano/templates/transfer_valve.tmpl +++ b/nano/templates/transfer_valve.tmpl @@ -8,7 +8,7 @@ {{else}} None {{/if}} - {{:helper.link('Remove', 'eject', {'tankone' : 1}, attachmentOne ? null : 'disabled')}} + {{:helper.link('Remove', 'eject', {'tankone' : 1}, data.attachmentOne ? null : 'disabled')}} @@ -22,7 +22,7 @@ {{else}} None {{/if}} - {{:helper.link('Remove', 'eject', {'tanktwo' : 1}, attachmentTwo ? null : 'disabled')}} + {{:helper.link('Remove', 'eject', {'tanktwo' : 1}, data.attachmentTwo ? null : 'disabled')}} @@ -36,7 +36,7 @@ {{else}} None {{/if}} - {{:helper.link('Remove', 'eject', {'rem_device' : 1}, valveAttachment ? null : 'disabled')}} + {{:helper.link('Remove', 'eject', {'rem_device' : 1}, data.valveAttachment ? null : 'disabled')}} {{if data.valveAttachment}} {{:helper.link('View', 'wrench', {'device' : 1})}} {{/if}} @@ -50,7 +50,7 @@ Valve Status:
    - {{:helper.link('Open', 'unlocked', {'open' : 1}, (!attachmentOne || !attachmentTwo) ? 'disabled' : (valveOpen ? 'selected' : null))}}{{:helper.link('Close', 'locked', {'open' : 1}, (!attachmentOne || !attachmentTwo) ? 'disabled' : (valveOpen ? null : 'selected'))}} + {{:helper.link('Open', 'unlocked', {'open' : 1}, (!data.attachmentOne || !data.attachmentTwo) ? 'disabled' : (data.valveOpen ? 'selected' : null))}}{{:helper.link('Close', 'locked', {'open' : 1}, (!data.attachmentOne || !data.attachmentTwo) ? 'disabled' : (data.valveOpen ? null : 'selected'))}}
    diff --git a/nano/templates/uplink.tmpl b/nano/templates/uplink.tmpl index d11160772e..dd92bcd0be 100644 --- a/nano/templates/uplink.tmpl +++ b/nano/templates/uplink.tmpl @@ -16,31 +16,30 @@ Used In File(s): \code\game\objects\items\devices\uplinks.dm
    -
    - Tele-Crystals: -
    -
    - {{:data.crystals}} -
    +
    + Tele-Crystals: +
    +
    + {{:data.crystals}} +

    Request items:


    Each item costs a number of tele-crystals as indicated by the number following their name.

    {{for data.nano_items}} -
    -

    {{:data.Category}}

    -
    - {{for data.items}} -
    - {{:helper.link( Name, 'gear', {'buy_item' : obj_path, 'cost' : Cost}, Cost > ~root.crystals ? 'disabled' : null, null)}} - {{:data.Cost}} -
    +
    +

    {{:value.Category}}

    +
    + {{for data.items :itemValue:itemIndex}} +
    + {{:helper.link( itemValue.Name, 'gear', {'buy_item' : itemValue.obj_path, 'cost' : itemValue.Cost}, itemValue.Cost > data.crystals ? 'disabled' : null, null)}} - {{:itemValue.Cost}} +
    {{/for}} -
    - +
    {{/for}}
    - {{:helper.link('Buy Random (??)' , 'gear', {'buy_item' : 'random'}, null, 'fixedLeftWidest')}} + {{:helper.link('Buy Random (??)' , 'gear', {'buy_item' : 'random'}, null, 'fixedLeftWidest')}}
    From 8b7f73bbfb671d12d851728f3d3f3073a838e7a1 Mon Sep 17 00:00:00 2001 From: Mark Aherne Date: Sat, 12 Jul 2014 00:39:57 +0100 Subject: [PATCH 29/88] Remove testing debug messages from nanomanager. --- code/modules/nano/nanomanager.dm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code/modules/nano/nanomanager.dm b/code/modules/nano/nanomanager.dm index a9c004fa5f..f3396ecd3f 100644 --- a/code/modules/nano/nanomanager.dm +++ b/code/modules/nano/nanomanager.dm @@ -54,7 +54,7 @@ ui.push_data(data) return ui else - testing("nanomanager/try_update_ui mob [user.name] [src_object:name] [ui_key] [force_open] - forcing opening of ui") + //testing("nanomanager/try_update_ui mob [user.name] [src_object:name] [ui_key] [force_open] - forcing opening of ui") ui.close() return null @@ -70,17 +70,17 @@ /datum/nanomanager/proc/get_open_ui(var/mob/user, src_object, ui_key) var/src_object_key = "\ref[src_object]" if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list)) - testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - there are no uis open") + //testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - there are no uis open") return null else if (isnull(open_uis[src_object_key][ui_key]) || !istype(open_uis[src_object_key][ui_key], /list)) - testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - there are no uis open for this object") + //testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - there are no uis open for this object") return null for (var/datum/nanoui/ui in open_uis[src_object_key][ui_key]) if (ui.user == user) return ui - testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - ui not found") + //testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - ui not found") return null /** @@ -135,7 +135,7 @@ */ /datum/nanomanager/proc/close_user_uis(var/mob/user, src_object = null, ui_key = null) if (isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0) - testing("nanomanager/close_user_uis mob [user.name] has no open uis") + //testing("nanomanager/close_user_uis mob [user.name] has no open uis") return 0 // has no open uis var/close_count = 0 @@ -144,7 +144,7 @@ ui.close() close_count++ - testing("nanomanager/close_user_uis mob [user.name] closed [open_uis.len] of [close_count] uis") + //testing("nanomanager/close_user_uis mob [user.name] closed [open_uis.len] of [close_count] uis") return close_count @@ -167,7 +167,7 @@ var/list/uis = open_uis[src_object_key][ui.ui_key] uis.Add(ui) processing_uis.Add(ui) - testing("nanomanager/ui_opened mob [ui.user.name] [ui.src_object:name] [ui.ui_key] - user.open_uis [ui.user.open_uis.len] | uis [uis.len] | processing_uis [processing_uis.len]") + //testing("nanomanager/ui_opened mob [ui.user.name] [ui.src_object:name] [ui.ui_key] - user.open_uis [ui.user.open_uis.len] | uis [uis.len] | processing_uis [processing_uis.len]") /** * Remove a /nanoui ui from the list of open uis @@ -189,7 +189,7 @@ var/list/uis = open_uis[src_object_key][ui.ui_key] uis.Remove(ui) - testing("nanomanager/ui_closed mob [ui.user.name] [ui.src_object:name] [ui.ui_key] - user.open_uis [ui.user.open_uis.len] | uis [uis.len] | processing_uis [processing_uis.len]") + //testing("nanomanager/ui_closed mob [ui.user.name] [ui.src_object:name] [ui.ui_key] - user.open_uis [ui.user.open_uis.len] | uis [uis.len] | processing_uis [processing_uis.len]") return 1 @@ -204,7 +204,7 @@ // /datum/nanomanager/proc/user_logout(var/mob/user) - testing("nanomanager/user_logout user [user.name]") + //testing("nanomanager/user_logout user [user.name]") return close_user_uis(user) /** @@ -217,9 +217,9 @@ * @return nothing */ /datum/nanomanager/proc/user_transferred(var/mob/oldMob, var/mob/newMob) - testing("nanomanager/user_transferred from mob [oldMob.name] to mob [newMob.name]") + //testing("nanomanager/user_transferred from mob [oldMob.name] to mob [newMob.name]") if (isnull(oldMob.open_uis) || !istype(oldMob.open_uis, /list) || open_uis.len == 0) - testing("nanomanager/user_transferred mob [oldMob.name] has no open uis") + //testing("nanomanager/user_transferred mob [oldMob.name] has no open uis") return 0 // has no open uis if (isnull(newMob.open_uis) || !istype(newMob.open_uis, /list)) From 6632cf7be032fa939a6dfa9f137b92c74af6bdaf Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 12 Jul 2014 09:23:39 +0930 Subject: [PATCH 30/88] Removes alarm sound from air alarm. --- code/game/machinery/alarm.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index ad70d7ca01..fe868e82b5 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -104,7 +104,7 @@ var/phoron_dangerlevel = 0 var/temperature_dangerlevel = 0 var/other_dangerlevel = 0 - + var/alarm_sound_cooldown = 200 var/last_sound_time = 0 @@ -173,7 +173,6 @@ if(!istype(location)) return//returns if loc is not simulated if ((alarm_area.fire || alarm_area.atmosalm >= 2) && world.time > last_sound_time + alarm_sound_cooldown) - playsound(src.loc, 'sound/machines/airalarm.ogg', 40, 0, 5) last_sound_time = world.time var/datum/gas_mixture/environment = location.return_air() @@ -324,11 +323,11 @@ if((stat & (NOPOWER|BROKEN)) || shorted) icon_state = "alarmp" return - + var/icon_level = danger_level if (alarm_area.atmosalm) icon_level = max(icon_level, 1) //if there's an atmos alarm but everything is okay locally, no need to go past yellow - + switch(icon_level) if (0) icon_state = "alarm0" @@ -728,7 +727,7 @@ Toxins: [phoron_percent]%
    output += "Fire alarm in area" else output += "No alerts" - + return output /obj/machinery/alarm/proc/rcon_text() From 6981ca52f46d720bdfae15f14567d921c3f98492 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 12 Jul 2014 10:35:31 +0930 Subject: [PATCH 31/88] Trying to fix the loadout spawn issue, at least this will make it more informative. --- code/game/jobs/job_controller.dm | 22 ++++++++++++++-------- code/modules/client/preferences_gear.dm | 3 +++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index c8be3a2351..d0600b4cca 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -377,6 +377,8 @@ var/global/datum/controller/occupations/job_master if(G.slot) H.equip_to_slot_or_del(new G.path(H), G.slot) + H << "\blue Equipping you with [thing]!" + else spawn_in_storage += thing @@ -462,15 +464,19 @@ var/global/datum/controller/occupations/job_master H.equip_to_slot_or_del(BPK, slot_back,1) //Deferred item spawning. - var/obj/item/weapon/storage/B = locate(/obj/item/weapon/storage/backpack) in H.contents + if(spawn_in_storage && spawn_in_storage.len) + var/obj/item/weapon/storage/B + for(var/obj/item/weapon/storage/S in H.contents) + B = S + break - if(isnull(B) || istype(B)) - B = locate(/obj/item/weapon/storage/box) in H.contents - - if(!isnull(B)) - for(var/thing in spawn_in_storage) - var/datum/gear/G = gear_datums[thing] - new G.path(B) + if(!isnull(B)) + for(var/thing in spawn_in_storage) + H << "\blue Placing [thing] in your [B]!" + var/datum/gear/G = gear_datums[thing] + new G.path(B) + else + H << "\red Failed to locate a storage object on your mob, either you spawned with no arms and no backpack or this is a bug." //TODO: Generalize this by-species if(H.species) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index e8df54ddfd..aee6547694 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -367,6 +367,7 @@ proc/populate_gear_list() display_name = "engineering bandana" path = /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1 cost = 2 + slot = slot_head allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer") //Science @@ -381,12 +382,14 @@ proc/populate_gear_list() display_name = "Zhan-Khazan furs" path = /obj/item/clothing/suit/tajaran/furs cost = 3 + slot = slot_wear_suit whitelisted = "Tajaran" /datum/gear/zhan_scarf display_name = "Zhan-Khazan headscarf" path = /obj/item/clothing/head/tajaran/scarf cost = 2 + slot = slot_head whitelisted = "Tajaran" /datum/gear/unathi_robe From 835f9e52f653ca93b6a7719d4005914e0c07c88d Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 12 Jul 2014 02:56:32 -0400 Subject: [PATCH 32/88] Fixes webbing and holsters shielding EMP --- code/modules/clothing/clothing.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 805f85f875..034fede96a 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -405,4 +405,8 @@ BLIND // can't see anything sensor_mode = pick(0,1,2,3) ..() +/obj/item/clothing/under/emp_act(severity) + if (hastie) + hastie.emp_act(severity) + ..() From f8d0e02b8385823c798dc9b5f4dfd3050d55780d Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Sat, 12 Jul 2014 00:36:13 -0700 Subject: [PATCH 33/88] Nerf on sound distance. --- code/game/sound.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/sound.dm b/code/game/sound.dm index d3f47aff82..0fe756eca5 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -25,7 +25,7 @@ var/list/page_sound = list('sound/effects/pageturn1.ogg', 'sound/effects/pagetur var/mob/M = P if(!M || !M.client) continue - if(get_dist(M, turf_source) <= (world.view + extrarange) * 6) + if(get_dist(M, turf_source) <= (world.view + extrarange) * 3) var/turf/T = get_turf(M) if(T && T.z == turf_source.z) M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff) @@ -52,7 +52,7 @@ var/const/SURROUND_CAP = 255 if(isturf(turf_source)) // 3D sounds, the technology is here! var/turf/T = get_turf(src) - S.volume -= get_dist(T, turf_source) * 0.5 + S.volume -= get_dist(T, turf_source) * 0.75 if (S.volume < 0) S.volume = 0 var/dx = turf_source.x - T.x // Hearing from the right/left From b22421eb05a1da1d78f44683e673964a5510ed74 Mon Sep 17 00:00:00 2001 From: Mark Aherne Date: Sat, 12 Jul 2014 10:27:15 +0100 Subject: [PATCH 34/88] Correct pregame_timeleft from my debug value 20 to production value 180. --- code/game/gamemodes/gameticker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 6038e8be27..0c8a7aa8bd 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -48,7 +48,7 @@ var/global/datum/controller/gameticker/ticker 'sound/music/clouds.s3m',\ 'sound/music/space_oddity.ogg') //Ground Control to Major Tom, this song is cool, what's going on? do - pregame_timeleft = 20 + pregame_timeleft = 180 world << "Welcome to the pre-game lobby!" world << "Please, setup your character and select ready. Game will start in [pregame_timeleft] seconds" while(current_state == GAME_STATE_PREGAME) From 55c7fbe739a2f1b81202eb38058e6e4b1ccba052 Mon Sep 17 00:00:00 2001 From: SparklySheep Date: Sat, 12 Jul 2014 10:26:54 -0500 Subject: [PATCH 35/88] Changes Space Law book to Corporate Regulations Because fuck anyone that thinks "Space Law" is a good name for a roleplaying server. --- code/game/objects/items/weapons/manuals.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 319486d6a3..73d3001549 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -737,11 +737,11 @@ /obj/item/weapon/book/manual/security_space_law - name = "Space Law" + name = "Corporate Regulations" desc = "A set of NanoTrasen guidelines for keeping law and order on their space stations." icon_state = "bookSpaceLaw" author = "NanoTrasen" - title = "Space Law" + title = "Corporate Regulations" dat = {" From acb5dfbbe352935a05894c9f1fc1ec69632fed82 Mon Sep 17 00:00:00 2001 From: SparklySheep Date: Sat, 12 Jul 2014 11:50:16 -0500 Subject: [PATCH 36/88] Detective Revolver nerf. Uses agony instead of... stun and weaken. Also changed the shotgun's stunshot to be a very powerful agony based shotgun shell. Beanbags are not for combat, stunshots are. --- code/modules/projectiles/projectile/bullets.dm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index cc38efa29e..21076c95fe 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -15,8 +15,7 @@ /obj/item/projectile/bullet/weakbullet // "rubber" bullets damage = 10 - stun = 5 - weaken = 5 + agony = 35 embed = 0 sharp = 0 @@ -28,8 +27,6 @@ /obj/item/projectile/bullet/midbullet damage = 20 - stun = 5 - weaken = 5 /obj/item/projectile/bullet/midbullet2 damage = 25 @@ -56,8 +53,7 @@ /obj/item/projectile/bullet/stunshot name = "stunshot" damage = 5 - stun = 10 - weaken = 10 + agony = 80 stutter = 10 embed = 0 sharp = 0 @@ -67,4 +63,4 @@ /obj/item/projectile/bullet/chameleon damage = 1 // stop trying to murderbone with a fake gun dumbass!!! - embed = 0 // nope \ No newline at end of file + embed = 0 // nope From 83ec2c5d8051e54856313e775ad726b74024b89a Mon Sep 17 00:00:00 2001 From: SparklySheep Date: Sat, 12 Jul 2014 12:06:43 -0500 Subject: [PATCH 37/88] Readjusted agony of weakbullet. --- code/modules/projectiles/projectile/bullets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 21076c95fe..446d762727 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -15,7 +15,7 @@ /obj/item/projectile/bullet/weakbullet // "rubber" bullets damage = 10 - agony = 35 + agony = 40 embed = 0 sharp = 0 From c0487b9c90a4d4c9454e1f75752c16e8889a152d Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 12 Jul 2014 16:15:37 -0400 Subject: [PATCH 38/88] Fixes human internal organs list --- code/ZAS/Phoron.dm | 2 +- code/game/machinery/adv_med.dm | 3 +-- code/game/machinery/flasher.dm | 2 +- code/game/objects/items.dm | 2 +- .../objects/items/weapons/grenades/flashbang.dm | 2 +- code/game/objects/items/weapons/tools.dm | 2 +- code/modules/events/organ_failure.dm | 5 ++--- code/modules/mob/living/carbon/human/human.dm | 7 +++---- .../mob/living/carbon/human/human_damage.dm | 2 +- code/modules/organs/blood.dm | 2 +- code/modules/organs/organ_external.dm | 2 +- code/modules/organs/organ_internal.dm | 4 ++-- code/modules/organs/pain.dm | 3 +-- code/modules/reagents/Chemistry-Reagents.dm | 13 +++++++------ code/modules/surgery/braincore.dm | 3 ++- code/modules/surgery/eye.dm | 10 +++++----- code/modules/surgery/ribcage.dm | 15 ++++++++------- code/modules/virus2/effect.dm | 2 +- 18 files changed, 40 insertions(+), 41 deletions(-) diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index 1e3df5292a..f96e47c188 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -118,7 +118,7 @@ obj/var/contaminated = 0 /mob/living/carbon/human/proc/burn_eyes() //The proc that handles eye burning. if(prob(20)) src << "\red Your eyes burn!" - var/datum/organ/internal/eyes/E = internal_organs["eyes"] + var/datum/organ/internal/eyes/E = internal_organs_by_name["eyes"] E.damage += 2.5 eye_blurry = min(eye_blurry+1.5,50) if (prob(max(0,E.damage - 15) + 1) &&!eye_blind) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index ec5529c80c..dac4bf7b00 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -332,8 +332,7 @@ else dat += "[e.display_name]--Not Found" dat += "" - for(var/organ_name in occupant.internal_organs) - var/datum/organ/internal/i = occupant.internal_organs[organ_name] + for(var/datum/organ/internal/i in occupant.internal_organs) var/mech = "" if(i.robotic == 1) mech = "Assisted:" diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 303e814ef1..eff51fc697 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -81,7 +81,7 @@ O.Weaken(strength) if (istype(O, /mob/living/carbon/human)) var/mob/living/carbon/human/H = O - var/datum/organ/internal/eyes/E = H.internal_organs["eyes"] + var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"] if ((E.damage > E.min_bruised_damage && prob(E.damage + 50))) flick("e_flash", O:flash) E.damage += rand(1, 5) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index b0897829e2..6beb98c40c 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -539,7 +539,7 @@ "\red You stab yourself in the eyes with [src]!" \ ) if(istype(M, /mob/living/carbon/human)) - var/datum/organ/internal/eyes/eyes = H.internal_organs["eyes"] + var/datum/organ/internal/eyes/eyes = H.internal_organs_by_name["eyes"] eyes.damage += rand(3,4) if(eyes.damage >= eyes.min_bruised_damage) if(M.stat != 2) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 2716719fda..dd60f16645 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -83,7 +83,7 @@ //This really should be in mob not every check if(ishuman(M)) var/mob/living/carbon/human/H = M - var/datum/organ/internal/eyes/E = H.internal_organs["eyes"] + var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"] if (E.damage >= E.min_bruised_damage) M << "\red Your eyes start to burn badly!" if(!banglet && !(istype(src , /obj/item/weapon/grenade/flashbang/clusterbang))) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index a05d2eac37..d148b3b758 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -356,7 +356,7 @@ var/safety = user:eyecheck() if(istype(user, /mob/living/carbon/human)) var/mob/living/carbon/human/H = user - var/datum/organ/internal/eyes/E = H.internal_organs["eyes"] + var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"] if(H.species.flags & IS_SYNTHETIC) return switch(safety) diff --git a/code/modules/events/organ_failure.dm b/code/modules/events/organ_failure.dm index 1499afcb45..f51c463328 100644 --- a/code/modules/events/organ_failure.dm +++ b/code/modules/events/organ_failure.dm @@ -13,7 +13,7 @@ datum/event/organ_failure/announce() datum/event/organ_failure/start() var/list/candidates = list() //list of candidate keys for(var/mob/living/carbon/human/G in player_list) - if(G.mind && G.mind.current && G.mind.current.stat != DEAD && G.health > 70) + if(G.mind && G.mind.current && G.mind.current.stat != DEAD && G.health > 70 && G.internal_organs) candidates += G if(!candidates.len) return candidates = shuffle(candidates)//Incorporating Donkie's list shuffle @@ -24,8 +24,7 @@ datum/event/organ_failure/start() var/acute = prob(15) if (prob(75)) //internal organ infection - var/O = pick(C.internal_organs) - var/datum/organ/internal/I = C.internal_organs[O] + var/datum/organ/internal/I = pick(C.internal_organs) if (acute) I.germ_level = max(INFECTION_LEVEL_TWO, I.germ_level) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index dc23eecd03..af74fd2853 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1086,8 +1086,7 @@ H.brainmob.mind.transfer_to(src) del(H) - for(var/E in internal_organs) - var/datum/organ/internal/I = internal_organs[E] + for(var/datum/organ/internal/I in internal_organs) I.damage = 0 for (var/datum/disease/virus in viruses) @@ -1099,11 +1098,11 @@ ..() /mob/living/carbon/human/proc/is_lung_ruptured() - var/datum/organ/internal/lungs/L = internal_organs["lungs"] + var/datum/organ/internal/lungs/L = internal_organs_by_name["lungs"] return L.is_bruised() /mob/living/carbon/human/proc/rupture_lung() - var/datum/organ/internal/lungs/L = internal_organs["lungs"] + var/datum/organ/internal/lungs/L = internal_organs_by_name["lungs"] if(!L.is_bruised()) src.custom_pain("You feel a stabbing pain in your chest!", 1) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 36aec93a02..dbf8379eeb 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -17,7 +17,7 @@ /mob/living/carbon/human/getBrainLoss() var/res = brainloss - var/datum/organ/internal/brain/sponge = internal_organs["brain"] + var/datum/organ/internal/brain/sponge = internal_organs_by_name["brain"] if (sponge.is_bruised()) res += 20 if (sponge.is_broken()) diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index e9f1563c15..1459098db7 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -63,7 +63,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 // Damaged heart virtually reduces the blood volume, as the blood isn't // being pumped properly anymore. - var/datum/organ/internal/heart/heart = internal_organs["heart"] + var/datum/organ/internal/heart/heart = internal_organs_by_name["heart"] if(heart.damage > 1 && heart.damage < heart.min_bruised_damage) blood_volume *= 0.8 diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 5cf4d01302..5f369141f4 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -98,7 +98,7 @@ return // High brute damage or sharp objects may damage internal organs - if(internal_organs != null) if( (sharp && brute >= 5) || brute >= 10) if(prob(5)) + if(internal_organs && ( (sharp && brute >= 5) || brute >= 10) && prob(5)) // Damage an internal organ var/datum/organ/internal/I = pick(internal_organs) I.take_damage(brute / 2) diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm index 3721633dce..69a86d82ce 100644 --- a/code/modules/organs/organ_internal.dm +++ b/code/modules/organs/organ_internal.dm @@ -27,8 +27,8 @@ var/datum/organ/external/E = H.organs_by_name[src.parent_organ] if(E.internal_organs == null) E.internal_organs = list() - E.internal_organs += src - H.internal_organs[src.name] = src + E.internal_organs |= src + H.internal_organs |= src src.owner = H /datum/organ/internal/process() diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index 250e9b984d..49cc2073df 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -102,8 +102,7 @@ mob/living/carbon/human/proc/handle_pain() pain(damaged_organ.display_name, maxdam, 0) // Damage to internal organs hurts a lot. - for(var/organ_name in internal_organs) - var/datum/organ/internal/I = internal_organs[organ_name] + for(var/datum/organ/internal/I in internal_organs) if(I.damage > 2) if(prob(2)) var/datum/organ/external/parent = get_organ(I.parent_organ) src.custom_pain("You feel a sharp pain in your [parent.display_name]", 1) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 2bb33f891a..145e3fd44c 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1312,7 +1312,7 @@ datum M.eye_blind = max(M.eye_blind-5 , 0) if(ishuman(M)) var/mob/living/carbon/human/H = M - var/datum/organ/internal/eyes/E = H.internal_organs["eyes"] + var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"] if(istype(E)) if(E.damage > 0) E.damage -= 1 @@ -1332,8 +1332,9 @@ datum if(!M) M = holder.my_atom if(ishuman(M)) var/mob/living/carbon/human/H = M - var/datum/organ/external/chest/C = H.get_organ("chest") - for(var/datum/organ/internal/I in C.internal_organs) + + //Peridaxon is hard enough to get, it's probably fair to make this all internal organs + for(var/datum/organ/internal/I in H.internal_organs) if(I.damage > 0) I.damage -= 0.20 ..() @@ -3036,7 +3037,7 @@ datum M:drowsyness = max(M:drowsyness, 30) if(ishuman(M)) var/mob/living/carbon/human/H = M - var/datum/organ/internal/liver/L = H.internal_organs["liver"] + var/datum/organ/internal/liver/L = H.internal_organs_by_name["liver"] if (istype(L)) L.take_damage(0.1, 1) H.adjustToxLoss(0.1) @@ -3273,13 +3274,13 @@ datum if(prob(30)) M.adjustToxLoss(2) if(prob(5)) if(ishuman(M)) var/mob/living/carbon/human/H = M - var/datum/organ/internal/heart/L = H.internal_organs["heart"] + var/datum/organ/internal/heart/L = H.internal_organs_by_name["heart"] if (istype(L)) L.take_damage(5, 0) if (300 to INFINITY) if(ishuman(M)) var/mob/living/carbon/human/H = M - var/datum/organ/internal/heart/L = H.internal_organs["heart"] + var/datum/organ/internal/heart/L = H.internal_organs_by_name["heart"] if (istype(L)) L.take_damage(100, 0) holder.remove_reagent(src.id, FOOD_METABOLISM) diff --git a/code/modules/surgery/braincore.dm b/code/modules/surgery/braincore.dm index b89c48275b..85f3913195 100644 --- a/code/modules/surgery/braincore.dm +++ b/code/modules/surgery/braincore.dm @@ -107,6 +107,7 @@ B.transfer_identity(target) target.internal_organs -= B + target.internal_organs_by_name -= "brain" target:brain_op_stage = 4.0 target.death()//You want them to die after the brain was transferred, so not to trigger client death() twice. @@ -173,7 +174,7 @@ end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) user.visible_message("\blue [user] mends hematoma in [target]'s brain with \the [tool].", \ "\blue You mend hematoma in [target]'s brain with \the [tool].") - var/datum/organ/internal/brain/sponge = target.internal_organs["brain"] + var/datum/organ/internal/brain/sponge = target.internal_organs_by_name["brain"] if (sponge) sponge.damage = 0 diff --git a/code/modules/surgery/eye.dm b/code/modules/surgery/eye.dm index 9977271c76..69e238679e 100644 --- a/code/modules/surgery/eye.dm +++ b/code/modules/surgery/eye.dm @@ -39,7 +39,7 @@ target.blinded += 1.5 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/datum/organ/internal/eyes/eyes = target.internal_organs["eyes"] + var/datum/organ/internal/eyes/eyes = target.internal_organs_by_name["eyes"] var/datum/organ/external/affected = target.get_organ(target_zone) user.visible_message("\red [user]'s hand slips, slicing [target]'s eyes wth \the [tool]!" , \ "\red Your hand slips, slicing [target]'s eyes wth \the [tool]!" ) @@ -69,7 +69,7 @@ target.op_stage.eyes = 2 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/datum/organ/internal/eyes/eyes = target.internal_organs["eyes"] + var/datum/organ/internal/eyes/eyes = target.internal_organs_by_name["eyes"] var/datum/organ/external/affected = target.get_organ(target_zone) user.visible_message("\red [user]'s hand slips, damaging [target]'s eyes with \the [tool]!", \ "\red Your hand slips, damaging [target]'s eyes with \the [tool]!") @@ -100,7 +100,7 @@ target.op_stage.eyes = 3 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/datum/organ/internal/eyes/eyes = target.internal_organs["eyes"] + var/datum/organ/internal/eyes/eyes = target.internal_organs_by_name["eyes"] var/datum/organ/external/affected = target.get_organ(target_zone) user.visible_message("\red [user]'s hand slips, stabbing \the [tool] into [target]'s eye!", \ "\red Your hand slips, stabbing \the [tool] into [target]'s eye!") @@ -126,7 +126,7 @@ "You are beginning to cauterize the incision around [target]'s eyes with \the [tool].") end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/datum/organ/internal/eyes/eyes = target.internal_organs["eyes"] + var/datum/organ/internal/eyes/eyes = target.internal_organs_by_name["eyes"] user.visible_message("\blue [user] cauterizes the incision around [target]'s eyes with \the [tool].", \ "\blue You cauterize the incision around [target]'s eyes with \the [tool].") if (target.op_stage.eyes == 3) @@ -136,7 +136,7 @@ target.op_stage.eyes = 0 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/datum/organ/internal/eyes/eyes = target.internal_organs["eyes"] + var/datum/organ/internal/eyes/eyes = target.internal_organs_by_name["eyes"] var/datum/organ/external/affected = target.get_organ(target_zone) user.visible_message("\red [user]'s hand slips, searing [target]'s eyes with \the [tool]!", \ "\red Your hand slips, searing [target]'s eyes with \the [tool]!") diff --git a/code/modules/surgery/ribcage.dm b/code/modules/surgery/ribcage.dm index 1532dda210..ab16f56915 100644 --- a/code/modules/surgery/ribcage.dm +++ b/code/modules/surgery/ribcage.dm @@ -202,9 +202,10 @@ var/is_chest_organ_damaged = 0 var/datum/organ/external/chest/chest = target.get_organ("chest") - for(var/datum/organ/internal/I in chest.internal_organs) if(I.damage > 0) - is_chest_organ_damaged = 1 - break + for(var/datum/organ/internal/I in chest.internal_organs) + if(I.damage > 0) + is_chest_organ_damaged = 1 + break return ..() && is_chest_organ_damaged && target.op_stage.ribcage == 2 begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -285,7 +286,7 @@ return 0 var/is_chest_organ_damaged = 0 - var/datum/organ/internal/heart/heart = target.internal_organs["heart"] + var/datum/organ/internal/heart/heart = target.internal_organs_by_name["heart"] var/datum/organ/external/chest/chest = target.get_organ("chest") for(var/datum/organ/internal/I in chest.internal_organs) if(I.damage > 0) is_chest_organ_damaged = 1 @@ -293,7 +294,7 @@ return ..() && is_chest_organ_damaged && heart.robotic == 2 && target.op_stage.ribcage == 2 begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/datum/organ/internal/heart/heart = target.internal_organs["heart"] + var/datum/organ/internal/heart/heart = target.internal_organs_by_name["heart"] if(heart.damage > 0) user.visible_message("[user] starts mending the mechanisms on [target]'s heart with \the [tool].", \ @@ -302,14 +303,14 @@ ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/datum/organ/internal/heart/heart = target.internal_organs["heart"] + var/datum/organ/internal/heart/heart = target.internal_organs_by_name["heart"] if(heart.damage > 0) user.visible_message("\blue [user] repairs [target]'s heart with \the [tool].", \ "\blue You repair [target]'s heart with \the [tool]." ) heart.damage = 0 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/datum/organ/internal/heart/heart = target.internal_organs["heart"] + var/datum/organ/internal/heart/heart = target.internal_organs_by_name["heart"] user.visible_message("\red [user]'s hand slips, smearing [tool] in the incision in [target]'s heart, gumming it up!!" , \ "\red Your hand slips, smearing [tool] in the incision in [target]'s heart, gumming it up!") heart.take_damage(5, 0) diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm index e5600b7633..41fda7a150 100644 --- a/code/modules/virus2/effect.dm +++ b/code/modules/virus2/effect.dm @@ -202,7 +202,7 @@ activate(var/mob/living/carbon/mob,var/multiplier) if(istype(mob, /mob/living/carbon/human)) var/mob/living/carbon/human/H = mob - var/datum/organ/internal/brain/B = H.internal_organs["brain"] + var/datum/organ/internal/brain/B = H.internal_organs_by_name["brain"] if (B.damage < B.min_broken_damage) B.take_damage(5) else From 1502799afdfaaee4fee6280cf069eec0974eebd8 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 12 Jul 2014 16:18:29 -0400 Subject: [PATCH 39/88] Fixes germ levels going below zero --- code/modules/organs/organ.dm | 2 +- code/modules/organs/organ_external.dm | 4 ++-- code/modules/organs/organ_internal.dm | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index f75f9e055d..a483a43d0f 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -21,7 +21,7 @@ /datum/organ/proc/handle_antibiotics() var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin") - if (antibiotics < 5) + if (!germ_level || antibiotics < 5) return if (germ_level < INFECTION_LEVEL_ONE) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 5f369141f4..b885d7610e 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -355,7 +355,7 @@ INFECTION_LEVEL_THREE above this germ level the player will take additional toxi Note that amputating the affected organ does in fact remove the infection from the player's body. */ /datum/organ/external/proc/update_germs() - + if(status & (ORGAN_ROBOT|ORGAN_DESTROYED) || (owner.species && owner.species.flags & IS_PLANT)) //Robotic limbs shouldn't be infected, nor should nonexistant limbs. germ_level = 0 return @@ -387,7 +387,7 @@ Note that amputating the affected organ does in fact remove the infection from t /datum/organ/external/proc/handle_germ_effects() var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin") - if (germ_level < INFECTION_LEVEL_ONE && prob(60)) //this could be an else clause, but it looks cleaner this way + if (germ_level > 0 && germ_level < INFECTION_LEVEL_ONE && prob(60)) //this could be an else clause, but it looks cleaner this way germ_level-- //since germ_level increases at a rate of 1 per second with dirty wounds, prob(60) should give us about 5 minutes before level one. if(germ_level >= INFECTION_LEVEL_ONE) diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm index 69a86d82ce..4ad6e328af 100644 --- a/code/modules/organs/organ_internal.dm +++ b/code/modules/organs/organ_internal.dm @@ -33,8 +33,6 @@ /datum/organ/internal/process() //Process infections - if (!germ_level) - return if (robotic >= 2 || (owner.species && owner.species.flags & IS_PLANT)) //TODO make robotic internal and external organs separate types of organ instead of a flag germ_level = 0 @@ -47,7 +45,7 @@ //** Handle the effects of infections var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin") - if (germ_level < INFECTION_LEVEL_ONE/2 && prob(30)) + if (germ_level > 0 && germ_level < INFECTION_LEVEL_ONE/2 && prob(30)) germ_level-- if (germ_level >= INFECTION_LEVEL_ONE/2) From aad89409de6eff3b5a8ad49146794b68f7700d26 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Sun, 13 Jul 2014 17:37:30 +0400 Subject: [PATCH 40/88] Slime update --- baystation12.dme | 1 + code/_onclick/item_attack.dm | 2 +- code/game/machinery/doors/windowdoor.dm | 4 +- code/game/objects/items/devices/scanners.dm | 45 +- code/game/objects/structures/grille.dm | 4 +- code/game/objects/structures/inflatable.dm | 4 +- code/game/objects/structures/mirror.dm | 4 +- code/game/objects/structures/window.dm | 4 +- code/modules/admin/topic.dm | 59 +- .../living/carbon/alien/humanoid/humanoid.dm | 2 +- .../mob/living/carbon/alien/larva/larva.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 2 +- .../mob/living/carbon/metroid/death.dm | 31 +- .../mob/living/carbon/metroid/emote.dm | 75 ++- code/modules/mob/living/carbon/metroid/hud.dm | 4 +- .../modules/mob/living/carbon/metroid/life.dm | 531 +++++++++-------- .../mob/living/carbon/metroid/metroid.dm | 550 +++++++++--------- .../mob/living/carbon/metroid/powers.dm | 152 ++--- code/modules/mob/living/carbon/metroid/say.dm | 23 + .../mob/living/carbon/metroid/subtypes.dm | 451 +++----------- .../mob/living/carbon/monkey/monkey.dm | 2 +- code/modules/mob/living/say.dm | 7 + .../modules/mob/living/silicon/robot/robot.dm | 2 +- .../mob/living/simple_animal/simple_animal.dm | 2 +- code/modules/mob/mob_helpers.dm | 5 - code/modules/mob/transform_procs.dm | 5 +- code/modules/projectiles/projectile/change.dm | 3 +- code/modules/reagents/Chemistry-Reagents.dm | 2 +- code/modules/reagents/Chemistry-Recipes.dm | 3 +- code/modules/surgery/braincore.dm | 3 +- maps/tgstation2.dmm | 2 +- 31 files changed, 903 insertions(+), 1083 deletions(-) create mode 100644 code/modules/mob/living/carbon/metroid/say.dm diff --git a/baystation12.dme b/baystation12.dme index afcec78b11..d8cb9e31e8 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -981,6 +981,7 @@ #include "code\modules\mob\living\carbon\metroid\login.dm" #include "code\modules\mob\living\carbon\metroid\metroid.dm" #include "code\modules\mob\living\carbon\metroid\powers.dm" +#include "code\modules\mob\living\carbon\metroid\say.dm" #include "code\modules\mob\living\carbon\metroid\subtypes.dm" #include "code\modules\mob\living\carbon\metroid\update_icons.dm" #include "code\modules\mob\living\carbon\monkey\death.dm" diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 90a68b02b6..22c8a11300 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -63,7 +63,7 @@ slime.Discipline = 0 if(power >= 3) - if(istype(slime, /mob/living/carbon/slime/adult)) + if(slime.is_adult) if(prob(5 + round(power/2))) if(slime.Victim) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 61d26340a5..44d374b85c 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -173,7 +173,7 @@ return src.attack_hand(user) /obj/machinery/door/window/attack_paw(mob/user as mob) - if(istype(user, /mob/living/carbon/alien/humanoid) || istype(user, /mob/living/carbon/slime/adult)) + if(istype(user, /mob/living/carbon/alien/humanoid)) if(src.operating) return playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) @@ -346,4 +346,4 @@ /obj/machinery/door/window/brigdoor/southright dir = SOUTH icon_state = "rightsecure" - base_state = "rightsecure" + base_state = "rightsecure" diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 441dee233a..6bc605a9c9 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -425,4 +425,47 @@ REAGENT SCANNER name = "advanced reagent scanner" icon_state = "adv_spectrometer" details = 1 - origin_tech = "magnets=4;biotech=2" \ No newline at end of file + origin_tech = "magnets=4;biotech=2" + +/obj/item/device/slime_scanner + name = "slime scanner" + icon_state = "adv_spectrometer" + item_state = "analyzer" + origin_tech = "biotech=1" + w_class = 2.0 + flags = CONDUCT + throwforce = 0 + throw_speed = 3 + throw_range = 7 + matter = list("metal" = 30,"glass" = 20) + +/obj/item/device/slime_scanner/attack(mob/living/M as mob, mob/living/user as mob) + if (!isslime(M)) + user << "This device can only scan slimes!" + return + var/mob/living/carbon/slime/T = M + user.show_message("Slime scan results:") + user.show_message(text("[T.colour] [] slime", T.is_adult ? "adult" : "baby")) + user.show_message(text("Nutrition: [T.nutrition]/[]", T.get_max_nutrition())) + if (T.nutrition < T.get_starve_nutrition()) + user.show_message("Warning: slime is starving!") + else if (T.nutrition < T.get_hunger_nutrition()) + user.show_message("Warning: slime is hungry") + user.show_message("Electric change strength: [T.powerlevel]") + user.show_message("Health: [T.health]") + if (T.slime_mutation[4] == T.colour) + user.show_message("This slime does not evolve any further") + else + if (T.slime_mutation[3] == T.slime_mutation[4]) + if (T.slime_mutation[2] == T.slime_mutation[1]) + user.show_message(text("Possible mutation: []", T.slime_mutation[3])) + user.show_message("Genetic destability: [T.mutation_chance/2]% chance of mutation on splitting") + else + user.show_message(text("Possible mutations: [], [], [] (x2)", T.slime_mutation[1], T.slime_mutation[2], T.slime_mutation[3])) + user.show_message("Genetic destability: [T.mutation_chance]% chance of mutation on splitting") + else + user.show_message(text("Possible mutations: [], [], [], []", T.slime_mutation[1], T.slime_mutation[2], T.slime_mutation[3], T.slime_mutation[4])) + user.show_message("Genetic destability: [T.mutation_chance]% chance of mutation on splitting") + if (T.cores > 1) + user.show_message("Anomalious slime core amount detected") + user.show_message("Growth progress: [T.amount_grown]/10") \ No newline at end of file diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index bb50f1d63d..595a7d903b 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -58,7 +58,9 @@ return /obj/structure/grille/attack_slime(mob/user as mob) - if(!istype(user, /mob/living/carbon/slime/adult)) return + var/mob/living/carbon/slime/S = user + if (!S.is_adult) + return playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) user.visible_message("[user] smashes against [src].", \ diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index 3d21a3a2b2..cd9dfd3e8a 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -103,7 +103,9 @@ attack_slime(mob/user as mob) - if(!isslimeadult(user)) return + var/mob/living/carbon/slime/S = user + if (!S.is_adult) + return attack_generic(user, rand(10, 15)) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 0937e72d84..5977121973 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -105,7 +105,9 @@ /obj/structure/mirror/attack_slime(mob/user as mob) - if(!isslimeadult(user)) return + var/mob/living/carbon/slime/S = user + if (!S.is_adult) + return if(shattered) playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1) return diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index bc4d5fd25e..4977da7f4d 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -155,7 +155,9 @@ /obj/structure/window/attack_slime(mob/user as mob) - if(!isslimeadult(user)) return + var/mob/living/carbon/slime/S = user + if (!S.is_adult) + return attack_generic(user, rand(10, 15)) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 5990b64ceb..6b1e1d2b01 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -228,7 +228,7 @@ emergency_shuttle.call_evac() log_admin("[key_name(usr)] called the Emergency Shuttle") message_admins("\blue [key_name_admin(usr)] called the Emergency Shuttle to the station", 1) - + else if (emergency_shuttle.can_recall()) emergency_shuttle.recall() log_admin("[key_name(usr)] sent the Emergency Shuttle back") @@ -247,7 +247,7 @@ log_admin("[key_name(usr)] edited the Emergency Shuttle's launch time to [new_time_left]") message_admins("\blue [key_name_admin(usr)] edited the Emergency Shuttle's launch time to [new_time_left*10]", 1) else if (emergency_shuttle.shuttle.has_arrive_time()) - + var/new_time_left = input("Enter new shuttle arrival time (seconds):","Edit Shuttle Arrival Time", emergency_shuttle.estimate_arrival_time() ) as num emergency_shuttle.shuttle.arrive_time = world.time + new_time_left*10 @@ -255,7 +255,7 @@ message_admins("\blue [key_name_admin(usr)] edited the Emergency Shuttle's arrival time to [new_time_left*10]", 1) else alert("The shuttle is neither counting down to launch nor is it in transit. Please try again when it is.") - + href_list["secretsadmin"] = "check_antagonist" else if(href_list["delay_round_end"]) @@ -291,7 +291,6 @@ if("larva") M.change_mob_type( /mob/living/carbon/alien/larva , null, null, delmob ) if("human") M.change_mob_type( /mob/living/carbon/human , null, null, delmob ) if("slime") M.change_mob_type( /mob/living/carbon/slime , null, null, delmob ) - if("adultslime") M.change_mob_type( /mob/living/carbon/slime/adult , null, null, delmob ) if("monkey") M.change_mob_type( /mob/living/carbon/monkey , null, null, delmob ) if("robot") M.change_mob_type( /mob/living/silicon/robot , null, null, delmob ) if("cat") M.change_mob_type( /mob/living/simple_animal/cat , null, null, delmob ) @@ -1935,20 +1934,20 @@ if("launchshuttle") if(!shuttle_controller) return // Something is very wrong, the shuttle controller has not been created. - + feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","ShL") - + var/list/valid_shuttles = list() for (var/shuttle_tag in shuttle_controller.shuttles) if (istype(shuttle_controller.shuttles[shuttle_tag], /datum/shuttle/ferry)) valid_shuttles += shuttle_tag - + var/shuttle_tag = input("Which shuttle do you want to launch?") as null|anything in valid_shuttles - + if (!shuttle_tag) return - + var/datum/shuttle/ferry/S = shuttle_controller.shuttles[shuttle_tag] if (S.can_launch()) S.launch(usr) @@ -1956,23 +1955,23 @@ log_admin("[key_name(usr)] launched the [shuttle_tag] shuttle") else alert("The [shuttle_tag] shuttle cannot be launched at this time. It's probably busy.") - + if("forcelaunchshuttle") if(!shuttle_controller) return // Something is very wrong, the shuttle controller has not been created. - + feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","ShFL") - + var/list/valid_shuttles = list() for (var/shuttle_tag in shuttle_controller.shuttles) if (istype(shuttle_controller.shuttles[shuttle_tag], /datum/shuttle/ferry)) valid_shuttles += shuttle_tag - + var/shuttle_tag = input("Which shuttle's launch do you want to force?") as null|anything in valid_shuttles - + if (!shuttle_tag) return - + var/datum/shuttle/ferry/S = shuttle_controller.shuttles[shuttle_tag] if (S.can_force()) S.force_launch(usr) @@ -1980,31 +1979,31 @@ log_admin("[key_name(usr)] has forced the [shuttle_tag] shuttle launch") else alert("The [shuttle_tag] shuttle launch cannot be forced at this time. It's busy, or hasn't been launched yet.") - + if("jumpshuttle") if(!shuttle_controller) return // Something is very wrong, the shuttle controller has not been created. - + feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","ShJ") - + var/shuttle_tag = input("Which shuttle do you want to jump?") as null|anything in shuttle_controller.shuttles if (!shuttle_tag) return - + var/datum/shuttle/S = shuttle_controller.shuttles[shuttle_tag] - + var/origin_area = input("Which area is the shuttle at now? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)") as null|area in world if (!origin_area) return - + var/destination_area = input("Which area is the shuttle at now? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)") as null|area in world if (!destination_area) return - + var/long_jump = alert("Is there a transition area for this jump?","", "Yes", "No") if (long_jump == "Yes") var/transition_area = input("Which area is the transition area? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)") as null|area in world if (!transition_area) return - + var/move_duration = input("How many seconds will this jump take?") as num - + S.long_jump(origin_area, destination_area, transition_area, move_duration) message_admins("\blue [key_name_admin(usr)] has initiated a jump from [origin_area] to [destination_area] lasting [move_duration] seconds for the [shuttle_tag] shuttle", 1) log_admin("[key_name_admin(usr)] has initiated a jump from [origin_area] to [destination_area] lasting [move_duration] seconds for the [shuttle_tag] shuttle") @@ -2012,29 +2011,29 @@ S.short_jump(origin_area, destination_area) message_admins("\blue [key_name_admin(usr)] has initiated a jump from [origin_area] to [destination_area] for the [shuttle_tag] shuttle", 1) log_admin("[key_name_admin(usr)] has initiated a jump from [origin_area] to [destination_area] for the [shuttle_tag] shuttle") - + if("moveshuttle") if(!shuttle_controller) return // Something is very wrong, the shuttle controller has not been created. feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","ShM") - + var/confirm = alert("This command directly moves a shuttle from one area to another. DO NOT USE THIS UNLESS YOU ARE DEBUGGING A SHUTTLE AND YOU KNOW WHAT YOU ARE DOING.", "Are you sure?", "Ok", "Cancel") if (confirm == "Cancel") return var/shuttle_tag = input("Which shuttle do you want to jump?") as null|anything in shuttle_controller.shuttles if (!shuttle_tag) return - + var/datum/shuttle/S = shuttle_controller.shuttles[shuttle_tag] - + var/origin_area = input("Which area is the shuttle at now? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)") as null|area in world if (!origin_area) return - + var/destination_area = input("Which area is the shuttle at now? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)") as null|area in world if (!destination_area) return - + S.move(origin_area, destination_area) message_admins("\blue [key_name_admin(usr)] moved the [shuttle_tag] shuttle", 1) log_admin("[key_name(usr)] moved the [shuttle_tag] shuttle") diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index d419a7cf70..03e590f036 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -177,7 +177,7 @@ var/damage = rand(1, 3) - if(istype(M, /mob/living/carbon/slime/adult)) + if(M.is_adult) damage = rand(10, 40) else damage = rand(5, 35) diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 043b60bae2..9f5640c69b 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -198,7 +198,7 @@ var/damage = rand(1, 3) - if(istype(src, /mob/living/carbon/slime/adult)) + if(M.is_adult) damage = rand(20, 40) else damage = rand(5, 35) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 4f6368ad6f..56374bcd0f 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -336,7 +336,7 @@ var/damage = rand(1, 3) - if(istype(M, /mob/living/carbon/slime/adult)) + if(M.is_adult) damage = rand(10, 35) else damage = rand(5, 25) diff --git a/code/modules/mob/living/carbon/metroid/death.dm b/code/modules/mob/living/carbon/metroid/death.dm index e37f3d2368..b8e004e201 100644 --- a/code/modules/mob/living/carbon/metroid/death.dm +++ b/code/modules/mob/living/carbon/metroid/death.dm @@ -1,23 +1,28 @@ /mob/living/carbon/slime/death(gibbed) + if(!gibbed) + if(is_adult) + var/mob/living/carbon/slime/M = new /mob/living/carbon/slime(loc) + M.colour = colour + M.rabid = 1 + is_adult = 0 + maxHealth = 150 + revive() + regenerate_icons() + number = rand(1, 1000) + name = "[colour] [is_adult ? "adult" : "baby"] slime ([number])" + return + if(stat == DEAD) return stat = DEAD icon_state = "[colour] baby slime dead" - - if(!gibbed) - if(istype(src, /mob/living/carbon/slime/adult)) - ghostize() - var/mob/living/carbon/slime/M1 = new primarytype(loc) - M1.rabid = 1 - var/mob/living/carbon/slime/M2 = new primarytype(loc) - M2.rabid = 1 - if(src) del(src) - else - for(var/mob/O in viewers(src, null)) - O.show_message("The [name] seizes up and falls limp...", 1) //ded -- Urist + overlays.len = 0 + for(var/mob/O in viewers(src, null)) + O.show_message("The [name] seizes up and falls limp...", 1) //ded -- Urist update_canmove() if(blind) blind.layer = 0 - ticker.mode.check_win() + if(ticker && ticker.mode) + ticker.mode.check_win() return ..(gibbed) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/metroid/emote.dm b/code/modules/mob/living/carbon/metroid/emote.dm index 2f6f000539..2cbc139f5a 100644 --- a/code/modules/mob/living/carbon/metroid/emote.dm +++ b/code/modules/mob/living/carbon/metroid/emote.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/slime/emote(var/act,var/m_type=1,var/message = null) +/mob/living/carbon/slime/emote(var/act, var/m_type=1, var/message = null) if (findtext(act, "-", 1, null)) @@ -9,7 +9,7 @@ if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_' act = copytext(act,1,length(act)) - switch(act) + switch(act) //Alphabetical please if ("me") if(silent) return @@ -19,40 +19,51 @@ return if (src.client.handle_spam_prevention(message,MUTE_IC)) return - if (stat) - return - if(!(message)) - return - return custom_emote(m_type, message) - - if ("custom") - return custom_emote(m_type, message) - if("moan") - message = "The [src.name] moans." - m_type = 2 - if("shiver") - message = "The [src.name] shivers." - m_type = 2 - if("sway") - message = "The [src.name] sways around dizzily." - m_type = 1 - if("twitch") - message = "The [src.name] twitches." - m_type = 1 - if("vibrate") - message = "The [src.name] vibrates!" - m_type = 1 - if("light") - message = "The [src.name] lights up for a bit, then stops." - m_type = 1 - if("jiggle") - message = "The [src.name] jiggles!" - m_type = 1 + if (stat) + return + if(!(message)) + return + return custom_emote(m_type, message) if("bounce") message = "The [src.name] bounces in place." m_type = 1 + + if ("custom") + return custom_emote(m_type, message) + + if("jiggle") + message = "The [src.name] jiggles!" + m_type = 1 + + if("light") + message = "The [src.name] lights up for a bit, then stops." + m_type = 1 + + if("moan") + message = "The [src.name] moans." + m_type = 2 + + if("shiver") + message = "The [src.name] shivers." + m_type = 2 + + if("sway") + message = "The [src.name] sways around dizzily." + m_type = 1 + + if("twitch") + message = "The [src.name] twitches." + m_type = 1 + + if("vibrate") + message = "The [src.name] vibrates!" + m_type = 1 + + if ("help") //This is an exception + src << "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, custom, jiggle, light, moan, shiver, sway, twitch, vibrate" + else - src << text("Invalid Emote: []", act) + src << "\blue Unusable emote '[act]'. Say *help for a list." if ((message && src.stat == 0)) if (m_type & 1) for(var/mob/O in viewers(src, null)) diff --git a/code/modules/mob/living/carbon/metroid/hud.dm b/code/modules/mob/living/carbon/metroid/hud.dm index c770083906..cfaa7f4f16 100644 --- a/code/modules/mob/living/carbon/metroid/hud.dm +++ b/code/modules/mob/living/carbon/metroid/hud.dm @@ -1,4 +1,2 @@ - /mob/living/carbon/slime/proc/regular_hud_updates() - return - + return \ No newline at end of file diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm index 47e9f6c675..c82d517d59 100644 --- a/code/modules/mob/living/carbon/metroid/life.dm +++ b/code/modules/mob/living/carbon/metroid/life.dm @@ -1,3 +1,10 @@ +/mob/living/carbon/slime + var/AIproc = 0 // determines if the AI loop is activated + var/Atkcool = 0 // attack cooldown + var/Tempstun = 0 // temporary temperature stuns + var/Discipline = 0 // if a slime has been hit with a freeze gun, or wrestled/attacked off a human, they become disciplined and don't attack anymore for a while + var/SStun = 0 // stun variable + /mob/living/carbon/slime/Life() set invisibility = 0 set background = 1 @@ -15,114 +22,80 @@ handle_targets() + if (!ckey) + handle_speech_and_mood() - var/datum/gas_mixture/environment // Added to prevent null location errors-- TLE + var/datum/gas_mixture/environment if(src.loc) environment = loc.return_air() - //Apparently, the person who wrote this code designed it so that //blinded get reset each cycle and then get activated later in the //code. Very ugly. I dont care. Moving this stuff here so its easy //to find it. src.blinded = null - // Basically just deletes any screen objects :< - regular_hud_updates() + regular_hud_updates() // Basically just deletes any screen objects :< - //Handle temperature/pressure differences between body and environment if(environment) - handle_environment(environment) + handle_environment(environment) // Handle temperature/pressure differences between body and environment - //Status updates, death etc. - handle_regular_status_updates() - - - - - -/mob/living/carbon/slime - var/AIproc = 0 // determines if the AI loop is activated - var/Atkcool = 0 // attack cooldown - var/Tempstun = 0 // temporary temperature stuns - var/Discipline = 0 // if a slime has been hit with a freeze gun, or wrestled/attacked off a human, they become disciplined and don't attack anymore for a while - var/SStun = 0 // stun variable + handle_regular_status_updates() // Status updates, death etc. /mob/living/carbon/slime/proc/AIprocess() // the master AI process - //world << "AI proc started." if(AIproc || stat == DEAD || client) return var/hungry = 0 - var/starving = 0 - if(istype(src, /mob/living/carbon/slime/adult)) - switch(nutrition) - if(400 to 1100) hungry = 1 - if(0 to 399) - starving = 1 - else - switch(nutrition) - if(150 to 900) hungry = 1 - if(0 to 149) starving = 1 + if (nutrition < get_starve_nutrition()) + hungry = 2 + else if (nutrition < get_grow_nutrition() && prob(25) || nutrition < get_hunger_nutrition()) + hungry = 1 + AIproc = 1 - //world << "AIproc [AIproc] && stat != 2 [stat] && (attacked > 0 [attacked] || starving [starving] || hungry [hungry] || rabid [rabid] || Victim [Victim] || Target [Target]" - while(AIproc && stat != 2 && (attacked > 0 || starving || hungry || rabid || Victim)) + + while(AIproc && stat != 2 && (attacked || hungry || rabid || Victim)) if(Victim) // can't eat AND have this little process at the same time - //world << "break 1" break if(!Target || client) - //world << "break 2" break - if(Target.health <= -70 || Target.stat == 2) Target = null AIproc = 0 - //world << "break 3" break if(Target) - //world << "[Target] Target Found" for(var/mob/living/carbon/slime/M in view(1,Target)) if(M.Victim == Target) Target = null AIproc = 0 - //world << "break 4" break if(!AIproc) - //world << "break 5" break if(Target in view(1,src)) - if(istype(Target, /mob/living/silicon)) if(!Atkcool) - spawn() - Atkcool = 1 - sleep(15) + Atkcool = 1 + spawn(45) Atkcool = 0 if(Target.Adjacent(src)) Target.attack_slime(src) - //world << "retrun 1" return if(!Target.lying && prob(80)) if(Target.client && Target.health >= 20) if(!Atkcool) - spawn() - Atkcool = 1 - sleep(25) + Atkcool = 1 + spawn(45) Atkcool = 0 if(Target.Adjacent(src)) Target.attack_slime(src) - - if(prob(30)) - step_to(src, Target) - else if(!Atkcool && Target.Adjacent(src)) Feedon(Target) @@ -133,13 +106,13 @@ else if(Target in view(7, src)) - if(Target.Adjacent(src)) + if(!Target.Adjacent(src)) // Bug of the month candidate: slimes were attempting to move to target only if it was directly next to them, which caused them to target things, but not approach them step_to(src, Target) + sleep(5) else Target = null AIproc = 0 - //world << "break 6" break var/sleeptime = movement_delay() @@ -148,7 +121,6 @@ sleep(sleeptime + 2) // this is about as fast as a player slime can go AIproc = 0 - //world << "AI proc ended." /mob/living/carbon/slime/proc/handle_environment(datum/gas_mixture/environment) if(!environment) @@ -166,28 +138,11 @@ else loc_temp = environment.temperature - /* - if((environment.temperature > (T0C + 50)) || (environment.temperature < (T0C + 10))) - var/transfer_coefficient - - transfer_coefficient = 1 - if(wear_mask && (wear_mask.body_parts_covered & HEAD) && (environment.temperature < wear_mask.protective_temperature)) - transfer_coefficient *= wear_mask.heat_transfer_coefficient - - // handle_temperature_damage(HEAD, environment.temperature, environment_heat_capacity*transfer_coefficient) - */ - - if(loc_temp < 310.15) // a cold place bodytemperature += adjust_body_temperature(bodytemperature, loc_temp, 1) else // a hot place bodytemperature += adjust_body_temperature(bodytemperature, loc_temp, 1) - /* - if(stat==2) - bodytemperature += 0.1*(environment.temperature - bodytemperature)*environment_heat_capacity/(environment_heat_capacity + 270000) - - */ //Account for massive pressure differences if(bodytemperature < (T0C + 5)) // start calculating temperature damage etc @@ -207,7 +162,6 @@ return //TODO: DEFERRED - /mob/living/carbon/slime/proc/adjust_body_temperature(current, loc_temp, boost) var/temperature = current var/difference = abs(current-loc_temp) //get difference @@ -229,33 +183,28 @@ if(reagents) reagents.metabolize(src) - src.updatehealth() return //TODO: DEFERRED - /mob/living/carbon/slime/proc/handle_regular_status_updates() - if(istype(src, /mob/living/carbon/slime/adult)) + if(is_adult) health = 200 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss()) else health = 150 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss()) - - - if(health < config.health_threshold_dead && stat != 2) death() return else if(src.health < config.health_threshold_crit) - // if(src.health <= 20 && prob(1)) spawn(0) emote("gasp") - //if(!src.rejuv) src.oxyloss++ - if(!src.reagents.has_reagent("inaprovaline")) src.adjustOxyLoss(10) + if(!src.reagents.has_reagent("inaprovaline")) + src.adjustOxyLoss(10) - if(src.stat != DEAD) src.stat = UNCONSCIOUS + if(src.stat != DEAD) + src.stat = UNCONSCIOUS if(prob(30)) adjustOxyLoss(-1) @@ -264,12 +213,9 @@ adjustCloneLoss(-1) adjustBruteLoss(-1) - if (src.stat == DEAD) - src.lying = 1 src.blinded = 1 - else if (src.paralysis || src.stunned || src.weakened || (status_flags && FAKEDEATH)) //Stunned etc. if (src.stunned > 0) @@ -314,89 +260,25 @@ return 1 - /mob/living/carbon/slime/proc/handle_nutrition() - if(prob(20)) - if(istype(src, /mob/living/carbon/slime/adult)) nutrition-=rand(4,6) - else nutrition-=rand(2,3) + if (prob(15)) + nutrition -= 1 + is_adult if(nutrition <= 0) nutrition = 0 if(prob(75)) - adjustToxLoss(rand(0,5)) - else - if(istype(src, /mob/living/carbon/slime/adult)) - if(nutrition >= 1000) - if(prob(40)) amount_grown++ + else if (nutrition >= get_grow_nutrition() && amount_grown < 10) + nutrition -= 20 + amount_grown++ + if(amount_grown >= 10 && !Victim && !Target && !ckey) + if(is_adult) + Reproduce() else - if(nutrition >= 800) - if(prob(40)) amount_grown++ - - if(amount_grown >= 10 && !Victim && !Target) - if(istype(src, /mob/living/carbon/slime/adult)) - if(!client) - for(var/i=1,i<=4,i++) - if(prob(70)) - var/mob/living/carbon/slime/M = new primarytype(loc) - M.powerlevel = round(powerlevel/4) - M.Friends = Friends - M.tame = tame - M.rabid = rabid - M.Discipline = Discipline - if(i != 1) step_away(M,src) - else - var/mutations = pick("one","two","three","four") - switch(mutations) - if("one") - var/mob/living/carbon/slime/M = new mutationone(loc) - M.powerlevel = round(powerlevel/4) - M.Friends = Friends - M.tame = tame - M.rabid = rabid - M.Discipline = Discipline - if(i != 1) step_away(M,src) - if("two") - var/mob/living/carbon/slime/M = new mutationtwo(loc) - M.powerlevel = round(powerlevel/4) - M.Friends = Friends - M.tame = tame - M.rabid = rabid - M.Discipline = Discipline - if(i != 1) step_away(M,src) - if("three") - var/mob/living/carbon/slime/M = new mutationthree(loc) - M.powerlevel = round(powerlevel/4) - M.Friends = Friends - M.tame = tame - M.rabid = rabid - M.Discipline = Discipline - if(i != 1) step_away(M,src) - if("four") - var/mob/living/carbon/slime/M = new mutationfour(loc) - M.powerlevel = round(powerlevel/4) - M.Friends = Friends - M.tame = tame - M.rabid = rabid - M.Discipline = Discipline - if(i != 1) step_away(M,src) - - del(src) - - else - if(!client) - var/mob/living/carbon/slime/adult/A = new adulttype(src.loc) - A.nutrition = nutrition -// A.nutrition += 100 - A.powerlevel = max(0, powerlevel-1) - A.Friends = Friends - A.tame = tame - A.rabid = rabid - del(src) - + Evolve() /mob/living/carbon/slime/proc/handle_targets() if(Tempstun) @@ -408,8 +290,7 @@ if(attacked > 50) attacked = 50 if(attacked > 0) - if(prob(85)) - attacked-- + attacked-- if(Discipline > 0) @@ -419,136 +300,278 @@ if(prob(10)) Discipline-- - if(!client) - if(!canmove) return - // DO AI STUFF HERE - - if(Target) - if(attacked <= 0) - Target = null - if(Victim) return // if it's eating someone already, continue eating! - - if(prob(1)) - emote(pick("bounce","sway","light","vibrate","jiggle")) + if(Target) + --target_patience + if (target_patience <= 0 || SStun || Discipline || attacked) // Tired of chasing or something draws out attention + target_patience = 0 + Target = null if(AIproc && SStun) return - var/hungry = 0 // determines if the slime is hungry - var/starving = 0 // determines if the slime is starving-hungry - if(istype(src, /mob/living/carbon/slime/adult)) // 1200 max nutrition - switch(nutrition) - if(601 to 900) - if(prob(25)) hungry = 1//Ensures they continue eating, but aren't as aggressive at the same time - if(301 to 600) hungry = 1 - if(0 to 300) - starving = 1 - else - switch(nutrition) // 1000 max nutrition - if(501 to 700) - if(prob(25)) hungry = 1 - if(201 to 500) hungry = 1 - if(0 to 200) starving = 1 + if (nutrition < get_starve_nutrition()) + hungry = 2 + else if (nutrition < get_grow_nutrition() && prob(25) || nutrition < get_hunger_nutrition()) + hungry = 1 - - if(starving && !client) // if a slime is starving, it starts losing its friends + if(hungry == 2 && !client) // if a slime is starving, it starts losing its friends if(Friends.len > 0 && prob(1)) var/mob/nofriend = pick(Friends) - Friends -= nofriend + --Friends[nofriend] if(!Target) - var/list/targets = list() + if(will_hunt() && hungry || attacked || rabid) // Only add to the list if we need to + var/list/targets = list() - if(hungry || starving) //Only add to the list if we need to for(var/mob/living/L in view(7,src)) - //Ignore other slimes, dead mobs and simple_animals - if(isslime(L) || L.stat != CONSCIOUS || isanimal(L)) + if(isslime(L) || L.stat == DEAD) // Ignore other slimes and dead mobs continue - if(issilicon(L)) - if(!istype(src, /mob/living/carbon/slime/adult)) //Non-starving diciplined adult slimes wont eat things - if(!starving && Discipline > 0) + if(L in Friends) // No eating friends! + continue + + if(issilicon(L) && (rabid || attacked)) // They can't eat silicons, but they can glomp them in defence + targets += L // Possible target found! + + if(istype(L, /mob/living/carbon/human) && dna) //Ignore slime(wo)men + var/mob/living/carbon/human/H = L + if(H.dna) + if(H.dna.mutantrace == "slime") continue - if(tame) //Tame slimes ignore electronic life + if(!L.canmove) // Only one slime can latch on at a time. + var/notarget = 0 + for(var/mob/living/carbon/slime/M in view(1,L)) + if(M.Victim == L) + notarget = 1 + if(notarget) continue - targets += L //Possible target found! + targets += L // Possible target found! - else if(iscarbon(L)) - - if(istype(L, /mob/living/carbon/human)) //Ignore slime(wo)men - var/mob/living/carbon/human/H = L - if(H.dna) - if(H.dna.mutantrace == "slime") - continue - - if(!istype(src, /mob/living/carbon/slime/adult)) //Non-starving diciplined adult slimes wont eat things - if(!starving && Discipline > 0) - continue - - if(L in Friends) //No eating friends! - continue - - if(tame && ishuman(L)) //Tame slimes dont eat people. - continue - - if(!L.canmove) //Only one slime can latch on at a time. - - var/notarget = 0 - for(var/mob/living/carbon/slime/M in view(1,L)) - if(M.Victim == L) - notarget = 1 - if(notarget) - continue - - targets += L //Possible target found! - - - - if((hungry || starving) && targets.len > 0) - if(!istype(src, /mob/living/carbon/slime/adult)) - if(!starving) + if(targets.len > 0) + if(attacked || rabid || hungry == 2) + Target = targets[1] // I am attacked and am fighting back or so hungry I don't even care + else for(var/mob/living/carbon/C in targets) if(!Discipline && prob(5)) - if(ishuman(C)) - Target = C - break - if(isalienadult(C)) + if(ishuman(C) || isalienadult(C)) Target = C break - if(islarva(C)) + if(islarva(C) || ismonkey(C)) Target = C break - if(ismonkey(C)) - Target = C - break - else - Target = targets[1] - else - Target = targets[1] // closest target - if(targets.len > 0) - if(attacked > 0 || rabid) - Target = targets[1] //closest mob probably attacked it, so override Target and attack the nearest! + if (Target) + target_patience = rand(5,7) + if (is_adult) + target_patience += 3 + if(!Target) // If we have no target, we are wandering or following orders + if (Leader) + if (holding_still) + holding_still = max(holding_still - 1, 0) + else if(canmove && isturf(loc)) + step_to(src, Leader) - if(!Target) - if(hungry || starving) - if(canmove && isturf(loc) && prob(50)) + else if(hungry) + if (holding_still) + holding_still = max(holding_still - hungry, 0) + else if(canmove && isturf(loc) && prob(50)) step(src, pick(cardinal)) else - if(canmove && isturf(loc) && prob(33)) + if (holding_still) + holding_still = max(holding_still - 1, 0) + else if(canmove && isturf(loc) && prob(33)) step(src, pick(cardinal)) - else - if(!AIproc) - spawn() AIprocess() + else if(!AIproc) + spawn() + AIprocess() + +/mob/living/carbon/slime/proc/handle_speech_and_mood() + //Mood starts here + var/newmood = "" + if (rabid || attacked) newmood = "angry" + else if (Target) newmood = "mischevous" + + if (!newmood) + if (Discipline && prob(25)) + newmood = "pout" + else if (prob(1)) + newmood = pick("sad", ":3", "pout") + + if ((mood == "sad" || mood == ":3" || mood == "pout") && !newmood) + if (prob(75)) newmood = mood + + if (newmood != mood) // This is so we don't redraw them every time + mood = newmood + regenerate_icons() + + //Speech understanding starts here + var/to_say + if (speech_buffer.len > 0) + var/who = speech_buffer[1] // Who said it? + var/phrase = speech_buffer[2] // What did they say? + if ((findtext(phrase, num2text(number)) || findtext(phrase, "slimes"))) // Talking to us + if (findtext(phrase, "hello") || findtext(phrase, "hi")) + to_say = pick("Hello...", "Hi...") + else if (findtext(phrase, "follow")) + if (Leader) + if (Leader == who) // Already following him + to_say = pick("Yes...", "Lead...", "Following...") + else if (Friends[who] > Friends[Leader]) // VIVA + Leader = who + to_say = "Yes... I follow [who]..." + else + to_say = "No... I follow [Leader]..." + else + if (Friends[who] > 2) + Leader = who + to_say = "I follow..." + else // Not friendly enough + to_say = pick("No...", "I won't follow...") + else if (findtext(phrase, "stop")) + if (Victim) // We are asked to stop feeding + if (Friends[who] > 4) + Victim = null + Target = null + if (Friends[who] < 7) + --Friends[who] + to_say = "Grrr..." // I'm angry but I do it + else + to_say = "Fine..." + else if (Target) // We are asked to stop chasing + if (Friends[who] > 3) + Target = null + if (Friends[who] < 6) + --Friends[who] + to_say = "Grrr..." // I'm angry but I do it + else + to_say = "Fine..." + else if (Leader) // We are asked to stop following + if (Leader == who) + to_say = "Yes... I'll stay..." + Leader = null + else + if (Friends[who] > Friends[Leader]) + Leader = null + to_say = "Yes... I'll stop..." + else + to_say = "No... I'll keep following..." + else if (findtext(phrase, "stay")) + if (Leader) + if (Leader == who) + holding_still = Friends[who] * 10 + to_say = "Yes... Staying..." + else if (Friends[who] > Friends[Leader]) + holding_still = (Friends[who] - Friends[Leader]) * 10 + to_say = "Yes... Staying..." + else + to_say = "No... I'll keep following..." + else + if (Friends[who] > 2) + holding_still = Friends[who] * 10 + to_say = "Yes... Staying..." + else + to_say = "No... I won't stay..." + speech_buffer = list() + + //Speech starts here + if (to_say) + say (to_say) + else if(prob(1)) + emote(pick("bounce","sway","light","vibrate","jiggle")) + else + var/t = 10 + var/slimes_near = -1 // Don't count myself + var/dead_slimes = 0 + var/friends_near = list() + for (var/mob/living/carbon/M in view(7,src)) + if (isslime(M)) + ++slimes_near + if (M.stat == DEAD) + ++dead_slimes + if (M in Friends) + t += 20 + friends_near += M + if (nutrition < get_hunger_nutrition()) t += 10 + if (nutrition < get_starve_nutrition()) t += 10 + if (prob(2) && prob(t)) + var/phrases = list() + if (Target) phrases += "[Target]... looks tasty..." + if (nutrition < get_starve_nutrition()) + phrases += "So... hungry..." + phrases += "Very... hungry..." + phrases += "Need... food..." + phrases += "Must... eat..." + else if (nutrition < get_hunger_nutrition()) + phrases += "Hungry..." + phrases += "Where is the food?" + phrases += "I want to eat..." + phrases += "Rawr..." + phrases += "Blop..." + phrases += "Blorble..." + if (rabid || attacked) + phrases += "Hrr..." + phrases += "Nhuu..." + phrases += "Unn..." + if (mood == ":3") + phrases += "Purr..." + if (attacked) + phrases += "Grrr..." + if (getToxLoss() > 30) + phrases += "Cold..." + if (getToxLoss() > 60) + phrases += "So... cold..." + phrases += "Very... cold..." + if (getToxLoss() > 90) + phrases += "..." + phrases += "C... c..." + if (Victim) + phrases += "Nom..." + phrases += "Tasty..." + if (powerlevel > 3) phrases += "Bzzz..." + if (powerlevel > 5) phrases += "Zap..." + if (powerlevel > 8) phrases += "Zap... Bzz..." + if (mood == "sad") phrases += "Bored..." + if (slimes_near) phrases += "Brother..." + if (slimes_near > 1) phrases += "Brothers..." + if (dead_slimes) phrases += "What happened?" + if (!slimes_near) + phrases += "Lonely..." + for (var/M in friends_near) + phrases += "[M]... friend..." + if (nutrition < get_hunger_nutrition()) + phrases += "[M]... feed me..." + say (pick(phrases)) + +/mob/living/carbon/slime/proc/get_max_nutrition() // Can't go above it + if (is_adult) return 1200 + else return 1000 + +/mob/living/carbon/slime/proc/get_grow_nutrition() // Above it we grow, below it we can eat + if (is_adult) return 1000 + else return 800 + +/mob/living/carbon/slime/proc/get_hunger_nutrition() // Below it we will always eat + if (is_adult) return 600 + else return 500 + +/mob/living/carbon/slime/proc/get_starve_nutrition() // Below it we will eat before everything else + if (is_adult) return 300 + else return 200 + +/mob/living/carbon/slime/proc/will_hunt(var/hunger = -1) // Check for being stopped from feeding and chasing + if (hunger == 2 || rabid || attacked) return 1 + if (Leader) return 0 + if (holding_still) return 0 + return 1 diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 0f4d205156..67f0b904ed 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -3,7 +3,8 @@ icon = 'icons/mob/slimes.dmi' icon_state = "grey baby slime" pass_flags = PASSTABLE - speak_emote = list("hums") + var/is_adult = 0 + speak_emote = list("telepathically chirps") layer = 5 @@ -12,7 +13,7 @@ gender = NEUTER update_icon = 0 - nutrition = 700 // 1000 = max + nutrition = 700 see_in_dark = 8 update_slimes = 0 @@ -22,67 +23,58 @@ status_flags = CANPARALYSE|CANPUSH var/cores = 1 // the number of /obj/item/slime_extract's the slime has left inside + var/mutation_chance = 30 // Chance of mutating, should be between 25 and 35 - var/powerlevel = 0 // 1-10 controls how much electricity they are generating - var/amount_grown = 0 // controls how long the slime has been overfed, if 10, grows into an adult - // if adult: if 10: reproduces + var/powerlevel = 0 // 1-10 controls how much electricity they are generating + var/amount_grown = 0 // controls how long the slime has been overfed, if 10, grows or reproduces + var/number = 0 // Used to understand when someone is talking to it var/mob/living/Victim = null // the person the slime is currently feeding on var/mob/living/Target = null // AI variable - tells the slime to hunt this down + var/mob/living/Leader = null // AI variable - tells the slime to follow this person - var/attacked = 0 // determines if it's been attacked recently. Can be any number, is a cooloff-ish variable - var/tame = 0 // if set to 1, the slime will not eat humans ever, or attack them - var/rabid = 0 // if set to 1, the slime will attack and eat anything it comes in contact with + var/attacked = 0 // Determines if it's been attacked recently. Can be any number, is a cooloff-ish variable + var/rabid = 0 // If set to 1, the slime will attack and eat anything it comes in contact with + var/holding_still = 0 // AI variable, cooloff-ish for how long it's going to stay in one place + var/target_patience = 0 // AI variable, cooloff-ish for how long it's going to follow its target - var/list/Friends = list() // A list of potential friends - var/list/FriendsWeight = list() // A list containing values respective to Friends. This determines how many times a slime "likes" something. If the slime likes it more than 2 times, it becomes a friend + var/list/Friends = list() // A list of friends; they are not considered targets for feeding; passed down after splitting - // slimes pass on genetic data, so all their offspring have the same "Friends", + var/list/speech_buffer = list() // Last phrase said near it and person who said it + + var/mood = "" // To show its face ///////////TIME FOR SUBSPECIES var/colour = "grey" - var/primarytype = /mob/living/carbon/slime - var/mutationone = /mob/living/carbon/slime/orange - var/mutationtwo = /mob/living/carbon/slime/metal - var/mutationthree = /mob/living/carbon/slime/blue - var/mutationfour = /mob/living/carbon/slime/purple - var/adulttype = /mob/living/carbon/slime/adult var/coretype = /obj/item/slime_extract/grey - -/mob/living/carbon/slime/adult - name = "adult slime" - icon = 'icons/mob/slimes.dmi' - icon_state = "grey adult slime" - speak_emote = list("telepathically chirps") - - health = 200 - gender = NEUTER - - update_icon = 0 - nutrition = 800 // 1200 = max - + var/list/slime_mutation[4] /mob/living/carbon/slime/New() - var/datum/reagents/R = new/datum/reagents(100) - reagents = R - R.my_atom = src - if(name == "baby slime") - name = text("[colour] baby slime ([rand(1, 1000)])") - else - name = text("[colour] adult slime ([rand(1,1000)])") - real_name = name - spawn (1) - regenerate_icons() - src << "\blue Your icons have been generated!" + create_reagents(100) + spawn (0) + number = rand(1, 1000) + name = "[colour] [is_adult ? "adult" : "baby"] slime ([number])" + icon_state = "[colour] [is_adult ? "adult" : "baby"] slime" + real_name = name + slime_mutation = mutation_table(colour) + mutation_chance = rand(25, 35) + var/sanitizedcolour = replacetext(colour, " ", "") + coretype = text2path("/obj/item/slime_extract/[sanitizedcolour]") ..() -/mob/living/carbon/slime/adult/New() - //verbs.Remove(/mob/living/carbon/slime/verb/ventcrawl) +/mob/living/carbon/slime/regenerate_icons() + icon_state = "[colour] [is_adult ? "adult" : "baby"] slime" + overlays.len = 0 + if (mood) + overlays += image('icons/mob/slimes.dmi', icon_state = "aslime-[mood]") ..() /mob/living/carbon/slime/movement_delay() + if (bodytemperature >= 330.23) // 135 F + return -1 // slimes become supercharged at high temperatures + var/tally = 0 var/health_deficiency = (100 - health) @@ -92,115 +84,93 @@ tally += (283.222 - bodytemperature) / 10 * 1.75 if(reagents) - if(reagents.has_reagent("hyperzine")) // hyperzine slows slimes down - tally *= 2 // moves twice as slow + if(reagents.has_reagent("hyperzine")) // Hyperzine slows slimes down + tally *= 2 - if(reagents.has_reagent("frostoil")) // frostoil also makes them move VEEERRYYYYY slow + if(reagents.has_reagent("frostoil")) // Frostoil also makes them move VEEERRYYYYY slow tally *= 5 if(health <= 0) // if damaged, the slime moves twice as slow tally *= 2 - if (bodytemperature >= 330.23) // 135 F - return -1 // slimes become supercharged at high temperatures - - return tally+config.slime_delay - + return tally + config.slime_delay /mob/living/carbon/slime/Bump(atom/movable/AM as mob|obj, yes) - spawn( 0 ) - if ((!( yes ) || now_pushing)) - return - now_pushing = 1 + if ((!(yes) || now_pushing)) + return + now_pushing = 1 - if(isobj(AM)) - if(!client && powerlevel > 0) - var/probab = 10 - switch(powerlevel) - if(1 to 2) probab = 20 - if(3 to 4) probab = 30 - if(5 to 6) probab = 40 - if(7 to 8) probab = 60 - if(9) probab = 70 - if(10) probab = 95 - if(prob(probab)) + if(isobj(AM)) + if(!client && powerlevel > 0) + var/probab = 10 + switch(powerlevel) + if(1 to 2) probab = 20 + if(3 to 4) probab = 30 + if(5 to 6) probab = 40 + if(7 to 8) probab = 60 + if(9) probab = 70 + if(10) probab = 95 + if(prob(probab)) + if(istype(AM, /obj/structure/window) || istype(AM, /obj/structure/grille)) + if(nutrition <= get_hunger_nutrition() && !Atkcool) + if (is_adult || prob(5)) + AM.attack_slime(src) + spawn() + Atkcool = 1 + sleep(45) + Atkcool = 0 + if(ismob(AM)) + var/mob/tmob = AM - if(istype(AM, /obj/structure/window) || istype(AM, /obj/structure/grille)) - if(istype(src, /mob/living/carbon/slime/adult)) - if(nutrition <= 600 && !Atkcool) - AM.attack_slime(src) - spawn() - Atkcool = 1 - sleep(15) - Atkcool = 0 - else - if(nutrition <= 500 && !Atkcool) - if(prob(5)) - AM.attack_slime(src) - spawn() - Atkcool = 1 - sleep(15) - Atkcool = 0 - - if(ismob(AM)) - var/mob/tmob = AM - - if(istype(src, /mob/living/carbon/slime/adult)) - if(istype(tmob, /mob/living/carbon/human)) - if(prob(90)) - now_pushing = 0 - return - else - if(istype(tmob, /mob/living/carbon/human)) + if(is_adult) + if(istype(tmob, /mob/living/carbon/human)) + if(prob(90)) now_pushing = 0 return + else + if(istype(tmob, /mob/living/carbon/human)) + now_pushing = 0 + return - now_pushing = 0 - ..() - if (!( istype(AM, /atom/movable) )) - return - if (!( now_pushing )) - now_pushing = 1 - if (!( AM.anchored )) - var/t = get_dir(src, AM) - if (istype(AM, /obj/structure/window)) - if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST) - for(var/obj/structure/window/win in get_step(AM,t)) - now_pushing = 0 - return - step(AM, t) - now_pushing = null + now_pushing = 0 + ..() + if (!istype(AM, /atom/movable)) return - return + if (!( now_pushing )) + now_pushing = 1 + if (!( AM.anchored )) + var/t = get_dir(src, AM) + if (istype(AM, /obj/structure/window)) + if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST) + for(var/obj/structure/window/win in get_step(AM,t)) + now_pushing = 0 + return + step(AM, t) + now_pushing = null /mob/living/carbon/slime/Process_Spacemove() return 2 - /mob/living/carbon/slime/Stat() ..() statpanel("Status") - if(istype(src, /mob/living/carbon/slime/adult)) + if(is_adult) stat(null, "Health: [round((health / 200) * 100)]%") else stat(null, "Health: [round((health / 150) * 100)]%") - if (client.statpanel == "Status") - if(istype(src,/mob/living/carbon/slime/adult)) - stat(null, "Nutrition: [nutrition]/1200") - if(amount_grown >= 10) + stat(null, "Nutrition: [nutrition]/[get_max_nutrition()]") + if(amount_grown >= 10) + if(is_adult) stat(null, "You can reproduce!") - else - stat(null, "Nutrition: [nutrition]/1000") - if(amount_grown >= 10) + else stat(null, "You can evolve!") stat(null,"Power Level: [powerlevel]") - /mob/living/carbon/slime/adjustFireLoss(amount) ..(-abs(amount)) // Heals them return @@ -210,25 +180,18 @@ ..(Proj) return 0 - /mob/living/carbon/slime/emp_act(severity) powerlevel = 0 // oh no, the power! ..() /mob/living/carbon/slime/ex_act(severity) - - if (stat == 2 && client) - return - - else if (stat == 2 && !client) - del(src) - return + ..() var/b_loss = null var/f_loss = null switch (severity) if (1.0) - b_loss += 500 + del(src) return if (2.0) @@ -260,7 +223,7 @@ //paralysis += 1 - show_message("\red The blob attacks you!") + show_message(" The blob attacks you!") adjustFireLoss(damage) @@ -271,7 +234,6 @@ /mob/living/carbon/slime/u_equip(obj/item/W as obj) return - /mob/living/carbon/slime/attack_ui(slot) return @@ -286,52 +248,48 @@ updatehealth() return - /mob/living/carbon/slime/attack_slime(mob/living/carbon/slime/M as mob) if (!ticker) M << "You cannot attack people before the game has started." return - if(Victim) return // can't attack while eating! + if (Victim) return // can't attack while eating! if (health > -100) - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message(text("\red The [M.name] has glomped []!", src), 1) - + visible_message(" The [M.name] has glomped [src]!", \ + " The [M.name] has glomped [src]!") var/damage = rand(1, 3) attacked += 5 - if(istype(src, /mob/living/carbon/slime/adult)) + if(M.is_adult) damage = rand(1, 6) else damage = rand(1, 3) adjustBruteLoss(damage) - updatehealth() - return - /mob/living/carbon/slime/attack_animal(mob/living/simple_animal/M as mob) if(M.melee_damage_upper == 0) M.emote("[M.friendly] [src]") else if(M.attack_sound) playsound(loc, M.attack_sound, 50, 1, 1) - for(var/mob/O in viewers(src, null)) - O.show_message("\red [M] [M.attacktext] [src]!", 1) + visible_message("[M] [M.attacktext] [src]!", \ + "[M] [M.attacktext] [src]!") M.attack_log += text("\[[time_stamp()]\] attacked [src.name] ([src.ckey])") src.attack_log += text("\[[time_stamp()]\] was attacked by [M.name] ([M.ckey])") var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) + attacked += 10 adjustBruteLoss(damage) updatehealth() /mob/living/carbon/slime/attack_paw(mob/living/carbon/monkey/M as mob) - if(!(istype(M, /mob/living/carbon/monkey))) return//Fix for aliens receiving double messages when attacking other aliens. + if(!(istype(M, /mob/living/carbon/monkey))) + return // Fix for aliens receiving double messages when attacking other aliens. if (!ticker) M << "You cannot attack people before the game has started." @@ -340,6 +298,7 @@ if (istype(loc, /turf) && istype(loc.loc, /area/start)) M << "No attacking people at spawn, you jackass." return + ..() switch(M.a_intent) @@ -352,9 +311,8 @@ if (health > 0) attacked += 10 //playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message(text("\red [M.name] has attacked [src]!"), 1) + visible_message("[M.name] has attacked [src]!", \ + "[M.name] has attacked [src]!") adjustBruteLoss(rand(1, 3)) updatehealth() return @@ -374,15 +332,11 @@ if(Victim) if(Victim == M) if(prob(60)) - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message("\red [M] attempts to wrestle \the [name] off!", 1) + visible_message("[M] attempts to wrestle \the [name] off!") playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) else - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message("\red [M] manages to wrestle \the [name] off!", 1) + visible_message(" [M] manages to wrestle \the [name] off!") playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(prob(90) && !client) @@ -402,21 +356,17 @@ else if(prob(30)) - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message("\red [M] attempts to wrestle \the [name] off of [Victim]!", 1) + visible_message("[M] attempts to wrestle \the [name] off of [Victim]!") playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) else - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message("\red [M] manages to wrestle \the [name] off of [Victim]!", 1) + visible_message(" [M] manages to wrestle \the [name] off of [Victim]!") playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(prob(80) && !client) Discipline++ - if(!istype(src, /mob/living/carbon/slime/adult)) + if(!is_adult) if(Discipline == 1) attacked = 0 @@ -432,18 +382,13 @@ return - - - if(M.gloves && istype(M.gloves,/obj/item/clothing/gloves)) var/obj/item/clothing/gloves/G = M.gloves if(G.cell) if(M.a_intent == "hurt")//Stungloves. Any contact will stun the alien. if(G.cell.charge >= 2500) G.cell.use(2500) - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message("\red [src] has been touched with the stun gloves by [M]!", 1, "\red You hear someone fall.", 2) + visible_message("[src] has been touched with the stun gloves by [M]!") return else M << "\red Not enough charge! " @@ -455,21 +400,18 @@ help_shake_act(M) if ("grab") - if (M == src) + if (M == src || anchored) return - var/obj/item/weapon/grab/G = new /obj/item/weapon/grab( M, src ) + var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src) M.put_in_active_hand(G) - grabbed_by += G G.synch() LAssailant = M playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has grabbed [] passively!", M, src), 1) + visible_message("[M] has grabbed [src] passively!") else @@ -479,8 +421,9 @@ if (prob(90)) if (HULK in M.mutations) damage += 5 - if(Victim) + if(Victim || Target) Victim = null + Target = null anchored = 0 if(prob(80) && !client) Discipline++ @@ -492,17 +435,14 @@ playsound(loc, "punch", 25, 1, -1) - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has punched []!", M, src), 1) + visible_message("[M] has punched [src]!", \ + "[M] has punched [src]!") adjustBruteLoss(damage) updatehealth() else playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has attempted to punch []!", M, src), 1) + visible_message("[M] has attempted to punch [src]!") return @@ -518,48 +458,41 @@ switch(M.a_intent) if ("help") - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message(text("\blue [M] caresses [src] with its scythe like arm."), 1) + visible_message("[M] caresses [src] with its scythe like arm.") if ("hurt") - if ((prob(95) && health > 0)) + if (prob(95)) attacked += 10 playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) var/damage = rand(15, 30) if (damage >= 25) damage = rand(20, 40) - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has attacked [name]!", M), 1) + visible_message("[M] has attacked [name]!", \ + "[M] has attacked [name]!") else - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has wounded [name]!", M), 1) + visible_message("[M] has wounded [name]!", \ + ")[M] has wounded [name]!") adjustBruteLoss(damage) updatehealth() else playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has attempted to lunge at [name]!", M), 1) + visible_message("[M] has attempted to lunge at [name]!", \ + "[M] has attempted to lunge at [name]!") if ("grab") - if (M == src) + if (M == src || anchored) return - var/obj/item/weapon/grab/G = new /obj/item/weapon/grab( M, M, src ) + var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src ) M.put_in_active_hand(G) - grabbed_by += G G.synch() LAssailant = M playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - for(var/mob/O in viewers(src, null)) - O.show_message(text("\red [] has grabbed [name] passively!", M), 1) + visible_message(" [M] has grabbed [name] passively!") if ("disarm") playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) @@ -567,12 +500,12 @@ attacked += 10 if(prob(95)) - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has tackled [name]!", M), 1) + visible_message("[M] has tackled [name]!", \ + "[M] has tackled [name]!") - if(Victim) + if(Victim || Target) Victim = null + Target = null anchored = 0 if(prob(80) && !client) Discipline++ @@ -593,68 +526,123 @@ else drop_item() - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has disarmed [name]!", M), 1) + visible_message("[M] has disarmed [name]!", + "[M] has disarmed [name]!") adjustBruteLoss(damage) updatehealth() return +/mob/living/carbon/slime/attackby(obj/item/W, mob/user) + if(W.force > 0) + attacked += 10 + if(prob(25)) + user << "[W] passes right through [src]!" + return + if(Discipline && prob(50)) // wow, buddy, why am I getting attacked?? + Discipline = 0 + if(W.force >= 3) + if(is_adult) + if(prob(5 + round(W.force/2))) + if(Victim || Target) + if(prob(80) && !client) + Discipline++ + + Victim = null + Target = null + anchored = 0 + + spawn() + SStun = 1 + sleep(rand(5,20)) + SStun = 0 + + spawn(0) + if(user) + canmove = 0 + step_away(src, user) + if(prob(25 + W.force)) + sleep(2) + if(user) + step_away(src, user) + canmove = 1 + + else + if(prob(10 + W.force*2)) + if(Victim || Target) + if(prob(80) && !client) + Discipline++ + if(Discipline == 1) + attacked = 0 + spawn() + SStun = 1 + sleep(rand(5,20)) + SStun = 0 + + Victim = null + Target = null + anchored = 0 + + spawn(0) + if(user) + canmove = 0 + step_away(src, user) + if(prob(25 + W.force*4)) + sleep(2) + if(user) + step_away(src, user) + canmove = 1 + ..() /mob/living/carbon/slime/restrained() return 0 - mob/living/carbon/slime/var/co2overloadtime = null mob/living/carbon/slime/var/temperature_resistance = T0C+75 - -/mob/living/carbon/slime/show_inv(mob/user as mob) - - user.set_machine(src) - var/dat = {" -
    [name]     -

    -
    Close -
    "} - user << browse(dat, text("window=mob[name];size=340x480")) - onclose(user, "mob[name]") +/mob/living/carbon/slime/show_inv(mob/user) return -/mob/living/carbon/slime/updatehealth() - if(status_flags & GODMODE) - if(istype(src, /mob/living/carbon/slime/adult)) - health = 200 - else - health = 150 - stat = CONSCIOUS - else - // slimes can't suffocate unless they suicide. They are also not harmed by fire - if(istype(src, /mob/living/carbon/slime/adult)) - health = 200 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss()) - else - health = 150 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss()) +/mob/living/carbon/slime/toggle_throw_mode() + return +/mob/living/carbon/slime/proc/apply_water() + adjustToxLoss(rand(15,20)) + if (!client) + if (Target) // Like cats + Target = null + ++Discipline + return /obj/item/slime_extract name = "slime extract" desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"." icon = 'icons/mob/slimes.dmi' icon_state = "grey slime extract" - flags = TABLEPASS force = 1.0 w_class = 1.0 - throwforce = 1.0 + throwforce = 0 throw_speed = 3 throw_range = 6 origin_tech = "biotech=4" var/Uses = 1 // uses before it goes inert + var/enhanced = 0 //has it been enhanced before? + + attackby(obj/item/O as obj, mob/user as mob) + if(istype(O, /obj/item/weapon/slimesteroid2)) + if(enhanced == 1) + user << " This extract has already been enhanced!" + return ..() + if(Uses == 0) + user << " You can't enhance a used extract!" + return ..() + user <<"You apply the enhancer. It now has triple the amount of uses." + Uses = 3 + enhanced = 1 + del(O) /obj/item/slime_extract/New() ..() - var/datum/reagents/R = new/datum/reagents(100) - reagents = R - R.my_atom = src + create_reagents(100) /obj/item/slime_extract/grey name = "grey slime extract" @@ -724,6 +712,26 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 name = "adamantine slime extract" icon_state = "adamantine slime extract" +/obj/item/slime_extract/bluespace + name = "bluespace slime extract" + icon_state = "bluespace slime extract" + +/obj/item/slime_extract/pyrite + name = "pyrite slime extract" + icon_state = "pyrite slime extract" + +/obj/item/slime_extract/cerulean + name = "cerulean slime extract" + icon_state = "cerulean slime extract" + +/obj/item/slime_extract/sepia + name = "sepia slime extract" + icon_state = "sepia slime extract" + +/obj/item/slime_extract/rainbow + name = "rainbow slime extract" + icon_state = "rainbow slime extract" + ////Pet Slime Creation/// /obj/item/weapon/slimepotion @@ -734,28 +742,31 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 attack(mob/living/carbon/slime/M as mob, mob/user as mob) if(!istype(M, /mob/living/carbon/slime))//If target is not a slime. - user << "\red The potion only works on baby slimes!" + user << " The potion only works on baby slimes!" return ..() - if(istype(M, /mob/living/carbon/slime/adult)) //Can't tame adults - user << "\red Only baby slimes can be tamed!" + if(M.is_adult) //Can't tame adults + user << " Only baby slimes can be tamed!" return..() if(M.stat) - user << "\red The slime is dead!" + user << " The slime is dead!" return..() + if(M.mind) + user << " The slime resists!" + return ..() var/mob/living/simple_animal/slime/pet = new /mob/living/simple_animal/slime(M.loc) pet.icon_state = "[M.colour] baby slime" pet.icon_living = "[M.colour] baby slime" pet.icon_dead = "[M.colour] baby slime dead" pet.colour = "[M.colour]" user <<"You feed the slime the potion, removing it's powers and calming it." - del (M) + del(M) var/newname = copytext(sanitize(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text),1,MAX_NAME_LEN) if (!newname) newname = "pet slime" pet.name = newname pet.real_name = newname - del (src) + del(src) /obj/item/weapon/slimepotion2 name = "advanced docility potion" @@ -763,27 +774,30 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 icon = 'icons/obj/chemical.dmi' icon_state = "bottle19" - attack(mob/living/carbon/slime/adult/M as mob, mob/user as mob) - if(!istype(M, /mob/living/carbon/slime/adult))//If target is not a slime. - user << "\red The potion only works on adult slimes!" + attack(mob/living/carbon/slime/M as mob, mob/user as mob) + if(!istype(M, /mob/living/carbon/slime/))//If target is not a slime. + user << " The potion only works on slimes!" return ..() if(M.stat) - user << "\red The slime is dead!" + user << " The slime is dead!" return..() + if(M.mind) + user << " The slime resists!" + return ..() var/mob/living/simple_animal/adultslime/pet = new /mob/living/simple_animal/adultslime(M.loc) pet.icon_state = "[M.colour] adult slime" pet.icon_living = "[M.colour] adult slime" pet.icon_dead = "[M.colour] baby slime dead" pet.colour = "[M.colour]" user <<"You feed the slime the potion, removing it's powers and calming it." - del (M) + del(M) var/newname = copytext(sanitize(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text),1,MAX_NAME_LEN) if (!newname) newname = "pet slime" pet.name = newname pet.real_name = newname - del (src) + del(src) /obj/item/weapon/slimesteroid @@ -794,25 +808,45 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 attack(mob/living/carbon/slime/M as mob, mob/user as mob) if(!istype(M, /mob/living/carbon/slime))//If target is not a slime. - user << "\red The steroid only works on baby slimes!" + user << " The steroid only works on baby slimes!" return ..() - if(istype(M, /mob/living/carbon/slime/adult)) //Can't tame adults - user << "\red Only baby slimes can use the steroid!" + if(M.is_adult) //Can't tame adults + user << " Only baby slimes can use the steroid!" return..() if(M.stat) - user << "\red The slime is dead!" + user << " The slime is dead!" return..() if(M.cores == 3) - user <<"\red The slime already has the maximum amount of extract!" + user <<" The slime already has the maximum amount of extract!" return..() user <<"You feed the slime the steroid. It now has triple the amount of extract." M.cores = 3 - del (src) + del(src) +/obj/item/weapon/slimesteroid2 + name = "extract enhancer" + desc = "A potent chemical mix that will give a slime extract three uses." + icon = 'icons/obj/chemical.dmi' + icon_state = "bottle17" + + /*afterattack(obj/target, mob/user , flag) + if(istype(target, /obj/item/slime_extract)) + if(target.enhanced == 1) + user << " This extract has already been enhanced!" + return ..() + if(target.Uses == 0) + user << " You can't enhance a used extract!" + return ..() + user <<"You apply the enhancer. It now has triple the amount of uses." + target.Uses = 3 + target.enahnced = 1 + del(src)*/ ////////Adamantine Golem stuff I dunno where else to put it +// This will eventually be removed. + /obj/item/clothing/under/golem name = "adamantine skin" desc = "a golem's skin" @@ -949,6 +983,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 var/area/A = get_area(src) if(A) G << "Golem rune created in [A.name]." + //////////////////////////////Old shit from metroids/RoRos, and the old cores, would not take much work to re-add them//////////////////////// /* @@ -958,11 +993,10 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"." icon = 'icons/mob/slimes.dmi' icon_state = "slime extract" - flags = TABLEPASS force = 1.0 w_class = 1.0 throwforce = 1.0 - throw_speed = 3 + throw_speed = 2 throw_range = 6 origin_tech = "biotech=4" var/POWERFLAG = 0 // sshhhhhhh @@ -971,9 +1005,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 /obj/item/slime_core/New() ..() - var/datum/reagents/R = new/datum/reagents(100) - reagents = R - R.my_atom = src + create_reagents(100) POWERFLAG = rand(1,10) Uses = rand(7, 25) //flags |= NOREACT @@ -1017,9 +1049,9 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 /obj/item/weapon/reagent_containers/food/snacks/egg/slime/proc/Hatch() processing_objects.Remove(src) var/turf/T = get_turf(src) - src.visible_message("\blue The [name] pulsates and quivers!") + src.visible_message(" The [name] pulsates and quivers!") spawn(rand(50,100)) - src.visible_message("\blue The [name] bursts open!") + src.visible_message(" The [name] bursts open!") new/mob/living/carbon/slime(T) del(src) @@ -1035,4 +1067,4 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 return else ..() -*/ \ No newline at end of file +*/ diff --git a/code/modules/mob/living/carbon/metroid/powers.dm b/code/modules/mob/living/carbon/metroid/powers.dm index 707fc9cc15..bb7dcbe7bb 100644 --- a/code/modules/mob/living/carbon/metroid/powers.dm +++ b/code/modules/mob/living/carbon/metroid/powers.dm @@ -11,12 +11,12 @@ var/list/choices = list() for(var/mob/living/C in view(1,src)) - if(C!=src && !istype(C,/mob/living/carbon/slime)) + if(C!=src && !istype(C,/mob/living/carbon/slime) && Adjacent(C)) choices += C - var/mob/living/carbon/M = input(src,"Who do you wish to feed on?") in null|choices + var/mob/living/M = input(src,"Who do you wish to feed on?") in null|choices if(!M) return - if(M in view(1, src)) + if(Adjacent(M)) if(!istype(src, /mob/living/carbon/brain)) if(!istype(M, /mob/living/carbon/slime)) @@ -42,76 +42,72 @@ -/mob/living/carbon/slime/proc/Feedon(var/mob/living/carbon/M) +/mob/living/carbon/slime/proc/Feedon(var/mob/living/M) Victim = M src.loc = M.loc canmove = 0 anchored = 1 var/lastnut = nutrition - //if(M.client) M << "\red You legs become paralyzed!" - if(istype(src, /mob/living/carbon/slime/adult)) + var/fed_succesfully = 0 + if(is_adult) icon_state = "[colour] adult slime eat" else icon_state = "[colour] baby slime eat" while(Victim && M.health > -70 && stat != 2) - // M.canmove = 0 canmove = 0 - if(M in view(1, src)) + if(Adjacent(M)) loc = M.loc if(prob(15) && M.client && istype(M, /mob/living/carbon)) - M << "\red [pick("You can feel your body becoming weak!", \ + M << "[pick("You can feel your body becoming weak!", \ "You feel like you're about to die!", \ "You feel every part of your body screaming in agony!", \ "A low, rolling pain passes through your body!", \ "Your body feels as if it's falling apart!", \ "You feel extremely weak!", \ - "A sharp, deep pain bathes every inch of your body!")]" + "A sharp, deep pain bathes every inch of your body!")]" if(istype(M, /mob/living/carbon)) - Victim.adjustCloneLoss(rand(1,10)) + Victim.adjustCloneLoss(rand(5,6)) Victim.adjustToxLoss(rand(1,2)) if(Victim.health <= 0) Victim.adjustToxLoss(rand(2,4)) - // Heal yourself - adjustToxLoss(-10) - adjustOxyLoss(-10) - adjustBruteLoss(-10) - adjustFireLoss(-10) - adjustCloneLoss(-10) + fed_succesfully = 1 - if(Victim) - for(var/mob/living/carbon/slime/slime in view(1,M)) - if(slime.Victim == M && slime != src) - slime.Feedstop() + else if(istype(M, /mob/living/simple_animal)) + Victim.adjustBruteLoss(is_adult ? rand(7, 15) : rand(4, 12)) + fed_succesfully = 1 - nutrition += rand(10,25) + else + if(prob(25)) + src << "[pick("This subject is incompatable", \ + "This subject does not have a life energy", "This subject is empty", \ + "I am not satisified", "I can not feed from this subject", \ + "I do not feel nourished", "This subject is not food")]..." + + if(fed_succesfully) + //I have no idea why this is not in handle_nutrition() + nutrition += rand(15,30) if(nutrition >= lastnut + 50) if(prob(80)) lastnut = nutrition powerlevel++ if(powerlevel > 10) powerlevel = 10 + adjustToxLoss(-10) - if(istype(src, /mob/living/carbon/slime/adult)) - if(nutrition > 1200) - nutrition = 1200 - else - if(nutrition > 1000) - nutrition = 1000 - - Victim.updatehealth() + //Heal yourself. + adjustOxyLoss(-10) + adjustBruteLoss(-10) + adjustFireLoss(-10) + adjustCloneLoss(-10) + updatehealth() - - else - if(prob(25)) - src << "\red [pick("This subject is incompatable", \ - "This subject does not have a life energy", "This subject is empty", \ - "I am not satisified", "I can not feed from this subject", \ - "I do not feel nourished", "This subject is not food")]..." + if(Victim) + Victim.updatehealth() sleep(rand(15,45)) @@ -119,11 +115,11 @@ break if(stat == 2) - if(!istype(src, /mob/living/carbon/slime/adult)) + if(!is_adult) icon_state = "[colour] baby slime dead" else - if(istype(src, /mob/living/carbon/slime/adult)) + if(is_adult) icon_state = "[colour] adult slime" else icon_state = "[colour] baby slime" @@ -139,7 +135,11 @@ if(Victim.LAssailant && Victim.LAssailant != Victim) if(prob(50)) if(!(Victim.LAssailant in Friends)) - Friends.Add(Victim.LAssailant) // no idea why i was using the |= operator + Friends[Victim.LAssailant] = 1 + //Friends.Add(Victim.LAssailant) // no idea why i was using the |= operator + else + ++Friends[Victim.LAssailant] + if(M.client && istype(src, /mob/living/carbon/human)) if(prob(85)) @@ -173,16 +173,13 @@ if(stat) src << "I must be conscious to do this..." return - if(!istype(src, /mob/living/carbon/slime/adult)) + if(!is_adult) if(amount_grown >= 10) - var/mob/living/carbon/slime/adult/new_slime = new adulttype(loc) - new_slime.nutrition = nutrition - new_slime.powerlevel = max(0, powerlevel-1) - new_slime.a_intent = "hurt" - new_slime.key = key - new_slime.universal_speak = universal_speak - new_slime << "You are now an adult slime." - del(src) + is_adult = 1 + maxHealth = 200 + amount_grown = 0 + regenerate_icons() + name = text("[colour] [is_adult ? "adult" : "baby"] slime ([number])") else src << "I am not ready to evolve yet..." else @@ -190,15 +187,14 @@ /mob/living/carbon/slime/verb/Reproduce() set category = "Slime" - set desc = "This will make you split into four Slimes. NOTE: this will KILL you, but you will be transferred into one of the babies." + set desc = "This will make you split into four Slimes." if(stat) src << "I must be conscious to do this..." return - if(istype(src, /mob/living/carbon/slime/adult)) + if(is_adult) if(amount_grown >= 10) - //if(input("Are you absolutely sure you want to reproduce? Your current body will cease to be, but your consciousness will be transferred into a produced slime.") in list("Yes","No")=="Yes") if(stat) src << "I must be conscious to do this..." return @@ -207,54 +203,30 @@ var/new_nutrition = round(nutrition * 0.9) var/new_powerlevel = round(powerlevel / 4) for(var/i=1,i<=4,i++) - if(prob(80)) - var/mob/living/carbon/slime/M = new primarytype(loc) - M.nutrition = new_nutrition - M.powerlevel = new_powerlevel - if(i != 1) step_away(M,src) - babies += M + var/mob/living/carbon/slime/M = new /mob/living/carbon/slime/(loc) + if(prob(mutation_chance)) + M.colour = slime_mutation[rand(1,4)] else - var/mutations = pick("one","two","three","four") - switch(mutations) - if("one") - var/mob/living/carbon/slime/M = new mutationone(loc) - M.nutrition = new_nutrition - M.powerlevel = new_powerlevel - if(i != 1) step_away(M,src) - babies += M - if("two") - var/mob/living/carbon/slime/M = new mutationtwo(loc) - M.nutrition = new_nutrition - M.powerlevel = new_powerlevel - if(i != 1) step_away(M,src) - babies += M - if("three") - var/mob/living/carbon/slime/M = new mutationthree(loc) - M.nutrition = new_nutrition - M.powerlevel = new_powerlevel - if(i != 1) step_away(M,src) - babies += M - if("four") - var/mob/living/carbon/slime/M = new mutationfour(loc) - M.nutrition = new_nutrition - M.powerlevel = new_powerlevel - if(i != 1) step_away(M,src) - babies += M + M.colour = colour + if(ckey) M.nutrition = new_nutrition //Player slimes are more robust at spliting. Once an oversight of poor copypasta, now a feature! + M.powerlevel = new_powerlevel + if(i != 1) step_away(M,src) + M.Friends = Friends.Copy() + babies += M + feedback_add_details("slime_babies_born","slimebirth_[replacetext(M.colour," ","_")]") var/mob/living/carbon/slime/new_slime = pick(babies) - new_slime.a_intent = "hurt" new_slime.universal_speak = universal_speak - new_slime.key = key - - new_slime << "You are now a slime!" + if(src.mind) + src.mind.transfer_to(new_slime) + else + new_slime.key = src.key del(src) else src << "I am not ready to reproduce yet..." else src << "I am not old enough to reproduce yet..." - - /mob/living/carbon/slime/verb/ventcrawl() set name = "Crawl through Vent" set desc = "Enter an air vent and crawl through the pipe system." diff --git a/code/modules/mob/living/carbon/metroid/say.dm b/code/modules/mob/living/carbon/metroid/say.dm new file mode 100644 index 0000000000..89708595da --- /dev/null +++ b/code/modules/mob/living/carbon/metroid/say.dm @@ -0,0 +1,23 @@ +/mob/living/carbon/slime/say(var/message) + var/verb = say_quote(message) + + if(copytext(message,1,2) == "*") + return emote(copytext(message,2)) + + return ..(message, null, verb) + +/mob/living/carbon/slime/say_quote(var/text) + var/ending = copytext(text, length(text)) + + if (ending == "?") + return "telepathically asks"; + else if (ending == "!") + return "telepathically cries"; + + return "telepathically chirps"; + +/mob/living/carbon/slime/say_understands(var/other) + if (istype(other, /mob/living/carbon/slime)) + return 1 + return ..() + diff --git a/code/modules/mob/living/carbon/metroid/subtypes.dm b/code/modules/mob/living/carbon/metroid/subtypes.dm index 4eb4087f6e..3b7e0107ab 100644 --- a/code/modules/mob/living/carbon/metroid/subtypes.dm +++ b/code/modules/mob/living/carbon/metroid/subtypes.dm @@ -1,372 +1,79 @@ - -////////////////Tier 2 - -/mob/living/carbon/slime/purple - colour = "purple" - icon_state = "purple baby slime" - primarytype = /mob/living/carbon/slime/purple - mutationone = /mob/living/carbon/slime/darkpurple - mutationtwo = /mob/living/carbon/slime/darkblue - mutationthree = /mob/living/carbon/slime/green - mutationfour = /mob/living/carbon/slime/green - adulttype = /mob/living/carbon/slime/adult/purple - coretype = /obj/item/slime_extract/purple - -/mob/living/carbon/slime/adult/purple - icon_state = "purple adult slime" - colour = "purple" - primarytype = /mob/living/carbon/slime/purple - mutationone = /mob/living/carbon/slime/darkpurple - mutationtwo = /mob/living/carbon/slime/darkblue - mutationthree = /mob/living/carbon/slime/green - mutationfour = /mob/living/carbon/slime/green - adulttype = /mob/living/carbon/slime/adult/purple - coretype = /obj/item/slime_extract/purple - -/mob/living/carbon/slime/metal - colour = "metal" - icon_state = "metal baby slime" - primarytype = /mob/living/carbon/slime/metal - mutationone = /mob/living/carbon/slime/silver - mutationtwo = /mob/living/carbon/slime/yellow - mutationthree = /mob/living/carbon/slime/gold - mutationfour = /mob/living/carbon/slime/gold - adulttype = /mob/living/carbon/slime/adult/metal - coretype = /obj/item/slime_extract/metal - -/mob/living/carbon/slime/adult/metal - icon_state = "metal adult slime" - colour = "metal" - primarytype = /mob/living/carbon/slime/metal - mutationone = /mob/living/carbon/slime/silver - mutationtwo = /mob/living/carbon/slime/yellow - mutationthree = /mob/living/carbon/slime/gold - mutationfour = /mob/living/carbon/slime/gold - adulttype = /mob/living/carbon/slime/adult/metal - coretype = /obj/item/slime_extract/metal - -/mob/living/carbon/slime/orange - colour = "orange" - icon_state = "orange baby slime" - primarytype = /mob/living/carbon/slime/orange - mutationone = /mob/living/carbon/slime/red - mutationtwo = /mob/living/carbon/slime/red - mutationthree = /mob/living/carbon/slime/darkpurple - mutationfour = /mob/living/carbon/slime/yellow - adulttype = /mob/living/carbon/slime/adult/orange - coretype = /obj/item/slime_extract/orange - -/mob/living/carbon/slime/adult/orange - colour = "orange" - icon_state = "orange adult slime" - primarytype = /mob/living/carbon/slime/orange - mutationone = /mob/living/carbon/slime/red - mutationtwo = /mob/living/carbon/slime/red - mutationthree = /mob/living/carbon/slime/darkpurple - mutationfour = /mob/living/carbon/slime/yellow - adulttype = /mob/living/carbon/slime/adult/orange - coretype = /obj/item/slime_extract/orange - -/mob/living/carbon/slime/blue - colour = "blue" - icon_state = "blue baby slime" - primarytype = /mob/living/carbon/slime/blue - mutationone = /mob/living/carbon/slime/darkblue - mutationtwo = /mob/living/carbon/slime/pink - mutationthree = /mob/living/carbon/slime/pink - mutationfour = /mob/living/carbon/slime/silver - adulttype = /mob/living/carbon/slime/adult/blue - coretype = /obj/item/slime_extract/blue - -/mob/living/carbon/slime/adult/blue - icon_state = "blue adult slime" - colour = "blue" - primarytype = /mob/living/carbon/slime/blue - mutationone = /mob/living/carbon/slime/darkblue - mutationtwo = /mob/living/carbon/slime/pink - mutationthree = /mob/living/carbon/slime/silver - mutationfour = /mob/living/carbon/slime/pink - adulttype = /mob/living/carbon/slime/adult/blue - coretype = /obj/item/slime_extract/blue - - - - -//Tier 3 - -/mob/living/carbon/slime/darkblue - colour = "dark blue" - icon_state = "dark blue baby slime" - primarytype = /mob/living/carbon/slime/darkblue - mutationone = /mob/living/carbon/slime/purple - mutationtwo = /mob/living/carbon/slime/purple - mutationthree = /mob/living/carbon/slime/blue - mutationfour = /mob/living/carbon/slime/blue - adulttype = /mob/living/carbon/slime/adult/darkblue - coretype = /obj/item/slime_extract/darkblue - -/mob/living/carbon/slime/adult/darkblue - icon_state = "dark blue adult slime" - colour = "dark blue" - primarytype = /mob/living/carbon/slime/darkblue - mutationone = /mob/living/carbon/slime/purple - mutationtwo = /mob/living/carbon/slime/purple - mutationthree = /mob/living/carbon/slime/blue - mutationfour = /mob/living/carbon/slime/blue - adulttype = /mob/living/carbon/slime/adult/darkblue - coretype = /obj/item/slime_extract/darkblue - -/mob/living/carbon/slime/darkpurple - colour = "dark purple" - icon_state = "dark purple baby slime" - primarytype = /mob/living/carbon/slime/darkpurple - mutationone = /mob/living/carbon/slime/purple - mutationtwo = /mob/living/carbon/slime/purple - mutationthree = /mob/living/carbon/slime/orange - mutationfour = /mob/living/carbon/slime/orange - adulttype = /mob/living/carbon/slime/adult/darkpurple - coretype = /obj/item/slime_extract/darkpurple - -/mob/living/carbon/slime/adult/darkpurple - icon_state = "dark purple adult slime" - colour = "dark purple" - primarytype = /mob/living/carbon/slime/darkpurple - mutationone = /mob/living/carbon/slime/purple - mutationtwo = /mob/living/carbon/slime/purple - mutationthree = /mob/living/carbon/slime/orange - mutationfour = /mob/living/carbon/slime/orange - adulttype = /mob/living/carbon/slime/adult/darkpurple - coretype = /obj/item/slime_extract/darkpurple - - -/mob/living/carbon/slime/yellow - icon_state = "yellow baby slime" - colour = "yellow" - primarytype = /mob/living/carbon/slime/yellow - mutationone = /mob/living/carbon/slime/metal - mutationtwo = /mob/living/carbon/slime/metal - mutationthree = /mob/living/carbon/slime/orange - mutationfour = /mob/living/carbon/slime/orange - adulttype = /mob/living/carbon/slime/adult/yellow - coretype = /obj/item/slime_extract/yellow - -/mob/living/carbon/slime/adult/yellow - icon_state = "yellow adult slime" - colour = "yellow" - primarytype = /mob/living/carbon/slime/yellow - mutationone = /mob/living/carbon/slime/metal - mutationtwo = /mob/living/carbon/slime/metal - mutationthree = /mob/living/carbon/slime/orange - mutationfour = /mob/living/carbon/slime/orange - adulttype = /mob/living/carbon/slime/adult/yellow - coretype = /obj/item/slime_extract/yellow - - -/mob/living/carbon/slime/silver - colour = "silver" - icon_state = "silver baby slime" - primarytype = /mob/living/carbon/slime/silver - mutationone = /mob/living/carbon/slime/metal - mutationtwo = /mob/living/carbon/slime/metal - mutationthree = /mob/living/carbon/slime/blue - mutationfour = /mob/living/carbon/slime/blue - adulttype = /mob/living/carbon/slime/adult/silver - coretype = /obj/item/slime_extract/silver - -/mob/living/carbon/slime/adult/silver - icon_state = "silver adult slime" - colour = "silver" - primarytype = /mob/living/carbon/slime/silver - mutationone = /mob/living/carbon/slime/metal - mutationtwo = /mob/living/carbon/slime/metal - mutationthree = /mob/living/carbon/slime/blue - mutationfour = /mob/living/carbon/slime/blue - adulttype = /mob/living/carbon/slime/adult/silver - coretype = /obj/item/slime_extract/silver - - - -/////////////Tier 4 - - -/mob/living/carbon/slime/pink - colour = "pink" - icon_state = "pink baby slime" - primarytype = /mob/living/carbon/slime/pink - mutationone = /mob/living/carbon/slime/pink - mutationtwo = /mob/living/carbon/slime/pink - mutationthree = /mob/living/carbon/slime/lightpink - mutationfour = /mob/living/carbon/slime/lightpink - adulttype = /mob/living/carbon/slime/adult/pink - coretype = /obj/item/slime_extract/pink - -/mob/living/carbon/slime/adult/pink - icon_state = "pink adult slime" - colour = "pink" - primarytype = /mob/living/carbon/slime/pink - mutationone = /mob/living/carbon/slime/pink - mutationtwo = /mob/living/carbon/slime/pink - mutationthree = /mob/living/carbon/slime/lightpink - mutationfour = /mob/living/carbon/slime/lightpink - adulttype = /mob/living/carbon/slime/adult/pink - coretype = /obj/item/slime_extract/pink - -/mob/living/carbon/slime/red - colour = "red" - icon_state = "red baby slime" - primarytype = /mob/living/carbon/slime/red - mutationone = /mob/living/carbon/slime/red - mutationtwo = /mob/living/carbon/slime/red - mutationthree = /mob/living/carbon/slime/oil - mutationfour = /mob/living/carbon/slime/oil - adulttype = /mob/living/carbon/slime/adult/red - coretype = /obj/item/slime_extract/red - -/mob/living/carbon/slime/adult/red - icon_state = "red adult slime" - colour = "red" - primarytype = /mob/living/carbon/slime/red - mutationone = /mob/living/carbon/slime/red - mutationtwo = /mob/living/carbon/slime/red - mutationthree = /mob/living/carbon/slime/oil - mutationfour = /mob/living/carbon/slime/oil - adulttype = /mob/living/carbon/slime/adult/red - coretype = /obj/item/slime_extract/red - -/mob/living/carbon/slime/gold - colour = "gold" - icon_state = "gold baby slime" - primarytype = /mob/living/carbon/slime/gold - mutationone = /mob/living/carbon/slime/gold - mutationtwo = /mob/living/carbon/slime/gold - mutationthree = /mob/living/carbon/slime/adamantine - mutationfour = /mob/living/carbon/slime/adamantine - adulttype = /mob/living/carbon/slime/adult/gold - coretype = /obj/item/slime_extract/gold - -/mob/living/carbon/slime/adult/gold - icon_state = "gold adult slime" - colour = "gold" - primarytype = /mob/living/carbon/slime/gold - mutationone = /mob/living/carbon/slime/gold - mutationtwo = /mob/living/carbon/slime/gold - mutationthree = /mob/living/carbon/slime/adamantine - mutationfour = /mob/living/carbon/slime/adamantine - adulttype = /mob/living/carbon/slime/adult/gold - coretype = /obj/item/slime_extract/gold - -/mob/living/carbon/slime/green - colour = "green" - icon_state = "green baby slime" - primarytype = /mob/living/carbon/slime/green - mutationone = /mob/living/carbon/slime/green - mutationtwo = /mob/living/carbon/slime/green - mutationthree = /mob/living/carbon/slime/black - mutationfour = /mob/living/carbon/slime/black - adulttype = /mob/living/carbon/slime/adult/green - coretype = /obj/item/slime_extract/green - -/mob/living/carbon/slime/adult/green - icon_state = "green adult slime" - colour = "green" - primarytype = /mob/living/carbon/slime/green - mutationone = /mob/living/carbon/slime/green - mutationtwo = /mob/living/carbon/slime/green - mutationthree = /mob/living/carbon/slime/black - mutationfour = /mob/living/carbon/slime/black - adulttype = /mob/living/carbon/slime/adult/green - coretype = /obj/item/slime_extract/green - - - -// Tier 5 - -/mob/living/carbon/slime/lightpink - colour = "light pink" - icon_state = "light pink baby slime" - primarytype = /mob/living/carbon/slime/lightpink - mutationone = /mob/living/carbon/slime/lightpink - mutationtwo = /mob/living/carbon/slime/lightpink - mutationthree = /mob/living/carbon/slime/lightpink - mutationfour = /mob/living/carbon/slime/lightpink - adulttype = /mob/living/carbon/slime/adult/lightpink - coretype = /obj/item/slime_extract/lightpink - -/mob/living/carbon/slime/adult/lightpink - icon_state = "light pink adult slime" - colour = "light pink" - primarytype = /mob/living/carbon/slime/lightpink - mutationone = /mob/living/carbon/slime/lightpink - mutationtwo = /mob/living/carbon/slime/lightpink - mutationthree = /mob/living/carbon/slime/lightpink - mutationfour = /mob/living/carbon/slime/lightpink - adulttype = /mob/living/carbon/slime/adult/lightpink - coretype = /obj/item/slime_extract/lightpink - - -/mob/living/carbon/slime/oil - icon_state = "oil baby slime" - colour = "oil" - primarytype = /mob/living/carbon/slime/oil - mutationone = /mob/living/carbon/slime/oil - mutationtwo = /mob/living/carbon/slime/oil - mutationthree = /mob/living/carbon/slime/oil - mutationfour = /mob/living/carbon/slime/oil - adulttype = /mob/living/carbon/slime/adult/oil - coretype = /obj/item/slime_extract/oil - -/mob/living/carbon/slime/adult/oil - icon_state = "oil adult slime" - colour = "oil" - primarytype = /mob/living/carbon/slime/oil - mutationone = /mob/living/carbon/slime/oil - mutationtwo = /mob/living/carbon/slime/oil - mutationthree = /mob/living/carbon/slime/oil - mutationfour = /mob/living/carbon/slime/oil - adulttype = /mob/living/carbon/slime/adult/oil - coretype = /obj/item/slime_extract/oil - - -/mob/living/carbon/slime/black - icon_state = "black baby slime" - colour = "black" - primarytype = /mob/living/carbon/slime/black - mutationone = /mob/living/carbon/slime/black - mutationtwo = /mob/living/carbon/slime/black - mutationthree = /mob/living/carbon/slime/black - mutationfour = /mob/living/carbon/slime/black - adulttype = /mob/living/carbon/slime/adult/black - coretype = /obj/item/slime_extract/black - -/mob/living/carbon/slime/adult/black - icon_state = "black adult slime" - colour = "black" - primarytype = /mob/living/carbon/slime/black - mutationone = /mob/living/carbon/slime/black - mutationtwo = /mob/living/carbon/slime/black - mutationthree = /mob/living/carbon/slime/black - mutationfour = /mob/living/carbon/slime/black - adulttype = /mob/living/carbon/slime/adult/black - coretype = /obj/item/slime_extract/black - -/mob/living/carbon/slime/adamantine - icon_state = "adamantine baby slime" - colour = "adamantine" - primarytype = /mob/living/carbon/slime/adamantine - mutationone = /mob/living/carbon/slime/adamantine - mutationtwo = /mob/living/carbon/slime/adamantine - mutationthree = /mob/living/carbon/slime/adamantine - mutationfour = /mob/living/carbon/slime/adamantine - adulttype = /mob/living/carbon/slime/adult/adamantine - coretype = /obj/item/slime_extract/adamantine - -/mob/living/carbon/slime/adult/adamantine - icon_state = "adamantine adult slime" - colour = "adamantine" - primarytype = /mob/living/carbon/slime/adamantine - mutationone = /mob/living/carbon/slime/adamantine - mutationtwo = /mob/living/carbon/slime/adamantine - mutationthree = /mob/living/carbon/slime/adamantine - mutationfour = /mob/living/carbon/slime/adamantine - adulttype = /mob/living/carbon/slime/adult/adamantine - coretype = /obj/item/slime_extract/adamantine \ No newline at end of file +proc/mutation_table(var/colour) + var/list/slime_mutation[4] + switch(colour) + //Tier 1 + if("grey") + slime_mutation[1] = "orange" + slime_mutation[2] = "metal" + slime_mutation[3] = "blue" + slime_mutation[4] = "purple" + //Tier 2 + if("purple") + slime_mutation[1] = "dark purple" + slime_mutation[2] = "dark blue" + slime_mutation[3] = "green" + slime_mutation[4] = "green" + if("metal") + slime_mutation[1] = "silver" + slime_mutation[2] = "yellow" + slime_mutation[3] = "gold" + slime_mutation[4] = "gold" + if("orange") + slime_mutation[1] = "dark purple" + slime_mutation[2] = "yellow" + slime_mutation[3] = "red" + slime_mutation[4] = "red" + if("blue") + slime_mutation[1] = "dark blue" + slime_mutation[2] = "silver" + slime_mutation[3] = "pink" + slime_mutation[4] = "pink" + //Tier 3 + if("dark blue") + slime_mutation[1] = "purple" + slime_mutation[2] = "blue" + slime_mutation[3] = "cerulean" + slime_mutation[4] = "cerulean" + if("dark purple") + slime_mutation[1] = "purple" + slime_mutation[2] = "orange" + slime_mutation[3] = "sepia" + slime_mutation[4] = "sepia" + if("yellow") + slime_mutation[1] = "metal" + slime_mutation[2] = "orange" + slime_mutation[3] = "bluespace" + slime_mutation[4] = "bluespace" + if("silver") + slime_mutation[1] = "metal" + slime_mutation[2] = "blue" + slime_mutation[3] = "pyrite" + slime_mutation[4] = "pyrite" + //Tier 4 + if("pink") + slime_mutation[1] = "pink" + slime_mutation[2] = "pink" + slime_mutation[3] = "light pink" + slime_mutation[4] = "light pink" + if("red") + slime_mutation[1] = "red" + slime_mutation[2] = "red" + slime_mutation[3] = "oil" + slime_mutation[4] = "oil" + if("gold") + slime_mutation[1] = "gold" + slime_mutation[2] = "gold" + slime_mutation[3] = "adamantine" + slime_mutation[4] = "adamantine" + if("green") + slime_mutation[1] = "green" + slime_mutation[2] = "green" + slime_mutation[3] = "black" + slime_mutation[4] = "black" + // Tier 5 + else + slime_mutation[1] = colour + slime_mutation[2] = colour + slime_mutation[3] = colour + slime_mutation[4] = colour + return(slime_mutation) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 4eb294c8a4..1892128c29 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -403,7 +403,7 @@ var/damage = rand(1, 3) - if(istype(src, /mob/living/carbon/slime/adult)) + if(M.is_adult) damage = rand(20, 40) else damage = rand(5, 35) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 4fd99b4293..b439c0d475 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -133,10 +133,17 @@ var/list/department_radio_keys = list( hearturfs += M.locs[1] for(var/obj/O in M.contents) listening_obj |= O + if (isslime(I)) + var/mob/living/carbon/slime/S = I + if (src in S.Friends) + S.speech_buffer = list() + S.speech_buffer.Add(src) + S.speech_buffer.Add(lowertext(html_decode(message))) else if(istype(I, /obj/)) var/obj/O = I hearturfs += O.locs[1] listening_obj |= O + for(var/mob/M in player_list) if(M.stat == DEAD && M.client && (M.client.prefs.toggles & CHAT_GHOSTEARS)) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 8d1823f0c5..273df70dd9 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -897,7 +897,7 @@ var/damage = rand(1, 3) - if(istype(src, /mob/living/carbon/slime/adult)) + if(M.is_adult) damage = rand(20, 40) else damage = rand(5, 35) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 906acdbfb2..d9b9693a86 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -341,7 +341,7 @@ var/damage = rand(1, 3) - if(istype(src, /mob/living/carbon/slime/adult)) + if(M.is_adult) damage = rand(20, 40) else damage = rand(5, 35) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 314a4026ab..175838d354 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -35,11 +35,6 @@ return 1 return 0 -/proc/isslimeadult(A) - if(istype(A, /mob/living/carbon/slime/adult)) - return 1 - return 0 - /proc/isrobot(A) if(istype(A, /mob/living/silicon/robot)) return 1 diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index b063cb7bc1..18693966cf 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -245,11 +245,10 @@ babies += M new_slime = pick(babies) else + new_slime = new /mob/living/carbon/slime(loc) if(adult) - new_slime = new /mob/living/carbon/slime/adult(loc) + new_slime.is_adult = 1 else - new_slime = new /mob/living/carbon/slime(loc) - new_slime.a_intent = "hurt" new_slime.key = key new_slime << "You are now a slime. Skreee!" diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm index aee7b1f6d8..fc88f6b519 100644 --- a/code/modules/projectiles/projectile/change.dm +++ b/code/modules/projectiles/projectile/change.dm @@ -49,8 +49,7 @@ Robot.mmi = new /obj/item/device/mmi(new_mob) Robot.mmi.transfer_identity(M) //Does not transfer key/client. if("slime") - if(prob(50)) new_mob = new /mob/living/carbon/slime/adult(M.loc) - else new_mob = new /mob/living/carbon/slime(M.loc) + new_mob = new /mob/living/carbon/slime(M.loc) new_mob.universal_speak = 1 if("xeno") var/alien_caste = pick("Hunter","Sentinel","Drone","Larva") diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 2bb33f891a..757a922233 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -234,7 +234,7 @@ datum T.wet_overlay = null for(var/mob/living/carbon/slime/M in T) - M.adjustToxLoss(rand(15,20)) + M.apply_water() var/hotspot = (locate(/obj/fire) in T) if(hotspot && !istype(T, /turf/space)) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index fbc3488d91..2fab5c9400 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1230,7 +1230,7 @@ datum O.show_message(text("\red The contents of the slime core harden and begin to emit a warm, bright light."), 1) var/obj/item/device/flashlight/slime/F = new /obj/item/device/flashlight/slime F.loc = get_turf(holder.my_atom) - + //Purple slimepsteroid @@ -1292,7 +1292,6 @@ datum required_other = 1 on_reaction(var/datum/reagents/holder) for(var/mob/living/carbon/slime/slime in viewers(get_turf(holder.my_atom), null)) - slime.tame = 0 slime.rabid = 1 for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("\red The [slime] is driven into a frenzy!."), 1) diff --git a/code/modules/surgery/braincore.dm b/code/modules/surgery/braincore.dm index b89c48275b..c0bc19179a 100644 --- a/code/modules/surgery/braincore.dm +++ b/code/modules/surgery/braincore.dm @@ -267,8 +267,7 @@ if(target.cores >= 0) new target.coretype(target.loc) if(target.cores <= 0) - var/origstate = initial(target.icon_state) - target.icon_state = "[origstate] dead-nocore" + target.icon_state = "[target.colour] baby slime dead-nocore" fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index fea5f3a21e..8429057322 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -6153,7 +6153,7 @@ "coq" = (/obj/machinery/optable{name = "Xenobiology Operating Table"},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/rnd/xenobiology) "cor" = (/obj/structure/stool/bed/chair{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "white"},/area/rnd/xenobiology) "cos" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/reagentgrinder,/turf/simulated/floor{icon_state = "white"},/area/rnd/xenobiology) -"cot" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/clothing/gloves/latex,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/rnd/xenobiology) +"cot" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/clothing/gloves/latex,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/item/device/slime_scanner,/obj/item/device/slime_scanner,/turf/simulated/floor{icon_state = "white"},/area/rnd/xenobiology) "cou" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/rnd/xenobiology) "cov" = (/obj/structure/stool/bed/chair{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/rnd/xenobiology) "cow" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/smartfridge/secure/extract,/turf/simulated/floor{dir = 2; icon_state = "whitecorner"},/area/rnd/xenobiology) From 31637edf760de3dae3550bdb93fc5d3c5f14d7d0 Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Sun, 13 Jul 2014 19:37:33 +0200 Subject: [PATCH 41/88] Introduces function for exact item placement of food and applies it to each food item in the game --- .../reagents/reagent_containers/food.dm | 28 +++- .../reagents/reagent_containers/food/cans.dm | 38 ++---- .../reagent_containers/food/condiment.dm | 12 ++ .../reagent_containers/food/drinks.dm | 34 +++-- .../reagent_containers/food/drinks/bottle.dm | 22 ++++ .../food/drinks/drinkingglass.dm | 122 +++++++++++++++++- .../reagent_containers/food/drinks/jar.dm | 1 + .../reagent_containers/food/snacks.dm | 3 +- 8 files changed, 212 insertions(+), 48 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food.dm b/code/modules/reagents/reagent_containers/food.dm index 07f98a014e..876df70505 100644 --- a/code/modules/reagents/reagent_containers/food.dm +++ b/code/modules/reagents/reagent_containers/food.dm @@ -6,7 +6,29 @@ volume = 50 //Sets the default container amount for all food items. var/filling_color = "#FFFFFF" //Used by sandwiches. + var/list/CoM = newlist() //Center of mass + /obj/item/weapon/reagent_containers/food/New() - ..() - src.pixel_x = rand(-10.0, 10) //Randomizes postion - src.pixel_y = rand(-10.0, 10) \ No newline at end of file + ..() + if (!pixel_x && !pixel_y) + src.pixel_x = rand(-6.0, 6) //Randomizes postion + src.pixel_y = rand(-6.0, 6) + +/obj/item/weapon/reagent_containers/food/afterattack(atom/A, mob/user, proximity, params) + if(proximity && params && istype(A, /obj/structure/table) && CoM.len) + //Places the item on a grid + var/list/mouse_control = params2list(params) + var/cellnumber = 4 + + var/mouse_x = text2num(mouse_control["icon-x"]) + var/mouse_y = text2num(mouse_control["icon-y"]) + + var/grid_x = round(mouse_x, 32/cellnumber) + var/grid_y = round(mouse_y, 32/cellnumber) + + if(mouse_control["icon-x"]) + var/sign = mouse_x - grid_x != 0 ? sign(mouse_x - grid_x) : -1 //positive if rounded down, else negative + pixel_x = grid_x - CoM["x"] + sign*16/cellnumber //center of the cell + if(mouse_control["icon-y"]) + var/sign = mouse_y - grid_y != 0 ? sign(mouse_y - grid_y) : -1 + pixel_y = grid_y - CoM["y"] + sign*16/cellnumber \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 2cc1c1ffda..7a0f81b3b9 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -135,129 +135,118 @@ name = "Space Cola" desc = "Cola. in space." icon_state = "cola" + CoM = list("x"=16, "y"=10) New() ..() reagents.add_reagent("cola", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle name = "Bottled Water" desc = "Introduced to the vending machines by Skrellian request, this water comes straight from the Martian poles." icon_state = "waterbottle" + CoM = list("x"=15, "y"=8) New() ..() reagents.add_reagent("water", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/cans/beer name = "Space Beer" desc = "Contains only water, malt and hops." icon_state = "beer" + CoM = list("x"=16, "y"=12) New() ..() reagents.add_reagent("beer", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/cans/ale name = "Magm-Ale" desc = "A true dorf's drink of choice." icon_state = "alebottle" item_state = "beer" + CoM = list("x"=16, "y"=10) New() ..() reagents.add_reagent("ale", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind name = "Space Mountain Wind" desc = "Blows right through you like a space wind." icon_state = "space_mountain_wind" + CoM = list("x"=16, "y"=10) New() ..() reagents.add_reagent("spacemountainwind", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko name = "Thirteen Loko" desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly." icon_state = "thirteen_loko" + CoM = list("x"=16, "y"=8) New() ..() reagents.add_reagent("thirteenloko", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb name = "Dr. Gibb" desc = "A delicious mixture of 42 different flavors." icon_state = "dr_gibb" + CoM = list("x"=16, "y"=10) New() ..() reagents.add_reagent("dr_gibb", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/cans/starkist name = "Star-kist" desc = "The taste of a star in liquid form. And, a bit of tuna...?" icon_state = "starkist" + CoM = list("x"=16, "y"=10) New() ..() reagents.add_reagent("cola", 15) reagents.add_reagent("orangejuice", 15) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/cans/space_up name = "Space-Up" desc = "Tastes like a hull breach in your mouth." icon_state = "space-up" + CoM = list("x"=16, "y"=10) New() ..() reagents.add_reagent("space_up", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/cans/lemon_lime name = "Lemon-Lime" desc = "You wanted ORANGE. It gave you Lemon Lime." icon_state = "lemon-lime" + CoM = list("x"=16, "y"=10) New() ..() reagents.add_reagent("lemon_lime", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea name = "Vrisk Serket Iced Tea" desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth?" icon_state = "ice_tea_can" + CoM = list("x"=16, "y"=10) New() ..() reagents.add_reagent("icetea", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice name = "Grapel Juice" desc = "500 pages of rules of how to appropriately enter into a combat with this juice!" icon_state = "purple_can" + CoM = list("x"=16, "y"=10) New() ..() reagents.add_reagent("grapejuice", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/cans/tonic name = "T-Borg's Tonic Water" desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." icon_state = "tonic" + CoM = list("x"=16, "y"=10) New() ..() reagents.add_reagent("tonic", 50) @@ -266,6 +255,7 @@ name = "Soda Water" desc = "A can of soda water. Still water's more refreshing cousin." icon_state = "sodawater" + CoM = list("x"=16, "y"=10) New() ..() reagents.add_reagent("sodawater", 50) diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 740d50754b..1bfff61828 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -12,6 +12,7 @@ icon_state = "emptycondiment" flags = FPRINT | TABLEPASS | OPENCONTAINER possible_transfer_amounts = list(1,5,10) + CoM = list("x"=16, "y"=6) volume = 50 attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -90,37 +91,46 @@ name = "Ketchup" desc = "You feel more American already." icon_state = "ketchup" + CoM = list("x"=16, "y"=6) if("capsaicin") name = "Hotsauce" desc = "You can almost TASTE the stomach ulcers now!" icon_state = "hotsauce" + CoM = list("x"=16, "y"=6) if("enzyme") name = "Universal Enzyme" desc = "Used in cooking various dishes." icon_state = "enzyme" + CoM = list("x"=16, "y"=6) if("soysauce") name = "Soy Sauce" desc = "A salty soy-based flavoring." icon_state = "soysauce" + CoM = list("x"=16, "y"=6) if("frostoil") name = "Coldsauce" desc = "Leaves the tongue numb in its passage." icon_state = "coldsauce" + CoM = list("x"=16, "y"=6) if("sodiumchloride") name = "Salt Shaker" desc = "Salt. From space oceans, presumably." icon_state = "saltshaker" + CoM = list("x"=16, "y"=10) if("blackpepper") name = "Pepper Mill" desc = "Often used to flavor food or make people sneeze." icon_state = "peppermillsmall" + CoM = list("x"=16, "y"=10) if("cornoil") name = "Corn Oil" desc = "A delicious oil used in cooking. Made from corn." icon_state = "oliveoil" + CoM = list("x"=16, "y"=6) if("sugar") name = "Sugar" desc = "Tastey space sugar!" + CoM = list("x"=16, "y"=6) else name = "Misc Condiment Bottle" if (reagents.reagent_list.len==1) @@ -128,10 +138,12 @@ else desc = "A mixture of various condiments. [reagents.get_master_reagent_name()] is one of them." icon_state = "mixedcondiments" + CoM = list("x"=16, "y"=6) else icon_state = "emptycondiment" name = "Condiment Bottle" desc = "An empty condiment bottle." + CoM = list("x"=16, "y"=6) return /obj/item/weapon/reagent_containers/food/condiment/enzyme diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index d09acc8e15..e3174d03d8 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -120,7 +120,7 @@ reagents.add_reagent(refill, trans) user << "Cyborg [src] refilled." - return + return ..() examine() set src in view() @@ -169,11 +169,10 @@ desc = "It's milk. White and nutritious goodness!" icon_state = "milk" item_state = "carton" + CoM = list("x"=16, "y"=9) New() ..() reagents.add_reagent("milk", 50) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /* Flour is no longer a reagent /obj/item/weapon/reagent_containers/food/drinks/flour @@ -194,63 +193,57 @@ desc = "It's soy milk. White and nutritious goodness!" icon_state = "soymilk" item_state = "carton" + CoM = list("x"=16, "y"=9) New() ..() reagents.add_reagent("soymilk", 50) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/coffee name = "Robust Coffee" desc = "Careful, the beverage you're about to enjoy is extremely hot." icon_state = "coffee" + CoM = list("x"=15, "y"=10) New() ..() reagents.add_reagent("coffee", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/tea name = "Duke Purple Tea" desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea." icon_state = "teacup" item_state = "coffee" + CoM = list("x"=16, "y"=14) New() ..() reagents.add_reagent("tea", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/ice name = "Ice Cup" desc = "Careful, cold ice, do not chew." icon_state = "coffee" + CoM = list("x"=15, "y"=10) New() ..() reagents.add_reagent("ice", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/h_chocolate name = "Dutch Hot Coco" desc = "Made in Space South America." icon_state = "hot_coco" item_state = "coffee" + CoM = list("x"=15, "y"=13) New() ..() reagents.add_reagent("hot_coco", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/dry_ramen name = "Cup Ramen" desc = "Just add 10ml water, self heats! A taste that reminds you of your school years." icon_state = "ramen" + CoM = list("x"=16, "y"=11) New() ..() reagents.add_reagent("dry_ramen", 30) - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/sillycup @@ -259,10 +252,9 @@ icon_state = "water_cup_e" possible_transfer_amounts = null volume = 10 + CoM = list("x"=16, "y"=12) New() ..() - src.pixel_x = rand(-10.0, 10) - src.pixel_y = rand(-10.0, 10) on_reagent_change() if(reagents.total_volume) icon_state = "water_cup" @@ -281,33 +273,39 @@ icon_state = "shaker" amount_per_transfer_from_this = 10 volume = 100 + CoM = list("x"=17, "y"=10) /obj/item/weapon/reagent_containers/food/drinks/flask name = "Captain's Flask" desc = "A metal flask belonging to the captain" icon_state = "flask" volume = 60 + CoM = list("x"=17, "y"=7) /obj/item/weapon/reagent_containers/food/drinks/flask/detflask name = "Detective's Flask" desc = "A metal flask with a leather band and golden badge belonging to the detective." icon_state = "detflask" volume = 60 + CoM = list("x"=17, "y"=8) /obj/item/weapon/reagent_containers/food/drinks/flask/barflask name = "flask" desc = "For those who can't be bothered to hang out at the bar to drink." icon_state = "barflask" volume = 60 + CoM = list("x"=17, "y"=7) /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask name = "vacuum flask" desc = "Keeping your drinks at the perfect temperature since 1892." icon_state = "vacuumflask" volume = 60 + CoM = list("x"=15, "y"=4) /obj/item/weapon/reagent_containers/food/drinks/britcup name = "cup" desc = "A cup with the British flag emblazoned on it." icon_state = "britcup" - volume = 30 \ No newline at end of file + volume = 30 + CoM = list("x"=15, "y"=13) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 93c61ece1c..2232a452ca 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -138,6 +138,7 @@ name = "Griffeater Gin" desc = "A bottle of high quality gin, produced in the New London Space Station." icon_state = "ginbottle" + CoM = list("x"=16, "y"=4) New() ..() reagents.add_reagent("gin", 100) @@ -146,6 +147,7 @@ name = "Uncle Git's Special Reserve" desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES." icon_state = "whiskeybottle" + CoM = list("x"=16, "y"=3) New() ..() reagents.add_reagent("whiskey", 100) @@ -154,6 +156,7 @@ name = "Tunguska Triple Distilled" desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide." icon_state = "vodkabottle" + CoM = list("x"=17, "y"=3) New() ..() reagents.add_reagent("vodka", 100) @@ -162,6 +165,7 @@ name = "Caccavo Guaranteed Quality Tequilla" desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!" icon_state = "tequillabottle" + CoM = list("x"=16, "y"=3) New() ..() reagents.add_reagent("tequilla", 100) @@ -170,6 +174,7 @@ name = "Bottle of Nothing" desc = "A bottle filled with nothing" icon_state = "bottleofnothing" + CoM = list("x"=17, "y"=5) New() ..() reagents.add_reagent("nothing", 100) @@ -178,6 +183,7 @@ name = "Wrapp Artiste Patron" desc = "Silver laced tequilla, served in space night clubs across the galaxy." icon_state = "patronbottle" + CoM = list("x"=16, "y"=6) New() ..() reagents.add_reagent("patron", 100) @@ -186,6 +192,7 @@ name = "Captain Pete's Cuban Spiced Rum" desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle." icon_state = "rumbottle" + CoM = list("x"=16, "y"=8) New() ..() reagents.add_reagent("rum", 100) @@ -194,6 +201,7 @@ name = "Flask of Holy Water" desc = "A flask of the chaplain's holy water." icon_state = "holyflask" + CoM = list("x"=17, "y"=10) New() ..() reagents.add_reagent("holywater", 100) @@ -202,6 +210,7 @@ name = "Goldeneye Vermouth" desc = "Sweet, sweet dryness~" icon_state = "vermouthbottle" + CoM = list("x"=17, "y"=3) New() ..() reagents.add_reagent("vermouth", 100) @@ -210,6 +219,7 @@ name = "Robert Robust's Coffee Liqueur" desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK" icon_state = "kahluabottle" + CoM = list("x"=17, "y"=3) New() ..() reagents.add_reagent("kahlua", 100) @@ -218,6 +228,7 @@ name = "College Girl Goldschlager" desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps." icon_state = "goldschlagerbottle" + CoM = list("x"=15, "y"=3) New() ..() reagents.add_reagent("goldschlager", 100) @@ -226,6 +237,7 @@ name = "Chateau De Baton Premium Cognac" desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time." icon_state = "cognacbottle" + CoM = list("x"=16, "y"=6) New() ..() reagents.add_reagent("cognac", 100) @@ -234,6 +246,7 @@ name = "Doublebeard Bearded Special Wine" desc = "A faint aura of unease and asspainery surrounds the bottle." icon_state = "winebottle" + CoM = list("x"=16, "y"=4) New() ..() reagents.add_reagent("wine", 100) @@ -242,6 +255,7 @@ name = "Jailbreaker Verte" desc = "One sip of this and you just know you're gonna have a good time." icon_state = "absinthebottle" + CoM = list("x"=16, "y"=6) New() ..() reagents.add_reagent("absinthe", 100) @@ -250,6 +264,7 @@ name = "Emeraldine Melon Liquor" desc = "A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light." icon_state = "alco-green" //Placeholder. + CoM = list("x"=16, "y"=6) New() ..() reagents.add_reagent("melonliquor", 100) @@ -258,6 +273,7 @@ name = "Miss Blue Curacao" desc = "A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic." icon_state = "alco-blue" //Placeholder. + CoM = list("x"=16, "y"=6) New() ..() reagents.add_reagent("bluecuracao", 100) @@ -266,6 +282,7 @@ name = "Briar Rose Grenadine Syrup" desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks." icon_state = "grenadinebottle" + CoM = list("x"=16, "y"=6) New() ..() reagents.add_reagent("grenadine", 100) @@ -274,6 +291,7 @@ name = "Warlock's Velvet" desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!" icon_state = "pwinebottle" + CoM = list("x"=16, "y"=4) New() ..() reagents.add_reagent("pwine", 100) @@ -285,6 +303,7 @@ desc = "Full of vitamins and deliciousness!" icon_state = "orangejuice" item_state = "carton" + CoM = list("x"=16, "y"=7) isGlass = 0 New() ..() @@ -295,6 +314,7 @@ desc = "It's cream. Made from milk. What else did you think you'd find in there?" icon_state = "cream" item_state = "carton" + CoM = list("x"=16, "y"=8) isGlass = 0 New() ..() @@ -305,6 +325,7 @@ desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." icon_state = "tomatojuice" item_state = "carton" + CoM = list("x"=16, "y"=8) isGlass = 0 New() ..() @@ -315,6 +336,7 @@ desc = "Sweet-sour goodness." icon_state = "limejuice" item_state = "carton" + CoM = list("x"=16, "y"=8) isGlass = 0 New() ..() diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm index 171fcc9335..fd12ac7548 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm @@ -1,11 +1,12 @@ - - + + /obj/item/weapon/reagent_containers/food/drinks/drinkingglass name = "glass" desc = "Your standard drinking glass." icon_state = "glass_empty" amount_per_transfer_from_this = 10 volume = 50 + CoM = list("x"=16, "y"=10) on_reagent_change() /*if(reagents.reagent_list.len > 1 ) @@ -22,142 +23,177 @@ icon_state = "beerglass" name = "Beer glass" desc = "A freezing pint of beer" + CoM = list("x"=16, "y"=8) if("beer2") icon_state = "beerglass" name = "Beer glass" desc = "A freezing pint of beer" + CoM = list("x"=16, "y"=8) if("ale") icon_state = "aleglass" name = "Ale glass" desc = "A freezing pint of delicious Ale" + CoM = list("x"=16, "y"=8) if("milk") icon_state = "glass_white" name = "Glass of milk" desc = "White and nutritious goodness!" + CoM = list("x"=16, "y"=10) if("cream") icon_state = "glass_white" name = "Glass of cream" desc = "Ewwww..." + CoM = list("x"=16, "y"=10) if("chocolate") icon_state = "chocolateglass" name = "Glass of chocolate" desc = "Tasty" + CoM = list("x"=16, "y"=10) if("lemonjuice") icon_state = "lemonglass" name = "Glass of lemonjuice" desc = "Sour..." + CoM = list("x"=16, "y"=10) if("cola") icon_state = "glass_brown" name = "Glass of Space Cola" desc = "A glass of refreshing Space Cola" + CoM = list("x"=16, "y"=10) if("nuka_cola") icon_state = "nuka_colaglass" name = "Nuka Cola" desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland" + CoM = list("x"=16, "y"=6) if("orangejuice") icon_state = "glass_orange" name = "Glass of Orange juice" desc = "Vitamins! Yay!" + CoM = list("x"=16, "y"=10) if("tomatojuice") icon_state = "glass_red" name = "Glass of Tomato juf" desc = "Are you sure this is tomato juice?" + CoM = list("x"=16, "y"=10) if("blood") icon_state = "glass_red" name = "Glass of Tomato juice" desc = "Are you sure this is tomato juice?" + CoM = list("x"=16, "y"=10) if("limejuice") icon_state = "glass_green" name = "Glass of Lime juice" desc = "A glass of sweet-sour lime juice." + CoM = list("x"=16, "y"=10) if("whiskey") icon_state = "whiskeyglass" name = "Glass of whiskey" desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy." + CoM = list("x"=16, "y"=12) if("gin") icon_state = "ginvodkaglass" name = "Glass of gin" desc = "A crystal clear glass of Griffeater gin." + CoM = list("x"=16, "y"=12) if("vodka") icon_state = "ginvodkaglass" name = "Glass of vodka" desc = "The glass contain wodka. Xynta." + CoM = list("x"=16, "y"=12) if("sake") icon_state = "ginvodkaglass" name = "Glass of Sake" desc = "A glass of Sake." + CoM = list("x"=16, "y"=12) if("goldschlager") icon_state = "ginvodkaglass" name = "Glass of goldschlager" desc = "100 proof that teen girls will drink anything with gold in it." + CoM = list("x"=16, "y"=12) if("wine") icon_state = "wineglass" name = "Glass of wine" desc = "A very classy looking drink." + CoM = list("x"=15, "y"=7) if("cognac") icon_state = "cognacglass" name = "Glass of cognac" desc = "Damn, you feel like some kind of French aristocrat just by holding this." + CoM = list("x"=16, "y"=6) if ("kahlua") icon_state = "kahluaglass" name = "Glass of RR coffee Liquor" desc = "DAMN, THIS THING LOOKS ROBUST" + CoM = list("x"=15, "y"=7) if("vermouth") icon_state = "vermouthglass" name = "Glass of Vermouth" desc = "You wonder why you're even drinking this straight." + CoM = list("x"=16, "y"=12) if("tequilla") icon_state = "tequillaglass" name = "Glass of Tequilla" desc = "Now all that's missing is the weird colored shades!" + CoM = list("x"=16, "y"=12) if("patron") icon_state = "patronglass" name = "Glass of Patron" desc = "Drinking patron in the bar, with all the subpar ladies." + CoM = list("x"=7, "y"=8) if("rum") icon_state = "rumglass" name = "Glass of Rum" desc = "Now you want to Pray for a pirate suit, don't you?" + CoM = list("x"=16, "y"=12) if("gintonic") icon_state = "gintonicglass" name = "Gin and Tonic" desc = "A mild but still great cocktail. Drink up, like a true Englishman." + CoM = list("x"=16, "y"=7) if("whiskeycola") icon_state = "whiskeycolaglass" name = "Whiskey Cola" desc = "An innocent-looking mixture of cola and Whiskey. Delicious." + CoM = list("x"=16, "y"=9) if("whiterussian") icon_state = "whiterussianglass" name = "White Russian" desc = "A very nice looking drink. But that's just, like, your opinion, man." + CoM = list("x"=16, "y"=9) if("screwdrivercocktail") icon_state = "screwdriverglass" name = "Screwdriver" desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." + CoM = list("x"=15, "y"=10) if("bloodymary") icon_state = "bloodymaryglass" name = "Bloody Mary" desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder." + CoM = list("x"=16, "y"=10) if("martini") icon_state = "martiniglass" name = "Classic Martini" desc = "Damn, the bartender even stirred it, not shook it." + CoM = list("x"=17, "y"=8) if("vodkamartini") icon_state = "martiniglass" name = "Vodka martini" desc ="A bastardisation of the classic martini. Still great." + CoM = list("x"=17, "y"=8) if("gargleblaster") icon_state = "gargleblasterglass" name = "Pan-Galactic Gargle Blaster" desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy." + CoM = list("x"=17, "y"=6) if("bravebull") icon_state = "bravebullglass" name = "Brave Bull" desc = "Tequilla and Coffee liquor, brought together in a mouthwatering mixture. Drink up." + CoM = list("x"=15, "y"=8) if("tequillasunrise") icon_state = "tequillasunriseglass" name = "Tequilla Sunrise" desc = "Oh great, now you feel nostalgic about sunrises back on Terra..." + CoM = list("x"=16, "y"=10) if("phoronspecial") icon_state = "phoronspecialglass" name = "Toxins Special" @@ -166,330 +202,412 @@ icon_state = "beepskysmashglass" name = "Beepsky Smash" desc = "Heavy, hot and strong. Just like the Iron fist of the LAW." + CoM = list("x"=18, "y"=10) if("doctorsdelight") icon_state = "doctorsdelightglass" name = "Doctor's Delight" desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place." + CoM = list("x"=16, "y"=8) if("manlydorf") icon_state = "manlydorfglass" name = "The Manly Dorf" desc = "A manly concotion made from Ale and Beer. Intended for true men only." + CoM = list("x"=16, "y"=10) if("irishcream") icon_state = "irishcreamglass" name = "Irish Cream" desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" + CoM = list("x"=16, "y"=9) if("cubalibre") icon_state = "cubalibreglass" name = "Cuba Libre" desc = "A classic mix of rum and cola." + CoM = list("x"=16, "y"=8) if("b52") icon_state = "b52glass" name = "B-52" desc = "Kahlua, Irish Cream, and congac. You will get bombed." + CoM = list("x"=16, "y"=10) if("atomicbomb") icon_state = "atomicbombglass" name = "Atomic Bomb" desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing." + CoM = list("x"=15, "y"=7) if("longislandicedtea") icon_state = "longislandicedteaglass" name = "Long Island Iced Tea" desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." + CoM = list("x"=16, "y"=8) if("threemileisland") icon_state = "threemileislandglass" name = "Three Mile Island Ice Tea" desc = "A glass of this is sure to prevent a meltdown." + CoM = list("x"=16, "y"=2) if("margarita") icon_state = "margaritaglass" name = "Margarita" desc = "On the rocks with salt on the rim. Arriba~!" + CoM = list("x"=16, "y"=8) if("blackrussian") icon_state = "blackrussianglass" name = "Black Russian" desc = "For the lactose-intolerant. Still as classy as a White Russian." + CoM = list("x"=16, "y"=9) if("vodkatonic") icon_state = "vodkatonicglass" name = "Vodka and Tonic" desc = "For when a gin and tonic isn't russian enough." + CoM = list("x"=16, "y"=7) if("manhattan") icon_state = "manhattanglass" name = "Manhattan" desc = "The Detective's undercover drink of choice. He never could stomach gin..." + CoM = list("x"=17, "y"=8) if("manhattan_proj") icon_state = "proj_manhattanglass" name = "Manhattan Project" desc = "A scienitst drink of choice, for thinking how to blow up the station." + CoM = list("x"=17, "y"=8) if("ginfizz") icon_state = "ginfizzglass" name = "Gin Fizz" desc = "Refreshingly lemony, deliciously dry." + CoM = list("x"=16, "y"=7) if("irishcoffee") icon_state = "irishcoffeeglass" name = "Irish Coffee" desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning." + CoM = list("x"=15, "y"=10) if("hooch") icon_state = "glass_brown2" name = "Hooch" desc = "You've really hit rock bottom now... your liver packed its bags and left last night." + CoM = list("x"=16, "y"=10) if("whiskeysoda") icon_state = "whiskeysodaglass2" name = "Whiskey Soda" desc = "Ultimate refreshment." + CoM = list("x"=16, "y"=9) if("tonic") icon_state = "glass_clear" name = "Glass of Tonic Water" desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." + CoM = list("x"=16, "y"=10) if("sodawater") icon_state = "glass_clear" name = "Glass of Soda Water" desc = "Soda water. Why not make a scotch and soda?" + CoM = list("x"=16, "y"=10) if("water") icon_state = "glass_clear" name = "Glass of Water" desc = "The father of all refreshments." + CoM = list("x"=16, "y"=10) if("spacemountainwind") icon_state = "Space_mountain_wind_glass" name = "Glass of Space Mountain Wind" desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind." + CoM = list("x"=16, "y"=10) if("thirteenloko") icon_state = "thirteen_loko_glass" name = "Glass of Thirteen Loko" desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass" + CoM = list("x"=16, "y"=10) if("dr_gibb") icon_state = "dr_gibb_glass" name = "Glass of Dr. Gibb" desc = "Dr. Gibb. Not as dangerous as the name might imply." + CoM = list("x"=16, "y"=10) if("space_up") icon_state = "space-up_glass" name = "Glass of Space-up" desc = "Space-up. It helps keep your cool." + CoM = list("x"=16, "y"=10) if("moonshine") icon_state = "glass_clear" name = "Moonshine" desc = "You've really hit rock bottom now... your liver packed its bags and left last night." + CoM = list("x"=16, "y"=10) if("soymilk") icon_state = "glass_white" name = "Glass of soy milk" desc = "White and nutritious soy goodness!" + CoM = list("x"=16, "y"=10) if("berryjuice") icon_state = "berryjuice" name = "Glass of berry juice" desc = "Berry juice. Or maybe its jam. Who cares?" + CoM = list("x"=16, "y"=10) if("poisonberryjuice") icon_state = "poisonberryjuice" name = "Glass of poison berry juice" desc = "A glass of deadly juice." + CoM = list("x"=16, "y"=10) if("carrotjuice") icon_state = "carrotjuice" name = "Glass of carrot juice" desc = "It is just like a carrot but without crunching." + CoM = list("x"=16, "y"=10) if("banana") icon_state = "banana" name = "Glass of banana juice" desc = "The raw essence of a banana. HONK" + CoM = list("x"=16, "y"=10) if("bahama_mama") icon_state = "bahama_mama" name = "Bahama Mama" desc = "Tropic cocktail" + CoM = list("x"=16, "y"=5) if("singulo") icon_state = "singulo" name = "Singulo" desc = "A blue-space beverage." + CoM = list("x"=17, "y"=4) if("alliescocktail") icon_state = "alliescocktail" name = "Allies cocktail" desc = "A drink made from your allies." + CoM = list("x"=17, "y"=8) if("antifreeze") icon_state = "antifreeze" name = "Anti-freeze" desc = "The ultimate refreshment." + CoM = list("x"=16, "y"=8) if("barefoot") icon_state = "b&p" name = "Barefoot" desc = "Barefoot and pregnant" + CoM = list("x"=17, "y"=8) if("demonsblood") icon_state = "demonsblood" name = "Demons Blood" desc = "Just looking at this thing makes the hair at the back of your neck stand up." + CoM = list("x"=16, "y"=2) if("booger") icon_state = "booger" name = "Booger" desc = "Ewww..." + CoM = list("x"=16, "y"=10) if("snowwhite") icon_state = "snowwhite" name = "Snow White" desc = "A cold refreshment." + CoM = list("x"=16, "y"=8) if("aloe") icon_state = "aloe" name = "Aloe" desc = "Very, very, very good." + CoM = list("x"=17, "y"=8) if("andalusia") icon_state = "andalusia" name = "Andalusia" desc = "A nice, strange named drink." + CoM = list("x"=16, "y"=9) if("sbiten") icon_state = "sbitenglass" name = "Sbiten" desc = "A spicy mix of Vodka and Spice. Very hot." + CoM = list("x"=17, "y"=8) if("red_mead") icon_state = "red_meadglass" name = "Red Mead" desc = "A True Vikings Beverage, though its color is strange." + CoM = list("x"=17, "y"=10) if("mead") icon_state = "meadglass" name = "Mead" desc = "A Vikings Beverage, though a cheap one." + CoM = list("x"=17, "y"=10) if("iced_beer") icon_state = "iced_beerglass" name = "Iced Beer" desc = "A beer so frosty, the air around it freezes." + CoM = list("x"=16, "y"=7) if("grog") icon_state = "grogglass" name = "Grog" desc = "A fine and cepa drink for Space." + CoM = list("x"=16, "y"=10) if("soy_latte") icon_state = "soy_latte" name = "Soy Latte" desc = "A nice and refrshing beverage while you are reading." + CoM = list("x"=15, "y"=9) if("cafe_latte") icon_state = "cafe_latte" name = "Cafe Latte" desc = "A nice, strong and refreshing beverage while you are reading." + CoM = list("x"=15, "y"=9) if("acidspit") icon_state = "acidspitglass" name = "Acid Spit" desc = "A drink from Nanotrasen. Made from live aliens." + CoM = list("x"=16, "y"=7) if("amasec") icon_state = "amasecglass" name = "Amasec" desc = "Always handy before COMBAT!!!" + CoM = list("x"=16, "y"=9) if("neurotoxin") icon_state = "neurotoxinglass" name = "Neurotoxin" desc = "A drink that is guaranteed to knock you silly." + CoM = list("x"=16, "y"=8) if("hippiesdelight") icon_state = "hippiesdelightglass" name = "Hippie's Delight" desc = "A drink enjoyed by people during the 1960's." + CoM = list("x"=16, "y"=8) if("bananahonk") icon_state = "bananahonkglass" name = "Banana Honk" desc = "A drink from Banana Heaven." + CoM = list("x"=16, "y"=8) if("silencer") icon_state = "silencerglass" name = "Silencer" desc = "A drink from mime Heaven." + CoM = list("x"=16, "y"=9) if("nothing") icon_state = "nothing" name = "Nothing" desc = "Absolutely nothing." + CoM = list("x"=16, "y"=10) if("devilskiss") icon_state = "devilskiss" name = "Devils Kiss" desc = "Creepy time!" + CoM = list("x"=16, "y"=8) if("changelingsting") icon_state = "changelingsting" name = "Changeling Sting" desc = "A stingy drink." + CoM = list("x"=16, "y"=10) if("irishcarbomb") icon_state = "irishcarbomb" name = "Irish Car Bomb" desc = "An irish car bomb." + CoM = list("x"=16, "y"=8) if("syndicatebomb") icon_state = "syndicatebomb" name = "Syndicate Bomb" desc = "A syndicate bomb." + CoM = list("x"=16, "y"=4) if("erikasurprise") icon_state = "erikasurprise" name = "Erika Surprise" desc = "The surprise is, it's green!" + CoM = list("x"=16, "y"=9) if("driestmartini") icon_state = "driestmartiniglass" name = "Driest Martini" desc = "Only for the experienced. You think you see sand floating in the glass." + CoM = list("x"=17, "y"=8) if("ice") icon_state = "iceglass" name = "Glass of ice" desc = "Generally, you're supposed to put something else in there too..." + CoM = list("x"=16, "y"=10) if("icecoffee") icon_state = "icedcoffeeglass" name = "Iced Coffee" desc = "A drink to perk you up and refresh you!" + CoM = list("x"=16, "y"=10) if("coffee") icon_state = "glass_brown" name = "Glass of coffee" desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere." + CoM = list("x"=16, "y"=10) if("bilk") icon_state = "glass_brown" name = "Glass of bilk" desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis." + CoM = list("x"=16, "y"=10) if("fuel") icon_state = "dr_gibb_glass" name = "Glass of welder fuel" desc = "Unless you are an industrial tool, this is probably not safe for consumption." + CoM = list("x"=16, "y"=10) if("brownstar") icon_state = "brownstar" name = "Brown Star" desc = "It's not what it sounds like..." + CoM = list("x"=16, "y"=10) if("grapejuice") icon_state = "grapejuice" name = "Glass of grape juice" desc = "It's grrrrrape!" + CoM = list("x"=16, "y"=10) if("grapesoda") icon_state = "grapesoda" name = "Can of Grape Soda" desc = "Looks like a delicious drank!" + CoM = list("x"=16, "y"=10) if("icetea") icon_state = "icedteaglass" name = "Iced Tea" desc = "No relation to a certain rap artist/ actor." + CoM = list("x"=15, "y"=10) if("grenadine") icon_state = "grenadineglass" name = "Glass of grenadine syrup" desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks." + CoM = list("x"=17, "y"=6) if("milkshake") icon_state = "milkshake" name = "Milkshake" desc = "Glorious brainfreezing mixture." + CoM = list("x"=16, "y"=7) if("lemonade") icon_state = "lemonadeglass" name = "Lemonade" desc = "Oh the nostalgia..." + CoM = list("x"=16, "y"=10) if("kiraspecial") icon_state = "kiraspecial" name = "Kira Special" desc = "Long live the guy who everyone had mistaken for a girl. Baka!" + CoM = list("x"=16, "y"=12) if("rewriter") icon_state = "rewriter" name = "Rewriter" desc = "The secret of the sanctuary of the Libarian..." + CoM = list("x"=16, "y"=9) if("suidream") icon_state = "sdreamglass" name = "Sui Dream" desc = "A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame." + CoM = list("x"=16, "y"=5) if("melonliquor") icon_state = "emeraldglass" name = "Glass of Melon Liquor" desc = "A relatively sweet and fruity 46 proof liquor." + CoM = list("x"=16, "y"=5) if("bluecuracao") icon_state = "curacaoglass" name = "Glass of Blue Curacao" desc = "Exotically blue, fruity drink, distilled from oranges." + CoM = list("x"=16, "y"=5) if("absinthe") icon_state = "absintheglass" name = "Glass of Absinthe" desc = "Wormwood, anise, oh my." + CoM = list("x"=16, "y"=5) if("pwine") icon_state = "pwineglass" name = "Glass of ???" desc = "A black ichor with an oily purple sheer on top. Are you sure you should drink this?" + CoM = list("x"=16, "y"=5) else icon_state ="glass_brown" name = "Glass of ..what?" desc = "You can't really tell what this is." + CoM = list("x"=16, "y"=10) else icon_state = "glass_empty" name = "Drinking glass" desc = "Your standard drinking glass" + CoM = list("x"=16, "y"=10) return // for /obj/machinery/vending/sovietsoda diff --git a/code/modules/reagents/reagent_containers/food/drinks/jar.dm b/code/modules/reagents/reagent_containers/food/drinks/jar.dm index 6a75c65852..1d8ae40b80 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/jar.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/jar.dm @@ -7,6 +7,7 @@ desc = "A jar. You're not sure what it's supposed to hold." icon_state = "jar" item_state = "beaker" + CoM = list("x"=15, "y"=8) New() ..() reagents.add_reagent("slime", 50) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index da04f2d30f..3f22882809 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -9,6 +9,7 @@ var/trash = null var/slice_path var/slices_num + CoM = list("x"=15, "y"=15) //Placeholder for effect that trigger on eating that aren't tied to reagents. /obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/M) @@ -107,7 +108,7 @@ return 0 /obj/item/weapon/reagent_containers/food/snacks/afterattack(obj/target, mob/user, proximity) - return + return ..() /obj/item/weapon/reagent_containers/food/snacks/examine() set src in view() From 46f69d205505eb62b4169f54150ccbfc36a9504a Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Sun, 13 Jul 2014 19:38:37 +0200 Subject: [PATCH 42/88] Fixes some food sprites being drawn too far away from the center --- icons/obj/drinks.dmi | Bin 66207 -> 66198 bytes icons/obj/food.dmi | Bin 92113 -> 92058 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 9da8b5ecf1c3803987537a23c9f29c5ecddf8196..8ae9ced1f990b4e42a709b3af615fefea6a54963 100644 GIT binary patch delta 64339 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

    XY&=;M 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

    e^g!YR!a^B%`g;pI9bG0otE2i5MF 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

    n{VS+SXru^!fTt?;TS;{8t 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

    `<#KKlIn{av6eIoU z7vp^>SAQE|HY|o~1OYw4+-FozXu%(LxIZIZ?V!8`z67&(!t!;YCL|-m3(l5N8Wh4R zu-j2WO^Q3HfwuiOqN5Vu_+Ii#^&jCF(-!!6!`RbsBjLDK@X*(5G6nSY$%Q1}H*6*E zJkIAgm$%TX{p(3_gjdR{7R_!BTGX5d3CaOP1^NoYv$(*Vd*~Z^)%-5d-0`gx34S>K?!Zu^V@%*>)OnB?#Q1jqk)QL3 zuPi?-S?4YnfY1og2-iRRlkUm9VQI4?I+DhA9QET$A2GP@e>1v2`7DW(jN10T-&iu9 z46)ywY>1}BFjaQ_7fkCj@dfrM)07iJU?d7~f5A1m@mw5)S=V(-3A3!vy`ouN8@Y0y8bFC~?0p*ALn4yV(t!uff(?WPxV&L&|3n~NHG`Q}B0 z_%)gLWdBRNWgb#<4(PnerONuvaKt}*yRHsLay3)fCBu&ha1cR!!1LRoxM{(;$Kp4Y z7~B#@nF~tZd;XrI?z``aAabNhnYPv}kgD=|#cs<_#dHPSbi)&MDy7fGVDvC6F)rQj zDfo4bkk8ki{y;*s-Fc5^ZFlK?8IBt~jMfr6?7E`qbZok!b(|UwI<-P1qkdlBEhi}X zgxL`4SQT}84Quw?$!j8sbJWr1>#2K3+1Em_+UsG_@%aF8AbKKMld;#vI_B}SXSw8k zH@dm;Up=O{=p=c?vFjGlKt|8d9mh91kE3ww>%F5=R)qPZa67D*$@Hqh_pr+jx@tOK(W}FEISG##dY6{>V1|LSX>siekKwzM z)tScC((fIUFk+aslKQ9u!JHjNrp!QPLx}r+dOPmDa%uk`%4HYo>IqRDh=>vOPdaio zTYm*x$@s!J}hI6HJMUp8|e3H?Q9DQugt%v9o66gzv)R`Bn z6TEmhLh|g8g?}v>Pa%oY;-jGj^BnCmSW2F-MLU&0<+$aFj477muA9}`8hgVGs*aHO z0lOO6-E^F-Oa_m&gqiA2~9sXM*A zhzi8C`7mzr^(kLL!ZjWZvIG6gY(Hy`6HVZ zVVeV_EDJ}MM(2UB#LB_f6TdegK|-5nFl|x{c4*vTDf#TCtvIWKZ?IF3CYdn zfo7<`^xRzf+Bz_r(w6hYX7m@`xa5<_69+XKx-Xo@9&<%gIsPi4V^&~7i$409 zHexg#c3{mQ`^RCN?cP9A2MDB3|5^Au-JEns!j=y?l_q<(z0s(8 z>ACB6_xmD~v7@&GY-O#_rj3Tvs{qC2%||EkzL^ksekZJ&?9v$oS%SP|mS$(sGdO^2 z7$sm%;cGycPsYBsT3(@o-2Z51iZ)B)Q}b|_`Mc&9+d>|yX__N?Gs(SuhULKeS?Wx( zzVsTs2x@Rc0Cn!$!bJ5a@*N@R3$SNbywW7qBmT>V_=EkAX%_)|=k6lLfkbqshR$W{ z{UT0Mz}yshB`N*$USGZUeSwuo>DTX6)#Q+M>8f00N@y#p&vUf0U0TR}!geiKFq_{J zTxBD=cN@^fnR7;@36kCRKS{q=ZGe}t%}Hcojet%e3S=YN=JJsilB2?tqssU=@I(Y8 z%K;u9pAp`yRm)#m`Av|@51kVj7lcX)x8FRXWQg_KEw`{jxNp7lu25Ke4Fz!6!kg3( zJZx$X?|n&`rCU_YD%Gmu*%&4fRCu8BEysVlHRP>xKh0>Vf|}+gtG|Ex^eG#5LV`*j z0i2Mjw6Vf`=)duCGZ#9H-_NCIK~O@vX`PeE;QC7Gr~AmNp)II@7_(Y)h>Y1&?7g{a zIaA9HZI^uielOYp_}53tRkqPFB2XdMwY-YGrF!|&O`j2*yofva9G1iu2qTee)o$D| z5iG2g{=|c>t%$opdA>KXx%o+7D7S7+D*02;l+_)wzf;X4yMUaGdyaz49k?P z6}lrT`y;#Gv6a+ruVad}!n0M;@^mY9(#*^Dg#)tGaJ0X%j}j2bZ)0Wkd$1gm^?4+- z-*IVs#}>DS<=|KJxp(LoGOLH$u(97lLPCcjVB}L>D$s&iY;iT$|d}fro%ZFHk&kyzkT_8*y)SA-?@=*{O(R{(x-cU8@39n zeDIxts{$J4_9XHb%5wjXxD_T@?YSmkgbJ&yWDeo=ZwpH>VBeF{Fvm5|*`2GhvWHJ% zX5|cw41HYMcgKNSYLISHwdAptu|?vC{nO7|70i9n+|(s|71VqM+(Q>JiT@0rxPP~Q z+?xb1t>&nZ5&fy`L!kwJ7&Jkwhes4HZzartT?N6j2NDVsSF>*__Db@Qsil5B$1F42 zyXtrf9a%RE!JfiD=W`Ql2abfXgY#^Crw;+PA84Z0v9h zts|yJnNEyq$Rjt#R^}U?qdxS&ug_*FQy5Ki2efb&5>pZ8}bxz~u*-*&;BPe`H@1fr=*B*hdGXGdwIZXXHUkGQDWWC!ep_93rOPjT8@MQY)5_stjW@UY6plIjdU+O|Q+@nr z9TXT5xyxT-Ih?xcea@G3EbXMxhcCM2%>sPdt?kntgfA4J?Q*T)=Fghp7eT8c@>%%A z7;q*yo^mvKP2@s}3e`V4n%EL6U^KPy@y%u76HRo>3{%pdnzeD%$r_L*2Bzgfp<7+tti!s&4;z4Idi_-1t2=|g~$Gj`^zylS#Sv#Kc?pGjZ7I?nq8mh}0^ zP~D2>SN!+x0nd%_2xe}@_1rI}1B+OC$Oxmz_~q$~+|fM{+Z!``^qH`bKh@O9VXoo= zdRt8{EST6--~G6HxQc0uS0P=Rq|MO#@(e(HQ%byVOf(#PS6ZWpgmTQT{H3j4Fq5W} zqBT%YFj#%DCy!s^nh^q+jHQ7rmj#}F6l}J&UsEtI_T`ZKyvrWgh@6^BY25I?$aceT zE#)YEy|(iCwLpDb>pwWXRL~a?2Q1Aj9dVg{B+bD%?LJ3JIX{ z-7wCJ^0j}OGTk{WfU$5&vBMY4hfK>Om5%SpdvF3GH+K!S1SbX*_;MaJHmBr(1DiIK zW+hoN$y3`DVl~L6f|RV0f}aHCU%w6xxfoiniSvzri8c~${_4m8(ZmYaZ= zE39d_L}^>R`yb(_7lCY}W_6!a#W65o-F+{$K2k1)ziP&Ci{hg(a?LuJMvw5M&wF>~ zRJCA|E=O-_McNB=l8&X)*0mB-wjKF(Ve_Ruarnr#t8W;-+T^=v1uqrv8Yyyep!UMh z^lg21t}suyh*%5kxF z-TDI!0l~V0@pBeNfeJqhR z&FGK8XRjG~nHQ-;jIug)CZPE;sHn0K7@U|dQba$cy<5q00F)*BSZCf9x0|->Q%B{3zhU!A<&_hT{Mf3F!{!Ok&KwRf96YzurPsU?sCBvO{T}2z&OoC;G~OD+ z>@iBK2F#^|YN(rjN=CzKDFDd=3V_1pIfErxAe$i3O@v?TDoMD=-}X6eiFE3l)ocuy zuA=X0LO;j(6CKgHDyMO^XY4PB6!X+M`%ClY&W;cA$lk*rVL!W|rLBeYl9)y5?q=f= zfjm#Unap{j*~Aqh3`dB?U)e|0&;Sg&<_i|W_ua`a-()<6xv)7~&Rk3yyrE}8nkn3; zic7mttM+Do?W&BnI*r@z(NO$!?Cxu2l3ewRHkp@wg`tUq>I2*z>+!SVQ4US(+)F|{ z+C~Pv09c^1w#4SU9DGbW7#?2I(#_C_2i}*ZOT-0eHcKf0O1cMBgy{r0Y48WMk5;zw z(CNG}Y|E8LInNjE*~lw6Iw zI!$uSM~Ak&$k_Z61%$>8LHD3`t>T^nL~R3aq+7&#`ffI6r_W87<$Cb$+LTKO#E>k zp39CFTP2R)kr5wfB9Gsv^bruJt^)-$E`KqYoG(2cn|8k|AOdwH*Y)7r>w4Z+sGO7~ zmPOl=o`1Cvg|l+Piz+9Jbu*fn(0e1Hf`xiQZqXnIFL9_nXUi5wt{LT->b{{7j5 zfcH?(p3mCcd`CS$FQZ9%g9i!0J;a;=zv&Y_(JVd5hVk~5!KMy>vL+SsN(Z0| z)0Nl%e(yg?+An=HVB-p&o5&O*SseZqxUE)fbWCmd`f4rN;|hsqm&2x9HM=K!cAEhpgo#@Wo(rvPLSpv@qQg|XhENV%&Pzt$oi>_@Jg1Fv% zX*iv|Uxcd*b%`vB<~1~_Qwh^#Is@q|=6`}o{Fa)10N3p%b%@pa+noqn3@b*`qa_R1k>2$v~- zW^%`Fj8qG*Co6ybk1iuc{87&j(+0AtG|di{6e>vR3Po2q^ZY4NWn*DqB;4-%?$n?7 zKe>1FB15y}@#+zFU^wZu z?@rYE=CK~SCSNb*FTOR_b2t~q}i`&Wy@Dk&;lMI ziePw%f+B%+HvrS}^XiZNSN|vLzP_ONoTUE<@%OKJMY%5|4ORUuu8@tdj*fm1_L7TD zzvAZRCSK%U`8S*B+mSJ|;_$@&)?3CN@qnR>jU7_&Sy0ID;;66vYenT95rJWU4neme z37X5|HMq!rRlp@)I=7_A?u6)sAr(l+7)=`5_T)vwYu_T?uLZ0~JvZ_PrKdf|`lVkm zW5<}}lSo+$iH{Fo6C;*Z7ZaL0k|m~xMV;ufcyGze%KX@VYd;*{vSpl${rXSUn1Nox zac$J(?aT^n1toRe@Et|{bcYFM$lRjU0`GnH2hXb}x7BG|SAoo!$j1DU0q~o()$4Z~ zhv@c!qTkRvGNOeLNW$fKq5c|!fZU12%)bZE^y87Mzi!w&*{fEcSH#*zJrV4F5venT z7CMPhxYg#Qc(|>Vtps^KE7KnT3WpLp$VK4kz2|0zl15Z{R7n}pSQ)xHe>?KIOKe)j znRoWLJAgZZ&X)WvjLXvt+z-Ytx+=PFc3%o03Pg1}JJ?;8_u@DmxD7uOGPtUdI9igW|?=#J;lJ-+g+(E zoA8xZ;Jjg&?XvHIP6~~v=XAf^`ob5+S0=Cz(2I}1R{9-g_+dg-|2bNP4(-0PAMe?4 zveiWET5W<$RZOfTRauRnUip=gTE+rzi4=ii15yeKgsNFhYKZ~u-y#Zzd%ayZ((VZ- zXeLFjeAXYg7X=@QinVy<(nUY%v$nNvOf0eNgm+>$?tl9JSnp5RI$W&3-dX^di@eo1 z|Fyw$%jqnaWsC#=a`Oh%-N9)x9LsyAxuB~atB(>1OO{qG{BxKg&~koD&~K6)y3_ai z0^s@7EL(PPf-VjfEp7C#U;02?{Q=}74zrxQ7nRI`69PIdJJmO{vr**)#?o#I(a9r} zKd_$h4bqO5GY(-ayvT1q#jZ-~rX-hgWx2KpKV4nG(u3Rv%Q35a5vvLMW>7Y)wmQ|pc4Ouz) z1&B6`S|VbeoHTs-a8Dh)e$O>s9p5s*$?5FI;X$<-Vccca&VNv8YhNfwXPIsH!x=76 z`)OA{^B;s;3jM{XzcpJd!%^SvRH;z_2UUSa^(*YLSg9i*?n^z;t)eur+C390yUUbC z)#*aLw7P-je;iK$KvnkK_HiM35bdj3w#_8z?Gzp4+Vq3urp&0Muqr3U6(0T%ug+N|P%Kowu6 z`f|%HdF8IfnTR^>XI~Njn z8gv1Jw!iN1>qM~@8S~jm?SCAxxo*HDv6hWA_z0yr0Be0Es=%6|lBgX0PcVA(92t?S zn$mD11r$7ue;w1ox&t)Bfn^oLAv&;O^^?t!m8nu)`y5q9l-f5JDRhwJL;0uZ505I0 zs0)TA!92Dg>NL+L@fyb|Jn~JxXsS#LD&j_#pQQFZL>Ag?DM{bXE7^s)7oH552vW4` zEPWPkZ>^tBT|^KC;$AzDq`v0Cr&8H^7Gu79%@%DJh4$Wj1osmGAYq!VC~y3GnO$ap znfeDF( z&{DO8xz9_8i=k?WD>>x8?re;>U|E7~ZKcUo+?gykMel{$K@W`-4vOv558pYP6VP%d zNV}F-KpG2y;y(%oRasPD2-9yUQr+>bC=oauY{C0@ps)Gxzb#6dzh{yVQFq%Dv^e~m4TuaHE7I9BlQoNJbjHGm z=F?MEUdMsXm>}XYbvD(L`0QX+FhgN`7Y4+?jZPFrE;$0>!p>#CmAFk3zE3#1;|)_D>u91P z^U7!~{q==!!P%`={Ew_5D`=WQqkEdu@@a%Sd+<%gW33~b2Mq%-#cw(<(}-2eBcnc|qU zw9Ned_l{}8_o8WFiS+_0|6>2}&D*`Ek66i?wy_pxe+o8}8zi?CJ2MYY%xvHS7q>3{ zZHZhk2O%K)q_{h02NwSm2tYeRbaE^3UJ`DzQCnYMZ+0~>Wz&R}i43~v#zYLFaERon zpjIH9;&mmQ#O@*!N=thViS+>Aw|GN_gO?n zthSC$raL3#c+@StXo!uC^_+=~iNpcQe?=H9INIC0pQFJ52H)$tv<`+|mjd}EfB!@N z(3W%9|J?)m4bTxhPcGDd>n3J&e{jt;{3(px;qmu2HvcLt4n+>2gJfiBxSj2Pr6^wC zM9+ITpS0IaQS6bx)Xrh)7Z{ zJq&S%>UJB>GJ|%6Wa%F1LRX4BxNItxdGslSY>Dc!hR8u;Q0S%Lyw+7Lx(h#j| zp+_YEYu$25AE%ax?1OXO(%P0BvP``%8fiq^T1L`RdnS(rA zjK8CD)I#eNAHy8JUt@QF&?~QbH@^Y$u9qk&!1;E8gns@n*kJVKB|+RZLYrvnE@8a) z{Q|76e#*}oo)m@eRMh@8sf|PtVuWp!)0h_!9x7a0JETVH{yczR>G5TPPjBr%4+JZ% z^^dW;Y0}=NeD@v?TrX)yCSFf7-;9?+tBjk!cIx`!ra;3OLOO7($2d>$>o`|>eE<|r z1BoyyerHynCX4@?fe2nUMRP7b2e)wWWc0_|ErQ1;yT|K=)$v1xVX{(UPu%YT2kD0= z_#5jUQ+(UQ_%Q9Ba%@pVjN*3ZQa-+u(?-dZ%EFkIqdxsszQ%^NqXuTUz0z*k@Up-C zBkco<1>an z^&Dc6m>=3$0gW$S{-lI~E|@WR&0*JhLJ`;VtIiK2Cjw?q*{1eA`8@Beq*EWMHk)Mc z@YGC9aJ~3c@8aD;-al}@7w%MD1DmTDYnQ-&yJ{8lgEjiKz_P#iIgpM=JK%xR zMM$W;J`4zz7hO*Z`HQ7pm~{mh+AezFup$(fzoGjNZ0Q}M%|nT^@ zf?PK~v;2W2`IwYix;LT#XE!c}0S_oXgCn_&0FV;f5X)0myf$6DgIXSQA_wrG6LGdpY1mgsZJ;V%%yBL6@SsPUW&b>;h)3?9} z&}_WE-$v{Oh`tNALi4QRZ%&k{JiY4iJqEm9P+x5)PmfnxQ69sdzrprEBY_vCsz(Ib zl>sO3&J8zyU-f+1^uyQa+c$cVi2T5tCe@SU31)@^usw@f^VkDpgCjVQ^x{yG;8Ly?PlPZ^!yiJo#NA5FR%yAPK1E;RMq>5 zqo>XF=T3yBC=L-VF@m9@N7qPeR(86LrNNcQ(abG+Y*kfmY4)IUp*7-e=Ww_0qnJ5Y z=B|5x@yQ?k?UtY4vmpA=99AKNLoq(Ei^kcZZ&49Oy(huc5-VLTb$v{MA&AjSsnXu1 znIIDNdDaXb4ZDS>;e+M)R-)iAJeua*8h@!imVM+kX=+xZY0+=tq`|j=5PJFY9ZXyfSX$p`iaUxcUBYuB|XJKdE zFCgxCb!mxfWoH|R-%E&(2O~Uh?n)(?u)_s+mv_eQKZC+|13gS-QrEN?z@2)~;_x_b z#n+Tulq$H!OwpXR0h3!Wl4)^PSWKN!@vSe{1F#sg{AIgYQlm*g^zdCc-Sh5WQ+kds z6-e&h==XL#rOleHuf+}2i-Az4`GS>G7&95!ap8~^r{v4E+?Y;K(}3~&?(a83dv3L- zDf76$uLsF%sHwkLAaihayVE{?{FZ2zi&$P-BAZ;^F~GkkEWrXric;v!&)Y`HWh7tP zAm6x358fW%^UT;LY;_@GP4U!Qtd37pglQBEkH0L<4*4g@Xjf_dJWP*6G5AG^TXQtu zSf{h-AmraV%!9jGx6`DL%$ZQ8EghN9Ha3bPK6qZVWQKsB4wmabK*X)Z2Ek&k-O7*S zqdFxcu|M~azqTJN4Qy=KAn#`X@q(|v22i&b^uy>3pTDFf%y11y2C9)yhjLk+hLa4t zxk+Jv7s-*ZBJyyMCkK68%L83qa?m)!NSq5)Up##N0Hm`5boS2;pm||-1Z(@ygRVO& zVljF8z81zNsuA_(nU#LqH-SGuqjxM;_U-fFhRg{Id|*@B%e7mzeutd>>I?NFL-qWA z5<$7*aXk$V;9ZXH?ErRTOBMAjx`txA z602&IYFY@X3Q)7mKQ43#scezlUR=upyu5C|bS_ql|@VAMj z|AX@+Dd~ZBgiQZjs4})aZNgk2cWm~aE#A-HcFchjJVZQl<}YoN06B99x{Af|sx^SpUmn0Fyb8i^nD{gQ6#%mdI_Ee0qphQ2S19mH=V!2%TBE#G+ zInH{Jd2whvOwT7nYn=E?N_H*}ZLwgk$ zltqO@T-uRGO7B^V|MInv1hhUq_rIy}i9a9bUm=iKOOUC!(ZcHNiQxe+C1|$$*Aw=UV5cI)gS%mo-U=qsa4kWy8w^y1)4~Zhcb}jg}aN z@Mj{W$#&7#I3oNMlI6f!c@SVK=i+u)+%b)!AoYU;Tuw+k1oy&XDcB&OiK^Ovkt{=C z_USXpkR@tXE$&*-Gr0QsLqv{2%8?EBg&aPgrx zP7t<~Ma!%_gD}c^5 z>{yk|;Sz9NC$V_%Q$0_lsULk#cH zB_%D6D1l;5f4{Ih*Y61eC?&xi2Ju-BsTSF}TJ9o}!V}!1GhT|yFFr{I=dodLH^z!Q zYi0(Lx*WNX0_o>-227x%FrWXcfbEE7yIwVnZ<0z6{4fE`7McSx5A}al=7xP>=hAIa zadf=N%jdA@A)@Rw>}~QX=RdCmVos&ZeT;Vfph@ZxkC z@AyCoUY_KOCCJ7gplRCa*xMju>0Q^Gc0MkI7CSXiK-roLud#^c_)yI0V*kDQ?m=@I z$>7*1nrSB@4}9!_>!k;ORPwZHH@Rf9%S5HFU%@x1?(%<;fR|7tKm>{e$ncaYbfeq; zzQMN9QUHzfqrW20i)sYbYy4|AWx$@-)(InM8`rPLt?wo##rpbWRO|eN{`)R-y3Q@ths4uUWM1#MFYTPnuK|8 zE$yjoiz|y!+S1ONXG;4pG$*O{=|22Yfx!R{ENNPAQHy#cFa7M08Z$fmuv*?pTXZze zL-fc)JQHRPDt>ARo25`0NPSGOU2E;Q6a|;Q>}m+-Eqpj)e{nGXRqV}cQ*GD1>OLvt zhv6ybvvP{HyUDRKQURgES#QIm78X2@_#ZO_Kn-V%t?#GISf;EPU{q; z!Df$dc(R5zbd&kV-%8k$eb?i`y0S2m+h#IwE@>Ef{I>k2UgekMlONu$G+PWY*`ud< z8X}BWKIvya@&?rEx9WGgvmEE|gjH1#yL;jcS;TR>)`HN!Pwy773=Mp zD9zOkh|t`9z=hq_^`*Z^gXZmkdO-4nvNJqKGf*LEHocV2 zWpv>a=4SWC!Bq|R+;>zn?KJ;@uF=W60+gFv*NrT@lezn|`it)>VPl_f9>4zk6G)mz zD1UyCV6BV;u+d%c3~2J;96Utg$NlGFmPlEN9dAwGjx2RCI4qa#@G@Y}fd^%mA+?~e z=-meoG=$K*`b^KQ*n@+*s93(XLYlilMO^u@v9U>_e>$gUu+0z#`D0hHC{=Ji$dl^U z$GCv4S+hkt*z6@4~q-4!S zWyQ9o zu2Q5kLKz`oT5VUrqY|<;J6lEvc`~mT`-^21SQdX=r#)onSRMcaE_qu;3edRNQ|3 zq8e>^cH4nGD)`**cI6ExoD?%7P9h-|$Y7GP@s{k@_jCDyWXcz}aqndRsao3a0nJOE zx31#?0hYw3+Bq3fF|K(~k9j81+4fwW{^;LjXR1%mn=Ro`%l9j1rOsnz=4^#)`Yr8G zXazDTd+k3}fA(I-67hWiqd2|e+>x91@~qWrp3BW#cb~WJ>)iMGLz`_)h~l!j;{8o2 z*`o5`cJd;^%f;-_4(7{;?m(%6wX)xhDkRB@@$*e&6_5?cvE8P2`yfNClq1r=N}0(k zH-cc20*cLx?*vYep2%fO$HHtYf;lU2%y8!)e-nuzjh)gpJ8;dzgQ+ma%xjNijbCD6 zy`ptEP-ld2)b0+3)ETmWh)X0gg;+y4CaBF!h_h$o(Atzdk)|qPA3V2km%5`;66V(W z9u4wJHE*eXU!uHoB_phORc2Imrhv7rN_&1-Faybf-+b_AK9tLAuY!B{tas$0)Qe`r z1!Sv84FqsxP4OSpoNU}S-GKqn8-M$`wCIPEH3JA{Dq)Q@E4)pv`WX7HsO;IWxHY%8 z=Utvn8uo?Fyw9En14Z~5VLw*TDihfICO zjbK4SOK2P^{-qt`-q2I+(z-O?qvRlPXV}iUJt5!^$^K~Mg4H<8*CzccZ6xeq@!T|Y z6pQHwOpY5D4%?Uwn0X6lnn0rG$ZKd*Y3*3ES|CId;vadpSZ&Fy>ECTwa(KYvAk9;- ztKaxf2i=@M_Xk`$>O9c)wu2AHU?}2*A3S;VY#bhlfx!M zaQapriVeUaYFOy>)*u7b4=I-YuwQ8qzGkQ+`~R71xziwvFv0(zHg(N4!v47Ygbuvx z3)nnls7w77e+|aN2bF#SAI`hL7lloY3u(*OSR1gZrFI@H=D(Tm#o16%(o zdhX!uR^tq%u?@WvEFSuBBje0J7kLff@qT}VnY`<{m`g!WznmFu@AdAbot6xeEsfG$6W%(hIJV+1}FtrnNk+F4RAN0YI zV^Rh|zw9CS)bNXHhY@6-BLK5nCn_Pg!rc}Y^ql0^7OABd(^O%xwW`$cve zl1hB5gaSP*4)#oCqGH6OEB7-h`{@CwVB(>JeqC+`4F{soWzQeqzXwAp_@G2989#p# z*x1-Wc>zp81GObibg~1Ko%m@lbM6iV10gSJM>J>rjFDfi%OPPwAmKGBN2N(*(gIVn z3{4hM*^W1GqLF;(ua7;8+Fets!RIhQd~#0fq(zu9bdr1uVv{1 zZW>XQ*CL}$cD6qkI$^od(U!Hj@9L4ipe3l`W17wjsQqGx+#`8I41iEl!Y?f?)qcu; zIqIE{*Tp)C922cOThD`%6E)`*HFQst2d|t9gw19N{a4L(UVg->**?sUc(dbUI!gla zd4`(wX=7~_cmKTcUi4XOqoy%!)wF;Pz{AJ4btLk`MDV(f)50#14|wM-z>odU1!aWa zUgOo&gGayLUq^?Rc0+S#D-^bN7{U>r&Ht<09o{#@Mkh^rs_N=3r+bTgXB$P9qxmny zy>{8&Dc@Z&yCUW>)bG?M5v>!9rF~ahZ2&f9R6gDBATPzJlM#dl2AX2IxKMKK2Q0Mx z@W!Dxe-78h93QuVn{R1e9b9dg<=Fqp9`ijyUp(C1@7dobNdy}k-$0*43HU>NJ6hTP zF<)a1@&5Mq0AKO|i+a-UjeP-ON4d4lx1|*?k@J3{-zcx>7U}Xo{stS(%|-nEuAY&S z2sU->ptUR!j*)Iel>WzjM%a@()`c3OKJqe~@w0PHZEcS8ATFSZC+MfTeLj2jp`hVT zQo-a$gJq#}bs*srt7dD&PfTeDr2!NNmyw*bpsCs-AXWke$x3zq8^Z@hS9lw;Rcglb z-+#(aqP~DwPU8#wuo-2TZD^<2 zK44~h9u#=M1WW&_&iLy)oq1>pkdu?szuOe`x}DF9OxWka)x$+P{!6}gzQp-9bjU|| zMZyl4n>Gug2{Up(N}0o{U~gT+&;s-HdB;n7d|!=|XK3Xc@SGoyvFaSrxX8aj7yOW= z1zb7pw@O3|58F6UvXQayla18N%7++?=gjCZ2tUT3zy_BpKIv-pJ0xR#3Vkl)SFMi6 z)#>~#)0TE)IQDrlp@~y$;2|X_y>9QdVHc{B68+2p-o1S_9~J>PD!;9` zrOzAG@>1FN{HmoXsOA0pCQcL^>A23*xnl-ezdxNgpY^;jfM`6fTUqsKrPp496ORfg zN_cf#C9ZL@k4-!1Be1{3NT-<%>;M);8ziiJk1rd7(M+&7igb#`@Io6ioW#LbLO*-> ztmZN$J0f(%7<;j0GNA$dftG*%u9K zx%>;}SJnFNvQSHlmOV0 z5{5%&W&HTMWxs6t)%^oW10-HFl3pEd91-Zla-vX@)ibjRyI-!YN$nA@F<4v86&~=a zxp=p%ltT9^qoa^*;?#zf3S=3qij6AdYyXC3ac9^ODZ|g$2>m@Mwa&- z?$f;*e$rFc{rW`hlmEk8+)@d+0RQZ+j6O{KZTEXp*nx}QhM8#n%i%Q+ajS^#cu~IBvxMHV(+t}XkT<;DjFup!_=I;%Q7si`5Xw3 zr_3RrNfo17aN%8Wu`4=|;(5a^d>1#qBjyNG7f|Z4E&J*7FYgos!^zMJw`KChq{&Ll zu0Io|t9)N18KECN;5uPVi}Kfa_P*}FKYPe|(E!aGU+~H|iN#uU8TVi!@AUPMMR06# z!0*Xh&@>uG``Uj}{78UnVCK)NWi@6qhhjDDFwp?NRm55Kq>Q&TB}38i`|eYzEo%ED zF=}AFC>m$DJX1L?GzOC%}QY{5G{Fd%!w54RQyhA7oBiC2?a;NR=EBkJmlZZ`4kGJ}12 zR!)#~Kz|4(ie*`oSCWKV5xw8;iH^ha{o<2iOn{FbU}t~zvg@k~%8iQl^5J9_;;OyJ zH5bzi+fusmP{IJQk}f@k6%tJNXtWebIGx9q*kVN%&LEDb%E2b&rJF7-MLID<`VscS zWAZM5s*5UY+D_?tU+N}7=iqx|*YbjJZihdy3pfS=hLK5Hc|)wvEig`gFjuDku^uqQ z`Ob@aNB=57od{>n6!!F9aFssdG>mGDB>V<@>k*!baqwGxwil%5Qb&kVi2Xec)N=X# z=|IS1ZMnE3_iq|6t_~FpwY000y~T zjCz*DkLr!uxkvw+3qS7F7re$MmGxJ`e?4)17(d=)HIQcbUB97Jg9W=&pzQYl`<#FX znk0PVGHc(SEoqj8!3zJ?N&j-^*t_-J5GGhYA4Vy!_O50u0gQN{X!CnWL}U;85|=STV>QDeptLSr0r*^ro@8&xHe z#p}1bq6PA(*sOUK4NrOW?3nrPVoiD3q+JTU1j)7U?qVcU{Tz%1XyaUfB@j+R08Gl( zF?R}tl(+8f?3ob0arzpyU%ee$O(C!Mfkga3#ak56k8x#ZG*6Ccc6oVH6D4TZauSYt zaTDcq;X|Ir%huk4n0)b%gq5l#+?`i=dL*`Ps59HHqrB2T7+Q~PIj~MJ*Vx~?$H(no ziNsH%`fhy+d?I5-IBz1sr-4F!6tBt!jXj1U!PLCA-_L3J^GYo>qHxnz zKm0X*O<8fQ51Vh}2gDu{d{dblZz~}uB&n~z;xqm$MF*oV!pS5_Q_)YVqOisrtjZ=T zxn=wn06IOMuqC&IO^s8o=|=#q-P2AIyGOyI?;d;ID08G&cbHlMpR^VfVQ*7gor3lA zZop$H(teWg5+>Cif?~q#IVnLY5(IARv;aMD`nV_tw{OAo_LfyfRU65D}X+? zoX{AH)!p*A*INRniKl>>QCB2^Q}b2QkN{Yh)!Ies#?Lb#ZI`{ol3LK`@yTMlQh?Ng zo#340rNTm)nVU4LzS2oXRox5MS>kIeQ-qs%(sKm>cN}*?s^VE%DogK^0)FO3>Rl$h zNdh+V1q|YLXh>T8>rycoLYn?u@JEc_d+n7@`UvWMka=sJmfK5rY;@tL{f`XFX-Yy7`VjC@DavyN9XZ21PylPL4$UYv_8*W_R9D)?b2vj#gAgi!sLxiwsUaa?WN~9RKY47!7AV zl*5OT6wXTusP*)(4uxLFp&TOy7+Bht3I9LF-a4$RsCyUPba!_ODlH1qDIuvy2}mj3 z-HVb?8UYcI2Bo`U(;d>?(%rS=EWht}&wb84|6HE6*>i7LYt1p%toNNGs9y&F>bx9% zwI;kD;toE{JJFDBL^I$?67;{M0AYyOxO2D$((+yRP*qI)z!&|A&5IN9|luB^SU@nTD@sX%ZHBP$pdthZ7%h`kUd-$jSm+@=uHG= z$03DGNAAL3=bz(lk}(ne0^M>+>WNXEaF|FNTi-EzeU8lz8$&@SMr%(Krq#U6oIQ0M z!G0wgFeYTzaOZIdg1-!R?LofDn4uIk
    4M$6}=Z&2Eg3?Tr&R_2p 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 DfuUkk delta 37676 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

    H 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 Date: Sun, 13 Jul 2014 13:29:19 -0700 Subject: [PATCH 43/88] Changed URL to Corporate Regulations --- code/game/objects/items/weapons/manuals.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 319486d6a3..7ddcfc7be2 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -749,7 +749,7 @@ - + From 743ac6115541c4748371565de07fdfcd8ef87faa Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Sun, 13 Jul 2014 13:30:36 -0700 Subject: [PATCH 44/88] Little Slip-up --- code/game/objects/items/weapons/manuals.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 7ddcfc7be2..a7eb1e4bdf 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -749,7 +749,7 @@ - + From aa2ea04c279b170b7db3dbe91fa80c8a38668412 Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Sun, 13 Jul 2014 13:47:07 -0700 Subject: [PATCH 45/88] space law -> Corporate regs in skills --- code/modules/mob/new_player/skill.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/new_player/skill.dm b/code/modules/mob/new_player/skill.dm index 09de8abffe..3eb1c6a246 100644 --- a/code/modules/mob/new_player/skill.dm +++ b/code/modules/mob/new_player/skill.dm @@ -62,7 +62,7 @@ datum/skill/management datum/skill/knowledge/law ID = "law" name = "NanoTrasen Law" - desc = "Your knowledge of NanoTrasen law and procedures. This includes Space Law, as well as general station rulings and procedures. A low level in this skill is typical for security officers, a high level in this skill is typical for captains." + desc = "Your knowledge of NanoTrasen law and procedures. This includes Corporate Regulations, as well as general station rulings and procedures. A low level in this skill is typical for security officers, a high level in this skill is typical for captains." field = "Security" secondary = 1 @@ -232,4 +232,4 @@ mob/living/carbon/human/verb/show_skills() set category = "IC" set name = "Show Own Skills" - show_skill_window(src, src) \ No newline at end of file + show_skill_window(src, src) From 43cc7cf39ad44786d5faa634c1d492dec0c1489f Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Sun, 13 Jul 2014 13:48:13 -0700 Subject: [PATCH 46/88] Space law -> Corporate regs in captain.dm --- code/game/jobs/job/captain.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index acc7c3e853..b75ed7c458 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -5,7 +5,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "Nanotrasen officials and Space law" + supervisors = "Nanotrasen officials and Corporate Regulations" selection_color = "#ccccff" idtype = /obj/item/weapon/card/id/gold req_admin_notify = 1 From b8e81f31d376c184e904f1a3d8d7866a30f67565 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 10:18:37 +0930 Subject: [PATCH 47/88] Fixes #5595 --- code/modules/mob/living/carbon/human/emote.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 591e4426e0..d4050c06b8 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -66,8 +66,10 @@ return custom_emote(m_type, message) if ("me") - if(silent) - return + + //if(silent && silent > 0 && findtext(message,"\"",1, null) > 0) + // return //This check does not work and I have no idea why, I'm leaving it in for reference. + if (src.client) if (client.prefs.muted & MUTE_IC) src << "\red You cannot send IC messages (muted)." From 4f032ef7f4c19faaeb691ba93ee11007f43ff029 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 10:43:47 +0930 Subject: [PATCH 48/88] Fixes #5600 --- code/WorkInProgress/computer3/laptop.dm | 49 +++++++++++++++++++++---- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/code/WorkInProgress/computer3/laptop.dm b/code/WorkInProgress/computer3/laptop.dm index bff5a116f3..b88f782c2c 100644 --- a/code/WorkInProgress/computer3/laptop.dm +++ b/code/WorkInProgress/computer3/laptop.dm @@ -30,18 +30,18 @@ var/obj/machinery/computer3/laptop/stored_computer = null verb/open_computer() - set name = "open laptop" + set name = "Open Laptop" set category = "Object" set src in view(1) - + if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) usr << "\red You can't do that." return - + if(!Adjacent(usr)) usr << "You can't reach it." return - + if(!istype(loc,/turf)) usr << "[src] is too bulky! You'll have to set it down." return @@ -69,9 +69,42 @@ if(Adjacent(usr)) open_computer() +//Quickfix until Snapshot works out how he wants to redo power. ~Z +/obj/item/device/laptop/verb/eject_id() + set category = "Object" + set name = "Eject ID Card" + set src in oview(1) + + if(stored_computer) + stored_computer.eject_id() + +/obj/machinery/computer3/laptop/verb/eject_id() + set category = "Object" + set name = "Eject ID Card" + set src in oview(1) + + var/obj/item/part/computer/cardslot/C = locate() in src.contents + + if(!C) + usr << "There is no card port on the laptop." + return + + var/obj/item/weapon/card/id/card + if(C.reader) + card = C.reader + else if(C.writer) + card = C.writer + else + usr << "There is nothing to remove from the laptop card port." + return + + usr << "You remove [card] from the laptop." + C.remove(card) + + /obj/machinery/computer3/laptop name = "Laptop Computer" - desc = "A clamshell portable computer. It is open." + desc = "A clamshell portable computer. It is open." icon_state = "laptop" density = 0 @@ -90,15 +123,15 @@ set name = "Close Laptop" set category = "Object" set src in view(1) - + if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) usr << "\red You can't do that." return - + if(!Adjacent(usr)) usr << "You can't reach it." return - + if(istype(loc,/obj/item/device/laptop)) testing("Close closed computer") return From 8ba723695f4a756835dc59eb1ab0c28525527c64 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 10:47:45 +0930 Subject: [PATCH 49/88] Fixes #5540 --- icons/mob/species/tajaran/helmet.dmi | Bin 11193 -> 10957 bytes icons/mob/species/tajaran/suit.dmi | Bin 5157 -> 5159 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi index dc431a835afc4fdcdfd8974fce1fdf4ce881a6c1..7316d42bb398f3b61064fb61bd28b150df45f2f0 100644 GIT binary patch delta 10210 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 RARGhzQBl-XD3`Mg{U3m#C!zoV diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/species/tajaran/suit.dmi index d0eca318fd2b655231346279ebbb3a3c24f492b6..13eb7174d941c17463cfb89d809adfa7497f7e5d 100644 GIT binary patch delta 4699 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 Date: Mon, 14 Jul 2014 11:42:39 +0930 Subject: [PATCH 50/88] Bandaid fix for #5589 --- code/modules/supermatter/supermatter.dm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index 129f54daa4..e7e3cc4972 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -123,20 +123,22 @@ shift_light(5, warning_color) if((world.timeofday - lastwarning) / 10 >= WARNING_DELAY) var/stability = num2text(round((damage / explosion_point) * 100)) + var/alert_msg if(damage > emergency_point) shift_light(7, emergency_color) - radio.autosay(addtext(emergency_alert, " Instability: ",stability,"%"), "Supermatter Monitor") + alert_msg = addtext(emergency_alert, " Instability: ",stability,"%") lastwarning = world.timeofday - else if(damage >= damage_archived) // The damage is still going up - radio.autosay(addtext(warning_alert," Instability: ",stability,"%"), "Supermatter Monitor") + alert_msg = addtext(warning_alert," Instability: ",stability,"%") lastwarning = world.timeofday - 150 - - else // Phew, we're safe - radio.autosay(safe_alert, "Supermatter Monitor") + else // Phew, we're safe + alert_msg = safe_alert lastwarning = world.timeofday + if(!istype(L, /turf/space) && alert_msg) + radio.autosay(alert_msg, "Supermatter Monitor") + if(damage > explosion_point) for(var/mob/living/mob in living_mob_list) if(istype(mob, /mob/living/carbon/human)) From 2b9b9b7a7d7bb7dd49825a8d1d3eaf3347c8a215 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 11:50:16 +0930 Subject: [PATCH 51/88] Fixes #5573 --- code/modules/mob/living/carbon/human/life.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 211da1cdac..09ffb42681 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1098,6 +1098,9 @@ return //TODO: DEFERRED proc/handle_regular_status_updates() + + if(status_flags & GODMODE) return 0 + if(stat == DEAD) //DEAD. BROWN BREAD. SWIMMING WITH THE SPESS CARP blinded = 1 silent = 0 From 2c634a8d7ad03e2e718750d51ee8725497fe370d Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 12:00:15 +0930 Subject: [PATCH 52/88] Fixes #5611 --- code/modules/mob/new_player/new_player.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index b4d3f02196..0f18e02cf3 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -134,6 +134,7 @@ return 1 if(href_list["late_join"]) + if(!ticker || ticker.current_state != GAME_STATE_PLAYING) usr << "\red The round is either not ready, or has already finished..." return @@ -143,6 +144,11 @@ src << alert("You are currently not whitelisted to play [client.prefs.species].") return 0 + var/datum/species/S = all_species[client.prefs.species] + if(!(S.flags & IS_WHITELISTED)) + src << alert("Your current species,[client.prefs.species], is not available for play on the station.") + return 0 + LateChoices() if(href_list["manifest"]) @@ -159,6 +165,11 @@ src << alert("You are currently not whitelisted to play [client.prefs.species].") return 0 + var/datum/species/S = all_species[client.prefs.species] + if(!(S.flags & IS_WHITELISTED)) + src << alert("Your current species,[client.prefs.species], is not available for play on the station.") + return 0 + AttemptLateSpawn(href_list["SelectedJob"],client.prefs.spawnpoint) return From bc2f91b4e4913b2598460cb4acee22b1e0abe4d9 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 12:02:48 +0930 Subject: [PATCH 53/88] Fixes #5608 --- code/modules/mining/machine_processing.dm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index d350e2052c..d8b671af25 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -142,10 +142,20 @@ /obj/machinery/mineral/processing_unit/process() - if (!active || !src.output || !src.input) return + if (!src.output || !src.input) return var/list/tick_alloys = list() + //Grab some more ore to process this tick. + for(var/i = 0,i Date: Mon, 14 Jul 2014 12:16:02 +0930 Subject: [PATCH 54/88] Fixes #5508 --- code/modules/mob/living/carbon/human/death.dm | 3 --- code/modules/organs/organ_external.dm | 22 ++++++++++++------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index bebd5680ef..e14cd9c534 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -58,7 +58,6 @@ dizziness = 0 jitteriness = 0 - hud_updateflag |= 1 << HEALTH_HUD hud_updateflag |= 1 << STATUS_HUD @@ -117,8 +116,6 @@ ticker.mode.check_win() //Calls the rounds wincheck, mainly for wizard, malf, and changeling now return ..(gibbed) - - /mob/living/carbon/human/proc/makeSkeleton() if(SKELETON in src.mutations) return diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index b885d7610e..713de4aef4 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -32,6 +32,7 @@ var/damage_msg = "\red You feel an intense pain" var/broken_description + var/vital //Lose a vital limb, die immediately. var/status = 0 var/open = 0 var/stage = 0 @@ -355,7 +356,7 @@ INFECTION_LEVEL_THREE above this germ level the player will take additional toxi Note that amputating the affected organ does in fact remove the infection from the player's body. */ /datum/organ/external/proc/update_germs() - + if(status & (ORGAN_ROBOT|ORGAN_DESTROYED) || (owner.species && owner.species.flags & IS_PLANT)) //Robotic limbs shouldn't be infected, nor should nonexistant limbs. germ_level = 0 return @@ -363,7 +364,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(owner.bodytemperature >= 170) //cryo stops germs from moving and doing their bad stuffs //** Syncing germ levels with external wounds handle_germ_sync() - + //** Handle antibiotics and curing infections handle_antibiotics() @@ -386,10 +387,10 @@ Note that amputating the affected organ does in fact remove the infection from t /datum/organ/external/proc/handle_germ_effects() var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin") - + if (germ_level > 0 && germ_level < INFECTION_LEVEL_ONE && prob(60)) //this could be an else clause, but it looks cleaner this way germ_level-- //since germ_level increases at a rate of 1 per second with dirty wounds, prob(60) should give us about 5 minutes before level one. - + if(germ_level >= INFECTION_LEVEL_ONE) //having an infection raises your body temperature var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 1)* min(germ_level/INFECTION_LEVEL_THREE, 1) + owner.species.body_temperature @@ -400,7 +401,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(prob(round(germ_level/10))) if (antibiotics < 5) germ_level++ - + if (prob(5)) //adjust this to tweak how fast people take toxin damage from infections owner.adjustToxLoss(1) @@ -411,7 +412,7 @@ Note that amputating the affected organ does in fact remove the infection from t if (I.germ_level > 0 && I.germ_level < min(germ_level, INFECTION_LEVEL_TWO)) //once the organ reaches whatever we can give it, or level two, switch to a different one if (!target_organ || I.germ_level > target_organ.germ_level) //choose the organ with the highest germ_level target_organ = I - + if (!target_organ) //figure out which organs we can spread germs to and pick one at random var/list/candidate_organs = list() @@ -420,7 +421,7 @@ Note that amputating the affected organ does in fact remove the infection from t candidate_organs += I if (candidate_organs.len) target_organ = pick(candidate_organs) - + if (target_organ) target_organ.germ_level++ @@ -666,6 +667,9 @@ Note that amputating the affected organ does in fact remove the infection from t // OK so maybe your limb just flew off, but if it was attached to a pair of cuffs then hooray! Freedom! release_restraints() + if(vital) + owner.death() + /**************************************************** HELPERS ****************************************************/ @@ -829,7 +833,7 @@ Note that amputating the affected organ does in fact remove the infection from t max_damage = 75 min_broken_damage = 40 body_part = UPPER_TORSO - + vital = 1 /datum/organ/external/groin name = "groin" @@ -838,6 +842,7 @@ Note that amputating the affected organ does in fact remove the infection from t max_damage = 50 min_broken_damage = 30 body_part = LOWER_TORSO + vital = 1 /datum/organ/external/l_arm name = "l_arm" @@ -931,6 +936,7 @@ Note that amputating the affected organ does in fact remove the infection from t min_broken_damage = 40 body_part = HEAD var/disfigured = 0 + vital = 1 /datum/organ/external/head/get_icon() if (!owner) From a2a5991baecf7467ce89954a425a9fe0540224a9 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 12:23:28 +0930 Subject: [PATCH 55/88] Fixes #5523 --- code/modules/clothing/head/jobs.dm | 2 +- icons/obj/clothing/hats.dmi | Bin 59315 -> 59313 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index d2ef8deccf..692cc90b63 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -3,7 +3,7 @@ /obj/item/clothing/head/chefhat name = "chef's hat" desc = "It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work." - icon_state = "chef" + icon_state = "chefhat" item_state = "chefhat" desc = "The commander in chef's head wear." flags = FPRINT | TABLEPASS diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 31be71e8e9eecca1d639cc38d64c8593f365bc0d..901928b4145bd83ecc9cc33635a2cfb8c932ac68 100644 GIT binary patch delta 933 zcmV;W16usE&jYc~1CS&Ev9TpD0e{G{^b(7V0;?|37@+2AY*v+vL8{~_&0|_knNGhp()KU{9yp*|fl=AEhO;}%HXhPD@IGQ|3 z=v<8D(ZdXaDzTgfVb;V@ZGR9K&*d~tY*IV|9m&ddM=#R^7~Y`F0X7zzfT{MZoV%VZ za8GboLyw#lIY<`{K;bxXhIVKq@gtSp%*;MR2guCalP{NWj#8c#JCkfpgj#$Zf#T5( z>y`9NmVN#``!c62h9?Q-PIP0z5@@5Lf@Wi}u6Bcwf?%X!PJkil5PzZkypec@da^>u zRc=UaA9d);SKzIJn&xpj0o~KBib4Z83~3_69r!|JxC&Pp+6Jo@RfYqOwhf0t0<$8O zo62yg4QQKD0xXWRZL`QLxEdJPHi^xDUolM#HM7s1i_ww?&cy69dLVi~Gn9dEAe?}! zTS40IXx#-2iQmW??SCsOeXUYn+dxSB9fj4WStpOFzoW3al7t@I(4SabpDm`nai^roFR!n;#wHz>Zby2orfMRB~Q4sE#bYj4pE+ZxANz{os zac~U0?_D^=aAELk~FGHi->v_T^S&*1^!!ttkrQ*nh7J8;sR^bD->`bL_{? zI0jlrN1{g`7ogoasf5r$M`6vLs;oH2OEW2_G%N6I9WRX`C8&v}vAhgxJ*2raaU3aF zU^&)`s5WFB1%6t-MO1je8t_)D;ong+sYC6g4t0~NX_n9N(xlAfbGaQj$II%F<@+{z zG3?lv`)d~y^nXedb;4Sw4TP_?bW-+yD6OVi^t@+!Y4Bd>P|3GV zx&|xUWO@M|y^6o-uisuZ1Rio5W!;skQSgwrQEKFYhnDTf)lcQ(n?pttB`uVp#QW({ z82f&W(8Hd}aHwG0CXqiAU{&kFg7B-O&?Q59{1f_d{}JW;)Bfq(^X`A6h=ur2dP`HY H-~`j+M$XJ6 delta 935 zcmV;Y16cgA&jYj11CS&Ev#}*F0e?lPmsn&Ju-sl^H*jDj53yz}kK0S^&Z5!B;R?Zt z&8(6!_=SSxsF<)34p~z9jP-Hs(=0gHElz+8d&B?r<-KsE)=_S|D|;Uols{DRZD%2` zy~$VMZ3nvQO}>tA!G*ucSK)1k`1(y7fu}{vIe+w&J3~|1irHJlL?%(>0)OZ!SPE2@ z^EAwCqd_vyG1=q=aKxS!C^P5eD4fW~rR>KWI|C~zucYPeTO=D-wptmQ2&A~O1;_2@ z5Xy#lmgqTyk|)WC$8L_5*dSlD9Y|ooM^Z`Uqn4T=;ib%-qm*Z7Xu_HbLlcsI#?jVKs^E}qM2n%Jax1lp06>yBQg2{61tnFDMrGyzlXSvhw- zS>T@Fu7(~tD{_!79Du5E;tcK3Na9B-yP27Nh7ORKxhG#P;T)wrD|RN?nh5pxIs(O` z8`dl7mn{4Id-i2cSqx7S%5CVzf+f&KLj}#oVlC|kBL%@o!<+y^(tjaB`FSJp4E1D% zkgME~+CJ*gm9M~C1vSm%bOKtZTNQ-{a2V1=hCA?i%5W8~GPDg=EvgI$9Bms8g9K(p zDmRtkP#e%TqXbwSXWM3xS8z2jux%2X|Gr|H7;0vpI~SuR51fhFXY@eyer6~G-#|D4 zSGR(+-_g1Y7!tpcHGkSyRQg(_ytaXm_B#rzPqR)QQ-4QcbtMTsxS>C>xISA9_c;CBlh~;8KWoR49BZeMuv~3a_*zC)#$gG2*sasPN#(%M&7B(2G_vS#^N$1#) zopB7bj*di+J}yAJb5aSRgO0+QJylt8j+bUqPH9%)%{pEhLrPE+O=Ec()_O>DXW}?g zu)uPx6;W--Itu)>e2b{?fHmN)R>QxeW>SaRNge7YRnsh=(xAaE_PNAP8$ecYw4uy{Z>GNPs_i?U_Y*I_R=epap-x^^wQwH&Y_ZT zn{*9UxXJVaI(ij<(_g>6Y6v{!Hp;pyRioe`Z==-60}n0RFRP!*#W#nHBuZK+Ly7m( zqcHaU8li_hmElmqwoM{`CcvuJg$3bPN1;oG^pC&0eiPh(`Tn$j`u4p0AI8vxyN!=o JCbQlI)8bDo&o}@8 From 338602ee181d8d4871acac51dd1580bb0997514c Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 12:41:10 +0930 Subject: [PATCH 56/88] Fixes #5531 --- baystation12.dme | 1 + code/modules/mob/living/carbon/brain/login.dm | 3 ++- code/modules/mob/living/silicon/login.dm | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/baystation12.dme b/baystation12.dme index 411f58ddd3..855bd5368e 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -954,6 +954,7 @@ #include "code\modules\mob\living\carbon\brain\death.dm" #include "code\modules\mob\living\carbon\brain\emote.dm" #include "code\modules\mob\living\carbon\brain\life.dm" +#include "code\modules\mob\living\carbon\brain\login.dm" #include "code\modules\mob\living\carbon\brain\MMI.dm" #include "code\modules\mob\living\carbon\brain\posibrain.dm" #include "code\modules\mob\living\carbon\brain\say.dm" diff --git a/code/modules/mob/living/carbon/brain/login.dm b/code/modules/mob/living/carbon/brain/login.dm index 84bccdfe96..e90297dfe5 100644 --- a/code/modules/mob/living/carbon/brain/login.dm +++ b/code/modules/mob/living/carbon/brain/login.dm @@ -1,2 +1,3 @@ /mob/living/carbon/brain/Login() - return ..() \ No newline at end of file + ..() + sleeping = 0 \ No newline at end of file diff --git a/code/modules/mob/living/silicon/login.dm b/code/modules/mob/living/silicon/login.dm index 32e0c8d346..a95a754eae 100644 --- a/code/modules/mob/living/silicon/login.dm +++ b/code/modules/mob/living/silicon/login.dm @@ -1,4 +1,5 @@ /mob/living/silicon/Login() + sleeping = 0 if(mind && ticker && ticker.mode) ticker.mode.remove_cultist(mind, 1) ticker.mode.remove_revolutionary(mind, 1) From a0291b0d7aac8b7ae1696d30b7e5dbcd1ec0de3e Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 14 Jul 2014 12:51:30 +0930 Subject: [PATCH 57/88] Fixes #5485 --- code/modules/mob/living/carbon/human/life.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 09ffb42681..f772fe5840 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -690,6 +690,7 @@ loc_temp = environment.temperature if(adjusted_pressure < species.warning_high_pressure && adjusted_pressure > species.warning_low_pressure && abs(loc_temp - bodytemperature) < 20 && bodytemperature < species.heat_level_1 && bodytemperature > species.cold_level_1 && environment.phoron < MOLES_PHORON_VISIBLE) + pressure_alert = 0 return // Temperatures are within normal ranges, fuck all this processing. ~Ccomp //Body temperature adjusts depending on surrounding atmosphere based on your thermal protection From bb6eedf19350488fe022c675851ee5d5bdee7005 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Mon, 14 Jul 2014 08:28:14 +0400 Subject: [PATCH 58/88] Fixes #5563 --- code/modules/surgery/braincore.dm | 7 +++++-- code/modules/surgery/surgery.dm | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/code/modules/surgery/braincore.dm b/code/modules/surgery/braincore.dm index b89c48275b..76d8e21d62 100644 --- a/code/modules/surgery/braincore.dm +++ b/code/modules/surgery/braincore.dm @@ -187,9 +187,12 @@ // SLIME CORE EXTRACTION // ////////////////////////////////////////////////////////////////// -/datum/surgery_step/slime/ +/datum/surgery_step/slime + is_valid_target(mob/living/carbon/slime/target) + return istype(target, /mob/living/carbon/slime/) + can_use(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - return istype(target, /mob/living/carbon/slime/) && target.stat == 2 + return target.stat == 2 /datum/surgery_step/slime/cut_flesh allowed_tools = list( diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 05371f18c8..ed7b449bc4 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -25,8 +25,10 @@ return allowed_tools[T] return 0 - // Checks if this step applies to the mutantrace of the user. - proc/is_valid_mutantrace(mob/living/carbon/human/target) + // Checks if this step applies to the user mob at all + proc/is_valid_target(mob/living/carbon/human/target) + if(!hasorgans(target)) + return 0 if(allowed_species) for(var/species in allowed_species) @@ -40,6 +42,7 @@ return 1 + // checks whether this step can be applied with the given user and target proc/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) return 0 @@ -81,7 +84,7 @@ proc/do_surgery(mob/living/M, mob/living/user, obj/item/tool) return 0 for(var/datum/surgery_step/S in surgery_steps) //check if tool is right or close enough and if this step is possible - if( S.tool_quality(tool) && S.can_use(user, M, user.zone_sel.selecting, tool) && S.is_valid_mutantrace(M)) + if( S.tool_quality(tool) && S.can_use(user, M, user.zone_sel.selecting, tool) && S.is_valid_target(M)) S.begin_step(user, M, user.zone_sel.selecting, tool) //start on it //We had proper tools! (or RNG smiled.) and User did not move or change hands. if( prob(S.tool_quality(tool)) && do_mob(user, M, rand(S.min_duration, S.max_duration))) From a6b4f5d2aa4e60b0b4b7451a87385f42bc31feff Mon Sep 17 00:00:00 2001 From: Whitellama Date: Sun, 13 Jul 2014 23:23:26 -0700 Subject: [PATCH 59/88] Fixed issues with cans complaining twice when trying to drink unopened and with transfering fluids between closed cans --- .../reagents/reagent_containers/food/cans.dm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 2cc1c1ffda..884d2d8e84 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -32,7 +32,7 @@ return 1 else if( istype(M, /mob/living/carbon/human) ) if (canopened == 0) - user << " You need to open the drink!" + user << "You need to open the drink!" return else if (canopened == 1) @@ -66,6 +66,9 @@ if(!proximity) return if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us. + if (canopened == 0) + user << "You need to open the drink!" + return if(!target.reagents.total_volume) user << "\red [target] is empty." @@ -77,10 +80,19 @@ var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this) user << "\blue You fill [src] with [trans] units of the contents of [target]." - if (canopened == 0) - user << "You need to open the drink!" + else if(target.is_open_container()) //Something like a glass. Player probably wants to transfer TO it. + if (canopened == 0) + user << "You need to open the drink!" + return + + if (istype(target, /obj/item/weapon/reagent_containers/food/drinks/cans)) + var/obj/item/weapon/reagent_containers/food/drinks/cans/cantarget = target + if(cantarget.canopened == 0) + user << "You need to open the drink you want to pour into!" + return + if(!reagents.total_volume) user << "\red [src] is empty." return From fd0ee4cf2f369972d107ec783722669514013665 Mon Sep 17 00:00:00 2001 From: Mark Aherne Date: Mon, 14 Jul 2014 11:50:25 +0100 Subject: [PATCH 60/88] Fixed comments for new JS files in nanoui.dm. Changed the BYOND cache path in "To BYOND Cache.bat" to a dynamic path. --- code/modules/nano/nanoui.dm | 8 ++++---- nano/To BYOND Cache.bat | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index b3262ee297..f788d0eeea 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -96,10 +96,10 @@ nanoui is used to open and update nano browser uis add_script("libraries.min.js") // A JS file comprising of jQuery, doT.js and jQuery Timer libraries (compressed together) add_script("nano_utility.js") // The NanoUtility JS, this is used to store utility functions. add_script("nano_template.js") // The NanoTemplate JS, this is used to render templates. - add_script("nano_state_manager.js") // The - add_script("nano_state.js") // The - add_script("nano_state_default.js") // The - add_script("nano_base_callbacks.js") // The + add_script("nano_state_manager.js") // The NanoStateManager JS, it handles updates from the server and passes data to the current state + add_script("nano_state.js") // The NanoState JS, this is the base state which all states must inherit from + add_script("nano_state_default.js") // The NanoStateDefault JS, this is the "default" state (used by all UIs by default), which inherits from NanoState + add_script("nano_base_callbacks.js") // The NanoBaseCallbacks JS, this is used to set up (before and after update) callbacks which are common to all templates add_script("nano_base_helpers.js") // The NanoBaseHelpers JS, this is used to set up template helpers which are common to all templates add_stylesheet("shared.css") // this CSS sheet is common to all UIs add_stylesheet("icons.css") // this CSS sheet is common to all UIs diff --git a/nano/To BYOND Cache.bat b/nano/To BYOND Cache.bat index ececbd1eac..486b8d1bea 100644 --- a/nano/To BYOND Cache.bat +++ b/nano/To BYOND Cache.bat @@ -1,4 +1,4 @@ -copy css\* C:\Users\Mark\Documents\BYOND\cache /y -copy images\* C:\Users\Mark\Documents\BYOND\cache /y -copy js\* C:\Users\Mark\Documents\BYOND\cache /y -copy templates\* C:\Users\Mark\Documents\BYOND\cache /y \ No newline at end of file +copy css\* "%USERPROFILE%\Documents\BYOND\cache" /y +copy images\* "%USERPROFILE%\Documents\BYOND\cache" /y +copy js\* "%USERPROFILE%\Documents\BYOND\cache" /y +copy templates\* "%USERPROFILE%\Documents\BYOND\cache" /y From 0dabf4fc0a19024855b805ac765efe92ebad2de6 Mon Sep 17 00:00:00 2001 From: Decius Date: Mon, 14 Jul 2014 16:27:07 -0400 Subject: [PATCH 61/88] Added in loyalty implant as a configuration... Also reorganized a few configurations to be more intuitive and readable. Just spaces and moving around on the switch thingy. Signed-off-by: Decius --- code/controllers/configuration.dm | 26 ++++++++++++++++++-------- config/example/game_options.txt | 8 ++++++++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index f9d825d896..66747abbb5 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -112,6 +112,8 @@ var/revival_cloning = 1 var/revival_brain_life = -1 + var/use_loyalty_implants = 0 + //Used for modifying movement speed for mobs. //Unversal modifiers var/run_speed = 0 @@ -521,10 +523,21 @@ config.revival_cloning = value if("revival_brain_life") config.revival_brain_life = value + if("organ_health_multiplier") + config.organ_health_multiplier = value / 100 + if("organ_regeneration_multiplier") + config.organ_regeneration_multiplier = value / 100 + if("bones_can_break") + config.bones_can_break = value + if("limbs_can_break") + config.limbs_can_break = value + + if("run_speed") config.run_speed = value if("walk_speed") config.walk_speed = value + if("human_delay") config.human_delay = value if("robot_delay") @@ -537,14 +550,11 @@ config.slime_delay = value if("animal_delay") config.animal_delay = value - if("organ_health_multiplier") - config.organ_health_multiplier = value / 100 - if("organ_regeneration_multiplier") - config.organ_regeneration_multiplier = value / 100 - if("bones_can_break") - config.bones_can_break = value - if("limbs_can_break") - config.limbs_can_break = value + + + if("use_loyalty_implants") + config.use_loyalty_implants = 1 + else log_misc("Unknown setting in configuration: '[name]'") diff --git a/config/example/game_options.txt b/config/example/game_options.txt index 4fdc0f5f3f..614e696df2 100644 --- a/config/example/game_options.txt +++ b/config/example/game_options.txt @@ -56,3 +56,11 @@ MONKEY_DELAY 0 ALIEN_DELAY 0 METROID_DELAY 0 ANIMAL_DELAY 0 + + +### Miscellaneous ### + +## Config options which, of course, don't fit into previous categories. + +## Remove the # in front of this config option to have loyalty implants spawn by default on your server. +#USE_LOYALTY_IMPLANTS From c920b0234fbfb75e3de6dc80d3e03baaa2095981 Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Mon, 14 Jul 2014 23:13:46 +0200 Subject: [PATCH 62/88] Renames CoM into center_of_mass --- .../reagents/reagent_containers/food.dm | 8 +- .../reagents/reagent_containers/food/cans.dm | 28 +-- .../reagent_containers/food/condiment.dm | 24 +- .../reagent_containers/food/drinks.dm | 28 +-- .../reagent_containers/food/drinks/bottle.dm | 44 ++-- .../food/drinks/drinkingglass.dm | 236 +++++++++--------- .../reagent_containers/food/drinks/jar.dm | 2 +- .../reagent_containers/food/snacks.dm | 2 +- 8 files changed, 186 insertions(+), 186 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food.dm b/code/modules/reagents/reagent_containers/food.dm index 876df70505..99261d81d9 100644 --- a/code/modules/reagents/reagent_containers/food.dm +++ b/code/modules/reagents/reagent_containers/food.dm @@ -6,7 +6,7 @@ volume = 50 //Sets the default container amount for all food items. var/filling_color = "#FFFFFF" //Used by sandwiches. - var/list/CoM = newlist() //Center of mass + var/list/center_of_mass = newlist() //Center of mass /obj/item/weapon/reagent_containers/food/New() ..() @@ -15,7 +15,7 @@ src.pixel_y = rand(-6.0, 6) /obj/item/weapon/reagent_containers/food/afterattack(atom/A, mob/user, proximity, params) - if(proximity && params && istype(A, /obj/structure/table) && CoM.len) + if(proximity && params && istype(A, /obj/structure/table) && center_of_mass.len) //Places the item on a grid var/list/mouse_control = params2list(params) var/cellnumber = 4 @@ -28,7 +28,7 @@ if(mouse_control["icon-x"]) var/sign = mouse_x - grid_x != 0 ? sign(mouse_x - grid_x) : -1 //positive if rounded down, else negative - pixel_x = grid_x - CoM["x"] + sign*16/cellnumber //center of the cell + pixel_x = grid_x - center_of_mass["x"] + sign*16/cellnumber //center of the cell if(mouse_control["icon-y"]) var/sign = mouse_y - grid_y != 0 ? sign(mouse_y - grid_y) : -1 - pixel_y = grid_y - CoM["y"] + sign*16/cellnumber \ No newline at end of file + pixel_y = grid_y - center_of_mass["y"] + sign*16/cellnumber \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 7a0f81b3b9..4083f0b442 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -135,7 +135,7 @@ name = "Space Cola" desc = "Cola. in space." icon_state = "cola" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) New() ..() reagents.add_reagent("cola", 30) @@ -144,7 +144,7 @@ name = "Bottled Water" desc = "Introduced to the vending machines by Skrellian request, this water comes straight from the Martian poles." icon_state = "waterbottle" - CoM = list("x"=15, "y"=8) + center_of_mass = list("x"=15, "y"=8) New() ..() reagents.add_reagent("water", 30) @@ -153,7 +153,7 @@ name = "Space Beer" desc = "Contains only water, malt and hops." icon_state = "beer" - CoM = list("x"=16, "y"=12) + center_of_mass = list("x"=16, "y"=12) New() ..() reagents.add_reagent("beer", 30) @@ -163,7 +163,7 @@ desc = "A true dorf's drink of choice." icon_state = "alebottle" item_state = "beer" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) New() ..() reagents.add_reagent("ale", 30) @@ -173,7 +173,7 @@ name = "Space Mountain Wind" desc = "Blows right through you like a space wind." icon_state = "space_mountain_wind" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) New() ..() reagents.add_reagent("spacemountainwind", 30) @@ -182,7 +182,7 @@ name = "Thirteen Loko" desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly." icon_state = "thirteen_loko" - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) New() ..() reagents.add_reagent("thirteenloko", 30) @@ -191,7 +191,7 @@ name = "Dr. Gibb" desc = "A delicious mixture of 42 different flavors." icon_state = "dr_gibb" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) New() ..() reagents.add_reagent("dr_gibb", 30) @@ -200,7 +200,7 @@ name = "Star-kist" desc = "The taste of a star in liquid form. And, a bit of tuna...?" icon_state = "starkist" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) New() ..() reagents.add_reagent("cola", 15) @@ -210,7 +210,7 @@ name = "Space-Up" desc = "Tastes like a hull breach in your mouth." icon_state = "space-up" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) New() ..() reagents.add_reagent("space_up", 30) @@ -219,7 +219,7 @@ name = "Lemon-Lime" desc = "You wanted ORANGE. It gave you Lemon Lime." icon_state = "lemon-lime" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) New() ..() reagents.add_reagent("lemon_lime", 30) @@ -228,7 +228,7 @@ name = "Vrisk Serket Iced Tea" desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth?" icon_state = "ice_tea_can" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) New() ..() reagents.add_reagent("icetea", 30) @@ -237,7 +237,7 @@ name = "Grapel Juice" desc = "500 pages of rules of how to appropriately enter into a combat with this juice!" icon_state = "purple_can" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) New() ..() reagents.add_reagent("grapejuice", 30) @@ -246,7 +246,7 @@ name = "T-Borg's Tonic Water" desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." icon_state = "tonic" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) New() ..() reagents.add_reagent("tonic", 50) @@ -255,7 +255,7 @@ name = "Soda Water" desc = "A can of soda water. Still water's more refreshing cousin." icon_state = "sodawater" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) New() ..() reagents.add_reagent("sodawater", 50) diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 1bfff61828..dccb59a3e7 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -12,7 +12,7 @@ icon_state = "emptycondiment" flags = FPRINT | TABLEPASS | OPENCONTAINER possible_transfer_amounts = list(1,5,10) - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) volume = 50 attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -91,46 +91,46 @@ name = "Ketchup" desc = "You feel more American already." icon_state = "ketchup" - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) if("capsaicin") name = "Hotsauce" desc = "You can almost TASTE the stomach ulcers now!" icon_state = "hotsauce" - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) if("enzyme") name = "Universal Enzyme" desc = "Used in cooking various dishes." icon_state = "enzyme" - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) if("soysauce") name = "Soy Sauce" desc = "A salty soy-based flavoring." icon_state = "soysauce" - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) if("frostoil") name = "Coldsauce" desc = "Leaves the tongue numb in its passage." icon_state = "coldsauce" - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) if("sodiumchloride") name = "Salt Shaker" desc = "Salt. From space oceans, presumably." icon_state = "saltshaker" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("blackpepper") name = "Pepper Mill" desc = "Often used to flavor food or make people sneeze." icon_state = "peppermillsmall" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("cornoil") name = "Corn Oil" desc = "A delicious oil used in cooking. Made from corn." icon_state = "oliveoil" - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) if("sugar") name = "Sugar" desc = "Tastey space sugar!" - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) else name = "Misc Condiment Bottle" if (reagents.reagent_list.len==1) @@ -138,12 +138,12 @@ else desc = "A mixture of various condiments. [reagents.get_master_reagent_name()] is one of them." icon_state = "mixedcondiments" - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) else icon_state = "emptycondiment" name = "Condiment Bottle" desc = "An empty condiment bottle." - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) return /obj/item/weapon/reagent_containers/food/condiment/enzyme diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index eb856435c0..a9aa234060 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -169,7 +169,7 @@ desc = "It's milk. White and nutritious goodness!" icon_state = "milk" item_state = "carton" - CoM = list("x"=16, "y"=9) + center_of_mass = list("x"=16, "y"=9) New() ..() reagents.add_reagent("milk", 50) @@ -193,7 +193,7 @@ desc = "It's soy milk. White and nutritious goodness!" icon_state = "soymilk" item_state = "carton" - CoM = list("x"=16, "y"=9) + center_of_mass = list("x"=16, "y"=9) New() ..() reagents.add_reagent("soymilk", 50) @@ -202,7 +202,7 @@ name = "Robust Coffee" desc = "Careful, the beverage you're about to enjoy is extremely hot." icon_state = "coffee" - CoM = list("x"=15, "y"=10) + center_of_mass = list("x"=15, "y"=10) New() ..() reagents.add_reagent("coffee", 30) @@ -212,7 +212,7 @@ desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea." icon_state = "teacup" item_state = "coffee" - CoM = list("x"=16, "y"=14) + center_of_mass = list("x"=16, "y"=14) New() ..() reagents.add_reagent("tea", 30) @@ -221,7 +221,7 @@ name = "Ice Cup" desc = "Careful, cold ice, do not chew." icon_state = "coffee" - CoM = list("x"=15, "y"=10) + center_of_mass = list("x"=15, "y"=10) New() ..() reagents.add_reagent("ice", 30) @@ -231,7 +231,7 @@ desc = "Made in Space South America." icon_state = "hot_coco" item_state = "coffee" - CoM = list("x"=15, "y"=13) + center_of_mass = list("x"=15, "y"=13) New() ..() reagents.add_reagent("hot_coco", 30) @@ -240,7 +240,7 @@ name = "Cup Ramen" desc = "Just add 10ml water, self heats! A taste that reminds you of your school years." icon_state = "ramen" - CoM = list("x"=16, "y"=11) + center_of_mass = list("x"=16, "y"=11) New() ..() reagents.add_reagent("dry_ramen", 30) @@ -252,7 +252,7 @@ icon_state = "water_cup_e" possible_transfer_amounts = null volume = 10 - CoM = list("x"=16, "y"=12) + center_of_mass = list("x"=16, "y"=12) New() ..() on_reagent_change() @@ -273,39 +273,39 @@ icon_state = "shaker" amount_per_transfer_from_this = 10 volume = 100 - CoM = list("x"=17, "y"=10) + center_of_mass = list("x"=17, "y"=10) /obj/item/weapon/reagent_containers/food/drinks/flask name = "Captain's Flask" desc = "A metal flask belonging to the captain" icon_state = "flask" volume = 60 - CoM = list("x"=17, "y"=7) + center_of_mass = list("x"=17, "y"=7) /obj/item/weapon/reagent_containers/food/drinks/flask/detflask name = "Detective's Flask" desc = "A metal flask with a leather band and golden badge belonging to the detective." icon_state = "detflask" volume = 60 - CoM = list("x"=17, "y"=8) + center_of_mass = list("x"=17, "y"=8) /obj/item/weapon/reagent_containers/food/drinks/flask/barflask name = "flask" desc = "For those who can't be bothered to hang out at the bar to drink." icon_state = "barflask" volume = 60 - CoM = list("x"=17, "y"=7) + center_of_mass = list("x"=17, "y"=7) /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask name = "vacuum flask" desc = "Keeping your drinks at the perfect temperature since 1892." icon_state = "vacuumflask" volume = 60 - CoM = list("x"=15, "y"=4) + center_of_mass = list("x"=15, "y"=4) /obj/item/weapon/reagent_containers/food/drinks/britcup name = "cup" desc = "A cup with the British flag emblazoned on it." icon_state = "britcup" volume = 30 - CoM = list("x"=15, "y"=13) + center_of_mass = list("x"=15, "y"=13) diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 2232a452ca..35b776af28 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -138,7 +138,7 @@ name = "Griffeater Gin" desc = "A bottle of high quality gin, produced in the New London Space Station." icon_state = "ginbottle" - CoM = list("x"=16, "y"=4) + center_of_mass = list("x"=16, "y"=4) New() ..() reagents.add_reagent("gin", 100) @@ -147,7 +147,7 @@ name = "Uncle Git's Special Reserve" desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES." icon_state = "whiskeybottle" - CoM = list("x"=16, "y"=3) + center_of_mass = list("x"=16, "y"=3) New() ..() reagents.add_reagent("whiskey", 100) @@ -156,7 +156,7 @@ name = "Tunguska Triple Distilled" desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide." icon_state = "vodkabottle" - CoM = list("x"=17, "y"=3) + center_of_mass = list("x"=17, "y"=3) New() ..() reagents.add_reagent("vodka", 100) @@ -165,7 +165,7 @@ name = "Caccavo Guaranteed Quality Tequilla" desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!" icon_state = "tequillabottle" - CoM = list("x"=16, "y"=3) + center_of_mass = list("x"=16, "y"=3) New() ..() reagents.add_reagent("tequilla", 100) @@ -174,7 +174,7 @@ name = "Bottle of Nothing" desc = "A bottle filled with nothing" icon_state = "bottleofnothing" - CoM = list("x"=17, "y"=5) + center_of_mass = list("x"=17, "y"=5) New() ..() reagents.add_reagent("nothing", 100) @@ -183,7 +183,7 @@ name = "Wrapp Artiste Patron" desc = "Silver laced tequilla, served in space night clubs across the galaxy." icon_state = "patronbottle" - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) New() ..() reagents.add_reagent("patron", 100) @@ -192,7 +192,7 @@ name = "Captain Pete's Cuban Spiced Rum" desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle." icon_state = "rumbottle" - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) New() ..() reagents.add_reagent("rum", 100) @@ -201,7 +201,7 @@ name = "Flask of Holy Water" desc = "A flask of the chaplain's holy water." icon_state = "holyflask" - CoM = list("x"=17, "y"=10) + center_of_mass = list("x"=17, "y"=10) New() ..() reagents.add_reagent("holywater", 100) @@ -210,7 +210,7 @@ name = "Goldeneye Vermouth" desc = "Sweet, sweet dryness~" icon_state = "vermouthbottle" - CoM = list("x"=17, "y"=3) + center_of_mass = list("x"=17, "y"=3) New() ..() reagents.add_reagent("vermouth", 100) @@ -219,7 +219,7 @@ name = "Robert Robust's Coffee Liqueur" desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK" icon_state = "kahluabottle" - CoM = list("x"=17, "y"=3) + center_of_mass = list("x"=17, "y"=3) New() ..() reagents.add_reagent("kahlua", 100) @@ -228,7 +228,7 @@ name = "College Girl Goldschlager" desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps." icon_state = "goldschlagerbottle" - CoM = list("x"=15, "y"=3) + center_of_mass = list("x"=15, "y"=3) New() ..() reagents.add_reagent("goldschlager", 100) @@ -237,7 +237,7 @@ name = "Chateau De Baton Premium Cognac" desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time." icon_state = "cognacbottle" - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) New() ..() reagents.add_reagent("cognac", 100) @@ -246,7 +246,7 @@ name = "Doublebeard Bearded Special Wine" desc = "A faint aura of unease and asspainery surrounds the bottle." icon_state = "winebottle" - CoM = list("x"=16, "y"=4) + center_of_mass = list("x"=16, "y"=4) New() ..() reagents.add_reagent("wine", 100) @@ -255,7 +255,7 @@ name = "Jailbreaker Verte" desc = "One sip of this and you just know you're gonna have a good time." icon_state = "absinthebottle" - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) New() ..() reagents.add_reagent("absinthe", 100) @@ -264,7 +264,7 @@ name = "Emeraldine Melon Liquor" desc = "A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light." icon_state = "alco-green" //Placeholder. - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) New() ..() reagents.add_reagent("melonliquor", 100) @@ -273,7 +273,7 @@ name = "Miss Blue Curacao" desc = "A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic." icon_state = "alco-blue" //Placeholder. - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) New() ..() reagents.add_reagent("bluecuracao", 100) @@ -282,7 +282,7 @@ name = "Briar Rose Grenadine Syrup" desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks." icon_state = "grenadinebottle" - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) New() ..() reagents.add_reagent("grenadine", 100) @@ -291,7 +291,7 @@ name = "Warlock's Velvet" desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!" icon_state = "pwinebottle" - CoM = list("x"=16, "y"=4) + center_of_mass = list("x"=16, "y"=4) New() ..() reagents.add_reagent("pwine", 100) @@ -303,7 +303,7 @@ desc = "Full of vitamins and deliciousness!" icon_state = "orangejuice" item_state = "carton" - CoM = list("x"=16, "y"=7) + center_of_mass = list("x"=16, "y"=7) isGlass = 0 New() ..() @@ -314,7 +314,7 @@ desc = "It's cream. Made from milk. What else did you think you'd find in there?" icon_state = "cream" item_state = "carton" - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) isGlass = 0 New() ..() @@ -325,7 +325,7 @@ desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." icon_state = "tomatojuice" item_state = "carton" - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) isGlass = 0 New() ..() @@ -336,7 +336,7 @@ desc = "Sweet-sour goodness." icon_state = "limejuice" item_state = "carton" - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) isGlass = 0 New() ..() diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm index fd12ac7548..c2bb90ddb8 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm @@ -6,7 +6,7 @@ icon_state = "glass_empty" amount_per_transfer_from_this = 10 volume = 50 - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) on_reagent_change() /*if(reagents.reagent_list.len > 1 ) @@ -23,177 +23,177 @@ icon_state = "beerglass" name = "Beer glass" desc = "A freezing pint of beer" - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) if("beer2") icon_state = "beerglass" name = "Beer glass" desc = "A freezing pint of beer" - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) if("ale") icon_state = "aleglass" name = "Ale glass" desc = "A freezing pint of delicious Ale" - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) if("milk") icon_state = "glass_white" name = "Glass of milk" desc = "White and nutritious goodness!" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("cream") icon_state = "glass_white" name = "Glass of cream" desc = "Ewwww..." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("chocolate") icon_state = "chocolateglass" name = "Glass of chocolate" desc = "Tasty" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("lemonjuice") icon_state = "lemonglass" name = "Glass of lemonjuice" desc = "Sour..." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("cola") icon_state = "glass_brown" name = "Glass of Space Cola" desc = "A glass of refreshing Space Cola" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("nuka_cola") icon_state = "nuka_colaglass" name = "Nuka Cola" desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland" - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) if("orangejuice") icon_state = "glass_orange" name = "Glass of Orange juice" desc = "Vitamins! Yay!" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("tomatojuice") icon_state = "glass_red" name = "Glass of Tomato juf" desc = "Are you sure this is tomato juice?" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("blood") icon_state = "glass_red" name = "Glass of Tomato juice" desc = "Are you sure this is tomato juice?" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("limejuice") icon_state = "glass_green" name = "Glass of Lime juice" desc = "A glass of sweet-sour lime juice." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("whiskey") icon_state = "whiskeyglass" name = "Glass of whiskey" desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy." - CoM = list("x"=16, "y"=12) + center_of_mass = list("x"=16, "y"=12) if("gin") icon_state = "ginvodkaglass" name = "Glass of gin" desc = "A crystal clear glass of Griffeater gin." - CoM = list("x"=16, "y"=12) + center_of_mass = list("x"=16, "y"=12) if("vodka") icon_state = "ginvodkaglass" name = "Glass of vodka" desc = "The glass contain wodka. Xynta." - CoM = list("x"=16, "y"=12) + center_of_mass = list("x"=16, "y"=12) if("sake") icon_state = "ginvodkaglass" name = "Glass of Sake" desc = "A glass of Sake." - CoM = list("x"=16, "y"=12) + center_of_mass = list("x"=16, "y"=12) if("goldschlager") icon_state = "ginvodkaglass" name = "Glass of goldschlager" desc = "100 proof that teen girls will drink anything with gold in it." - CoM = list("x"=16, "y"=12) + center_of_mass = list("x"=16, "y"=12) if("wine") icon_state = "wineglass" name = "Glass of wine" desc = "A very classy looking drink." - CoM = list("x"=15, "y"=7) + center_of_mass = list("x"=15, "y"=7) if("cognac") icon_state = "cognacglass" name = "Glass of cognac" desc = "Damn, you feel like some kind of French aristocrat just by holding this." - CoM = list("x"=16, "y"=6) + center_of_mass = list("x"=16, "y"=6) if ("kahlua") icon_state = "kahluaglass" name = "Glass of RR coffee Liquor" desc = "DAMN, THIS THING LOOKS ROBUST" - CoM = list("x"=15, "y"=7) + center_of_mass = list("x"=15, "y"=7) if("vermouth") icon_state = "vermouthglass" name = "Glass of Vermouth" desc = "You wonder why you're even drinking this straight." - CoM = list("x"=16, "y"=12) + center_of_mass = list("x"=16, "y"=12) if("tequilla") icon_state = "tequillaglass" name = "Glass of Tequilla" desc = "Now all that's missing is the weird colored shades!" - CoM = list("x"=16, "y"=12) + center_of_mass = list("x"=16, "y"=12) if("patron") icon_state = "patronglass" name = "Glass of Patron" desc = "Drinking patron in the bar, with all the subpar ladies." - CoM = list("x"=7, "y"=8) + center_of_mass = list("x"=7, "y"=8) if("rum") icon_state = "rumglass" name = "Glass of Rum" desc = "Now you want to Pray for a pirate suit, don't you?" - CoM = list("x"=16, "y"=12) + center_of_mass = list("x"=16, "y"=12) if("gintonic") icon_state = "gintonicglass" name = "Gin and Tonic" desc = "A mild but still great cocktail. Drink up, like a true Englishman." - CoM = list("x"=16, "y"=7) + center_of_mass = list("x"=16, "y"=7) if("whiskeycola") icon_state = "whiskeycolaglass" name = "Whiskey Cola" desc = "An innocent-looking mixture of cola and Whiskey. Delicious." - CoM = list("x"=16, "y"=9) + center_of_mass = list("x"=16, "y"=9) if("whiterussian") icon_state = "whiterussianglass" name = "White Russian" desc = "A very nice looking drink. But that's just, like, your opinion, man." - CoM = list("x"=16, "y"=9) + center_of_mass = list("x"=16, "y"=9) if("screwdrivercocktail") icon_state = "screwdriverglass" name = "Screwdriver" desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." - CoM = list("x"=15, "y"=10) + center_of_mass = list("x"=15, "y"=10) if("bloodymary") icon_state = "bloodymaryglass" name = "Bloody Mary" desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("martini") icon_state = "martiniglass" name = "Classic Martini" desc = "Damn, the bartender even stirred it, not shook it." - CoM = list("x"=17, "y"=8) + center_of_mass = list("x"=17, "y"=8) if("vodkamartini") icon_state = "martiniglass" name = "Vodka martini" desc ="A bastardisation of the classic martini. Still great." - CoM = list("x"=17, "y"=8) + center_of_mass = list("x"=17, "y"=8) if("gargleblaster") icon_state = "gargleblasterglass" name = "Pan-Galactic Gargle Blaster" desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy." - CoM = list("x"=17, "y"=6) + center_of_mass = list("x"=17, "y"=6) if("bravebull") icon_state = "bravebullglass" name = "Brave Bull" desc = "Tequilla and Coffee liquor, brought together in a mouthwatering mixture. Drink up." - CoM = list("x"=15, "y"=8) + center_of_mass = list("x"=15, "y"=8) if("tequillasunrise") icon_state = "tequillasunriseglass" name = "Tequilla Sunrise" desc = "Oh great, now you feel nostalgic about sunrises back on Terra..." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("phoronspecial") icon_state = "phoronspecialglass" name = "Toxins Special" @@ -202,412 +202,412 @@ icon_state = "beepskysmashglass" name = "Beepsky Smash" desc = "Heavy, hot and strong. Just like the Iron fist of the LAW." - CoM = list("x"=18, "y"=10) + center_of_mass = list("x"=18, "y"=10) if("doctorsdelight") icon_state = "doctorsdelightglass" name = "Doctor's Delight" desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place." - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) if("manlydorf") icon_state = "manlydorfglass" name = "The Manly Dorf" desc = "A manly concotion made from Ale and Beer. Intended for true men only." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("irishcream") icon_state = "irishcreamglass" name = "Irish Cream" desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" - CoM = list("x"=16, "y"=9) + center_of_mass = list("x"=16, "y"=9) if("cubalibre") icon_state = "cubalibreglass" name = "Cuba Libre" desc = "A classic mix of rum and cola." - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) if("b52") icon_state = "b52glass" name = "B-52" desc = "Kahlua, Irish Cream, and congac. You will get bombed." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("atomicbomb") icon_state = "atomicbombglass" name = "Atomic Bomb" desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing." - CoM = list("x"=15, "y"=7) + center_of_mass = list("x"=15, "y"=7) if("longislandicedtea") icon_state = "longislandicedteaglass" name = "Long Island Iced Tea" desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) if("threemileisland") icon_state = "threemileislandglass" name = "Three Mile Island Ice Tea" desc = "A glass of this is sure to prevent a meltdown." - CoM = list("x"=16, "y"=2) + center_of_mass = list("x"=16, "y"=2) if("margarita") icon_state = "margaritaglass" name = "Margarita" desc = "On the rocks with salt on the rim. Arriba~!" - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) if("blackrussian") icon_state = "blackrussianglass" name = "Black Russian" desc = "For the lactose-intolerant. Still as classy as a White Russian." - CoM = list("x"=16, "y"=9) + center_of_mass = list("x"=16, "y"=9) if("vodkatonic") icon_state = "vodkatonicglass" name = "Vodka and Tonic" desc = "For when a gin and tonic isn't russian enough." - CoM = list("x"=16, "y"=7) + center_of_mass = list("x"=16, "y"=7) if("manhattan") icon_state = "manhattanglass" name = "Manhattan" desc = "The Detective's undercover drink of choice. He never could stomach gin..." - CoM = list("x"=17, "y"=8) + center_of_mass = list("x"=17, "y"=8) if("manhattan_proj") icon_state = "proj_manhattanglass" name = "Manhattan Project" desc = "A scienitst drink of choice, for thinking how to blow up the station." - CoM = list("x"=17, "y"=8) + center_of_mass = list("x"=17, "y"=8) if("ginfizz") icon_state = "ginfizzglass" name = "Gin Fizz" desc = "Refreshingly lemony, deliciously dry." - CoM = list("x"=16, "y"=7) + center_of_mass = list("x"=16, "y"=7) if("irishcoffee") icon_state = "irishcoffeeglass" name = "Irish Coffee" desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning." - CoM = list("x"=15, "y"=10) + center_of_mass = list("x"=15, "y"=10) if("hooch") icon_state = "glass_brown2" name = "Hooch" desc = "You've really hit rock bottom now... your liver packed its bags and left last night." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("whiskeysoda") icon_state = "whiskeysodaglass2" name = "Whiskey Soda" desc = "Ultimate refreshment." - CoM = list("x"=16, "y"=9) + center_of_mass = list("x"=16, "y"=9) if("tonic") icon_state = "glass_clear" name = "Glass of Tonic Water" desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("sodawater") icon_state = "glass_clear" name = "Glass of Soda Water" desc = "Soda water. Why not make a scotch and soda?" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("water") icon_state = "glass_clear" name = "Glass of Water" desc = "The father of all refreshments." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("spacemountainwind") icon_state = "Space_mountain_wind_glass" name = "Glass of Space Mountain Wind" desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("thirteenloko") icon_state = "thirteen_loko_glass" name = "Glass of Thirteen Loko" desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("dr_gibb") icon_state = "dr_gibb_glass" name = "Glass of Dr. Gibb" desc = "Dr. Gibb. Not as dangerous as the name might imply." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("space_up") icon_state = "space-up_glass" name = "Glass of Space-up" desc = "Space-up. It helps keep your cool." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("moonshine") icon_state = "glass_clear" name = "Moonshine" desc = "You've really hit rock bottom now... your liver packed its bags and left last night." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("soymilk") icon_state = "glass_white" name = "Glass of soy milk" desc = "White and nutritious soy goodness!" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("berryjuice") icon_state = "berryjuice" name = "Glass of berry juice" desc = "Berry juice. Or maybe its jam. Who cares?" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("poisonberryjuice") icon_state = "poisonberryjuice" name = "Glass of poison berry juice" desc = "A glass of deadly juice." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("carrotjuice") icon_state = "carrotjuice" name = "Glass of carrot juice" desc = "It is just like a carrot but without crunching." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("banana") icon_state = "banana" name = "Glass of banana juice" desc = "The raw essence of a banana. HONK" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("bahama_mama") icon_state = "bahama_mama" name = "Bahama Mama" desc = "Tropic cocktail" - CoM = list("x"=16, "y"=5) + center_of_mass = list("x"=16, "y"=5) if("singulo") icon_state = "singulo" name = "Singulo" desc = "A blue-space beverage." - CoM = list("x"=17, "y"=4) + center_of_mass = list("x"=17, "y"=4) if("alliescocktail") icon_state = "alliescocktail" name = "Allies cocktail" desc = "A drink made from your allies." - CoM = list("x"=17, "y"=8) + center_of_mass = list("x"=17, "y"=8) if("antifreeze") icon_state = "antifreeze" name = "Anti-freeze" desc = "The ultimate refreshment." - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) if("barefoot") icon_state = "b&p" name = "Barefoot" desc = "Barefoot and pregnant" - CoM = list("x"=17, "y"=8) + center_of_mass = list("x"=17, "y"=8) if("demonsblood") icon_state = "demonsblood" name = "Demons Blood" desc = "Just looking at this thing makes the hair at the back of your neck stand up." - CoM = list("x"=16, "y"=2) + center_of_mass = list("x"=16, "y"=2) if("booger") icon_state = "booger" name = "Booger" desc = "Ewww..." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("snowwhite") icon_state = "snowwhite" name = "Snow White" desc = "A cold refreshment." - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) if("aloe") icon_state = "aloe" name = "Aloe" desc = "Very, very, very good." - CoM = list("x"=17, "y"=8) + center_of_mass = list("x"=17, "y"=8) if("andalusia") icon_state = "andalusia" name = "Andalusia" desc = "A nice, strange named drink." - CoM = list("x"=16, "y"=9) + center_of_mass = list("x"=16, "y"=9) if("sbiten") icon_state = "sbitenglass" name = "Sbiten" desc = "A spicy mix of Vodka and Spice. Very hot." - CoM = list("x"=17, "y"=8) + center_of_mass = list("x"=17, "y"=8) if("red_mead") icon_state = "red_meadglass" name = "Red Mead" desc = "A True Vikings Beverage, though its color is strange." - CoM = list("x"=17, "y"=10) + center_of_mass = list("x"=17, "y"=10) if("mead") icon_state = "meadglass" name = "Mead" desc = "A Vikings Beverage, though a cheap one." - CoM = list("x"=17, "y"=10) + center_of_mass = list("x"=17, "y"=10) if("iced_beer") icon_state = "iced_beerglass" name = "Iced Beer" desc = "A beer so frosty, the air around it freezes." - CoM = list("x"=16, "y"=7) + center_of_mass = list("x"=16, "y"=7) if("grog") icon_state = "grogglass" name = "Grog" desc = "A fine and cepa drink for Space." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("soy_latte") icon_state = "soy_latte" name = "Soy Latte" desc = "A nice and refrshing beverage while you are reading." - CoM = list("x"=15, "y"=9) + center_of_mass = list("x"=15, "y"=9) if("cafe_latte") icon_state = "cafe_latte" name = "Cafe Latte" desc = "A nice, strong and refreshing beverage while you are reading." - CoM = list("x"=15, "y"=9) + center_of_mass = list("x"=15, "y"=9) if("acidspit") icon_state = "acidspitglass" name = "Acid Spit" desc = "A drink from Nanotrasen. Made from live aliens." - CoM = list("x"=16, "y"=7) + center_of_mass = list("x"=16, "y"=7) if("amasec") icon_state = "amasecglass" name = "Amasec" desc = "Always handy before COMBAT!!!" - CoM = list("x"=16, "y"=9) + center_of_mass = list("x"=16, "y"=9) if("neurotoxin") icon_state = "neurotoxinglass" name = "Neurotoxin" desc = "A drink that is guaranteed to knock you silly." - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) if("hippiesdelight") icon_state = "hippiesdelightglass" name = "Hippie's Delight" desc = "A drink enjoyed by people during the 1960's." - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) if("bananahonk") icon_state = "bananahonkglass" name = "Banana Honk" desc = "A drink from Banana Heaven." - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) if("silencer") icon_state = "silencerglass" name = "Silencer" desc = "A drink from mime Heaven." - CoM = list("x"=16, "y"=9) + center_of_mass = list("x"=16, "y"=9) if("nothing") icon_state = "nothing" name = "Nothing" desc = "Absolutely nothing." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("devilskiss") icon_state = "devilskiss" name = "Devils Kiss" desc = "Creepy time!" - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) if("changelingsting") icon_state = "changelingsting" name = "Changeling Sting" desc = "A stingy drink." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("irishcarbomb") icon_state = "irishcarbomb" name = "Irish Car Bomb" desc = "An irish car bomb." - CoM = list("x"=16, "y"=8) + center_of_mass = list("x"=16, "y"=8) if("syndicatebomb") icon_state = "syndicatebomb" name = "Syndicate Bomb" desc = "A syndicate bomb." - CoM = list("x"=16, "y"=4) + center_of_mass = list("x"=16, "y"=4) if("erikasurprise") icon_state = "erikasurprise" name = "Erika Surprise" desc = "The surprise is, it's green!" - CoM = list("x"=16, "y"=9) + center_of_mass = list("x"=16, "y"=9) if("driestmartini") icon_state = "driestmartiniglass" name = "Driest Martini" desc = "Only for the experienced. You think you see sand floating in the glass." - CoM = list("x"=17, "y"=8) + center_of_mass = list("x"=17, "y"=8) if("ice") icon_state = "iceglass" name = "Glass of ice" desc = "Generally, you're supposed to put something else in there too..." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("icecoffee") icon_state = "icedcoffeeglass" name = "Iced Coffee" desc = "A drink to perk you up and refresh you!" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("coffee") icon_state = "glass_brown" name = "Glass of coffee" desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("bilk") icon_state = "glass_brown" name = "Glass of bilk" desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("fuel") icon_state = "dr_gibb_glass" name = "Glass of welder fuel" desc = "Unless you are an industrial tool, this is probably not safe for consumption." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("brownstar") icon_state = "brownstar" name = "Brown Star" desc = "It's not what it sounds like..." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("grapejuice") icon_state = "grapejuice" name = "Glass of grape juice" desc = "It's grrrrrape!" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("grapesoda") icon_state = "grapesoda" name = "Can of Grape Soda" desc = "Looks like a delicious drank!" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("icetea") icon_state = "icedteaglass" name = "Iced Tea" desc = "No relation to a certain rap artist/ actor." - CoM = list("x"=15, "y"=10) + center_of_mass = list("x"=15, "y"=10) if("grenadine") icon_state = "grenadineglass" name = "Glass of grenadine syrup" desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks." - CoM = list("x"=17, "y"=6) + center_of_mass = list("x"=17, "y"=6) if("milkshake") icon_state = "milkshake" name = "Milkshake" desc = "Glorious brainfreezing mixture." - CoM = list("x"=16, "y"=7) + center_of_mass = list("x"=16, "y"=7) if("lemonade") icon_state = "lemonadeglass" name = "Lemonade" desc = "Oh the nostalgia..." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) if("kiraspecial") icon_state = "kiraspecial" name = "Kira Special" desc = "Long live the guy who everyone had mistaken for a girl. Baka!" - CoM = list("x"=16, "y"=12) + center_of_mass = list("x"=16, "y"=12) if("rewriter") icon_state = "rewriter" name = "Rewriter" desc = "The secret of the sanctuary of the Libarian..." - CoM = list("x"=16, "y"=9) + center_of_mass = list("x"=16, "y"=9) if("suidream") icon_state = "sdreamglass" name = "Sui Dream" desc = "A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame." - CoM = list("x"=16, "y"=5) + center_of_mass = list("x"=16, "y"=5) if("melonliquor") icon_state = "emeraldglass" name = "Glass of Melon Liquor" desc = "A relatively sweet and fruity 46 proof liquor." - CoM = list("x"=16, "y"=5) + center_of_mass = list("x"=16, "y"=5) if("bluecuracao") icon_state = "curacaoglass" name = "Glass of Blue Curacao" desc = "Exotically blue, fruity drink, distilled from oranges." - CoM = list("x"=16, "y"=5) + center_of_mass = list("x"=16, "y"=5) if("absinthe") icon_state = "absintheglass" name = "Glass of Absinthe" desc = "Wormwood, anise, oh my." - CoM = list("x"=16, "y"=5) + center_of_mass = list("x"=16, "y"=5) if("pwine") icon_state = "pwineglass" name = "Glass of ???" desc = "A black ichor with an oily purple sheer on top. Are you sure you should drink this?" - CoM = list("x"=16, "y"=5) + center_of_mass = list("x"=16, "y"=5) else icon_state ="glass_brown" name = "Glass of ..what?" desc = "You can't really tell what this is." - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) else icon_state = "glass_empty" name = "Drinking glass" desc = "Your standard drinking glass" - CoM = list("x"=16, "y"=10) + center_of_mass = list("x"=16, "y"=10) return // for /obj/machinery/vending/sovietsoda diff --git a/code/modules/reagents/reagent_containers/food/drinks/jar.dm b/code/modules/reagents/reagent_containers/food/drinks/jar.dm index 1d8ae40b80..7cca924261 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/jar.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/jar.dm @@ -7,7 +7,7 @@ desc = "A jar. You're not sure what it's supposed to hold." icon_state = "jar" item_state = "beaker" - CoM = list("x"=15, "y"=8) + center_of_mass = list("x"=15, "y"=8) New() ..() reagents.add_reagent("slime", 50) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 00221f6bf3..29001d9723 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -9,7 +9,7 @@ var/trash = null var/slice_path var/slices_num - CoM = list("x"=15, "y"=15) + center_of_mass = list("x"=15, "y"=15) //Placeholder for effect that trigger on eating that aren't tied to reagents. /obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/M) From 203c36114d478ff27478b0f3ba4d2de5f2c68f5c Mon Sep 17 00:00:00 2001 From: Decius Date: Mon, 14 Jul 2014 17:21:11 -0400 Subject: [PATCH 63/88] Made spawning with a loyalty implant compliant to configuration... Created a proc for being implanted with loyalty implant which checks for the configuration for whether or not it will work. If it is enabled, it continues on-- if it is disabled, it returns from the proc. Also made secure closets not automatically spawn them unless the config is set to allow it. Admin 'loyalty implanting' via the panel is now compliant to the configuration file. If preferred, I am willing to make an override variable to the proc that will allow admins to do it anyway. Supply pack for it commented out due to inability to make it conform. Easy enough to re-add back for anyone downstream if they wish it. Same applies to the design. Signed-off-by: Decius --- .../Sigyn/Department Sec/jobs.dm | 6 +- code/WorkInProgress/Sigyn/Softcurity/jobs.dm | 22 ++++--- .../Sigyn/Softcurity/secure_closet.dm | 2 +- code/WorkInProgress/kilakk/responseteam.dm | 4 +- code/datums/mind.dm | 60 +++++++++---------- code/datums/supplypacks.dm | 19 +++--- code/game/gamemodes/epidemic/epidemic.dm | 2 +- code/game/jobs/job/captain.dm | 9 +-- code/game/jobs/job/civilian.dm | 10 ++-- code/game/jobs/job/security.dm | 9 +-- .../objects/items/weapons/implants/implant.dm | 6 ++ code/modules/admin/verbs/striketeam.dm | 4 +- code/modules/mob/living/carbon/human/human.dm | 10 ++++ code/modules/research/designs.dm | 2 + 14 files changed, 85 insertions(+), 80 deletions(-) diff --git a/code/WorkInProgress/Sigyn/Department Sec/jobs.dm b/code/WorkInProgress/Sigyn/Department Sec/jobs.dm index 66e14b040c..7f98a7b6ec 100644 --- a/code/WorkInProgress/Sigyn/Department Sec/jobs.dm +++ b/code/WorkInProgress/Sigyn/Department Sec/jobs.dm @@ -83,9 +83,9 @@ proc/assign_sec_to_department(var/mob/living/carbon/human/H) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack) - var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) - L.imp_in = H - L.implanted = 1 + + implant_loyalty(H) + return 1 /obj/item/device/radio/headset/headset_sec/department/New() diff --git a/code/WorkInProgress/Sigyn/Softcurity/jobs.dm b/code/WorkInProgress/Sigyn/Softcurity/jobs.dm index a214626d1c..243dc47c75 100644 --- a/code/WorkInProgress/Sigyn/Softcurity/jobs.dm +++ b/code/WorkInProgress/Sigyn/Softcurity/jobs.dm @@ -23,9 +23,9 @@ H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/taser(H), slot_s_store) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack) - var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) - L.imp_in = H - L.implanted = 1 + + H.implant_loyalty(src) // Will not do so if config is set to disallow. + return 1 @@ -52,9 +52,9 @@ H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack) - var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) - L.imp_in = H - L.implanted = 1 + + H.implant_loyalty(src) // // Will not do so if config is set to disallow. + return 1 @@ -89,9 +89,7 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/device/detective_scanner(H), slot_in_backpack) - var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) - L.imp_in = H - L.implanted = 1 + H.implant_loyalty(src) // Will not do so if config is set to disallow. return 1 @@ -118,9 +116,9 @@ H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack) - var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) - L.imp_in = H - L.implanted = 1 + + H.implant_loyalty(src) // Will not do so if config is set to disallow. + return 1 /datum/job/hop diff --git a/code/WorkInProgress/Sigyn/Softcurity/secure_closet.dm b/code/WorkInProgress/Sigyn/Softcurity/secure_closet.dm index 88f06f98e7..e74c6fce6c 100644 --- a/code/WorkInProgress/Sigyn/Softcurity/secure_closet.dm +++ b/code/WorkInProgress/Sigyn/Softcurity/secure_closet.dm @@ -70,7 +70,7 @@ new /obj/item/weapon/storage/backpack/satchel_sec(src) new /obj/item/weapon/cartridge/hos(src) new /obj/item/device/radio/headset/heads/hos(src) - new /obj/item/weapon/storage/lockbox/loyalty(src) + if (config.use_loyalty_implants) new /obj/item/weapon/storage/lockbox/loyalty(src) new /obj/item/weapon/storage/flashbang_kit(src) new /obj/item/weapon/storage/belt/security(src) new /obj/item/device/flash(src) diff --git a/code/WorkInProgress/kilakk/responseteam.dm b/code/WorkInProgress/kilakk/responseteam.dm index 6faafad342..8e0cdbc638 100644 --- a/code/WorkInProgress/kilakk/responseteam.dm +++ b/code/WorkInProgress/kilakk/responseteam.dm @@ -231,9 +231,7 @@ var/global/admin_emergency_team = 0 // Used for admin-spawned response teams // equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(src), slot_in_backpack) // Regular medkit // Loyalty implants - var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(src) - L.imp_in = src - L.implanted = 1 + implant_loyalty(src) // ID cards var/obj/item/weapon/card/id/E = new(src) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 936eea26d1..cc24ed7fdb 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -510,37 +510,37 @@ datum/mind I.Del() break H << "\blue Your loyalty implant has been deactivated." - if("add") - var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) - L.imp_in = H - L.implanted = 1 - var/datum/organ/external/affected = H.organs_by_name["head"] - affected.implants += L - L.part = affected - H << "\red You somehow have become the recepient of a loyalty transplant, and it just activated!" - if(src in ticker.mode.revolutionaries) - special_role = null - ticker.mode.revolutionaries -= src - src << "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!" - if(src in ticker.mode.head_revolutionaries) - special_role = null - ticker.mode.head_revolutionaries -=src - src << "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!" - if(src in ticker.mode.cult) - ticker.mode.cult -= src - ticker.mode.update_cult_icons_removed(src) - special_role = null - var/datum/game_mode/cult/cult = ticker.mode - if (istype(cult)) - cult.memorize_cult_objectives(src) - current << "\red The nanobots in the loyalty implant remove all thoughts about being in a cult. Have a productive day!" - memory = "" - if(src in ticker.mode.traitors) - ticker.mode.traitors -= src - special_role = null - current << "\red The nanobots in the loyalty implant remove all thoughts about being a traitor to Nanotrasen. Have a nice day!" - log_admin("[key_name_admin(usr)] has de-traitor'ed [current].") + if("add") + H.implant_loyalty(src) + + if(config.use_loyalty_implants) // The following won't occur if there are not loyalty implants. + H << "\red You somehow have become the recepient of a loyalty transplant, and it just activated!" + if(src in ticker.mode.revolutionaries) + special_role = null + ticker.mode.revolutionaries -= src + src << "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!" + if(src in ticker.mode.head_revolutionaries) + special_role = null + ticker.mode.head_revolutionaries -=src + src << "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!" + if(src in ticker.mode.cult) + ticker.mode.cult -= src + ticker.mode.update_cult_icons_removed(src) + special_role = null + var/datum/game_mode/cult/cult = ticker.mode + if (istype(cult)) + cult.memorize_cult_objectives(src) + current << "\red The nanobots in the loyalty implant remove all thoughts about being in a cult. Have a productive day!" + memory = "" + if(src in ticker.mode.traitors) + ticker.mode.traitors -= src + special_role = null + current << "\red The nanobots in the loyalty implant remove all thoughts about being a traitor to Nanotrasen. Have a nice day!" + log_admin("[key_name_admin(usr)] has de-traitor'ed [current].") + else + usr << "Loyalty implants are currently disabled for your server in the configuration files." + else if (href_list["revolution"]) current.hud_updateflag |= (1 << SPECIALROLE_HUD) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 7990329aa1..abca12f25e 100755 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -681,14 +681,6 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee access = access_armory group = "Security" -/datum/supply_packs/loyalty - name = "Loyalty implant crate" - contains = list (/obj/item/weapon/storage/lockbox/loyalty) - cost = 60 - containertype = /obj/structure/closet/crate/secure - containername = "Loyalty implant crate" - access = access_armory - group = "Security" /datum/supply_packs/ballistic name = "Ballistic gear crate" @@ -725,6 +717,17 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee access = access_armory group = "Security" +/* +/datum/supply_packs/loyalty + name = "Loyalty implant crate" + contains = list (/obj/item/weapon/storage/lockbox/loyalty) + cost = 60 + containertype = /obj/structure/closet/crate/secure + containername = "Loyalty implant crate" + access = access_armory + group = "Security" +*/ + /datum/supply_packs/expenergy name = "Experimental energy gear crate" contains = list(/obj/item/clothing/suit/armor/laserproof, diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm index d0db2d66b9..4a0712c712 100644 --- a/code/game/gamemodes/epidemic/epidemic.dm +++ b/code/game/gamemodes/epidemic/epidemic.dm @@ -71,7 +71,7 @@ world << sound('sound/AI/commandreport.ogg') // add an extra law to the AI to make sure it cooperates with the heads - var/extra_law = "Crew authorized to know of pathogen [virus_name]'s existence are: Heads of command, any crew member with loyalty implant. Do not allow unauthorized personnel to gain knowledge of [virus_name]. Aid authorized personnel in quarantining and neutrlizing the outbreak. This law overrides all other laws." + var/extra_law = "Crew authorized to know of pathogen [virus_name]'s existence are: Heads of command. Do not allow unauthorized personnel to gain knowledge of [virus_name]. Aid authorized personnel in quarantining and neutrlizing the outbreak. This law overrides all other laws." for(var/mob/living/silicon/ai/M in world) M.add_ion_law(extra_law) M << "\red " + extra_law diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index acc7c3e853..dfa159be37 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -32,13 +32,10 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_r_hand) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) - var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) - L.imp_in = H - L.implanted = 1 world << "[H.real_name] is the captain!" - var/datum/organ/external/affected = H.organs_by_name["head"] - affected.implants += L - L.part = affected + + H.implant_loyalty(src) + return 1 get_access() diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 0576e5b823..57350f087a 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -357,10 +357,8 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) - L.imp_in = H - L.implanted = 1 - var/datum/organ/external/affected = H.organs_by_name["head"] - affected.implants += L - L.part = affected + + H.implant_loyalty(H) + + return 1 diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 69e9babb0a..c83c0c0ea2 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -39,12 +39,7 @@ else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack) - var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) - L.imp_in = H - L.implanted = 1 - var/datum/organ/external/affected = H.organs_by_name["head"] - affected.implants += L - L.part = affected + H.implant_loyalty(H) return 1 @@ -165,4 +160,4 @@ else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack) - return 1 + return 1 diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index f8c46134c1..b9f3ef4afd 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -1,5 +1,11 @@ #define MALFUNCTION_TEMPORARY 1 #define MALFUNCTION_PERMANENT 2 + + +/mob/living/carbon/human/ + + + /obj/item/weapon/implant name = "implant" icon = 'icons/obj/device.dmi' diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm index cf5b94322d..e8a92edbe3 100644 --- a/code/modules/admin/verbs/striketeam.dm +++ b/code/modules/admin/verbs/striketeam.dm @@ -158,9 +158,7 @@ var/global/sent_strike_team = 0 equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(src), slot_r_hand) - var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(src)//Here you go Deuryn - L.imp_in = src - L.implanted = 1 + implant_loyalty(src) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 56374bcd0f..a1b76fa081 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -317,6 +317,16 @@ if(armor >= 2) return +/mob/living/carbon/human/proc/implant_loyalty(mob/living/carbon/human/M) + if(!config.use_loyalty_implants) return + + var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(M) + L.imp_in = M + L.implanted = 1 + var/datum/organ/external/affected = M.organs_by_name["head"] + affected.implants += L + L.part = affected + /mob/living/carbon/human/proc/is_loyalty_implanted(mob/living/carbon/human/M) for(var/L in M.contents) if(istype(L, /obj/item/weapon/implant/loyalty)) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 002888e61e..38fb4994fa 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -1358,6 +1358,7 @@ datum/design/nanopaste materials = list("$metal" = 7000, "$glass" = 7000) build_path = "/obj/item/stack/nanopaste" +/* // Removal of loyalty implants. Can't think of a way to add this to the config option. datum/design/implant_loyal name = "loyalty implant" desc = "Makes you loyal or such." @@ -1366,6 +1367,7 @@ datum/design/implant_loyal build_type = PROTOLATHE materials = list("$metal" = 7000, "$glass" = 7000) build_path = "/obj/item/weapon/implant/loyalty" +*/ datum/design/implant_chem name = "chemical implant" From b37ce454df8586b39f6a1559d7043833d96036bc Mon Sep 17 00:00:00 2001 From: Decius Date: Mon, 14 Jul 2014 18:02:04 -0400 Subject: [PATCH 64/88] Removed from map + made implanters conform to configuration... Signed-off-by: Decius --- code/game/objects/items/weapons/implants/implantcase.dm | 3 ++- code/game/objects/items/weapons/implants/implanter.dm | 5 ++--- maps/tgstation2.dmm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 3dc57db654..9d0f40e159 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -113,7 +113,8 @@ New() - src.imp = new /obj/item/weapon/implant/loyalty( src ) + if (config.use_loyalty_implants) + src.imp = new /obj/item/weapon/implant/loyalty( src ) ..() return diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index f1f5d8521e..21d768a3aa 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -60,13 +60,12 @@ name = "implanter-loyalty" /obj/item/weapon/implanter/loyalty/New() - src.imp = new /obj/item/weapon/implant/loyalty( src ) + if(config.use_loyalty_implants) + src.imp = new /obj/item/weapon/implant/loyalty( src ) ..() update() return - - /obj/item/weapon/implanter/explosive name = "implanter (E)" diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index 8429057322..0186a02701 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -134,7 +134,7 @@ "acD" = (/obj/structure/stool/bed/chair{dir = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor{icon_state = "red"; dir = 6},/area/security/prison) "acE" = (/obj/structure/rack,/obj/item/weapon/gun/energy/laser,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window/brigdoor{dir = 4; name = "Weapons locker"; req_access_txt = "3"},/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/security/warden) "acF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/camera{c_tag = "Brig East"; dir = 8},/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/security/brig) -"acG" = (/obj/structure/rack,/obj/item/weapon/storage/lockbox/loyalty,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/security/warden) +"acG" = (/obj/structure/rack,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/security/warden) "acH" = (/obj/machinery/flasher/portable,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/security/warden) "acI" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/security/brig) "acJ" = (/obj/structure/rack,/obj/item/clothing/suit/armor/riot,/obj/item/weapon/melee/baton,/obj/item/weapon/shield/riot,/obj/item/clothing/head/helmet/riot,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/brigdoor{dir = 8; name = "Weapons locker"; req_access_txt = "3"},/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/security/warden) From 0b314561ca283f4b88ee0aaa8dab96f8ca64ab3b Mon Sep 17 00:00:00 2001 From: Decius Date: Mon, 14 Jul 2014 19:02:21 -0400 Subject: [PATCH 65/88] Now allows admin override via player panel, a small fix, and... implantation works again. Since they'll only be accessible via an admin specifically spawning it, except for in cases where it is configured to be allowed, it'll be fine. This now allows admins to incorporate loyalty implants still if they so wish for whatever reason, but it is normally inaccessible. Signed-off-by: Decius --- code/datums/mind.dm | 53 +++++++++---------- .../items/weapons/implants/implantcase.dm | 3 +- .../items/weapons/implants/implanter.dm | 3 +- code/modules/mob/living/carbon/human/human.dm | 4 +- 4 files changed, 29 insertions(+), 34 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index cc24ed7fdb..b749bfb07e 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -512,34 +512,31 @@ datum/mind H << "\blue Your loyalty implant has been deactivated." if("add") - H.implant_loyalty(src) - - if(config.use_loyalty_implants) // The following won't occur if there are not loyalty implants. - H << "\red You somehow have become the recepient of a loyalty transplant, and it just activated!" - if(src in ticker.mode.revolutionaries) - special_role = null - ticker.mode.revolutionaries -= src - src << "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!" - if(src in ticker.mode.head_revolutionaries) - special_role = null - ticker.mode.head_revolutionaries -=src - src << "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!" - if(src in ticker.mode.cult) - ticker.mode.cult -= src - ticker.mode.update_cult_icons_removed(src) - special_role = null - var/datum/game_mode/cult/cult = ticker.mode - if (istype(cult)) - cult.memorize_cult_objectives(src) - current << "\red The nanobots in the loyalty implant remove all thoughts about being in a cult. Have a productive day!" - memory = "" - if(src in ticker.mode.traitors) - ticker.mode.traitors -= src - special_role = null - current << "\red The nanobots in the loyalty implant remove all thoughts about being a traitor to Nanotrasen. Have a nice day!" - log_admin("[key_name_admin(usr)] has de-traitor'ed [current].") - else - usr << "Loyalty implants are currently disabled for your server in the configuration files." + H.implant_loyalty(H, override = TRUE) + H << "\red You somehow have become the recepient of a loyalty transplant, and it just activated!" + if(src in ticker.mode.revolutionaries) + special_role = null + ticker.mode.revolutionaries -= src + src << "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!" + if(src in ticker.mode.head_revolutionaries) + special_role = null + ticker.mode.head_revolutionaries -=src + src << "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!" + if(src in ticker.mode.cult) + ticker.mode.cult -= src + ticker.mode.update_cult_icons_removed(src) + special_role = null + var/datum/game_mode/cult/cult = ticker.mode + if (istype(cult)) + cult.memorize_cult_objectives(src) + current << "\red The nanobots in the loyalty implant remove all thoughts about being in a cult. Have a productive day!" + memory = "" + if(src in ticker.mode.traitors) + ticker.mode.traitors -= src + special_role = null + current << "\red The nanobots in the loyalty implant remove all thoughts about being a traitor to Nanotrasen. Have a nice day!" + log_admin("[key_name_admin(usr)] has de-traitor'ed [current].") + else else if (href_list["revolution"]) diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 9d0f40e159..3dc57db654 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -113,8 +113,7 @@ New() - if (config.use_loyalty_implants) - src.imp = new /obj/item/weapon/implant/loyalty( src ) + src.imp = new /obj/item/weapon/implant/loyalty( src ) ..() return diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 21d768a3aa..f92f5b759c 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -60,8 +60,7 @@ name = "implanter-loyalty" /obj/item/weapon/implanter/loyalty/New() - if(config.use_loyalty_implants) - src.imp = new /obj/item/weapon/implant/loyalty( src ) + src.imp = new /obj/item/weapon/implant/loyalty( src ) ..() update() return diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index a1b76fa081..4253810d28 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -317,8 +317,8 @@ if(armor >= 2) return -/mob/living/carbon/human/proc/implant_loyalty(mob/living/carbon/human/M) - if(!config.use_loyalty_implants) return +/mob/living/carbon/human/proc/implant_loyalty(mob/living/carbon/human/M, override = FALSE) // Won't override by default. + if(!config.use_loyalty_implants && !override) return // Nuh-uh. var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(M) L.imp_in = M From 8d8e3f43d4dec3cff2baaff0a769f6875dcc22a3 Mon Sep 17 00:00:00 2001 From: Decius-R Date: Mon, 14 Jul 2014 19:14:38 -0400 Subject: [PATCH 66/88] Fixed a small mistake.. Forgot to remove where I was going to originally make a proc. Didn't see it at skim through. Fixed. --- code/game/objects/items/weapons/implants/implant.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index b9f3ef4afd..c474650f9a 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -2,10 +2,6 @@ #define MALFUNCTION_PERMANENT 2 -/mob/living/carbon/human/ - - - /obj/item/weapon/implant name = "implant" icon = 'icons/obj/device.dmi' From 1b7ab133f3a0fc26400cc0ebb3acea75536fcd5a Mon Sep 17 00:00:00 2001 From: Decius Date: Mon, 14 Jul 2014 19:30:27 -0400 Subject: [PATCH 67/88] Fixes mailman sprite... West facing sprite was one pixel too far to the left. Signed-off-by: Decius --- icons/mob/uniform.dmi | Bin 230100 -> 230103 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 47d928e2d1118e66847fbec7edfb2b11ce9fd27d..311d8494de9b12118cff71fb221604e8bdf05748 100644 GIT binary patch delta 55699 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

    #2mqIys>lxTq`Pr^r!FJ!X}f)Vhhypl>3BX{go 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"Ynn9H=kY|2PW<|&Xz0Ch$$3RG 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 From 177560cf4bfae830c721ec0b3874a3a6b046bfb4 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 14 Jul 2014 22:06:14 -0400 Subject: [PATCH 68/88] Moves turf collision handling into living_defense --- code/game/atoms.dm | 2 +- code/modules/mob/living/living_defense.dm | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 3253f272d0..d4c15b23e1 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -40,7 +40,7 @@ step(src, turn(src.dir, 180)) if(istype(src,/mob/living)) var/mob/living/M = src - M.take_organ_damage(20) + M.turf_collision(T, speed) /atom/proc/assume_air(datum/gas_mixture/giver) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 0b7be48153..c3bbfe0728 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -73,6 +73,9 @@ if(istype(O,/obj/item/weapon)) var/obj/item/weapon/W = O dtype = W.damtype + + //run to-hit check here + src.visible_message("\red [src] has been hit by [O].") var/armor = run_armor_check(zone, "melee", "Your armor has protected your [zone].", "Your armor has softened hit to your [zone].") @@ -117,6 +120,9 @@ src.anchored = 1 src.pinned += O +//This is called when the mob is thrown into a dense turf +/mob/living/proc/turf_collision(var/turf/T, var/speed) + src.take_organ_damage(speed*4) /mob/living/proc/near_wall(var/direction,var/distance=1) var/turf/T = get_step(get_turf(src),direction) From 41904850d4f0200615adfdca023904ad8862c5e6 Mon Sep 17 00:00:00 2001 From: JimTheCactus Date: Mon, 14 Jul 2014 20:55:39 -0600 Subject: [PATCH 69/88] Fixed not-quite-blank field issues in the various record keeping computers. Added trim to most fields in Medical Computer Added trim to most fields in Staff Computer Added name verification in Staff Computer Added trim to most fields in Security Computer Added name verification in Security Computer --- baystation12.int | 6 ----- code/game/machinery/computer/medical.dm | 28 ++++++++++++------------ code/game/machinery/computer/security.dm | 20 ++++++++--------- code/game/machinery/computer/skills.dm | 8 +++---- 4 files changed, 28 insertions(+), 34 deletions(-) delete mode 100644 baystation12.int diff --git a/baystation12.int b/baystation12.int deleted file mode 100644 index b82874fded..0000000000 --- a/baystation12.int +++ /dev/null @@ -1,6 +0,0 @@ -// BEGIN_INTERNALS -/* -MAP_ICON_TYPE: 0 -AUTO_FILE_DIR: OFF -*/ -// END_INTERNALS diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 2949498ae3..3898593172 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -253,7 +253,7 @@ switch(href_list["field"]) if("fingerprint") if (istype(src.active1, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please input fingerprint hash:", "Med. records", src.active1.fields["fingerprint"], null) as text),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please input fingerprint hash:", "Med. records", src.active1.fields["fingerprint"], null) as text)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1)) return src.active1.fields["fingerprint"] = t1 @@ -271,55 +271,55 @@ src.active1.fields["age"] = t1 if("mi_dis") if (istype(src.active2, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please input minor disabilities list:", "Med. records", src.active2.fields["mi_dis"], null) as text),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please input minor disabilities list:", "Med. records", src.active2.fields["mi_dis"], null) as text)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["mi_dis"] = t1 if("mi_dis_d") if (istype(src.active2, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please summarize minor dis.:", "Med. records", src.active2.fields["mi_dis_d"], null) as message),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please summarize minor dis.:", "Med. records", src.active2.fields["mi_dis_d"], null) as message)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["mi_dis_d"] = t1 if("ma_dis") if (istype(src.active2, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please input major diabilities list:", "Med. records", src.active2.fields["ma_dis"], null) as text),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please input major diabilities list:", "Med. records", src.active2.fields["ma_dis"], null) as text)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["ma_dis"] = t1 if("ma_dis_d") if (istype(src.active2, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please summarize major dis.:", "Med. records", src.active2.fields["ma_dis_d"], null) as message),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please summarize major dis.:", "Med. records", src.active2.fields["ma_dis_d"], null) as message)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["ma_dis_d"] = t1 if("alg") if (istype(src.active2, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please state allergies:", "Med. records", src.active2.fields["alg"], null) as text),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please state allergies:", "Med. records", src.active2.fields["alg"], null) as text)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["alg"] = t1 if("alg_d") if (istype(src.active2, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please summarize allergies:", "Med. records", src.active2.fields["alg_d"], null) as message),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please summarize allergies:", "Med. records", src.active2.fields["alg_d"], null) as message)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["alg_d"] = t1 if("cdi") if (istype(src.active2, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please state diseases:", "Med. records", src.active2.fields["cdi"], null) as text),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please state diseases:", "Med. records", src.active2.fields["cdi"], null) as text)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["cdi"] = t1 if("cdi_d") if (istype(src.active2, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please summarize diseases:", "Med. records", src.active2.fields["cdi_d"], null) as message),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please summarize diseases:", "Med. records", src.active2.fields["cdi_d"], null) as message)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["cdi_d"] = t1 if("notes") if (istype(src.active2, /datum/data/record)) - var/t1 = copytext(html_encode(input("Please summarize notes:", "Med. records", html_decode(src.active2.fields["notes"]), null) as message),1,MAX_MESSAGE_LEN) + var/t1 = copytext(html_encode(trim(input("Please summarize notes:", "Med. records", html_decode(src.active2.fields["notes"]), null) as message)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["notes"] = t1 @@ -334,21 +334,21 @@ src.temp = text("Blood Type:
    \n\t    A- A+
    \n\tB- B+
    \n\tAB- AB+
    \n\tO- O+
    ", src, src, src, src, src, src, src, src) if("b_dna") if (istype(src.active1, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please input DNA hash:", "Med. records", src.active1.fields["dna"], null) as text),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please input DNA hash:", "Med. records", src.active1.fields["dna"], null) as text)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1)) return src.active1.fields["dna"] = t1 if("vir_name") var/datum/data/record/v = locate(href_list["edit_vir"]) if (v) - var/t1 = copytext(sanitize(input("Please input pathogen name:", "VirusDB", v.fields["name"], null) as text),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please input pathogen name:", "VirusDB", v.fields["name"], null) as text)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1)) return v.fields["name"] = t1 if("vir_desc") var/datum/data/record/v = locate(href_list["edit_vir"]) if (v) - var/t1 = copytext(sanitize(input("Please input information about pathogen:", "VirusDB", v.fields["description"], null) as message),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please input information about pathogen:", "VirusDB", v.fields["description"], null) as message)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1)) return v.fields["description"] = t1 @@ -451,7 +451,7 @@ if (!( istype(src.active2, /datum/data/record) )) return var/a2 = src.active2 - var/t1 = copytext(sanitize(input("Add Comment:", "Med. records", null, null) as message),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Add Comment:", "Med. records", null, null) as message)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return var/counter = 1 diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 58a77c950d..e7060f7577 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -387,7 +387,7 @@ What a mess.*/ if (!( istype(active2, /datum/data/record) )) return var/a2 = active2 - var/t1 = copytext(sanitize(input("Add Comment:", "Secure. records", null, null) as message),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Add Comment:", "Secure. records", null, null) as message)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2)) return var/counter = 1 @@ -450,19 +450,19 @@ What a mess.*/ switch(href_list["field"]) if("name") if (istype(active1, /datum/data/record)) - var/t1 = input("Please input name:", "Secure. records", active1.fields["name"], null) as text + var/t1 = reject_bad_name(input("Please input name:", "Secure. records", active1.fields["name"], null) as text) if ((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon)))) || active1 != a1) return active1.fields["name"] = t1 if("id") if (istype(active2, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please input id:", "Secure. records", active1.fields["id"], null) as text),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please input id:", "Secure. records", active1.fields["id"], null) as text)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1)) return active1.fields["id"] = t1 if("fingerprint") if (istype(active1, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please input fingerprint hash:", "Secure. records", active1.fields["fingerprint"], null) as text),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please input fingerprint hash:", "Secure. records", active1.fields["fingerprint"], null) as text)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1)) return active1.fields["fingerprint"] = t1 @@ -480,31 +480,31 @@ What a mess.*/ active1.fields["age"] = t1 if("mi_crim") if (istype(active2, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please input minor disabilities list:", "Secure. records", active2.fields["mi_crim"], null) as text),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please input minor disabilities list:", "Secure. records", active2.fields["mi_crim"], null) as text)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2)) return active2.fields["mi_crim"] = t1 if("mi_crim_d") if (istype(active2, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please summarize minor dis.:", "Secure. records", active2.fields["mi_crim_d"], null) as message),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please summarize minor dis.:", "Secure. records", active2.fields["mi_crim_d"], null) as message)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2)) return active2.fields["mi_crim_d"] = t1 if("ma_crim") if (istype(active2, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please input major diabilities list:", "Secure. records", active2.fields["ma_crim"], null) as text),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please input major diabilities list:", "Secure. records", active2.fields["ma_crim"], null) as text)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2)) return active2.fields["ma_crim"] = t1 if("ma_crim_d") if (istype(active2, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please summarize major dis.:", "Secure. records", active2.fields["ma_crim_d"], null) as message),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please summarize major dis.:", "Secure. records", active2.fields["ma_crim_d"], null) as message)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2)) return active2.fields["ma_crim_d"] = t1 if("notes") if (istype(active2, /datum/data/record)) - var/t1 = copytext(html_encode(input("Please summarize notes:", "Secure. records", html_decode(active2.fields["notes"]), null) as message),1,MAX_MESSAGE_LEN) + var/t1 = copytext(html_encode(trim(input("Please summarize notes:", "Secure. records", html_decode(active2.fields["notes"]), null) as message)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active2 != a2)) return active2.fields["notes"] = t1 @@ -531,7 +531,7 @@ What a mess.*/ alert(usr, "You do not have the required rank to do this!") if("species") if (istype(active1, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please enter race:", "General records", active1.fields["species"], null) as message),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please enter race:", "General records", active1.fields["species"], null) as message)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1)) return active1.fields["species"] = t1 diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 27360e963e..bc4d977dad 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -325,19 +325,19 @@ What a mess.*/ switch(href_list["field"]) if("name") if (istype(active1, /datum/data/record)) - var/t1 = input("Please input name:", "Secure. records", active1.fields["name"], null) as text + var/t1 = reject_bad_name(input("Please input name:", "Secure. records", active1.fields["name"], null) as text) if ((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon)))) || active1 != a1) return active1.fields["name"] = t1 if("id") if (istype(active1, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please input id:", "Secure. records", active1.fields["id"], null) as text),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please input id:", "Secure. records", active1.fields["id"], null) as text)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1)) return active1.fields["id"] = t1 if("fingerprint") if (istype(active1, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please input fingerprint hash:", "Secure. records", active1.fields["fingerprint"], null) as text),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please input fingerprint hash:", "Secure. records", active1.fields["fingerprint"], null) as text)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1)) return active1.fields["fingerprint"] = t1 @@ -366,7 +366,7 @@ What a mess.*/ alert(usr, "You do not have the required rank to do this!") if("species") if (istype(active1, /datum/data/record)) - var/t1 = copytext(sanitize(input("Please enter race:", "General records", active1.fields["species"], null) as message),1,MAX_MESSAGE_LEN) + var/t1 = copytext(trim(sanitize(input("Please enter race:", "General records", active1.fields["species"], null) as message)),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1)) return active1.fields["species"] = t1 From b905b08489dc378644f40ecd691b17afd5a6893e Mon Sep 17 00:00:00 2001 From: JimTheCactus Date: Mon, 14 Jul 2014 21:02:13 -0600 Subject: [PATCH 70/88] Restored original .int file. It's not being ignored right I think. --- baystation12.int | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 baystation12.int diff --git a/baystation12.int b/baystation12.int new file mode 100644 index 0000000000..b82874fded --- /dev/null +++ b/baystation12.int @@ -0,0 +1,6 @@ +// BEGIN_INTERNALS +/* +MAP_ICON_TYPE: 0 +AUTO_FILE_DIR: OFF +*/ +// END_INTERNALS From 836d2e40a83dbc7e698753f11afcef852262215a Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 14 Jul 2014 23:53:27 -0400 Subject: [PATCH 71/88] Adds miss chance and shield checks to thrown atoms Also makes setting a thrown atom's throwing var the responsibility of the handler, so that impact handling code can decide if the thrown atom should keep on going. --- code/game/atoms.dm | 23 ++------------- code/game/atoms_movable.dm | 29 +++++++++++++++---- code/game/mecha/mecha.dm | 1 + .../living/carbon/alien/special/facehugger.dm | 1 + code/modules/mob/living/living_defense.dm | 22 +++++++++++--- code/modules/mob/mob_helpers.dm | 6 +++- 6 files changed, 51 insertions(+), 31 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index d4c15b23e1..05a52137cc 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -22,27 +22,6 @@ //Detective Work, used for the duplicate data points kept in the scanners var/list/original_atom -/atom/proc/throw_impact(atom/hit_atom, var/speed) - if(istype(hit_atom,/mob/living)) - var/mob/living/M = hit_atom - M.hitby(src,speed) - - else if(isobj(hit_atom)) - var/obj/O = hit_atom - if(!O.anchored) - step(O, src.dir) - O.hitby(src,speed) - - else if(isturf(hit_atom)) - var/turf/T = hit_atom - if(T.density) - spawn(2) - step(src, turn(src.dir, 180)) - if(istype(src,/mob/living)) - var/mob/living/M = src - M.turf_collision(T, speed) - - /atom/proc/assume_air(datum/gas_mixture/giver) return null @@ -237,6 +216,8 @@ its easier to just keep the beam vertical. return /atom/proc/hitby(atom/movable/AM as mob|obj) + if (density) + AM.throwing = 0 return /atom/proc/add_hiddenprint(mob/living/M as mob) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 41da5ea7c8..6870d3ab6f 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -25,7 +25,6 @@ /atom/movable/Bump(var/atom/A as mob|obj|turf|area, yes) if(src.throwing) src.throw_impact(A) - src.throwing = 0 spawn( 0 ) if ((A && yes)) @@ -44,6 +43,29 @@ return 1 return 0 +//called when src is thrown into hit_atom +/atom/movable/proc/throw_impact(atom/hit_atom, var/speed) + if(istype(hit_atom,/mob/living)) + var/mob/living/M = hit_atom + M.hitby(src,speed) + + else if(isobj(hit_atom)) + var/obj/O = hit_atom + if(!O.anchored) + step(O, src.dir) + O.hitby(src,speed) + + else if(isturf(hit_atom)) + src.throwing = 0 + var/turf/T = hit_atom + if(T.density) + spawn(2) + step(src, turn(src.dir, 180)) + if(istype(src,/mob/living)) + var/mob/living/M = src + M.turf_collision(T, speed) + +//decided whether a movable atom being thrown can pass through the turf it is in. /atom/movable/proc/hit_check(var/speed) if(src.throwing) for(var/atom/A in get_turf(src)) @@ -51,12 +73,9 @@ if(istype(A,/mob/living)) if(A:lying) continue src.throw_impact(A,speed) - if(src.throwing == 1) - src.throwing = 0 if(isobj(A)) if(A.density && !A.throwpass) // **TODO: Better behaviour for windows which are dense, but shouldn't always stop movement src.throw_impact(A,speed) - src.throwing = 0 /atom/movable/proc/throw_at(atom/target, range, speed) if(!target || !src) return 0 @@ -149,8 +168,8 @@ a = get_area(src.loc) //done throwing, either because it hit something or it finished moving - src.throwing = 0 if(isobj(src)) src.throw_impact(get_turf(src),speed) + src.throwing = 0 //Overlays diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index e3465c3b7c..0cb89ee683 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -469,6 +469,7 @@ return /obj/mecha/hitby(atom/movable/A as mob|obj) //wrapper + ..() src.log_message("Hit by [A].",1) call((proc_res["dynhitby"]||src), "dynhitby")(A) return diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 4edcbd3dc7..48c16a9983 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -107,6 +107,7 @@ var/const/MAX_ACTIVE_TIME = 400 if(stat == CONSCIOUS) icon_state = "[initial(icon_state)]" Attach(hit_atom) + throwing = 0 /obj/item/clothing/mask/facehugger/proc/Attach(M as mob) if( (!iscorgi(M) && !iscarbon(M)) || isalien(M)) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index c3bbfe0728..5f5018e382 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -65,6 +65,7 @@ P.on_hit(src, absorb, def_zone) return absorb +//this proc handles being hit by a thrown atom /mob/living/hitby(atom/movable/AM as mob|obj,var/speed = 5)//Standardization and logging -Sieve if(istype(AM,/obj/)) var/obj/O = AM @@ -73,14 +74,27 @@ if(istype(O,/obj/item/weapon)) var/obj/item/weapon/W = O dtype = W.damtype + var/throw_damage = O.throwforce*(speed/5) - //run to-hit check here + //def_zone = get_zone_with_miss_chance(zone, src, 15*AM.throwing_dist_travelled) + zone = get_zone_with_miss_chance(zone, src) //TODO: store the location of the thrower and adjust miss chance with distance + + if(!zone) + visible_message("\blue \The [AM] misses [src] narrowly!") + return + + AM.throwing = 0 //it hit, so stop moving + + if (istype(src, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = src + if (H.check_shields(throw_damage, "[O]")) + return src.visible_message("\red [src] has been hit by [O].") - var/armor = run_armor_check(zone, "melee", "Your armor has protected your [zone].", "Your armor has softened hit to your [zone].") + var/armor = run_armor_check(zone, "melee", "Your armor has protected your [zone].", "Your armor has softened the hit to your [zone].") if(armor < 2) - apply_damage(O.throwforce*(speed/5), dtype, zone, armor, is_sharp(O), has_edge(O), O) + apply_damage(throw_damage, dtype, zone, armor, is_sharp(O), has_edge(O), O) if(!O.fingerprintslast) return @@ -99,7 +113,7 @@ if(speed >= 15) var/obj/item/weapon/W = O var/momentum = speed/2 - var/dir = get_dir(M,src) + var/dir = get_dir(M,src) //TODO: store the location of the thrower and move this out of the fingerprintslast block visible_message("\red [src] staggers under the impact!","\red You stagger under the impact!") src.throw_at(get_edge_target_turf(src,dir),1,momentum) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 314a4026ab..bb7881f0a0 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -147,7 +147,11 @@ proc/hasorgans(A) */ return zone - +// Returns zone with a certain probability. +// If the probability misses, returns "chest" instead. +// If "chest" was passed in as zone, then on a "miss" will return "head", "l_arm", or "r_arm" +// Do not use this if someone is intentionally trying to hit a specific body part. +// Use get_zone_with_miss_chance() for that. /proc/ran_zone(zone, probability) zone = check_zone(zone) if(!probability) probability = 90 From f2845dbe76c5869616f59e31b81f332ad3b7c68e Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 15 Jul 2014 01:14:04 -0400 Subject: [PATCH 72/88] Thrown items can be targeted, has miss chance... ...based on distance, similar to projectiles. --- code/_onclick/telekinesis.dm | 2 +- code/defines/obj.dm | 3 ++- code/game/atoms_movable.dm | 8 +++++++- code/game/machinery/bots/farmbot.dm | 2 +- code/game/machinery/kitchen/gibber.dm | 2 +- code/game/machinery/kitchen/smartfridge.dm | 2 +- code/game/machinery/vending.dm | 2 +- code/game/mecha/equipment/tools/tools.dm | 2 +- code/game/mecha/equipment/weapons/weapons.dm | 2 +- .../objects/items/weapons/extinguisher.dm | 9 ++++++--- .../structures/stool_bed_chair_nest/chairs.dm | 2 +- .../stool_bed_chair_nest/wheelchair.dm | 7 ++++++- code/modules/games/cards.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/mob/living/living_defense.dm | 20 ++++++++++++++----- code/modules/projectiles/guns/alien.dm | 2 +- .../projectiles/guns/projectile/bow.dm | 2 +- .../projectiles/guns/projectile/pneumatic.dm | 2 +- .../projectiles/guns/projectile/rocket.dm | 2 +- code/modules/reagents/grenade_launcher.dm | 2 +- 21 files changed, 52 insertions(+), 27 deletions(-) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 0abb637cce..3f74cbd0ea 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -141,7 +141,7 @@ var/const/tk_maxrange = 15 else apply_focus_overlay() - focus.throw_at(target, 10, 1) + focus.throw_at(target, 10, 1, user) last_throw = world.time return diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 25a5242c07..c7e3df319d 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -303,9 +303,10 @@ var/global/list/PDA_Manifest = list() throw_speed = 1 throw_range = 20 flags = FPRINT | TABLEPASS | CONDUCT + afterattack(atom/target as mob|obj|turf|area, mob/user as mob) user.drop_item() - src.throw_at(target, throw_range, throw_speed) + src.throw_at(target, throw_range, throw_speed, user) /obj/effect/stop var/victim = null diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 6870d3ab6f..de6b84d655 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -7,6 +7,8 @@ var/l_move_time = 1 var/m_flag = 1 var/throwing = 0 + var/thrower + var/turf/throw_source = null var/throw_speed = 2 var/throw_range = 7 var/moved_recently = 0 @@ -77,11 +79,13 @@ if(A.density && !A.throwpass) // **TODO: Better behaviour for windows which are dense, but shouldn't always stop movement src.throw_impact(A,speed) -/atom/movable/proc/throw_at(atom/target, range, speed) +/atom/movable/proc/throw_at(atom/target, range, speed, thrower) if(!target || !src) return 0 //use a modified version of Bresenham's algorithm to get from the atom's current position to that of the target src.throwing = 1 + src.thrower = thrower + src.throw_source = get_turf(src) //store the origin turf if(usr) if(HULK in usr.mutations) @@ -170,6 +174,8 @@ //done throwing, either because it hit something or it finished moving if(isobj(src)) src.throw_impact(get_turf(src),speed) src.throwing = 0 + src.thrower = null + src.throw_source = null //Overlays diff --git a/code/game/machinery/bots/farmbot.dm b/code/game/machinery/bots/farmbot.dm index 228b525049..1c0bd0875f 100644 --- a/code/game/machinery/bots/farmbot.dm +++ b/code/game/machinery/bots/farmbot.dm @@ -394,7 +394,7 @@ if ( emagged ) // Warning, hungry humans detected: throw fertilizer at them spawn(0) fert.loc = src.loc - fert.throw_at(target, 16, 3) + fert.throw_at(target, 16, 3, src) src.visible_message("\red [src] launches [fert.name] at [target.name]!") flick("farmbot_broke", src) spawn (FARMBOT_EMAG_DELAY) diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index 4b2fce70cd..b74d3a587a 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -217,7 +217,7 @@ var/obj/item/meatslab = allmeat[i] var/turf/Tx = locate(src.x - i, src.y, src.z) meatslab.loc = src.loc - meatslab.throw_at(Tx,i,3) + meatslab.throw_at(Tx,i,3,src) if (!Tx.density) new /obj/effect/decal/cleanable/blood/gibs(Tx,i) src.operating = 0 diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index 6242626bc7..8eca8dce3a 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -403,7 +403,7 @@ if(!throw_item) return 0 spawn(0) - throw_item.throw_at(target,16,3) + throw_item.throw_at(target,16,3,src) src.visible_message("\red [src] launches [throw_item.name] at [target.name]!") return 1 diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 5dd31a036e..e69a2b36de 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -552,7 +552,7 @@ if (!throw_item) return 0 spawn(0) - throw_item.throw_at(target, 16, 3) + throw_item.throw_at(target, 16, 3, src) src.visible_message("\red [src] launches [throw_item.name] at [target.name]!") return 1 diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 08cc9a65d0..629e3b9d7d 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -464,7 +464,7 @@ return else if(target!=locked) if(locked in view(chassis)) - locked.throw_at(target, 14, 1.5) + locked.throw_at(target, 14, 1.5, chassis) locked = null send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info()) set_ready_state(0) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index e8a9dc072f..fb1174814d 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -231,7 +231,7 @@ var/missile_range = 30 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/Fire(atom/movable/AM, atom/target, turf/aimloc) - AM.throw_at(target,missile_range, missile_speed) + AM.throw_at(target,missile_range, missile_speed, chassis) /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive name = "SRM-8 Missile Rack" diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 219843e68b..652e51e95c 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -82,16 +82,19 @@ C = usr.buckled var/obj/B = usr.buckled var/movementdirection = turn(direction,180) - if(C) C.propelled = 1 - B.Move(get_step(usr,movementdirection), movementdirection) - sleep(1) + if(C) C.propelled = 4 B.Move(get_step(usr,movementdirection), movementdirection) sleep(1) B.Move(get_step(usr,movementdirection), movementdirection) + if(C) C.propelled = 3 + sleep(1) + B.Move(get_step(usr,movementdirection), movementdirection) sleep(1) B.Move(get_step(usr,movementdirection), movementdirection) + if(C) C.propelled = 2 sleep(2) B.Move(get_step(usr,movementdirection), movementdirection) + if(C) C.propelled = 1 sleep(2) B.Move(get_step(usr,movementdirection), movementdirection) if(C) C.propelled = 0 diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 9982017c6b..115806277c 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -138,7 +138,7 @@ if(propelled) var/mob/living/occupant = buckled_mob unbuckle() - occupant.throw_at(A, 3, 2) + occupant.throw_at(A, 3, propelled) occupant.apply_effect(6, STUN, 0) occupant.apply_effect(6, WEAKEN, 0) occupant.apply_effect(6, STUTTER, 0) diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index adec836a78..705351acfc 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -136,7 +136,12 @@ if(propelled || (pulling && (pulling.a_intent == "hurt"))) var/mob/living/occupant = buckled_mob unbuckle() - occupant.throw_at(A, 3, 2) + + if (pulling && (pulling.a_intent == "hurt")) + occupant.throw_at(A, 3, 3, pulling) + else if (propelled) + occupant.throw_at(A, 3, propelled) + occupant.apply_effect(6, STUN, 0) occupant.apply_effect(6, WEAKEN, 0) occupant.apply_effect(6, STUTTER, 0) diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index d7ee461161..60adf1e704 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -116,7 +116,7 @@ H.concealed = 1 H.update_icon() usr.visible_message("\The [usr] deals a card to \the [M].") - H.throw_at(get_step(M,M.dir),10,1) + H.throw_at(get_step(M,M.dir),10,1,H) /obj/item/weapon/hand/attackby(obj/O as obj, mob/user as mob) if(istype(O,/obj/item/weapon/hand)) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index a3c9babd97..c7bf755356 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -330,7 +330,7 @@ */ - item.throw_at(target, item.throw_range, item.throw_speed) + item.throw_at(target, item.throw_range, item.throw_speed, src) /mob/living/carbon/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 45a6647aff..8580099124 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1383,7 +1383,7 @@ status_flags |= LEAPING src.visible_message("\The [src] leaps at [T]!") - src.throw_at(get_step(get_turf(T),get_turf(src)), 5, 1) + src.throw_at(get_step(get_turf(T),get_turf(src)), 5, 1, src) playsound(src.loc, 'sound/voice/shriek1.ogg', 50, 1) sleep(5) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 5f5018e382..aca29b3e0e 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -69,21 +69,31 @@ /mob/living/hitby(atom/movable/AM as mob|obj,var/speed = 5)//Standardization and logging -Sieve if(istype(AM,/obj/)) var/obj/O = AM - var/zone = ran_zone("chest",75)//Hits a random part of the body, geared towards the chest var/dtype = BRUTE if(istype(O,/obj/item/weapon)) var/obj/item/weapon/W = O dtype = W.damtype var/throw_damage = O.throwforce*(speed/5) + var/zone + if (istype(O.thrower, /mob/living)) + var/mob/living/L = O.thrower + zone = check_zone(L.zone_sel.selecting) + else + zone = ran_zone("chest",75) //Hits a random part of the body, geared towards the chest + //def_zone = get_zone_with_miss_chance(zone, src, 15*AM.throwing_dist_travelled) - zone = get_zone_with_miss_chance(zone, src) //TODO: store the location of the thrower and adjust miss chance with distance + if (O.throw_source) + var/distance = get_dist(O.throw_source, loc) + zone = get_zone_with_miss_chance(zone, src, min(15*(distance-2), 0)) + else + zone = get_zone_with_miss_chance(zone, src, 15) if(!zone) - visible_message("\blue \The [AM] misses [src] narrowly!") + visible_message("\blue \The [O] misses [src] narrowly!") return - AM.throwing = 0 //it hit, so stop moving + O.throwing = 0 //it hit, so stop moving if (istype(src, /mob/living/carbon/human)) var/mob/living/carbon/human/H = src @@ -136,7 +146,7 @@ //This is called when the mob is thrown into a dense turf /mob/living/proc/turf_collision(var/turf/T, var/speed) - src.take_organ_damage(speed*4) + src.take_organ_damage(speed*5) /mob/living/proc/near_wall(var/direction,var/distance=1) var/turf/T = get_step(get_turf(src),direction) diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index f192873090..9ac058bc88 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -110,7 +110,7 @@ user.visible_message("\red [user] fires [src]!", "\red You fire [src]!") spike.loc = get_turf(src) - spike.throw_at(target,10,fire_force) + spike.throw_at(target,10,fire_force,user) spike = null update_icon() diff --git a/code/modules/projectiles/guns/projectile/bow.dm b/code/modules/projectiles/guns/projectile/bow.dm index 912b5f2f1e..7788d35627 100644 --- a/code/modules/projectiles/guns/projectile/bow.dm +++ b/code/modules/projectiles/guns/projectile/bow.dm @@ -191,7 +191,7 @@ var/obj/item/weapon/arrow/A = arrow A.loc = get_turf(user) - A.throw_at(target,10,tension*release_speed) + A.throw_at(target,10,tension*release_speed,user) arrow = null tension = 0 icon_state = "crossbow" diff --git a/code/modules/projectiles/guns/projectile/pneumatic.dm b/code/modules/projectiles/guns/projectile/pneumatic.dm index 43c1fed24a..7f1de5e43c 100644 --- a/code/modules/projectiles/guns/projectile/pneumatic.dm +++ b/code/modules/projectiles/guns/projectile/pneumatic.dm @@ -131,7 +131,7 @@ user.visible_message("[user] fires [src] and launches [object] at [target]!","You fire [src] and launch [object] at [target]!") src.remove_from_storage(object,user.loc) - object.throw_at(target,10,speed) + object.throw_at(target,10,speed,user) var/lost_gas_amount = tank.air_contents.total_moles*(pressure_setting/100) var/datum/gas_mixture/removed = tank.air_contents.remove(lost_gas_amount) diff --git a/code/modules/projectiles/guns/projectile/rocket.dm b/code/modules/projectiles/guns/projectile/rocket.dm index a1575b937c..0cf732c9c2 100644 --- a/code/modules/projectiles/guns/projectile/rocket.dm +++ b/code/modules/projectiles/guns/projectile/rocket.dm @@ -43,7 +43,7 @@ var/obj/item/missile/M = new projectile(user.loc) playsound(user.loc, 'sound/effects/bang.ogg', 50, 1) M.primed = 1 - M.throw_at(target, missile_range, missile_speed) + M.throw_at(target, missile_range, missile_speed,user) message_admins("[key_name_admin(user)] fired a rocket from a rocket launcher ([src.name]).") log_game("[key_name_admin(user)] used a rocket launcher ([src.name]).") rockets -= I diff --git a/code/modules/reagents/grenade_launcher.dm b/code/modules/reagents/grenade_launcher.dm index 5545883c2f..b69f428410 100644 --- a/code/modules/reagents/grenade_launcher.dm +++ b/code/modules/reagents/grenade_launcher.dm @@ -56,7 +56,7 @@ var/obj/item/weapon/grenade/chem_grenade/F = grenades[1] //Now with less copypasta! grenades -= F F.loc = user.loc - F.throw_at(target, 30, 2) + F.throw_at(target, 30, 2, user) message_admins("[key_name_admin(user)] fired a grenade ([F.name]) from a grenade launcher ([src.name]).") log_game("[key_name_admin(user)] used a grenade ([src.name]).") F.active = 1 From 2edfda5682e95c9685e11b72d8c664b77ab259f3 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 15 Jul 2014 01:26:08 -0400 Subject: [PATCH 73/88] Thrown momentum no longer depends on fingerprints --- code/modules/mob/living/living_defense.dm | 57 +++++++++++------------ 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index aca29b3e0e..9779e7bb63 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -82,7 +82,6 @@ else zone = ran_zone("chest",75) //Hits a random part of the body, geared towards the chest - //def_zone = get_zone_with_miss_chance(zone, src, 15*AM.throwing_dist_travelled) if (O.throw_source) var/distance = get_dist(O.throw_source, loc) zone = get_zone_with_miss_chance(zone, src, min(15*(distance-2), 0)) @@ -106,43 +105,39 @@ if(armor < 2) apply_damage(throw_damage, dtype, zone, armor, is_sharp(O), has_edge(O), O) - if(!O.fingerprintslast) - return + if(ismob(O.thrower)) + var/mob/M = O.thrower + var/client/assailant = M.client + if(assailant) + src.attack_log += text("\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])") + M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]") + if(!istype(src,/mob/living/simple_animal/mouse)) + msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (JMP)") - var/client/assailant = directory[ckey(O.fingerprintslast)] - if(assailant && assailant.mob && istype(assailant.mob,/mob)) - var/mob/M = assailant.mob + // Begin BS12 momentum-transfer code. + if(O.throw_source && speed >= 15) + var/obj/item/weapon/W = O + var/momentum = speed/2 + var/dir = get_dir(O.throw_source, src) - src.attack_log += text("\[[time_stamp()]\] Has been hit with a thrown [O], last touched by [M.name] ([assailant.ckey])") - M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]") - if(!istype(src,/mob/living/simple_animal/mouse)) - msg_admin_attack("[src.name] ([src.ckey]) was hit by a thrown [O], last touched by [M.name] ([assailant.ckey]) (JMP)") + visible_message("\red [src] staggers under the impact!","\red You stagger under the impact!") + src.throw_at(get_edge_target_turf(src,dir),1,momentum) - // Begin BS12 momentum-transfer code. + if(!W || !src) return - if(speed >= 15) - var/obj/item/weapon/W = O - var/momentum = speed/2 - var/dir = get_dir(M,src) //TODO: store the location of the thrower and move this out of the fingerprintslast block + if(istype(W.loc,/mob/living) && W.sharp) //Projectile is embedded and suitable for pinning. - visible_message("\red [src] staggers under the impact!","\red You stagger under the impact!") - src.throw_at(get_edge_target_turf(src,dir),1,momentum) + if(!istype(src,/mob/living/carbon/human)) //Handles embedding for non-humans and simple_animals. + O.loc = src + src.embedded += O - if(!W || !src) return + var/turf/T = near_wall(dir,2) - if(istype(W.loc,/mob/living) && W.sharp) //Projectile is embedded and suitable for pinning. - - if(!istype(src,/mob/living/carbon/human)) //Handles embedding for non-humans and simple_animals. - O.loc = src - src.embedded += O - - var/turf/T = near_wall(dir,2) - - if(T) - src.loc = T - visible_message("[src] is pinned to the wall by [O]!","You are pinned to the wall by [O]!") - src.anchored = 1 - src.pinned += O + if(T) + src.loc = T + visible_message("[src] is pinned to the wall by [O]!","You are pinned to the wall by [O]!") + src.anchored = 1 + src.pinned += O //This is called when the mob is thrown into a dense turf /mob/living/proc/turf_collision(var/turf/T, var/speed) From f49e709394377054d7c32863c13a933babee517b Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 14 Jul 2014 23:59:10 -0400 Subject: [PATCH 74/88] Fixes organs not being removed due to damage Because the dismemberment check was being done before brute_dam was updated, the attack that actually brought brute_dam above the threshold would not be able to pass the check, regardless of how much damage was actually done. --- code/modules/organs/organ_external.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index b885d7610e..fcf458871a 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -90,13 +90,6 @@ brute *= brmod //~2/3 damage for ROBOLIMBS burn *= bumod //~2/3 damage for ROBOLIMBS - //If limb took enough damage, try to cut or tear it off - if(body_part != UPPER_TORSO && body_part != LOWER_TORSO) //as hilarious as it is, getting hit on the chest too much shouldn't effectively gib you. - if(config.limbs_can_break && brute_dam >= max_damage * config.organ_health_multiplier) - if( (edge && prob(5 * brute)) || (brute > 20 && prob(2 * brute)) ) - droplimb(1) - return - // High brute damage or sharp objects may damage internal organs if(internal_organs && ( (sharp && brute >= 5) || brute >= 10) && prob(5)) // Damage an internal organ @@ -161,6 +154,14 @@ // sync the organ's damage with its wounds src.update_damages() + + //If limb took enough damage, try to cut or tear it off + if(body_part != UPPER_TORSO && body_part != LOWER_TORSO) //as hilarious as it is, getting hit on the chest too much shouldn't effectively gib you. + if(config.limbs_can_break && brute_dam >= max_damage * config.organ_health_multiplier) + if( (edge && prob(5 * brute)) || (brute > 20 && prob(2 * brute)) ) + droplimb(1) + return + owner.updatehealth() var/result = update_icon() From 4448784402f8d48b218f714758deecf67fc77ee0 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 15 Jul 2014 00:07:34 -0400 Subject: [PATCH 75/88] Fixes suits being punctured by projectiles when... ...fully blocked by a shield. --- code/modules/mob/living/carbon/human/human_defense.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 1d57e629d0..1b3be43ddd 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -51,11 +51,6 @@ emp_act return -1 // complete projectile permutation - if(check_shields(P.damage, "the [P.name]")) - P.on_hit(src, 2, def_zone) - handle_suit_punctures(P.damage_type, P.damage) - return 2 - //BEGIN BOOK'S TASER NERF. if(istype(P, /obj/item/projectile/beam/stun)) var/datum/organ/external/select_area = get_organ(def_zone) // We're checking the outside, buddy! @@ -89,6 +84,10 @@ emp_act return //END TASER NERF + if(check_shields(P.damage, "the [P.name]")) + P.on_hit(src, 2, def_zone) + return 2 + var/datum/organ/external/organ = get_organ(check_zone(def_zone)) var/armor = getarmor_organ(organ, "bullet") From fd6181c54f7a6760d6ebc999ea0964d541c1cd57 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 15 Jul 2014 01:30:32 -0400 Subject: [PATCH 76/88] Fixes melee attacks using area effect armour values def_zone is normally not set when attacking with a melee weapon, and the melee armour check didn't use target_zone for some reason. --- code/modules/mob/living/carbon/human/human_defense.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 1b3be43ddd..06783d6d51 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -189,7 +189,8 @@ emp_act /mob/living/carbon/human/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone) if(!I || !user) return 0 - var/target_zone = get_zone_with_miss_chance(user.zone_sel.selecting, src) + var/target_zone = def_zone? def_zone : get_zone_with_miss_chance(user.zone_sel.selecting, src) + if(user == src) // Attacking yourself can't miss target_zone = user.zone_sel.selecting if(!target_zone) @@ -228,7 +229,7 @@ emp_act var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened hit to your [hit_area].") var/weapon_sharp = is_sharp(I) var/weapon_edge = has_edge(I) - if ((weapon_sharp || weapon_edge) && prob(getarmor(def_zone, "melee"))) + if ((weapon_sharp || weapon_edge) && prob(getarmor(target_zone, "melee"))) weapon_sharp = 0 weapon_edge = 0 From 852215834a2f05847589bbc0cd4e329a087bf9d7 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 15 Jul 2014 01:55:24 -0400 Subject: [PATCH 77/88] Bad indentation causing robot modules to embed --- code/modules/mob/living/carbon/human/human_damage.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 81a756845b..62ac94e2f7 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -309,7 +309,7 @@ This function restores all organs. //Sharp objects will always embed if they do enough damage. if((sharp && damage > (10*W.w_class)) || (sharp && !ismob(W.loc)) || (damage > embed_threshold && prob(embed_chance))) organ.embed(W) - else if( (damage > (5*W.w_class)) && ((!ismob(W.loc) && !sharp)) || (prob((damage - 2)/W.w_class) ) ) - organ.embed(W) + else if( (damage > (5*W.w_class)) && ((!ismob(W.loc) && !sharp)) || (prob((damage - 2)/W.w_class) ) ) + organ.embed(W) return 1 From dbf507062e7243bf616da075f7b22b7afd037552 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 15 Jul 2014 02:21:05 -0400 Subject: [PATCH 78/88] Moves human specific hitby code to human_defense --- .../mob/living/carbon/human/human_defense.dm | 71 +++++++++++++++++++ code/modules/mob/living/living_defense.dm | 40 ++++------- 2 files changed, 84 insertions(+), 27 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 0f091a5654..6a96557162 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -282,6 +282,77 @@ emp_act bloody_body(src) return 1 +//this proc handles being hit by a thrown atom +/mob/living/carbon/human/hitby(atom/movable/AM as mob|obj,var/speed = 5) + if(istype(AM,/obj/)) + var/obj/O = AM + var/dtype = BRUTE + if(istype(O,/obj/item/weapon)) + var/obj/item/weapon/W = O + dtype = W.damtype + var/throw_damage = O.throwforce*(speed/5) + + var/zone + if (istype(O.thrower, /mob/living)) + var/mob/living/L = O.thrower + zone = check_zone(L.zone_sel.selecting) + else + zone = ran_zone("chest",75) //Hits a random part of the body, geared towards the chest + + //check if we hit + if (O.throw_source) + var/distance = get_dist(O.throw_source, loc) + zone = get_zone_with_miss_chance(zone, src, min(15*(distance-2), 0)) + else + zone = get_zone_with_miss_chance(zone, src, 15) + + if(!zone) + visible_message("\blue \The [O] misses [src] narrowly!") + return + + O.throwing = 0 //it hit, so stop moving + + if ((O.thrower != src) && check_shields(throw_damage, "[O]")) + return + + var/datum/organ/external/affecting = get_organ(zone) + var/hit_area = affecting.display_name + + src.visible_message("\red [src] has been hit in the [hit_area] by [O].") + var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened hit to your [hit_area].") //I guess "melee" is the best fit here + + if(armor < 2) + apply_damage(throw_damage, dtype, zone, armor, is_sharp(O), has_edge(O), O) + + if(ismob(O.thrower)) + var/mob/M = O.thrower + var/client/assailant = M.client + if(assailant) + src.attack_log += text("\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])") + M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]") + if(!istype(src,/mob/living/simple_animal/mouse)) + msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (JMP)") + + // Begin BS12 momentum-transfer code. + if(O.throw_source && speed >= 15) + var/obj/item/weapon/W = O + var/momentum = speed/2 + var/dir = get_dir(O.throw_source, src) + + visible_message("\red [src] staggers under the impact!","\red You stagger under the impact!") + src.throw_at(get_edge_target_turf(src,dir),1,momentum) + + if(!W || !src) return + + if(W.loc == src && W.sharp) //Projectile is embedded and suitable for pinning. + var/turf/T = near_wall(dir,2) + + if(T) + src.loc = T + visible_message("[src] is pinned to the wall by [O]!","You are pinned to the wall by [O]!") + src.anchored = 1 + src.pinned += O + /mob/living/carbon/human/proc/bloody_hands(var/mob/living/source, var/amount = 2) if (gloves) gloves.add_blood(source) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 9779e7bb63..8b9bfccb87 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -75,36 +75,23 @@ dtype = W.damtype var/throw_damage = O.throwforce*(speed/5) - var/zone - if (istype(O.thrower, /mob/living)) - var/mob/living/L = O.thrower - zone = check_zone(L.zone_sel.selecting) - else - zone = ran_zone("chest",75) //Hits a random part of the body, geared towards the chest - + var/miss_chance = 15 if (O.throw_source) var/distance = get_dist(O.throw_source, loc) - zone = get_zone_with_miss_chance(zone, src, min(15*(distance-2), 0)) - else - zone = get_zone_with_miss_chance(zone, src, 15) - - if(!zone) + miss_chance = min(15*(distance-2), 0) + + if (prob(miss_chance)) visible_message("\blue \The [O] misses [src] narrowly!") return - O.throwing = 0 //it hit, so stop moving - - if (istype(src, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = src - if (H.check_shields(throw_damage, "[O]")) - return - src.visible_message("\red [src] has been hit by [O].") - var/armor = run_armor_check(zone, "melee", "Your armor has protected your [zone].", "Your armor has softened the hit to your [zone].") + var/armor = run_armor_check(null, "melee") if(armor < 2) - apply_damage(throw_damage, dtype, zone, armor, is_sharp(O), has_edge(O), O) + apply_damage(throw_damage, dtype, null, armor, is_sharp(O), has_edge(O), O) + O.throwing = 0 //it hit, so stop moving + if(ismob(O.thrower)) var/mob/M = O.thrower var/client/assailant = M.client @@ -124,12 +111,11 @@ src.throw_at(get_edge_target_turf(src,dir),1,momentum) if(!W || !src) return - - if(istype(W.loc,/mob/living) && W.sharp) //Projectile is embedded and suitable for pinning. - - if(!istype(src,/mob/living/carbon/human)) //Handles embedding for non-humans and simple_animals. - O.loc = src - src.embedded += O + + if(W.sharp) //Projectile is suitable for pinning. + //Handles embedding for non-humans and simple_animals. + O.loc = src + src.embedded += O var/turf/T = near_wall(dir,2) From 08f45dc1cf982a553bf0433fb9318fd442ed798f Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 15 Jul 2014 02:21:25 -0400 Subject: [PATCH 79/88] Thrown sharp objects no longer always embed --- code/modules/mob/living/carbon/human/human_damage.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 62ac94e2f7..570e141c65 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -307,9 +307,8 @@ This function restores all organs. var/embed_threshold = sharp? 5*W.w_class : 15*W.w_class //Sharp objects will always embed if they do enough damage. - if((sharp && damage > (10*W.w_class)) || (sharp && !ismob(W.loc)) || (damage > embed_threshold && prob(embed_chance))) - organ.embed(W) - else if( (damage > (5*W.w_class)) && ((!ismob(W.loc) && !sharp)) || (prob((damage - 2)/W.w_class) ) ) + //Thrown objects have some momentum already and have a small chance to embed even if the damage is below the threshold + if((sharp && damage > (10*W.w_class)) || (sharp && !ismob(W.loc) && prob(damage/(10*W.w_class)*100)) || (damage > embed_threshold && prob(embed_chance))) organ.embed(W) return 1 From 005c6589c27069e7903aa911d0e44b0de00f306e Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 15 Jul 2014 15:30:10 -0400 Subject: [PATCH 80/88] Limits hearing sounds in a vacuum --- code/game/sound.dm | 17 +++++++++++++++-- code/modules/mob/living/say.dm | 3 +-- code/setup.dm | 2 ++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/code/game/sound.dm b/code/game/sound.dm index 0fe756eca5..84abfeeae4 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -25,10 +25,23 @@ var/list/page_sound = list('sound/effects/pageturn1.ogg', 'sound/effects/pagetur var/mob/M = P if(!M || !M.client) continue - if(get_dist(M, turf_source) <= (world.view + extrarange) * 3) + + var/distance = get_dist(M, turf_source) + if(distance <= (world.view + extrarange) * 3) var/turf/T = get_turf(M) + if(T && T.z == turf_source.z) - M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff) + //check that the air can transmit sound + var/datum/gas_mixture/environment = T.return_air() + if (!environment || environment.return_pressure() < SOUND_MINIMUM_PRESSURE) + if (distance > 1) + continue + + var/new_frequency = 32000 + (frequency - 32000)*0.75 //lower the frequency a bit. very rudimentary + var/new_volume = vol*0.5 //muffle the sound, like we're hearing through contact + M.playsound_local(turf_source, soundin, new_volume, vary, new_frequency, falloff) + else + M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff) var/const/FALLOFF_SOUNDS = 2 var/const/SURROUND_CAP = 255 diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 4fd99b4293..3344a9e210 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -1,4 +1,3 @@ -#define SAY_MINIMUM_PRESSURE 10 var/list/department_radio_keys = list( ":r" = "right ear", "#r" = "right ear", ".r" = "right ear", ":l" = "left ear", "#l" = "left ear", ".l" = "left ear", @@ -112,7 +111,7 @@ var/list/department_radio_keys = list( var/datum/gas_mixture/environment = T.return_air() if(environment) var/pressure = environment.return_pressure() - if(pressure < SAY_MINIMUM_PRESSURE) + if(pressure < SOUND_MINIMUM_PRESSURE) italics = 1 message_range = 1 diff --git a/code/setup.dm b/code/setup.dm index 55c1510234..e337d651f2 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -27,6 +27,8 @@ #define HUMAN_NEEDED_OXYGEN MOLES_CELLSTANDARD*BREATH_PERCENTAGE*0.16 //Amount of air needed before pass out/suffocation commences +#define SOUND_MINIMUM_PRESSURE 10 + // Pressure limits. #define HAZARD_HIGH_PRESSURE 550 //This determins at what pressure the ultra-high pressure red icon is displayed. (This one is set as a constant) #define WARNING_HIGH_PRESSURE 325 //This determins when the orange pressure icon is displayed (it is 0.7 * HAZARD_HIGH_PRESSURE) From 866a486ad694fd28d6d5968996e15fa6b0f47f4a Mon Sep 17 00:00:00 2001 From: Whitellama Date: Tue, 15 Jul 2014 12:55:21 -0700 Subject: [PATCH 81/88] Made LOOC show character names of living players and BYOND keys of observing/dead players --- code/game/verbs/ooc.dm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index c87d375e97..12d2b9a067 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -130,6 +130,10 @@ var/global/normal_ooc_colour = "#002eb8" log_ooc("(LOCAL) [mob.name]/[key] : [msg]") var/list/heard = get_mobs_in_view(7, src.mob) + var/mob/S = src.mob + var/display_name = S.key + if(S.stat != DEAD) + display_name = S.name for(var/mob/M in heard) if(!M.client) continue @@ -138,7 +142,6 @@ var/global/normal_ooc_colour = "#002eb8" continue //they are handled after that if(C.prefs.toggles & CHAT_LOOC) - var/display_name = src.key if(holder) if(holder.fakekey) if(C.holder) @@ -148,7 +151,8 @@ var/global/normal_ooc_colour = "#002eb8" C << "LOOC: [display_name]: [msg]" for(var/client/C in admins) if(C.prefs.toggles & CHAT_LOOC) - var/prefix = "(R)LOOC" - if (C.mob in heard) - prefix = "LOOC" - C << "[prefix]: [src.key]: [msg]" \ No newline at end of file + var/prefix = "LOOC" + if (!(C.mob in heard)) + prefix = "(R)LOOC" + display_name = S.key + C << "[prefix]: [display_name]: [msg]" \ No newline at end of file From 90f7029f4efdafedfe24e0c7ea741ed6677167c8 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 15 Jul 2014 16:26:05 -0400 Subject: [PATCH 82/88] Adjusts the volume change in space Did some playtesting with energy guns and revolvers in space. --- code/game/sound.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/sound.dm b/code/game/sound.dm index 84abfeeae4..3f89ea4d18 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -37,8 +37,8 @@ var/list/page_sound = list('sound/effects/pageturn1.ogg', 'sound/effects/pagetur if (distance > 1) continue - var/new_frequency = 32000 + (frequency - 32000)*0.75 //lower the frequency a bit. very rudimentary - var/new_volume = vol*0.5 //muffle the sound, like we're hearing through contact + var/new_frequency = 32000 + (frequency - 32000)*0.125 //lower the frequency. very rudimentary + var/new_volume = vol*0.15 //muffle the sound, like we're hearing through contact M.playsound_local(turf_source, soundin, new_volume, vary, new_frequency, falloff) else M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff) From 8ec8c615e40c247ed94dde5d7e1411e4088c66a1 Mon Sep 17 00:00:00 2001 From: Whitellama Date: Tue, 15 Jul 2014 13:33:52 -0700 Subject: [PATCH 83/88] Made it so admins see global LOOC character names/BYOND keys based on whether that player is alive/dead --- code/game/verbs/ooc.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 12d2b9a067..cead05c53e 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -151,8 +151,7 @@ var/global/normal_ooc_colour = "#002eb8" C << "LOOC: [display_name]: [msg]" for(var/client/C in admins) if(C.prefs.toggles & CHAT_LOOC) - var/prefix = "LOOC" - if (!(C.mob in heard)) - prefix = "(R)LOOC" - display_name = S.key + var/prefix = "(R)LOOC" + if (C.mob in heard) + prefix = "LOOC" C << "[prefix]: [display_name]: [msg]" \ No newline at end of file From c469b188ee725d986e71508235fc37fa9b25cc5a Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 15 Jul 2014 16:35:03 -0400 Subject: [PATCH 84/88] Fixes air alarms not siphoning or cycling --- code/game/machinery/alarm.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 501749a123..eb1e911849 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -405,6 +405,12 @@ return 1 /obj/machinery/alarm/proc/apply_mode() + //propagate mode to other air alarms in the area + //TODO: make it so that players can choose between applying the new mode to the room they are in (related area) vs the entire alarm area + for (var/area/RA in alarm_area.related) + for (var/obj/machinery/alarm/AA in RA) + AA.mode = mode + switch(mode) if(AALARM_MODE_SCRUBBING) for(var/device_id in alarm_area.air_scrub_names) From a4bef09a6933a17eecf4f032319a670d438010e8 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 15 Jul 2014 18:22:43 -0400 Subject: [PATCH 85/88] Fixes air alarm icons not updating I'm not sure how I missed that the first time. --- code/game/area/areas.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 31f3f0cb97..3d40b556f6 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -87,8 +87,6 @@ for(var/area/RA in related) for(var/obj/machinery/camera/C in RA) C.network.Remove("Atmosphere Alarms") - for (var/obj/machinery/alarm/AA in RA) - AA.update_icon() for(var/mob/living/silicon/aiPlayer in player_list) aiPlayer.cancelAlarm("Atmosphere", src, src) for(var/obj/machinery/computer/station_alert/a in machines) @@ -101,8 +99,6 @@ for(var/obj/machinery/camera/C in RA) cameras += C C.network.Add("Atmosphere Alarms") - for (var/obj/machinery/alarm/AA in RA) - AA.update_icon() for(var/mob/living/silicon/aiPlayer in player_list) aiPlayer.triggerAlarm("Atmosphere", src, cameras, src) for(var/obj/machinery/computer/station_alert/a in machines) @@ -110,6 +106,10 @@ air_doors_close() atmosalm = danger_level + for(var/area/RA in related) + for (var/obj/machinery/alarm/AA in RA) + AA.update_icon() + return 1 return 0 From db18074f9028f71a0070d84519440fb32a9ee74a Mon Sep 17 00:00:00 2001 From: Atlantiscze Date: Tue, 15 Jul 2014 23:00:24 +0200 Subject: [PATCH 86/88] Designed to replace AI's intercoms. Integrated headset-like device which has access to all department frequencies. Also let's AIs use radio on intellicard. AI's communication can however be disabled by using intellicard option. Communication will be disabled until it is restored via intellicard again, even if the AI is moved back into physical core. ICly it's software lock which prevents the AI from using communication circuits which are standard in all AI cores/intellicards/etc. This does not stop AI from using intercom, however. Forum link: http://baystation12.net/forums/viewtopic.php?f=5&t=6536&start=1260 --- code/game/objects/items/devices/aicard.dm | 10 +++++++++ .../items/devices/radio/encryptionkey.dm | 6 +++++ .../objects/items/devices/radio/headset.dm | 18 ++++++++++++++- code/modules/mob/living/say.dm | 21 +++++++++--------- code/modules/mob/living/silicon/ai/ai.dm | 14 +++++++++++- code/modules/mob/living/silicon/say.dm | 13 ++++++++--- icons/obj/radio.dmi | Bin 6121 -> 6379 bytes 7 files changed, 67 insertions(+), 15 deletions(-) diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 43daf35b32..204b94cc3d 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -71,6 +71,10 @@ dat += "
    " dat += {"[A.control_disabled ? "Enable" : "Disable"] Wireless Activity"} dat += "
    " + dat += "Subspace Transceiver is: [A.aiRadio.disabledAi ? "Disabled" : "Enabled"]" + dat += "
    " + dat += {"[A.aiRadio.disabledAi ? "Enable" : "Disable"] Subspace Transceiver"} + dat += "
    " dat += {" Close"} user << browse(dat, "window=aicard") onclose(user, "aicard") @@ -92,6 +96,12 @@ U.unset_machine() return + if ("Radio") + for(var/mob/living/silicon/ai/A in src) + A.aiRadio.disabledAi = !A.aiRadio.disabledAi + A << "Your Subspace Transceiver has been: [A.aiRadio.disabledAi ? "disabled" : "enabled"]" + U << "You [A.aiRadio.disabledAi ? "Disable" : "Enable"] the AI's Subspace Transceiver" + if ("Wipe") var/confirm = alert("Are you sure you want to wipe this card's memory? This cannot be undone once started.", "Confirm Wipe", "Yes", "No") if(confirm == "Yes") diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index d2d5417d6c..287e827249 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -74,6 +74,12 @@ icon_state = "cap_cypherkey" channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0) +/obj/item/device/encryptionkey/heads/ai_integrated + name = "AI Integrated Encryption Key" + desc = "Integrated encryption key" + icon_state = "cap_cypherkey" + channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1) + /obj/item/device/encryptionkey/heads/rd name = "Research Director's Encryption Key" desc = "An encyption key for a radio headset. Contains cypherkeys." diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index ed59e43989..ab376e4825 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -19,7 +19,9 @@ keyslot1 = new /obj/item/device/encryptionkey/ recalculateChannels() -/obj/item/device/radio/headset/receive_range(freq, level) +/obj/item/device/radio/headset/receive_range(freq, level, aiOverride = 0) + if (aiOverride) + return ..(freq, level) if(ishuman(src.loc)) var/mob/living/carbon/human/H = src.loc if(H.l_ear == src || H.r_ear == src) @@ -99,6 +101,20 @@ item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/heads/captain +/obj/item/device/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway. + name = "AI Subspace Transceiver" + desc = "Integrated AI radio transceiver." + icon_state = "ai_radio" + item_state = "headset" + keyslot2 = new /obj/item/device/encryptionkey/heads/ai_integrated + var/myAi = null // Atlantis: Reference back to the AI which has this radio. + var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via intellicard menu. + +/obj/item/device/radio/headset/heads/ai_integrated/receive_range(freq, level) + if (disabledAi) + return -1 //Transciever Disabled. + return ..(freq, level, 1) + /obj/item/device/radio/headset/heads/rd name = "Research Director's headset" desc = "Headset of the researching God. To access the science channel, use :n. For command, use :c." diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index b439c0d475..2e81992826 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -84,28 +84,29 @@ var/list/department_radio_keys = list( /mob/living/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="", var/italics=0, var/message_range = world.view, var/list/used_radios = list(), var/sound/speech_sound, var/sound_vol) var/turf/T = get_turf(src) - + //handle nonverbal and sign languages here if (speaking) if (speaking.flags & NONVERBAL) if (prob(30)) src.custom_emote(1, "[pick(speaking.signlang_verb)].") - + if (speaking.flags & SIGNLANG) say_signlang(message, pick(speaking.signlang_verb), speaking) return - + //speaking into radios if(used_radios.len) italics = 1 message_range = 1 - - for(var/mob/living/M in hearers(5, src)) - if(M != src) - M.show_message("[src] talks into [used_radios.len ? used_radios[1] : "the radio."]") - if (speech_sound) - src.playsound_local(get_turf(src), speech_sound, sound_vol * 0.5, 1) - + + if (!istype(src, /mob/living/silicon/ai)) // Atlantis: Prevents nearby people from hearing the AI when it talks using it's integrated radio. + for(var/mob/living/M in hearers(5, src)) + if(M != src) + M.show_message("[src] talks into [used_radios.len ? used_radios[1] : "the radio."]") + if (speech_sound) + src.playsound_local(get_turf(src), speech_sound, sound_vol * 0.5, 1) + speech_sound = null //so we don't play it twice. //make sure the air can transmit speech diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index b34f7aa641..44da5d74af 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -30,6 +30,7 @@ var/list/ai_list = list() var/icon/holo_icon//Default is assigned when AI is created. var/obj/item/device/pda/ai/aiPDA = null var/obj/item/device/multitool/aiMulti = null + var/obj/item/device/radio/headset/heads/ai_integrated/aiRadio = null var/custom_sprite = 0 //For our custom sprites //Hud stuff @@ -87,12 +88,14 @@ var/list/ai_list = list() aiPDA.name = name + " (" + aiPDA.ownjob + ")" aiMulti = new(src) + aiRadio = new(src) + aiRadio.myAi = src if (istype(loc, /turf)) verbs.Add(/mob/living/silicon/ai/proc/ai_call_shuttle,/mob/living/silicon/ai/proc/ai_camera_track, \ /mob/living/silicon/ai/proc/ai_camera_list, /mob/living/silicon/ai/proc/ai_network_change, \ /mob/living/silicon/ai/proc/ai_statuschange, /mob/living/silicon/ai/proc/ai_hologram_change, \ - /mob/living/silicon/ai/proc/toggle_camera_light) + /mob/living/silicon/ai/proc/toggle_camera_light, /mob/living/silicon/ai/proc/control_integrateed_radio) //Languages add_language("Sol Common", 0) @@ -738,3 +741,12 @@ var/list/ai_list = list() return else return ..() + +/mob/living/silicon/ai/proc/control_integrateed_radio() + set name = "Radio Settings" + set desc = "Allows you to change settings of your radio." + set category = "AI Commands" + + src << "Accessing Subspace Transceiver control..." + if (src.aiRadio) + src.aiRadio.interact(src) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 0811a52cd8..67ca178e89 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -109,7 +109,11 @@ if("general") switch(bot_type) if(IS_AI) - src << "Yeah, not yet, sorry" + if (AI.aiRadio.disabledAi) + src << "\red System Error - Transceiver Disabled" + else + log_say("[key_name(src)] : [message]") + AI.aiRadio.talk_into(src,message,null,verb,speaking) if(IS_ROBOT) log_say("[key_name(src)] : [message]") R.radio.talk_into(src,message,null,verb,speaking) @@ -122,8 +126,11 @@ if(message_mode && message_mode in radiochannels) switch(bot_type) if(IS_AI) - src << "You don't have this function yet, I'm working on it" - return + if (AI.aiRadio.disabledAi) + src << "\red System Error - Transceiver Disabled" + else + log_say("[key_name(src)] : [message]") + AI.aiRadio.talk_into(src,message,message_mode,verb,speaking) if(IS_ROBOT) log_say("[key_name(src)] : [message]") R.radio.talk_into(src,message,message_mode,verb,speaking) diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi index 9c4830d273cb40f43ab3ece84db41eeee1817357..b0b250a18b857c4187a5ca9b361a3dc94220a1ee 100644 GIT binary patch literal 6379 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 literal 6121 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 Date: Tue, 15 Jul 2014 20:34:08 -0600 Subject: [PATCH 87/88] Fixes #5640 Make sparks effect target mob, not organ The malfunction sparks were calling to a var src, which in most other places is the main object itself, here that's the organ and it doesn't have a loc. Changed it to call the organ's owner. --- code/modules/organs/organ_external.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index b885d7610e..dda74ac59a 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -355,7 +355,7 @@ INFECTION_LEVEL_THREE above this germ level the player will take additional toxi Note that amputating the affected organ does in fact remove the infection from the player's body. */ /datum/organ/external/proc/update_germs() - + if(status & (ORGAN_ROBOT|ORGAN_DESTROYED) || (owner.species && owner.species.flags & IS_PLANT)) //Robotic limbs shouldn't be infected, nor should nonexistant limbs. germ_level = 0 return @@ -363,7 +363,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(owner.bodytemperature >= 170) //cryo stops germs from moving and doing their bad stuffs //** Syncing germ levels with external wounds handle_germ_sync() - + //** Handle antibiotics and curing infections handle_antibiotics() @@ -386,10 +386,10 @@ Note that amputating the affected organ does in fact remove the infection from t /datum/organ/external/proc/handle_germ_effects() var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin") - + if (germ_level > 0 && germ_level < INFECTION_LEVEL_ONE && prob(60)) //this could be an else clause, but it looks cleaner this way germ_level-- //since germ_level increases at a rate of 1 per second with dirty wounds, prob(60) should give us about 5 minutes before level one. - + if(germ_level >= INFECTION_LEVEL_ONE) //having an infection raises your body temperature var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 1)* min(germ_level/INFECTION_LEVEL_THREE, 1) + owner.species.body_temperature @@ -400,7 +400,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(prob(round(germ_level/10))) if (antibiotics < 5) germ_level++ - + if (prob(5)) //adjust this to tweak how fast people take toxin damage from infections owner.adjustToxLoss(1) @@ -411,7 +411,7 @@ Note that amputating the affected organ does in fact remove the infection from t if (I.germ_level > 0 && I.germ_level < min(germ_level, INFECTION_LEVEL_TWO)) //once the organ reaches whatever we can give it, or level two, switch to a different one if (!target_organ || I.germ_level > target_organ.germ_level) //choose the organ with the highest germ_level target_organ = I - + if (!target_organ) //figure out which organs we can spread germs to and pick one at random var/list/candidate_organs = list() @@ -420,7 +420,7 @@ Note that amputating the affected organ does in fact remove the infection from t candidate_organs += I if (candidate_organs.len) target_organ = pick(candidate_organs) - + if (target_organ) target_organ.germ_level++ @@ -800,8 +800,8 @@ Note that amputating the affected organ does in fact remove the infection from t owner.u_equip(c_hand) owner.emote("me", 1, "drops what they were holding, their [hand_name] malfunctioning!") var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() - spark_system.set_up(5, 0, src) - spark_system.attach(src) + spark_system.set_up(5, 0, owner) + spark_system.attach(owner) spark_system.start() spawn(10) del(spark_system) From b524c5ed2aa516c5448f7b1356bb60564e73f374 Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Wed, 16 Jul 2014 01:48:58 -0500 Subject: [PATCH 88/88] PDA template correction for new NanoUI Templating. --- 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 7b47bb0910..5ea77b60a8 100644 --- a/nano/templates/pda.tmpl +++ b/nano/templates/pda.tmpl @@ -164,7 +164,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{/if}} {{/if}} {{:helper.link('Atmospheric Scan', 'gear', {'choice' : "3"}, null, 'fixedLeftWide')}} - {{:helper.link(fon==1 ? 'Disable Flashlight' : 'Enable Flashlight', 'lightbulb', {'choice' : "Light"}, null,'fixedLeftWide')}} + {{:helper.link(data.fon==1 ? 'Disable Flashlight' : 'Enable Flashlight', 'lightbulb', {'choice' : "Light"}, null,'fixedLeftWide')}} {{if data.pai}}