- Chef and bartender now both have access to the bar area. Bartender has his shotgun and shaker spawn in his back room, which now has wooden floor and tables. Booze-o-mat is now bartender-access.

- Split the items in the engivend vending machine into the engivend machine, which retained the circuitboards, belts and got power cells; and the YouTool vending machine, which has tools and gloves and such.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4157 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj/vending.dm

@@ -69,6 +69,7 @@
 	name = "Booze-O-Mat"
 	desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
 	icon_state = "boozeomat"        //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles
+	icon_deny = "boozeomat-deny"
 	product_paths = "/obj/item/weapon/reagent_containers/food/drinks/bottle/gin;/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey;/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla;/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka;/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth;/obj/item/weapon/reagent_containers/food/drinks/bottle/rum;/obj/item/weapon/reagent_containers/food/drinks/bottle/wine;/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac;/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua;/obj/item/weapon/reagent_containers/food/drinks/beer;/obj/item/weapon/reagent_containers/food/drinks/ale;/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/cream;/obj/item/weapon/reagent_containers/food/drinks/tonic;/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/sodawater;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass;/obj/item/weapon/reagent_containers/food/drinks/ice"
 	product_amounts = "5;5;5;5;5;5;5;5;5;6;6;4;4;4;4;8;8;15;30;9"
 	vend_delay = 15
@@ -76,6 +77,7 @@
 	product_hideamt = "10"
 	product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
 	product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!"
+	req_access_txt = "25"
 
 /obj/machinery/vending/assist
 	product_amounts = "5;3;4;1;4"
@@ -243,7 +245,7 @@
 	product_hideamt = "20"
 	product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."
 
-/obj/machinery/vending/tool//Who did this and why is it here? I don't even
+/obj/machinery/vending/tool
 	name = "YouTool"
 	desc = "Tools for tools."
 	icon_state = "tool"
@@ -251,21 +253,21 @@
 	req_access_txt = "12" //Maintenance access
 	product_paths = "/obj/item/weapon/cable_coil/random;/obj/item/weapon/crowbar;/obj/item/weapon/weldingtool;/obj/item/weapon/wirecutters;/obj/item/weapon/wrench;/obj/item/device/analyzer;/obj/item/device/t_scanner"
 	product_amounts = "10;5;3;5;5;5;5"
-	product_hidden = "/obj/item/weapon/weldingtool/largetank;/obj/item/device/multitool"
+	product_hidden = "/obj/item/weapon/weldingtool/hugeetank;/obj/item/clothing/gloves/fyellow"
 	product_hideamt = "2;2"
 	product_coin = "/obj/item/clothing/gloves/yellow"
 	product_coin_amt = "1"
 
-/obj/machinery/vending/engivend//Source of tools and what have you for Engineering (Needed on account of the public auto-lathe being removed) -Sieve
+/obj/machinery/vending/engivend
 	name = "Engi-Vend"
 	desc = "Spare tool vending. What? Did you expect some witty description?"
 	icon_state = "engivend"
 	icon_deny = "engivend-deny"
 	req_access_txt = "10" //Engineering access
-	product_paths = "/obj/item/weapon/cable_coil/random;/obj/item/clothing/glasses/meson;/obj/item/weapon/crowbar;/obj/item/weapon/weldingtool;/obj/item/weapon/wirecutters;/obj/item/weapon/wrench;/obj/item/device/t_scanner;/obj/item/device/multitool;/obj/item/weapon/airlock_electronics;/obj/item/weapon/module/power_control"
-	product_amounts = "5;3;5;3;5;5;5;2;3;3"
-	product_hidden = "/obj/item/weapon/weldingtool/hugetank;/obj/item/clothing/gloves/fyellow"
-	product_hideamt = "2;2"
+	product_paths = "/obj/item/clothing/glasses/meson;/obj/item/device/multitool;/obj/item/weapon/airlock_electronics;/obj/item/weapon/module/power_control;/obj/item/weapon/cell/high"
+	product_amounts = "2;4;10;10;10"
+	product_hidden = "/obj/item/weapon/cell/potato"
+	product_hideamt = "3"
 	product_coin = "/obj/item/weapon/storage/belt/utility"
 	product_coin_amt = "3"
 

code/game/objects/closets/secure/bar.dm

@@ -1,6 +1,12 @@
 /obj/structure/closet/secure_closet/bar
 	name = "Booze"
 	req_access = list(access_bar)
+	icon_state = "cabinetdetective_locked"
+	icon_closed = "cabinetdetective"
+	icon_locked = "cabinetdetective_locked"
+	icon_opened = "cabinetdetective_open"
+	icon_broken = "cabinetdetective_broken"
+	icon_off = "cabinetdetective_broken"
 
 
 	New()

code/modules/mob/new_player/poll.dm

@@ -230,7 +230,12 @@
 			usr << "\red You already voted in this poll."
 			return
 
-		var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_vote VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]')")
+		var/adminrank = "Player"
+		if(usr && usr.client && usr.client.holder)
+			adminrank = usr.client.holder.rank
+
+
+		var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_vote (`id` ,`datetime` ,`pollid` ,`optionid` ,`ckey` ,`ip` ,'adminrank') VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]')")
 		insert_query.Execute()
 
 		usr << "\blue Vote successful."

html/changelog.html

@@ -47,6 +47,15 @@ should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 
+<div class="commit sansserif">
+	<h2 class="date">24 July 2012</h2>
+	<h3 class="author">Errorage updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="tweak">Both the chef and bartender have access to the bar area so both can serve if the other is incompetent or does not exist. Bartender's shotgun and shaker were moved to his back room and the booze-o-mat is now ID restricted to the bartender.</li>
+		<li class="rscadd">Added powercells into vending machines in engineering</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">22 July 2012</h2>
 	<h3 class="author">Errorage updated:</h3>