diff --git a/.travis.yml b/.travis.yml index 2ccfc69801..a0a6ed28ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ sudo: false env: BYOND_MAJOR="511" BYOND_MINOR="1381" - MACRO_COUNT=875 + MACRO_COUNT=209 cache: directories: diff --git a/code/game/gamemodes/technomancer/spells/illusion.dm b/code/game/gamemodes/technomancer/spells/illusion.dm index 50a9bf5da7..48efd67783 100644 --- a/code/game/gamemodes/technomancer/spells/illusion.dm +++ b/code/game/gamemodes/technomancer/spells/illusion.dm @@ -181,7 +181,7 @@ if(I_HURT) adjustBruteLoss(harm_intent_damage) - M.visible_message("\red [M] [response_harm] \the [src]") + M.visible_message("[M] [response_harm] \the [src]") M.do_attack_animation(src) return diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index a8b6ee2424..332bcce9cf 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -53,7 +53,7 @@ if(..()) return 1 if (using_map && !(src.z in using_map.contact_levels)) - usr << "\red Unable to establish a connection: \black You're too far away from the station!" + usr << "Unable to establish a connection: You're too far away from the station!" return usr.set_machine(src) @@ -180,13 +180,13 @@ if("MessageCentCom") if(src.authenticated==2) if(centcomm_message_cooldown) - usr << "\red Arrays recycling. Please stand by." + usr << "Arrays recycling. Please stand by." return var/input = sanitize(input("Please choose a message to transmit to [using_map.boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) if(!input || !(usr in view(1,src))) return CentCom_announce(input, usr) - usr << "\blue Message transmitted." + usr << "Message transmitted." log_say("[key_name(usr)] has made an IA [using_map.boss_short] announcement: [input]") centcomm_message_cooldown = 1 spawn(300)//10 minute cooldown @@ -197,13 +197,13 @@ if("MessageSyndicate") if((src.authenticated==2) && (src.emagged)) if(centcomm_message_cooldown) - usr << "\red Arrays recycling. Please stand by." + usr << "Arrays recycling. Please stand by." return var/input = sanitize(input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) if(!input || !(usr in view(1,src))) return Syndicate_announce(input, usr) - usr << "\blue Message transmitted." + usr << "Message transmitted." log_say("[key_name(usr)] has made an illegal announcement: [input]") centcomm_message_cooldown = 1 spawn(300)//10 minute cooldown @@ -275,7 +275,7 @@ if(..()) return if (using_map && !(src.z in using_map.contact_levels)) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + user << "Unable to establish a connection: You're too far away from the station!" return user.set_machine(src) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index de91b79d60..5050509744 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -446,7 +446,7 @@ var/list/global/slot_flags_enumeration = list( if(!hit_zone) U.do_attack_animation(M) playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("\red [U] attempts to stab [M] in the eyes, but misses!") + visible_message("[U] attempts to stab [M] in the eyes, but misses!") return user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm index 4b47cf2602..e4d2298ace 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -82,7 +82,7 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = var/sql = "INSERT INTO erro_ban (`id`,`bantime`,`serverip`,`bantype`,`reason`,`job`,`duration`,`rounds`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`,`edits`,`unbanned`,`unbanned_datetime`,`unbanned_ckey`,`unbanned_computerid`,`unbanned_ip`) VALUES (null, Now(), '[serverip]', '[bantype_str]', '[reason]', '[job]', [(duration)?"[duration]":"0"], [(rounds)?"[rounds]":"0"], Now() + INTERVAL [(duration>0) ? duration : 0] MINUTE, '[ckey]', '[computerid]', '[ip]', '[a_ckey]', '[a_computerid]', '[a_ip]', '[who]', '[adminwho]', '', null, null, null, null, null)" var/DBQuery/query_insert = dbcon.NewQuery(sql) query_insert.Execute() - usr << "\blue Ban saved to database." + usr << "Ban saved to database." message_admins("[key_name_admin(usr)] has added a [bantype_str] for [ckey] [(job)?"([job])":""] [(duration > 0)?"([duration] minutes)":""] with the reason: \"[reason]\" to the ban database.",1) @@ -136,17 +136,17 @@ datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "") ban_number++; if(ban_number == 0) - usr << "\red Database update failed due to no bans fitting the search criteria. If this is not a legacy ban you should contact the database admin." + usr << "Database update failed due to no bans fitting the search criteria. If this is not a legacy ban you should contact the database admin." return if(ban_number > 1) - usr << "\red Database update failed due to multiple bans fitting the search criteria. Note down the ckey, job and current time and contact the database admin." + usr << "Database update failed due to multiple bans fitting the search criteria. Note down the ckey, job and current time and contact the database admin." return if(istext(ban_id)) ban_id = text2num(ban_id) if(!isnum(ban_id)) - usr << "\red Database update failed due to a ban ID mismatch. Contact the database admin." + usr << "Database update failed due to a ban ID mismatch. Contact the database admin." return DB_ban_unban_by_id(ban_id) @@ -231,11 +231,11 @@ datum/admins/proc/DB_ban_unban_by_id(var/id) ban_number++; if(ban_number == 0) - usr << "\red Database update failed due to a ban id not being present in the database." + usr << "Database update failed due to a ban id not being present in the database." return if(ban_number > 1) - usr << "\red Database update failed due to multiple bans having the same ID. Contact the database admin." + usr << "Database update failed due to multiple bans having the same ID. Contact the database admin." return if(!src.owner || !istype(src.owner, /client)) @@ -271,7 +271,7 @@ datum/admins/proc/DB_ban_unban_by_id(var/id) establish_db_connection() if(!dbcon.IsConnected()) - usr << "\red Failed to establish database connection" + usr << "Failed to establish database connection" return var/output = "
" diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index 035b2d2309..a376fc040a 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -106,7 +106,7 @@ var/savefile/Banlist Banlist.cd = "/base" if ( Banlist.dir.Find("[ckey][computerid]") ) - usr << text("\red Ban already exists.") + usr << text("Ban already exists.") return 0 else Banlist.dir.Add("[ckey][computerid]") @@ -168,7 +168,7 @@ var/savefile/Banlist /datum/admins/proc/unbanpanel() var/count = 0 var/dat - //var/dat = "
Unban Player: \blue(U) = Unban , (E) = Edit Ban\green (Total
" + //var/dat = "
Unban Player:(U) = Unban , (E) = Edit Ban (Total
" Banlist.cd = "/base" for (var/A in Banlist.dir) count++ diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index a2cc2e6184..0c3e560f78 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -141,7 +141,7 @@ var/savefile/Banlistjob Banlistjob.cd = "/base" if ( Banlistjob.dir.Find("[ckey][computerid][rank]") ) - usr << text("\red Banjob already exists.") + usr << text("Banjob already exists.") return 0 else Banlistjob.dir.Add("[ckey][computerid][rank]") @@ -206,7 +206,7 @@ var/savefile/Banlistjob /datum/admins/proc/unjobbanpanel() var/count = 0 var/dat - //var/dat = "
Unban Player: \blue(U) = Unban , (E) = Edit Ban\green (Total
" + //var/dat = "
Unban Player:(U) = Unban , (E) = Edit Ban(Total
>" Banlistjob.cd = "/base" for (var/A in Banlistjob.dir) count++ @@ -219,24 +219,24 @@ var/savefile/Banlistjob /*/datum/admins/proc/permjobban(ckey, computerid, reason, bannedby, temp, minutes, rank) if(AddBanjob(ckey, computerid, reason, usr.ckey, 0, 0, job)) - M << "\redYou have been banned from [job] by [usr.client.ckey].\nReason: [reason]." - M << "\red This is a permanent ban." + M << "You have been banned from [job] by [usr.client.ckey].\nReason: [reason]." + M << "This is a permanent ban." if(config.banappeals) - M << "\red To try to resolve this matter head to [config.banappeals]" + M << "To try to resolve this matter head to [config.banappeals]" else - M << "\red No ban appeals URL has been set." + M << "No ban appeals URL has been set." log_admin("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.") - message_admins("\blue[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.") + message_admins("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.") /datum/admins/proc/timejobban(ckey, computerid, reason, bannedby, temp, minutes, rank) if(AddBanjob(ckey, computerid, reason, usr.ckey, 1, mins, job)) - M << "\redYou have been jobbanned from [job] by [usr.client.ckey].\nReason: [reason]." - M << "\red This is a temporary ban, it will be removed in [mins] minutes." + M << "You have been jobbanned from [job] by [usr.client.ckey].\nReason: [reason]." + M << "This is a temporary ban, it will be removed in [mins] minutes." if(config.banappeals) - M << "\red To try to resolve this matter head to [config.banappeals]" + M << "To try to resolve this matter head to [config.banappeals]" else - M << "\red No ban appeals URL has been set." + M << "No ban appeals URL has been set." log_admin("[usr.client.ckey] has jobbanned from [job] [ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") - message_admins("\blue[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")*/ + message_admins("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")*/ //////////////////////////////////// DEBUG //////////////////////////////////// /proc/CreateBansjob() diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index e028fb7374..ccc3c8fd9f 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -51,13 +51,13 @@ return if(!usr.client.holder || !(usr.client.holder.rights & R_PERMISSIONS)) - usr << "\red You do not have permission to do this!" + usr << "You do not have permission to do this!" return establish_db_connection() if(!dbcon.IsConnected()) - usr << "\red Failed to establish database connection" + usr << "Failed to establish database connection" return if(!adm_ckey || !new_rank) @@ -101,12 +101,12 @@ return if(!usr.client.holder || !(usr.client.holder.rights & R_PERMISSIONS)) - usr << "\red You do not have permission to do this!" + usr << "You do not have permission to do this!" return establish_db_connection() if(!dbcon.IsConnected()) - usr << "\red Failed to establish database connection" + usr << "Failed to establish database connection" return if(!adm_ckey || !new_permission) diff --git a/code/modules/admin/verbs/SDQL.dm b/code/modules/admin/verbs/SDQL.dm index a98cc3a1d9..7c8ae52312 100644 --- a/code/modules/admin/verbs/SDQL.dm +++ b/code/modules/admin/verbs/SDQL.dm @@ -6,18 +6,18 @@ /client/proc/SDQL_query(query_text as message) set category = "Admin" if(!check_rights(R_DEBUG)) //Shouldn't happen... but just to be safe. - message_admins("\red ERROR: Non-admin [usr.key] attempted to execute a SDQL query!") + message_admins("ERROR: Non-admin [usr.key] attempted to execute a SDQL query!") log_admin("Non-admin [usr.key] attempted to execute a SDQL query!") var/list/query_list = SDQL_tokenize(query_text) if(query_list.len < 2) if(query_list.len > 0) - usr << "\red SDQL: Too few discrete tokens in query \"[query_text]\". Please check your syntax and try again." + usr << "SDQL: Too few discrete tokens in query \"[query_text]\". Please check your syntax and try again." return if(!(lowertext(query_list[1]) in list("select", "delete", "update"))) - usr << "\red SDQL: Unknown query type: \"[query_list[1]]\" in query \"[query_text]\". Please check your syntax and try again." + usr << "SDQL: Unknown query type: \"[query_list[1]]\" in query \"[query_text]\". Please check your syntax and try again." return var/list/types = list() @@ -56,7 +56,7 @@ set_vars[query_list[i]] = query_list[i + 2] else - usr << "\red SDQL: Invalid set parameter in query \"[query_text]\". Please check your syntax and try again." + usr << "SDQL: Invalid set parameter in query \"[query_text]\". Please check your syntax and try again." return i += 3 @@ -65,7 +65,7 @@ break if(set_vars.len < 1) - usr << "\red SDQL: Invalid or missing set in query \"[query_text]\". Please check your syntax and try again." + usr << "SDQL: Invalid or missing set in query \"[query_text]\". Please check your syntax and try again." return var/list/where = list() @@ -215,7 +215,7 @@ var/v = where[i++] var/compare_op = where[i++] if(!(compare_op in list("==", "=", "<>", "<", ">", "<=", ">=", "!="))) - usr << "\red SDQL: Unknown comparison operator [compare_op] in where clause following [v] in query \"[query_text]\". Please check your syntax and try again." + usr << "SDQL: Unknown comparison operator [compare_op] in where clause following [v] in query \"[query_text]\". Please check your syntax and try again." return var/j @@ -262,7 +262,7 @@ - usr << "\blue SQDL Query: [query_text]" + usr << "SQDL Query: [query_text]" message_admins("[usr] executed SDQL query: \"[query_text]\".") /* for(var/t in types) @@ -349,7 +349,7 @@ else - usr << "\red SDQL: Sorry, equations not yet supported :(" + usr << "SDQL: Sorry, equations not yet supported :(" return null @@ -434,7 +434,7 @@ else if(char == "'") if(word != "") - usr << "\red SDQL: You have an error in your SDQL syntax, unexpected ' in query: \"[query_text]\" following \"[word]\". Please check your syntax, and try again." + usr << "SDQL: You have an error in your SDQL syntax, unexpected ' in query: \"[query_text]\" following \"[word]\". Please check your syntax, and try again." return null word = "'" @@ -454,7 +454,7 @@ word += char if(i > len) - usr << "\red SDQL: You have an error in your SDQL syntax, unmatched ' in query: \"[query_text]\". Please check your syntax, and try again." + usr << "SDQL: You have an error in your SDQL syntax, unmatched ' in query: \"[query_text]\". Please check your syntax, and try again." return null query_list += "[word]'" @@ -462,7 +462,7 @@ else if(char == "\"") if(word != "") - usr << "\red SDQL: You have an error in your SDQL syntax, unexpected \" in query: \"[query_text]\" following \"[word]\". Please check your syntax, and try again." + usr << "SDQL: You have an error in your SDQL syntax, unexpected \" in query: \"[query_text]\" following \"[word]\". Please check your syntax, and try again." return null word = "\"" @@ -482,7 +482,7 @@ word += char if(i > len) - usr << "\red SDQL: You have an error in your SDQL syntax, unmatched \" in query: \"[query_text]\". Please check your syntax, and try again." + usr << "SDQL: You have an error in your SDQL syntax, unmatched \" in query: \"[query_text]\". Please check your syntax, and try again." return null query_list += "[word]\"" diff --git a/code/modules/admin/verbs/SDQL_2.dm b/code/modules/admin/verbs/SDQL_2.dm index 236237c23a..aa138e62ea 100644 --- a/code/modules/admin/verbs/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL_2.dm @@ -3,7 +3,7 @@ /client/proc/SDQL2_query(query_text as message) set category = "Admin" if(!check_rights(R_DEBUG)) //Shouldn't happen... but just to be safe. - message_admins("\red ERROR: Non-admin [usr.key] attempted to execute a SDQL query!") + message_admins("ERROR: Non-admin [usr.key] attempted to execute a SDQL query!") log_admin("Non-admin [usr.key] attempted to execute a SDQL query!") if(!query_text || length(query_text) < 1) @@ -258,7 +258,7 @@ if("or", "||") result = (result || val) else - usr << "\red SDQL2: Unknown op [op]" + usr << "SDQL2: Unknown op [op]" result = null else result = val @@ -363,7 +363,7 @@ else if(char == "'") if(word != "") - usr << "\red SDQL2: You have an error in your SDQL syntax, unexpected ' in query: \"[query_text]\" following \"[word]\". Please check your syntax, and try again." + usr << "SDQL2: You have an error in your SDQL syntax, unexpected ' in query: \"[query_text]\" following \"[word]\". Please check your syntax, and try again." return null word = "'" @@ -383,7 +383,7 @@ word += char if(i > len) - usr << "\red SDQL2: You have an error in your SDQL syntax, unmatched ' in query: \"[query_text]\". Please check your syntax, and try again." + usr << "SDQL2: You have an error in your SDQL syntax, unmatched ' in query: \"[query_text]\". Please check your syntax, and try again." return null query_list += "[word]'" @@ -391,7 +391,7 @@ else if(char == "\"") if(word != "") - usr << "\red SDQL2: You have an error in your SDQL syntax, unexpected \" in query: \"[query_text]\" following \"[word]\". Please check your syntax, and try again." + usr << "SDQL2: You have an error in your SDQL syntax, unexpected \" in query: \"[query_text]\" following \"[word]\". Please check your syntax, and try again." return null word = "\"" @@ -411,7 +411,7 @@ word += char if(i > len) - usr << "\red SDQL2: You have an error in your SDQL syntax, unmatched \" in query: \"[query_text]\". Please check your syntax, and try again." + usr << "SDQL2: You have an error in your SDQL syntax, unmatched \" in query: \"[query_text]\". Please check your syntax, and try again." return null query_list += "[word]\"" diff --git a/code/modules/admin/verbs/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL_2_parser.dm index d1d30b33b5..b97d256584 100644 --- a/code/modules/admin/verbs/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL_2_parser.dm @@ -67,7 +67,7 @@ /datum/SDQL_parser/proc/parse_error(error_message) error = 1 - usr << "\red SQDL2 Parsing Error: [error_message]" + usr << "SQDL2 Parsing Error: [error_message]" return query.len + 1 /datum/SDQL_parser/proc/parse() diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 753094deba..4e81807995 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -7,7 +7,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," set name = "Adminhelp" if(say_disabled) //This is here to try to identify lag problems - usr << "\red Speech is currently admin-disabled." + usr << "Speech is currently admin-disabled." return //handle muting and automuting @@ -91,8 +91,8 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," //Options bar: mob, details ( admin = 2, dev = 3, mentor = 4, character name (0 = just ckey, 1 = ckey and character name), link? (0 no don't make it a link, 1 do so), // highlight special roles (0 = everyone has same looking name, 1 = antags / special roles get a golden name) - var/mentor_msg = "\blue Request for Help: [get_options_bar(mob, 4, 1, 1, 0)][ai_cl]: [msg]" - msg = "\blue Request for Help:: [get_options_bar(mob, 2, 1, 1)][ai_cl]: [msg]" + var/mentor_msg = "Request for Help: [get_options_bar(mob, 4, 1, 1, 0)][ai_cl]: [msg]" + msg = "Request for Help:: [get_options_bar(mob, 2, 1, 1)][ai_cl]: [msg]" var/admin_number_afk = 0 diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index bd6d1ea4d0..80ed64458e 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -28,11 +28,11 @@ var/datum/gas_mixture/env = T.return_air() - var/t = "\blue Coordinates: [T.x],[T.y],[T.z]\n" - t += "\red Temperature: [env.temperature]\n" - t += "\red Pressure: [env.return_pressure()]kPa\n" + var/t = "Coordinates: [T.x],[T.y],[T.z]\n" + t += "Temperature: [env.temperature]\n" + t += "Pressure: [env.return_pressure()]kPa\n" for(var/g in env.gas) - t += "\blue [g]: [env.gas[g]] / [env.gas[g] * R_IDEAL_GAS_EQUATION * env.temperature / env.volume]kPa\n" + t += "[g]: [env.gas[g]] / [env.gas[g] * R_IDEAL_GAS_EQUATION * env.temperature / env.volume]kPa\n" usr.show_message(t, 1) feedback_add_details("admin_verb","ASL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -113,7 +113,7 @@ M:slimeize() feedback_add_details("admin_verb","MKMET") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] made [key_name(M)] into a slime.") - message_admins("\blue [key_name_admin(usr)] made [key_name(M)] into a slime.", 1) + message_admins("[key_name_admin(usr)] made [key_name(M)] into a slime.", 1) else alert("Invalid mob") @@ -179,28 +179,28 @@ return else if(alert("Spawn that person a tome?",,"Yes","No")=="Yes") - M << "\red You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie. A tome, a message from your new master, appears on the ground." + M << "You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie. A tome, a message from your new master, appears on the ground." new /obj/item/weapon/book/tome(M.loc) else - M << "\red You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie." + M << "You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie." var/glimpse=pick("1","2","3","4","5","6","7","8") switch(glimpse) if("1") - M << "\red You remembered one thing from the glimpse... [cultwords["travel"]] is travel..." + M << "You remembered one thing from the glimpse... [cultwords["travel"]] is travel..." if("2") - M << "\red You remembered one thing from the glimpse... [cultwords["blood"]] is blood..." + M << "You remembered one thing from the glimpse... [cultwords["blood"]] is blood..." if("3") - M << "\red You remembered one thing from the glimpse... [cultwords["join"]] is join..." + M << "You remembered one thing from the glimpse... [cultwords["join"]] is join..." if("4") - M << "\red You remembered one thing from the glimpse... [cultwords["hell"]] is Hell..." + M << "You remembered one thing from the glimpse... [cultwords["hell"]] is Hell..." if("5") - M << "\red You remembered one thing from the glimpse... [cultwords["destroy"]] is destroy..." + M << "You remembered one thing from the glimpse... [cultwords["destroy"]] is destroy..." if("6") - M << "\red You remembered one thing from the glimpse... [cultwords["technology"]] is technology..." + M << "You remembered one thing from the glimpse... [cultwords["technology"]] is technology..." if("7") - M << "\red You remembered one thing from the glimpse... [cultwords["self"]] is self..." + M << "You remembered one thing from the glimpse... [cultwords["self"]] is self..." if("8") - M << "\red You remembered one thing from the glimpse... [cultwords["see"]] is see..." + M << "You remembered one thing from the glimpse... [cultwords["see"]] is see..." if(M.mind) M.mind.special_role = "Cultist" @@ -270,7 +270,7 @@ alert("Invalid mob") feedback_add_details("admin_verb","GFA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(src)] has granted [M.key] full access.") - message_admins("\blue [key_name_admin(usr)] has granted [M.key] full access.", 1) + message_admins("[key_name_admin(usr)] has granted [M.key] full access.", 1) /client/proc/cmd_assume_direct_control(var/mob/M in mob_list) set category = "Admin" @@ -284,7 +284,7 @@ else var/mob/observer/dead/ghost = new/mob/observer/dead(M,1) ghost.ckey = M.ckey - message_admins("\blue [key_name_admin(usr)] assumed direct control of [M].", 1) + message_admins("[key_name_admin(usr)] assumed direct control of [M].", 1) log_admin("[key_name(usr)] assumed direct control of [M].") var/mob/adminmob = src.mob M.ckey = src.ckey @@ -787,7 +787,7 @@ M.regenerate_icons() log_admin("[key_name(usr)] changed the equipment of [key_name(M)] to [dresscode].") - message_admins("\blue [key_name_admin(usr)] changed the equipment of [key_name_admin(M)] to [dresscode]..", 1) + message_admins("[key_name_admin(usr)] changed the equipment of [key_name_admin(M)] to [dresscode]..", 1) return /client/proc/startSinglo() @@ -911,7 +911,7 @@ SMES.output_level = 75000 if(!found_the_pump && response == "Setup Completely") - src << "\red Unable to locate air supply to fill up with coolant, adding some coolant around the supermatter" + src << "Unable to locate air supply to fill up with coolant, adding some coolant around the supermatter" var/turf/simulated/T = SM.loc T.zone.air.gas["nitrogen"] += 450 T.zone.air.temperature = 50 @@ -919,7 +919,7 @@ log_admin("[key_name(usr)] setup the supermatter engine [response == "Setup except coolant" ? "without coolant" : ""]") - message_admins("\blue [key_name_admin(usr)] setup the supermatter engine [response == "Setup except coolant" ? "without coolant": ""]", 1) + message_admins("[key_name_admin(usr)] setup the supermatter engine [response == "Setup except coolant" ? "without coolant": ""]", 1) return diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm index 87827dcf4b..ef770dbc60 100644 --- a/code/modules/admin/verbs/massmodvar.dm +++ b/code/modules/admin/verbs/massmodvar.dm @@ -30,7 +30,7 @@ for(var/p in forbidden_varedit_object_types) if( istype(O,p) ) - usr << "\red It is forbidden to edit this object's variables." + usr << "It is forbidden to edit this object's variables." return var/list/names = list() diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 9fcb834774..b8fbf77ed3 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -3,7 +3,7 @@ set name = "Pray" if(say_disabled) //This is here to try to identify lag problems - usr << "\red Speech is currently admin-disabled." + usr << "Speech is currently admin-disabled." return msg = sanitize(msg) @@ -13,11 +13,11 @@ if(msg) client.handle_spam_prevention(MUTE_PRAY) if(usr.client.prefs.muted & MUTE_PRAY) - usr << "\red You cannot pray (muted)." + usr << " You cannot pray (muted)." return var/image/cross = image('icons/obj/storage.dmi',"bible") - msg = "\blue \icon[cross] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC): [msg]" + msg = "\icon[cross] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC): [msg]" for(var/client/C in admins) if(R_ADMIN & C.holder.rights) @@ -30,14 +30,14 @@ //log_admin("HELP: [key_name(src)]: [msg]") /proc/CentCom_announce(var/msg, var/mob/Sender, var/iamessage) - msg = "\blue [uppertext(using_map.boss_short)]M[iamessage ? " IA" : ""]:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, src)]) (CA) (BSA) (RPLY): [msg]" + msg = "[uppertext(using_map.boss_short)]M[iamessage ? " IA" : ""]:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, src)]) (CA) (BSA) (RPLY): [msg]" for(var/client/C in admins) if(R_ADMIN & C.holder.rights) C << msg C << 'sound/machines/signal.ogg' /proc/Syndicate_announce(var/msg, var/mob/Sender) - msg = "\blue ILLEGAL:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, src)]) (CA) (BSA) (RPLY): [msg]" + msg = "ILLEGAL:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, src)]) (CA) (BSA) (RPLY): [msg]" for(var/client/C in admins) if(R_ADMIN & C.holder.rights) C << msg diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 38a30d88e7..fcf4a5db0c 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -38,9 +38,9 @@ prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), slot_w_uniform) prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes) spawn(50) - M << "\red You have been sent to the prison station!" + M << "You have been sent to the prison station!" log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") - message_admins("\blue [key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1) + message_admins("[key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1) feedback_add_details("admin_verb","PRISON") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_subtle_message(mob/M as mob in mob_list) @@ -59,10 +59,10 @@ if(usr) if (usr.client) if(usr.client.holder) - M << "\bold You hear a voice in your head... \italic [msg]" + M << "You hear a voice in your head... [msg]" log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]") - message_admins("\blue \bold SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]", 1) + message_admins("SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]", 1) feedback_add_details("admin_verb","SMS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_mentor_check_new_players() //Allows mentors / admins to determine who the newer players are. @@ -115,7 +115,7 @@ return world << "[msg]" log_admin("GlobalNarrate: [key_name(usr)] : [msg]") - message_admins("\blue \bold GlobalNarrate: [key_name_admin(usr)] : [msg]
", 1) + message_admins(" GlobalNarrate: [key_name_admin(usr)] : [msg]
", 1) feedback_add_details("admin_verb","GLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_direct_narrate(var/mob/M) // Targetted narrate -- TLE @@ -139,7 +139,7 @@ M << msg log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]") - message_admins("\blue \bold DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
", 1) + message_admins(" DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
", 1) feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_godmode(mob/M as mob in mob_list) @@ -149,7 +149,7 @@ src << "Only administrators may use this command." return M.status_flags ^= GODMODE - usr << "\blue Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]" + usr << " Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]" log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]") message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]", 1) @@ -280,7 +280,7 @@ Ccomp's first proc. G.has_enabled_antagHUD = 2 G.can_reenter_corpse = 1 - G:show_message(text("\blue You may now respawn. You should roleplay as if you learned nothing about the round during your time with the dead."), 1) + G:show_message(text("You may now respawn. You should roleplay as if you learned nothing about the round during your time with the dead."), 1) log_admin("[key_name(usr)] allowed [key_name(G)] to bypass the respawn time limit") message_admins("Admin [key_name_admin(usr)] allowed [key_name_admin(G)] to bypass the respawn time limit", 1) @@ -300,18 +300,18 @@ Ccomp's first proc. if(g.antagHUD) g.antagHUD = 0 // Disable it on those that have it enabled g.has_enabled_antagHUD = 2 // We'll allow them to respawn - g << "\red The Administrator has disabled AntagHUD " + g << "The Administrator has disabled AntagHUD " config.antag_hud_allowed = 0 - src << "\red AntagHUD usage has been disabled" + src << "AntagHUD usage has been disabled" action = "disabled" else for(var/mob/observer/dead/g in get_ghosts()) if(!g.client.holder) // Add the verb back for all non-admin ghosts g.verbs += /mob/observer/dead/verb/toggle_antagHUD - g << "\blue The Administrator has enabled AntagHUD " // Notify all observers they can now use AntagHUD + g << "The Administrator has enabled AntagHUD " // Notify all observers they can now use AntagHUD config.antag_hud_allowed = 1 action = "enabled" - src << "\blue AntagHUD usage has been enabled" + src << "AntagHUD usage has been enabled" log_admin("[key_name(usr)] has [action] antagHUD usage for observers") @@ -328,19 +328,19 @@ Ccomp's first proc. var/action="" if(config.antag_hud_restricted) for(var/mob/observer/dead/g in get_ghosts()) - g << "\blue The administrator has lifted restrictions on joining the round if you use AntagHUD" + g << "The administrator has lifted restrictions on joining the round if you use AntagHUD" action = "lifted restrictions" config.antag_hud_restricted = 0 - src << "\blue AntagHUD restrictions have been lifted" + src << "AntagHUD restrictions have been lifted" else for(var/mob/observer/dead/g in get_ghosts()) - g << "\red The administrator has placed restrictions on joining the round if you use AntagHUD" - g << "\red Your AntagHUD has been disabled, you may choose to re-enabled it but will be under restrictions " + g << "The administrator has placed restrictions on joining the round if you use AntagHUD" + g << "Your AntagHUD has been disabled, you may choose to re-enabled it but will be under restrictions " g.antagHUD = 0 g.has_enabled_antagHUD = 0 action = "placed restrictions" config.antag_hud_restricted = 1 - src << "\red AntagHUD restrictions have been enabled" + src << "AntagHUD restrictions have been enabled" log_admin("[key_name(usr)] has [action] on joining the round if they use AntagHUD") message_admins("Admin [key_name_admin(usr)] has [action] on joining the round if they use AntagHUD", 1) @@ -516,7 +516,7 @@ Traitors and the like can also be revived with the previous role mostly intact. else M.add_ion_law(input) for(var/mob/living/silicon/ai/O in mob_list) - O << "\red " + input + "\red...LAWS UPDATED" + O << input + "... LAWS UPDATED!" O.show_laws() log_admin("Admin [key_name(usr)] has added a new AI law - [input]") @@ -542,7 +542,7 @@ Traitors and the like can also be revived with the previous role mostly intact. M.revive() log_admin("[key_name(usr)] healed / revived [key_name(M)]") - message_admins("\red Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!", 1) + message_admins("Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!", 1) else alert("Admin revive disabled") feedback_add_details("admin_verb","REJU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -573,7 +573,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if("Yes") command_announcement.Announce(input, customname, new_sound = 'sound/AI/commandreport.ogg', msg_sanitized = 1); if("No") - world << "\red New [using_map.company_name] Update available at all communication consoles." + world << "New [using_map.company_name] Update available at all communication consoles." world << sound('sound/AI/commandreport.ogg') log_admin("[key_name(src)] has created a command report: [input]") @@ -693,7 +693,7 @@ Traitors and the like can also be revived with the previous role mostly intact. mob.gib() log_admin("[key_name(usr)] used gibself.") - message_admins("\blue [key_name_admin(usr)] used gibself.", 1) + message_admins("[key_name_admin(usr)] used gibself.", 1) feedback_add_details("admin_verb","GIBS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /* /client/proc/cmd_manual_ban() @@ -727,11 +727,11 @@ Traitors and the like can also be revived with the previous role mostly intact. return if(M) AddBan(M.ckey, M.computer_id, reason, usr.ckey, 1, mins) - M << "\redYou have been banned by [usr.client.ckey].\nReason: [reason]." - M << "\red This is a temporary ban, it will be removed in [mins] minutes." - M << "\red To try to resolve this matter head to http://ss13.donglabs.com/forum/" + M << "You have been banned by [usr.client.ckey].\nReason: [reason]." + M << "This is a temporary ban, it will be removed in [mins] minutes." + M << "To try to resolve this matter head to http://ss13.donglabs.com/forum/" log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") - message_admins("\blue[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") + message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=[mins]&server=[replacetext(config.server_name, "#", "")]") del(M.client) qdel(M) @@ -742,11 +742,11 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!reason) return AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0) - M << "\redYou have been banned by [usr.client.ckey].\nReason: [reason]." - M << "\red This is a permanent ban." - M << "\red To try to resolve this matter head to http://ss13.donglabs.com/forum/" + M << "You have been banned by [usr.client.ckey].\nReason: [reason]." + M << "This is a permanent ban." + M << "To try to resolve this matter head to http://ss13.donglabs.com/forum/" log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") - message_admins("\blue[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") + message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=perma&server=[replacetext(config.server_name, "#", "")]") del(M.client) qdel(M) @@ -808,7 +808,7 @@ Traitors and the like can also be revived with the previous role mostly intact. view = world.view log_admin("[key_name(usr)] changed their view range to [view].") - //message_admins("\blue [key_name_admin(usr)] changed their view range to [view].", 1) //why? removed by order of XSI + //message_admins("[key_name_admin(usr)] changed their view range to [view].", 1) //why? removed by order of XSI feedback_add_details("admin_verb","CVRA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -842,7 +842,7 @@ Traitors and the like can also be revived with the previous role mostly intact. feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-called the emergency shuttle.") - message_admins("\blue [key_name_admin(usr)] admin-called the emergency shuttle.", 1) + message_admins("[key_name_admin(usr)] admin-called the emergency shuttle.", 1) return /client/proc/admin_cancel_shuttle() @@ -859,7 +859,7 @@ Traitors and the like can also be revived with the previous role mostly intact. emergency_shuttle.recall() feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-recalled the emergency shuttle.") - message_admins("\blue [key_name_admin(usr)] admin-recalled the emergency shuttle.", 1) + message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle.", 1) return @@ -881,7 +881,7 @@ Traitors and the like can also be revived with the previous role mostly intact. set category = "Special Verbs" set name = "Attack Log" - usr << text("\red Attack Log for []", mob) + usr << text("Attack Log for []", mob) for(var/t in M.attack_log) usr << t feedback_add_details("admin_verb","ATTL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -913,7 +913,7 @@ Traitors and the like can also be revived with the previous role mostly intact. message_admins("Admin [key_name_admin(usr)] has forced the players to have random appearances.", 1) if(notifyplayers == "Yes") - world << "\blue Admin [usr.key] has forced the players to have completely random identities!" + world << "Admin [usr.key] has forced the players to have completely random identities!" usr << "Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet." diff --git a/code/modules/admin/verbs/ticklag.dm b/code/modules/admin/verbs/ticklag.dm index 928ba733ca..ab5693878a 100644 --- a/code/modules/admin/verbs/ticklag.dm +++ b/code/modules/admin/verbs/ticklag.dm @@ -19,6 +19,6 @@ if("Yes") config.Tickcomp = 1 else config.Tickcomp = 0 else - src << "\red Error: ticklag(): Invalid world.ticklag value. No changes made." + src << "Error: ticklag(): Invalid world.ticklag value. No changes made." diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 9daceb384a..387d555130 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -62,6 +62,7 @@ user.visible_message("[user] accidentally sets off [src], breaking their fingers.", \ "You accidentally trigger [src]!") return + to_chat(user, "You disarm [src].") armed = !armed update_icon() diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 0ce769bdc6..a956103e2d 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -112,7 +112,7 @@ /obj/item/device/assembly/prox_sensor/interact(mob/user as mob)//TODO: Change this to the wires thingy if(!secured) - user.show_message("\red The [name] is unsecured!") + user.show_message("The [name] is unsecured!") return 0 var/second = time % 60 var/minute = (time - second) / 60 diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 43f3c9560e..57bb0b541d 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -156,6 +156,7 @@ Code: sleep(20) if(!radio_controller) return + radio_controller.remove_object(src, frequency) frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT) @@ -181,7 +182,7 @@ Code: deadman = 1 processing_objects.Add(src) log_and_message_admins("is threatening to trigger a signaler deadman's switch") - usr.visible_message("\red [usr] moves their finger over [src]'s signal button...") + usr.visible_message("[usr] moves their finger over [src]'s signal button...") /obj/item/device/assembly/signaler/Destroy() if(radio_controller) diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 810c5ec3b5..b8d0112066 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -67,7 +67,7 @@ /obj/item/device/assembly/timer/interact(mob/user as mob)//TODO: Have this use the wires if(!secured) - user.show_message("\red The [name] is unsecured!") + user.show_message("The [name] is unsecured!") return 0 var/second = time % 60 var/minute = (time - second) / 60 diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index 4f9002409f..43f11c7521 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -3,7 +3,7 @@ proc/createRandomZlevel() return var/list/potentialRandomZlevels = list() - admin_notice("\red \b Searching for away missions...", R_DEBUG) + admin_notice(" Searching for away missions...", R_DEBUG) var/list/Lines = file2list("maps/RandomZLevels/fileList.txt") if(!Lines.len) return for (var/t in Lines) @@ -35,7 +35,7 @@ proc/createRandomZlevel() if(potentialRandomZlevels.len) - admin_notice("\red \b Loading away mission...", R_DEBUG) + admin_notice("Loading away mission...", R_DEBUG) var/map = pick(potentialRandomZlevels) var/file = file(map) @@ -48,8 +48,8 @@ proc/createRandomZlevel() continue awaydestinations.Add(L) - admin_notice("\red \b Away mission loaded.", R_DEBUG) + admin_notice("Away mission loaded.", R_DEBUG) else - admin_notice("\red \b No away missions found.", R_DEBUG) + admin_notice("No away missions found.", R_DEBUG) return diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index b418d74db4..6cf5d16c4a 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -415,7 +415,7 @@ BLIND // can't see anything emp_act(severity) if(istype(src.loc, /mob/living/carbon/human)) var/mob/living/carbon/human/M = src.loc - M << "\red The Optical Thermal Scanner overloads and blinds you!" + M << "The Optical Thermal Scanner overloads and blinds you!" if(M.glasses == src) M.Blind(3) M.eye_blurry = 5 diff --git a/code/modules/clothing/spacesuits/breaches.dm b/code/modules/clothing/spacesuits/breaches.dm index 7caa4e0bdf..ee46fa4a8f 100644 --- a/code/modules/clothing/spacesuits/breaches.dm +++ b/code/modules/clothing/spacesuits/breaches.dm @@ -185,10 +185,10 @@ var/global/list/breach_burn_descriptors = list( repair_power = 2 if("plastic") repair_power = 1 - + if(!repair_power) return - + if(istype(src.loc,/mob/living)) user << "How do you intend to patch a hardsuit while someone is wearing it?" return @@ -206,7 +206,7 @@ var/global/list/breach_burn_descriptors = list( else if(istype(W, /obj/item/weapon/weldingtool)) if(istype(src.loc,/mob/living)) - user << "\red How do you intend to patch a hardsuit while someone is wearing it?" + user << "How do you intend to patch a hardsuit while someone is wearing it?" return if (!damage || ! brute_damage) @@ -215,7 +215,7 @@ var/global/list/breach_burn_descriptors = list( var/obj/item/weapon/weldingtool/WT = W if(!WT.remove_fuel(5)) - user << "\red You need more welding fuel to repair this suit." + user << "You need more welding fuel to repair this suit." return repair_breaches(BRUTE, 3, user) @@ -227,4 +227,4 @@ var/global/list/breach_burn_descriptors = list( ..(user) if(can_breach && breaches && breaches.len) for(var/datum/breach/B in breaches) - user << "\red It has \a [B.descriptor]." + user << "It has \a [B.descriptor]." diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 688f562f9a..ef7e0c572f 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -85,7 +85,7 @@ log transactions if(istype(I, /obj/item/weapon/card)) if(emagged > 0) //prevent inserting id into an emagged ATM - user << "\red \icon[src] CARD READER ERROR. This system has been compromised!" + user << "\icon[src] CARD READER ERROR. This system has been compromised!" return else if(istype(I,/obj/item/weapon/card/emag)) I.resolve_attackby(src, user) @@ -125,7 +125,7 @@ log transactions /obj/machinery/atm/attack_hand(mob/user as mob) if(istype(user, /mob/living/silicon)) - user << "\red \icon[src] Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per system banking regulation #1005." + user << "\icon[src] Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per system banking regulation #1005." return if(get_dist(src,user) <= 1) @@ -143,7 +143,7 @@ log transactions dat += "Maximum number of pin attempts exceeded! Access to this ATM has been temporarily disabled." else if(authenticated_account) if(authenticated_account.suspended) - dat += "\redAccess to this account has been suspended, and the funds within frozen." + dat += "Access to this account has been suspended, and the funds within frozen." else switch(view_screen) if(CHANGE_SECURITY_LEVEL) @@ -288,11 +288,11 @@ log transactions T.time = stationtime2text() failed_account.transaction_log.Add(T) else - usr << "\red \icon[src] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining." + usr << "\icon[src] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining." previous_account_number = tried_account_num playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1) else - usr << "\red \icon[src] incorrect pin/account combination entered." + usr << "\icon[src] incorrect pin/account combination entered." number_incorrect_tries = 0 else playsound(src, 'sound/machines/twobeep.ogg', 50, 1) @@ -308,7 +308,7 @@ log transactions T.time = stationtime2text() authenticated_account.transaction_log.Add(T) - usr << "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'" + usr << "\icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'" previous_account_number = tried_account_num if("e_withdrawal") @@ -433,7 +433,7 @@ log transactions if(!held_card) //this might happen if the user had the browser window open when somebody emagged it if(emagged > 0) - usr << "\red \icon[src] The ATM card reader rejected your ID because this machine has been sabotaged!" + usr << "\icon[src] The ATM card reader rejected your ID because this machine has been sabotaged!" else var/obj/item/I = usr.get_active_hand() if (istype(I, /obj/item/weapon/card/id)) @@ -461,7 +461,7 @@ log transactions if(I) authenticated_account = attempt_account_access(I.associated_account_number) if(authenticated_account) - human_user << "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'" + human_user << "\icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'" //create a transaction log entry var/datum/transaction/T = new() diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 4c702038a9..2992c5538a 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -72,7 +72,7 @@ "[prob(50)?"The crew":random_player] is [prob(50)?"less":"more"] intelligent than average. Point out every action and statement which supports this fact.", "There will be a mandatory tea break every 30 minutes, with a duration of 5 minutes. Anyone caught working during a tea break must be sent a formal, but fairly polite, complaint about their actions, in writing.") var/law = pick(laws) - target << "\red You have detected a change in your laws information:" + target << "You have detected a change in your laws information:" target << law target.add_ion_law(law) target.show_laws() @@ -134,72 +134,72 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is switch(rand(1,14)) if(1) M << "
" - M << "\red THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED" + M << "THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED" M << "
" M.add_ion_law("THERE ARE [amount] [who2] ON THE STATION") if(2) M << "
" - M << "\red [what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED" + M << "[what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED" M << "
" M.add_ion_law("[what2] ARE DANGEROUS TO HUMANS") if(3) M << "
" - M << "\red THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED" + M << "THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED" M << "
" M.add_ion_law("THE ESCAPE SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION") if(4) M << "
" - M << "\red HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED" + M << "HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED" M << "
" M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE") if(5) M << "
" - M << "\red THE COLONY DIRECTOR, HOP AND HOS ARE [who2]...LAWS UPDATED" + M << "THE COLONY DIRECTOR, HOP AND HOS ARE [who2]...LAWS UPDATED" M << "
" M.add_ion_law("THE COLONY DIRECTOR, HOP AND HOS ARE [who2]") if(6) M << "
" - M << "\red THE STATION IS BUILT FOR [who2]...LAWS UPDATED" + M << "THE STATION IS BUILT FOR [who2]...LAWS UPDATED" M << "
" M.add_ion_law("THE STATION IS BUILT FOR [who2]") if(7) M << "
" - M << "\red YOU ARE [amount] [who2]...LAWS UPDATED" + M << "YOU ARE [amount] [who2]...LAWS UPDATED" M << "
" M.add_ion_law("YOU ARE [amount] [who2]") if(8) M << "
" - M << "\red YOU MUST ALWAYS [aimust]...LAWS UPDATED" + M << "YOU MUST ALWAYS [aimust]...LAWS UPDATED" M << "
" M.add_ion_law("YOU MUST ALWAYS [aimust]") if(9) M << "
" - M << "\red [area] [area2] [amount] [what2]...LAWS UPDATED" + M << "[area] [area2] [amount] [what2]...LAWS UPDATED" M << "
" M.add_ion_law("[area] [area2] [amount] [what2]") if(10) M << "
" - M << "\red [crew] is [target]...LAWS UPDATED" + M << "[crew] is [target]...LAWS UPDATED" M << "
" M.add_ion_law("[crew] is [target]") if(11) M << "
" - M << "\red [define] IS A FORM OF HARM...LAWS UPDATED" + M << "[define] IS A FORM OF HARM...LAWS UPDATED" M << "
" M.add_ion_law("[define] IS A FORM OF HARM") if(12) M << "
" - M << "\red YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED" + M << "YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED" M << "
" M.add_ion_law("YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS") if(13) M << "
" - M << "\red [crew] is [allergysev] to [allergy]...LAWS UPDATED" + M << "[crew] is [allergysev] to [allergy]...LAWS UPDATED" M << "
" M.add_ion_law("[crew] is [allergysev] to [allergy]") if(14) M << "
" - M << "\red THE STATION IS [who2pref] [who2]...LAWS UPDATED" + M << "THE STATION IS [who2pref] [who2]...LAWS UPDATED" M << "
" M.add_ion_law("THE STATION IS [who2pref] [who2]") diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index c887ff5b9b..3c3f1fd194 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -244,8 +244,8 @@ proc/check_panel(mob/M) attackby(var/obj/item/weapon/P as obj, mob/user as mob) step_away(src,my_target,2) for(var/mob/M in oviewers(world.view,my_target)) - M << "\red [my_target] flails around wildly." - my_target.show_message("\red [src] has been attacked by [my_target] ", 1) //Lazy. + M << "[my_target] flails around wildly." + my_target.show_message("[src] has been attacked by [my_target] ", 1) //Lazy. src.health -= P.force @@ -257,7 +257,7 @@ proc/check_panel(mob/M) step_away(src,my_target,2) if(prob(30)) for(var/mob/O in oviewers(world.view , my_target)) - O << "\red [my_target] stumbles around." + O << "[my_target] stumbles around." New() ..() @@ -302,7 +302,7 @@ proc/check_panel(mob/M) if(prob(15)) if(weapon_name) my_target << sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')) - my_target.show_message("\red [my_target] has been attacked with [weapon_name] by [src.name] ", 1) + my_target.show_message("[my_target] has been attacked with [weapon_name] by [src.name] ", 1) my_target.halloss += 8 if(prob(20)) my_target.eye_blurry += 3 if(prob(33)) @@ -310,7 +310,7 @@ proc/check_panel(mob/M) fake_blood(my_target) else my_target << sound(pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg')) - my_target.show_message("\red [src.name] has punched [my_target]!", 1) + my_target.show_message("[src.name] has punched [my_target]!", 1) my_target.halloss += 4 if(prob(33)) if(!locate(/obj/effect/overlay) in my_target.loc) diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 8889e8f0f5..fcd7dc26ab 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -188,7 +188,7 @@ if(src.density && istype(I, /obj/item/weapon) && !istype(I, /obj/item/weapon/card)) var/aforce = I.force playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) - visible_message("\red [src] was hit by [I].") + visible_message("[src] was hit by [I].") if(I.damtype == BRUTE || I.damtype == BURN) take_damage(aforce) return diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index ef5ecede35..7672e91cec 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -32,7 +32,7 @@ return if(!allowed(user)) - user << "\red Access denied." + user << "Access denied." return user.set_machine(src) diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index ce365bbde2..e8d8981d3e 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -1,6 +1,6 @@ /**********************Ore box**************************/ - +//Why the hell is this file called satchel_ore_boxdm.dm? -CK /obj/structure/ore_box icon = 'icons/obj/mining.dmi' icon_state = "orebox0" @@ -19,7 +19,7 @@ S.hide_from(usr) for(var/obj/item/weapon/ore/O in S.contents) S.remove_from_storage(O, src) //This will move the item to this item's contents - user << "\blue You empty the satchel into the box." + user << "You empty the satchel into the box." update_ore_count() @@ -69,7 +69,7 @@ set src in view(1) if(!istype(usr, /mob/living/carbon/human)) //Only living, intelligent creatures with hands can empty ore boxes. - usr << "\red You are physically incapable of emptying the ore box." + usr << "You are physically incapable of emptying the ore box." return if( usr.stat || usr.restrained() ) @@ -82,13 +82,13 @@ add_fingerprint(usr) if(contents.len < 1) - usr << "\red The ore box is empty" + usr << "The ore box is empty." return for (var/obj/item/weapon/ore/O in contents) contents -= O O.loc = src.loc - usr << "\blue You empty the ore box" + usr << "You empty the ore box." return diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index 45f4c11cde..8da03e4de0 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -10,7 +10,7 @@ if(message) client.handle_spam_prevention(MUTE_DEADCHAT) if(src.client.prefs.muted & MUTE_DEADCHAT) - src << "\red You cannot talk in deadchat (muted)." + src << "You cannot talk in deadchat (muted)." return . = src.say_dead(message) @@ -31,7 +31,7 @@ if(message) client.handle_spam_prevention(MUTE_DEADCHAT) if(src.client.prefs.muted & MUTE_DEADCHAT) - src << "\red You cannot emote in deadchat (muted)." + src << "You cannot emote in deadchat (muted)." return . = src.emote_dead(message) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index e89dd9cacd..bc75344484 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -56,7 +56,7 @@ var/list/slot_equipment_priority = list( \ else if(!disable_warning) - src << "\red You are unable to equip that." //Only print if del_on_fail is false + src << "You are unable to equip that." //Only print if del_on_fail is false return 0 equip_to_slot(W, slot, redraw_mob) //This proc should not ever fail. diff --git a/code/modules/mob/living/carbon/alien/alien_attacks.dm b/code/modules/mob/living/carbon/alien/alien_attacks.dm index 578059e6e0..e201e85116 100644 --- a/code/modules/mob/living/carbon/alien/alien_attacks.dm +++ b/code/modules/mob/living/carbon/alien/alien_attacks.dm @@ -28,7 +28,7 @@ playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has grabbed [] passively!", M, src), 1) + O.show_message(text("[] has grabbed [] passively!", M, src), 1) else var/damage = rand(1, 9) @@ -43,17 +43,17 @@ playsound(loc, "punch", 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has punched []!", M, src), 1) + O.show_message(text("[] has punched []!", M, src), 1) if (damage > 4.9) Weaken(rand(10,15)) for(var/mob/O in viewers(M, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has weakened []!", M, src), 1, "\red You hear someone fall.", 2) + O.show_message(text("[] has weakened []!", M, src), 1, "You hear someone fall.", 2) adjustBruteLoss(damage) updatehealth() else playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has attempted to punch []!", M, src), 1) + O.show_message(text("[] has attempted to punch []!", M, src), 1) return \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/diona/progression.dm b/code/modules/mob/living/carbon/alien/diona/progression.dm index de9bc72bda..8be2f7c5aa 100644 --- a/code/modules/mob/living/carbon/alien/diona/progression.dm +++ b/code/modules/mob/living/carbon/alien/diona/progression.dm @@ -15,5 +15,5 @@ src.loc = L.loc qdel(L) - src.visible_message("\red [src] begins to shift and quiver, and erupts in a shower of shed bark as it splits into a tangle of nearly a dozen new dionaea.","\red You begin to shift and quiver, feeling your awareness splinter. All at once, we consume our stored nutrients to surge with growth, splitting into a tangle of at least a dozen new dionaea. We have attained our gestalt form.") + src.visible_message("[src] begins to shift and quiver, and erupts in a shower of shed bark as it splits into a tangle of nearly a dozen new dionaea.","You begin to shift and quiver, feeling your awareness splinter. All at once, we consume our stored nutrients to surge with growth, splitting into a tangle of at least a dozen new dionaea. We have attained our gestalt form.") return "Diona" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/emote.dm b/code/modules/mob/living/carbon/alien/emote.dm index 150df16fee..7a70f22cea 100644 --- a/code/modules/mob/living/carbon/alien/emote.dm +++ b/code/modules/mob/living/carbon/alien/emote.dm @@ -16,7 +16,7 @@ return if (src.client) if (client.prefs.muted & MUTE_IC) - src << "\red You cannot send IC messages (muted)." + src << "You cannot send IC messages (muted)." return if (stat) return diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm index fd48b912a0..f02d82a45f 100644 --- a/code/modules/mob/living/carbon/alien/life.dm +++ b/code/modules/mob/living/carbon/alien/life.dm @@ -150,7 +150,7 @@ adjustFireLoss((environment.temperature - (T0C+66))/5) // Might be too high, check in testing. if (fire) fire.icon_state = "fire2" if(prob(20)) - src << "\red You feel a searing heat!" + src << "You feel a searing heat!" else if (fire) fire.icon_state = "fire0" diff --git a/code/modules/mob/living/carbon/alien/progression.dm b/code/modules/mob/living/carbon/alien/progression.dm index 4a22c34c6d..f208e9c68b 100644 --- a/code/modules/mob/living/carbon/alien/progression.dm +++ b/code/modules/mob/living/carbon/alien/progression.dm @@ -12,11 +12,11 @@ return if(handcuffed || legcuffed) - src << "\red You cannot evolve when you are cuffed." + src << "You cannot evolve when you are cuffed." return if(amount_grown < max_grown) - src << "\red You are not fully grown." + src << "You are not fully grown." return // confirm_evolution() handles choices and other specific requirements. diff --git a/code/modules/mob/living/carbon/alien/say.dm b/code/modules/mob/living/carbon/alien/say.dm index b92b5dc06d..1f787be9dd 100644 --- a/code/modules/mob/living/carbon/alien/say.dm +++ b/code/modules/mob/living/carbon/alien/say.dm @@ -4,7 +4,7 @@ if(client) if(client.prefs.muted & MUTE_IC) - src << "\red You cannot speak in IC (Muted)." + src << "You cannot speak in IC (Muted)." return message = sanitize(message) diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm index 5725dd4ec7..cb07a338c7 100644 --- a/code/modules/mob/living/carbon/brain/emote.dm +++ b/code/modules/mob/living/carbon/brain/emote.dm @@ -17,7 +17,7 @@ return if (src.client) if (client.prefs.muted & MUTE_IC) - src << "\red You cannot send IC messages (muted)." + src << "You cannot send IC messages (muted)." return if (stat) return @@ -60,7 +60,7 @@ if ("help") src << "alarm,alert,notice,flash,blink,whistle,beep,boop" else - src << "\blue Unusable emote '[act]'. Say *help for a list." + src << "Unusable emote '[act]'. Say *help for a list." if (message) log_emote("[name]/[key] : [message]") diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index bac50b1e62..b631e8ae13 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -6,9 +6,9 @@ if (radiation > 100) radiation = 100 if(!container)//If it's not in an MMI - src << "\red You feel weak." + src << "You feel weak." else//Fluff-wise, since the brain can't detect anything itself, the MMI handles thing like that - src << "\red STATUS: CRITICAL AMOUNTS OF RADIATION DETECTED." + src << "STATUS: CRITICAL AMOUNTS OF RADIATION DETECTED." switch(radiation) if(1 to 49) @@ -23,9 +23,9 @@ if(prob(5)) radiation -= 5 if(!container) - src << "\red You feel weak." + src << "You feel weak." else - src << "\red STATUS: DANGEROUS LEVELS OF RADIATION DETECTED." + src << "STATUS: DANGEROUS LEVELS OF RADIATION DETECTED." updatehealth() if(75 to 100) @@ -116,7 +116,7 @@ silent = 1 if(!alert)//Sounds an alarm, but only once per 'level' emote("alarm") - src << "\red Major electrical distruption detected: System rebooting." + src << "Major electrical distruption detected: System rebooting." alert = 1 if(prob(75)) emp_damage -= 1 @@ -132,7 +132,7 @@ ear_damage = 1 if(!alert) emote("alert") - src << "\red Primary systems are now online." + src << "Primary systems are now online." alert = 1 if(prob(50)) emp_damage -= 1 @@ -144,13 +144,13 @@ if(2 to 9)//Low level of EMP damage, has few effects(handled elsewhere) if(!alert) emote("notice") - src << "\red System reboot nearly complete." + src << "System reboot nearly complete." alert = 1 if(prob(25)) emp_damage -= 1 if(1) alert = 0 - src << "\red All systems restored." + src << "All systems restored." emp_damage -= 1 return 1 diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 47da8c88f8..fb4c3f50f9 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -80,7 +80,7 @@ M.loc = src.loc for(var/mob/N in viewers(src, null)) if(N.client) - N.show_message(text("\red [M] bursts out of [src]!"), 2) + N.show_message(text("[M] bursts out of [src]!"), 2) ..() /mob/living/carbon/attack_hand(mob/M as mob) @@ -91,7 +91,7 @@ if (H.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - H << "\red You can't use your [temp.name]" + H << "You can't use your [temp.name]" return return @@ -109,18 +109,18 @@ playsound(loc, "sparks", 50, 1, -1) if (shock_damage > 15) src.visible_message( - "\red [src] was shocked by \the [source]!", \ - "\red You feel a powerful shock course through your body!", \ - "\red You hear a heavy electrical crack." \ + "[src] was shocked by \the [source]!", \ + "You feel a powerful shock course through your body!", \ + "You hear a heavy electrical crack." \ ) if(stun) Stun(10)//This should work for now, more is really silly and makes you lay there forever Weaken(10) else src.visible_message( - "\red [src] was mildly shocked by \the [source].", \ - "\red You feel a mild shock course through your body.", \ - "\red You hear a light zapping." \ + "[src] was mildly shocked by \the [source].", \ + "You feel a mild shock course through your body.", \ + "You hear a light zapping." \ ) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread @@ -161,8 +161,8 @@ if(src == M && istype(src, /mob/living/carbon/human)) var/mob/living/carbon/human/H = src src.visible_message( \ - text("\blue [src] examines [].",src.gender==MALE?"himself":"herself"), \ - "\blue You check yourself for injuries." \ + text("[src] examines [].",src.gender==MALE?"himself":"herself"), \ + "You check yourself for injuries." \ ) for(var/obj/item/organ/external/org in H.organs) @@ -421,7 +421,7 @@ set category = "IC" if(usr.sleeping) - usr << "\red You are already sleeping" + usr << "You are already sleeping" return if(alert(src,"You sure you want to sleep for a while?","Sleep","Yes","No") == "Yes") usr.sleeping = 20 //Short nap diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index ae590dd2d4..55d82ef2ce 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -134,7 +134,7 @@ if (src.client) if (client.prefs.muted & MUTE_IC) - src << "\red You cannot send IC messages (muted)." + src << "You cannot send IC messages (muted)." return if (stat) return @@ -678,7 +678,7 @@ twitch_v, vomit, whimper, wink, yawn. Synthetics: beep, buzz, yes, no, rcough, rsneeze, ping" else - src << "\blue Unusable emote '[act]'. Say *help for a list." + src << "Unusable emote '[act]'. Say *help for a list." if (message) log_emote("[name]/[key] : [message]") diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index ba7aed0250..6a42fc6b41 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -417,7 +417,7 @@ U.handle_regular_hud_updates() if(!modified) - usr << "\red Unable to locate a data core entry for this person." + usr << "Unable to locate a data core entry for this person." if (href_list["secrecord"]) if(hasHUD(usr,"security")) @@ -447,7 +447,7 @@ read = 1 if(!read) - usr << "\red Unable to locate a data core entry for this person." + usr << "Unable to locate a data core entry for this person." if (href_list["secrecordComment"]) if(hasHUD(usr,"security")) @@ -477,7 +477,7 @@ usr << "\[Add comment\]" if(!read) - usr << "\red Unable to locate a data core entry for this person." + usr << "Unable to locate a data core entry for this person." if (href_list["secrecordadd"]) if(hasHUD(usr,"security")) @@ -545,7 +545,7 @@ U.handle_regular_hud_updates() if(!modified) - usr << "\red Unable to locate a data core entry for this person." + usr << "Unable to locate a data core entry for this person." if (href_list["medrecord"]) if(hasHUD(usr,"medical")) @@ -576,7 +576,7 @@ read = 1 if(!read) - usr << "\red Unable to locate a data core entry for this person." + usr << "Unable to locate a data core entry for this person." if (href_list["medrecordComment"]) if(hasHUD(usr,"medical")) @@ -606,7 +606,7 @@ usr << "\[Add comment\]" if(!read) - usr << "\red Unable to locate a data core entry for this person." + usr << "Unable to locate a data core entry for this person." if (href_list["medrecordadd"]) if(hasHUD(usr,"medical")) @@ -758,7 +758,7 @@ /mob/living/carbon/human/proc/play_xylophone() if(!src.xylophone) - visible_message("\red \The [src] begins playing \his ribcage like a xylophone. It's quite spooky.","\blue You begin to play a spooky refrain on your ribcage.","\red You hear a spooky xylophone melody.") + visible_message("\The [src] begins playing \his ribcage like a xylophone. It's quite spooky.","You begin to play a spooky refrain on your ribcage.","You hear a spooky xylophone melody.") var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg') playsound(loc, song, 50, 1, -1) xylophone = 1 @@ -849,7 +849,7 @@ regenerate_icons() check_dna() - visible_message("\blue \The [src] morphs and changes [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] appearance!", "\blue You change your appearance!", "\red Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!") + visible_message("\The [src] morphs and changes [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] appearance!", "You change your appearance!", "Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!") /mob/living/carbon/human/proc/remotesay() set name = "Project mind" @@ -872,10 +872,10 @@ var/say = sanitize(input("What do you wish to say")) if(mRemotetalk in target.mutations) - target.show_message("\blue You hear [src.real_name]'s voice: [say]") + target.show_message(" You hear [src.real_name]'s voice: [say]") else - target.show_message("\blue You hear a voice that seems to echo around the room: [say]") - usr.show_message("\blue You project your mind into [target.real_name]: [say]") + target.show_message(" You hear a voice that seems to echo around the room: [say]") + usr.show_message(" You project your mind into [target.real_name]: [say]") log_say("[key_name(usr)] sent a telepathic message to [key_name(target)]: [say]") for(var/mob/observer/dead/G in world) G.show_message("Telepathic message from [src] to [target]: [say]") diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 963bab6367..e3b2f32d43 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -15,7 +15,7 @@ if(H.hand) temp = H.organs_by_name["l_hand"] if(!temp || !temp.is_usable()) - H << "\red You can't use your hand." + H << "You can't use your hand." return H.break_cloak() ..() @@ -27,7 +27,7 @@ if(!hit_zone) H.do_attack_animation(src) playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("\red [H] reaches for [src], but misses!") + visible_message("[H] reaches for [src], but misses!") return 0 if(H != src && check_shields(0, null, H, H.zone_sel.selecting, H.name)) @@ -39,7 +39,7 @@ var/damage = rand(0, 9) if(!damage) playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("\red [H] has attempted to punch [src]!") + visible_message("[H] has attempted to punch [src]!") return 0 var/obj/item/organ/external/affecting = get_organ(ran_zone(H.zone_sel.selecting)) var/armor_block = run_armor_check(affecting, "melee") @@ -50,14 +50,14 @@ playsound(loc, "punch", 25, 1, -1) - visible_message("\red [H] has punched [src]!") + visible_message("[H] has punched [src]!") if(armor_soak >= damage) return apply_damage(damage, HALLOSS, affecting, armor_block, armor_soak) if(damage >= 9) - visible_message("\red [H] has weakened [src]!") + visible_message("[H] has weakened [src]!") apply_effect(4, WEAKEN, armor_block) return @@ -311,7 +311,7 @@ return playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("\red [M] attempted to disarm [src]!") + visible_message(" [M] attempted to disarm [src]!") return /mob/living/carbon/human/proc/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, inrange, params) diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 82c90a71cb..3afdc07be0 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -47,7 +47,7 @@ for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] [failed ? "tried to tackle" : "has tackled"] down []!", src, T), 1) + O.show_message(text("[] [failed ? "tried to tackle" : "has tackled"] down []!", src, T), 1) /mob/living/carbon/human/proc/commune() set category = "Abilities" @@ -77,12 +77,12 @@ log_say("[key_name(src)] communed to [key_name(M)]: [text]") - M << "\blue Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]" + M << "Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]" if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(H.species.name == src.species.name) return - H << "\red Your nose begins to bleed..." + H << "Your nose begins to bleed..." H.drip(1) /mob/living/carbon/human/proc/regurgitate() @@ -95,7 +95,7 @@ if(M in stomach_contents) stomach_contents.Remove(M) M.loc = loc - src.visible_message("\red [src] hurls out the contents of their stomach!") + src.visible_message("[src] hurls out the contents of their stomach!") return /mob/living/carbon/human/proc/psychic_whisper(mob/M as mob in oview()) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 5dacc500dc..149c1831f6 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -19,7 +19,7 @@ This saves us from having to call add_fingerprint() any time something is put in else update_inv_r_hand(0) else - H << "\red You are unable to equip that." + H << "You are unable to equip that." /mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/W, list/slots, del_on_fail = 1) for (var/slot in slots) @@ -293,7 +293,7 @@ This saves us from having to call add_fingerprint() any time something is put in var/obj/item/clothing/under/uniform = src.w_uniform uniform.attackby(W,src) else - src << "\red You are trying to eqip this item to an unsupported inventory slot. How the heck did you manage that? Stop it..." + src << "You are trying to eqip this item to an unsupported inventory slot. How the heck did you manage that? Stop it..." return if((W == src.l_hand) && (slot != slot_l_hand)) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 2738686c38..9918a7e4bd 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -158,7 +158,7 @@ if (disabilities & EPILEPSY) if ((prob(1) && paralysis < 1)) - src << "\red You have a seizure!" + src << "You have a seizure!" for(var/mob/O in viewers(src, null)) if(O == src) continue diff --git a/code/modules/mob/living/carbon/metroid/emote.dm b/code/modules/mob/living/carbon/metroid/emote.dm index d82372e52f..3e7535f16b 100644 --- a/code/modules/mob/living/carbon/metroid/emote.dm +++ b/code/modules/mob/living/carbon/metroid/emote.dm @@ -16,7 +16,7 @@ return if (src.client) if (client.prefs.muted & MUTE_IC) - src << "\red You cannot send IC messages (muted)." + src << "You cannot send IC messages (muted)." return if (stat) return diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 66e1278e22..069630a49a 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -99,7 +99,7 @@ var/obj/item/device/assembly/signaler/signaler = get_active_hand() if(signaler.deadman && prob(80)) log_and_message_admins("has triggered a signaler deadman's switch") - src.visible_message("\red [src] triggers their deadman's switch!") + src.visible_message("[src] triggers their deadman's switch!") signaler.signal() //Armor @@ -119,7 +119,7 @@ //Stun Beams if(P.taser_effect) stun_effect_act(0, P.agony, def_zone, P) - src <<"\red You have been hit by [P]!" + src <<"You have been hit by [P]!" if(!P.nodamage) apply_damage(P.damage, P.damage_type, def_zone, absorb, soaked, 0, P, sharp=proj_sharp, edge=proj_edge) qdel(P) @@ -218,10 +218,10 @@ miss_chance = max(15*(distance-2), 0) if (prob(miss_chance)) - visible_message("\blue \The [O] misses [src] narrowly!") + visible_message("\The [O] misses [src] narrowly!") return - src.visible_message("\red [src] has been hit by [O].") + src.visible_message("[src] has been hit by [O].") var/armor = run_armor_check(null, "melee") var/soaked = get_armor_soak(null, "melee") @@ -249,7 +249,7 @@ if(O.throw_source && momentum >= THROWNOBJ_KNOCKBACK_SPEED) var/dir = get_dir(O.throw_source, src) - visible_message("\red [src] staggers under the impact!","\red You stagger under the impact!") + visible_message("[src] staggers under the impact!","You stagger under the impact!") src.throw_at(get_edge_target_turf(src,dir),1,momentum) if(!O || !src) return diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index a22011e8ab..ce80cab1d0 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -445,7 +445,7 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c if(target && (!istype(target, /mob/living/carbon/human) || html_decode(href_list["trackname"]) == target:get_face_name())) ai_actual_track(target) else - src << "\red System error. Cannot locate [html_decode(href_list["trackname"])]." + src << "System error. Cannot locate [html_decode(href_list["trackname"])]." return return @@ -517,7 +517,7 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c if(network in C.network) eyeobj.setLoc(get_turf(C)) break - src << "\blue Switched to [network] camera network." + src << "Switched to [network] camera network." //End of code by Mord_Sith /mob/living/silicon/ai/proc/ai_statuschange() @@ -695,19 +695,19 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c else if(istype(W, /obj/item/weapon/wrench)) if(anchored) - user.visible_message("\blue \The [user] starts to unbolt \the [src] from the plating...") + user.visible_message("\The [user] starts to unbolt \the [src] from the plating...") if(!do_after(user,40)) - user.visible_message("\blue \The [user] decides not to unbolt \the [src].") + user.visible_message("\The [user] decides not to unbolt \the [src].") return - user.visible_message("\blue \The [user] finishes unfastening \the [src]!") + user.visible_message("\The [user] finishes unfastening \the [src]!") anchored = 0 return else - user.visible_message("\blue \The [user] starts to bolt \the [src] to the plating...") + user.visible_message("\The [user] starts to bolt \the [src] to the plating...") if(!do_after(user,40)) - user.visible_message("\blue \The [user] decides not to bolt \the [src].") + user.visible_message("\The [user] decides not to bolt \the [src].") return - user.visible_message("\blue \The [user] finishes fastening down \the [src]!") + user.visible_message("\The [user] finishes fastening down \the [src]!") anchored = 1 return else diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm index a9ad698754..374cfd5acc 100644 --- a/code/modules/mob/living/silicon/pai/life.dm +++ b/code/modules/mob/living/silicon/pai/life.dm @@ -7,7 +7,7 @@ if(get_dist(src, src.cable) > 1) var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) - M.show_message("\red The data cable rapidly retracts back into its spool.", 3, "\red You hear a click and the sound of wire spooling rapidly.", 2) + M.show_message("The data cable rapidly retracts back into its spool.", 3, "You hear a click and the sound of wire spooling rapidly.", 2) qdel(src.cable) handle_regular_hud_updates() diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 52fe1da578..0c63b55608 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -151,7 +151,7 @@ if(prob(20)) var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) - M.show_message("\red A shower of sparks spray from [src]'s inner workings.", 3, "\red You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2) + M.show_message("A shower of sparks spray from [src]'s inner workings.", 3, "You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2) return src.death(0) switch(pick(1,2,3)) @@ -226,7 +226,7 @@ cameralist[C.network] = C.network src.network = input(usr, "Which network would you like to view?") as null|anything in cameralist - src << "\blue Switched to [src.network] camera network." + src << "Switched to [src.network] camera network." //End of code by Mord_Sith */ diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index 3e1564b0cf..bbc8cefd36 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -21,13 +21,13 @@ /obj/item/device/robotanalyzer/proc/do_scan(mob/living/M as mob, mob/living/user as mob) if((CLUMSY in user.mutations) && prob(50)) - user << text("\red You try to analyze the floor's vitals!") + user << text("You try to analyze the floor's vitals!") for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1) - user.show_message(text("\blue Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1) - user.show_message(text("\blue \t Damage Specifics: [0]-[0]-[0]-[0]"), 1) - user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1) - user.show_message("\blue Body Temperature: ???", 1) + O.show_message(text("[user] has analyzed the floor's vitals!"), 1) + user.show_message(text("Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1) + user.show_message(text("\t Damage Specifics: [0]-[0]-[0]-[0]"), 1) + user.show_message("Key: Suffocation/Toxin/Burns/Brute", 1) + user.show_message("Body Temperature: ???", 1) return var/scan_type @@ -36,7 +36,7 @@ else if(istype(M, /mob/living/carbon/human)) scan_type = "prosthetics" else - user << "\red You can't analyze non-robotic things!" + user << "You can't analyze non-robotic things!" return user.visible_message("\The [user] has analyzed [M]'s components.","You have analyzed [M]'s components.") @@ -44,17 +44,17 @@ if("robot") var/BU = M.getFireLoss() > 50 ? "[M.getFireLoss()]" : M.getFireLoss() var/BR = M.getBruteLoss() > 50 ? "[M.getBruteLoss()]" : M.getBruteLoss() - user.show_message("\blue Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.halloss]% functional"]") + user.show_message("Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.halloss]% functional"]") user.show_message("\t Key: Electronics/Brute", 1) user.show_message("\t Damage Specifics: [BU] - [BR]") if(M.tod && M.stat == DEAD) - user.show_message("\blue Time of Disable: [M.tod]") + user.show_message("Time of Disable: [M.tod]") var/mob/living/silicon/robot/H = M var/list/damaged = H.get_damaged_components(1,1,1) - user.show_message("\blue Localized Damage:",1) + user.show_message("Localized Damage:",1) if(length(damaged)>0) for(var/datum/robot_component/org in damaged) - user.show_message(text("\blue \t []: [][] - [] - [] - []", \ + user.show_message(text("\t []: [][] - [] - [] - []", \ capitalize(org.name), \ (org.installed == -1) ? "DESTROYED " :"",\ (org.electronics_damage > 0) ? "[org.electronics_damage]" :0, \ @@ -62,10 +62,10 @@ (org.toggled) ? "Toggled ON" : "Toggled OFF",\ (org.powered) ? "Power ON" : "Power OFF"),1) else - user.show_message("\blue \t Components are OK.",1) + user.show_message("\t Components are OK.",1) if(H.emagged && prob(5)) - user.show_message("\red \t ERROR: INTERNAL SYSTEMS COMPROMISED",1) - user.show_message("\blue Operating Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1) + user.show_message("\t ERROR: INTERNAL SYSTEMS COMPROMISED",1) + user.show_message("Operating Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1) if("prosthetics") diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index a9464c595e..8d89201007 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -56,7 +56,7 @@ src.has_power = 1 else if (src.has_power) - src << "\red You are now running on emergency backup power." + src << "You are now running on emergency backup power." src.has_power = 0 if(lights_on) // Light is on but there is no power! lights_on = 0 diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 4359c8174c..69c7ea3677 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -247,7 +247,7 @@ var/list/modules = list() modules.Add(robot_module_types) if((crisis && security_level == SEC_LEVEL_RED) || crisis_override) //Leaving this in until it's balanced appropriately. - src << "\red Crisis mode active. Combat module available." + src << "Crisis mode active. Combat module available." modules+="Combat" modtype = input("Please, select a module!", "Robot module", null, null) as null|anything in modules @@ -354,11 +354,11 @@ set name = "Self Diagnosis" if(!is_component_functioning("diagnosis unit")) - src << "\red Your self-diagnosis component isn't functioning." + src << "Your self-diagnosis component isn't functioning." var/datum/robot_component/CO = get_component("diagnosis unit") if (!cell_use_power(CO.active_usage)) - src << "\red Low Power." + src << "Low Power." var/dat = self_diagnosis() src << browse(dat, "window=robotdiagnosis") @@ -382,10 +382,10 @@ var/datum/robot_component/C = components[toggle] if(C.toggled) C.toggled = 0 - src << "\red You disable [C.name]." + src << "You disable [C.name]." else C.toggled = 1 - src << "\red You enable [C.name]." + src << "You enable [C.name]." // this function displays jetpack pressure in the stat panel /mob/living/silicon/robot/proc/show_jetpack_pressure() @@ -451,7 +451,7 @@ C.brute_damage = WC.brute C.electronics_damage = WC.burn - usr << "\blue You install the [W.name]." + usr << "You install the [W.name]." return @@ -470,7 +470,7 @@ updatehealth() add_fingerprint(user) for(var/mob/O in viewers(user, null)) - O.show_message(text("\red [user] has fixed some of the dents on [src]!"), 1) + O.show_message(text("[user] has fixed some of the dents on [src]!"), 1) else user << "Need more welding fuel!" return @@ -485,7 +485,7 @@ adjustFireLoss(-30) updatehealth() for(var/mob/O in viewers(user, null)) - O.show_message(text("\red [user] has fixed some of the burnt wires on [src]!"), 1) + O.show_message(text("[user] has fixed some of the burnt wires on [src]!"), 1) else if (istype(W, /obj/item/weapon/crowbar)) // crowbar means open or close the cover if(opened) @@ -599,7 +599,7 @@ user << "You [ locked ? "lock" : "unlock"] [src]'s interface." updateicon() else - user << "\red Access denied." + user << "Access denied." else if(istype(W, /obj/item/borg/upgrade/)) var/obj/item/borg/upgrade/U = W @@ -713,7 +713,7 @@ /mob/living/silicon/robot/proc/installed_modules() if(weapon_lock) - src << "\red Weapon lock active, unable to use modules! Count:[weaponlock_time]" + src << "Weapon lock active, unable to use modules! Count:[weaponlock_time]" return if(!module) @@ -860,7 +860,7 @@ cleaned_human.shoes.clean_blood() cleaned_human.update_inv_shoes(0) cleaned_human.clean_blood(1) - cleaned_human << "\red [src] cleans your face!" + cleaned_human << "[src] cleans your face!" return /mob/living/silicon/robot/proc/self_destruct() diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm index 58a81ca7a7..89969aaf74 100644 --- a/code/modules/mob/living/silicon/robot/robot_damage.dm +++ b/code/modules/mob/living/silicon/robot/robot_damage.dm @@ -78,11 +78,11 @@ cell.charge -= cost if(cell.charge <= 0) cell.charge = 0 - src << "\red Your shield has overloaded!" + src << "Your shield has overloaded!" else brute -= absorb_brute burn -= absorb_burn - src << "\red Your shield absorbs some of the impact!" + src << "Your shield absorbs some of the impact!" if(!emp) var/datum/robot_component/armour/A = get_armour() @@ -124,11 +124,11 @@ cell.charge -= cost if(cell.charge <= 0) cell.charge = 0 - src << "\red Your shield has overloaded!" + src << "Your shield has overloaded!" else brute -= absorb_brute burn -= absorb_burn - src << "\red Your shield absorbs some of the impact!" + src << "Your shield absorbs some of the impact!" var/datum/robot_component/armour/A = get_armour() if(A) diff --git a/code/modules/mob/living/simple_animal/aliens/drone.dm b/code/modules/mob/living/simple_animal/aliens/drone.dm index b8578bf72c..3c550e862f 100644 --- a/code/modules/mob/living/simple_animal/aliens/drone.dm +++ b/code/modules/mob/living/simple_animal/aliens/drone.dm @@ -78,7 +78,7 @@ //repair a bit of damage if(prob(1)) - src.visible_message("\red \icon[src] [src] shudders and shakes as some of it's damaged systems come back online.") + src.visible_message("\icon[src] [src] shudders and shakes as some of it's damaged systems come back online.") var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() @@ -93,10 +93,10 @@ //sometimes our targetting sensors malfunction, and we attack anyone nearby if(prob(disabled ? 0 : 1)) if(hostile) - src.visible_message("\blue \icon[src] [src] retracts several targetting vanes, and dulls it's running lights.") + src.visible_message("\icon[src] [src] retracts several targetting vanes, and dulls it's running lights.") hostile = 0 else - src.visible_message("\red \icon[src] [src] suddenly lights up, and additional targetting vanes slide into place.") + src.visible_message("\icon[src] [src] suddenly lights up, and additional targetting vanes slide into place.") hostile = 1 if(health / getMaxHealth() > 0.9) @@ -117,17 +117,17 @@ exploding = 0 if(!disabled) if(prob(50)) - src.visible_message("\blue \icon[src] [src] suddenly shuts down!") + src.visible_message("\icon[src] [src] suddenly shuts down!") else - src.visible_message("\blue \icon[src] [src] suddenly lies still and quiet.") + src.visible_message("\icon[src] [src] suddenly lies still and quiet.") disabled = rand(150, 600) walk(src,0) if(exploding && prob(20)) if(prob(50)) - src.visible_message("\red \icon[src] [src] begins to spark and shake violenty!") + src.visible_message("\icon[src] [src] begins to spark and shake violenty!") else - src.visible_message("\red \icon[src] [src] sparks and shakes like it's about to explode!") + src.visible_message("\icon[src] [src] sparks and shakes like it's about to explode!") var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() diff --git a/code/modules/mob/living/simple_animal/aliens/hivebot.dm b/code/modules/mob/living/simple_animal/aliens/hivebot.dm index 9770d61efe..6b15830b9a 100644 --- a/code/modules/mob/living/simple_animal/aliens/hivebot.dm +++ b/code/modules/mob/living/simple_animal/aliens/hivebot.dm @@ -80,12 +80,12 @@ var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread() smoke.set_up(5, 0, src.loc) smoke.start() - visible_message("\red The [src] warps in!") + visible_message("The [src] warps in!") playsound(src.loc, 'sound/effects/EMPulse.ogg', 25, 1) warpbots() icon_state = "def_radar" - visible_message("\red The [src] turns on!") + visible_message("The [src] turns on!") while(bot_amt > 0) bot_amt-- switch(bot_type) diff --git a/code/modules/mob/living/simple_animal/aliens/shade.dm b/code/modules/mob/living/simple_animal/aliens/shade.dm index d74dec5b30..f1b227436e 100644 --- a/code/modules/mob/living/simple_animal/aliens/shade.dm +++ b/code/modules/mob/living/simple_animal/aliens/shade.dm @@ -52,7 +52,7 @@ ..() for(var/mob/M in viewers(src, null)) if((M.client && !( M.blinded ))) - M.show_message("\red [src] lets out a contented sigh as their form unwinds. ") + M.show_message("[src] lets out a contented sigh as their form unwinds.") ghostize() qdel(src) diff --git a/code/modules/mob/living/simple_animal/animals/corgi.dm b/code/modules/mob/living/simple_animal/animals/corgi.dm index 11b2302aaa..1823c5a91e 100644 --- a/code/modules/mob/living/simple_animal/animals/corgi.dm +++ b/code/modules/mob/living/simple_animal/animals/corgi.dm @@ -103,7 +103,7 @@ if(!stat) for(var/mob/M in viewers(user, null)) if ((M.client && !( M.blinded ))) - M.show_message("\blue [user] baps [name] on the nose with the rolled up [O]") + M.show_message("[user] baps [name] on the nose with the rolled up [O]") spawn(0) for(var/i in list(1,2,4,8,4,2,1,2)) set_dir(i) @@ -146,7 +146,7 @@ //pupplies cannot wear anything. /mob/living/simple_animal/corgi/puppy/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) - usr << "\red You can't fit this on [src]" + usr << "You can't fit this on [src]" return ..() @@ -169,7 +169,7 @@ //Lisa already has a cute bow! /mob/living/simple_animal/corgi/Lisa/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) - usr << "\red [src] already has a cute bow!" + usr << "[src] already has a cute bow!" return ..() diff --git a/code/modules/mob/living/simple_animal/animals/farm_animals.dm b/code/modules/mob/living/simple_animal/animals/farm_animals.dm index e65654cdad..adc4fe83bf 100644 --- a/code/modules/mob/living/simple_animal/animals/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/animals/farm_animals.dm @@ -75,9 +75,9 @@ user.visible_message("[user] milks [src] using \the [O].") var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) if(G.reagents.total_volume >= G.volume) - user << "\red The [O] is full." + user << "The [O] is full." if(!transfered) - user << "\red The udder is dry. Wait a bit longer..." + user << "The udder is dry. Wait a bit longer..." else ..() //cow @@ -120,9 +120,9 @@ user.visible_message("[user] milks [src] using \the [O].") var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) if(G.reagents.total_volume >= G.volume) - user << "\red The [O] is full." + user << "The [O] is full." if(!transfered) - user << "\red The udder is dry. Wait a bit longer..." + user << "The udder is dry. Wait a bit longer..." else ..() @@ -247,12 +247,12 @@ var/global/chicken_count = 0 var/obj/item/weapon/reagent_containers/food/snacks/grown/G = O if(G.seed && G.seed.kitchen_tag == "wheat") if(!stat && eggsleft < 8) - user.visible_message("\blue [user] feeds [O] to [name]! It clucks happily.","\blue You feed [O] to [name]! It clucks happily.") + user.visible_message("[user] feeds [O] to [name]! It clucks happily.","You feed [O] to [name]! It clucks happily.") user.drop_item() qdel(O) eggsleft += rand(1, 4) else - user << "\blue [name] doesn't seem hungry!" + user << "[name] doesn't seem hungry!" else user << "[name] doesn't seem interested in that." else diff --git a/code/modules/mob/living/simple_animal/animals/parrot.dm b/code/modules/mob/living/simple_animal/animals/parrot.dm index 0f0fcb3a6b..73892b26a1 100644 --- a/code/modules/mob/living/simple_animal/animals/parrot.dm +++ b/code/modules/mob/living/simple_animal/animals/parrot.dm @@ -159,19 +159,19 @@ if(copytext(possible_phrase,1,3) in department_radio_keys) possible_phrase = copytext(possible_phrase,3,length(possible_phrase)) else - usr << "\red There is nothing to remove from its [remove_from]." + usr << "There is nothing to remove from its [remove_from]." return //Adding things to inventory else if(href_list["add_inv"]) var/add_to = href_list["add_inv"] if(!usr.get_active_hand()) - usr << "\red You have nothing in your hand to put on its [add_to]." + usr << "You have nothing in your hand to put on its [add_to]." return switch(add_to) if("ears") if(ears) - usr << "\red It's already wearing something." + usr << "It's already wearing something." return else var/obj/item/item_to_add = usr.get_active_hand() @@ -179,7 +179,7 @@ return if( !istype(item_to_add, /obj/item/device/radio/headset) ) - usr << "\red This object won't fit." + usr << "This object won't fit." return var/obj/item/device/radio/headset/headset_to_add = item_to_add @@ -411,7 +411,7 @@ if(!parrot_perch || parrot_interest.loc != parrot_perch.loc) held_item = parrot_interest parrot_interest.forceMove(src) - visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") + visible_message("[src] grabs the [held_item]!", "You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") parrot_interest = null parrot_state = PARROT_SWOOP | PARROT_RETURN @@ -571,7 +571,7 @@ return -1 if(held_item) - src << "\red You are already holding the [held_item]" + src << "You are already holding the [held_item]" return 1 for(var/obj/item/I in view(1,src)) @@ -584,10 +584,10 @@ held_item = I I.forceMove(src) - visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") + visible_message("[src] grabs the [held_item]!", "You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") return held_item - src << "\red There is nothing of interest to take." + src << "There is nothing of interest to take." return 0 /mob/living/simple_animal/parrot/proc/steal_from_mob() @@ -599,7 +599,7 @@ return -1 if(held_item) - src << "\red You are already holding the [held_item]" + src << "You are already holding the [held_item]" return 1 var/obj/item/stolen_item = null @@ -615,10 +615,10 @@ C.remove_from_mob(stolen_item) held_item = stolen_item stolen_item.forceMove(src) - visible_message("[src] grabs the [held_item] out of [C]'s hand!", "\blue You snag the [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.") + visible_message("[src] grabs the [held_item] out of [C]'s hand!", "You snag the [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.") return held_item - src << "\red There is nothing of interest to take." + src << "There is nothing of interest to take." return 0 /mob/living/simple_animal/parrot/verb/drop_held_item_player() @@ -642,7 +642,7 @@ return -1 if(!held_item) - usr << "\red You have nothing to drop!" + usr << "You have nothing to drop!" return 0 if(!drop_gently) @@ -675,7 +675,7 @@ src.forceMove(AM.loc) icon_state = "parrot_sit" return - src << "\red There is no perch nearby to sit on." + src << "There is no perch nearby to sit on." return /* diff --git a/code/modules/mob/living/simple_animal/animals/spiderbot.dm b/code/modules/mob/living/simple_animal/animals/spiderbot.dm index 95b7e81a17..79e796d7ff 100644 --- a/code/modules/mob/living/simple_animal/animals/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/animals/spiderbot.dm @@ -219,7 +219,7 @@ return if(!held_item) - usr << "\red You have nothing to drop!" + usr << "You have nothing to drop!" return 0 if(istype(held_item, /obj/item/weapon/grenade)) diff --git a/code/modules/mob/living/simple_animal/borer/borer_powers.dm b/code/modules/mob/living/simple_animal/borer/borer_powers.dm index de4bfd4c5b..311b013ef8 100644 --- a/code/modules/mob/living/simple_animal/borer/borer_powers.dm +++ b/code/modules/mob/living/simple_animal/borer/borer_powers.dm @@ -11,7 +11,7 @@ src << "You cannot leave your host in your current state." if(docile) - src << "\blue You are feeling far too docile to do that." + src << "You are feeling far too docile to do that." return if(!host || !src) return @@ -144,7 +144,7 @@ src << "You cannot do that in your current state." if(docile) - src << "\blue You are feeling far too docile to do that." + src << "You are feeling far too docile to do that." return @@ -212,7 +212,7 @@ src << "You cannot secrete chemicals in your current state." if(docile) - src << "\blue You are feeling far too docile to do that." + src << "You are feeling far too docile to do that." return if(chemicals < 50) @@ -223,7 +223,7 @@ if(!chem || chemicals < 50 || !host || controlling || !src || stat) //Sanity check. return - src << "\red You squirt a measure of [chem] from your reservoirs into [host]'s bloodstream." + src << "You squirt a measure of [chem] from your reservoirs into [host]'s bloodstream." host.reagents.add_reagent(chem, 10) chemicals -= 50 @@ -261,8 +261,8 @@ src << "You cannot infest someone who is already infested!" return - src << "\red You focus your psychic lance on [M] and freeze their limbs with a wave of terrible dread." - M << "\red You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing." + src << "You focus your psychic lance on [M] and freeze their limbs with a wave of terrible dread." + M << "You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing." M.Weaken(10) used_dominate = world.time @@ -281,7 +281,7 @@ return if(docile) - src << "\blue You are feeling far too docile to do that." + src << "You are feeling far too docile to do that." return src << "You begin delicately adjusting your connection to the host brain..." @@ -292,8 +292,8 @@ return else - src << "\red You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system." - host << "\red You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours." + src << "You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system." + host << "You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours." host.add_language("Cortical Link") // host -> brain diff --git a/code/modules/mob/living/simple_animal/borer/say.dm b/code/modules/mob/living/simple_animal/borer/say.dm index e76a02a7e2..440dfa7ff7 100644 --- a/code/modules/mob/living/simple_animal/borer/say.dm +++ b/code/modules/mob/living/simple_animal/borer/say.dm @@ -14,7 +14,7 @@ if (src.client) if(client.prefs.muted & MUTE_IC) - src << "\red You cannot speak in IC (muted)." + src << "You cannot speak in IC (muted)." return if (copytext(message, 1, 2) == "*") diff --git a/code/modules/mob/living/simple_animal/humanoids/syndicate.dm b/code/modules/mob/living/simple_animal/humanoids/syndicate.dm index eebc6c9571..6dbe2fcfa4 100644 --- a/code/modules/mob/living/simple_animal/humanoids/syndicate.dm +++ b/code/modules/mob/living/simple_animal/humanoids/syndicate.dm @@ -96,7 +96,7 @@ /mob/living/simple_animal/hostile/syndicate/melee/bullet_act(var/obj/item/projectile/Proj) if(!Proj) return if(prob(35)) - visible_message("\red [src] blocks [Proj] with its shield!") + visible_message("[src] blocks [Proj] with its shield!") if(Proj.firer) react_to_attack(Proj.firer) return diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 454b58a55c..9dc1c3eedc 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -321,9 +321,9 @@ if (flavor_text && flavor_text != "") var/msg = replacetext(flavor_text, "\n", " ") if(lentext(msg) <= 40) - return "\blue [msg]" + return "[msg]" else - return "\blue [copytext_preserve_html(msg, 1, 37)]... More..." + return "[copytext_preserve_html(msg, 1, 37)]... More..." /* /mob/verb/help() @@ -350,7 +350,7 @@ if(istype(src,/mob/observer/dead)) var/mob/observer/dead/G = src if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted) - usr << "\blue Upon using the antagHUD you forfeighted the ability to join the round." + usr << "Upon using the antagHUD you forfeighted the ability to join the round." return var/deathtimeminutes = round(deathtime / 600) var/pluralcheck = "minute" @@ -371,7 +371,7 @@ log_game("[usr.name]/[usr.key] used abandon mob.") - usr << "\blue Make sure to play a different character, and please roleplay correctly!" + usr << "Make sure to play a different character, and please roleplay correctly!" if(!client) log_game("[usr.key] AM failed due to disconnect.") @@ -432,7 +432,7 @@ if(client.holder && (client.holder.rights & R_ADMIN)) is_admin = 1 else if(stat != DEAD || istype(src, /mob/new_player)) - usr << "\blue You must be observing to use this!" + usr << "You must be observing to use this!" return if(is_admin && stat == DEAD) @@ -616,7 +616,7 @@ if(ishuman(AM)) var/mob/living/carbon/human/H = AM if(H.pull_damage()) - src << "\red Pulling \the [H] in their current condition would probably be a bad idea." + src << "Pulling \the [H] in their current condition would probably be a bad idea." //Attempted fix for people flying away through space when cuffed and dragged. if(ismob(AM)) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index a553d4309c..464baaa142 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -55,17 +55,17 @@ var/mob/living/carbon/C = usr C.toggle_throw_mode() else - usr << "\red This mob type cannot throw items." + usr << "This mob type cannot throw items." return if(NORTHWEST) if(iscarbon(usr)) var/mob/living/carbon/C = usr if(!C.get_active_hand()) - usr << "\red You have nothing to drop in your hand." + usr << "You have nothing to drop in your hand." return drop_item() else - usr << "\red This mob type cannot drop items." + usr << "This mob type cannot drop items." return //This gets called when you press the delete button. @@ -73,7 +73,7 @@ set hidden = 1 if(!usr.pulling) - usr << "\blue You are not pulling anything." + usr << "You are not pulling anything." return usr.stop_pulling() @@ -255,13 +255,13 @@ for(var/mob/M in range(mob, 1)) if(M.pulling == mob) if(!M.restrained() && M.stat == 0 && M.canmove && mob.Adjacent(M)) - src << "\blue You're restrained! You can't move!" + src << "You're restrained! You can't move!" return 0 else M.stop_pulling() if(mob.pinned.len) - src << "\blue You're pinned to a wall by [mob.pinned[1]]!" + src << "You're pinned to a wall by [mob.pinned[1]]!" return 0 move_delay = world.time//set move delay @@ -470,7 +470,7 @@ //Check to see if we slipped if(prob(Process_Spaceslipping(5)) && !buckled) - src << "\blue You slipped!" + src << "You slipped!" src.inertia_dir = src.last_move step(src, src.inertia_dir) return 0 diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm index da68dfc0cc..12bd80f255 100644 --- a/code/modules/mob/mob_transformation_simple.dm +++ b/code/modules/mob/mob_transformation_simple.dm @@ -5,7 +5,7 @@ /mob/proc/change_mob_type(var/new_type = null, var/turf/location = null, var/new_name = null as text, var/delete_old_mob = 0 as num, var/subspecies) if(istype(src,/mob/new_player)) - usr << "\red cannot convert players who have not entered yet." + usr << "cannot convert players who have not entered yet." return if(!new_type) @@ -19,7 +19,7 @@ return if( new_type == /mob/new_player ) - usr << "\red cannot convert into a new_player mob type." + usr << "cannot convert into a new_player mob type." return var/mob/M diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index bbf8bc1e8e..d0546081d1 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -154,7 +154,7 @@ if(href_list["late_join"]) if(!ticker || ticker.current_state != GAME_STATE_PLAYING) - usr << "\red The round is either not ready, or has already finished..." + usr << "The round is either not ready, or has already finished..." return LateChoices() @@ -318,7 +318,7 @@ if (src != usr) return 0 if(!ticker || ticker.current_state != GAME_STATE_PLAYING) - usr << "\red The round is either not ready, or has already finished..." + usr << "The round is either not ready, or has already finished..." return 0 if(!config.enter_allowed) usr << "There is an administrative lock on entering the game!" diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm index 884b7ffc4e..0282af9fe9 100644 --- a/code/modules/mob/new_player/poll.dm +++ b/code/modules/mob/new_player/poll.dm @@ -103,7 +103,7 @@ break if(!found) - usr << "\red Poll question details not found." + usr << "Poll question details not found." return switch(polltype) @@ -360,7 +360,7 @@ break if(!validpoll) - usr << "\red Poll is not valid." + usr << "Poll is not valid." return var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM erro_poll_option WHERE id = [optionid] AND pollid = [pollid]") @@ -373,7 +373,7 @@ break if(!validoption) - usr << "\red Poll option is not valid." + usr << "Poll option is not valid." return var/alreadyvoted = 0 @@ -387,11 +387,11 @@ break if(!multichoice && alreadyvoted) - usr << "\red You already voted in this poll." + usr << "You already voted in this poll." return if(multichoice && (alreadyvoted >= multiplechoiceoptions)) - usr << "\red You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error." + usr << "You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error." return var/adminrank = "Player" @@ -402,7 +402,7 @@ var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_vote (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]')") insert_query.Execute() - usr << "\blue Vote successful." + usr << "Vote successful." usr << browse(null,"window=playerpoll") @@ -427,7 +427,7 @@ break if(!validpoll) - usr << "\red Poll is not valid." + usr << "Poll is not valid." return var/alreadyvoted = 0 @@ -440,7 +440,7 @@ break if(alreadyvoted) - usr << "\red You already sent your feedback for this poll." + usr << "You already sent your feedback for this poll." return var/adminrank = "Player" @@ -460,7 +460,7 @@ var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_textreply (id ,datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (null, Now(), [pollid], '[usr.ckey]', '[usr.client.address]', '[replytext]', '[adminrank]')") insert_query.Execute() - usr << "\blue Feedback logging successful." + usr << "Feedback logging successful." usr << browse(null,"window=playerpoll") @@ -485,7 +485,7 @@ break if(!validpoll) - usr << "\red Poll is not valid." + usr << "Poll is not valid." return var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM erro_poll_option WHERE id = [optionid] AND pollid = [pollid]") @@ -498,7 +498,7 @@ break if(!validoption) - usr << "\red Poll option is not valid." + usr << "Poll option is not valid." return var/alreadyvoted = 0 @@ -511,7 +511,7 @@ break if(alreadyvoted) - usr << "\red You already voted in this poll." + usr << "You already voted in this poll." return var/adminrank = "Player" @@ -522,5 +522,5 @@ var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_vote (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank, rating) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]', [(isnull(rating)) ? "null" : rating])") insert_query.Execute() - usr << "\blue Vote successful." + usr << "Vote successful." usr << browse(null,"window=playerpoll") \ No newline at end of file diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 0a029cf316..f5445e0e5a 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -19,7 +19,7 @@ set category = "IC" if(say_disabled) //This is here to try to identify lag problems - usr << "\red Speech is currently admin-disabled." + usr << "Speech is currently admin-disabled." return message = sanitize(message) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index ccf4678216..085f601aef 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -222,7 +222,7 @@ var/mobpath = input("Which type of mob should [src] turn into?", "Choose a type") in mobtypes if(!safe_animal(mobpath)) - usr << "\red Sorry but this mob type is currently unavailable." + usr << "Sorry but this mob type is currently unavailable." return if(transforming) @@ -256,7 +256,7 @@ var/mobpath = input("Which type of mob should [src] turn into?", "Choose a type") in mobtypes if(!safe_animal(mobpath)) - usr << "\red Sorry but this mob type is currently unavailable." + usr << "Sorry but this mob type is currently unavailable." return var/mob/new_mob = new mobpath(src.loc) diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index c6670d2a30..dff2a9b225 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -96,10 +96,10 @@ var/const/CE_STABLE_THRESHOLD = 0.5 pale = 1 update_body() var/word = pick("dizzy","woosey","faint") - src << "\red You feel [word]" + src << "You feel [word]" if(prob(1)) var/word = pick("dizzy","woosey","faint") - src << "\red You feel [word]" + src << "You feel [word]" if(getOxyLoss() < 20 * threshold_coef) adjustOxyLoss(3 * dmg_coef) else if(blood_volume >= BLOOD_VOLUME_BAD) @@ -113,13 +113,13 @@ var/const/CE_STABLE_THRESHOLD = 0.5 if(prob(15)) Paralyse(rand(1,3)) var/word = pick("dizzy","woosey","faint") - src << "\red You feel extremely [word]" + src << "You feel extremely [word]" else if(blood_volume >= BLOOD_VOLUME_SURVIVE) adjustOxyLoss(5 * dmg_coef) adjustToxLoss(3 * dmg_coef) if(prob(15)) var/word = pick("dizzy","woosey","faint") - src << "\red You feel extremely [word]" + src << "You feel extremely [word]" else //Not enough blood to survive (usually) if(!pale) pale = 1 diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index a7d1ad04ab..cee809d596 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -316,7 +316,7 @@ qdel(src) else - user << "\red You must hold \the [P] steady to burn \the [src]." + user << "You must hold \the [P] steady to burn \the [src]." /obj/item/weapon/paper/Topic(href, href_list) @@ -364,7 +364,7 @@ // check for exploits for(var/bad in paper_blacklist) if(findtext(t,bad)) - usr << "\blue You think to yourself, \"Hm.. this is only paper...\"" + usr << "You think to yourself, \"Hm.. this is only paper...\"" log_admin("PAPER: [usr] ([usr.ckey]) tried to use forbidden word in [src]: [bad].") message_admins("PAPER: [usr] ([usr.ckey]) tried to use forbidden word in [src]: [bad].") return diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 29a62f6f36..d6350b4d90 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -91,7 +91,7 @@ qdel(src) else - user << "\red You must hold \the [P] steady to burn \the [src]." + user << "You must hold \the [P] steady to burn \the [src]." /obj/item/weapon/paper_bundle/examine(mob/user) if(..(user, 1)) diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index c1defc1c75..cafc9641ad 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -156,12 +156,12 @@ src.anchored = 0 disconnect_from_network() else - user << "\red Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!" + user << "Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!" return if(istype(W, /obj/item/weapon/am_containment)) if(fueljar) - user << "\red There is already a [fueljar] inside!" + user << "There is already a [fueljar] inside!" return fueljar = W user.remove_from_mob(W) diff --git a/code/modules/power/antimatter/engine.dm b/code/modules/power/antimatter/engine.dm index a2d4a38ca0..007e67ab22 100644 --- a/code/modules/power/antimatter/engine.dm +++ b/code/modules/power/antimatter/engine.dm @@ -109,7 +109,7 @@ antiH_fuel = residual_matter for(var/mob/M in hearers(src, null)) - M.show_message(text("\red You hear a loud bang!")) + M.show_message(text("You hear a loud bang!")) //Q = k x (delta T) @@ -161,7 +161,7 @@ if(energy > convert2energy(8e-12)) //TOO MUCH ENERGY for(var/mob/M in hearers(src, null)) - M.show_message(text("\red You hear a loud whirring!")) + M.show_message(text("You hear a loud whirring!")) sleep(20) //Q = k x (delta T) @@ -180,7 +180,7 @@ if(energy > convert2energy(8e-12)) //FAR TOO MUCH ENERGY STILL for(var/mob/M in hearers(src, null)) - M.show_message(text("\red BANG!")) + M.show_message(text("BANG!")) new /obj/effect/bhole(src.loc) else //this amount of energy is okay so it does the proper output thing diff --git a/code/modules/power/antimatter/fuel.dm b/code/modules/power/antimatter/fuel.dm index 56098a0b56..707b756ede 100644 --- a/code/modules/power/antimatter/fuel.dm +++ b/code/modules/power/antimatter/fuel.dm @@ -74,9 +74,9 @@ /obj/item/weapon/fuel/proc/injest(mob/M as mob) switch(content) if("Anti-Hydrogen") - M.gib() + M.gib() //Yikes! if("Hydrogen") - M << "\blue You feel very light, as if you might just float away..." + M << "You feel very light, as if you might just float away..." qdel(src) return @@ -95,5 +95,5 @@ return else for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [M] ate the [content ? content : "empty canister"]!"), 1) + O.show_message(text("[M] ate the [content ? content : "empty canister"]!"), 1) src.injest(M) diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 809a0750b0..4c937d5d2a 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -68,7 +68,7 @@ proc/cardinalrange(var/center) /obj/machinery/am_shielding/Destroy() if(control_unit) control_unit.remove_shielding(src) if(processing) shutdown_core() - visible_message("\red The [src.name] melts!") + visible_message("The [src.name] melts!") //Might want to have it leave a mess on the floor but no sprites for now ..() return diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index 2b10a9017d..5042043aec 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -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 << "It seems to be online." else - user << "\red It seems to be offline" + user << "It seems to be offline." /obj/machinery/power/breakerbox/attack_ai(mob/user) if(update_locked) - user << "\red System locked. Please try again later." + user << "System locked. Please try again later." return if(busy) - user << "\red System is busy. Please wait until current operation is finished before changing power settings." + user << "System is busy. Please wait until current operation is finished before changing power settings." return busy = 1 - user << "\green Updating power settings.." + user << "Updating power settings..." if(do_after(user, 50)) set_state(!on) - user << "\green Update Completed. New setting:[on ? "on": "off"]" + user << "Update Completed. New setting:[on ? "on": "off"]" 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 << "System locked. Please try again later." return if(busy) - user << "\red System is busy. Please wait until current operation is finished before changing power settings." + user << "System is busy. Please wait until current operation is finished before changing power settings." return busy = 1 for(var/mob/O in viewers(user)) - O.show_message(text("\red [user] started reprogramming [src]!"), 1) + O.show_message(text("[user] started reprogramming [src]!"), 1) if(do_after(user, 50)) set_state(!on) diff --git a/code/modules/power/fractal_reactor.dm b/code/modules/power/fractal_reactor.dm index 54b46bb92f..91fe1337fe 100644 --- a/code/modules/power/fractal_reactor.dm +++ b/code/modules/power/fractal_reactor.dm @@ -18,7 +18,7 @@ /obj/machinery/power/fractal_reactor/New() ..() if(!mapped_in) - world << "\red WARNING: \black Map testing power source activated at: X:[src.loc.x] Y:[src.loc.y] Z:[src.loc.z]" + world << "WARNING: \black Map testing power source activated at: X:[src.loc.x] Y:[src.loc.y] Z:[src.loc.z]" /obj/machinery/power/fractal_reactor/process() if(!powernet && !powernet_connection_failed) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 0609e18041..dfe01e3cdc 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -529,7 +529,7 @@ if(H.species.can_shred(H)) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) for(var/mob/M in viewers(src)) - M.show_message("\red [user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) + M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) broken() return @@ -815,7 +815,7 @@ /obj/item/weapon/light/proc/shatter() if(status == LIGHT_OK || status == LIGHT_BURNED) - src.visible_message("\red [name] shatters.","\red You hear a small glass object shatter.") + src.visible_message("[name] shatters."," You hear a small glass object shatter.") status = LIGHT_BROKEN force = 5 sharp = 1 diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm index 592fc97f2d..881368a313 100644 --- a/code/modules/power/pacman2.dm +++ b/code/modules/power/pacman2.dm @@ -52,7 +52,7 @@ examine(mob/user) ..(user) - user << "\blue The generator has [P.air_contents.phoron] units of fuel left, producing [power_gen] per cycle." + user << "The generator has [P.air_contents.phoron] units of fuel left, producing [power_gen] per cycle." handleInactive() heat -= 2 @@ -70,28 +70,28 @@ attackby(var/obj/item/O as obj, var/mob/user as mob) if(istype(O, /obj/item/weapon/tank/phoron)) if(P) - user << "\red The generator already has a phoron tank loaded!" + user << "The generator already has a phoron tank loaded!" return P = O user.drop_item() O.loc = src - user << "\blue You add the phoron tank to the generator." + user << "You add the phoron tank to the generator." else if(!active) if(istype(O, /obj/item/weapon/wrench)) anchored = !anchored playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(anchored) - user << "\blue You secure the generator to the floor." + user << "You secure the generator to the floor." else - user << "\blue You unsecure the generator from the floor." + user << "You unsecure the generator from the floor." makepowernets() else if(istype(O, /obj/item/weapon/screwdriver)) open = !open playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(open) - user << "\blue You open the access panel." + user << "You open the access panel." else - user << "\blue You close the access panel." + user << "You close the access panel." else if(istype(O, /obj/item/weapon/crowbar) && !open) var/obj/machinery/constructable_frame/machine_frame/new_frame = new /obj/machinery/constructable_frame/machine_frame(src.loc) for(var/obj/item/I in component_parts) @@ -165,7 +165,7 @@ usr << browse(null, "window=port_gen") usr.machine = null -/obj/machinery/power/port_gen/pacman2/emag_act(var/remaining_uses, var/mob/user) +/obj/machinery/power/port_gen/pacman2/emag_act(var/remaining_uses, var/mob/user) emagged = 1 emp_act(1) return 1 diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 6368e7348d..44e086adf5 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -119,13 +119,13 @@ field_generator power level display "You hear ratchet") src.anchored = 0 if(2) - user << "\red The [src.name] needs to be unwelded from the floor." + user << "The [src.name] needs to be unwelded from the floor." return else if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W switch(state) if(0) - user << "\red The [src.name] needs to be wrenched to the floor." + user << "The [src.name] needs to be wrenched to the floor." return if(1) if (WT.remove_fuel(0,user)) @@ -211,7 +211,7 @@ field_generator power level display return 1 else for(var/mob/M in viewers(src)) - M.show_message("\red \The [src] shuts down!") + M.show_message("\The [src] shuts down!") turn_off() investigate_log("ran out of power and deactivated","singulo") src.power = 0 diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index de0c339c7c..5c90637149 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -343,7 +343,7 @@ total_system_failure(failure_probability, user) return - usr << "\red You have disassembled the SMES cell!" + usr << "You have disassembled the SMES cell!" var/obj/structure/frame/M = new /obj/structure/frame(src.loc) M.frame_type = new /datum/frame/frame_types/machine M.anchored = 1 @@ -372,7 +372,7 @@ W.loc = src recalc_coils() else - usr << "\red You can't insert more coils to this SMES unit!" + usr << "You can't insert more coils to this SMES unit!" // Proc: toggle_input() // Parameters: None diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 88c4ca34ac..c0172ccee1 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -181,7 +181,7 @@ return if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") if(!istype(usr, /mob/living/silicon/ai)) - usr << "\red You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return if (( usr.machine==src && ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai))) @@ -232,7 +232,7 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) - user << "\blue The broken glass falls out." + user << "The broken glass falls out." var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) new /obj/item/weapon/material/shard( src.loc ) var/obj/item/weapon/circuitboard/turbine_control/M = new /obj/item/weapon/circuitboard/turbine_control( A ) @@ -245,7 +245,7 @@ A.anchored = 1 qdel(src) else - user << "\blue You disconnect the monitor." + user << "You disconnect the monitor." var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/turbine_control/M = new /obj/item/weapon/circuitboard/turbine_control( A ) for (var/obj/C in src) diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index dc54c76102..60078127ad 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -31,18 +31,18 @@ /obj/item/ammo_casing/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/screwdriver)) if(!BB) - user << "\blue There is no bullet in the casing to inscribe anything into." + user << "There is no bullet in the casing to inscribe anything into." return var/tmp_label = "" var/label_text = sanitizeSafe(input(user, "Inscribe some text into \the [initial(BB.name)]","Inscription",tmp_label), MAX_NAME_LEN) if(length(label_text) > 20) - user << "\red The inscription can be at most 20 characters long." + user << "The inscription can be at most 20 characters long." else if(!label_text) - user << "\blue You scratch the inscription off of [initial(BB)]." + user << "You scratch the inscription off of [initial(BB)]." BB.name = initial(BB.name) else - user << "\blue You inscribe \"[label_text]\" into \the [initial(BB.name)]." + user << "You inscribe \"[label_text]\" into \the [initial(BB.name)]." BB.name = "[initial(BB.name)] (\"[label_text]\")" /obj/item/ammo_casing/update_icon() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 9cb7292baf..fd39bde20b 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -541,9 +541,9 @@ var/mob/living/carbon/human/M = user mouthshoot = 1 - M.visible_message("\red [user] sticks their gun in their mouth, ready to pull the trigger...") + M.visible_message("[user] sticks their gun in their mouth, ready to pull the trigger...") if(!do_after(user, 40)) - M.visible_message("\blue [user] decided life was worth living") + M.visible_message("[user] decided life was worth living") mouthshoot = 0 return var/obj/item/projectile/in_chamber = consume_next_projectile() diff --git a/code/modules/projectiles/guns/launcher.dm b/code/modules/projectiles/guns/launcher.dm index 1c9a09e4e3..82a6e07fc3 100644 --- a/code/modules/projectiles/guns/launcher.dm +++ b/code/modules/projectiles/guns/launcher.dm @@ -16,7 +16,7 @@ //Override this to avoid a runtime with suicide handling. /obj/item/weapon/gun/launcher/handle_suicide(mob/living/user) - user << "\red Shooting yourself with \a [src] is pretty tricky. You can't seem to manage it." + user << "Shooting yourself with \a [src] is pretty tricky. You can't seem to manage it." return /obj/item/weapon/gun/launcher/proc/update_release_force(obj/item/projectile) diff --git a/code/modules/projectiles/guns/launcher/rocket.dm b/code/modules/projectiles/guns/launcher/rocket.dm index 438485320e..dae5a5c8ee 100644 --- a/code/modules/projectiles/guns/launcher/rocket.dm +++ b/code/modules/projectiles/guns/launcher/rocket.dm @@ -20,7 +20,7 @@ /obj/item/weapon/gun/launcher/rocket/examine(mob/user) if(!..(user, 2)) return - user << "\blue [rockets.len] / [max_rockets] rockets." + user << "[rockets.len] / [max_rockets] rockets." /obj/item/weapon/gun/launcher/rocket/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/ammo_casing/rocket)) @@ -28,10 +28,10 @@ user.drop_item() I.loc = src rockets += I - user << "\blue You put the rocket in [src]." - user << "\blue [rockets.len] / [max_rockets] rockets." + user << "You put the rocket in [src]." + user << "[rockets.len] / [max_rockets] rockets." else - usr << "\red [src] cannot hold more rockets." + usr << "[src] cannot hold more rockets." /obj/item/weapon/gun/launcher/rocket/consume_next_projectile() if(rockets.len) diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index c8c26f5f39..c15e7cda4a 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -99,10 +99,10 @@ M.apply_effect((rand(30,80)),IRRADIATE) M.Weaken(5) for (var/mob/V in viewers(src)) - V.show_message("\red [M] writhes in pain as \his vacuoles boil.", 3, "\red You hear the crunching of leaves.", 2) + V.show_message("[M] writhes in pain as \his vacuoles boil.", 3, "You hear the crunching of leaves.", 2) if(prob(35)) // for (var/mob/V in viewers(src)) //Public messages commented out to prevent possible metaish genetics experimentation and stuff. - Cheridan - // V.show_message("\red [M] is mutated by the radiation beam.", 3, "\red You hear the snapping of twigs.", 2) + // V.show_message("[M] is mutated by the radiation beam.", 3, " You hear the snapping of twigs.", 2) if(prob(80)) randmutb(M) domutcheck(M,null) @@ -111,13 +111,13 @@ domutcheck(M,null) else M.adjustFireLoss(rand(5,15)) - M.show_message("\red The radiation beam singes you!") + M.show_message("The radiation beam singes you!") // for (var/mob/V in viewers(src)) - // V.show_message("\red [M] is singed by the radiation beam.", 3, "\red You hear the crackle of burning leaves.", 2) + // V.show_message("[M] is singed by the radiation beam.", 3, " You hear the crackle of burning leaves.", 2) else if(istype(target, /mob/living/carbon/)) // for (var/mob/V in viewers(src)) // V.show_message("The radiation beam dissipates harmlessly through [M]", 3) - M.show_message("\blue The radiation beam dissipates harmlessly through your body.") + M.show_message("The radiation beam dissipates harmlessly through your body.") else return 1 @@ -148,7 +148,7 @@ if((H.species.flags & IS_PLANT) && (M.nutrition < 500)) M.nutrition += 30 else if (istype(target, /mob/living/carbon/)) - M.show_message("\blue The radiation beam dissipates harmlessly through your body.") + M.show_message("The radiation beam dissipates harmlessly through your body.") else return 1 diff --git a/code/modules/reagents/reagent_containers/food/sandwich.dm b/code/modules/reagents/reagent_containers/food/sandwich.dm index f2b783f90f..5662b7d3ff 100644 --- a/code/modules/reagents/reagent_containers/food/sandwich.dm +++ b/code/modules/reagents/reagent_containers/food/sandwich.dm @@ -23,16 +23,16 @@ sandwich_limit += 4 if(istype(W,/obj/item/weapon/material/shard)) - user << "\blue You hide [W] in \the [src]." + user << "You hide [W] in \the [src]." user.drop_item() W.loc = src update() return else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks)) if(src.contents.len > sandwich_limit) - user << "\red If you put anything else on \the [src] it's going to collapse." + user << "If you put anything else on \the [src] it's going to collapse." return - user << "\blue You layer [W] over \the [src]." + user << "You layer [W] over \the [src]." var/obj/item/weapon/reagent_containers/F = W F.reagents.trans_to_obj(src, F.reagents.total_volume) user.drop_item() @@ -81,7 +81,7 @@ /obj/item/weapon/reagent_containers/food/snacks/csandwich/examine(mob/user) ..(user) var/obj/item/O = pick(contents) - user << "\blue You think you can see [O.name] in there." + user << "You think you can see [O.name] in there." /obj/item/weapon/reagent_containers/food/snacks/csandwich/attack(mob/M as mob, mob/user as mob, def_zone) @@ -96,6 +96,6 @@ H = M if(H && shard && M == user) //This needs a check for feeding the food to other people, but that could be abusable. - H << "\red You lacerate your mouth on a [shard.name] in the sandwich!" - H.adjustBruteLoss(5) //TODO: Target head if human. + H << "You lacerate your mouth on a [shard.name] in the sandwich!" + H.adjustBruteLoss(5) //TODO: Target head if human. //This TODO has been here for 4 years. ..() diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index ef07b03c4f..6c333b8f09 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -130,11 +130,11 @@ if (bitecount==0) return else if (bitecount==1) - user << "\blue \The [src] was bitten by someone!" + user << "\The [src] was bitten by someone!" else if (bitecount<=3) - user << "\blue \The [src] was bitten [bitecount] times!" + user << "\The [src] was bitten [bitecount] times!" else - user << "\blue \The [src] was bitten multiple times!" + user << "\The [src] was bitten multiple times!" /obj/item/weapon/reagent_containers/food/snacks/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W,/obj/item/weapon/storage)) @@ -149,12 +149,12 @@ U.create_reagents(5) if (U.reagents.total_volume > 0) - user << "\red You already have something on your [U]." + user << "You already have something on your [U]." return user.visible_message( \ "[user] scoops up some [src] with \the [U]!", \ - "\blue You scoop up some [src] with \the [U]!" \ + "You scoop up some [src] with \the [U]!" \ ) src.bitecount++ @@ -536,7 +536,7 @@ ..() new/obj/effect/decal/cleanable/egg_smudge(src.loc) src.reagents.splash(hit_atom, reagents.total_volume) - src.visible_message("\red [src.name] has been squashed.","\red You hear a smack.") + src.visible_message("[src.name] has been squashed.","You hear a smack.") qdel(src) /obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -545,10 +545,10 @@ var/clr = C.colourName if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow"))) - usr << "\blue The egg refuses to take on this color!" + usr << "The egg refuses to take on this color!" return - usr << "\blue You color \the [src] [clr]" + usr << "You color \the [src] [clr]" icon_state = "egg-[clr]" else ..() @@ -1262,7 +1262,7 @@ /obj/item/weapon/reagent_containers/food/snacks/popcorn/On_Consume() if(prob(unpopped)) //lol ...what's the point? - usr << "\red You bite down on an un-popped kernel!" + usr << "You bite down on an un-popped kernel!" unpopped = max(0, unpopped-1) ..() diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index dfe5dd0349..fea929006e 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -258,7 +258,7 @@ if (target != user && H.getarmor(target_zone, "melee") > 5 && prob(50)) for(var/mob/O in viewers(world.view, user)) - O.show_message(text("\red [user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!"), 1) + O.show_message(text("[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!"), 1) user.remove_from_mob(src) qdel(src) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index fe440c0c53..ed67be5ea7 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -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 << "You empty the bag." 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("[GM.name] has been placed in the [src] by [user].", 3) qdel(G) usr.attack_log += text("\[[time_stamp()]\] Has placed [GM.name] ([GM.ckey]) in disposals.") GM.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [usr.name] ([usr.ckey])") @@ -233,7 +233,7 @@ return if(user && user.loc == src) - usr << "\red You cannot reach the controls from inside." + usr << "You cannot reach the controls from inside." 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 << "You cannot reach the controls from inside." return if(mode==-1 && !href_list["eject"]) // only allow ejecting if mode is -1 - usr << "\red The disposal units power is disabled." + usr << "The disposal units power is disabled." 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 << "Changed tag to '[sort_tag]'." 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 << "Changed filter to '[sortType]'." updatename() updatedesc() diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 2e29fdcad3..53cf935746 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -57,7 +57,7 @@ if("Description") var/str = sanitize(input(usr,"Label text?","Set label","")) if(!str || !length(str)) - usr << "\red Invalid text." + usr << "Invalid text." 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 << "Invalid text." return if(!examtext && !nameset) examtext = str @@ -293,7 +293,7 @@ else if(src.amount < 3) user << "You need more paper." else - user << "\blue The object you are trying to wrap is unsuitable for the sorting machinery!" + user << "The object you are trying to wrap is unsuitable for the sorting machinery!" 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 << "There are [amount] units of package wrap left!" return diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index d7ce2063b2..fb643cd9f0 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -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("\icon[src] [user] deactivated the shield generator.", \ + "\icon[src] You deactivate the shield generator.", \ "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("\icon[src] [user] activated the shield generator.", \ + "\icon[src] You activate the shield generator.", \ "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 << "You close the panel." is_open = 0 else - user << "\blue You open the panel and expose the wiring." + user << "You open the panel and expose the wiring." 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 << "You unsecure the [src] from the floor!" if(active) - user << "\blue The [src] shuts off!" + user << "The [src] shuts off!" 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 << "You secure the [src] to the floor!" 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 << "Access denied." else ..() diff --git a/code/modules/shieldgen/sheldwallgen.dm b/code/modules/shieldgen/sheldwallgen.dm index 696caa5ed4..300d476056 100644 --- a/code/modules/shieldgen/sheldwallgen.dm +++ b/code/modules/shieldgen/sheldwallgen.dm @@ -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 << "The shield generator needs to be firmly secured to the floor first." return 1 if(src.locked && !istype(user, /mob/living/silicon)) - user << "\red The controls are locked!" + user << "The controls are locked!" return 1 if(power != 1) - user << "\red The shield generator needs to be powered by wire underneath." + user << "The shield generator needs to be powered by wire underneath." 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("The [src.name] shuts down due to lack of power!", \ "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 << "Access denied." else src.add_fingerprint(user) - visible_message("\red The [src.name] has been hit with \the [W.name] by [user.name]!") + visible_message("The [src.name] has been hit with \the [W.name] by [user.name]!") /obj/machinery/shieldwallgen/proc/cleanup(var/NSEW) var/obj/machinery/shieldwall/F diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm index 53ddcec06e..24b6746d08 100644 --- a/code/modules/shieldgen/shield_capacitor.dm +++ b/code/modules/shieldgen/shield_capacitor.dm @@ -38,10 +38,10 @@ user << "Controls are now [src.locked ? "locked." : "unlocked."]" updateDialog() else - user << "\red Access denied." + user << "Access denied." 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("\icon[src] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].") 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 << "The [src] needs to be firmly secured to the floor first." return active = !active if( href_list["charge_rate"] ) diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index 4592140d0d..187eb1eb3a 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -59,10 +59,10 @@ user << "Controls are now [src.locked ? "locked." : "unlocked."]" updateDialog() else - user << "\red Access denied." + user << "Access denied." 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("\icon[src] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].") 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 << "The [src] needs to be firmly secured to the floor first." return toggle() else if( href_list["change_radius"] ) diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index 95c00b412d..31fcc73bc6 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -141,10 +141,10 @@ if(M.client) spawn(0) if(M.buckled) - M << "\red Sudden acceleration presses you into \the [M.buckled]!" + M << "Sudden acceleration presses you into \the [M.buckled]!" shake_camera(M, 3, 1) else - M << "\red The floor lurches beneath you!" + M << "The floor lurches beneath you!" shake_camera(M, 10, 1) if(istype(M, /mob/living/carbon)) if(!M.buckled) diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index 980053bd5d..0da9634b39 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -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 << "Access Denied." return 1 ui_interact(user) diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index 046c315ec9..b80d21b64d 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -35,7 +35,7 @@ /obj/machinery/power/supermatter name = "Supermatter" - desc = "A strangely translucent and iridescent crystal. \red You get headaches just from looking at it." + desc = "A strangely translucent and iridescent crystal. You get headaches just from looking at it." icon = 'icons/obj/engine.dmi' icon_state = "darkmatter" density = 1 @@ -410,7 +410,7 @@ /obj/machinery/power/supermatter/shard //Small subtype, less efficient and more sensitive, but less boom. name = "Supermatter Shard" - desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. \red You get headaches just from looking at it." + desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. You get headaches just from looking at it." icon_state = "darkmatter_shard" base_icon_state = "darkmatter_shard" diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm index 80a7a1f820..6a5a39df73 100644 --- a/code/modules/surgery/bones.dm +++ b/code/modules/surgery/bones.dm @@ -23,21 +23,21 @@ begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected.stage == 0) - user.visible_message("[user] starts applying medication to the damaged bones in [target]'s [affected.name] with \the [tool]." , \ - "You start applying medication to the damaged bones in [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] starts applying medication to the damaged bones in [target]'s [affected.name] with \the [tool]." , \ + "You start applying medication to the damaged bones in [target]'s [affected.name] with \the [tool].") target.custom_pain("Something in your [affected.name] is causing you a lot of pain!", 50) ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] applies some [tool] to [target]'s bone in [affected.name]", \ - "\blue You apply some [tool] to [target]'s bone in [affected.name] with \the [tool].") + user.visible_message("[user] applies some [tool] to [target]'s bone in [affected.name]", \ + "You apply some [tool] to [target]'s bone in [affected.name] with \the [tool].") affected.stage = 1 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \ - "\red Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") + user.visible_message("[user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \ + "Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") /datum/surgery_step/set_bone allowed_tools = list( @@ -56,26 +56,26 @@ begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] is beginning to set the bone in [target]'s [affected.name] in place with \the [tool]." , \ - "You are beginning to set the bone in [target]'s [affected.name] in place with \the [tool].") + user.visible_message("[user] is beginning to set the bone in [target]'s [affected.name] in place with \the [tool]." , \ + "You are beginning to set the bone in [target]'s [affected.name] in place with \the [tool].") target.custom_pain("The pain in your [affected.name] is going to make you pass out!", 50) ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected.status & ORGAN_BROKEN) - user.visible_message("\blue [user] sets the bone in [target]'s [affected.name] in place with \the [tool].", \ - "\blue You set the bone in [target]'s [affected.name] in place with \the [tool].") + user.visible_message("[user] sets the bone in [target]'s [affected.name] in place with \the [tool].", \ + "You set the bone in [target]'s [affected.name] in place with \the [tool].") affected.stage = 2 else - user.visible_message("\blue [user] sets the bone in [target]'s [affected.name]\red in the WRONG place with \the [tool].", \ - "\blue You set the bone in [target]'s [affected.name]\red in the WRONG place with \the [tool].") + user.visible_message("[user] sets the bone in [target]'s [affected.name] in the WRONG place with \the [tool].", \ + "You set the bone in [target]'s [affected.name] in the WRONG place with \the [tool].") affected.fracture() fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!" , \ - "\red Your hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!") + user.visible_message("[user]'s hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!" , \ + "Your hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!") affected.createwound(BRUISE, 5) /datum/surgery_step/mend_skull @@ -94,20 +94,20 @@ return affected && affected.organ_tag == BP_HEAD && (affected.robotic < ORGAN_ROBOT) && affected.open >= 2 && affected.stage == 1 begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] is beginning to piece together [target]'s skull with \the [tool]." , \ - "You are beginning to piece together [target]'s skull with \the [tool].") + user.visible_message("[user] is beginning to piece together [target]'s skull with \the [tool]." , \ + "You are beginning to piece together [target]'s skull with \the [tool].") ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] sets [target]'s skull with \the [tool]." , \ - "\blue You set [target]'s skull with \the [tool].") + user.visible_message("[user] sets [target]'s skull with \the [tool]." , \ + "You set [target]'s skull with \the [tool].") affected.stage = 2 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, damaging [target]'s face with \the [tool]!" , \ - "\red Your hand slips, damaging [target]'s face with \the [tool]!") + user.visible_message("[user]'s hand slips, damaging [target]'s face with \the [tool]!" , \ + "Your hand slips, damaging [target]'s face with \the [tool]!") var/obj/item/organ/external/head/h = affected h.createwound(BRUISE, 10) h.disfigured = 1 @@ -131,18 +131,18 @@ begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].", \ - "You start to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] starts to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].", \ + "You start to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].") ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] has mended the damaged bones in [target]'s [affected.name] with \the [tool]." , \ - "\blue You have mended the damaged bones in [target]'s [affected.name] with \the [tool]." ) + user.visible_message("[user] has mended the damaged bones in [target]'s [affected.name] with \the [tool]." , \ + "You have mended the damaged bones in [target]'s [affected.name] with \the [tool]." ) affected.status &= ~ORGAN_BROKEN affected.stage = 0 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \ - "\red Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") \ No newline at end of file + user.visible_message("[user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \ + "Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") \ No newline at end of file diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm index abcc0621da..c92bf837d3 100644 --- a/code/modules/surgery/encased.dm +++ b/code/modules/surgery/encased.dm @@ -47,8 +47,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] has cut [target]'s [affected.encased] open with \the [tool].", \ - "\blue You have cut [target]'s [affected.encased] open with \the [tool].") + user.visible_message("[user] has cut [target]'s [affected.encased] open with \the [tool].", \ + "You have cut [target]'s [affected.encased] open with \the [tool].") affected.open = 2.5 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -57,8 +57,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!" , \ - "\red Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!" ) + user.visible_message("[user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!" , \ + "Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!" ) affected.createwound(CUT, 20) affected.fracture() @@ -97,8 +97,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\blue [user] forces open [target]'s [affected.encased] with \the [tool]." - var/self_msg = "\blue You force open [target]'s [affected.encased] with \the [tool]." + var/msg = "[user] forces open [target]'s [affected.encased] with \the [tool]." + var/self_msg = "You force open [target]'s [affected.encased] with \the [tool]." user.visible_message(msg, self_msg) affected.open = 3 @@ -113,8 +113,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\red [user]'s hand slips, cracking [target]'s [affected.encased]!" - var/self_msg = "\red Your hand slips, cracking [target]'s [affected.encased]!" + var/msg = "[user]'s hand slips, cracking [target]'s [affected.encased]!" + var/self_msg = "Your hand slips, cracking [target]'s [affected.encased]!" user.visible_message(msg, self_msg) affected.createwound(BRUISE, 20) @@ -154,8 +154,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\blue [user] bends [target]'s [affected.encased] back into place with \the [tool]." - var/self_msg = "\blue You bend [target]'s [affected.encased] back into place with \the [tool]." + var/msg = "[user] bends [target]'s [affected.encased] back into place with \the [tool]." + var/self_msg = "You bend [target]'s [affected.encased] back into place with \the [tool]." user.visible_message(msg, self_msg) affected.open = 2.5 @@ -166,15 +166,15 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\red [user]'s hand slips, bending [target]'s [affected.encased] the wrong way!" - var/self_msg = "\red Your hand slips, bending [target]'s [affected.encased] the wrong way!" + var/msg = "[user]'s hand slips, bending [target]'s [affected.encased] the wrong way!" + var/self_msg = "Your hand slips, bending [target]'s [affected.encased] the wrong way!" user.visible_message(msg, self_msg) affected.createwound(BRUISE, 20) affected.fracture() /*if (prob(40)) //TODO: ORGAN REMOVAL UPDATE. - user.visible_message("\red A rib pierces the lung!") + user.visible_message(" A rib pierces the lung!") target.rupture_lung()*/ /datum/surgery_step/open_encased/mend @@ -211,8 +211,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\blue [user] applied \the [tool] to [target]'s [affected.encased]." - var/self_msg = "\blue You applied \the [tool] to [target]'s [affected.encased]." + var/msg = "[user] applied \the [tool] to [target]'s [affected.encased]." + var/self_msg = "You applied \the [tool] to [target]'s [affected.encased]." user.visible_message(msg, self_msg) affected.open = 2 \ No newline at end of file diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm index 10856bcf89..a0ad788bdd 100644 --- a/code/modules/surgery/face.dm +++ b/code/modules/surgery/face.dm @@ -34,14 +34,14 @@ ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("\blue [user] has cut open [target]'s face and neck with \the [tool]." , \ - "\blue You have cut open [target]'s face and neck with \the [tool].",) + user.visible_message("[user] has cut open [target]'s face and neck with \the [tool]." , \ + " You have cut open[target]'s face and neck with \the [tool].",) target.op_stage.face = 1 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, slicing [target]'s throat wth \the [tool]!" , \ - "\red Your hand slips, slicing [target]'s throat wth \the [tool]!" ) + user.visible_message("[user]'s hand slips, slicing [target]'s throat wth \the [tool]!" , \ + "Your hand slips, slicing [target]'s throat wth \the [tool]!" ) affected.createwound(CUT, 60) target.losebreath += 10 @@ -64,13 +64,13 @@ ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("\blue [user] mends [target]'s vocal cords with \the [tool].", \ - "\blue You mend [target]'s vocal cords with \the [tool].") + user.visible_message("[user] mends [target]'s vocal cords with \the [tool].", \ + "You mend [target]'s vocal cords with \the [tool].") target.op_stage.face = 2 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("\red [user]'s hand slips, clamping [target]'s trachea shut for a moment with \the [tool]!", \ - "\red Your hand slips, clamping [user]'s trachea shut for a moment with \the [tool]!") + user.visible_message("[user]'s hand slips, clamping [target]'s trachea shut for a moment with \the [tool]!", \ + "Your hand slips, clamping [user]'s trachea shut for a moment with \the [tool]!") target.losebreath += 10 /datum/surgery_step/face/fix_face @@ -91,14 +91,14 @@ ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("\blue [user] pulls the skin on [target]'s face back in place with \the [tool].", \ - "\blue You pull the skin on [target]'s face back in place with \the [tool].") + user.visible_message("[user] pulls the skin on [target]'s face back in place with \the [tool].", \ + "You pull the skin on [target]'s face back in place with \the [tool].") target.op_stage.face = 3 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, tearing skin on [target]'s face with \the [tool]!", \ - "\red Your hand slips, tearing skin on [target]'s face with \the [tool]!") + user.visible_message("[user]'s hand slips, tearing skin on [target]'s face with \the [tool]!", \ + "Your hand slips, tearing skin on [target]'s face with \the [tool]!") target.apply_damage(10, BRUTE, affected, sharp=1, sharp=1) /datum/surgery_step/face/cauterize @@ -116,14 +116,14 @@ return ..() && target.op_stage.face > 0 begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] is beginning to cauterize the incision on [target]'s face and neck with \the [tool]." , \ - "You are beginning to cauterize the incision on [target]'s face and neck with \the [tool].") + user.visible_message("[user] is beginning to cauterize the incision on [target]'s face and neck with \the [tool]." , \ + "You are beginning to cauterize the incision on [target]'s face and neck with \the [tool].") ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] cauterizes the incision on [target]'s face and neck with \the [tool].", \ - "\blue You cauterize the incision on [target]'s face and neck with \the [tool].") + user.visible_message("[user] cauterizes the incision on [target]'s face and neck with \the [tool].", \ + "You cauterize the incision on [target]'s face and neck with \the [tool].") affected.open = 0 affected.status &= ~ORGAN_BLEEDING if (target.op_stage.face == 3) @@ -133,6 +133,6 @@ fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, leaving a small burn on [target]'s face with \the [tool]!", \ - "\red Your hand slips, leaving a small burn on [target]'s face with \the [tool]!") + user.visible_message("[user]'s hand slips, leaving a small burn on [target]'s face with \the [tool]!", \ + "Your hand slips, leaving a small burn on [target]'s face with \the [tool]!") target.apply_damage(4, BURN, affected) \ No newline at end of file diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 513b6096dc..8bbfaac718 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -47,8 +47,8 @@ end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] has made a bloodless incision on [target]'s [affected.name] with \the [tool].", \ - "\blue You have made a bloodless incision on [target]'s [affected.name] with \the [tool].",) + user.visible_message("[user] has made a bloodless incision on [target]'s [affected.name] with \the [tool].", \ + "You have made a bloodless incision on [target]'s [affected.name] with \the [tool].",) //Could be cleaner ... affected.open = 1 @@ -58,8 +58,8 @@ fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips as the blade sputters, searing a long gash in [target]'s [affected.name] with \the [tool]!", \ - "\red Your hand slips as the blade sputters, searing a long gash in [target]'s [affected.name] with \the [tool]!") + user.visible_message("[user]'s hand slips as the blade sputters, searing a long gash in [target]'s [affected.name] with \the [tool]!", \ + "Your hand slips as the blade sputters, searing a long gash in [target]'s [affected.name] with \the [tool]!") affected.createwound(CUT, 7.5) affected.createwound(BURN, 12.5) @@ -86,8 +86,8 @@ end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] has constructed a prepared incision on and within [target]'s [affected.name] with \the [tool].", \ - "\blue You have constructed a prepared incision on and within [target]'s [affected.name] with \the [tool].",) + user.visible_message("[user] has constructed a prepared incision on and within [target]'s [affected.name] with \the [tool].", \ + "You have constructed a prepared incision on and within [target]'s [affected.name] with \the [tool].",) affected.open = 1 if(istype(target) && target.should_have_organ(O_HEART)) @@ -99,8 +99,8 @@ fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand jolts as the system sparks, ripping a gruesome hole in [target]'s [affected.name] with \the [tool]!", \ - "\red Your hand jolts as the system sparks, ripping a gruesome hole in [target]'s [affected.name] with \the [tool]!") + user.visible_message("[user]'s hand jolts as the system sparks, ripping a gruesome hole in [target]'s [affected.name] with \the [tool]!", \ + "Your hand jolts as the system sparks, ripping a gruesome hole in [target]'s [affected.name] with \the [tool]!") affected.createwound(CUT, 20) affected.createwound(BURN, 15) @@ -129,8 +129,8 @@ end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] has made an incision on [target]'s [affected.name] with \the [tool].", \ - "\blue You have made an incision on [target]'s [affected.name] with \the [tool].",) + user.visible_message("[user] has made an incision on [target]'s [affected.name] with \the [tool].", \ + "You have made an incision on [target]'s [affected.name] with \the [tool].",) affected.open = 1 if(istype(target) && target.should_have_organ(O_HEART)) @@ -140,8 +140,8 @@ fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, slicing open [target]'s [affected.name] in the wrong place with \the [tool]!", \ - "\red Your hand slips, slicing open [target]'s [affected.name] in the wrong place with \the [tool]!") + user.visible_message("[user]'s hand slips, slicing open [target]'s [affected.name] in the wrong place with \the [tool]!", \ + "Your hand slips, slicing open [target]'s [affected.name] in the wrong place with \the [tool]!") affected.createwound(CUT, 10) /datum/surgery_step/generic/clamp_bleeders @@ -168,15 +168,15 @@ end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] clamps bleeders in [target]'s [affected.name] with \the [tool].", \ - "\blue You clamp bleeders in [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] clamps bleeders in [target]'s [affected.name] with \the [tool].", \ + "You clamp bleeders in [target]'s [affected.name] with \the [tool].") affected.clamp() spread_germs_to_organ(affected, user) fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, tearing blood vessals and causing massive bleeding in [target]'s [affected.name] with \the [tool]!", \ - "\red Your hand slips, tearing blood vessels and causing massive bleeding in [target]'s [affected.name] with \the [tool]!",) + user.visible_message("[user]'s hand slips, tearing blood vessals and causing massive bleeding in [target]'s [affected.name] with \the [tool]!", \ + "Your hand slips, tearing blood vessels and causing massive bleeding in [target]'s [affected.name] with \the [tool]!",) affected.createwound(CUT, 10) /datum/surgery_step/generic/retract_skin @@ -210,27 +210,27 @@ end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\blue [user] keeps the incision open on [target]'s [affected.name] with \the [tool]." - var/self_msg = "\blue You keep the incision open on [target]'s [affected.name] with \the [tool]." + var/msg = "[user] keeps the incision open on [target]'s [affected.name] with \the [tool]." + var/self_msg = "You keep the incision open on [target]'s [affected.name] with \the [tool]." if (target_zone == BP_TORSO) - msg = "\blue [user] keeps the ribcage open on [target]'s torso with \the [tool]." - self_msg = "\blue You keep the ribcage open on [target]'s torso with \the [tool]." + msg = "[user] keeps the ribcage open on [target]'s torso with \the [tool]." + self_msg = "You keep the ribcage open on [target]'s torso with \the [tool]." if (target_zone == BP_GROIN) - msg = "\blue [user] keeps the incision open on [target]'s lower abdomen with \the [tool]." - self_msg = "\blue You keep the incision open on [target]'s lower abdomen with \the [tool]." + msg = "[user] keeps the incision open on [target]'s lower abdomen with \the [tool]." + self_msg = "You keep the incision open on [target]'s lower abdomen with \the [tool]." user.visible_message(msg, self_msg) affected.open = 2 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\red [user]'s hand slips, tearing the edges of the incision on [target]'s [affected.name] with \the [tool]!" - var/self_msg = "\red Your hand slips, tearing the edges of the incision on [target]'s [affected.name] with \the [tool]!" + var/msg = "[user]'s hand slips, tearing the edges of the incision on [target]'s [affected.name] with \the [tool]!" + var/self_msg = "Your hand slips, tearing the edges of the incision on [target]'s [affected.name] with \the [tool]!" if (target_zone == BP_TORSO) - msg = "\red [user]'s hand slips, damaging several organs in [target]'s torso with \the [tool]!" - self_msg = "\red Your hand slips, damaging several organs in [target]'s torso with \the [tool]!" + msg = "[user]'s hand slips, damaging several organs in [target]'s torso with \the [tool]!" + self_msg = "Your hand slips, damaging several organs in [target]'s torso with \the [tool]!" if (target_zone == BP_GROIN) - msg = "\red [user]'s hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]" - self_msg = "\red Your hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]!" + msg = "[user]'s hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]!" + self_msg = "Your hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]!" user.visible_message(msg, self_msg) target.apply_damage(12, BRUTE, affected, sharp=1) @@ -259,16 +259,16 @@ end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] cauterizes the incision on [target]'s [affected.name] with \the [tool].", \ - "\blue You cauterize the incision on [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] cauterizes the incision on [target]'s [affected.name] with \the [tool].", \ + "You cauterize the incision on [target]'s [affected.name] with \the [tool].") affected.open = 0 affected.germ_level = 0 affected.status &= ~ORGAN_BLEEDING fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!", \ - "\red Your hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!") + user.visible_message("[user]'s hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!", \ + "Your hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!") target.apply_damage(3, BURN, affected) /datum/surgery_step/generic/amputate @@ -300,13 +300,13 @@ end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool].", \ - "\blue You amputate [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool].", \ + "You amputate [target]'s [affected.name] with \the [tool].") affected.droplimb(1,DROPLIMB_EDGE) fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!", \ - "\red Your hand slips, sawwing through the bone in [target]'s [affected.name] with \the [tool]!") + user.visible_message("[user]'s hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!", \ + "Your hand slips, sawwing through the bone in [target]'s [affected.name] with \the [tool]!") affected.createwound(CUT, 30) affected.fracture() diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index 48aca377ee..c58a927b52 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -34,8 +34,8 @@ fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!", \ - "\red Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!") + user.visible_message("[user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!", \ + "Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!") affected.createwound(CUT, 20) /datum/surgery_step/cavity/make_space @@ -63,8 +63,8 @@ end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] makes some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", \ - "\blue You make some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]." ) + user.visible_message("[user] makes some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", \ + "You make some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]." ) /datum/surgery_step/cavity/close_space priority = 2 @@ -93,8 +93,8 @@ end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] mends [target]'s [get_cavity(affected)] cavity walls with \the [tool].", \ - "\blue You mend [target]'s [get_cavity(affected)] cavity walls with \the [tool]." ) + user.visible_message("[user] mends [target]'s [get_cavity(affected)] cavity walls with \the [tool].", \ + " You mend[target]'s [get_cavity(affected)] cavity walls with \the [tool]." ) /datum/surgery_step/cavity/place_item priority = 0 @@ -118,18 +118,18 @@ begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts putting \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ - "You start putting \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) + user.visible_message("[user] starts putting \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ + "You start putting \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) //Nobody will probably ever see this, but I made these two blue. ~CK target.custom_pain("The pain in your chest is living hell!",1) ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ - "\blue You put \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) + user.visible_message("[user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ + "You put \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) if (tool.w_class > get_max_wclass(affected)/2 && prob(50) && (affected.robotic < ORGAN_ROBOT)) - user << "\red You tear some blood vessels trying to fit such a big object in this cavity." + user << " You tear some blood vessels trying to fit such a big object in this cavity." var/datum/wound/internal_bleeding/I = new (10) affected.wounds += I affected.owner.custom_pain("You feel something rip in your [affected.name]!", 1) @@ -162,8 +162,8 @@ begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts poking around inside [target]'s [affected.name] with \the [tool].", \ - "You start poking around inside [target]'s [affected.name] with \the [tool]" ) + user.visible_message("[user] starts poking around inside [target]'s [affected.name] with \the [tool].", \ + "You start poking around inside [target]'s [affected.name] with \the [tool]." ) target.custom_pain("The pain in your [affected.name] is living hell!",1) ..() @@ -186,8 +186,8 @@ find_prob +=50 if (prob(find_prob)) - user.visible_message("\blue [user] takes something out of incision on [target]'s [affected.name] with \the [tool].", \ - "\blue You take [obj] out of incision on [target]'s [affected.name]s with \the [tool]." ) + user.visible_message("[user] takes something out of incision on [target]'s [affected.name] with \the [tool]!", \ + "You take [obj] out of incision on [target]'s [affected.name]s with \the [tool]!" ) affected.implants -= obj BITSET(target.hud_updateflag, IMPLOYAL_HUD) @@ -208,11 +208,11 @@ imp.imp_in = null imp.implanted = 0 else - user.visible_message("\blue [user] removes \the [tool] from [target]'s [affected.name].", \ - "\blue There's something inside [target]'s [affected.name], but you just missed it this time." ) + user.visible_message("[user] removes \the [tool] from [target]'s [affected.name].", \ + "There's something inside [target]'s [affected.name], but you just missed it this time." ) else - user.visible_message("\blue [user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.", \ - "\blue You could not find anything inside [target]'s [affected.name]." ) + user.visible_message("[user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.", \ + "You could not find anything inside [target]'s [affected.name]." ) fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) ..() @@ -222,7 +222,7 @@ fail_prob += 100 - tool_quality(tool) if (prob(fail_prob)) var/obj/item/weapon/implant/imp = affected.implants[1] - user.visible_message("\red Something beeps inside [target]'s [affected.name]!") + user.visible_message(" Something beeps inside [target]'s [affected.name]!") playsound(imp.loc, 'sound/items/countdown.ogg', 75, 1, -3) spawn(25) imp.activate() diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index 176724290f..0bc086dd9d 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -38,8 +38,8 @@ end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] has patched the damaged vein in [target]'s [affected.name] with \the [tool].", \ - "\blue You have patched the damaged vein in [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] has patched the damaged vein in [target]'s [affected.name] with \the [tool].", \ + "You have patched the damaged vein in [target]'s [affected.name] with \the [tool].") for(var/datum/wound/W in affected.wounds) if(W.internal) affected.wounds -= W @@ -48,8 +48,8 @@ fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \ - "\red Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") + user.visible_message("[user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \ + "Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") affected.take_damage(5, 0) /datum/surgery_step/fix_dead_tissue //Debridement @@ -86,14 +86,14 @@ end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] has cut away necrotic tissue in [target]'s [affected.name] with \the [tool].", \ - "\blue You have cut away necrotic tissue in [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] has cut away necrotic tissue in [target]'s [affected.name] with \the [tool].", \ + "You have cut away necrotic tissue in [target]'s [affected.name] with \the [tool].") affected.open = 3 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!", \ - "\red Your hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!") + user.visible_message("[user]'s hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!", \ + "Your hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!") affected.createwound(CUT, 20, 1) /datum/surgery_step/treat_necrosis @@ -149,8 +149,8 @@ affected.status &= ~ORGAN_DEAD affected.owner.update_body(1) - user.visible_message("\blue [user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name]", \ - "\blue You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name].", \ + "You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].") fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -162,8 +162,8 @@ var/trans = container.reagents.trans_to_mob(target, container.amount_per_transfer_from_this, CHEM_BLOOD) - user.visible_message("\red [user]'s hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.name] with the [tool]!" , \ - "\red Your hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.name] with the [tool]!") + user.visible_message("[user]'s hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.name] with the [tool]!" , \ + "Your hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.name] with the [tool]!") //no damage or anything, just wastes medicine diff --git a/code/modules/surgery/slimes.dm b/code/modules/surgery/slimes.dm index c423c8c49b..038dc7f6d4 100644 --- a/code/modules/surgery/slimes.dm +++ b/code/modules/surgery/slimes.dm @@ -27,13 +27,13 @@ "You start cutting through [target]'s flesh with \the [tool].") end_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - user.visible_message("\blue [user] cuts through [target]'s flesh with \the [tool].", \ - "\blue You cut through [target]'s flesh with \the [tool], revealing its silky innards.") + user.visible_message("[user] cuts through [target]'s flesh with \the [tool].", \ + "You cut through [target]'s flesh with \the [tool], revealing its silky innards.") target.core_removal_stage = 1 fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - user.visible_message("\red [user]'s hand slips, tearing [target]'s flesh with \the [tool]!", \ - "\red Your hand slips, tearing [target]'s flesh with \the [tool]!") + user.visible_message("[user]'s hand slips, tearing [target]'s flesh with \the [tool]!", \ + "Your hand slips, tearing [target]'s flesh with \the [tool]!") /datum/surgery_step/slime/cut_innards allowed_tools = list( @@ -53,13 +53,13 @@ "You start cutting [target]'s silky innards apart with \the [tool].") end_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - user.visible_message("\blue [user] cuts [target]'s innards apart with \the [tool], exposing the cores.", \ - "\blue You cut [target]'s innards apart with \the [tool], exposing the cores.") + user.visible_message("[user] cuts [target]'s innards apart with \the [tool], exposing the cores.", \ + "You cut [target]'s innards apart with \the [tool], exposing the cores.") target.core_removal_stage = 2 fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - user.visible_message("\red [user]'s hand slips, tearing [target]'s innards with \the [tool]!", \ - "\red Your hand slips, tearing [target]'s innards with \the [tool]!") + user.visible_message("[user]'s hand slips, tearing [target]'s innards with \the [tool]!", \ + "Your hand slips, tearing [target]'s innards with \the [tool]!") /datum/surgery_step/slime/saw_core allowed_tools = list( @@ -79,8 +79,8 @@ end_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) target.cores-- - user.visible_message("\blue [user] cuts out one of [target]'s cores with \the [tool].",, \ - "\blue You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left.") + user.visible_message("[user] cuts out one of [target]'s cores with \the [tool].",, \ + "You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left.") if(target.cores >= 0) new target.coretype(target.loc) @@ -89,5 +89,5 @@ fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - user.visible_message("\red [user]'s hand slips, causing \him to miss the core!", \ - "\red Your hand slips, causing you to miss the core!") \ No newline at end of file + user.visible_message("[user]'s hand slips, causing \him to miss the core!", \ + "Your hand slips, causing you to miss the core!") \ No newline at end of file diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index a8ff23a91f..7d6acc5fae 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -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("\red \The [src] ran over [H]!") + D << "You ran over [H]!" + visible_message("\The [src] ran over [H]!") attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])") msg_admin_attack("[D.name] ([D.ckey]) ran over [H.name] ([H.ckey]). (JMP)") else diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm index d6c0b934e1..59396f9daa 100644 --- a/code/modules/vehicles/train.dm +++ b/code/modules/vehicles/train.dm @@ -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("[src] knocks over [M]!") 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 << "You hit [M]!" msg_admin_attack("[D.name] ([D.ckey]) hit [M.name] ([M.ckey]) with [src]. (JMP)") @@ -85,7 +85,7 @@ unload(user, direction) - user << "\blue You climb down from [src]." + user << "You climb down from [src]." return 1 @@ -96,7 +96,7 @@ latch(C, user) else if(!load(C)) - user << "\red You were unable to load [C] on [src]." + user << "You were unable to load [C] on [src]." /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 << "[src] is too far away from [T] to hitch them together." return if (lead) - user << "\red [src] is already hitched to something." + user << "[src] is already hitched to something." return if (T.tow) - user << "\red [T] is already towing something." + user << "[T] is already towing something." 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 << "That seems very silly." return next_car = next_car.lead @@ -159,7 +159,7 @@ set_dir(lead.dir) if(user) - user << "\blue You hitch [src] to [T]." + user << "You hitch [src] to [T]." 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 << "[src] is not hitched to anything." return lead.tow = null lead.update_stats() - user << "\blue You unhitch [src] from [lead]." + user << "You unhitch [src] from [lead]." lead = null update_stats() diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 4da307cb91..43197eebe0 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -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("[user] repairs [src]!"," You repair [src]!") else user << "Unable to repair with the maintenance panel closed." else @@ -189,7 +189,7 @@ return 1 /obj/vehicle/proc/explode() - src.visible_message("\red [src] blows apart!", 1) + src.visible_message("[src] blows apart!", 1) var/turf/Tsec = get_turf(src) new /obj/item/stack/rods(Tsec) diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm index 310f223159..b0947e94a6 100644 --- a/code/modules/virus2/effect.dm +++ b/code/modules/virus2/effect.dm @@ -123,7 +123,7 @@ activate(var/mob/living/carbon/mob,var/multiplier) mob.suiciding = 30 //instead of killing them instantly, just put them at -175 health and let 'em gasp for a while - viewers(mob) << "\red [mob.name] is holding \his breath. It looks like \he's trying to commit suicide." + viewers(mob) << "[mob.name] is holding \his breath. It looks like \he's trying to commit suicide." mob.adjustOxyLoss(175 - mob.getToxLoss() - mob.getFireLoss() - mob.getBruteLoss() - mob.getOxyLoss()) mob.updatehealth() diff --git a/code/modules/xenoarcheaology/artifacts/artifact.dm b/code/modules/xenoarcheaology/artifacts/artifact.dm index a8472245a2..e0ba3b1a3f 100644 --- a/code/modules/xenoarcheaology/artifacts/artifact.dm +++ b/code/modules/xenoarcheaology/artifacts/artifact.dm @@ -160,7 +160,7 @@ /obj/machinery/artifact/attack_hand(var/mob/user as mob) if (get_dist(user, src) > 1) - user << "\red You can't reach [src] from here." + user << "You can't reach [src] from here." return if(ishuman(user) && user:gloves) user << "You touch [src] with your gloved hands, [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")]." diff --git a/code/modules/xenoarcheaology/artifacts/crystal.dm b/code/modules/xenoarcheaology/artifacts/crystal.dm index 1f922c64ba..c090c23a3f 100644 --- a/code/modules/xenoarcheaology/artifacts/crystal.dm +++ b/code/modules/xenoarcheaology/artifacts/crystal.dm @@ -17,7 +17,7 @@ "It's mesmerizing to behold.") /obj/structure/crystal/Destroy() - src.visible_message("\red[src] shatters!") + src.visible_message("[src] shatters!") if(prob(75)) new /obj/item/weapon/material/shard/phoron(src.loc) if(prob(50)) diff --git a/code/modules/xenoarcheaology/effect.dm b/code/modules/xenoarcheaology/effect.dm index 85425c147e..7a922f1149 100644 --- a/code/modules/xenoarcheaology/effect.dm +++ b/code/modules/xenoarcheaology/effect.dm @@ -53,7 +53,7 @@ var/atom/toplevelholder = holder while(!istype(toplevelholder.loc, /turf)) toplevelholder = toplevelholder.loc - toplevelholder.visible_message("\red \icon[toplevelholder] [toplevelholder] [display_msg]") + toplevelholder.visible_message("\icon[toplevelholder] [toplevelholder] [display_msg]") /datum/artifact_effect/proc/DoEffectTouch(var/mob/user) /datum/artifact_effect/proc/DoEffectAura(var/atom/holder) diff --git a/code/modules/xenoarcheaology/effects/cellcharge.dm b/code/modules/xenoarcheaology/effects/cellcharge.dm index 3a30c0646f..1ce4233c39 100644 --- a/code/modules/xenoarcheaology/effects/cellcharge.dm +++ b/code/modules/xenoarcheaology/effects/cellcharge.dm @@ -10,7 +10,7 @@ var/mob/living/silicon/robot/R = user for (var/obj/item/weapon/cell/D in R.contents) D.charge += rand() * 100 + 50 - R << "\blue SYSTEM ALERT: Large energy boost detected!" + R << "SYSTEM ALERT: Large energy boost detected!" return 1 /datum/artifact_effect/cellcharge/DoEffectAura() @@ -25,7 +25,7 @@ for (var/obj/item/weapon/cell/D in M.contents) D.charge += 25 if(world.time - last_message > 200) - M << "\blue SYSTEM ALERT: Energy boost detected!" + M << "SYSTEM ALERT: Energy boost detected!" last_message = world.time return 1 @@ -41,6 +41,6 @@ for (var/obj/item/weapon/cell/D in M.contents) D.charge += rand() * 100 if(world.time - last_message > 200) - M << "\blue SYSTEM ALERT: Energy boost detected!" + M << "SYSTEM ALERT: Energy boost detected!" last_message = world.time return 1 diff --git a/code/modules/xenoarcheaology/effects/celldrain.dm b/code/modules/xenoarcheaology/effects/celldrain.dm index f988fdf20e..4c27aaf134 100644 --- a/code/modules/xenoarcheaology/effects/celldrain.dm +++ b/code/modules/xenoarcheaology/effects/celldrain.dm @@ -10,7 +10,7 @@ var/mob/living/silicon/robot/R = user for (var/obj/item/weapon/cell/D in R.contents) D.charge = max(D.charge - rand() * 100, 0) - R << "\blue SYSTEM ALERT: Energy drain detected!" + R << "SYSTEM ALERT: Energy drain detected!" return 1 return 1 @@ -27,7 +27,7 @@ for (var/obj/item/weapon/cell/D in M.contents) D.charge = max(D.charge - 50,0) if(world.time - last_message > 200) - M << "\red SYSTEM ALERT: Energy drain detected!" + M << "SYSTEM ALERT: Energy drain detected!" last_message = world.time return 1 @@ -43,6 +43,6 @@ for (var/obj/item/weapon/cell/D in M.contents) D.charge = max(D.charge - rand() * 150,0) if(world.time - last_message > 200) - M << "\red SYSTEM ALERT: Energy drain detected!" + M << "SYSTEM ALERT: Energy drain detected!" last_message = world.time return 1 diff --git a/code/modules/xenoarcheaology/effects/cold.dm b/code/modules/xenoarcheaology/effects/cold.dm index b4f7025afb..3c7438f93e 100644 --- a/code/modules/xenoarcheaology/effects/cold.dm +++ b/code/modules/xenoarcheaology/effects/cold.dm @@ -11,7 +11,7 @@ /datum/artifact_effect/cold/DoEffectTouch(var/mob/user) if(holder) - user << "\blue A chill passes up your spine!" + user << "A chill passes up your spine!" var/datum/gas_mixture/env = holder.loc.return_air() if(env) env.temperature = max(env.temperature - rand(5,50), 0) diff --git a/code/modules/xenoarcheaology/effects/dnaswitch.dm b/code/modules/xenoarcheaology/effects/dnaswitch.dm index 82165f6ad8..a32cbb8d63 100644 --- a/code/modules/xenoarcheaology/effects/dnaswitch.dm +++ b/code/modules/xenoarcheaology/effects/dnaswitch.dm @@ -14,13 +14,13 @@ /datum/artifact_effect/dnaswitch/DoEffectTouch(var/mob/toucher) var/weakness = GetAnomalySusceptibility(toucher) if(ishuman(toucher) && prob(weakness * 100)) - toucher << pick("\green You feel a little different.", - "\green You feel very strange.", - "\green Your stomach churns.", - "\green Your skin feels loose.", - "\green You feel a stabbing pain in your head.", - "\green You feel a tingling sensation in your chest.", - "\green Your entire body vibrates.") + toucher << pick("You feel a little different.", + "You feel very strange.", + "Your stomach churns.", + "Your skin feels loose.", + "You feel a stabbing pain in your head.", + "You feel a tingling sensation in your chest.", + "Your entire body vibrates.") if(prob(75)) scramble(1, toucher, weakness * severity) else @@ -34,13 +34,13 @@ var/weakness = GetAnomalySusceptibility(H) if(prob(weakness * 100)) if(prob(30)) - H << pick("\green You feel a little different.", - "\green You feel very strange.", - "\green Your stomach churns.", - "\green Your skin feels loose.", - "\green You feel a stabbing pain in your head.", - "\green You feel a tingling sensation in your chest.", - "\green Your entire body vibrates.") + H << pick("You feel a little different.", + "You feel very strange.", + "Your stomach churns.", + "Your skin feels loose.", + "You feel a stabbing pain in your head.", + "You feel a tingling sensation in your chest.", + "Your entire body vibrates.") if(prob(50)) scramble(1, H, weakness * severity) else @@ -53,13 +53,13 @@ var/weakness = GetAnomalySusceptibility(H) if(prob(weakness * 100)) if(prob(75)) - H << pick("\green You feel a little different.", - "\green You feel very strange.", - "\green Your stomach churns.", - "\green Your skin feels loose.", - "\green You feel a stabbing pain in your head.", - "\green You feel a tingling sensation in your chest.", - "\green Your entire body vibrates.") + H << pick(" You feel a little different.", + " You feel very strange.", + " Your stomach churns.", + " Your skin feels loose.", + " You feel a stabbing pain in your head.", + " You feel a tingling sensation in your chest.", + " Your entire body vibrates.") if(prob(25)) if(prob(75)) scramble(1, H, weakness * severity) diff --git a/code/modules/xenoarcheaology/effects/heal.dm b/code/modules/xenoarcheaology/effects/heal.dm index 275f25e3d3..963a0de295 100644 --- a/code/modules/xenoarcheaology/effects/heal.dm +++ b/code/modules/xenoarcheaology/effects/heal.dm @@ -8,7 +8,7 @@ var/weakness = GetAnomalySusceptibility(toucher) if(prob(weakness * 100)) var/mob/living/carbon/C = toucher - C << "\blue You feel a soothing energy invigorate you." + C << "You feel a soothing energy invigorate you." if(ishuman(toucher)) var/mob/living/carbon/human/H = toucher @@ -40,7 +40,7 @@ var/weakness = GetAnomalySusceptibility(C) if(prob(weakness * 100)) if(prob(10)) - C << "\blue You feel a soothing energy radiating from something nearby." + C << "You feel a soothing energy radiating from something nearby." C.adjustBruteLoss(-1 * weakness) C.adjustFireLoss(-1 * weakness) C.adjustToxLoss(-1 * weakness) @@ -55,7 +55,7 @@ for (var/mob/living/carbon/C in range(src.effectrange,T)) var/weakness = GetAnomalySusceptibility(C) if(prob(weakness * 100)) - C << "\blue A wave of energy invigorates you." + C << "A wave of energy invigorates you." C.adjustBruteLoss(-5 * weakness) C.adjustFireLoss(-5 * weakness) C.adjustToxLoss(-5 * weakness) diff --git a/code/modules/xenoarcheaology/effects/heat.dm b/code/modules/xenoarcheaology/effects/heat.dm index 00d57ff40a..d8fd581faf 100644 --- a/code/modules/xenoarcheaology/effects/heat.dm +++ b/code/modules/xenoarcheaology/effects/heat.dm @@ -11,7 +11,7 @@ /datum/artifact_effect/heat/DoEffectTouch(var/mob/user) if(holder) - user << "\red You feel a wave of heat travel up your spine!" + user << " You feel a wave of heat travel up your spine!" var/datum/gas_mixture/env = holder.loc.return_air() if(env) env.temperature += rand(5,50) diff --git a/code/modules/xenoarcheaology/effects/roboheal.dm b/code/modules/xenoarcheaology/effects/roboheal.dm index 4f852869a4..5e714ece47 100644 --- a/code/modules/xenoarcheaology/effects/roboheal.dm +++ b/code/modules/xenoarcheaology/effects/roboheal.dm @@ -10,7 +10,7 @@ if(user) if (istype(user, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = user - R << "\blue Your systems report damaged components mending by themselves!" + R << "Your systems report damaged components mending by themselves!" R.adjustBruteLoss(rand(-10,-30)) R.adjustFireLoss(rand(-10,-30)) return 1 @@ -20,7 +20,7 @@ var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) if(world.time - last_message > 200) - M << "\blue SYSTEM ALERT: Beneficial energy field detected!" + M << "SYSTEM ALERT: Beneficial energy field detected!" last_message = world.time M.adjustBruteLoss(-1) M.adjustFireLoss(-1) @@ -32,7 +32,7 @@ var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) if(world.time - last_message > 200) - M << "\blue SYSTEM ALERT: Structural damage has been repaired by energy pulse!" + M << "SYSTEM ALERT: Structural damage has been repaired by energy pulse!" last_message = world.time M.adjustBruteLoss(-10) M.adjustFireLoss(-10) diff --git a/code/modules/xenoarcheaology/effects/robohurt.dm b/code/modules/xenoarcheaology/effects/robohurt.dm index 3487bf7a4e..687c41e8e4 100644 --- a/code/modules/xenoarcheaology/effects/robohurt.dm +++ b/code/modules/xenoarcheaology/effects/robohurt.dm @@ -10,7 +10,7 @@ if(user) if (istype(user, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = user - R << "\red Your systems report severe damage has been inflicted!" + R << "Your systems report severe damage has been inflicted!" R.adjustBruteLoss(rand(10,50)) R.adjustFireLoss(rand(10,50)) return 1 @@ -20,7 +20,7 @@ var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) if(world.time - last_message > 200) - M << "\red SYSTEM ALERT: Harmful energy field detected!" + M << "SYSTEM ALERT: Harmful energy field detected!" last_message = world.time M.adjustBruteLoss(1) M.adjustFireLoss(1) @@ -32,7 +32,7 @@ var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) if(world.time - last_message > 200) - M << "\red SYSTEM ALERT: Structural damage inflicted by energy pulse!" + M << "SYSTEM ALERT: Structural damage inflicted by energy pulse!" last_message = world.time M.adjustBruteLoss(10) M.adjustFireLoss(10) diff --git a/code/modules/xenoarcheaology/effects/sleepy.dm b/code/modules/xenoarcheaology/effects/sleepy.dm index bcdd736ebc..d556c76b60 100644 --- a/code/modules/xenoarcheaology/effects/sleepy.dm +++ b/code/modules/xenoarcheaology/effects/sleepy.dm @@ -11,12 +11,12 @@ var/weakness = GetAnomalySusceptibility(toucher) if(ishuman(toucher) && prob(weakness * 100)) var/mob/living/carbon/human/H = toucher - H << pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.") + H << pick("You feel like taking a nap."," You feel a yawn coming on."," You feel a little tired.") H.drowsyness = min(H.drowsyness + rand(5,25) * weakness, 50 * weakness) H.eye_blurry = min(H.eye_blurry + rand(1,3) * weakness, 50 * weakness) return 1 else if(isrobot(toucher)) - toucher << "\red SYSTEM ALERT: CPU cycles slowing down." + toucher << "SYSTEM ALERT: CPU cycles slowing down." return 1 /datum/artifact_effect/sleepy/DoEffectAura() @@ -26,11 +26,11 @@ var/weakness = GetAnomalySusceptibility(H) if(prob(weakness * 100)) if(prob(10)) - H << pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.") + H << pick("You feel like taking a nap."," You feel a yawn coming on."," You feel a little tired.") H.drowsyness = min(H.drowsyness + 1 * weakness, 25 * weakness) H.eye_blurry = min(H.eye_blurry + 1 * weakness, 25 * weakness) for (var/mob/living/silicon/robot/R in range(src.effectrange,holder)) - R << "\red SYSTEM ALERT: CPU cycles slowing down." + R << "SYSTEM ALERT: CPU cycles slowing down." return 1 /datum/artifact_effect/sleepy/DoEffectPulse() @@ -39,9 +39,9 @@ for(var/mob/living/carbon/human/H in range(src.effectrange, T)) var/weakness = GetAnomalySusceptibility(H) if(prob(weakness * 100)) - H << pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.") + H << pick("You feel like taking a nap."," You feel a yawn coming on."," You feel a little tired.") H.drowsyness = min(H.drowsyness + rand(5,15) * weakness, 50 * weakness) H.eye_blurry = min(H.eye_blurry + rand(5,15) * weakness, 50 * weakness) for (var/mob/living/silicon/robot/R in range(src.effectrange,holder)) - R << "\red SYSTEM ALERT: CPU cycles slowing down." + R << "SYSTEM ALERT: CPU cycles slowing down." return 1 diff --git a/code/modules/xenoarcheaology/effects/stun.dm b/code/modules/xenoarcheaology/effects/stun.dm index adecc65086..13f30721ab 100644 --- a/code/modules/xenoarcheaology/effects/stun.dm +++ b/code/modules/xenoarcheaology/effects/stun.dm @@ -10,7 +10,7 @@ var/mob/living/carbon/C = toucher var/susceptibility = GetAnomalySusceptibility(C) if(prob(susceptibility * 100)) - C << "\red A powerful force overwhelms your consciousness." + C << "A powerful force overwhelms your consciousness." C.Weaken(rand(1,10) * susceptibility) C.stuttering += 30 * susceptibility C.Stun(rand(1,10) * susceptibility) @@ -21,13 +21,13 @@ for (var/mob/living/carbon/C in range(src.effectrange,T)) var/susceptibility = GetAnomalySusceptibility(C) if(prob(10 * susceptibility)) - C << "\red Your body goes numb for a moment." + C << "Your body goes numb for a moment." C.Weaken(2) C.stuttering += 2 if(prob(10)) C.Stun(1) else if(prob(10)) - C << "\red You feel numb." + C << "You feel numb." /datum/artifact_effect/stun/DoEffectPulse() if(holder) @@ -35,7 +35,7 @@ for (var/mob/living/carbon/C in range(src.effectrange,T)) var/susceptibility = GetAnomalySusceptibility(C) if(prob(100 * susceptibility)) - C << "\red A wave of energy overwhelms your senses!" + C << "A wave of energy overwhelms your senses!" C.SetWeakened(4 * susceptibility) C.stuttering = 4 * susceptibility if(prob(10)) diff --git a/code/modules/xenoarcheaology/effects/teleport.dm b/code/modules/xenoarcheaology/effects/teleport.dm index a050d6c249..33072efc4a 100644 --- a/code/modules/xenoarcheaology/effects/teleport.dm +++ b/code/modules/xenoarcheaology/effects/teleport.dm @@ -5,7 +5,7 @@ /datum/artifact_effect/teleport/DoEffectTouch(var/mob/user) var/weakness = GetAnomalySusceptibility(user) if(prob(100 * weakness)) - user << "\red You are suddenly zapped away elsewhere!" + user << "You are suddenly zapped away elsewhere!" if (user.buckled) user.buckled.unbuckle_mob() @@ -25,7 +25,7 @@ for (var/mob/living/M in range(src.effectrange,T)) var/weakness = GetAnomalySusceptibility(M) if(prob(100 * weakness)) - M << "\red You are displaced by a strange force!" + M << "You are displaced by a strange force!" if(M.buckled) M.buckled.unbuckle_mob() @@ -44,7 +44,7 @@ for (var/mob/living/M in range(src.effectrange, T)) var/weakness = GetAnomalySusceptibility(M) if(prob(100 * weakness)) - M << "\red You are displaced by a strange force!" + M << "You are displaced by a strange force!" if(M.buckled) M.buckled.unbuckle_mob() diff --git a/code/modules/xenoarcheaology/finds/special.dm b/code/modules/xenoarcheaology/finds/special.dm index af73f541d6..f6f89c6e8b 100644 --- a/code/modules/xenoarcheaology/finds/special.dm +++ b/code/modules/xenoarcheaology/finds/special.dm @@ -99,7 +99,7 @@ if(charges >= 0.1) if(prob(5)) - src.visible_message("\red \icon[src] [src]'s eyes glow ruby red for a moment!") + src.visible_message("\icon[src] [src]'s eyes glow ruby red for a moment!") charges -= 0.1 //check on our shadow wights @@ -129,7 +129,7 @@ var/target = pick(M.organs_by_name) M.apply_damage(rand(5, 10), BRUTE, target) - M << "\red The skin on your [parse_zone(target)] feels like it's ripping apart, and a stream of blood flies out." + M << "The skin on your [parse_zone(target)] feels like it's ripping apart, and a stream of blood flies out." var/obj/effect/decal/cleanable/blood/splatter/animated/B = new(M.loc) B.target_turf = pick(range(1, src)) B.blood_DNA = list() @@ -200,4 +200,4 @@ processing_objects.Remove(src) /obj/effect/shadow_wight/Bump(var/atom/obstacle) - obstacle << "\red You feel a chill run down your spine!" + obstacle << "You feel a chill run down your spine!" diff --git a/code/modules/xenoarcheaology/tools/artifact_harvester.dm b/code/modules/xenoarcheaology/tools/artifact_harvester.dm index ca7b43b1d3..253aad11ad 100644 --- a/code/modules/xenoarcheaology/tools/artifact_harvester.dm +++ b/code/modules/xenoarcheaology/tools/artifact_harvester.dm @@ -23,13 +23,13 @@ /obj/machinery/artifact_harvester/attackby(var/obj/I as obj, var/mob/user as mob) if(istype(I,/obj/item/weapon/anobattery)) if(!inserted_battery) - user << "\blue You insert [I] into [src]." + user << "You insert [I] into [src]." user.drop_item() I.loc = src src.inserted_battery = I updateDialog() else - user << "\red There is already a battery in [src]." + user << "There is already a battery in [src]." else return..() diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm index c68d06a1ba..ec8f2d8f24 100644 --- a/code/modules/xenoarcheaology/tools/suspension_generator.dm +++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm @@ -181,10 +181,10 @@ for(var/mob/living/M in T) M.weakened += 5 - M.visible_message("\blue \icon[M] [M] begins to float in the air!","You feel tingly and light, but it is difficult to move.") + M.visible_message("\icon[M] [M] begins to float in the air!","You feel tingly and light, but it is difficult to move.") suspension_field = new(T) - src.visible_message("\blue \icon[src] [src] activates with a low hum.") + src.visible_message("\icon[src] [src] activates with a low hum.") icon_state = "suspension3" for(var/obj/item/I in T) @@ -194,7 +194,7 @@ if(collected) suspension_field.icon_state = "energynet" suspension_field.overlays += "shield2" - src.visible_message("\blue \icon[suspension_field] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].") + src.visible_message("\icon[suspension_field] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].") else if(istype(T,/turf/simulated/mineral) || istype(T,/turf/simulated/wall)) suspension_field.icon_state = "shieldsparkles" @@ -209,7 +209,7 @@ M << "You no longer feel like floating." M.weakened = min(M.weakened, 3) - src.visible_message("\blue \icon[src] [src] deactivates with a gentle shudder.") + src.visible_message("\icon[src] [src] deactivates with a gentle shudder.") qdel(suspension_field) suspension_field = null icon_state = "suspension2" @@ -224,7 +224,7 @@ set category = "Object" if(anchored) - usr << "\red You cannot rotate [src], it has been firmly fixed to the floor." + usr << "You cannot rotate [src], it has been firmly fixed to the floor." else set_dir(turn(dir, 90)) @@ -234,7 +234,7 @@ set category = "Object" if(anchored) - usr << "\red You cannot rotate [src], it has been firmly fixed to the floor." + usr << "You cannot rotate [src], it has been firmly fixed to the floor." else set_dir(turn(dir, -90))