Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real

2020-05-12 13:34:31 -07:00
parent 458c072cf6 ffc7211444
commit 8458f97692
260 changed files with 2810 additions and 1298 deletions
@@ -133,7 +133,7 @@
 			if(reagents)
 				for(var/datum/reagent/consumable/R in reagents.reagent_list)
 					if(R.nutriment_factor > 0)
-						H.nutrition += R.nutriment_factor * R.volume
+						H.adjust_nutrition(R.nutriment_factor * R.volume)
 						reagents.del_reagent(R.type)
 			reagents.trans_to(H, reagents.total_volume)
 			qdel(src)