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

@@ -32,7 +32,7 @@
return
if(!allowed(user))
user << "\red Access denied."
user << "<font color='red'>Access denied.</font>"
return
user.set_machine(src)

View File

@@ -1,6 +1,6 @@
/**********************Ore box**************************/
//Why the hell is this file called satchel_ore_boxdm.dm? -CK
/obj/structure/ore_box
icon = 'icons/obj/mining.dmi'
icon_state = "orebox0"
@@ -19,7 +19,7 @@
S.hide_from(usr)
for(var/obj/item/weapon/ore/O in S.contents)
S.remove_from_storage(O, src) //This will move the item to this item's contents
user << "\blue You empty the satchel into the box."
user << "<font color='blue'>You empty the satchel into the box.</font>"
update_ore_count()
@@ -69,7 +69,7 @@
set src in view(1)
if(!istype(usr, /mob/living/carbon/human)) //Only living, intelligent creatures with hands can empty ore boxes.
usr << "\red You are physically incapable of emptying the ore box."
usr << "<font color='red'>You are physically incapable of emptying the ore box.</font>"
return
if( usr.stat || usr.restrained() )
@@ -82,13 +82,13 @@
add_fingerprint(usr)
if(contents.len < 1)
usr << "\red The ore box is empty"
usr << "<font color='red'>The ore box is empty.</font>"
return
for (var/obj/item/weapon/ore/O in contents)
contents -= O
O.loc = src.loc
usr << "\blue You empty the ore box"
usr << "<font color='blue'>You empty the ore box.</font>"
return