sdf

code/modules/detectivework/tools/rag.dm

@@ -264,7 +264,7 @@
 	update_name()
 	update_icon()
 
-/obj/item/reagent_containers/glass/rag/process()
+/obj/item/reagent_containers/glass/rag/process(seconds_per_tick)
 	if(!can_ignite())
 		visible_message(SPAN_WARNING("\The [src] burns out."))
 		extinguish()
@@ -289,11 +289,11 @@
 
 	for(var/fuel_type in reagents.reagent_volumes)
 		if(ispath(fuel_type, /singleton/reagent/fuel) || ispath(fuel_type, /singleton/reagent/alcohol))
-			reagents.remove_reagent(reagents.reagent_volumes[fuel_type], reagents.maximum_volume/25)
+			reagents.remove_reagent(fuel_type, ((reagents.maximum_volume/25) * seconds_per_tick))
 			break
 	update_name()
 	update_icon()
-	burn_time--
+	burn_time -= seconds_per_tick
 
 /obj/item/reagent_containers/glass/rag/advanced
 	name = "microfiber cloth"

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

@@ -36,9 +36,9 @@
 /obj/item/reagent_containers/food/drinks/bottle/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
 	..()
 
-	var/mob/M = throwing?.thrower?.resolve()
+	var/mob/M = throwingdatum?.thrower?.resolve()
 	if((drink_flags & IS_GLASS) && istype(M) && M.a_intent == I_HURT)
-		var/throw_dist = get_dist(throwing?.thrower?.resolve(), loc)
+		var/throw_dist = get_dist(get_turf(M), get_turf(src))
 		if(throwingdatum.speed >= throw_speed && smash_check(throw_dist)) //not as reliable as smashing directly
 			if(reagents)
 				hit_atom.visible_message(SPAN_NOTICE("The contents of \the [src] splash all over [hit_atom]!"))