Corpse Bloodpump properly functions

Highvel rounds now actually have Highvel bullets.
PolarisSS13 · Jul 18, 2023 · eb0655d · eb0655d
1 parent 567f003
commit eb0655d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/code/game/machinery/oxygen_pump.dm b/code/game/machinery/oxygen_pump.dm
@@ -326,7 +326,7 @@
 							H.adjustOxyLoss(-(rand(1,8)))
 
 				if(H.stat == DEAD)
-					H.add_modifier(/datum/modifier/bloodpump_corpse, 6 SECONDS)
+					H.add_modifier(/datum/modifier/bloodpump/corpse, 6 SECONDS)
 
 				else
 					H.add_modifier(/datum/modifier/bloodpump, 6 SECONDS)

diff --git a/code/modules/mob/_modifiers/medical.dm b/code/modules/mob/_modifiers/medical.dm
@@ -18,7 +18,7 @@
 	if(holder.stat == DEAD)
 		src.expire()
 
-/datum/modifier/bloodpump_corpse
+/datum/modifier/bloodpump/corpse
 	name = "forced blood pumping"
 	desc = "Your blood flows thanks to the wonderful power of science."
 
@@ -28,8 +28,9 @@
 
 	pulse_set_level = PULSE_SLOW
 
-/datum/modifier/bloodpump/corpse/check_if_valid()
-	..()
+/datum/modifier/bloodpump/corpse/check_if_valid() // Don't want this to expire on corpses, so cover the baseline time check.
+	if(expire_at && expire_at < world.time)
+		src.expire()
 	if(holder.stat != DEAD)
 		src.expire()
 

diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm
@@ -364,8 +364,8 @@
 
 /obj/item/ammo_casing/a145/highvel
 	desc = "A 14.5mm sabot shell."
-	projectile_type = /obj/item/projectile/bullet/rifle/a145
-	
+	projectile_type = /obj/item/projectile/bullet/rifle/a145/highvel
+
 /obj/item/ammo_casing/a145/bb
 	desc = "A 14.5mm BB. That'll take someone's eye out."
 	projectile_type = /obj/item/projectile/bullet/bb

diff --git a/code/modules/reagents/reagents/medicine.dm b/code/modules/reagents/reagents/medicine.dm
@@ -421,15 +421,15 @@
 	scannable = 1
 
 /datum/reagent/mortiferin/on_mob_life(var/mob/living/carbon/M, var/alien, var/datum/reagents/metabolism/location)
-	if(M.stat == DEAD && M.has_modifier_of_type(/datum/modifier/bloodpump_corpse))
+	if(M.stat == DEAD && M.has_modifier_of_type(/datum/modifier/bloodpump/corpse))
 		affects_dead = TRUE
 	else
 		affects_dead = FALSE
 
 	. = ..(M, alien, location)
 
 /datum/reagent/mortiferin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
-	if(M.bodytemperature < (T0C - 10) || (M.stat == DEAD && M.has_modifier_of_type(/datum/modifier/bloodpump_corpse)))
+	if(M.bodytemperature < (T0C - 10) || (M.stat == DEAD && M.has_modifier_of_type(/datum/modifier/bloodpump/corpse)))
 		var/chem_effective = 1 * M.species.chem_strength_heal
 		if(alien == IS_SLIME)
 			if(prob(10))
@@ -466,7 +466,7 @@
 
 /datum/reagent/necroxadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
 	var/chem_effective = 1 * M.species.chem_strength_heal
-	if(M.bodytemperature < 170 || (M.stat == DEAD && M.has_modifier_of_type(/datum/modifier/bloodpump_corpse)))
+	if(M.bodytemperature < 170 || (M.stat == DEAD && M.has_modifier_of_type(/datum/modifier/bloodpump/corpse)))
 		if(alien == IS_SLIME)
 			if(prob(10))
 				to_chat(M, "<span class='danger'>It's so cold. Something causes your cellular mass to harden sporadically, resulting in seizure-like twitching.</span>")