diff --git a/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm b/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm index 7374963fba8..7672d72fef3 100644 --- a/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm +++ b/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm @@ -48,7 +48,7 @@ obj/item/weapon/tank adjust_mixture(temperature as num, target_toxin_pressure as num, target_oxygen_pressure as num) set src in world if(!air_contents) - usr << "\red ERROR: no gas_mixture associated with this tank" + usr << "ERROR: no gas_mixture associated with this tank" return null air_contents.temperature = temperature @@ -74,7 +74,7 @@ turf/simulated/floor else usr << "Space Borders: None" else - usr << "\blue [x],[y] has no parent air group." + usr << "[x],[y] has no parent air group." verb create_wall() @@ -329,7 +329,7 @@ obj/machinery/atmospherics set src in world set category = "Minor" - world << "\blue [x],[y]" + world << "[x],[y]" world << "network 1: [network_node1.normal_members.len], [network_node1.line_members.len]" for(var/obj/O in network_node1.normal_members) world << "member: [O.x], [O.y]" @@ -406,7 +406,7 @@ turf/simulated set src in world set category = "Minor" var/datum/gas_mixture/GM = return_air() - usr << "\blue @[x],[y] ([GM.group_multiplier]): O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(active_hotspot)?("\red BURNING"):(null)]" + usr << "@[x],[y] ([GM.group_multiplier]): O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(active_hotspot)?("BURNING"):(null)]"" for(var/datum/gas/trace_gas in GM.trace_gases) usr << "[trace_gas.type]: [trace_gas.moles]" @@ -515,7 +515,7 @@ mob fire_report() set category = "Debug" - usr << "\b \red Fire Report" + usr << "Fire Report" for(var/obj/effect/hotspot/flame in world) usr << "[flame.x],[flame.y]: [flame.temperature]K, [flame.volume] L - [flame.loc:air:temperature]" diff --git a/code/FEA/FEA_system.dm b/code/FEA/FEA_system.dm index 6a3dfe0f8b2..d25da913b87 100644 --- a/code/FEA/FEA_system.dm +++ b/code/FEA/FEA_system.dm @@ -146,7 +146,7 @@ datum setup() set background = 1 - world << "\red \b Processing Geometry..." + world << "Processing Geometry..." sleep(1) var/start_time = world.timeofday @@ -156,7 +156,7 @@ datum assemble_group_turf(S) S.update_air_properties() - world << "\red \b Geometry processed in [(world.timeofday-start_time)/10] seconds!" + world << "Geometry processed in [(world.timeofday-start_time)/10] seconds!" assemble_group_turf(turf/simulated/base) diff --git a/code/TriDimension/Movement.dm b/code/TriDimension/Movement.dm index 5f451a1038d..3637184d31a 100644 --- a/code/TriDimension/Movement.dm +++ b/code/TriDimension/Movement.dm @@ -13,13 +13,13 @@ for(var/atom/A in T.contents) if(A.density) blocked = 1 - usr << "\red You bump into [A.name]." + usr << "You bump into \the [A]." break if(!blocked) usr.Move(T) usr << "You move upwards." else - usr << "\red There is something in your way." + usr << "There is something in your way." if (legal == 0) usr << "There is nothing of interest in this direction." return 1 @@ -40,13 +40,13 @@ for(var/atom/A in T.contents) if(A.density) blocked = 1 - usr << "\red You bump into [A.name]." + usr << "You bump into \the [A]." break if(!blocked) usr.Move(T) usr << "You move downwards." else - usr << "\red You cant move through the floor." + usr << "You cant move through the floor." if (legal == 0) usr << "There is nothing of interest in this direction." return 1 diff --git a/code/TriDimension/Pipes.dm b/code/TriDimension/Pipes.dm index c71255a34bd..2958e2a4dcf 100644 --- a/code/TriDimension/Pipes.dm +++ b/code/TriDimension/Pipes.dm @@ -73,7 +73,7 @@ obj/machinery/atmospherics/pipe/zpipe/check_pressure(pressure) else return 1 obj/machinery/atmospherics/pipe/zpipe/proc/burst() - src.visible_message("\red \bold [src] bursts!"); + src.visible_message("\The [src] bursts!"); playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) var/datum/effect/effect/system/smoke_spread/smoke = new smoke.set_up(1,0, src.loc, 0) diff --git a/code/TriDimension/Structures.dm b/code/TriDimension/Structures.dm index cf216274bbf..99151936f5f 100644 --- a/code/TriDimension/Structures.dm +++ b/code/TriDimension/Structures.dm @@ -141,7 +141,7 @@ if(blocked || istype(T, /turf/simulated/wall)) M << "Something is blocking the ladder." else - M.visible_message("\blue \The [M] climbs [src.icon_state == "ladderup" ? "up" : "down"] \the [src]!", "You climb [src.icon_state == "ladderup" ? "up" : "down"] \the [src]!", "You hear some grunting, and clanging of a metal ladder being used.") + M.visible_message("\The [M] climbs [src.icon_state == "ladderup" ? "up" : "down"] \the [src]!", "You climb [src.icon_state == "ladderup" ? "up" : "down"] \the [src]!", "You hear some grunting, and clanging of a metal ladder being used.") M.Move(target.loc) /* hatch @@ -188,7 +188,7 @@ qdel(src) if(M.z == z && get_dist(src,M) <= 1) var/list/adjacent_to_me = global_adjacent_z_levels["[z]"] - M.visible_message("\blue \The [M] scurries [target.z == adjacent_to_me["up"] ? "up" : "down"] \the [src]!", "You scramble [target.z == adjacent_to_me["up"] ? "up" : "down"] \the [src]!", "You hear some grunting, and a hatch sealing.") + M.visible_message("\The [M] scurries [target.z == adjacent_to_me["up"] ? "up" : "down"] \the [src]!", "You scramble [target.z == adjacent_to_me["up"] ? "up" : "down"] \the [src]!", "You hear some grunting, and a hatch sealing.") M.Move(target.loc) flick(top_icon_state_close,top_hatch) bottom_hatch.overlays -= green_overlay @@ -271,4 +271,4 @@ var/turf/above2 = locate(bottom.x, bottom.y, controller.up_target) if(istype(above2, /turf/space) || istype(above,/turf/simulated/floor/open)) top.target2 = above2 - return \ No newline at end of file + return diff --git a/code/TriDimension/Turfs.dm b/code/TriDimension/Turfs.dm index 43e33ed3c28..6443d6b5697 100644 --- a/code/TriDimension/Turfs.dm +++ b/code/TriDimension/Turfs.dm @@ -109,7 +109,7 @@ return var/obj/item/stack/rods/R = C if (R.use(1)) - user << "\blue Constructing support lattice ..." + user << "Constructing support lattice..." playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1) ReplaceWithLattice() return @@ -126,5 +126,5 @@ S.use(1) return else - user << "\red The plating is going to need some support." + user << "The plating is going to need some support." return diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index 62a6daea16f..9f6451adf93 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -80,7 +80,7 @@ obj/item/check_airflow_movable(n) return if(src:shoes && src:shoes.flags & NOSLIP) return - src << "\red You are sucked away by airflow!" + src << "You are sucked away by airflow!" var/airflow_falloff = 9 - sqrt((x - airflow_dest.x) ** 2 + (y - airflow_dest.y) ** 2) if(airflow_falloff < 1) airflow_dest = null @@ -144,7 +144,7 @@ obj/item/check_airflow_movable(n) if(istype(src:shoes, /obj/item/clothing/shoes/magboots)) if(src:shoes.flags & NOSLIP) return - src << "\red You are pushed away by airflow!" + src << "You are pushed away by airflow!" last_airflow = world.time var/airflow_falloff = 9 - sqrt((x - airflow_dest.x) ** 2 + (y - airflow_dest.y) ** 2) if(airflow_falloff < 1) @@ -197,7 +197,7 @@ atom/movable/proc/airflow_hit(atom/A) mob/airflow_hit(atom/A) for(var/mob/M in hearers(src)) - M.show_message("\red \The [src] slams into \a [A]!",1,"\red You hear a loud slam!",2) + M.show_message("\The [src] slams into \a [A]!",1,"You hear a loud slam!",2) playsound(src.loc, "smash.ogg", 25, 1, -1) var/weak_amt = istype(A,/obj/item) ? A:w_class : rand(1,5) //Heheheh Weaken(weak_amt) @@ -205,7 +205,7 @@ mob/airflow_hit(atom/A) obj/airflow_hit(atom/A) for(var/mob/M in hearers(src)) - M.show_message("\red \The [src] slams into \a [A]!",1,"\red You hear a loud slam!",2) + M.show_message("\The [src] slams into \a [A]!",1,"You hear a loud slam!",2) playsound(src.loc, "smash.ogg", 25, 1, -1) . = ..() @@ -215,7 +215,7 @@ obj/item/airflow_hit(atom/A) mob/living/carbon/human/airflow_hit(atom/A) // for(var/mob/M in hearers(src)) -// M.show_message("\red [src] slams into [A]!",1,"\red You hear a loud slam!",2) +// M.show_message("[src] slams into [A]!",1,"You hear a loud slam!",2) playsound(src.loc, "punch", 25, 1, -1) if (prob(33)) loc:add_blood(src) @@ -244,4 +244,4 @@ zone/proc/movables() for(var/atom/A in T) if(istype(A, /obj/effect) || istype(A, /mob/aiEye)) continue - . += A \ No newline at end of file + . += A diff --git a/code/ZAS/Controller.dm b/code/ZAS/Controller.dm index 83d2a54ec3c..506657df12e 100644 --- a/code/ZAS/Controller.dm +++ b/code/ZAS/Controller.dm @@ -187,7 +187,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun #ifdef ZASDBG if(updated != updating.len) tick_progress = "[updating.len - updated] tiles left unupdated." - world << "\red [tick_progress]" + world << "[tick_progress]" . = 0 #endif @@ -371,4 +371,4 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun /datum/controller/air_system/proc/remove_edge(connection_edge/E) edges.Remove(E) - if(!E.sleeping) active_edges.Remove(E) \ No newline at end of file + if(!E.sleeping) active_edges.Remove(E) diff --git a/code/ZAS/Diagnostic.dm b/code/ZAS/Diagnostic.dm index 1d4cc1a3883..f54caa3a42a 100644 --- a/code/ZAS/Diagnostic.dm +++ b/code/ZAS/Diagnostic.dm @@ -148,7 +148,7 @@ client/proc/Test_ZAS_Connection(var/turf/simulated/T as turf) for(var/zone/Z in air_master.zones) if(Z.air == air && Z != src) var/turf/zloc = pick(Z.contents) - client << "\red Illegal air datum shared by: [zloc.loc.name]"*/ + client << "Illegal air datum shared by: [zloc.loc.name]"*/ /*client/proc/TestZASRebuild() @@ -234,4 +234,4 @@ client/proc/Test_ZAS_Connection(var/turf/simulated/T as turf) client/proc/ZASSettings() set category = "Debug" - vsc.SetDefault(mob) \ No newline at end of file + vsc.SetDefault(mob) diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index 391f5b719a9..0e74052c2a1 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -88,7 +88,7 @@ obj/var/contaminated = 0 if(vsc.plc.SKIN_BURNS) if(!pl_head_protected() || !pl_suit_protected()) burn_skin(0.75) - if(prob(20)) src << "\red Your skin burns!" + if(prob(20)) src << "Your skin burns!" updatehealth() //Burn eyes if exposed. @@ -111,7 +111,7 @@ obj/var/contaminated = 0 if(vsc.plc.GENETIC_CORRUPTION) if(rand(1,10000) < vsc.plc.GENETIC_CORRUPTION) randmutb(src) - src << "\red High levels of toxins cause you to spontaneously mutate." + src << "High levels of toxins cause you to spontaneously mutate!" domutcheck(src,null) @@ -122,11 +122,11 @@ obj/var/contaminated = 0 var/obj/item/organ/eyes/E = internal_organs_by_name["eyes"] if(E) - if(prob(20)) src << "\red Your eyes burn!" + if(prob(20)) src << "Your eyes burn!" E.damage += 2.5 eye_blurry = min(eye_blurry+1.5,50) if (prob(max(0,E.damage - 15) + 1) &&!eye_blind) - src << "\red You are blinded!" + src << "You are blinded!" eye_blind += 20 /mob/living/carbon/human/proc/pl_head_protected() diff --git a/code/ZAS/Variable Settings.dm b/code/ZAS/Variable Settings.dm index c152159b7ac..674be3fc5ea 100644 --- a/code/ZAS/Variable Settings.dm +++ b/code/ZAS/Variable Settings.dm @@ -168,7 +168,7 @@ var/global/vs_control/vsc = new vars[ch] = vw if(how == "Toggle") newvar = (newvar?"ON":"OFF") - world << "\blue [key_name(user)] changed the setting [display_description] to [newvar]." + world << "[key_name(user)] changed the setting [display_description] to [newvar]." if(ch in plc.settings) ChangeSettingsDialog(user,plc.settings) else @@ -321,7 +321,7 @@ var/global/vs_control/vsc = new plc.N2O_HALLUCINATION = initial(plc.N2O_HALLUCINATION) - world << "\blue [key_name(user)] changed the global phoron/ZAS settings to \"[def]\"" + world << "[key_name(user)] changed the global phoron/ZAS settings to \"[def]\"" /pl_control/var/list/settings = list() diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index e43ca1dc2a9..83383ea56ac 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -233,7 +233,7 @@ var/syndicate_code_response//Code response for traitors. set name = "Generate Code Phrase" set category = "Debug" - world << "\red Code Phrase is: \black [generate_code_phrase()]" + world << "Code Phrase is: [generate_code_phrase()]" return diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index ae38249956a..0051a1a9de4 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -34,7 +34,8 @@ input = replace_characters(input, list("\n"=" ","\t"=" ")) if(encode) - //In addition to processing html, html_encode removes byond formatting codes like "\red", "\i" and other. + // The below \ escapes have a space inserted to attempt to enable Travis auto-checking of span class usage. Please do not remove the space. + //In addition to processing html, html_encode removes byond formatting codes like "\ red", "\ i" and other. //It is important to avoid double-encode text, it can "break" quotes and some other characters. //Also, keep in mind that escaped characters don't work in the interface (window titles, lower left corner of the main window, etc.) input = html_encode(input) @@ -312,4 +313,4 @@ proc/TextPreview(var/string,var/len=40) /proc/create_text_tag(var/tagname, var/tagdesc = tagname, var/client/C = null) if(C && (C.prefs.toggles & CHAT_NOICONS)) return tagdesc - return "[tagdesc]" \ No newline at end of file + return "[tagdesc]" diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 7307927ac0d..5a56b34e617 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -329,7 +329,7 @@ nutrition = max(nutrition - rand(1,5),0) handle_regular_hud_updates() else - src << "\red You're out of energy! You need food!" + src << "You're out of energy! You need food!" // Simple helper to face what you clicked on, in case it should be needed in more than one place /mob/proc/face_atom(var/atom/A) diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index f39499f3dce..7193a786a5e 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -261,11 +261,11 @@ datum/hud/New(mob/owner) set hidden = 1 if(!hud_used) - usr << "\red This mob type does not use a HUD." + usr << "This mob type does not use a HUD." return if(!ishuman(src)) - usr << "\red Inventory hiding is currently only supported for human mobs, sorry." + usr << "Inventory hiding is currently only supported for human mobs, sorry." return if(!client) return @@ -356,4 +356,4 @@ datum/hud/New(mob/owner) hud_used.hidden_inventory_update() hud_used.persistant_inventory_update() - update_action_buttons() \ No newline at end of file + update_action_buttons() diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index 168ae47c863..abc0e6114ed 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -6,9 +6,9 @@ if(!client) return client.inquisitive_ghost = !client.inquisitive_ghost if(client.inquisitive_ghost) - src << "\blue You will now examine everything you click on." + src << "You will now examine everything you click on." else - src << "\blue You will no longer examine things you click on." + src << "You will no longer examine things you click on." /mob/dead/observer/DblClickOn(var/atom/A, var/params) if(client.buildmode) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index ae57895cd6a..0ba005455c6 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -120,7 +120,7 @@ var/const/tk_maxrange = 15 if(8 to tk_maxrange) user.next_move += 10 else - user << "\blue Your mind won't reach that far." + user << "Your mind won't reach that far." return if(!focus) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 0b4f91fb9c0..ccfdf1519f1 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -227,9 +227,9 @@ throwforce = 5 w_class = 2.0 throw_speed = 4 - throw_range = 20 + throw_range = 20 matter = list(DEFAULT_WALL_MATERIAL = 100) - origin_tech = list(TECH_MAGNET = 1) + origin_tech = list(TECH_MAGNET = 1) /obj/item/weapon/staff name = "wizards staff" @@ -282,7 +282,7 @@ attack_verb = list("whipped", "lashed", "disciplined", "tickled") suicide_act(mob/user) - viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." + viewers(user) << "[user] is strangling \himself with \the [src]! It looks like \he's trying to commit suicide." return (OXYLOSS) /obj/item/weapon/module @@ -342,7 +342,7 @@ if (C.bugged && C.status) cameras.Add(C) if (length(cameras) == 0) - usr << "\red No bugged functioning cameras found." + usr << "No bugged functioning cameras found." return var/list/friendly_cameras = new/list() @@ -425,35 +425,35 @@ desc = "A basic capacitor used in the construction of a variety of devices." icon_state = "capacitor" origin_tech = list(TECH_POWER = 1) - matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 50) + matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 50) /obj/item/weapon/stock_parts/scanning_module name = "scanning module" desc = "A compact, high resolution scanning module used in the construction of certain devices." icon_state = "scan_module" origin_tech = list(TECH_MAGNET = 1) - matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20) + matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20) /obj/item/weapon/stock_parts/manipulator name = "micro-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "micro_mani" origin_tech = list(TECH_MATERIAL = 1, TECH_DATA = 1) - matter = list(DEFAULT_WALL_MATERIAL = 30) + matter = list(DEFAULT_WALL_MATERIAL = 30) /obj/item/weapon/stock_parts/micro_laser name = "micro-laser" desc = "A tiny laser used in certain devices." icon_state = "micro_laser" origin_tech = list(TECH_MAGNET = 1) - matter = list(DEFAULT_WALL_MATERIAL = 10,"glass" = 20) + matter = list(DEFAULT_WALL_MATERIAL = 10,"glass" = 20) /obj/item/weapon/stock_parts/matter_bin name = "matter bin" desc = "A container for hold compressed matter awaiting re-construction." icon_state = "matter_bin" origin_tech = list(TECH_MATERIAL = 1) - matter = list(DEFAULT_WALL_MATERIAL = 80) + matter = list(DEFAULT_WALL_MATERIAL = 80) //Rank 2 @@ -543,35 +543,35 @@ icon_state = "subspace_ansible" desc = "A compact module capable of sensing extradimensional activity." origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 5 ,TECH_MATERIAL = 4, TECH_BLUESPACE = 2) - matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) + matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) /obj/item/weapon/stock_parts/subspace/filter name = "hyperwave filter" icon_state = "hyperwave_filter" desc = "A tiny device capable of filtering and converting super-intense radiowaves." origin_tech = list(TECH_DATA = 4, TECH_MAGNET = 2) - matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) + matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) /obj/item/weapon/stock_parts/subspace/amplifier name = "subspace amplifier" icon_state = "subspace_amplifier" desc = "A compact micro-machine capable of amplifying weak subspace transmissions." origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) - matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) + matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) /obj/item/weapon/stock_parts/subspace/treatment name = "subspace treatment disk" icon_state = "treatment_disk" desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves." origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 2, TECH_MATERIAL = 5, TECH_BLUESPACE = 2) - matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) + matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) /obj/item/weapon/stock_parts/subspace/analyzer name = "subspace wavelength analyzer" icon_state = "wavelength_analyzer" desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." origin_tech = list(TECH_DATA = 3, TECH_MAGNETS = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) - matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) + matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) /obj/item/weapon/stock_parts/subspace/crystal name = "ansible crystal" @@ -585,7 +585,7 @@ icon_state = "subspace_transmitter" desc = "A large piece of equipment used to open a window into the subspace dimension." origin_tech = list(TECH_MAGNET = 5, TECH_MATERIAL = 5, TECH_BLUESPACE = 3) - matter = list(DEFAULT_WALL_MATERIAL = 50) + matter = list(DEFAULT_WALL_MATERIAL = 50) /obj/item/weapon/ectoplasm name = "ectoplasm"