diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm
index 5a86f6be7cf..c11b55facc3 100644
--- a/code/game/gamemodes/changeling/changeling_powers.dm
+++ b/code/game/gamemodes/changeling/changeling_powers.dm
@@ -240,10 +240,10 @@
 	O.loc = usr.loc
 
 	O.name = text("monkey ([])",copytext(md5(usr.real_name), 2, 6))
-	O.toxloss = usr.getToxLoss()
-	O.bruteloss = usr.getBruteLoss()
-	O.oxyloss = usr.getOxyLoss()
-	O.fireloss = usr.getFireLoss()
+	O.setToxLoss(usr.getToxLoss())
+	O.setBruteLoss(usr.getBruteLoss())
+	O.setOxyLoss(usr.getOxyLoss())
+	O.setFireLoss(usr.getFireLoss())
 	O.stat = usr.stat
 	O.a_intent = "hurt"
 	for (var/obj/item/weapon/implant/I in implants)
@@ -335,10 +335,10 @@
 
 	updateappearance(O,O.dna.uni_identity)
 	domutcheck(O, null)
-	O.toxloss = usr.getToxLoss()
-	O.bruteloss = usr.getBruteLoss()
-	O.oxyloss = usr.getOxyLoss()
-	O.fireloss = usr.getFireLoss()
+	O.setToxLoss(usr.getToxLoss())
+	O.setBruteLoss(usr.getBruteLoss())
+	O.setOxyLoss(usr.getOxyLoss())
+	O.setFireLoss(usr.getFireLoss())
 	O.stat = usr.stat
 	for (var/obj/item/weapon/implant/I in implants)
 		I.loc = O
@@ -379,10 +379,10 @@
 	spawn(1200)
 		usr.stat = 0
 		//usr.fireloss = 0
-		usr.toxloss = 0
+		usr.setToxLoss(0)
 		//usr.bruteloss = 0
-		usr.oxyloss = 0
-		usr.cloneloss = 0
+		usr.setOxyLoss(0)
+		usr.setCloneLoss(0)
 		usr.paralysis = 0
 		usr.stunned = 0
 		usr.weakened = 0
@@ -390,7 +390,7 @@
 		//usr.health = 100
 		//usr.updatehealth()
 		var/mob/living/M = src
-		M.heal_overall_damage(1000, 1000)
+		M.heal_overall_damage(M.getBruteLoss(), M.getFireLoss())
 		usr.reagents.clear_reagents()
 		usr.lying = 0
 		usr.canmove = 1
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index 2fe4258bf6f..5c7448948be 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -15,7 +15,7 @@
 	adjustFireLoss(-getFireLoss())
 	for(var/datum/organ/external/O in organs)
 		if(istype(O, /datum/organ/external))
-			bruteloss += O.brute_dam
+			adjustBruteLoss(O.brute_dam)
 			adjustFireLoss(O.burn_dam)
 	return
 
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index d1584abda61..779e440aa25 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -12,14 +12,14 @@
 	if(!damage || (blocked >= 2))	return 0
 	switch(damagetype)
 		if(BRUTE)
-			bruteloss += (damage/(blocked+1))
+			adjustBruteLoss(damage/(blocked+1))
 		if(BURN)
 			if(mutations & COLD_RESISTANCE)	damage = 0
 			adjustFireLoss(damage/(blocked+1))
 		if(TOX)
 			adjustToxLoss(damage/(blocked+1))
 		if(OXY)
-			oxyloss += (damage/(blocked+1))
+			adjustOxyLoss(damage/(blocked+1))
 		if(CLONE)
 			cloneloss += (damage/(blocked+1))
 	UpdateDamageIcon()