Merge pull request #15185 from Citadel-Station-13/silicons-patch-6

fixes airlock deflection
This commit is contained in:
Lin
2021-09-20 23:53:53 -05:00
committed by GitHub
+1 -1
View File
@@ -22,7 +22,7 @@
//returns the damage value of the attack after processing the obj's various armor protections
/obj/proc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0)
if(damage_flag == MELEE && damage_amount < damage_deflection)
if(damage_flag == "melee" && damage_amount < damage_deflection) // TODO: Refactor armor datums and types entirely jfc
return 0
switch(damage_type)
if(BRUTE)