cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 16:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes rig armor not working and some other armor stuff. (#11365)

Browse Source
This commit is contained in:
Matt Atlas
2021-03-04 12:52:27 -03:00
committed by GitHub
parent 4922b6df02
commit e7eef8b7db
11 changed files with 80 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_defense.dm
+3 -2
View File
@@ -146,8 +146,9 @@
//presumably, if they are wearing a helmet that stops pressure effects, then it probably covers the throat as well
var/obj/item/clothing/head/helmet = get_equipped_item(slot_head)
if(istype(helmet) && (helmet.body_parts_covered & HEAD) && (helmet.flags & STOPPRESSUREDAMAGE))
//we don't do an armor_check here because this is not an impact effect like a weapon swung with momentum, that either penetrates or glances off.
damage_mod = 1.0 - (LAZYACCESS(helmet.armor, "melee")/100)
var/datum/component/armor/armor_component = helmet.GetComponent(/datum/component/armor)
if(armor_component)
damage_mod -= armor_component.get_blocked(BRUTE, damage_flags, W.armor_penetration, W.force*1.5)
var/total_damage = 0
for(var/i in 1 to 3)