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

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 9792c56..ccee841 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),