Bhijin's requests.

This commit is contained in:
Thalpy
2019-10-01 20:58:31 +01:00
parent 05d292afc8
commit bfee1c13ff
4 changed files with 12 additions and 4 deletions
@@ -62,4 +62,4 @@
/mob/living/simple_animal/astral/Life()
if(!mind)
qdel(src)
..()
. = ..()
+1 -1
View File
@@ -1082,7 +1082,7 @@
switch(E.phase)
if(1 to 2)
E.phase = -1
to_chat(C, "<span class='big warning'>You suddenly forget [E.master]'s modulus operandi and their political affiliations!</b></span>")
to_chat(C, "<span class='big warning'>You have no recollection of being enthralled by [E.master]!</b></span>")
to_chat(user, "<span class='notice'><i>You revert [C] back to their state before enthrallment.</i></span>")
if(3)
E.phase = 0
@@ -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)