Merge branch 'FERMICHEMCurTweaks' of https://github.com/Thalpy/Citadel-Station-13 into FERMICHEMCurTweaks

This commit is contained in:
Fermi
2019-10-02 19:42:35 +01:00
4 changed files with 12 additions and 4 deletions
@@ -741,7 +741,15 @@
deltaResist *= 1.25
if (owner.reagents.has_reagent("neurine"))
deltaResist *= 1.5
if (!HAS_TRAIT(owner, TRAIT_CROCRIN_IMMUNE) && M.canbearoused && owner.client?.prefs.lewdchem)
if (owner.reagents.has_reagent("anaphro"))
deltaResist *= 1.5
if (owner.reagents.has_reagent("anaphro+"))
deltaResist *= 2
if (owner.reagents.has_reagent("aphro"))
deltaResist *= 0.75
if (owner.reagents.has_reagent("aphro+"))
deltaResist *= 0.5
//Antag resistance
//cultists are already brainwashed by their god
if(iscultist(owner))
@@ -57,7 +57,7 @@
hatArmor = (cached_purity/10)
else
hatArmor = (cached_purity/10)
if(hatArmor > 100)
if(hatArmor > 90)
return ..()
var/obj/item/W = M.head
W.armor = W.armor.modifyAllRatings(hatArmor)