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

This commit is contained in:
silicons
2020-07-23 10:26:03 -07:00
291 changed files with 5170 additions and 1010 deletions
@@ -221,7 +221,7 @@
var/mob/living/carbon/M = owner
//chem calculations
if(!owner.reagents.has_reagent(/datum/chemical_reaction/fermi/enthrall))
if(!owner.reagents.has_reagent(/datum/reagent/fermi/enthrall))
if (phase < 3 && phase != 0)
deltaResist += 3//If you've no chem, then you break out quickly
if(prob(5))