mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-24 12:36:22 +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:
@@ -99,7 +99,7 @@
|
||||
|
||||
if(istype(I, /obj/item/weapon/storage/bag/trash))
|
||||
var/obj/item/weapon/storage/bag/trash/T = I
|
||||
user << "\blue You empty the bag."
|
||||
user << "<font color='blue'>You empty the bag.</font>"
|
||||
for(var/obj/item/O in T.contents)
|
||||
T.remove_from_storage(O,src)
|
||||
T.update_icon()
|
||||
@@ -128,7 +128,7 @@
|
||||
GM.client.eye = src
|
||||
GM.forceMove(src)
|
||||
for (var/mob/C in viewers(src))
|
||||
C.show_message("\red [GM.name] has been placed in the [src] by [user].", 3)
|
||||
C.show_message("<font color='red'>[GM.name] has been placed in the [src] by [user].</font>", 3)
|
||||
qdel(G)
|
||||
usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Has placed [GM.name] ([GM.ckey]) in disposals.</font>")
|
||||
GM.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been placed in disposals by [usr.name] ([usr.ckey])</font>")
|
||||
@@ -233,7 +233,7 @@
|
||||
return
|
||||
|
||||
if(user && user.loc == src)
|
||||
usr << "\red You cannot reach the controls from inside."
|
||||
usr << "<font color='red'>You cannot reach the controls from inside.</font>"
|
||||
return
|
||||
|
||||
// Clumsy folks can only flush it.
|
||||
@@ -282,11 +282,11 @@
|
||||
|
||||
/obj/machinery/disposal/Topic(href, href_list)
|
||||
if(usr.loc == src)
|
||||
usr << "\red You cannot reach the controls from inside."
|
||||
usr << "<font color='red'>You cannot reach the controls from inside.</font>"
|
||||
return
|
||||
|
||||
if(mode==-1 && !href_list["eject"]) // only allow ejecting if mode is -1
|
||||
usr << "\red The disposal units power is disabled."
|
||||
usr << "<font color='red'>The disposal units power is disabled.</font>"
|
||||
return
|
||||
if(..())
|
||||
return
|
||||
@@ -1169,7 +1169,7 @@
|
||||
if(O.currTag)// Tag set
|
||||
sort_tag = O.currTag
|
||||
playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1)
|
||||
user << "\blue Changed tag to '[sort_tag]'."
|
||||
user << "<font color='blue'>Changed tag to '[sort_tag]'.</font>"
|
||||
updatename()
|
||||
updatedesc()
|
||||
|
||||
@@ -1237,7 +1237,7 @@
|
||||
if(O.currTag)// Tag set
|
||||
sortType = O.currTag
|
||||
playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1)
|
||||
user << "\blue Changed filter to '[sortType]'."
|
||||
user << "<font color='blue'>Changed filter to '[sortType]'.</font>"
|
||||
updatename()
|
||||
updatedesc()
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
if("Description")
|
||||
var/str = sanitize(input(usr,"Label text?","Set label",""))
|
||||
if(!str || !length(str))
|
||||
usr << "\red Invalid text."
|
||||
usr << "<font color='red'>Invalid text.</font>"
|
||||
return
|
||||
if(!examtext && !nameset)
|
||||
examtext = str
|
||||
@@ -165,7 +165,7 @@
|
||||
if("Description")
|
||||
var/str = sanitize(input(usr,"Label text?","Set label",""))
|
||||
if(!str || !length(str))
|
||||
usr << "\red Invalid text."
|
||||
usr << "<font color='red'>Invalid text.</font>"
|
||||
return
|
||||
if(!examtext && !nameset)
|
||||
examtext = str
|
||||
@@ -293,7 +293,7 @@
|
||||
else if(src.amount < 3)
|
||||
user << "<span class='warning'>You need more paper.</span>"
|
||||
else
|
||||
user << "\blue The object you are trying to wrap is unsuitable for the sorting machinery!"
|
||||
user << "<font color='blue'>The object you are trying to wrap is unsuitable for the sorting machinery!</font>"
|
||||
if (src.amount <= 0)
|
||||
new /obj/item/weapon/c_tube( src.loc )
|
||||
qdel(src)
|
||||
@@ -302,7 +302,7 @@
|
||||
|
||||
examine(mob/user)
|
||||
if(..(user, 0))
|
||||
user << "\blue There are [amount] units of package wrap left!"
|
||||
user << "<font color='blue'>There are [amount] units of package wrap left!</font>"
|
||||
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user