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

Relocating someone's joint no longer hurts the person HELPING instead #3938

Merged
merged 1 commit into from
Oct 24, 2024
Merged

Relocating someone's joint no longer hurts the person HELPING instead #3938

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
12 changes: 6 additions & 6 deletions code/datums/wounds/bones.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,13 +388,13 @@
if(prob(65))
user.visible_message(span_danger("[user] snaps [victim]'s dislocated [limb.plaintext_zone] back into place!"), span_notice("You snap [victim]'s dislocated [limb.plaintext_zone] back into place!"), ignored_mobs=victim)
to_chat(victim, span_userdanger("[user] snaps your dislocated [limb.plaintext_zone] back into place!"))
user.pain_emote("scream")
user.apply_damage(20, BRUTE, limb, wound_bonus = CANT_WOUND)
victim.pain_emote("scream")
victim.apply_damage(20, BRUTE, limb, wound_bonus = CANT_WOUND)
qdel(src)
else
user.visible_message(span_danger("[user] wrenches [victim]'s dislocated [limb.plaintext_zone] around painfully!"), span_danger("You wrench [victim]'s dislocated [limb.plaintext_zone] around painfully!"), ignored_mobs=victim)
to_chat(victim, span_userdanger("[user] wrenches your dislocated [limb.plaintext_zone] around painfully!"))
user.apply_damage(10, BRUTE, limb, wound_bonus = CANT_WOUND)
victim.apply_damage(10, BRUTE, limb, wound_bonus = CANT_WOUND)
chiropractice(user)

/// If someone is snapping our dislocated joint into a fracture by hand with an aggro grab and harm or disarm intent
Expand All @@ -407,12 +407,12 @@
if(prob(65))
user.visible_message(span_danger("[user] snaps [victim]'s dislocated [limb.plaintext_zone] with a sickening crack!"), span_danger("You snap [victim]'s dislocated [limb.plaintext_zone] with a sickening crack!"), ignored_mobs=victim)
to_chat(victim, span_userdanger("[user] snaps your dislocated [limb.plaintext_zone] with a sickening crack!"))
user.pain_emote("scream")
user.apply_damage(25, BRUTE, limb, wound_bonus = 30)
victim.pain_emote("scream")
victim.apply_damage(25, BRUTE, limb, wound_bonus = 30)
else
user.visible_message(span_danger("[user] wrenches [victim]'s dislocated [limb.plaintext_zone] around painfully!"), span_danger("You wrench [victim]'s dislocated [limb.plaintext_zone] around painfully!"), ignored_mobs=victim)
to_chat(victim, span_userdanger("[user] wrenches your dislocated [limb.plaintext_zone] around painfully!"))
user.apply_damage(10, BRUTE, limb, wound_bonus = CANT_WOUND)
victim.apply_damage(10, BRUTE, limb, wound_bonus = CANT_WOUND)
malpractice(user)


Expand Down
Loading