[MIRROR] Addendum to Baystation12#34339

SierraBay · Nov 21, 2023 · 2483d64 · 2483d64
1 parent 8f7930c
commit 2483d64
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -152,10 +152,17 @@
 		return breathe_organ.get_oxygen_deprivation()
 
 /mob/living/carbon/human/setOxyLoss(amount)
+<<<<<<< ours
 	if(!need_breathe())
 		return 0
 	else
 		adjustOxyLoss(getOxyLoss()-amount)
+=======
+	if (!need_breathe())
+		return
+	amount = (clamp(amount, 0, 100) - getOxyLoss()) / 100
+	adjustOxyLoss(amount * species.total_health)
+>>>>>>> theirs
 
 /mob/living/carbon/human/adjustOxyLoss(amount)
 	if(!need_breathe())