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 12:47:23 -05:00
committed by Anewbe
parent a3319de4f4
commit e158fcd3cc
132 changed files with 686 additions and 684 deletions
+10 -10
View File
@@ -257,14 +257,14 @@
return
if (src.active)
user.visible_message("\blue \icon[src] [user] deactivated the shield generator.", \
"\blue \icon[src] You deactivate the shield generator.", \
user.visible_message("<font color='blue'>\icon[src] [user] deactivated the shield generator.</font>", \
"<font color='blue'>\icon[src] You deactivate the shield generator.</font>", \
"You hear heavy droning fade out.")
src.shields_down()
else
if(anchored)
user.visible_message("\blue \icon[src] [user] activated the shield generator.", \
"\blue \icon[src] You activate the shield generator.", \
user.visible_message("<font color='blue'>\icon[src] [user] activated the shield generator.</font>", \
"<font color='blue'>\icon[src] You activate the shield generator.</font>", \
"You hear heavy droning.")
src.shields_up()
else
@@ -281,10 +281,10 @@
if(istype(W, /obj/item/weapon/screwdriver))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
if(is_open)
user << "\blue You close the panel."
user << "<font color='blue'>You close the panel.</font>"
is_open = 0
else
user << "\blue You open the panel and expose the wiring."
user << "<font color='blue'>You open the panel and expose the wiring.</font>"
is_open = 1
else if(istype(W, /obj/item/stack/cable_coil) && malfunction && is_open)
@@ -304,15 +304,15 @@
return
if(anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
user << "\blue You unsecure the [src] from the floor!"
user << "<font color='blue'>You unsecure the [src] from the floor!</font>"
if(active)
user << "\blue The [src] shuts off!"
user << "<font color='blue'>The [src] shuts off!</font>"
src.shields_down()
anchored = 0
else
if(istype(get_turf(src), /turf/space)) return //No wrenching these in space!
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
user << "\blue You secure the [src] to the floor!"
user << "<font color='blue'>You secure the [src] to the floor!</font>"
anchored = 1
@@ -321,7 +321,7 @@
src.locked = !src.locked
user << "The controls are now [src.locked ? "locked." : "unlocked."]"
else
user << "\red Access denied."
user << "<font color='red'>Access denied.</font>"
else
..()
+6 -6
View File
@@ -28,13 +28,13 @@
/obj/machinery/shieldwallgen/attack_hand(mob/user as mob)
if(state != 1)
user << "\red The shield generator needs to be firmly secured to the floor first."
user << "<font color='red'>The shield generator needs to be firmly secured to the floor first.</font>"
return 1
if(src.locked && !istype(user, /mob/living/silicon))
user << "\red The controls are locked!"
user << "<font color='red'>The controls are locked!</font>"
return 1
if(power != 1)
user << "\red The shield generator needs to be powered by wire underneath."
user << "<font color='red'>The shield generator needs to be powered by wire underneath.</font>"
return 1
if(src.active >= 1)
@@ -106,7 +106,7 @@
src.active = 2
if(src.active >= 1)
if(src.power == 0)
src.visible_message("\red The [src.name] shuts down due to lack of power!", \
src.visible_message("<font color='red'>The [src.name] shuts down due to lack of power!</font>", \
"You hear heavy droning fade out")
icon_state = "Shield_Gen"
src.active = 0
@@ -182,11 +182,11 @@
src.locked = !src.locked
user << "Controls are now [src.locked ? "locked." : "unlocked."]"
else
user << "\red Access denied."
user << "<font color='red'>Access denied.</font>"
else
src.add_fingerprint(user)
visible_message("\red The [src.name] has been hit with \the [W.name] by [user.name]!")
visible_message("<font color='red'>The [src.name] has been hit with \the [W.name] by [user.name]!</font>")
/obj/machinery/shieldwallgen/proc/cleanup(var/NSEW)
var/obj/machinery/shieldwall/F
+3 -3
View File
@@ -38,10 +38,10 @@
user << "Controls are now [src.locked ? "locked." : "unlocked."]"
updateDialog()
else
user << "\red Access denied."
user << "<font color='red'>Access denied.</font>"
else if(istype(W, /obj/item/weapon/wrench))
src.anchored = !src.anchored
src.visible_message("\blue \icon[src] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].")
src.visible_message("<font color='blue'>\icon[src] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].</font>")
if(anchored)
spawn(0)
@@ -120,7 +120,7 @@
return
if( href_list["toggle"] )
if(!active && !anchored)
usr << "\red The [src] needs to be firmly secured to the floor first."
usr << "<font color='red'>The [src] needs to be firmly secured to the floor first.</font>"
return
active = !active
if( href_list["charge_rate"] )
+3 -3
View File
@@ -59,10 +59,10 @@
user << "Controls are now [src.locked ? "locked." : "unlocked."]"
updateDialog()
else
user << "\red Access denied."
user << "<font color='red'>Access denied.</font>"
else if(istype(W, /obj/item/weapon/wrench))
src.anchored = !src.anchored
src.visible_message("\blue \icon[src] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].")
src.visible_message("<font color='blue'>\icon[src] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].</font>")
if(active)
toggle()
@@ -208,7 +208,7 @@
return
else if( href_list["toggle"] )
if (!active && !anchored)
usr << "\red The [src] needs to be firmly secured to the floor first."
usr << "<font color='red'>The [src] needs to be firmly secured to the floor first.</font>"
return
toggle()
else if( href_list["change_radius"] )