cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 16:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Falling objects now have armor penetration. (#14344)

Browse Source
This commit is contained in:
Matt Atlas
2022-06-23 20:46:12 +02:00
committed by GitHub
parent 25b8883215
commit dbf9920c51
2 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/multiz/movement.dm
View File

@@ -684,7 +684,7 @@
*
* @return The /mob/living that was hit. null if no mob was hit.
*/
/atom/movable/proc/fall_collateral(levels_fallen, stopped_early = FALSE)
/atom/movable/proc/fall_collateral(levels_fallen, stopped_early = FALSE, armor_penetration = 0)
// No gravity, stop falling into spess!
var/area/area = get_area(src)
if (istype(loc, /turf/space) || (area && !area.has_gravity()))
@@ -727,8 +727,9 @@
if (ishuman(L))
var/mob/living/carbon/human/H = L
var/cranial_damage = rand(0,damage/2)
H.apply_damage(cranial_damage, BRUTE, BP_HEAD)
H.apply_damage((damage - cranial_damage), BRUTE, BP_CHEST)
H.apply_damage(cranial_damage, BRUTE, BP_HEAD, armor_pen = cranial_damage + armor_penetration)
var/new_damage = damage - cranial_damage
H.apply_damage(new_damage, BRUTE, BP_CHEST, armor_pen = new_damage + armor_penetration)
if (damage >= THROWNOBJ_KNOCKBACK_DIVISOR)
H.Weaken(rand(damage / 4, damage / 2))
@@ -754,6 +755,9 @@
if (.)
to_chat(src, SPAN_DANGER("You fell ontop of \the [.]!"))
/obj/fall_collateral(levels_fallen, stopped_early = FALSE, armor_penetration)
. = ..(levels_fallen, stopped_early, src.armor_penetration)
/**
* Helper proc for customizing which attributes should be used in fall damage
* calculations. Allows for greater control over the damage. (Drop pods, anyone?)