cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Macro Replacements. (#3574)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/power/breaker_box.dm
View File

@@ -34,24 +34,24 @@
/obj/machinery/power/breakerbox/examine(mob/user)
user << "Large machine with heavy duty switching circuits used for advanced grid control"
if(on)
user << "\green It seems to be online."
user << "<font color='green'>It seems to be online.</font>"
else
user << "\red It seems to be offline"
user << "<font color='red'>It seems to be offline.</font>"
/obj/machinery/power/breakerbox/attack_ai(mob/user)
if(update_locked)
user << "\red System locked. Please try again later."
user << "<font color='red'>System locked. Please try again later.</font>"
return
if(busy)
user << "\red System is busy. Please wait until current operation is finished before changing power settings."
user << "<font color='red'>System is busy. Please wait until current operation is finished before changing power settings.</font>"
return
busy = 1
user << "\green Updating power settings.."
user << "<font color='green'>Updating power settings...</font>"
if(do_after(user, 50))
set_state(!on)
user << "\green Update Completed. New setting:[on ? "on": "off"]"
user << "<font color='green'>Update Completed. New setting:[on ? "on": "off"]</font>"
update_locked = 1
spawn(600)
update_locked = 0
@@ -60,16 +60,16 @@
/obj/machinery/power/breakerbox/attack_hand(mob/user)
if(update_locked)
user << "\red System locked. Please try again later."
user << "<font color='red'>System locked. Please try again later.</font>"
return
if(busy)
user << "\red System is busy. Please wait until current operation is finished before changing power settings."
user << "<font color='red'>System is busy. Please wait until current operation is finished before changing power settings.</font>"
return
busy = 1
for(var/mob/O in viewers(user))
O.show_message(text("\red [user] started reprogramming [src]!"), 1)
O.show_message(text("<font color='red'>[user] started reprogramming [src]!</font>"), 1)
if(do_after(user, 50))
set_state(!on)