Merge pull request #11868 from Arturlang/tackling_and_lunge

Ports TG Tackling and uses it to rework bloodsucker lunge
This commit is contained in:
Ghom
2020-04-21 15:50:44 +02:00
committed by GitHub
46 changed files with 794 additions and 151 deletions
@@ -728,7 +728,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
var/real_dorf = isdwarf(M) //_species(H, /datum/species/dwarf)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.dna.check_mutation(DWARFISM) || HAS_TRAIT(H, TRAIT_ALCOHOL_TOLERANCE) || real_dorf)
if(HAS_TRAIT(H, TRAIT_DWARF) || HAS_TRAIT(H, TRAIT_ALCOHOL_TOLERANCE || real_dorf))
to_chat(H, "<span class='notice'>Now THAT is MANLY!</span>")
if(real_dorf)
boozepwr = 100 // Don't want dwarves to die because of a low booze power