Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147

tgui/src/interfaces/chem_master.ract

@@ -17,7 +17,7 @@
 							<ui-button action='transferToBuffer' params='{"id": "{{id}}", "amount": 10}'>10</ui-button>
 							<ui-button action='transferToBuffer' params='{"id": "{{id}}", "amount": 1000}'>All</ui-button>
 							<ui-button action='transferToBuffer' params='{"id": "{{id}}", "amount": -1}'>Custom</ui-button>
-							<ui-button action='analyze' params='{"id": "{{id}}"}'>Analyze</ui-button>
+							<ui-button action='analyzeBeak' params='{"id": "{{id}}"}'>Analyze</ui-button>
 						</div>
 					</ui-section>
 			{{else}}
@@ -41,7 +41,7 @@
 						<ui-button action='transferFromBuffer' params='{"id": "{{id}}", "amount": 10}'>10</ui-button>
 						<ui-button action='transferFromBuffer' params='{"id": "{{id}}", "amount": 1000}'>All</ui-button>
 						<ui-button action='transferFromBuffer' params='{"id": "{{id}}", "amount": -1}'>Custom</ui-button>
-						<ui-button action='analyze' params='{"id": "{{id}}"}'>Analyze</ui-button>
+						<ui-button action='analyzeBuff' params='{"id": "{{id}}"}'>Analyze</ui-button>
 					</div>
 				</ui-section>
 			{{/each}}

tgui/src/interfaces/gulag_item_reclaimer.ract

@@ -1,10 +1,7 @@
-<ui-display>
-	<center><ui-button action="handle_id">{{data.id ? data.id_name : "-------------"}}</ui-button></center>
-</ui-display>
 <ui-display title='Stored Items'>
 	{{#each data.mobs}}
 		<ui-section label='{{name}}'>
 			<ui-button action="release_items" params='{"mobref":{{mob}}}' state={{data.can_reclaim ? null : 'disabled'}}>Drop Items</ui-button>
 		</ui-section>
 	{{/each}}
-</ui-display>
+</ui-display>

tgui/src/interfaces/labor_claim_console.ract

@@ -6,24 +6,15 @@
 	{{/each}}
 </ui-display>
 <ui-display title='Points'>
-	<ui-section label='ID'>
-		<ui-button action="handle_id">{{data.id ? data.id_name : "-------------"}}</ui-button>
+	<ui-section label='Unclaimed points'>
+		<span>{{data.unclaimed_points}}</span>
+		<ui-button action="claim_points" state={{data.unclaimed_points ? null : 'disabled'}}>Claim points</ui-button>
 	</ui-section>
-	{{#if data.id}}
-		<ui-section label='Points collected'>
-			<span>{{data.points}}</span>
-		</ui-section>
-		<ui-section label='Goal'>
-			<span>{{data.goal}}</span>
-		</ui-section>
-		<ui-section label='Unclaimed points'>
-			<span>{{data.unclaimed_points}}</span>
-			<ui-button action="claim_points" state={{data.unclaimed_points ? null : 'disabled'}}>Claim points</ui-button>
-		</ui-section>
-	{{/if}}
 </ui-display>
 <ui-display>
-	<center>
+	<span>Points: {{data.id_points}}</span>
+	<ui-section label='Status'>
+		<span>{{data.status_info}}</span>
 		<ui-button action="move_shuttle" state={{data.can_go_home ? null : 'disabled'}}>Move shuttle</ui-button>
-	</center>
-</ui-display>
+	</ui-section>
+</ui-display>

tgui/src/interfaces/ore_redemption_machine.ract

@@ -3,24 +3,10 @@
 		This machine only accepts ore. Gibtonite and Slag are not accepted.
 	</ui-section>
 	<ui-section>
-		Current unclaimed points: {{data.unclaimedPoints}}
-		{{#if data.unclaimedPoints}}
+		Current unclaimed credits: {{data.unclaimedPoints}}
 			<ui-button action='Claim'>
-				Claim Points
+				Claim
 			</ui-button>
-		{{/if}}
-	</ui-section>
-	<ui-section>
-		{{#if data.hasID}}
-			<ui-button action='Eject'>
-				Eject ID
-			</ui-button>
-			You have {{data.claimedPoints}} mining points collected.
-		{{else}}
-			<ui-button action='Insert'>
-				Insert ID
-			</ui-button>
-		{{/if}}
 	</ui-section>
 </ui-display>
 <ui-display>