Merge branch 'master' of github.com:Baystation12/Baystation12

Conflicts:
	maps/tgstation.2.0.8.dmm

code/game/objects/devices/PDA/PDA.dm

@@ -775,15 +775,6 @@
 						user << "\blue \t [re]"
 				else
 					user << "\blue No active chemical agents found in [A]."
-			else if(istype(A,/obj/machinery/water/pipe))
-				var/datum/water/pipeline/P = A:parent
-				if(P.reagents.reagent_list.len > 0)
-					var/reagents_length = P.reagents.reagent_list.len
-					user << "\blue [reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found at [P.return_pressure()]kPa."
-					for (var/re in P.reagents.reagent_list)
-						user << "\blue \t [re]"
-				else
-					user << "\blue No active chemical agents found in [A]."
 			else
 				user << "\blue No significant chemical agents found in [A]."
 

code/game/objects/devices/PDA/cart.dm

@@ -34,7 +34,6 @@
 		name = "Power-ON Cartridge"
 		icon_state = "cart-e"
 		access_engine = 1
-		access_reagent_scanner = 1
 
 	medical
 		name = "Med-U Cartridge"

code/game/objects/stool.dm

@@ -326,8 +326,14 @@
 						"You unbuckled from [src] by [user.name].",\
 						"You hear metal clanking")
 				else
+					var/t_himself = "itself"
+					if (M.gender == MALE)
+						t_himself = "himself"
+					else if (M.gender == FEMALE)
+						t_himself = "herself"
+
 					M.visible_message(\
-						"\blue [M.name] unbuckled \himself!",\
+						"\blue [M.name] unbuckled [t_himself]!",\
 						"You unbuckle yourself from [src].",\
 						"You hear metal clanking")
 				M.pixel_y = 0

code/game/objects/washing_machine.dm

@@ -21,16 +21,6 @@
 	//1 = hacked
 	var/gibs_ready = 0
 	var/obj/crayon
-	var/obj/machinery/water/binary/fixture/cxn
-
-	New()
-		..()
-		reagents = new(200)
-		reagents.my_atom = src
-		spawn(2)
-			cxn = locate(/obj/machinery/water/binary/fixture) in loc
-			if(cxn)
-				cxn.parent = src
 
 /obj/machinery/washing_machine/verb/start()
 	set name = "Start Washing"
@@ -41,31 +31,13 @@
 		usr << "The washing machine cannot run in this state."
 		return
 
-	if(!cxn)
-		usr << "\The [src] makes a grinding sound and stalls."
-
 	if( locate(/mob,contents) )
 		state = 8
 	else
 		state = 5
 	update_icon()
-
-	// collect water, fill up
-	var/amt_needed
-	do
-		amt_needed = reagents.maximum_volume/2 - reagents.total_volume
-		cxn.fill(amt_needed)
-		sleep(10)
-	while(amt_needed > 0)
-
-	// now, clean things
 	sleep(200)
 	for(var/atom/A in contents)
-		reagents.reaction(A, TOUCH)
-
-		if(A.blood_DNA)
-			reagents.add_reagent("blood", 10) // down the sink
-		reagents.add_reagent("carbon", 5)
 		A.clean_blood()
 
 	if(crayon)
@@ -170,7 +142,6 @@
 		gibs_ready = 1
 	else
 		state = 4
-	cxn.drain(reagents.total_volume)
 	update_icon()
 
 /obj/machinery/washing_machine/verb/climb_out()