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
+2 -2
View File
@@ -316,7 +316,7 @@
qdel(src)
else
user << "\red You must hold \the [P] steady to burn \the [src]."
user << "<font color='red'>You must hold \the [P] steady to burn \the [src].</font>"
/obj/item/weapon/paper/Topic(href, href_list)
@@ -364,7 +364,7 @@
// check for exploits
for(var/bad in paper_blacklist)
if(findtext(t,bad))
usr << "\blue You think to yourself, \"Hm.. this is only paper...\""
usr << "<font color='blue'>You think to yourself, \"Hm.. this is only paper...\</font>""
log_admin("PAPER: [usr] ([usr.ckey]) tried to use forbidden word in [src]: [bad].")
message_admins("PAPER: [usr] ([usr.ckey]) tried to use forbidden word in [src]: [bad].")
return
+1 -1
View File
@@ -91,7 +91,7 @@
qdel(src)
else
user << "\red You must hold \the [P] steady to burn \the [src]."
user << "<font color='red'>You must hold \the [P] steady to burn \the [src].</font>"
/obj/item/weapon/paper_bundle/examine(mob/user)
if(..(user, 1))