mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2026-08-28 04:47:07 +01:00
temporary hotfix* for people screaming while unconscious (#5032)
This commit is contained in:
+3
-2
@@ -195,7 +195,8 @@
|
||||
|
||||
if(status & ORGAN_BROKEN && brute)
|
||||
jostle_bone(brute)
|
||||
if(organ_can_feel_pain() && prob(40) && !isbelly(owner.loc) && !istype(owner.loc, /obj/item/dogborg/sleeper)) owner.emote("scream") //getting hit on broken hand hurts
|
||||
if(organ_can_feel_pain() && IS_CONSCIOUS(owner) && prob(40) && !isbelly(owner.loc) && !istype(owner.loc, /obj/item/dogborg/sleeper))
|
||||
owner.emote("scream") //getting hit on broken hand hurts
|
||||
if(used_weapon)
|
||||
add_autopsy_data("[used_weapon]", brute + burn)
|
||||
|
||||
@@ -986,7 +987,7 @@ Note that amputating the affected organ does in fact remove the infection from t
|
||||
"<span class='danger'>Something feels like it shattered in your [name]!</span>",\
|
||||
"<span class='danger'>You hear a sickening crack.</span>")
|
||||
jostle_bone()
|
||||
if(organ_can_feel_pain() && !isbelly(owner.loc))
|
||||
if(organ_can_feel_pain() && IS_CONSCIOUS(owner) && !isbelly(owner.loc))
|
||||
INVOKE_ASYNC(owner, /mob/proc/emote, "scream")
|
||||
|
||||
playsound(src.loc, "fracture", 10, 1, -2)
|
||||
|
||||
Reference in New Issue
Block a user