Merge branch 'pr/21'

code/modules/reagents/reagent_containers/glass.dm

@@ -54,7 +54,7 @@
 
 /obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
 	. = ..()
-	if((!proximity) || !spillable || !check_allowed_items(target,target_self=1))
+	if((!proximity) || !check_allowed_items(target,target_self=1))
 		return
 
 	if(target.is_refillable()) //Something like a glass. Player probably wants to transfer TO it.

code/modules/reagents/reagent_containers/rags.dm

@@ -54,7 +54,7 @@
 /obj/item/reagent_containers/rag/pre_altattackby(mob/living/M, mob/living/user, params)
 	if(istype(M) && user.a_intent == INTENT_HELP)
 		user.changeNext_move(CLICK_CD_MELEE)
-		if(user.on_fire)
+		if(M.on_fire)
 			user.visible_message("<span class='warning'>\The [user] uses \the [src] to pat out [M == user ? "[user.p_their()]" : "\the [M]'s"] flames!</span>")
 			if(hitsound)
 				playsound(M, hitsound, 25, 1)