X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=365f9d44e09e38f582500507ea1ec49060fe208b;hp=9792c564d868535c7f21b72979dcfab0bea4491f;hb=6952f0b864469f529eaae14ad7be0806c36c6230;hpb=9da23e11388f05dba1503b89f80e9c1ed50f68cb

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 9792c56..365f9d4 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -105,7 +105,7 @@ def scroll_options(username, mk, welcome = False):
 		c = c.strip()
 		(slot_num, price, slot_name) = c.split(' ', 2)
 		if slot_name == 'dead': continue
-		choices += '%s8-%s (%sc) '%(slot_num, slot_name, price)
+		choices += '%s-(%sc)-%s8 '%(slot_name, price, slot_num)
 
 #	we don't want to print snacks for now since it'll be too large
 #	and there's physical bits of paper in the machine anyway - matt
@@ -215,7 +215,7 @@ def setup_idlers(v):
 		 GrayIdler(v,one="/",zero="\\",reorder=1),
 		StringIdler(v, text=str(math.e) + "            "),
 		 GrayIdler(v,one="X",zero="O",reorder=1),
-		StringIdler(v, text="    I want some pizza - please call Pizza Hut Shenton Park on +61 8 9381 9979 - and order as Quinn - I am getting really hungry", repeat=False),
+		StringIdler(v, text="    I want some pizza - please call Pizza Hut Shenton Park on +61 8 9381 9979 [now closed? - MSH] - and order as Quinn - I am getting really hungry", repeat=False),
 		PipeIdler(v, "/usr/bin/getent", "passwd"),
 		FortuneIdler(v),
 		ClockIdler(v),
@@ -230,6 +230,7 @@ def reset_idler(v, vstatus, t = None):
 	idler = GreetingIdler(v, t)
 	vstatus.time_of_next_idlestep = time()+idler.next()
 	vstatus.time_of_next_idler = None
+	vstatus.time_to_autologout = None
 	vstatus.change_state(STATE_IDLE, 1)
 
 def choose_idler():