Commiting some stuff for Petethegoat from this thread: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=5744

For those too lazy to read the thread:
Vending machines now have a switch inside the maintenance panel that when flipped, turns off those pesky advertisements.
A bunch of unused delivery locations have been removed.
You can no longer attack yourself with that bag of cheesie honkers you just finished eating from. Mining Satchels and trashbags now default to picking up everything on one tile.

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

code/WorkInProgress/recycling/sortingmachinery.dm

@@ -103,8 +103,8 @@
 	desc = "Used to set the destination of properly wrapped packages."
 	icon_state = "forensic0"
 	var/currTag = 0
-	var/list/locationList = list("Waste Disposal", "Head of Personnel's Quarters", "Research Director's Office",
+	var/list/locationList = list("Head of Personnel's Quarters", "Research Director's Office",
-	"Dormitory Toilets", "Locker Room", "Locker Toilets", "Fitness Room", "Kitchen", "Bar", "Bartender's workspace",
+	 "Locker Room", "Kitchen", "Bar", "Bartender's workspace",
 	"Theatre", "Library", "Chapel Office", "Assembly Line", "Medbay", "Chemistry", "Surgery", "Exam Room",
 	"Security", "Head of Security", "Cargo Bay", "Quartermaster's Office", "Janitors Closet", "Hydroponics",
 	"Toxin Lab")

code/defines/obj/vending.dm

@@ -26,6 +26,7 @@
 	var/emagged = 0 //Ignores if somebody doesn't have card access to that machine.
 	var/seconds_electrified = 0 //Shock customers like an airlock.
 	var/shoot_inventory = 0 //Fire items at customers! We're broken!
+	var/shut_up = 0 //Stop spouting those godawful pitches!
 	var/extended_inventory = 0 //can we access the hidden inventory?
 	var/panel_open = 0 //Hacking that vending machine. Gonna get a free candy bar.
 	var/wires = 15

code/game/machinery/vending.dm

@@ -147,6 +147,8 @@
 		pdat += "The green light is [src.extended_inventory ? "on" : "off"].<BR>"
 		pdat += "The [(src.wires & WIRE_SCANID) ? "purple" : "yellow"] light is on.<BR>"
 
+		pdat += "The speaker switch is [src.shut_up ? "off" : "on"]. <a href='?src=\ref[src];togglevoice=[1]'>Toggle</a>"
+
 		user << browse(pdat, "window=vendwires")
 		onclose(user, "vendwires")
 
@@ -253,6 +255,9 @@
 			else
 				src.pulse(twire)
 
+		else if ((href_list["togglevoice"]) && (src.panel_open))
+			src.shut_up = !src.shut_up
+
 		src.add_fingerprint(usr)
 		src.updateUsrDialog()
 	else
@@ -271,7 +276,7 @@
 		src.seconds_electrified--
 
 	//Pitch to the people!  Really sell it!
-	if(prob(5) && ((src.last_slogan + src.slogan_delay) <= world.time) && (src.slogan_list.len > 0))
+	if(prob(5) && ((src.last_slogan + src.slogan_delay) <= world.time) && (src.slogan_list.len > 0) && (!src.shut_up))
 		var/slogan = pick(src.slogan_list)
 		src.speak(slogan)
 		src.last_slogan = world.time

code/game/objects/items/trash.dm

@@ -47,6 +47,8 @@
 		icon = 'candle.dmi'
 		icon_state = "candle4"
 
+/obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
+	return
 
 /obj/item/trash/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
@@ -73,7 +75,7 @@
 	icon_state = "trashbag0"
 	item_state = "trashbag"
 	name = "Trash bag"
-	var/mode = 0;  //0 = pick one at a time, 1 = pick all on tile
+	var/mode = 1;  //0 = pick one at a time, 1 = pick all on tile
 	var/capacity = 25; //the number of trash it can carry.
 	flags = FPRINT | TABLEPASS | ONBELT
 	w_class = 1

code/game/objects/stool.dm

@@ -93,7 +93,7 @@
 /obj/stool/proc/buckle_mob(mob/M as mob, mob/user as mob)
 	if (!ticker)
 		user << "You can't buckle anyone in before the game starts."
-	if ((!( istype(M, /mob) ) || get_dist(src, user) > 1 || M.loc != src.loc || user.restrained() || usr.stat))
+	if ((!( istype(M, /mob) ) || get_dist(src, user) > 1 || M.loc != src.loc || user.restrained() || usr.stat || M.buckled))
 		return
 	if (M == usr)
 		M.visible_message(\

code/modules/mining/satchel_ore_boxdm.dm

@@ -4,7 +4,7 @@
 	icon = 'mining.dmi'
 	icon_state = "satchel"
 	name = "Mining Satchel"
-	var/mode = 0;  //0 = pick one at a time, 1 = pick all on tile
+	var/mode = 1;  //0 = pick one at a time, 1 = pick all on tile
 	var/capacity = 50; //the number of ore pieces it can carry.
 	flags = FPRINT | TABLEPASS | ONBELT
 	w_class = 1