Merge pull request #750 from Citadel-Station-13/upstream-merge-26851

[MIRROR] Fixes runtime with null nutriment taste data
2017-05-06 22:00:16 -07:00
parent 236c91a945 36b517d2ba
commit 52f5226547
1 changed files with 4 additions and 1 deletions
@@ -60,7 +60,10 @@
 	// data for nutriment is one or more (flavour -> ratio)
 	// where all the ratio values adds up to 1

-	var/list/taste_amounts = data.Copy()
+	var/list/taste_amounts = list()
+	if(data)
+		taste_amounts = data.Copy()
+
 	counterlist_scale(taste_amounts, volume)

 	var/list/other_taste_amounts = newdata.Copy()