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

tgui/src/interfaces/chem_master.ract

@@ -1,4 +1,4 @@
-{{#if data.screen == "home"}}
+{{#if data.screen == "home"}}
 	<ui-display title='Beaker' button>
 		<ui-button icon='{{data.isBeakerLoaded ? "Eject" : "close"}}'
 			style='{{data.isBeakerLoaded ? "selected" : null}}'
@@ -50,14 +50,17 @@
 
 	{{#if !data.condi}}
 		<ui-display title='Pills, Bottles and Patches' >
+			{{#each data.pillStyles}}
+				<ui-button state='{{id==data.chosenPillStyle ? "selected" : null}}' action='pillStyle' params='{"id": "{{id}}"}'>{{{htmltag}}}</ui-button>
+			{{/each}}
+			<br>
 			{{#if data.isPillBottleLoaded}}
 				<ui-button action='ejectp' state='{{data.isPillBottleLoaded ? null : "disabled"}}'>{{data.isPillBottleLoaded ? "Eject" : "No Pill bottle loaded"}}</ui-button>
 				<span class='content'>{{data.pillBotContent}}/{{data.pillBotMaxContent}}</span>
 			{{else}}
 				<span class='average'>No Pillbottle</span>
 			{{/if}}
-			
-			<br/>
+
 			<br/>
 			<ui-button action='createPill' params='{"many": 0}' state='{{data.bufferContents ? null : "disabled"}}' >Create Pill (max 50µ)</ui-button>
 			<br/>

tgui/tgui.html

@@ -16,7 +16,8 @@
       };
     </script>
     <link rel='stylesheet' href='tgui.css'/>
-    <link rel='stylesheet' href='spritesheet_pipes.css'/>
+    <!-- This is processed in byond, so interfaces can override the html head if needed, for custom sheets of style etc -->
+    <!--customheadhtml-->
     <script id='data' type='application/json' data-ref='[ref]'>{}</script>
     <script defer src='tgui.js'></script>
   </head>