Overhauls and 2/28 sync (#244)

* map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures * lazy fix for bleeding edgy (#252) * map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures
2017-02-28 09:30:49 -06:00
parent 93782cf716
commit 0bca862419
544 changed files with 309981 additions and 81206 deletions
@@ -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,29 @@
+<ui-display>
+  <ui-section label='Message'>
+    {{data.hidden_message}}
+  </ui-section>
+  <ui-section label='Created On'>
+    {{data.realdate}}
+  </ui-section>
+  <ui-section label='Approval'>
+    <ui-button
+      icon='arrow-up'
+      state='{{data.is_creator ? 'disabled' : data.has_liked ? 'selected' : null}}'
+      action='like'>{{data.num_likes}}</ui-button>
+    <ui-button
+      icon='circle'
+      state='{{data.is_creator ? 'disabled' : !data.has_liked && !data.has_disliked ? 'selected' : null}}'
+      action='neutral'></ui-button>
+    <ui-button
+      icon='arrow-down'
+      state='{{data.is_creator ? 'disabled' : data.has_disliked ? 'selected' : null}}'
+      action='dislike'>{{data.num_dislikes}}</ui-button>
+   </ui-section>
+</ui-display>
+{{#if data.admin_mode}}
+  <ui-display title='Admin Panel'>
+    <ui-section label='Creator Ckey'>{{data.creator_key}}</ui-section>
+    <ui-section label='Creator Character Name'>{{data.creator_name}}</ui-section>
+    <ui-button icon='remove' action='delete' style='danger'>Delete</ui-button>
+  </ui-display>
+{{/if}}
@@ -0,0 +1,43 @@
+{{#if data.processing}}
+<ui-notice>
+  <span>The grinder is currently processing and cannot be used.</span>
+</ui-notice>
+{{/if}}
+<ui-display title='Processing Chamber' button>
+  {{#partial button}}
+    <ui-button icon='eject' state='{{(data.operating == 0) && data.contents ? null : "disabled"}}' action='eject'>Eject Contents</ui-button>
+  {{/partial}}
+  <ui-section label='Grinding'>
+    <span class='{{data.operating ? "average" : "good"}}'>{{data.operating ? "Busy" : "Ready"}}</span>
+	<ui-button icon='refresh' state='{{(data.operating == 0) && data.contents ? null : "disabled"}}' action='grind'>Activate</ui-button>
+  </ui-section>
+  <ui-section label='Contents'>
+    {{#if data.contents}}
+      {{#each adata.contentslist}}
+        <span class='highlight' intro-outro='fade'>The {{name}}</span><br/>
+      {{else}}
+        <span>No Contents</span>
+      {{/each}}
+    {{else}}
+      <span>No Contents</span>
+    {{/if}}
+	</ui-section>
+</ui-display>
+<ui-display title='Container' button>
+  {{#partial button}}
+    <ui-button icon='eject' state='{{(data.operating == 0) && data.isBeakerLoaded ? null : "disabled"}}' action='detach'>Detach</ui-button>
+  {{/partial}}
+  <ui-section label='Reagents'>
+    {{#if data.isBeakerLoaded}}
+      <span>{{Math.round(adata.beakerCurrentVolume)}}/{{data.beakerMaxVolume}} Units</span>
+      <br/>
+      {{#each adata.beakerContents}}
+        <span class='highlight' intro-outro='fade'>{{Math.fixed(volume, 2)}} units of {{name}}</span><br/>
+      {{else}}
+        <span class='bad'>Container Empty</span>
+      {{/each}}
+    {{else}}
+      <span class='average'>No Container</span>
+    {{/if}}
+	</ui-section>
+</ui-display>
@@ -0,0 +1,16 @@
+<ui-display title='Products'>
+	{{#each data.products}}
+	<ui-section label='{{name}}' labelcolor='{{color}}' candystripe right>
+		<span><b>{{amount}}</b></span>
+		<ui-button  state='{{(amount > 0) ? null : "disabled"}}' icon='{{(amount > 0) ? "cart-arrow-down" : "ban"}}' action='vend' params='{"key": {{key}}}'>{{(amount > 0) ? "Vend" : "Sold Out"}}</ui-button>
+	</ui-section>
+	{{/each}}
+</ui-display>
+{{#if data.coinslot}}
+	<ui-display title='Coin Slot'>
+		<ui-section label='Coin'>
+		<span class='{{data.coin ? "bold" : null}}'>{{data.coin ? data.coin : "No Coin"}}</span>
+		 <ui-button icon='arrow-circle-up' state='{{data.coin && data.canvend ? null : "disabled"}}'
+      action='eject'>Eject Coin</ui-button>
+	</ui-display>
+{{/if}}