cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12

Browse Source 
Conflicts:
	code/datums/supplypacks.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	icons/mob/suit.dmi
	icons/obj/drinks.dmi
This commit is contained in:
Chinsky
2013-01-30 16:39:00 +04:00
parent 566ef61c23 381cb4ad44
commit 24cf3c2dd0
7 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Recipes.dm
+7
View File
@@ -479,6 +479,13 @@ datum
new /obj/item/stack/sheet/mineral/plasma(location)
return
condensedcapsaicin
name = "Condensed Capsaicin"
id = "condensedcapsaicin"
result = "condensedcapsaicin"
required_reagents = list("capsaicin" = 2)
required_catalysts = list("plasma" = 5)
result_amount = 1
virus_food
name = "Virus Food"
id = "virusfood"