Merge remote-tracking branch 'citadel/master' into combat_patches_1

2021-07-18 15:12:52 -07:00
parent d9b70b1f1c 94dc98ccfa
commit 3070f178e0
159 changed files with 132112 additions and 130447 deletions
@@ -28,6 +28,7 @@

 //Called when temperature is above a certain threshold, or if purity is too low.
 /datum/chemical_reaction/proc/FermiExplode(datum/reagents/R0, var/atom/my_atom, volume, temp, pH, Exploding = FALSE)
+	set waitfor = FALSE
 	if (Exploding == TRUE)
 		return