Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259

2019-10-24 10:10:07 +02:00
parent 687d452d67 7011533bb7
commit a50606bb67
140 changed files with 2369 additions and 1037 deletions
@@ -158,6 +158,7 @@
 	if(..())
 		if(reagents.total_volume)
 			if(M.reagents)
+				reagents.reaction(M, INJECT)
 				reagents.trans_to(M, reagents.total_volume)