cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bigger, more varied pain messages. (#6914)

Browse Source 
* MY BONES, MY BONES, AAAAA

* get me off mr pain's wild ride

* Kore ga Requiem da.

* I hate you Travis. Die die die die die die die die.
This commit is contained in:
Matt Atlas
2019-09-04 20:21:24 +02:00
committed by Werner
parent 3885992428
commit 5a6d7cff96
8 changed files with 71 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/blood.dm
+4 -4
View File
@@ -91,10 +91,10 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
pale = 1
update_body()
var/word = pick("dizzy","woosey","faint")
to_chat(src, "<span class='warning'>You feel [word]</span>")
to_chat(src, "<span class='warning'>You feel [word]...</span>")
if(prob(1))
var/word = pick("dizzy","woosey","faint")
to_chat(src, "<span class='warning'>You feel [word]</span>")
to_chat(src, "<span class='warning'>You feel [word]...</span>")
if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
if(!pale)
pale = 1
@@ -104,13 +104,13 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
if(prob(15))
Paralyse(rand(1,3))
var/word = pick("dizzy","woosey","faint")
to_chat(src, "<span class='warning'>You feel extremely [word]</span>")
to_chat(src, "<span class='warning'>You feel extremely [word]...</span>")
if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
oxyloss += 3
toxloss += 3
if(prob(15))
var/word = pick("dizzy","woosey","faint")
to_chat(src, "<span class='warning'>You feel extremely [word]</span>")
to_chat(src, "<span class='warning'>You feel extremely [word]...</span>")
if(0 to BLOOD_VOLUME_SURVIVE)
// There currently is a strange bug here. If the mob is not below -100 health
// when death() is called, apparently they will be just fine, and this way it'll
code/modules/organs/organ_external.dm
+8 -7
View File
@@ -747,20 +747,20 @@ Note that amputating the affected organ does in fact remove the infection from t
var/gore_sound = "[(status & ORGAN_ROBOT) ? "tortured metal" : "ripping tendons and flesh"]"
owner.visible_message(
"<span class='danger'>\The [owner]'s [src.name] flies off in an arc!</span>",\
"<span class='moderate'><b>Your [src.name] goes flying off!</b></span>",\
"<span class='moderate'><b><font size=2>Your [src.name] goes flying off!</font></b></span>",\
"<span class='danger'>You hear the terrible sound of [gore_sound].</span>")
if(DROPLIMB_BURN)
var/gore = "[(status & ORGAN_ROBOT) ? "": " of burning flesh"]"
owner.visible_message(
"<span class='danger'>\The [owner]'s [src.name] flashes away into ashes!</span>",\
"<span class='moderate'><b>Your [src.name] flashes away into ashes!</b></span>",\
"<span class='moderate'><b><font size=2>Your [src.name] flashes away into ashes!</font></b></span>",\
"<span class='danger'>You hear the crackling sound[gore].</span>")
if(DROPLIMB_BLUNT)
var/gore = "[(status & ORGAN_ROBOT) ? "": " in a shower of gore"]"
var/gore_sound = "[(status & ORGAN_ROBOT) ? "rending sound of tortured metal" : "sickening splatter of gore"]"
owner.visible_message(
"<span class='danger'>\The [owner]'s [src.name] explodes[gore]!</span>",\
"<span class='moderate'><b>Your [src.name] explodes[gore]!</b></span>",\
"<span class='moderate'><b><font size=3>Your [src.name] explodes[gore]!</font></b></span>",\
"<span class='danger'>You hear the [gore_sound].</span>")
var/mob/living/carbon/human/victim = owner //Keep a reference for post-removed().
@@ -913,10 +913,11 @@ Note that amputating the affected organ does in fact remove the infection from t
return
if(owner)
var/message = pick("snapped in half", "shattered", "was pulverized")
owner.visible_message(\
"<span class='warning'>You hear a loud cracking sound coming from \the [owner].</span>",\
"<span class='danger'>Something feels like it shattered in your [name]!</span>",\
"You hear a sickening crack.")
"<span class='warning'><font size='2'>You hear a loud cracking sound coming from \the [owner]!</font></span>",\
"<span class='danger'><font size=3>Something feels like it [message] in your [name]!</font></span>",\
"You hear a sickening crack!")
if(owner.species && (owner.can_feel_pain()))
owner.emote("scream")
@@ -1028,7 +1029,7 @@ Note that amputating the affected organ does in fact remove the infection from t
if(supplied_message)
owner.visible_message("<span class='danger'>[supplied_message]</span>")
else
owner.visible_message("<span class='danger'>\The [W] sticks in the wound!</span>")
owner.visible_message("<span class='danger'>\The [W] sticks in [owner]'s wound!</span>", "<span class='danger'>\The [W] sticks in your wound!</span>")
implants += W
owner.embedded_flag = 1
owner.verbs += /mob/proc/yank_out_object
code/modules/organs/pain.dm
+6 -6
View File
@@ -28,20 +28,20 @@ mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0
msg = "<span class='danger'>Your [partname] burns.</span>"
if(11 to 90)
flash_weak_pain()
msg = "<span class='danger'><font size=2>Your [partname] burns horribly!</font></span>"
msg = "<span class='danger'><font size=3>Your [partname] burns horribly!</font></span>"
if(91 to 10000)
flash_pain()
msg = "<span class='danger'><font size=3>Your [partname] feels like it's on fire!</font></span>"
msg = "<span class='danger'><font size=4>Your [partname] feels like it's on fire!</font></span>"
else
switch(amount)
if(1 to 10)
if(5 to 14)
msg = "<b>Your [partname] hurts.</b>"
if(11 to 90)
if(15 to 90)
flash_weak_pain()
msg = "<b><font size=2>Your [partname] hurts badly!</font></b>"
msg = "<b><font size=3>Your [partname] hurts badly!</font></b>"
if(91 to 10000)
flash_pain()
msg = "<b><font size=3>Your [partname] is screaming out in pain!</font></b>"
msg = "<b><font size=4>Your [partname] is screaming out in pain!</font></b>"
if(msg && (msg != last_pain_message || prob(10)))
last_pain_message = msg
to_chat(src, msg)