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

@@ -119,13 +119,13 @@ field_generator power level display
"You hear ratchet")
src.anchored = 0
if(2)
user << "\red The [src.name] needs to be unwelded from the floor."
user << "<font color='red'>The [src.name] needs to be unwelded from the floor.</font>"
return
else if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
switch(state)
if(0)
user << "\red The [src.name] needs to be wrenched to the floor."
user << "<font color='red'>The [src.name] needs to be wrenched to the floor.</font>"
return
if(1)
if (WT.remove_fuel(0,user))
@@ -211,7 +211,7 @@ field_generator power level display
return 1
else
for(var/mob/M in viewers(src))
M.show_message("\red \The [src] shuts down!")
M.show_message("<font color='red'>\The [src] shuts down!</font>")
turn_off()
investigate_log("ran out of power and <font color='red'>deactivated</font>","singulo")
src.power = 0