From ec79e75c0fd242c4116d6bd727fa4cbd453f529b Mon Sep 17 00:00:00 2001
From: Ccomp5950 <Ccomp5950@gmail.com>
Date: Sat, 23 Nov 2013 01:43:34 -0600
Subject: [PATCH] Fixed nanoUI issues with Watermelon Juice in the Soda
 Dispenser

Added some if statements so that NanoUI for the booze/soda dispensers isn't /exactly/ like the chemdispenser, mentions glass instead of beaker, and "drinks" instead of chemical.

Also removed my debug messages
---
 code/modules/reagents/Chemistry-Machinery.dm |  4 ---
 code/modules/reagents/Chemistry-Reagents.dm  |  2 +-
 nano/css/shared.css                          | 11 ++++--
 nano/templates/chem_dispenser.tmpl           | 36 +++++++++++++++-----
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index dfb59b7a97..5a9811a519 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -183,7 +183,6 @@
 	return 1 // update UIs attached to this object
 
 /obj/machinery/chem_dispenser/attackby(var/obj/item/weapon/reagent_containers/B as obj, var/mob/user as mob)
-	world << "DEBUG:  got chem_dispenser attack by"
 	if(isrobot(user))
 		return
 
@@ -200,9 +199,7 @@
 	if(src.beaker)
 		user << "Something is already loaded into the machine."
 		return
-	world << "DEBUG:  Got to chem_dispenser/attackby istype check"
 	if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B, /obj/item/weapon/reagent_containers/food))
-		world << "DEBUG: Passed istype check"
 		if(!accept_glass && istype(B,/obj/item/weapon/reagent_containers/food))
 			user << "<span class='notice'>This machine only accepts beakers</span>"
 		src.beaker =  B
@@ -259,7 +256,6 @@
 	dispensable_reagents = list("water","ice","coffee","tea","cream","lemon_lime","sugar","orangejuice","limejuice","cola","sodawater","tonic","beer","kahlua","whiskey","wine","vodka","gin","rum","tequilla","vermouth","cognac","ale","mead")
 
 	/obj/machinery/chem_dispenser/beer/attackby(var/obj/item/weapon/B as obj, var/mob/user as mob)
-		world << "DEBUG:  GOT BEER DISPENSER attackby"
 		..()
 
 		if(istype(B, /obj/item/device/multitool))
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 02c5de3a05..867fb39c65 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -2563,7 +2563,7 @@ datum
 				return
 
 		drink/cold/spacemountainwind
-			name = "MountainWind"
+			name = "Mountain Wind"
 			id = "spacemountainwind"
 			description = "Blows right through you like a space wind."
 			color = "#102000" // rgb: 16, 32, 0
diff --git a/nano/css/shared.css b/nano/css/shared.css
index 76aac18f46..fe5c35dd30 100644
--- a/nano/css/shared.css
+++ b/nano/css/shared.css
@@ -176,6 +176,8 @@ h4 {
     width: 16px;
     height: 16px;
 }
+
+
 div.notice {
     clear: both;
 }
@@ -301,9 +303,14 @@ div.notice {
     border-color: #666666;
 }
 .fixedLeft {
-    width: 110px;
+    width: 130px;
     float: left;
 }
+.fixedLeftWide {
+    width: 260px;
+    float: left;
+}
+
 .floatRight {
     float: right;
 }
@@ -355,4 +362,4 @@ div.notice {
 	height: 200px;
 	margin: 200px 0;
 	text-align: center;
-}
\ No newline at end of file
+}
diff --git a/nano/templates/chem_dispenser.tmpl b/nano/templates/chem_dispenser.tmpl
index 9d9f6525fd..875f57c6e8 100644
--- a/nano/templates/chem_dispenser.tmpl
+++ b/nano/templates/chem_dispenser.tmpl
@@ -26,23 +26,32 @@ Used In File(s): \code\modules\reagents\Chemistry-Machinery.dm
 <div class="item">&nbsp;</div>
 <div class="item">
 	<div class="itemLabel" style="width: 100%;">
-		Chemical Dispenser
+		{^{if glass}}
+			Drink Dispenser
+		{{else}}
+			Chemical Dispenser
+		{{/if}}
 	</div>
 </div>
 <div class="item">
-	<div class="itemContent" style="width: 100%;">
+	<div class="itemContentWide" style="width: 100%;">
 		{^{for chemicals}}
-			{^{:~link(title, 'circle-arrow-s', commands, null, 'fixedLeft')}}
+			{^{:~link(title, 'circle-arrow-s', commands, null, ~root.glass ? 'fixedLeftWide' : 'fixedLeft' )}}
 		{{/for}}
+		
 	</div>
 </div>
 <div class="item">&nbsp;</div>
 <div class="item">
 	<div class="itemLabel">
-		Beaker Contents
+		{^{if glass}}
+			Glass
+		{{else}}
+			Beaker
+		{{/if}} Contents
 	</div>
 	<div class="itemContent">
-		{^{:~link('Eject Beaker', 'eject', {'ejectBeaker' : 1}, isBeakerLoaded ? null : 'disabled', 'floatRight')}}
+		{^{:~link(glass ? 'Eject Glass' : 'Eject Beaker', 'eject', {'ejectBeaker' : 1}, isBeakerLoaded ? null : 'disabled', 'floatRight')}}
 	</div>
 </div>
 <div class="statusDisplay" style="height: 225px; overflow: auto;">
@@ -53,11 +62,22 @@ Used In File(s): \code\modules\reagents\Chemistry-Machinery.dm
 				{^{for beakerContents}}
 					<span class="highlight">{^{:volume}} units of {^{:name}}</span><br>
 				{{else}}
-					<span class="bad">Beaker is empty</span>
+					<span class="bad">
+							{^{if glass}}
+								Glass
+							{{else}}
+								Beaker
+							{{/if}}
+								 is empty</span>
 				{{/for}}
 			{{else}}
-				<span class="average"><i>No beaker loaded</i></span>
+				<span class="average"><i>No 
+							{^{if glass}}
+								Glass
+							{{else}}
+								Beaker
+							{{/if}} loaded</i></span>
 			{{/if}}
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>