Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown

Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

code/modules/reagents/reagent_containers/dropper.dm

@@ -9,6 +9,7 @@
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list(1,2,3,4,5)
 	w_class = 1
+	slot_flags = SLOT_EARS
 	volume = 5
 
 	afterattack(var/obj/target, var/mob/user, var/flag)
@@ -29,7 +30,7 @@
 			if(ismob(target))
 
 				var/time = 20 //2/3rds the time of a syringe
-				user.visible_message("<span class='warning'>[user] is trying to squirt something into [target]'s eyes!")
+				user.visible_message("<span class='warning'>[user] is trying to squirt something into [target]'s eyes!</span>")
 
 				if(!do_mob(user, target, time))
 					return
@@ -64,7 +65,7 @@
 				return
 
 			else
-				trans = reagents.trans_to(target, amount_per_transfer_from_this)
+				trans = reagents.splash(target, amount_per_transfer_from_this) //sprinkling reagents on generic non-mobs
 				user << "<span class='notice'>You transfer [trans] units of the solution.</span>"
 
 		else // Taking from something

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

@@ -78,7 +78,7 @@
 	//The reagents in the bottle splash all over the target, thanks for the idea Nodrak
 	if(reagents)
 		user.visible_message("<span class='notice'>The contents of the [src] splash all over [target]!</span>")
-		reagents.splash_mob(target, reagents.total_volume)
+		reagents.splash(target, reagents.total_volume)
 
 	//Finally, smash the bottle. This kills (qdel) the bottle.
 	src.smash(target, user)

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

@@ -481,7 +481,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom)
 	..()
 	new/obj/effect/decal/cleanable/egg_smudge(src.loc)
-	src.reagents.trans_to(hit_atom, reagents.total_volume)
+	src.reagents.splash(hit_atom, reagents.total_volume)
 	src.visible_message("\red [src.name] has been squashed.","\red You hear a smack.")
 	qdel(src)
 

code/modules/reagents/reagent_containers/glass.dm

@@ -88,7 +88,7 @@
 
 		if(reagents.total_volume)
 			user << "<span class='notice'>You splash the solution onto [target].</span>"
-			reagents.trans_to(target, reagents.total_volume)
+			reagents.splash(target, reagents.total_volume)
 			return
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob)

code/modules/reagents/reagent_containers/pill.dm

@@ -9,6 +9,7 @@
 	item_state = "pill"
 	possible_transfer_amounts = null
 	w_class = 1
+	slot_flags = SLOT_EARS
 	volume = 60
 
 	New()

code/modules/reagents/reagent_containers/spray.dm

@@ -55,7 +55,7 @@
 /obj/item/weapon/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user as mob, proximity)
 	if (A.density && proximity)
 		A.visible_message("[usr] sprays [A] with [src].")
-		reagents.trans_to(A, amount_per_transfer_from_this)
+		reagents.splash(A, amount_per_transfer_from_this)
 	else
 		spawn(0)
 			var/obj/effect/effect/water/chempuff/D = new/obj/effect/effect/water/chempuff(get_turf(src))
@@ -90,7 +90,7 @@
 		return
 	if(isturf(usr.loc))
 		usr << "<span class='notice'>You empty \the [src] onto the floor.</span>"
-		reagents.trans_to(usr.loc, reagents.total_volume)
+		reagents.splash(usr.loc, reagents.total_volume)
 
 //space cleaner
 /obj/item/weapon/reagent_containers/spray/cleaner

code/modules/reagents/reagent_containers/syringes.dm

@@ -16,6 +16,7 @@
 	possible_transfer_amounts = null
 	volume = 15
 	w_class = 1
+	slot_flags = SLOT_EARS
 	sharp = 1
 	var/mode = SYRINGE_DRAW
 	var/image/filling //holds a reference to the current filling overlay