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

Removes all \red and \blue's (#2309)

Browse Source 
Removes all \red's and \blues in favor of span classes. \red things that were bold were replaced with danger because it's warning but bold.
This commit is contained in:
Ron
2017-05-21 05:07:57 -04:00
committed by skull132
parent fe396373c6
commit 790480c8da
226 changed files with 1027 additions and 1027 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/blood.dm
+4 -4
View File
@@ -84,10 +84,10 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
pale = 1
update_body()
var/word = pick("dizzy","woosey","faint")
src << "\red You feel [word]"
src << "<span class='warning'>You feel [word]</span>"
if(prob(1))
var/word = pick("dizzy","woosey","faint")
src << "\red You feel [word]"
src << "<span class='warning'>You feel [word]</span>"
if(oxyloss < 20)
oxyloss += 3
if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
@@ -101,13 +101,13 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
if(prob(15))
Paralyse(rand(1,3))
var/word = pick("dizzy","woosey","faint")
src << "\red You feel extremely [word]"
src << "<span class='warning'>You feel extremely [word]</span>"
if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
oxyloss += 5
toxloss += 3
if(prob(15))
var/word = pick("dizzy","woosey","faint")
src << "\red You feel extremely [word]"
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.dm
+1 -1
View File
@@ -359,7 +359,7 @@ var/list/organ_cache = list()
if(robotic)
return
user << "\blue You take an experimental bite out of \the [src]."
user << "<span class='notice'>You take an experimental bite out of \the [src].</span>"
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in reagents.reagent_list
blood_splatter(src,B,1)
code/modules/organs/organ_external.dm
+13 -13
View File
@@ -42,7 +42,7 @@
var/obj/item/organ/external/parent
var/list/obj/item/organ/external/children
var/list/internal_organs = list() // Internal organs of this body part
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
var/stage = 0
@@ -397,12 +397,12 @@ This function completely restores a damaged organ to perfect condition.
W.open_wound(damage)
if(prob(25))
if(status & ORGAN_ROBOT)
owner.visible_message("\red The damage to [owner.name]'s [name] worsens.",\
"\red The damage to your [name] worsens.",\
owner.visible_message("<span class='warning'>The damage to [owner.name]'s [name] worsens.</span>",\
"<span class='warning'>The damage to your [name] worsens.</span>",\
"You hear the screech of abused metal.")
else
owner.visible_message("\red The wound on [owner.name]'s [name] widens with a nasty ripping noise.",\
"\red The wound on your [name] widens with a nasty ripping noise.",\
owner.visible_message("<span class='warning'>The wound on [owner.name]'s [name] widens with a nasty ripping noise.</span>",\
"<span class='warning'>The wound on your [name] widens with a nasty ripping noise.</span>",\
"You hear a nasty ripping noise, as if flesh is being torn apart.")
return
@@ -888,8 +888,8 @@ Note that amputating the affected organ does in fact remove the infection from t
if(owner)
owner.visible_message(\
"\red You hear a loud cracking sound coming from \the [owner].",\
"\red <b>Something feels like it shattered in your [name]!</b>",\
"<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))
owner.emote("scream")
@@ -1059,13 +1059,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].", \
"\red <b>Your [name] becomes a mangled mess!</b>", \
"\red You hear a sickening crack.")
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>", \
"<span class='warning'>You hear a sickening crack.</span>")
else
owner.visible_message("\red \The [owner]'s [name] melts away, turning into mangled mess!", \
"\red <b>Your [name] melts away!</b>", \
"\red You hear a sickening sizzle.")
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>", \
"<span class='warning'>You hear a sickening sizzle.</span>")
disfigured = 1
/obj/item/organ/external/proc/get_wounds_desc()
code/modules/organs/organ_internal.dm
+2 -2
View File
@@ -109,7 +109,7 @@
if (germ_level > INFECTION_LEVEL_ONE)
if(prob(1))
owner << "\red Your skin itches."
owner << "<span class='warning'>Your skin itches.</span>"
if (germ_level > INFECTION_LEVEL_TWO)
if(prob(1))
spawn owner.delayed_vomit()
@@ -201,7 +201,7 @@ obj/item/organ/vaurca/neuralsocket/process()
if (is_broken())
if (all_languages[LANGUAGE_VAURCA] in owner.languages)
owner.remove_language(LANGUAGE_VAURCA)
owner << "<span class='warning'> Your mind suddenly grows dark as the unity of the Hive is torn from you.</span>"
owner << "<span class='warning'>Your mind suddenly grows dark as the unity of the Hive is torn from you.</span>"
else
if (!(all_languages[LANGUAGE_VAURCA] in owner.languages))
owner.add_language(LANGUAGE_VAURCA)
code/modules/organs/pain.dm
+5 -5
View File
@@ -25,13 +25,13 @@ mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0
if(burning)
switch(amount)
if(1 to 10)
msg = "\red <b>Your [partname] burns.</b>"
msg = "<span class='danger'>Your [partname] burns.</span>"
if(11 to 90)
flash_weak_pain()
msg = "\red <b><font size=2>Your [partname] burns badly!</font></b>"
msg = "<span class='danger'><font size=2>Your [partname] burns badly!</font></span>"
if(91 to 10000)
flash_pain()
msg = "\red <b><font size=3>OH GOD! Your [partname] is on fire!</font></b>"
msg = "<span class='danger'><font size=3>OH GOD! Your [partname] is on fire!</font></span>"
else
switch(amount)
if(1 to 10)
@@ -61,9 +61,9 @@ mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength)
return
if(analgesic)
return
var/msg = "\red <b>[message]</b>"
var/msg = "<span class='danger'>[message]</span>"
if(flash_strength >= 1)
msg = "\red <font size=3><b>[message]</b></font>"
msg = "<span class='danger'><font size=3>[message]</font></span>"
// Anti message spam checks
if(msg && ((msg != last_pain_message) || (world.time >= next_pain_time)))