Merge pull request #10164 from Kelenius/ofMartiniAndFixes

Of martini and fixes
This commit is contained in:
PsiOmegaDelta
2015-07-13 11:45:08 +02:00
2 changed files with 5 additions and 3 deletions
+2
View File
@@ -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)
+3 -3
View File
@@ -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