Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Flesh Repair respects Blood Pump #8952

Closed
wants to merge 2 commits into from
Closed

Flesh Repair respects Blood Pump #8952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1504327
Flesh Repair respects Blood Pump
Mechoid Feb 14, 2023
6fcba9e
Fixfix
Mechoid Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/machinery/oxygen_pump.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/_modifiers/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."

Expand Down
6 changes: 3 additions & 3 deletions code/modules/reagents/reagents/medicine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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>")
Expand Down
2 changes: 1 addition & 1 deletion code/modules/surgery/external_repair.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
req_open = 1

/datum/surgery_step/repairflesh/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
if (target.stat == DEAD) // Sorry defibs, your subjects need to have pumping fluids for these to work.
if (target.stat == DEAD && !target.has_modifier_of_type(/datum/modifier/bloodpump/corpse)) // Sorry defibs, your subjects need to have pumping fluids for these to work.
return 0
if (isslime(target))
return 0
Expand Down