Macro Replacements. (#3574)

* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
This commit is contained in:
Cameron653
2017-07-19 13:47:23 -04:00
committed by Anewbe
parent a3319de4f4
commit e158fcd3cc
132 changed files with 686 additions and 684 deletions

View File

@@ -247,7 +247,7 @@
var/list/modules = list()
modules.Add(robot_module_types)
if((crisis && security_level == SEC_LEVEL_RED) || crisis_override) //Leaving this in until it's balanced appropriately.
src << "\red Crisis mode active. Combat module available."
src << "<font color='red'>Crisis mode active. Combat module available.</font>"
modules+="Combat"
modtype = input("Please, select a module!", "Robot module", null, null) as null|anything in modules
@@ -354,11 +354,11 @@
set name = "Self Diagnosis"
if(!is_component_functioning("diagnosis unit"))
src << "\red Your self-diagnosis component isn't functioning."
src << "<font color='red'>Your self-diagnosis component isn't functioning.</font>"
var/datum/robot_component/CO = get_component("diagnosis unit")
if (!cell_use_power(CO.active_usage))
src << "\red Low Power."
src << "<font color='red'>Low Power.</font>"
var/dat = self_diagnosis()
src << browse(dat, "window=robotdiagnosis")
@@ -382,10 +382,10 @@
var/datum/robot_component/C = components[toggle]
if(C.toggled)
C.toggled = 0
src << "\red You disable [C.name]."
src << "<font color='red'>You disable [C.name].</font>"
else
C.toggled = 1
src << "\red You enable [C.name]."
src << "<font color='red'>You enable [C.name].</font>"
// this function displays jetpack pressure in the stat panel
/mob/living/silicon/robot/proc/show_jetpack_pressure()
@@ -451,7 +451,7 @@
C.brute_damage = WC.brute
C.electronics_damage = WC.burn
usr << "\blue You install the [W.name]."
usr << "<font color='blue'>You install the [W.name].</font>"
return
@@ -470,7 +470,7 @@
updatehealth()
add_fingerprint(user)
for(var/mob/O in viewers(user, null))
O.show_message(text("\red [user] has fixed some of the dents on [src]!"), 1)
O.show_message(text("<font color='red'>[user] has fixed some of the dents on [src]!</font>"), 1)
else
user << "Need more welding fuel!"
return
@@ -485,7 +485,7 @@
adjustFireLoss(-30)
updatehealth()
for(var/mob/O in viewers(user, null))
O.show_message(text("\red [user] has fixed some of the burnt wires on [src]!"), 1)
O.show_message(text("<font color='red'>[user] has fixed some of the burnt wires on [src]!</font>"), 1)
else if (istype(W, /obj/item/weapon/crowbar)) // crowbar means open or close the cover
if(opened)
@@ -599,7 +599,7 @@
user << "You [ locked ? "lock" : "unlock"] [src]'s interface."
updateicon()
else
user << "\red Access denied."
user << "<font color='red'>Access denied.</font>"
else if(istype(W, /obj/item/borg/upgrade/))
var/obj/item/borg/upgrade/U = W
@@ -713,7 +713,7 @@
/mob/living/silicon/robot/proc/installed_modules()
if(weapon_lock)
src << "\red Weapon lock active, unable to use modules! Count:[weaponlock_time]"
src << "<font color='red'>Weapon lock active, unable to use modules! Count:[weaponlock_time]</font>"
return
if(!module)
@@ -860,7 +860,7 @@
cleaned_human.shoes.clean_blood()
cleaned_human.update_inv_shoes(0)
cleaned_human.clean_blood(1)
cleaned_human << "\red [src] cleans your face!"
cleaned_human << "<font color='red'>[src] cleans your face!</font>"
return
/mob/living/silicon/robot/proc/self_destruct()