April sync (#360)

* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
This commit is contained in:
Poojawa
2017-04-13 23:37:00 -05:00
committed by GitHub
parent cdc32c98fa
commit 7e9b96a00f
1322 changed files with 174827 additions and 23888 deletions
+32 -1
View File
@@ -11,6 +11,13 @@
<ui-section label='Port'>
<span class='{{data.portConnected ? "good" : "average"}}'>{{data.portConnected ? "Connected" : "Not Connected"}}</span>
</ui-section>
{{#if data.isPrototype}}
<ui-section label='Access'>
<ui-button icon='{{data.restricted ? "lock" : "unlock"}}'
style='{{"caution"}}'
action='restricted'>{{data.restricted ? "Restricted to Engineering" : "Public"}}</ui-button>
</ui-section>
{{/if}}
</ui-display>
<ui-display title='Valve'>
<ui-section label='Release Pressure'>
@@ -30,8 +37,32 @@
<ui-button icon='{{data.valveOpen ? "unlock" : "lock"}}'
style='{{data.valveOpen ? data.hasHoldingTank ? "caution" : "danger" : null}}'
action='valve'>{{data.valveOpen ? "Open" : "Closed"}}</ui-button>
</ui-section>
</ui-display>
{{#if data.isPrototype}}
<ui-display title='Valve Toggle Timer'>
{{^data.timing}}
<ui-section label='Adjust Timer'>
<ui-button icon='refresh' state='{{data.timer_is_not_default ? null : "disabled"}}'
action='timer' params='{"change": "reset"}'>Reset</ui-button>
<ui-button icon='minus' state='{{data.timer_is_not_min ? null : "disabled"}}'
action='timer' params='{"change": "decrease"}'>Decrease</ui-button>
<ui-button icon='pencil' state='{{"disabled"}}'
action='timer' params='{"change": "input"}'>Set</ui-button>
<ui-button icon='plus' state='{{data.timer_is_not_max ? null : "disabled"}}'
action='timer' params='{"change": "increase"}'>Increase</ui-button>
</ui-section>
{{/data.timing}}
<ui-section label='Timer'>
<ui-button icon='clock-o' style='{{data.timing ? "danger" : "caution"}}'
action='toggle_timer'> {{data.timing ? "On" : "Off"}}
</ui-button>
<ui-section label='Time until Valve Toggle'>
<span>{{data.timing ? data.time_left : data.timer_set}}</span>
</ui-section>
</ui-display>
{{/if}}
<ui-display title='Holding Tank' button>
{{#partial button}}
{{#if data.hasHoldingTank}}
+7 -8
View File
@@ -1,16 +1,15 @@
<ui-display>
<ui-section label='State'>
{{#if data.mode == 0}}
<span class='bad'>Off</span>
{{#if data.full_pressure}}
<span class='good'>Ready</span>
{{else}}
{{#if data.mode == -1}}
{{#if data.panel_open}}
<span class='bad'>Power Disabled</span>
{{else}}
{{#if data.mode == 1}}
{{#if data.pressure_charging}}
<span class='average'>Pressurizing</span>
{{else}}
<span class='good'>Ready</span>
<span class='bad'>Off</span>
{{/if}}
{{/if}}
{{/if}}
@@ -21,7 +20,7 @@
<ui-section label='Handle'>
<ui-button
icon='{{data.flush ? "toggle-on" : "toggle-off" }}'
state='{{data.isai || data.mode == -1 ? 'disabled' : null}}'
state='{{data.isai || data.panel_open ? 'disabled' : null}}'
action='{{data.flush ? "handle-0" : "handle-1" }}'>
{{data.flush ? "Disengage" : "Engage" }}</ui-button>
</ui-section>
@@ -29,6 +28,6 @@
<ui-button icon='sign-out' state='{{data.isai ? 'disabled' : null}}' action='eject'>Eject Contents</ui-button><br/>
</ui-section>
<ui-section label='Power'>
<ui-button icon='power-off' state='{{data.mode == -1 ? 'disabled' : null}}' action='{{data.mode ? "pump-0" : "pump-1" }}' style='{{data.mode ? "selected" : null }}'></ui-button><br/>
<ui-button icon='power-off' state='{{data.panel_open ? 'disabled' : null}}' action='{{data.pressure_charging ? "pump-0" : "pump-1" }}' style='{{data.pressure_charging ? "selected" : null }}'></ui-button><br/>
</ui-section>
</ui-display>
+41
View File
@@ -0,0 +1,41 @@
<ui-display title="Known Languages">
{{#each data.languages}}
<ui-section label={{name}}>
<span>{{desc}}</span>
<span>Key: ,{{key}}</span>
<span>{{can_speak ? "Can Speak" : "Cannot Speak"}}</span>
<ui-button
action='select_default'
params='{"language_name":"{{name}}"}'
style='{{is_default ? "selected" : can_speak ? null : "disabled"}}'
>{{is_default ? "Default Language" : "Select as Default"}}
</ui-button>
{{#if data.admin_mode}}
<ui-button
action='remove_language'
params='{"language_name":"{{name}}"}'
>Remove
</ui-button>
{{/if}}
</ui-section>
{{/each}}
</ui-display>
{{#if data.admin_mode}}
<ui-button
action='toggle_omnitongue'
style='{{data.omnitongue ? "selected" : null}}'
>Omnitongue {{data.omnitongue ? "Enabled" : "Disabled"}}
</ui-button>
<ui-display title="Unknown Languages">
{{#each data.unknown_languages}}
<ui-section label={{name}}>
<span>{{desc}}</span>
<span>Key: ,{{key}}</span>
<ui-button
action='grant_language'
params='{"language_name":"{{name}}"}'
>Grant</ui-button>
</ui-section>
{{/each}}
</ui-display>
{{/if}}