Post-rebase compile updates.

code/datums/damage/_damage_type.dm

@@ -24,22 +24,23 @@
 	if(!category_type)
 		. += "no category type set"
 
-/decl/damage_handler/proc/set_mob_damage(var/mob/living/target, var/damage)
+/decl/damage_handler/proc/set_mob_damage(var/mob/living/target, var/damage, var/skip_update_health = FALSE)
 	if(!(category_type in target.damage_values))
 		return FALSE
 	var/oldval = target.damage_values[category_type]
 	var/newval = clamp(oldval + damage, 0, target.get_max_health())
 	if(oldval == newval)
 		return FALSE
 	target.damage_values[category_type] = newval
-	target.update_health()
+	if(!skip_update_health)
+		target.update_health()
 	return TRUE
 
-/decl/damage_handler/proc/heal_mob_damage(var/mob/living/target, var/damage)
-	return set_mob_damage(target, target.get_damage(category_type)-damage)
+/decl/damage_handler/proc/heal_mob_damage(var/mob/living/target, var/damage, var/skip_update_health = FALSE)
+	return set_mob_damage(target, target.get_damage(category_type)-damage, skip_update_health = skip_update_health)
 
-/decl/damage_handler/proc/apply_damage_to_mob(var/mob/living/target, var/damage, var/def_zone, var/damage_flags = 0, var/used_weapon, var/silent = FALSE)
-	return set_mob_damage(target, target.get_damage(category_type)+damage)
+/decl/damage_handler/proc/apply_damage_to_mob(var/mob/living/target, var/damage, var/def_zone, var/damage_flags = 0, var/used_weapon, var/silent = FALSE, var/skip_update_health = FALSE)
+	return set_mob_damage(target, target.get_damage(category_type)+damage, skip_update_health = skip_update_health)
 
 // There is a disconnect between legacy damage and armor code. This here helps bridge the gap.
 /decl/damage_handler/proc/get_armor_key(var/damage_flags = 0)
@@ -48,5 +49,5 @@
 /decl/damage_handler/proc/get_damage_for_mob(var/mob/living/target)
 	return LAZYACCESS(target.damage_values, category_type) || 0
 
-/decl/damage_handler/proc/damage_limb(var/obj/item/organ/external/organ, var/damage, var/damage_flags = 0, var/used_weapon)
-	return organ?.take_damage(damage, category_type, damage_flags = damage_flags, used_weapon = used_weapon)
+/decl/damage_handler/proc/damage_limb(var/obj/item/organ/external/organ, var/damage, var/damage_flags = 0, var/used_weapon, var/skip_update_health = FALSE)
+	return organ?.take_damage(damage, category_type, damage_flags = damage_flags, used_weapon = used_weapon, skip_update_health = skip_update_health)

code/datums/damage/damage_electrocution.dm

@@ -7,14 +7,14 @@
 /decl/damage_handler/electrocute/get_armor_key(var/damage_flags)
 	return ARMOR_ENERGY
 
-/decl/damage_handler/electrocute/apply_damage_to_mob(var/mob/living/target, var/damage, var/def_zone, var/damage_flags = 0, var/used_weapon, var/silent = FALSE)
+/decl/damage_handler/electrocute/apply_damage_to_mob(var/mob/living/target, var/damage, var/def_zone, var/damage_flags = 0, var/used_weapon, var/silent = FALSE, var/skip_update_health = FALSE)
 	target.electrocute_act(damage) // todo
 	return TRUE
 
-/decl/damage_handler/electrocute/set_mob_damage(var/mob/living/target, var/damage)
+/decl/damage_handler/electrocute/set_mob_damage(var/mob/living/target, var/damage, var/skip_update_health = FALSE)
 	return FALSE
 
-/decl/damage_handler/electrocute/heal_mob_damage(var/mob/living/target, var/damage)
+/decl/damage_handler/electrocute/heal_mob_damage(var/mob/living/target, var/damage, var/skip_update_health = FALSE)
 	return FALSE
 
 /decl/damage_handler/electrocute/get_damage_for_mob(var/mob/living/target)

code/game/atom_damage.dm

@@ -1,5 +1,5 @@
-/atom/proc/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/atom/proc/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	return FALSE
 
-/atom/proc/heal_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0)
-	return take_damage(-(damage), damage_type, def_zone, damage_flags)
+/atom/proc/heal_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, skip_update_health = FALSE)
+	return take_damage(-(damage), damage_type, def_zone, damage_flags, skip_update_health = skip_update_health)

code/game/gamemodes/cult/runes.dm

@@ -315,7 +315,7 @@
 	take_damage(Proj.damage, Proj.damage_type, damage_flags = Proj.damage_flags)
 	..()
 
-/obj/effect/cultwall/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/effect/cultwall/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	health -= damage
 	if(health <= 0)
 		visible_message("<span class='warning'>\The [src] dissipates.</span>")

code/game/machinery/_machines_base/machinery_damage.dm

@@ -1,4 +1,4 @@
-/obj/machinery/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/machinery/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	//Let's not bother initializing all the components for nothing
 	if(damage <= 0)
 		return

code/game/machinery/_machines_base/stock_parts/_stock_parts.dm

@@ -63,7 +63,7 @@
 // RefreshParts has been called, likely meaning other componenets were added/removed.
 /obj/item/stock_parts/proc/on_refresh(var/obj/machinery/machine)
 
-/obj/item/stock_parts/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/item/stock_parts/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	if(damage_type in ignore_damage_types)
 		return
 	. = ..()

code/game/machinery/doors/_door.dm

@@ -333,7 +333,7 @@
 		return TRUE
 	return FALSE
 
-/obj/machinery/door/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/machinery/door/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	if(!health)
 		..(damage, damtype)
 		update_icon()

code/game/machinery/doors/airlock.dm

@@ -1075,7 +1075,7 @@ About the new airlock wires panel:
 	return
 
 // Braces can act as an extra layer of armor - they will take damage first.
-/obj/machinery/door/airlock/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/machinery/door/airlock/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	if(brace)
 		brace.take_damage(damage, damtype)
 	else

code/game/machinery/doors/windowdoor.dm

@@ -132,7 +132,7 @@
 
 	return TRUE
 
-/obj/machinery/door/window/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/machinery/door/window/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	src.health = max(0, src.health - damage)
 	if (src.health <= 0)
 		shatter()

code/game/machinery/flasher.dm

@@ -81,7 +81,7 @@
 				var/vision_organ = H.get_bodytype()?.vision_organ
 				if(vision_organ)
 					var/obj/item/organ/internal/E = GET_INTERNAL_ORGAN(H, vision_organ)
-					if(E && E.is_bruised() && prob(E.damage + 50))
+					if(E && E.is_bruised() && prob(E.organ_damage + 50))
 						H.flash_eyes()
 						E.organ_damage += rand(1, 5)
 

code/game/machinery/portable_turret.dm

@@ -326,7 +326,7 @@ var/global/list/turret_icons
 		enabled = 1 //turns it back on. The cover popUp() popDown() are automatically called in process(), no need to define it here
 		return 1
 
-/obj/machinery/porta_turret/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/machinery/porta_turret/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	if(!raised && !raising)
 		damage = damage / 8
 		if(damage < 5)

code/game/objects/item_damage.dm

@@ -1,5 +1,5 @@
 /**Basic damage handling for items. Returns the amount of damage taken after armor if the item was damaged.*/
-/obj/item/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/item/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	if(!can_take_damage()) // This object does not take damage.
 		return 0 //Must return a number
 	if(damage < 0)

code/game/objects/items/flashlights/_flashlight.dm

@@ -140,7 +140,7 @@
 			return
 		if(MUTATION_XRAY in H.mutations)
 			to_chat(user, SPAN_NOTICE("\The [H]'s pupils give an eerie glow!"))
-		if(vision.damage)
+		if(vision.organ_damage)
 			to_chat(user, SPAN_WARNING("There's visible damage to [H]'s [vision.name]!"))
 		else if(HAS_STATUS(H, STAT_BLURRY))
 			to_chat(user, SPAN_NOTICE("\The [H]'s pupils react slower than normally."))

code/game/objects/items/weapons/storage/wall_mirror.dm

@@ -59,7 +59,7 @@
 		flick("mirror_open",src)
 		return
 
-/obj/structure/mirror/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/structure/mirror/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	if(prob(damage))
 		visible_message(SPAN_WARNING("[src] shatters!"))
 		shatter()

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -21,11 +21,7 @@
 	if ((MUTATION_CLUMSY in user.mutations) && prob(50))
 		to_chat(user, "<span class='warning'>You club yourself over the head.</span>")
 		SET_STATUS_MAX(user, STAT_WEAK, (3 * force))
-		if(ishuman(user))
-			var/mob/living/carbon/human/H = user
-			H.take_damage(2*force, /decl/damage_handler/brute, BP_HEAD)
-		else
-			user.take_damage(2*force, /decl/damage_handler/brute, BP_HEAD)
+		user.take_damage(2*force, /decl/damage_handler/brute, BP_HEAD)
 		return
 	return ..()
 
@@ -78,11 +74,7 @@
 		if ((MUTATION_CLUMSY in user.mutations) && prob(50))
 			to_chat(user, "<span class='warning'>You club yourself over the head.</span>")
 			SET_STATUS_MAX(user, STAT_WEAK, (3 * force))
-			if(ishuman(user))
-				var/mob/living/carbon/human/H = user
-				H.take_damage(2*force, /decl/damage_handler/brute, BP_HEAD)
-			else
-				user.take_damage(2*force, /decl/damage_handler/brute, BP_HEAD)
+			user.take_damage(2*force, /decl/damage_handler/brute, BP_HEAD)
 			return
 		if(..())
 			//playsound(src.loc, "swing_hit", 50, 1, -1)

code/game/objects/structures/__structure.dm

@@ -86,7 +86,7 @@
 	set waitfor = FALSE
 	return FALSE
 
-/obj/structure/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/structure/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	if(health == -1) // This object does not take damage.
 		return
 

code/game/objects/structures/defensive_barrier.dm

@@ -141,7 +141,7 @@
 
 	. = ..()
 
-/obj/structure/defensive_barrier/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/structure/defensive_barrier/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	if(damage)
 		playsound(src.loc, 'sound/effects/bang.ogg', 75, 1)
 		damage = round(damage * 0.5)

code/game/objects/structures/grille.dm

@@ -205,7 +205,7 @@
 	..()
 
 // TODO: handle this with armour or something.
-/obj/structure/grille/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/structure/grille/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	if(damage_type == /decl/damage_handler/burn)
 		damage = round(damage * 0.1)
 	return ..()

code/game/objects/structures/window.dm

@@ -82,7 +82,7 @@
 	SHOULD_CALL_PARENT(FALSE)
 	. = shatter()
 
-/obj/structure/window/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/structure/window/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	. = ..()
 	playsound(loc, "glasscrack", 100, 1)
 
@@ -589,7 +589,7 @@
 	SHOULD_CALL_PARENT(FALSE)
 	return
 
-/obj/structure/window/reinforced/crescent/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/structure/window/reinforced/crescent/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	return
 
 /obj/structure/window/reinforced/crescent/shatter()

code/game/turfs/simulated/walls.dm

@@ -174,7 +174,7 @@ var/global/list/wall_fullblend_objects = list(
 			F.icon_state = "wall_thermite"
 			visible_message(SPAN_DANGER("\The [src] spontaneously combusts!"))
 
-/turf/simulated/wall/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/turf/simulated/wall/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	if(reinf_material && (damage_type in reinf_material.wall_armor))
 		damage = round(damage / reinf_material.wall_armor[damage_type])
 	if(damage)

code/modules/blob/blob.dm

@@ -67,7 +67,7 @@
 		return
 	attempt_attack(global.alldirs)
 
-/obj/effect/blob/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/effect/blob/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 
 	var/decl/damage_handler/damage_type_data = GET_DECL(damage_type)
 	var/armor_key = damage_type_data?.get_armor_key(damage_flags)

code/modules/mechs/components/_components.dm

@@ -69,7 +69,7 @@
 /obj/item/mech_component/proc/ready_to_install()
 	return 1
 
-/obj/item/mech_component/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/obj/item/mech_component/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	if(damage_type == /decl/damage_handler/brute)
 		brute_damage = max(0, brute_damage + damage)
 	else if(damage_type == /decl/damage_handler/burn)
@@ -84,7 +84,7 @@
 		damageable_components += RC
 	if(!damageable_components.len) return
 	var/obj/item/robot_parts/robot_component/RC = pick(damageable_components)
-	RC.take_damage(damage, damage_type, def_zone, damage_flags, used_weapon, armor_pen, silent, override_droplimb)
+	RC.take_damage(damage, damage_type, def_zone, damage_flags, used_weapon, armor_pen, silent, override_droplimb, skip_update_health)
 
 /obj/item/mech_component/attackby(var/obj/item/thing, var/mob/user)
 	if(IS_SCREWDRIVER(thing))

code/modules/mechs/exosuit_damage_handlers.dm

@@ -9,7 +9,7 @@
 /decl/damage_handler/brute/exosuit
 	expected_type = /mob/living/exosuit
 
-/decl/damage_handler/brute/exosuit/apply_damage_to_mob(var/mob/living/target, var/damage, var/def_zone, var/damage_flags = 0, var/used_weapon, var/silent = FALSE)
+/decl/damage_handler/brute/exosuit/apply_damage_to_mob(var/mob/living/target, var/damage, var/def_zone, var/damage_flags = 0, var/used_weapon, var/silent = FALSE, var/skip_update_health = FALSE)
 	var/mob/living/exosuit/target_exo = target
 	var/obj/item/mech_component/MC = target_exo.resolve_def_zone_to_component(def_zone)
 	if(MC)
@@ -24,10 +24,10 @@
 	for(var/obj/item/mech_component/MC in list(target_exo.arms, target_exo.legs, target_exo.body, target_exo.head))
 		. += MC.brute_damage
 
-/decl/damage_handler/brute/exosuit/set_mob_damage(var/mob/living/target, var/damage)
+/decl/damage_handler/brute/exosuit/set_mob_damage(var/mob/living/target, var/damage, var/skip_update_health = FALSE)
 	return FALSE // No idea how to handle this sanely for exosuits.
 
-/decl/damage_handler/burn/exosuit/heal_mob_damage(var/mob/living/target, var/damage)
+/decl/damage_handler/burn/exosuit/heal_mob_damage(var/mob/living/target, var/damage, var/skip_update_health = FALSE)
 	. = FALSE
 	var/mob/living/exosuit/target_exo = target
 	for(var/obj/item/mech_component/MC in list(target_exo.arms, target_exo.legs, target_exo.body, target_exo.head))
@@ -42,7 +42,7 @@
 /decl/damage_handler/burn/exosuit
 	expected_type = /mob/living/exosuit
 
-/decl/damage_handler/burn/exosuit/apply_damage_to_mob(var/mob/living/target, var/damage, var/def_zone, var/damage_flags = 0, var/used_weapon, var/silent = FALSE)
+/decl/damage_handler/burn/exosuit/apply_damage_to_mob(var/mob/living/target, var/damage, var/def_zone, var/damage_flags = 0, var/used_weapon, var/silent = FALSE, var/skip_update_health = FALSE)
 	var/mob/living/exosuit/target_exo = target
 	var/obj/item/mech_component/MC = target_exo.resolve_def_zone_to_component(def_zone)
 	if(MC)
@@ -57,10 +57,10 @@
 	for(var/obj/item/mech_component/MC in list(target_exo.arms, target_exo.legs, target_exo.body, target_exo.head))
 		. += MC.burn_damage
 
-/decl/damage_handler/burn/exosuit/set_mob_damage(var/mob/living/target, var/damage)
+/decl/damage_handler/burn/exosuit/set_mob_damage(var/mob/living/target, var/damage, var/skip_update_health = FALSE)
 	return FALSE // No idea how to handle this sanely for exosuits.
 
-/decl/damage_handler/burn/exosuit/heal_mob_damage(var/mob/living/target, var/damage)
+/decl/damage_handler/burn/exosuit/heal_mob_damage(var/mob/living/target, var/damage, var/skip_update_health = FALSE)
 	. = FALSE
 	var/mob/living/exosuit/target_exo = target
 	for(var/obj/item/mech_component/MC in list(target_exo.arms, target_exo.legs, target_exo.body, target_exo.head))

code/modules/mechs/mech_damage.dm

@@ -39,7 +39,7 @@
 		else if(part == body)
 			LAZYSET(., BP_CHEST, part.w_class)
 
-/mob/living/exosuit/take_damage(var/damage, var/damage_type = /decl/damage_handler/brute, var/def_zone = null, var/damage_flags = 0, var/used_weapon = null, var/armor_pen, var/silent = FALSE, var/override_droplimb)
+/mob/living/exosuit/take_damage(damage, damage_type = /decl/damage_handler/brute, def_zone, damage_flags = 0, used_weapon, armor_pen, silent = FALSE, override_droplimb, skip_update_health = FALSE)
 	/*
 	if(!def_zone)
 		if(damage_flags & DAM_DISPERSED)