From de12232bda376dd508ad3cc3d679bf2e090d9f61 Mon Sep 17 00:00:00 2001
From: SchrodingersWolf <108938550+SchrodingersWolf@users.noreply.github.com>
Date: Fri, 1 Sep 2023 17:00:06 -0400
Subject: [PATCH] Tweaks how splints work on healthy limbs (#22080)
* It's not painful when my legs are not broken
* Changes to_chat to owner.visible_message
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Spaces and right shifting be gone
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
---
code/modules/surgery/organs/organ_external.dm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 07a3af5245c..c62115cc810 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -492,12 +492,14 @@ Note that amputating the affected organ does in fact remove the infection from t
owner.splinted_limbs -= src
return
if(owner.step_count >= splinted_count + SPLINT_LIFE)
- status &= ~ORGAN_SPLINTED //oh no, we actually need surgery now!
- owner.visible_message("[owner] screams in pain as [owner.p_their()] splint pops off their [name]!","You scream in pain as your splint pops off your [name]!")
- owner.emote("scream")
- owner.Stun(4 SECONDS)
+ status &= ~ORGAN_SPLINTED // Oh no, we actually need surgery now!
owner.handle_splints()
-
+ if(!(status & ORGAN_BROKEN))
+ to_chat(owner, "Your splint harmlessly pops off your [name].") // If we fixed our bones, a splint popping off shouldn't be painful and stun us.
+ return
+ owner.visible_message("[owner] screams in pain as [owner.p_their()] splint pops off [owner.p_their()] [name]!","You scream in pain as your splint pops off your [name]!")
+ owner.emote("scream")
+ owner.Weaken(4 SECONDS) // Better feedback compared to stun() - We won't be just standing there menancingly
/****************************************************
DISMEMBERMENT