cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-14 01:18:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes pain and announcement font size. (#22681)

Browse Source 
title, h2 and manual font size brokey

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2026-06-19 19:23:07 +02:00
committed by GitHub
parent 5c7a012e8b
commit 2f4a8d6f3d
23 changed files with 105 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/internal/heart.dm
+1 -1
View File
@@ -291,7 +291,7 @@
if(world.time >= next_blood_squirt && istype(owner.loc, /turf) && do_spray.len)
owner.visible_message(SPAN_DANGER("Blood squirts from \the [owner]'s [pick(do_spray)]!"), \
SPAN_DANGER("<font size=3>Blood sprays out of your [pick(do_spray)]!</font>"))
SPAN_DANGER("<font size=5>Blood sprays out of your [pick(do_spray)]!</font>"))
owner.eye_blurry = 2
owner.Stun(1)
next_blood_squirt = world.time + time_between_arterial_sprays
code/modules/organs/organ_external.dm
+5 -5
View File
@@ -1126,20 +1126,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_DANGER("\The [owner]'s [src.name] flies off in an arc!"),\
"<span class='moderate'><b><font size=2>Your [src.name] goes flying off!</font></b></span>",\
"<span class='moderate'><b><font size=5>Your [src.name] goes flying off!</font></b></span>",\
SPAN_DANGER("You hear the terrible sound of [gore_sound]."))
if(DROPLIMB_BURN)
var/gore = "[(status & ORGAN_ROBOT) ? "": " of burning flesh"]"
owner.visible_message(
SPAN_DANGER("\The [owner]'s [src.name] flashes away into ashes!"),\
"<span class='moderate'><b><font size=2>Your [src.name] flashes away into ashes!</font></b></span>",\
"<span class='moderate'><b><font size=5>Your [src.name] flashes away into ashes!</font></b></span>",\
SPAN_DANGER("You hear the crackling sound[gore]."))
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_DANGER("\The [owner]'s [src.name] explodes[gore]!"),\
"<span class='moderate'><b><font size=3>Your [src.name] explodes[gore]!</font></b></span>",\
"<span class='moderate'><b><font size=5>Your [src.name] explodes[gore]!</font></b></span>",\
SPAN_DANGER("You hear the [gore_sound]."))
var/mob/living/carbon/human/victim = owner //Keep a reference for post-removed().
@@ -1296,8 +1296,8 @@ Note that amputating the affected organ does in fact remove the infection from t
if(!silent)
var/message = pick("broke in half", "shattered")
owner.visible_message(\
SPAN_WARNING("<font size=2>You hear a loud cracking sound coming from \the [owner]!</font>"),\
SPAN_DANGER("<font size=3>Something feels like it [message] in your [name]!</font>"),\
SPAN_WARNING("<font size=4>You hear a loud cracking sound coming from \the [owner]!</font>"),\
SPAN_DANGER("<font size=5>Something feels like it [message] in your [name]!</font>"),\
"You hear a sickening crack!")
if(owner.species && owner.can_feel_pain())
owner.emote("scream")
code/modules/organs/pain.dm
+3 -3
View File
@@ -26,11 +26,11 @@
last_pain_message = message
if(power >= 110)
flash_strong_pain()
to_chat(src, SPAN_DANGER("<font size=3>[message]</font>"))
to_chat(src, SPAN_DANGER(FONT_HUGE("[message]")))
else if(power >= 70)
to_chat(src, SPAN_DANGER("<font size=3>[message]</font>"))
to_chat(src, SPAN_DANGER(FONT_LARGE("[message]")))
else if(power >= 40)
to_chat(src, SPAN_DANGER("<font size=2>[message]</font>"))
to_chat(src, SPAN_DANGER(FONT_LARGE("[message]")))
else if(power >= 10)
to_chat(src, SPAN_DANGER("[message]"))
else