cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-06 23:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

High damage bullets now gib limbs, fixes projectile used_weapon fuckery. (#10888)

Browse Source
This commit is contained in:
Matt Atlas
2021-01-05 20:47:00 +01:00
committed by GitHub
parent c055c8ed6a
commit 94588ebfe6
3 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,7 @@
P.damage_flags &= ~DAM_LASER
if(!P.nodamage)
damaged = apply_damage(P.damage, P.damage_type, def_zone, absorb, 0, P, damage_flags = P.damage_flags, used_weapon = "\a [P.name]")
damaged = apply_damage(P.damage, P.damage_type, def_zone, absorb, 0, P, damage_flags = P.damage_flags, used_weapon = P)
bullet_impact_visuals(P, def_zone, damaged)
P.on_hit(src, absorb, def_zone)
return absorb

23
code/modules/organs/organ_external.dm
View File

@@ -377,20 +377,21 @@
if((brute_dam + burn_dam) >= (max_damage * config.organ_health_multiplier))
var/edge_eligible = 0
var/edge_eligible = FALSE
var/blunt_eligible = FALSE
var/maim_bonus = 0
if(istype(used_weapon,/obj/item))
if(isitem(used_weapon))
var/obj/item/W = used_weapon
if(isprojectile(W))
var/obj/item/projectile/P = W
if(P.damage_flags & DAM_BULLET)
blunt_eligible = TRUE
maim_bonus += P.maim_rate
else if(W.w_class >= w_class && edge)
edge_eligible = 1
else if(edge)
edge_eligible = 1
edge_eligible = TRUE
if(edge_eligible && brute >= max_damage / (DROPLIMB_THRESHOLD_EDGE + maim_bonus))
if(!blunt_eligible && edge_eligible && brute >= max_damage / (DROPLIMB_THRESHOLD_EDGE + maim_bonus))
droplimb(0, DROPLIMB_EDGE)
else if(burn >= max_damage / (DROPLIMB_THRESHOLD_DESTROY + maim_bonus))
droplimb(0, DROPLIMB_BURN)
@@ -1316,6 +1317,12 @@ Note that amputating the affected organ does in fact remove the infection from t
if(!(limb_flags & ORGAN_HAS_TENDON) || (status & ORGAN_ROBOT) || (status & ORGAN_TENDON_CUT))
return FALSE
. = TRUE
playsound(src.loc, 'sound/effects/snap.ogg', 40, 1, -2)
status |= ORGAN_TENDON_CUT
if(!owner)
return
var/message = pick("tore apart", "ripped away")
owner.visible_message(\
"<span class='warning'><font size=2>You hear a loud snapping sound coming from \the [owner]!</font></span>",\
@@ -1325,10 +1332,6 @@ Note that amputating the affected organ does in fact remove the infection from t
owner.emote("scream")
owner.flash_strong_pain()
playsound(src.loc, 'sound/effects/snap.ogg', 40, 1, -2)
status |= ORGAN_TENDON_CUT
return TRUE
// Damage procs
/obj/item/organ/external/proc/get_brute_damage()
return brute_dam