Skip to content

prevent species with NOBLOOD from getting bleed wounds #594

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

Open
Absolucy wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −5
Open

prevent species with NOBLOOD from getting bleed wounds #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions code/__DEFINES/wounds.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ GLOBAL_LIST_INIT(global_all_wound_types, list(/datum/wound/blunt/critical, /datu
#define ACCEPTS_GAUZE (1<<4)
/// If this wound marks the limb as being allowed to have splints applied
#define ACCEPTS_SPLINT (1<<5)
/// PENTEST ADDITION: If this wound requires humanoids to NOT have the NOBLOOD species trait
#define BLEED_WOUND (1<<6)
Copy link
Contributor Author

@Absolucy Absolucy Feb 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: this is in the main file rather than in code/~PENTEST/__DEFINES so that if upstream ever adds another wound flag, we can just bump this to 1<<7 or whatever, without accidentally forgetting about it and causing issues.

Copy link
Collaborator

@Ossa88 Ossa88 Feb 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So just peeked at their current live code, and they have edited this section of code. But based on when it was done we can deal with that when I get to it.


/// When a wound is staining the gauze with blood
#define GAUZE_STAIN_BLOOD 1
Expand Down
2 changes: 1 addition & 1 deletion code/datums/wounds/_wounds.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@

if(ishuman(L.owner))
var/mob/living/carbon/human/H = L.owner
if(((wound_flags & BONE_WOUND) && !(HAS_BONE in H.dna.species.species_traits)) || ((wound_flags & FLESH_WOUND) && !(HAS_FLESH in H.dna.species.species_traits)))
if(((wound_flags & BONE_WOUND) && !(HAS_BONE in H.dna.species.species_traits)) || ((wound_flags & FLESH_WOUND) && !(HAS_FLESH in H.dna.species.species_traits)) || ((wound_flags & BLEED_WOUND) && (NOBLOOD in H.dna.species.species_traits))) // PENTEST ADDITION: add check for BLEED_WOUND flag
qdel(src)
return

Expand Down
4 changes: 2 additions & 2 deletions code/datums/wounds/pierce.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
treatable_by = list(/obj/item/stack/medical/suture)
treatable_tool = TOOL_CAUTERY
base_treat_time = 3 SECONDS
wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE | ACCEPTS_SPLINT)
wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE | ACCEPTS_SPLINT | BLEED_WOUND) // PENTEST ADDITION: BLEED_WOUND flag

/// How much blood we start losing when this wound is first applied
var/initial_flow
Expand Down Expand Up @@ -212,4 +212,4 @@
threshold_minimum = 115
threshold_penalty = 50
status_effect_type = /datum/status_effect/wound/pierce/critical
wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE | ACCEPTS_SPLINT | MANGLES_FLESH)
wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE | ACCEPTS_SPLINT | MANGLES_FLESH | BLEED_WOUND) // PENTEST ADDITION: BLEED_WOUND flag
4 changes: 2 additions & 2 deletions code/datums/wounds/slash.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
treatable_by_grabbed = list(/obj/item/gun/energy/laser)
treatable_tool = TOOL_CAUTERY
base_treat_time = 3 SECONDS
wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE)
wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE | BLEED_WOUND) // PENTEST ADDITION: BLEED_WOUND flag

/// How much blood we start losing when this wound is first applied
var/initial_flow
Expand Down Expand Up @@ -268,4 +268,4 @@
threshold_penalty = 50
demotes_to = /datum/wound/slash/severe
status_effect_type = /datum/status_effect/wound/slash/critical
wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE | MANGLES_FLESH)
wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE | MANGLES_FLESH | BLEED_WOUND) // PENTEST ADDITION: BLEED_WOUND flag
Loading