cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-09 17:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7263 from VOREStation/Arokha/standrag

Browse Source 
Remove bloodspray when pulling standing people
This commit is contained in:
Atermonera
2020-06-04 19:26:13 -07:00
committed by GitHub
parent 1bcb649378 577a18f35e
commit 69a5424abf
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/living/carbon/human/human.dm
View File

@@ -1631,7 +1631,8 @@
// Drag damage is handled in a parent
/mob/living/carbon/human/dragged(var/mob/living/dragger, var/oldloc)
if(prob(getBruteLoss() * 200 / maxHealth))
var/area/A = get_area(src)
if(lying && !buckled && A.has_gravity() && prob(getBruteLoss() * 200 / maxHealth))
var/bloodtrail = 1
if(species?.flags & NO_BLOOD)
bloodtrail = 0

2
code/modules/mob/living/living.dm
View File

@@ -765,7 +765,7 @@ default behaviour is:
/mob/living/proc/dragged(var/mob/living/dragger, var/oldloc)
var/area/A = get_area(src)
if(lying && !buckled && pull_damage() && A.has_gravity && (prob(getBruteLoss() * 200 / maxHealth)))
if(lying && !buckled && pull_damage() && A.has_gravity() && (prob(getBruteLoss() * 200 / maxHealth)))
adjustBruteLoss(2)
visible_message("<span class='danger'>\The [src]'s [isSynthetic() ? "state" : "wounds"] worsen terribly from being dragged!</span>")