From 678027d93da58211972fc9a7881bd66e3b16a9b4 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Mon, 13 Jul 2015 11:01:32 +0300 Subject: [PATCH 1/2] Fixes #10145 --- code/modules/reagents/Chemistry-Recipes.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 72ce607065..6da341198d 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1459,10 +1459,10 @@ required_reagents = list("rum" = 2, "cola" = 1) result_amount = 3 -/datum/chemical_reaction/classicmartini +/datum/chemical_reaction/martini name = "Classic Martini" - id = "classicmartini" - result = "classicmartini" + id = "martini" + result = "martini" required_reagents = list("gin" = 2, "vermouth" = 1) result_amount = 3 From e8bc544a92b049d652098014b53aba4d107eab9d Mon Sep 17 00:00:00 2001 From: Kelenius Date: Mon, 13 Jul 2015 11:44:47 +0300 Subject: [PATCH 2/2] Fixes #10150 --- code/game/objects/effects/chem/foam.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/effects/chem/foam.dm b/code/game/objects/effects/chem/foam.dm index fb5b6f8ca7..99a68e1363 100644 --- a/code/game/objects/effects/chem/foam.dm +++ b/code/game/objects/effects/chem/foam.dm @@ -39,6 +39,8 @@ if(!metal && reagents) var/turf/T = get_turf(src) reagents.touch_turf(T) + for(var/obj/O in T) + reagents.touch_obj(O) /obj/effect/effect/foam/process() if(--amount < 0)