Merge pull request #34671 from Qlonever/buffcpr

Uncap oxygenation for asystole mobs
Baystation12 · Jun 17, 2024 · c8dacc9 · c8dacc9
2 parents 81e7c02 + d7e11d6
commit c8dacc9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/code/game/objects/items/devices/auto_cpr.dm b/code/game/objects/items/devices/auto_cpr.dm
@@ -54,7 +54,7 @@
 	if(H.get_inventory_slot(src) != slot_wear_suit)
 		return PROCESS_KILL
 
-	if(world.time > last_pump + 15 SECONDS)
+	if(world.time > last_pump + 10 SECONDS)
 		last_pump = world.time
 		playsound(src, 'sound/machines/pump.ogg', 25)
 		if(!skilled_setup && prob(20))
@@ -66,4 +66,4 @@
 		else
 			var/obj/item/organ/internal/heart/heart = H.internal_organs_by_name[BP_HEART]
 			if(heart)
-				heart.external_pump = list(world.time, 0.6)
+				heart.external_pump = list(world.time, 0.5)
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -95,7 +95,7 @@
 
 					var/obj/item/organ/internal/heart/heart = internal_organs_by_name[BP_HEART]
 					if (heart)
-						heart.external_pump = list(world.time, 0.4 + 0.1*pumping_skill + Frand(-0.1,0.1))
+						heart.external_pump = list(world.time, 0.4 + 0.05*pumping_skill + Frand(-0.1,0.1))
 
 					if (stat != DEAD && prob(2 * pumping_skill))
 						resuscitate()

diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm
@@ -315,9 +315,6 @@
 /mob/living/carbon/human/proc/get_blood_oxygenation()
 	var/blood_volume = get_blood_circulation()
 	if(blood_carries_oxygen())
-		if(is_asystole()) // Heart is missing or isn't beating and we're not breathing (hardcrit)
-			return min(blood_volume, BLOOD_VOLUME_SURVIVE)
-
 		if(!need_breathe())
 			return blood_volume
 	else