Bleeding edgy refresh (#303)
* not code stuff * other things * global vars, defines, helpers * onclick hud stuff, orphans, world.dm * controllers and datums * game folder * everything not client/mobs in modules * client folder * stage 1 mob stuff * simple animal things * silicons * carbon things * ayylmaos and monkeys * hyoomahn * icons n shit * sprite fixes * compile fixes * some fixes I cherrypicked. * qdel fixes * forgot brain refractors
This commit is contained in:
+7
-7
File diff suppressed because one or more lines are too long
+2
-2
@@ -2,7 +2,7 @@
|
||||
"name": "tgui",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"autoprefixer": "6.3.3",
|
||||
"autoprefixer": "6.7.7",
|
||||
"babel-core": "6.5.2",
|
||||
"babel-plugin-external-helpers": "6.5.0",
|
||||
"babel-polyfill": "6.5.0",
|
||||
@@ -20,7 +20,7 @@
|
||||
"fontfaceobserver": "1.6.3",
|
||||
"gulp": "github:gulpjs/gulp#4.0",
|
||||
"gulp-bytediff": "1.0.0",
|
||||
"gulp-cssnano": "2.1.1",
|
||||
"gulp-cssnano": "2.1.2",
|
||||
"gulp-if": "2.0.0",
|
||||
"gulp-load-plugins": "1.2.0",
|
||||
"gulp-postcss": "6.1.0",
|
||||
|
||||
@@ -51,10 +51,10 @@
|
||||
<ui-section label='Temperature'>
|
||||
<span class='{{temperatureStatus(adata.cellTemperature)}}'>{{Math.round(adata.cellTemperature)}} K</span>
|
||||
</ui-section>
|
||||
<ui-section label='Door'>
|
||||
<ui-button icon='{{data.isOpen ? "unlock" : "lock"}}' action='door'>{{data.isOpen ? "Open" : "Closed"}}</ui-button>
|
||||
<ui-button icon='{{data.autoEject ? "sign-out" : "sign-in"}}' action='autoeject'>{{data.autoEject ? "Auto" : "Manual"}}</ui-button>
|
||||
</ui-section>
|
||||
<ui-section label='Door'>
|
||||
<ui-button icon='{{data.isOpen ? "unlock" : "lock"}}' action='door'>{{data.isOpen ? "Open" : "Closed"}}</ui-button>
|
||||
<ui-button icon='{{data.autoEject ? "sign-out" : "sign-in"}}' action='autoeject'>{{data.autoEject ? "Auto" : "Manual"}}</ui-button>
|
||||
</ui-section>
|
||||
</ui-display>
|
||||
<ui-display title='Beaker' button>
|
||||
{{#partial button}}
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
{{#if data.shaking}}
|
||||
<ui-display title={{data.question}}>
|
||||
<ui-section>
|
||||
{{#each data.answers}}
|
||||
<ui-button
|
||||
action='vote' params='{"answer": "{{answer}}"}'
|
||||
style='{{selected ? "selected" : null}}' >{{answer}} ({{amount}})
|
||||
</ui-button>
|
||||
{{/each}}
|
||||
</ui-section>
|
||||
</ui-display>
|
||||
{{else}}
|
||||
<ui-notice>The eightball is not currently being shaken.</ui-notice>
|
||||
{{/if}}
|
||||
Reference in New Issue
Block a user