Merge branch 'upstream/development' into development

# Conflicts:
#	code/_helpers/time.dm
#	code/game/objects/items/devices/floor_painter.dm
#	code/game/objects/items/stacks/medical.dm
#	code/global.dm
#	code/modules/cargo/randomstock.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/paperwork/faxmachine.dm

code/modules/reagents/reagent_containers/blood_pack.dm

@@ -66,9 +66,8 @@
 		..()
 
 /obj/item/weapon/reagent_containers/blood/examine(mob/user, distance = 2)
-	..()
-	if (vampire_marks)
-		user << "<span='notice'>There are teeth marks on it.</span>"
+	if (..() && vampire_marks)
+		user << "<span class='warning'>There are teeth marks on it.</span>"
 	return
 
 /obj/item/weapon/reagent_containers/blood/attackby(obj/item/weapon/P as obj, mob/user as mob)

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

@@ -1677,7 +1677,7 @@
 
 	afterattack(obj/O as obj, var/mob/living/carbon/human/user as mob, proximity)
 		if(!proximity) return
-		if(istype(O,/obj/structure/sink) && !wrapped)
+		if(( istype(O, /obj/structure/reagent_dispensers/watertank) || istype(O,/obj/structure/sink) ) && !wrapped)
 			user << "You place \the [name] under a stream of water..."
 			if(istype(user))
 				user.unEquip(src)