cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-24 17:12:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-12-21 21:57:49 +00:00
parent 06a47d15d5 8b9806c8c4
commit 6b935d64ec
192 changed files with 7436 additions and 5475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/reagents/Chemistry-Recipes.dm
View File

@@ -2478,13 +2478,13 @@
id = "virginsexonthebeach"
result = "virginsexonthebeach"
required_reagents = list("orangejuice" = 3, "grenadine" = 2)
result_amount = 4
result_amount = 5
/datum/chemical_reaction/drinks/sexonthebeach
name = "Sex On The Beach"
id = "sexonthebeach"
result = "sexonthebeach"
required_reagents = list("orangejuice" = 3, "grenadine" = 2, "vodka" = 1)
required_reagents = list("virginsexonthebeach" = 5, "vodka" = 1)
result_amount = 6
/datum/chemical_reaction/drinks/eggnog