Committing some of SuperSayu's misc patches: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11671

* Smart fridge smartly shows (x5)(x10)(x25)(All) vend options based on quantity stored
* Gateway fix: When the away mission gate is calibrated, you will come out facing south. Matters somewhat when walking through in an exosuit. Also one pedantic text edit.
* Drink volume estimation:
* * Moved "half-full" to 26%-66% rather than 25%-49%
* * Moved "almost full" to 67%-90% rather than 50%-111% (1/.9)

Also removed /obj/item/weapon/directions and /obj/item/weapon/paperscrap.
They've been replaced by /obj/item/weapon/paper/crumpled and /obj/item/weapon/paper/crumpled/bloody.
Updated 2.1.0 and all away missions.

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

code/defines/obj/weapon.dm

@@ -276,18 +276,6 @@
 	name = "warning cone"
 	icon_state = "cone"
 
-/obj/item/weapon/directions
-	name = "crumpled paper"
-	gender = PLURAL
-	desc = "This is a crumpled piece of paper."
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "crumpled"
-	throwforce = 0
-	w_class = 1.0
-	throw_speed = 3
-	throw_range = 15
-	//layer = 4
-
 /obj/item/weapon/rack_parts
 	name = "rack parts"
 	desc = "Parts of a rack."

code/game/gamemodes/cult/ritual.dm

@@ -775,24 +775,3 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 					R.word3=wordtech
 					R.loc = user.loc
 					R.check_icon()
-
-
-/obj/item/weapon/paperscrap
-	name = "scrap of paper"
-	icon_state = "scrap"
-	throw_speed = 1
-	throw_range = 2
-	w_class = 1.0
-	flags = FPRINT | TABLEPASS
-
-	var/data
-
-	attack_self(mob/user as mob)
-		view_scrap(user)
-
-	examine()
-		set src in usr
-		view_scrap(usr)
-
-	proc/view_scrap(var/viewer)
-		viewer << browse(data)

code/game/machinery/kitchen/smartfridge.dm

@@ -139,9 +139,14 @@
 				dat += "<FONT color = 'blue'><B>[capitalize(O)]</B>:"
 				dat += " [N] </font>"
 				dat += "<a href='byond://?src=\ref[src];vend=[O];amount=1'>Vend</A> "
-				dat += "(<a href='byond://?src=\ref[src];vend=[O];amount=5'>x5</A>)"
-				dat += "(<a href='byond://?src=\ref[src];vend=[O];amount=10'>x10</A>)"
-				dat += "(<a href='byond://?src=\ref[src];vend=[O];amount=25'>x25</A>)"
+				if(N > 5)
+					dat += "(<a href='byond://?src=\ref[src];vend=[O];amount=5'>x5</A>)"
+					if(N > 10)
+						dat += "(<a href='byond://?src=\ref[src];vend=[O];amount=10'>x10</A>)"
+						if(N > 25)
+							dat += "(<a href='byond://?src=\ref[src];vend=[O];amount=25'>x25</A>)"
+				if(N > 1)
+					dat += "(<a href='?src=\ref[src];vend=[O];amount=[N]'>All</A>)"
 				dat += "<br>"
 
 		dat += "</TT>"

code/modules/awaymissions/gateway.dm

@@ -120,6 +120,7 @@ obj/machinery/gateway/centerstation/process()
 	if(!awaygate)	return
 	if(awaygate.calibrated)
 		M.loc = get_step(awaygate.loc, SOUTH)
+		M.dir = SOUTH
 		return
 	else
 		var/obj/effect/landmark/dest = pick(awaydestinations)
@@ -230,6 +231,6 @@ obj/machinery/gateway/centerstation/process()
 			user << "\black The gate is already calibrated, there is no work for you to do here."
 			return
 		else
-			user << "\blue <b>Recalibration successful!</b>: \black This gates systems have been fine tuned, travel to this gate will now be on target."
+			user << "\blue <b>Recalibration successful!</b>: \black This gate's systems have been fine tuned.  Travel to this gate will now be on target."
 			calibrated = 1
 			return

code/modules/paperwork/paper.dm

@@ -1,5 +1,6 @@
 /*
  * Paper
+ * also scraps of paper
  */
 
 /obj/item/weapon/paper
@@ -338,3 +339,13 @@
 /obj/item/weapon/paper/sop
 	name = "paper- 'Standard Operating Procedure'"
 	info = "Alert Levels:<BR>\nBlue- Emergency<BR>\n\t1. Caused by fire<BR>\n\t2. Caused by manual interaction<BR>\n\tAction:<BR>\n\t\tClose all fire doors. These can only be opened by reseting the alarm<BR>\nRed- Ejection/Self Destruct<BR>\n\t1. Caused by module operating computer.<BR>\n\tAction:<BR>\n\t\tAfter the specified time the module will eject completely.<BR>\n<BR>\nEngine Maintenance Instructions:<BR>\n\tShut off ignition systems:<BR>\n\tActivate internal power<BR>\n\tActivate orbital balance matrix<BR>\n\tRemove volatile liquids from area<BR>\n\tWear a fire suit<BR>\n<BR>\n\tAfter<BR>\n\t\tDecontaminate<BR>\n\t\tVisit medical examiner<BR>\n<BR>\nToxin Laboratory Procedure:<BR>\n\tWear a gas mask regardless<BR>\n\tGet an oxygen tank.<BR>\n\tActivate internal atmosphere<BR>\n<BR>\n\tAfter<BR>\n\t\tDecontaminate<BR>\n\t\tVisit medical examiner<BR>\n<BR>\nDisaster Procedure:<BR>\n\tFire:<BR>\n\t\tActivate sector fire alarm.<BR>\n\t\tMove to a safe area.<BR>\n\t\tGet a fire suit<BR>\n\t\tAfter:<BR>\n\t\t\tAssess Damage<BR>\n\t\t\tRepair damages<BR>\n\t\t\tIf needed, Evacuate<BR>\n\tMeteor Shower:<BR>\n\t\tActivate fire alarm<BR>\n\t\tMove to the back of ship<BR>\n\t\tAfter<BR>\n\t\t\tRepair damage<BR>\n\t\t\tIf needed, Evacuate<BR>\n\tAccidental Reentry:<BR>\n\t\tActivate fire alrms in front of ship.<BR>\n\t\tMove volatile matter to a fire proof area!<BR>\n\t\tGet a fire suit.<BR>\n\t\tStay secure until an emergency ship arrives.<BR>\n<BR>\n\t\tIf ship does not arrive-<BR>\n\t\t\tEvacuate to a nearby safe area!"
+
+/obj/item/weapon/paper/crumpled
+	name = "paper scrap"
+	icon_state = "scrap"
+
+/obj/item/weapon/paper/crumpled/update_icon()
+	return
+
+/obj/item/weapon/paper/crumpled/bloody
+	icon_state = "scrap_bloodied"

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -109,11 +109,11 @@
 		if (!(usr in range(0)) && usr!=src.loc) return
 		if(!reagents || reagents.total_volume==0)
 			usr << "\blue \The [src] is empty!"
-		else if (reagents.total_volume<src.volume/4)
+		else if (reagents.total_volume<=src.volume/4)
 			usr << "\blue \The [src] is almost empty!"
-		else if (reagents.total_volume<src.volume/2)
+		else if (reagents.total_volume<=src.volume*0.66)
 			usr << "\blue \The [src] is half full!"
-		else if (reagents.total_volume<src.volume/0.90)
+		else if (reagents.total_volume<=src.volume*0.90)
 			usr << "\blue \The [src] is almost full!"
 		else
 			usr << "\blue \The [src] is full!"

maps/tgstation.2.1.0.dmm

@@ -7786,7 +7786,7 @@
 "cTL" = (/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/simulated/floor,/area/derelict/bridge)
 "cTM" = (/turf/simulated/floor,/area/derelict/bridge)
 "cTN" = (/turf/simulated/floor/plating,/area/derelict/bridge)
-"cTO" = (/obj/structure/table,/obj/item/weapon/directions,/turf/simulated/floor,/area/derelict/bridge)
+"cTO" = (/obj/structure/table,/obj/item/weapon/paper/crumpled,/turf/simulated/floor,/area/derelict/bridge)
 "cTP" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/derelict/bridge)
 "cTQ" = (/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor/airless{icon_state = "damaged3"},/area/derelict/singularity_engine)
 "cTR" = (/obj/structure/window/reinforced,/turf/simulated/floor/airless{icon_state = "damaged5"},/area/derelict/singularity_engine)
@@ -8367,7 +8367,7 @@
 "deU" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/door/airlock/maintenance{name = "Mining Station Maintenance"; req_access_txt = "54"},/turf/simulated/floor/plating,/area/mine/north_outpost)
 "deV" = (/obj/machinery/atmospherics/pipe/simple,/turf/simulated/wall,/area/mine/north_outpost)
 "deW" = (/obj/machinery/hydroponics,/turf/simulated/floor{icon_state = "dark"},/area/mine/abandoned)
-"deX" = (/obj/structure/table,/obj/item/weapon/directions,/turf/simulated/floor/airless{icon_state = "floorscorched2"},/area/mine/abandoned)
+"deX" = (/obj/structure/table,/obj/item/weapon/paper/crumpled,/turf/simulated/floor/airless{icon_state = "floorscorched2"},/area/mine/abandoned)
 "deY" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/mine/abandoned)
 "deZ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating,/area/mine/abandoned)
 "dfa" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/mine/abandoned)