Replace all BYOND text macros

This commit is contained in:
Markolie
2017-02-21 14:19:59 +01:00
parent fb1cef8029
commit 6982014a6e
286 changed files with 1303 additions and 1311 deletions
@@ -50,7 +50,7 @@
// Internal organs of this body part
var/list/internal_organs = list()
var/damage_msg = "\red You feel an intense pain"
var/damage_msg = "<span class='warning'>You feel an intense pain</span>"
var/broken_description
var/open = 0
@@ -808,7 +808,7 @@ Note that amputating the affected organ does in fact remove the infection from t
return
if(owner)
owner.visible_message(\
"\red You hear a loud cracking sound coming from \the [owner].",\
"<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.")
if(owner.species && !(owner.species.flags & NO_PAIN))
@@ -960,13 +960,13 @@ Note that amputating the affected organ does in fact remove the infection from t
return
if(owner)
if(type == "brute")
owner.visible_message("\red You hear a sickening cracking sound coming from \the [owner]'s [name].", \
owner.visible_message("<span class='warning'>You hear a sickening cracking sound coming from \the [owner]'s [name].</span>", \
"<span class='danger'>Your [name] becomes a mangled mess!</span>", \
"\red You hear a sickening crack.")
"<span class='warning'>You hear a sickening crack.</span>")
else
owner.visible_message("\red \The [owner]'s [name] melts away, turning into mangled mess!", \
owner.visible_message("<span class='warning'>\The [owner]'s [name] melts away, turning into mangled mess!</span>", \
"<span class='danger'>Your [name] melts away!</span>", \
"\red You hear a sickening sizzle.")
"<span class='warning'>You hear a sickening sizzle.</span>")
disfigured = 1
/obj/item/organ/external/is_primary_organ(var/mob/living/carbon/human/O = null)
+1 -1
View File
@@ -55,7 +55,7 @@ mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength)
return
var/msg = "<span class='danger'>[message]</span>"
if(flash_strength >= 1)
msg = "\red <font size=3><b>[message]</b></font>"
msg = "<span class='warning'><font size=3><b>[message]</b></font></span>"
// Anti message spam checks
if(msg && ((msg != last_pain_message) || (world.time >= next_pain_time)))