Merge tgstation r4572 into bs12_with_tgport, fixed missing title screen (tgside problem?), some conflicts

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-08-28 20:22:22 +10:00
parent eacd84b212
commit e6078b100f
15 changed files with 127 additions and 41 deletions
+2 -2
View File
@@ -1095,8 +1095,8 @@ datum
name = "The Doctor's Delight"
id = "doctordelight"
result = "doctorsdelight"
required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1)
result_amount = 4
required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1, "tricordrazine" = 1)
result_amount = 5
irish_cream
name = "Irish Cream"