cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 11:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/game/machinery/vending.dm
This commit is contained in:
PsiOmega
2015-04-10 15:25:34 +02:00
parent 05da117d10 4c44482dfc
commit 1ba8dcbca9
12 changed files with 1093 additions and 1077 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Recipes.dm
+8 -12
View File
@@ -213,13 +213,6 @@ datum
required_catalysts = list("phoron" = 5)
result_amount = 2
virus_food
name = "Virus Food"
id = "virusfood"
result = "virusfood"
required_reagents = list("water" = 1, "milk" = 1)
result_amount = 5
leporazine
name = "Leporazine"
id = "leporazine"
@@ -538,8 +531,8 @@ datum
name = "Virus Food"
id = "virusfood"
result = "virusfood"
required_reagents = list("water" = 5, "milk" = 5, "oxygen" = 5)
result_amount = 15
required_reagents = list("water" = 1, "milk" = 1, "oxygen" = 1)
result_amount = 3
/*
mix_virus
name = "Mix Virus"
@@ -1629,7 +1622,9 @@ datum
required_reagents = list("egg" = 3, "flour" = 10)
result_amount = 1
on_reaction(var/datum/reagents/holder, var/created_volume)
new /obj/item/weapon/reagent_containers/food/snacks/dough(get_turf(holder.my_atom))
var/turf/T = get_turf(holder.my_atom)
for(var/i = 1 to created_volume)
new /obj/item/weapon/reagent_containers/food/snacks/dough(T)
return
syntiflesh
@@ -1639,8 +1634,9 @@ datum
required_reagents = list("blood" = 5, "clonexadone" = 1)
result_amount = 1
on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(location)
var/turf/T = get_turf(holder.my_atom)
for(var/i = 1 to created_volume)
new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(T)
return
hot_ramen