Merge pull request #1172 from Erthilo/master

Bug fixes and new portalathe sprite

code/WorkInProgress/SkyMarshal/portalathe.dm

@@ -1,8 +1,9 @@
 //May expand later, but right now it just repairs lights.
 /obj/item/device/portalathe
-	name = "\improper Portable Autolathe"
-	desc = "It blinks and has an antenna on it.  It must be advanced."
-	icon_state = "t-ray0"
+	name = "portable autolathe"
+	desc = "A device which can repair broken lights instantly. Must be advanced."
+	icon = 'janitor.dmi'
+	icon_state = "portalathe"
 
 	afterattack(var/atom/target, mob/user as mob)
 		if(!target || !user)

code/game/gamemodes/newobjective.dm

@@ -1086,6 +1086,7 @@ datum
 
 
 			reagent
+				weight = 20
 				var/target_name
 				New(var/text,var/joba)
 					..()

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

@@ -905,7 +905,10 @@
 	if (ismob(loc))
 		var/mob/M = loc
 		M.show_message("\red Your [src] explodes!", 1)
-
+		if (src in M.contents)
+			if(fon)
+				fon = 0
+				M.total_luminosity -= f_lum
 	if(T)
 		T.hotspot_expose(700,125)
 

code/modules/chemical/Chemistry-Tools.dm

@@ -1580,9 +1580,9 @@
 						if(!reagents.total_volume)
 							if(M == user) user << "\red You finish eating [src]."
 							else user << "\red [M] finishes eating [src]."
+							del(src)
 							spawn(5)
 								user.update_clothing()
-							del(src)
 				playsound(M.loc,'eatfood.ogg', rand(10,50), 1)
 				return 1
 		else if(istype(M, /mob/living/simple_animal/livestock))
@@ -1979,14 +1979,7 @@
 
 	attackby(var/obj/D, mob/user as mob)
 		if(isprox(D))
-			var/obj/item/weapon/bucket_sensor/B = new /obj/item/weapon/bucket_sensor
-			B.loc = user
-			if (user.r_hand == D)
-				user.u_equip(D)
-				user.r_hand = B
-			else
-				user.u_equip(D)
-				user.l_hand = B
+			var/obj/item/weapon/bucket_sensor/B = new /obj/item/weapon/bucket_sensor(user.loc)
 			B.layer = 20
 			user << "You add the sensor to the bucket"
 			del(D)