Merge pull request #3558 from X0-11/experimental-combat-changes

armor processing tweak
HaloSpaceStation · Jun 3, 2024 · 8bd8b97 · 8bd8b97
2 parents 24e5ccc + 6f3a75b
commit 8bd8b97
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -104,11 +104,11 @@ cloak disrupt override
 	var/protection = 0
 	var/list/protective_gear = list(head, wear_mask, wear_suit, w_uniform, gloves, shoes)
 	for(var/gear in protective_gear)
-		if(gear && istype(gear ,/obj/item/clothing))
+		if(gear)
 			var/obj/item/clothing/C = gear
 			if(istype(C) && C.body_parts_covered & def_zone.body_part)
-				var/effective_armor_thickness = 1
-				if(!isnull(initial(C.armor_thickness)))
+				var/effective_armor_thickness = 0
+				if(!isnull(C.armor_thickness_max))
 					effective_armor_thickness = (C.armor_thickness/10) + 1
 					if(type in C.armor_thickness_modifiers)
 						effective_armor_thickness *= C.armor_thickness_modifiers[type]