runtimev1-experimental

code/modules/reagents/chemistry/recipes/special.dm

@@ -187,6 +187,7 @@ GLOBAL_LIST_INIT(food_reagents, build_reagents_to_food()) //reagentid = related
 	var/datum/chemical_reaction/recipe = get_chemical_reaction(recipe_id)
 	if(!recipe)
 		info = "This recipe is illegible."
+		return
 	var/list/dat = list("<ul>")
 	for(var/rid in recipe.required_reagents)
 		var/datum/reagent/R = GLOB.chemical_reagents_list[rid]
@@ -209,4 +210,4 @@ GLOBAL_LIST_INIT(food_reagents, build_reagents_to_food()) //reagentid = related
 			dat += " above [recipe.required_temp] degrees"
 	dat += "."
 	info = dat.Join("")
-	update_icon()
+	update_icon()

code/modules/reagents/reagent_containers.dm

@@ -84,11 +84,14 @@
 	SplashReagents(target, TRUE)
 
 /obj/item/reagent_containers/proc/bartender_check(atom/target)
-	if(target.CanPass(src, get_turf(src)) && thrownby && thrownby.actions)
-		for(var/datum/action/innate/drink_fling/D in thrownby.actions)
-			if(D.active)
-				return TRUE
-	return FALSE
+	. = FALSE
+	var/turf/T = get_turf(src)
+	if(!T || target.CanPass(src, T) || !thrownby || !thrownby.actions)
+		return
+	for(var/datum/action/innate/drink_fling/D in thrownby.actions)
+		if(D.active)
+			return TRUE
+
 
 /obj/item/reagent_containers/proc/ForceResetRotation()
 	transform = initial(transform)
@@ -217,4 +220,4 @@
 	update_icon()
 	if(prob(25))
 		for(var/mob/M in seen)
-			to_chat(M, "<span class='notice'>[iconhtml] \The [src]'s is damaged by [cause] and begins to deform!</span>")
+			to_chat(M, "<span class='notice'>[iconhtml] \The [src]'s is damaged by [cause] and begins to deform!</span>")

code/modules/reagents/reagent_containers/glass.dm

@@ -22,13 +22,9 @@
 
 	if(istype(M))
 		if(user.a_intent == INTENT_HARM)
-			var/R
 			M.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [M]!</span>", \
 							"<span class='userdanger'>[user] splashes the contents of [src] onto [M]!</span>")
-			if(reagents)
-				for(var/datum/reagent/A in reagents.reagent_list)
-					R += A.id + " ("
-					R += num2text(A.volume) + "),"
+			var/R = reagents?.log_list()
 			if(isturf(target) && reagents.reagent_list.len && thrownby)
 				log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
 				message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")