mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-22 11:36:38 +01:00
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:
@@ -141,10 +141,10 @@
|
||||
if(M.client)
|
||||
spawn(0)
|
||||
if(M.buckled)
|
||||
M << "\red Sudden acceleration presses you into \the [M.buckled]!"
|
||||
M << "<font color='red'>Sudden acceleration presses you into \the [M.buckled]!</font>"
|
||||
shake_camera(M, 3, 1)
|
||||
else
|
||||
M << "\red The floor lurches beneath you!"
|
||||
M << "<font color='red'>The floor lurches beneath you!</font>"
|
||||
shake_camera(M, 10, 1)
|
||||
if(istype(M, /mob/living/carbon))
|
||||
if(!M.buckled)
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
return
|
||||
//src.add_fingerprint(user) //shouldn't need fingerprints just for looking at it.
|
||||
if(!allowed(user))
|
||||
user << "\red Access Denied."
|
||||
user << "<font color='red'>Access Denied.</font>"
|
||||
return 1
|
||||
|
||||
ui_interact(user)
|
||||
|
||||
Reference in New Issue
Block a user