Merge pull request #2576 from Spamcat/BEF-staging

Fixity-fix

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

@@ -11,10 +11,11 @@
 	var/slices_num
 
 	//Placeholder for effect that trigger on eating that aren't tied to reagents.
-/obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume()
+/obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/M)
 	if(!usr)	return
 	if(!reagents.total_volume)
-		usr.visible_message("<span class='notice'>[usr] finishes eating [src].</span>","<span class='notice'>You finish eating [src].</span>")
+		if(M == usr)
+			usr << "<span class='notice'>You finish eating \the [src].</span>"
 		usr.drop_from_inventory(src)	//so icons update :[
 
 		if(trash)
@@ -90,7 +91,7 @@
 					else
 						reagents.trans_to(M, reagents.total_volume)
 					bitecount++
-					On_Consume()
+					On_Consume(M)
 			return 1
 
 	return 0

code/modules/reagents/syringe_gun.dm

@@ -22,16 +22,20 @@
 		usr << "\blue [syringes.len] / [max_syringes] syringes."
 
 	attackby(obj/item/I as obj, mob/user as mob)
-
 		if(istype(I, /obj/item/weapon/reagent_containers/syringe))
-			if(syringes.len < max_syringes)
-				user.drop_item()
-				I.loc = src
-				syringes += I
-				user << "\blue You put the syringe in [src]."
-				user << "\blue [syringes.len] / [max_syringes] syringes."
+			var/obj/item/weapon/reagent_containers/syringe/S = I
+			if(S.mode != 2)
+				if(syringes.len < max_syringes)
+					user.drop_item()
+					I.loc = src
+					syringes += I
+					user << "\blue You put the syringe in [src]."
+					user << "\blue [syringes.len] / [max_syringes] syringes."
+				else
+					usr << "\red [src] cannot hold more syringes."
 			else
-				usr << "\red [src] cannot hold more syringes."
+				usr << "\red This syringe is broken!"
+
 
 	afterattack(obj/target, mob/user , flag)
 		if(!isturf(target.loc) || target == user) return