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

This commit is contained in:
silicons
2020-07-07 21:07:58 -07:00
99 changed files with 2195 additions and 1778 deletions
@@ -108,8 +108,7 @@
//Life, Stat, Hud Updates, and Say
/mob/living/simple_animal/revenant/BiologicalLife(seconds, times_fired)
if(!(. = ..()))
return
. = ..()
if(stasis)
return
if(revealed && essence <= 0)