cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-20 03:30:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Makes freerunning quirk prevent falling damage from short falls (#972)

Browse Source 
* Merge pull request #53822 from Mickyan/freefalling

Makes freerunning quirk prevent falling damage from short falls

* Makes freerunning quirk prevent falling damage from short falls

Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-09-25 13:38:32 +02:00
committed by GitHub
co-authored by skoglol
parent 59ce61e60c
commit dbafac7ee4
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+6
View File
@@ -40,6 +40,12 @@
GLOB.human_list -= src
return ..()
/mob/living/carbon/human/ZImpactDamage(turf/T, levels)
if(!HAS_TRAIT(src, TRAIT_FREERUNNING) || levels > 1) // falling off one level
return ..()
visible_message("<span class='danger'>[src] makes a hard landing on [T] but remains unharmed from the fall.</span>", \
"<span class='userdanger'>You brace for the fall. You make a hard landing on [T] but remain unharmed.</span>")
Knockdown(levels * 50)
/mob/living/carbon/human/prepare_data_huds()
//Update med hud images...