cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-16 13:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Corpse Bloodpump properly functions

Browse Source 
Highvel rounds now actually have Highvel bullets.
This commit is contained in:
Mechoid
2023-07-17 17:53:59 -07:00
parent 567f003541
commit eb0655d6c6
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/oxygen_pump.dm
View File

@@ -326,7 +326,7 @@
H.adjustOxyLoss(-(rand(1,8))) H.adjustOxyLoss(-(rand(1,8)))
if(H.stat == DEAD) if(H.stat == DEAD)
H.add_modifier(/datum/modifier/bloodpump_corpse, 6 SECONDS) H.add_modifier(/datum/modifier/bloodpump/corpse, 6 SECONDS)
else else
H.add_modifier(/datum/modifier/bloodpump, 6 SECONDS) H.add_modifier(/datum/modifier/bloodpump, 6 SECONDS)

7
code/modules/mob/_modifiers/medical.dm
View File

@@ -18,7 +18,7 @@
if(holder.stat == DEAD) if(holder.stat == DEAD)
src.expire() src.expire()
/datum/modifier/bloodpump_corpse /datum/modifier/bloodpump/corpse
name = "forced blood pumping" name = "forced blood pumping"
desc = "Your blood flows thanks to the wonderful power of science." desc = "Your blood flows thanks to the wonderful power of science."
@@ -28,8 +28,9 @@
pulse_set_level = PULSE_SLOW 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) if(holder.stat != DEAD)
src.expire() src.expire()

2
code/modules/projectiles/ammunition/rounds.dm
View File

@@ -364,7 +364,7 @@
/obj/item/ammo_casing/a145/highvel /obj/item/ammo_casing/a145/highvel
desc = "A 14.5mm sabot shell." 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 /obj/item/ammo_casing/a145/bb
desc = "A 14.5mm BB. That'll take someone's eye out." desc = "A 14.5mm BB. That'll take someone's eye out."

6
code/modules/reagents/reagents/medicine.dm
View File

@@ -421,7 +421,7 @@
scannable = 1 scannable = 1
/datum/reagent/mortiferin/on_mob_life(var/mob/living/carbon/M, var/alien, var/datum/reagents/metabolism/location) /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 affects_dead = TRUE
else else
affects_dead = FALSE affects_dead = FALSE
@@ -429,7 +429,7 @@
. = ..(M, alien, location) . = ..(M, alien, location)
/datum/reagent/mortiferin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) /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 var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME) if(alien == IS_SLIME)
if(prob(10)) if(prob(10))
@@ -466,7 +466,7 @@
/datum/reagent/necroxadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) /datum/reagent/necroxadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
var/chem_effective = 1 * M.species.chem_strength_heal 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(alien == IS_SLIME)
if(prob(10)) 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>") to_chat(M, "<span class='danger'>It's so cold. Something causes your cellular mass to harden sporadically, resulting in seizure-like twitching.</span>")