From 68a30e9969bbd199809a80a679dae50754088ca9 Mon Sep 17 00:00:00 2001
From: Fermi <>
Date: Wed, 20 Nov 2019 12:11:44 +0000
Subject: [PATCH] Final pass

---
 code/game/machinery/Sleeper.dm           |  4 +-
 tgui/src/interfaces/reagent_sleeper.ract | 72 ------------------------
 tgui/src/interfaces/sleeper.ract         | 26 ++++++++-
 3 files changed, 25 insertions(+), 77 deletions(-)
 delete mode 100644 tgui/src/interfaces/reagent_sleeper.ract

diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 48e6d6de47..7d7a03945f 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -130,7 +130,7 @@
 	if(istype(I, /obj/item/reagent_containers))
 		var/obj/item/reagent_containers/RC = I
 		for(var/datum/reagent/R in RC.reagents.reagent_list)
-			if((!istype(R, /datum/reagent/medicine) && !(obj_flags & EMAGGED)) || ((allowed(usr) && scan_id)))
+			if((!istype(R, /datum/reagent/medicine) && !(obj_flags & EMAGGED)) || (allowed(usr)))
 				visible_message("The [src] gives out a hearty boop and rejects the [I]. The Sleeper's screen flashes with a pompous \"Medicines only, please.\"")
 				return
 		RC.reagents.trans_to(reagents, 1000)
@@ -295,7 +295,7 @@
 				return
 			reagents.add_reagent(chem_buttons[chem], 10) //other_purity = 0.75 for when the mechanics are in
 		if("purge")
-			if((allowed(usr) && scan_id))
+			if(allowed(usr))
 				var/chem = params["chem"]
 				if(!is_operational())
 					return
diff --git a/tgui/src/interfaces/reagent_sleeper.ract b/tgui/src/interfaces/reagent_sleeper.ract
deleted file mode 100644
index 5038923103..0000000000
--- a/tgui/src/interfaces/reagent_sleeper.ract
+++ /dev/null
@@ -1,72 +0,0 @@
-<ui-display title='Occupant'>
-  <ui-section label='Occupant'>
-	 <span>{{data.occupant.name ? data.occupant.name : "No Occupant"}}</span>
-  </ui-section>
-  {{#if data.occupied}}
-    <ui-section label='State'>
-      <span class='{{data.occupant.statstate}}'>{{data.occupant.stat}}</span>
-  	</ui-section>
-    <ui-section label='Health'>
-      <ui-bar min='{{data.occupant.minHealth}}' max='{{data.occupant.maxHealth}}' value='{{data.occupant.health}}'
-        state='{{data.occupant.health >= 0 ? "good" : "average"}}'>{{Math.round(adata.occupant.health)}}</ui-bar>
-    </ui-section>
-    {{#each [{label: "Brute", type: "bruteLoss"}, {label: "Respiratory", type: "oxyLoss"}, {label: "Toxin", type: "toxLoss"}, {label: "Burn", type: "fireLoss"}]}}
-      <ui-section label='{{label}}'>
-        <ui-bar min='0' max='{{data.occupant.maxHealth}}' value='{{data.occupant[type]}}' state='bad'>{{Math.round(adata.occupant[type])}}</ui-bar>
-      </ui-section>
-    {{/each}}
-    {{#if data.occupant.blood}}
-      <ui-section label='Blood'>
-        <ui-section label='Volume'>
-          <ui-bar min='0' max='{{data.occupant.blood.maxBloodVolume}}' value='{{data.occupant.blood.currentBloodVolume}}' state='{{data.occupant.blood.currentBloodVolume <= data.occupant.blood.dangerBloodVolume ? "bad" : "good"}}'>{{& data.occupant.blood.currentBloodVolume <= data.occupant.blood.dangerBloodVolume ? "<b>LOW</b>" : "OK"}} - {{Math.round(data.occupant.blood.currentBloodVolume)}} cl</ui-bar>
-        </ui-section>
-        <ui-section label='Type'>
-          <span class='highlight'>{{data.occupant.blood.bloodType}}</span>
-        </ui-section>
-      </ui-section>
-    {{/if}}
-    <ui-section label='Cells'>
-        <span class='{{data.occupant.cloneLoss ? "bad" : "good"}}'>{{data.occupant.cloneLoss ? "Damaged" : "Healthy"}}</span>
-    </ui-section>
-    <ui-section label='Brain'>
-        <span class='{{data.occupant.brainLoss ? "bad" : "good"}}'>{{data.occupant.brainLoss ? "Abnormal" : "Healthy"}}</span>
-    </ui-section>
-    <ui-section label='Bloodstream'>
-        {{#each adata.occupant.reagents}}
-          <span class='highlight' intro-outro='fade'>{{Math.fixed(volume, 1)}} units of {{name}}</span><br/>
-        {{else}}
-          <span class='good'>Pure</span>
-        {{/each}}
-    </ui-section>
-  {{/if}}
-</ui-display>
-<ui-display title='Controls'>
-	<ui-section label='Door'>
-    <ui-button icon='{{data.open ? "unlock" : "lock"}}' action='door'>{{data.open ? "Open" : "Closed"}}</ui-button>
-	</ui-section>
-  <ui-section label='Synthesize'>
-    {{#each data.synthchems}}
-      <ui-button grid action='synth' params='{"chem": "{{id}}"}'>{{name}}</ui-button>
-    {{/each}}
-  </ui-section>
-  <ui-section label='Inject'>
-    {{#each data.chems}}
-	  <span><b>{{name}}</b>: {{vol}}u</span>
-	  {{#if data.efficiency >= 4}}
-	  	<span>Purity: {{purity}}</span>
-	  {{/if}}
-	  {{#if data.efficiency >= 3}}
-	    <ui-button state='{{data.occupied && allowed ? null : "disabled"}}' action='inject' params='{"chem": "{{id}}", "volume": 1}'>1</ui-button>
-	  {{/if}}
-	  {{#if adata.efficiency >= 2}}
-	    <ui-button state='{{data.occupied && allowed ? null : "disabled"}}' action='inject' params='{"chem": "{{id}}", "volume": 5}'>5</ui-button>
-	  {{/if}}
-	  <ui-button state='{{data.occupied && allowed ? null : "disabled"}}' action='inject' params='{"chem": "{{id}}", "volume": 10}'>10</ui-button>
-	  <ui-button state='{{data.occupied && allowed ? null : "disabled"}}' action='purge' params='{"chem": "{{id}}"}'>Purge</ui-button><br/>
-    {{/each}}
-    </ui-section>
-  <ui-section label='Capacity'>
-    <ui-bar min=0 max='{{data.tot_capacity}}' value='{{data.current_vol}}'
-    state='{{data.current_vol}}'>{{data.current_vol}}</ui-bar>
-  </ui-section>
-</ui-display>
diff --git a/tgui/src/interfaces/sleeper.ract b/tgui/src/interfaces/sleeper.ract
index e5bad17461..5038923103 100644
--- a/tgui/src/interfaces/sleeper.ract
+++ b/tgui/src/interfaces/sleeper.ract
@@ -44,9 +44,29 @@
 	<ui-section label='Door'>
     <ui-button icon='{{data.open ? "unlock" : "lock"}}' action='door'>{{data.open ? "Open" : "Closed"}}</ui-button>
 	</ui-section>
-  <ui-section label='Inject'>
-    {{#each data.chems}}
-      <ui-button icon='flask' state='{{data.occupied && allowed ? null : "disabled"}}' action='inject' params='{"chem": "{{id}}"}'>{{name}}</ui-button><br/>
+  <ui-section label='Synthesize'>
+    {{#each data.synthchems}}
+      <ui-button grid action='synth' params='{"chem": "{{id}}"}'>{{name}}</ui-button>
     {{/each}}
   </ui-section>
+  <ui-section label='Inject'>
+    {{#each data.chems}}
+	  <span><b>{{name}}</b>: {{vol}}u</span>
+	  {{#if data.efficiency >= 4}}
+	  	<span>Purity: {{purity}}</span>
+	  {{/if}}
+	  {{#if data.efficiency >= 3}}
+	    <ui-button state='{{data.occupied && allowed ? null : "disabled"}}' action='inject' params='{"chem": "{{id}}", "volume": 1}'>1</ui-button>
+	  {{/if}}
+	  {{#if adata.efficiency >= 2}}
+	    <ui-button state='{{data.occupied && allowed ? null : "disabled"}}' action='inject' params='{"chem": "{{id}}", "volume": 5}'>5</ui-button>
+	  {{/if}}
+	  <ui-button state='{{data.occupied && allowed ? null : "disabled"}}' action='inject' params='{"chem": "{{id}}", "volume": 10}'>10</ui-button>
+	  <ui-button state='{{data.occupied && allowed ? null : "disabled"}}' action='purge' params='{"chem": "{{id}}"}'>Purge</ui-button><br/>
+    {{/each}}
+    </ui-section>
+  <ui-section label='Capacity'>
+    <ui-bar min=0 max='{{data.tot_capacity}}' value='{{data.current_vol}}'
+    state='{{data.current_vol}}'>{{data.current_vol}}</ui-bar>
+  </ui-section>
 </ui-display>