diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 95b61ee21f7..2eebb3aea00 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -204,7 +204,7 @@ default behaviour is:
 
 /mob/living/proc/updatehealth()
 	if(status_flags & GODMODE)
-		health = 100
+		health = maxHealth
 		stat = CONSCIOUS
 	else
 		health = maxHealth - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss() - getCloneLoss() - getHalLoss()
diff --git a/code/modules/mob/living/silicon/decoy/life.dm b/code/modules/mob/living/silicon/decoy/life.dm
index 8a6aa8be436..47de5a8dfd4 100644
--- a/code/modules/mob/living/silicon/decoy/life.dm
+++ b/code/modules/mob/living/silicon/decoy/life.dm
@@ -9,7 +9,7 @@
 
 /mob/living/silicon/decoy/updatehealth()
 	if(status_flags & GODMODE)
-		health = 100
+		health = maxHealth
 		stat = CONSCIOUS
 	else
-		health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
+		health = maxHealth - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm
index b99761c25e2..6866a9d08fb 100644
--- a/code/modules/mob/living/silicon/pai/life.dm
+++ b/code/modules/mob/living/silicon/pai/life.dm
@@ -31,10 +31,10 @@
 
 /mob/living/silicon/pai/updatehealth()
 	if(status_flags & GODMODE)
-		health = 100
+		health = maxHealth
 		stat = CONSCIOUS
 	else
-		health = 100 - getBruteLoss() - getFireLoss()
+		health = maxHealth - getBruteLoss() - getFireLoss()
 
 /mob/living/silicon/pai/Stat()
 	..()
@@ -49,4 +49,4 @@
 			stat(null, "Bot M#$FUN90: MALFUNC--")
 	if(istype(card.loc, /mob/living/bot/floorbot))
 		var/mob/living/bot/floorbot/F = card.loc
-		stat(null, "Metal Count: [F.amount]/[F.maxAmount]")
\ No newline at end of file
+		stat(null, "Metal Count: [F.amount]/[F.maxAmount]")
diff --git a/html/changelogs/amunak-maxhealth.yml b/html/changelogs/amunak-maxhealth.yml
new file mode 100755
index 00000000000..d9dd3c3ef5a
--- /dev/null
+++ b/html/changelogs/amunak-maxhealth.yml
@@ -0,0 +1,4 @@
+author: Amunak
+delete-after: True
+changes:
+  - bugfix: "Fixes hardcoded health checks setting to 100 instead of maxHealth (mainly in godmode checks but also pAI)."