Merge branch 'master' into upstream-merge-37406

2018-05-13 03:28:37 -05:00
parent fcc078af35 e31829a7e9
commit 80aad142a4
67 changed files with 964 additions and 432 deletions
@@ -191,7 +191,7 @@

 //fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting. Again.
 /datum/gas_reaction/fusion
-	exclude = FALSE
+	exclude = TRUE
 	priority = 2
 	name = "Plasmic Fusion"
 	id = "fusion"