Skip to content

TRAIT_NOBLOOD now resets your blood volume #5486

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

Merged
merged 2 commits into from
Feb 19, 2025
Merged

TRAIT_NOBLOOD now resets your blood volume #5486

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
941d67b
trait noblood is now a tiny bit more literal
RikuTheKiller Feb 16, 2025
84a3850
final touches
RikuTheKiller Feb 16, 2025
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
4 changes: 4 additions & 0 deletions code/modules/mob/living/carbon/human/examine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,10 @@
var/apparent_blood_volume = blood_volume
if(HAS_TRAIT(src, TRAIT_USES_SKINTONES) && (skin_tone == "albino"))
apparent_blood_volume -= 150 // enough to knock you down one tier
// MONKESTATION EDIT START
if(HAS_TRAIT(src, TRAIT_NOBLOOD))
apparent_blood_volume = BLOOD_VOLUME_NORMAL // Duh.
// MONKESTATION EDIT END
if(isethereal(src))//Monkestation Changes Start:
if(appears_dead)
if(blood_volume < ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE)
Expand Down
7 changes: 6 additions & 1 deletion monkestation/code/modules/mob/living/carbon/human/init_signals.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
/mob/living/carbon/human/register_init_signals()
. = ..()
RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_NOBLOOD), PROC_REF(on_gain_noblood_trait))
RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_NOBLOOD), PROC_REF(on_lose_noblood_trait))

RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_FAT), PROC_REF(on_trait_fat_gain))
RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_FAT), PROC_REF(on_trait_fat_loss))

/mob/living/carbon/human/proc/on_gain_noblood_trait(datum/source)
SIGNAL_HANDLER
blood_volume = BLOOD_VOLUME_NORMAL

/mob/living/carbon/human/proc/on_lose_noblood_trait(datum/source)
SIGNAL_HANDLER
blood_volume = clamp(blood_volume, BLOOD_VOLUME_NORMAL, BLOOD_VOLUME_MAXIMUM - 1)
blood_volume = BLOOD_VOLUME_NORMAL

/mob/living/carbon/human/proc/on_trait_fat_gain(datum/source)
SIGNAL_HANDLER
Expand Down
Loading