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
+2 -2
View File
@@ -161,8 +161,8 @@
if(is_train_head() && istype(load, /mob/living/carbon/human))
var/mob/living/carbon/human/D = load
D << "\red \b You ran over [H]!"
visible_message("<B>\red \The [src] ran over [H]!</B>")
D << "<font color='red'><B>You ran over [H]!</B></font>"
visible_message("<B><font color='red'>\The [src] ran over [H]!</B></font>")
attack_log += text("\[[time_stamp()]\] <font color='red'>ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])</font>")
msg_admin_attack("[D.name] ([D.ckey]) ran over [H.name] ([H.ckey]). (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)")
else
+11 -11
View File
@@ -49,12 +49,12 @@
if(emagged)
if(istype(A, /mob/living))
var/mob/living/M = A
visible_message("\red [src] knocks over [M]!")
visible_message("<font color='red'>[src] knocks over [M]!</font>")
M.apply_effects(5, 5) //knock people down if you hit them
M.apply_damages(22 / move_delay) // and do damage according to how fast the train is going
if(istype(load, /mob/living/carbon/human))
var/mob/living/D = load
D << "\red You hit [M]!"
D << "<font color='red'>You hit [M]!</font>"
msg_admin_attack("[D.name] ([D.ckey]) hit [M.name] ([M.ckey]) with [src]. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)")
@@ -85,7 +85,7 @@
unload(user, direction)
user << "\blue You climb down from [src]."
user << "<font color='blue'>You climb down from [src].</font>"
return 1
@@ -96,7 +96,7 @@
latch(C, user)
else
if(!load(C))
user << "\red You were unable to load [C] on [src]."
user << "<font color='red'>You were unable to load [C] on [src].</font>"
/obj/vehicle/train/attack_hand(mob/user as mob)
if(user.stat || user.restrained() || !Adjacent(user))
@@ -134,22 +134,22 @@
//Note: there is a modified version of this in code\modules\vehicles\cargo_train.dm specifically for cargo train engines
/obj/vehicle/train/proc/attach_to(obj/vehicle/train/T, mob/user)
if (get_dist(src, T) > 1)
user << "\red [src] is too far away from [T] to hitch them together."
user << "<font color='red'>[src] is too far away from [T] to hitch them together.</font>"
return
if (lead)
user << "\red [src] is already hitched to something."
user << "<font color='red'>[src] is already hitched to something.</font>"
return
if (T.tow)
user << "\red [T] is already towing something."
user << "<font color='red'>[T] is already towing something.</font>"
return
//check for cycles.
var/obj/vehicle/train/next_car = T
while (next_car)
if (next_car == src)
user << "\red That seems very silly."
user << "<font color='red'>That seems very silly.</font>"
return
next_car = next_car.lead
@@ -159,7 +159,7 @@
set_dir(lead.dir)
if(user)
user << "\blue You hitch [src] to [T]."
user << "<font color='blue'>You hitch [src] to [T].</font>"
update_stats()
@@ -167,13 +167,13 @@
//detaches the train from whatever is towing it
/obj/vehicle/train/proc/unattach(mob/user)
if (!lead)
user << "\red [src] is not hitched to anything."
user << "<font color='red'>[src] is not hitched to anything.</font>"
return
lead.tow = null
lead.update_stats()
user << "\blue You unhitch [src] from [lead]."
user << "<font color='blue'>You unhitch [src] from [lead].</font>"
lead = null
update_stats()
+2 -2
View File
@@ -94,7 +94,7 @@
if(open)
health = min(maxhealth, health+10)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
user.visible_message("\red [user] repairs [src]!","\blue You repair [src]!")
user.visible_message("<font color='red'>[user] repairs [src]!</font>","<font color='blue'> You repair [src]!</font>")
else
user << "<span class='notice'>Unable to repair with the maintenance panel closed.</span>"
else
@@ -189,7 +189,7 @@
return 1
/obj/vehicle/proc/explode()
src.visible_message("\red <B>[src] blows apart!</B>", 1)
src.visible_message("<font color='red'><B>[src] blows apart!</B></font>", 1)
var/turf/Tsec = get_turf(src)
new /obj/item/stack/rods(Tsec)