From 6012a5c6eba849f4ad39ee0a200032b7d6c3309f Mon Sep 17 00:00:00 2001 From: oranges Date: Sat, 6 Jan 2018 00:57:52 +1300 Subject: [PATCH 1/2] Fix bug with smashing bottles on throw (#34077) The passed in variable is a datum, not a mob Corrects the description for another instance of this --- code/modules/food_and_drinks/drinks/drinks.dm | 4 ++-- code/modules/food_and_drinks/drinks/drinks/bottle.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 5eae2b80d8..b65104b192 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -100,10 +100,10 @@ to_chat(user, "You heat [name] with [I]!") ..() -/obj/item/reagent_containers/food/drinks/throw_impact(atom/target, mob/thrower) +/obj/item/reagent_containers/food/drinks/throw_impact(atom/target, datum/thrownthing/throwinfo) . = ..() if(!.) //if the bottle wasn't caught - smash(target, thrower, TRUE) + smash(target, throwinfo.thrower, TRUE) /obj/item/reagent_containers/food/drinks/proc/smash(atom/target, mob/thrower, ranged = FALSE) if(!isGlass) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 005dda29ca..f2ab7ee3a2 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -367,7 +367,7 @@ isGlass = FALSE return -/obj/item/reagent_containers/food/drinks/bottle/molotov/throw_impact(atom/target,mob/thrower) +/obj/item/reagent_containers/food/drinks/bottle/molotov/throw_impact(atom/target,datum/thrownthing/throwdata) var/firestarter = 0 for(var/datum/reagent/R in reagents.reagent_list) for(var/A in accelerants)