Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two

This commit is contained in:
Timothy Teakettle
2021-05-08 01:28:23 +01:00
30 changed files with 528 additions and 198 deletions
@@ -217,6 +217,6 @@
/datum/reagent/fermi/zeolites/reaction_obj(obj/O, reac_volume)
var/datum/component/radioactive/contamination = O.GetComponent(/datum/component/radioactive)
if(contamination && reac_volume >= 5 && purity >= 0.7) //you need at least 0.7 purity to instantly purge all contam on an object.
if(contamination && purity >= 0.7) //you need at least 0.7 purity to instantly purge all contam on an object.
qdel(contamination)
return
..()