Hard upstream sync (#6951)

* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
This commit is contained in:
deathride58
2018-05-31 16:03:18 -07:00
committed by kevinz000
parent b6e608cb4c
commit 2f9e3e403d
395 changed files with 134016 additions and 26287 deletions
+8 -1
View File
@@ -21,6 +21,13 @@
{{#if !data.locked }}
<ui-display title='Express Cargo Console'>
<ui-section label='Landing Location'>
<ui-button state='{{data.usingBeacon ? null : "selected"}}' action='LZCargo'> Cargo Bay</ui-button>
<ui-button state='{{data.hasBeacon ? data.usingBeacon ? "selected" : null : "disabled"}}' action='LZBeacon'> {{data.beaconzone}} ({{data.beaconName}})</ui-button>
<ui-button state='{{data.canBuyBeacon ? null : "disabled"}}' action='printBeacon'> {{data.printMsg}}</ui-button>
</ui-section>
<ui-section label='Credits'>
<span>{{Math.floor(adata.points)}}</span>
</ui-section>
@@ -34,7 +41,7 @@
<tab name='{{name}}'>
{{#each packs}}
<ui-section label='{{name}}' candystripe right>
<ui-button tooltip='{{desc}}' tooltip-side='left' action='add' params='{"id": "{{id}}"}'>{{cost}} Credits</ui-button>
<ui-button state='{{data.canBeacon ? null : "disabled"}}' tooltip='{{desc}}' tooltip-side='left' action='add' params='{"id": "{{id}}"}'>{{cost}} Credits {{data.beaconError}}</ui-button>
</ui-section>
{{/each}}
</tab>
+17 -19
View File
@@ -17,29 +17,27 @@
</ui-display>
{{/if}}
<ui-display title='Utilities'>
<ui-section>
<ui-button icon='{{data.mode >= 0 ? "check-square-o" : "square-o"}}' state='{{data.mode >= 0 ? "selected" : null}}'
action='mode' params='{"mode": {{data.screen}}}'>Lay Pipes</ui-button>
</ui-section>
<ui-section>
<ui-button icon='{{data.mode == -1 ? "check-square-o" : "square-o"}}' state='{{data.mode == -1 ? "selected" : null}}'
action='mode' params='{"mode": -1}'>Eat Pipes</ui-button>
</ui-section>
<ui-section>
<ui-button icon='{{data.mode == -2 ? "check-square-o" : "square-o"}}' state='{{data.mode == -2 ? "selected" : null}}'
action='mode' params='{"mode": -2}'>Paint Pipes</ui-button>
</ui-section>
<ui-button icon='{{data.mode & 1 ? "check-square-o" : "square-o"}}'
action='mode' params='{"mode": 1}'>Build</ui-button>
<ui-button icon='{{data.mode & 2 ? "check-square-o" : "square-o"}}'
action='mode' params='{"mode": 2}'>Wrench</ui-button>
<ui-button icon='{{data.mode & 4 ? "check-square-o" : "square-o"}}'
action='mode' params='{"mode": 4}'>Destroy</ui-button>
{{#if data.category == 0}}
<ui-button icon='{{data.mode & 8 ? "check-square-o" : "square-o"}}'
action='mode' params='{"mode": 8}'>Paint</ui-button>
{{/if}}
</ui-display>
<ui-display title='Category'>
<ui-section>
<ui-button icon='{{data.screen == 0 ? "check-square-o" : "square-o"}}' state='{{data.screen == 0 ? "selected" : null}}'
action='screen' params='{"screen": 0}'>Atmospherics</ui-button>
<ui-button icon='{{data.screen == 1 ? "check-square-o" : "square-o"}}' state='{{data.screen == 1 ? "selected" : null}}'
action='screen' params='{"screen": 1}'>Disposals</ui-button>
<ui-button icon='{{data.screen == 2 ? "check-square-o" : "square-o"}}' state='{{data.screen == 2 ? "selected" : null}}'
action='screen' params='{"screen": 2}'>Transit Tubes</ui-button>
<ui-button icon='{{data.category == 0 ? "check-square-o" : "square-o"}}' state='{{data.category <= 0 ? "selected" : null}}'
action='category' params='{"category": 0}'>Atmospherics</ui-button>
<ui-button icon='{{data.category == 1 ? "check-square-o" : "square-o"}}' state='{{data.category == 1 ? "selected" : null}}'
action='category' params='{"category": 1}'>Disposals</ui-button>
<ui-button icon='{{data.category == 2 ? "check-square-o" : "square-o"}}' state='{{data.category == 2 ? "selected" : null}}'
action='category' params='{"category": 2}'>Transit Tubes</ui-button>
</ui-section>
{{#if data.screen == 0}}
{{#if data.category == 0}}
<ui-section label='Piping Layer'>
<ui-button state='{{data.piping_layer == 1 ? "selected" : null}}' action='piping_layer'
params='{"piping_layer": 1}'>1</ui-button>
+5
View File
@@ -12,6 +12,11 @@
</script>
<ui-display>
{{#if data.emagged}}
<ui-notice>
<span>Safety restraints disabled.</span>
</ui-notice>
{{/if}}
{{#if data.vr_avatar}}
<ui-display title='Virtual Avatar'>
<ui-section label='Name'>