shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11805 from kevinz000/damage_procs_lite

Browse Source 
/carbon adjustStaminaLoss is now armor-piercing *as intended* before our modularized bandaid
This commit is contained in:
Ghom
2020-04-16 19:05:34 +02:00
committed by GitHub
parent 30617f62f1 4e99c6bb28
commit eb48e00bcb
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/mob/living/carbon/damage_procs.dm
+6 -1
View File
@@ -14,7 +14,12 @@
/mob/living/carbon/adjustStaminaLoss(amount, updating_health = TRUE, forced = FALSE, affected_zone = BODY_ZONE_CHEST)
if(!forced && (status_flags & GODMODE))
return FALSE
apply_damage(amount > 0 ? amount*incomingstammult : amount, STAMINA, affected_zone)
var/obj/item/bodypart/BP = isbodypart(affected_zone)? affected_zone : (get_bodypart(check_zone(affected_zone)) || bodyparts[1])
if(amount > 0? BP.receive_damage(0, 0, amount * incomingstammult) : BP.heal_damage(0, 0, abs(amount)))
update_damage_overlays()
if(updating_health)
updatehealth()
update_stamina()
if((combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && amount > 20)
incomingstammult = max(0.01, incomingstammult/(amount*0.05))
return amount