Updates to master

Closes #14823
This commit is contained in:
Putnam
2021-06-11 16:29:04 -07:00
parent 833d34ba8e
commit 78cf3463ba
@@ -341,7 +341,7 @@
return TRUE
. = ..()
/obj/structure/foamedmetal/resin/BlockSuperconductivity()
/obj/structure/foamedmetal/resin/BlockThermalConductivity()
return TRUE
#undef ALUMINUM_FOAM