From d3766aec10d54f0ad0ce4ce62bf6a1ee86783348 Mon Sep 17 00:00:00 2001 From: ike709 Date: Fri, 22 Aug 2014 17:07:26 -0500 Subject: [PATCH 1/7] Span classes everywhere part 1 --- code/ATMOSPHERICS/atmospherics.dm | 8 +-- .../components/unary/vent_pump.dm | 8 +-- code/__HELPERS/unsorted.dm | 20 +++--- code/_onclick/observer.dm | 4 +- code/datums/datumvars.dm | 10 +-- code/datums/diseases/cold.dm | 20 +++--- code/datums/diseases/flu.dm | 16 ++--- code/datums/diseases/retrovirus.dm | 28 ++++---- code/datums/mind.dm | 64 +++++++++---------- code/datums/spells/wizard.dm | 4 +- 10 files changed, 91 insertions(+), 91 deletions(-) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index 4da786ef77..7359b9c860 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -63,21 +63,21 @@ obj/machinery/atmospherics/attackby(var/obj/item/weapon/W as obj, var/mob/user a if(can_unwrench && istype(W, /obj/item/weapon/wrench)) var/turf/T = src.loc if (level==1 && isturf(T) && T.intact) - user << "\red You must remove the plating first." + user << " You must remove the plating first." return 1 var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." + user << "You cannot unwrench this [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + user << "You begin to unfasten \the [src]..." add_fingerprint(user) if (do_after(user, 40)) user.visible_message( \ "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ + "You have unfastened \the [src].", \ "You hear ratchet.") var/obj/item/pipe/newpipe = new(loc, make_from=src) transfer_fingerprints_to(newpipe) diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index 348ab41736..b712246e19 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -276,12 +276,12 @@ attackby(obj/item/W, mob/user) if (istype(W, /obj/item/weapon/wrench)&& !(stat & NOPOWER) && on) - user << "\red You cannot unwrench this [src], turn it off first." + user << "You cannot unwrench this [src], turn it off first." return 1 if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if (WT.remove_fuel(0,user)) - user << "\blue Now welding the vent." + user << "Now welding the vent." if(do_after(user, 20)) if(!src || !WT.isOn()) return playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) @@ -294,9 +294,9 @@ welded = 0 update_icon() else - user << "\blue The welding tool needs to be on to start this task." + user << "The welding tool needs to be on to start this task." else - user << "\blue You need more welding fuel to complete this task." + user << "You need more welding fuel to complete this task." return 1 else return ..() diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 2cd1af33e9..191e680134 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1347,11 +1347,11 @@ var/list/WALLITEMS = list( /obj/proc/atmosanalyzer_scan(var/datum/gas_mixture/air_contents, mob/user, var/obj/target = src) var/obj/icon = target - user.visible_message("\red [user] has used the analyzer on \icon[icon] [target].") + user.visible_message("[user] has used the analyzer on \icon[icon] [target].") var/pressure = air_contents.return_pressure() var/total_moles = air_contents.total_moles() - user << "\blue Results of analysis of \icon[icon] [target]." + user << "Results of analysis of \icon[icon] [target]." if(total_moles>0) var/o2_concentration = air_contents.oxygen/total_moles var/n2_concentration = air_contents.nitrogen/total_moles @@ -1360,16 +1360,16 @@ var/list/WALLITEMS = list( var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) - user << "\blue Pressure: [round(pressure,0.1)] kPa" - user << "\blue Nitrogen: [round(n2_concentration*100)]%" - user << "\blue Oxygen: [round(o2_concentration*100)]%" - user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Plasma: [round(plasma_concentration*100)]%" + user << "Pressure: [round(pressure,0.1)] kPa" + user << "Nitrogen: [round(n2_concentration*100)]%" + user << "Oxygen: [round(o2_concentration*100)]%" + user << "CO2: [round(co2_concentration*100)]%" + user << "Plasma: [round(plasma_concentration*100)]%" if(unknown_concentration>0.01) - user << "\red Unknown: [round(unknown_concentration*100)]%" - user << "\blue Temperature: [round(air_contents.temperature-T0C)]°C" + user << "Unknown: [round(unknown_concentration*100)]%" + user << "Temperature: [round(air_contents.temperature-T0C)]°C" else - user << "\blue [target] is empty!" + user << "[target] is empty!" return proc/check_target_facings(mob/living/initator, mob/living/target) diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index 3542eb1e42..a5110d911c 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/datums/datumvars.dm b/code/datums/datumvars.dm index 1ec395a445..c93245db9a 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -8,7 +8,7 @@ client if(!usr.client || !usr.client.holder) - usr << "\red You need to be an administrator to access this." + usr << "You need to be an administrator to access this." return @@ -623,7 +623,7 @@ client usr << "No objects of this type exist" return log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ") - message_admins("\blue [key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ") + message_admins("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ") if("Type and subtypes") var/i = 0 for(var/obj/Obj in world) @@ -634,7 +634,7 @@ client usr << "No objects of this type exist" return log_admin("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ") - message_admins("\blue [key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ") + message_admins("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ") else if(href_list["addreagent"]) if(!check_rights(0)) return @@ -664,7 +664,7 @@ client if(amount) A.reagents.add_reagent(chosen_id, amount) log_admin("[key_name(usr)] has added [amount] units of [chosen] to \the [A]") - message_admins("\blue [key_name(usr)] has added [amount] units of [chosen] to \the [A]") + message_admins("[key_name(usr)] has added [amount] units of [chosen] to \the [A]") href_list["datumrefresh"] = href_list["addreagent"] @@ -879,7 +879,7 @@ client if(amount != 0) log_admin("[key_name(usr)] dealt [amount] amount of [Text] damage to [L] ") - message_admins("\blue [key_name(usr)] dealt [amount] amount of [Text] damage to [L] ") + message_admins("[key_name(usr)] dealt [amount] amount of [Text] damage to [L] ") href_list["datumrefresh"] = href_list["mobToDamage"] diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm index 9317fa12ef..85e06598ff 100644 --- a/code/datums/diseases/cold.dm +++ b/code/datums/diseases/cold.dm @@ -16,16 +16,16 @@ if(2) /* if(affected_mob.sleeping && prob(40)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return */ if(affected_mob.lying && prob(40)) //changed FROM prob(10) until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if(prob(1) && prob(5)) - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if(prob(1)) @@ -33,22 +33,22 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "\red Your throat feels sore." + affected_mob << "Your throat feels sore." if(prob(1)) - affected_mob << "\red Mucous runs down the back of your throat." + affected_mob << "Mucous runs down the back of your throat." if(3) /* if(affected_mob.sleeping && prob(25)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return */ if(affected_mob.lying && prob(25)) //changed FROM prob(5) until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if(prob(1) && prob(1)) - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if(prob(1)) @@ -56,9 +56,9 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "\red Your throat feels sore." + affected_mob << "Your throat feels sore." if(prob(1)) - affected_mob << "\red Mucous runs down the back of your throat." + affected_mob << "Mucous runs down the back of your throat." if(prob(1) && prob(50)) if(!affected_mob.resistances.Find(/datum/disease/flu)) var/datum/disease/Flu = new /datum/disease/flu(0) diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm index bb32b44e5b..c050b9e1d1 100644 --- a/code/datums/diseases/flu.dm +++ b/code/datums/diseases/flu.dm @@ -17,12 +17,12 @@ if(2) /* if(affected_mob.sleeping && prob(20)) //removed until sleeping is fixed --Blaank - affected_mob << "\blue You feel better." + affected_mob << "You feel better." stage-- return */ if(affected_mob.lying && prob(20)) //added until sleeping is fixed --Blaank - affected_mob << "\blue You feel better." + affected_mob << "You feel better." stage-- return if(prob(1)) @@ -30,11 +30,11 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "\red Your muscles ache." + affected_mob << "Your muscles ache." if(prob(20)) affected_mob.take_organ_damage(1) if(prob(1)) - affected_mob << "\red Your stomach hurts." + affected_mob << "Your stomach hurts." if(prob(20)) affected_mob.adjustToxLoss(1) affected_mob.updatehealth() @@ -42,12 +42,12 @@ if(3) /* if(affected_mob.sleeping && prob(15)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." stage-- return */ if(affected_mob.lying && prob(15)) //added until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." stage-- return if(prob(1)) @@ -55,11 +55,11 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "\red Your muscles ache." + affected_mob << "Your muscles ache." if(prob(20)) affected_mob.take_organ_damage(1) if(prob(1)) - affected_mob << "\red Your stomach hurts." + affected_mob << "Your stomach hurts." if(prob(20)) affected_mob.adjustToxLoss(1) affected_mob.updatehealth() diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm index 521176fbf1..538de60916 100644 --- a/code/datums/diseases/retrovirus.dm +++ b/code/datums/diseases/retrovirus.dm @@ -33,55 +33,55 @@ if(restcure) /* if(affected_mob.sleeping && prob(30)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return */ if(affected_mob.lying && prob(30)) //changed FROM prob(20) until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if (prob(8)) - affected_mob << "\red Your head hurts." + affected_mob << "our head hurts." if (prob(9)) affected_mob << "You feel a tingling sensation in your chest." if (prob(9)) - affected_mob << "\red You feel angry." + affected_mob << "You feel angry." if(2) if(restcure) /* if(affected_mob.sleeping && prob(20)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return */ if(affected_mob.lying && prob(20)) //changed FROM prob(10) until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if (prob(8)) - affected_mob << "\red Your skin feels loose." + affected_mob << "Your skin feels loose." if (prob(10)) affected_mob << "You feel very strange." if (prob(4)) - affected_mob << "\red You feel a stabbing pain in your head!" + affected_mob << "You feel a stabbing pain in your head!" affected_mob.Paralyse(2) if (prob(4)) - affected_mob << "\red Your stomach churns." + affected_mob << "Your stomach churns." if(3) if(restcure) /* if(affected_mob.sleeping && prob(20)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return */ if(affected_mob.lying && prob(20)) //changed FROM prob(10) until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if (prob(10)) - affected_mob << "\red Your entire body vibrates." + affected_mob << "Your entire body vibrates." if (prob(35)) if(prob(50)) scramble_dna(affected_mob, 1, 0, rand(15,45)) @@ -91,12 +91,12 @@ if(restcure) /* if(affected_mob.sleeping && prob(10)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return */ if(affected_mob.lying && prob(5)) //changed FROM prob(5) until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if (prob(60)) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index dd115ca9cd..eb1e8a633b 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -586,16 +586,16 @@ datum/mind switch(href_list["revolution"]) if("clear") remove_antag("Rev") - current << "\red You have been brainwashed! You are no longer a revolutionary!" + current << "You have been brainwashed! You are no longer a revolutionary!" message_admins("[key_name_admin(usr)] has de-rev'ed [current].") log_admin("[key_name(usr)] has de-rev'ed [current].") if("rev") if(src in ticker.mode.head_revolutionaries) ticker.mode.head_revolutionaries -= src ticker.mode.update_rev_icons_removed(src) - current << "\red Revolution has been disappointed of your leader traits! You are a regular revolutionary now!" + current << "Revolution has been disappointed of your leader traits! You are a regular revolutionary now!" else if(!(src in ticker.mode.revolutionaries)) - current << "\red You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!" + current << " You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!" else return ticker.mode.revolutionaries += src @@ -608,9 +608,9 @@ datum/mind if(src in ticker.mode.revolutionaries) ticker.mode.revolutionaries -= src ticker.mode.update_rev_icons_removed(src) - current << "\red You have proved your devotion to revoltion! Yea are a head revolutionary now!" + current << "You have proved your devotion to revoltion! Yea are a head revolutionary now!" else if(!(src in ticker.mode.head_revolutionaries)) - current << "\red You are a member of the revolutionaries' leadership now!" + current << "You are a member of the revolutionaries' leadership now!" else return if (ticker.mode.head_revolutionaries.len>0) @@ -633,24 +633,24 @@ datum/mind if("autoobjectives") ticker.mode.forge_revolutionary_objectives(src) ticker.mode.greet_revolutionary(src,0) - usr << "\blue The objectives for revolution have been generated and shown to [key]" + usr << "The objectives for revolution have been generated and shown to [key]" if("flash") if (!ticker.mode.equip_revolutionary(current)) - usr << "\red Spawning flash failed!" + usr << "Spawning flash failed!" if("takeflash") var/list/L = current.get_contents() var/obj/item/device/flash/flash = locate() in L if (!flash) - usr << "\red Deleting flash failed!" + usr << "Deleting flash failed!" qdel(flash) if("repairflash") var/list/L = current.get_contents() var/obj/item/device/flash/flash = locate() in L if (!flash) - usr << "\red Repairing flash failed!" + usr << "Repairing flash failed!" else flash.broken = 0 @@ -663,13 +663,13 @@ datum/mind fail |= !ticker.mode.equip_traitor(current, 1) fail |= !ticker.mode.equip_revolutionary(current) if (fail) - usr << "\red Reequipping revolutionary goes wrong!" + usr << "Reequipping revolutionary goes wrong!" else if (href_list["cult"]) switch(href_list["cult"]) if("clear") remove_antag("Cultist") - current << "\red You have been brainwashed! You are no longer a cultist!" + current << "You have been brainwashed! You are no longer a cultist!" message_admins("[key_name_admin(usr)] has de-cult'ed [current].") log_admin("[key_name(usr)] has de-cult'ed [current].") if("cultist") @@ -691,26 +691,26 @@ datum/mind ) var/where = H.equip_in_one_of_slots(T, slots) if (!where) - usr << "\red Spawning tome failed!" + usr << "Spawning tome failed!" else H << "A tome, a message from your new master, appears in your [where]." if("amulet") if (!ticker.mode.equip_cultist(current)) - usr << "\red Spawning amulet failed!" + usr << "Spawning amulet failed!" else if (href_list["wizard"]) switch(href_list["wizard"]) if("clear") remove_antag("Wizard") - current << "\red You have been brainwashed! You are no longer a wizard!" + current << "You have been brainwashed! You are no longer a wizard!" log_admin("[key_name(usr)] has de-wizard'ed [current].") if("wizard") if(!(src in ticker.mode.wizards)) ticker.mode.wizards += src special_role = "Wizard" //ticker.mode.learn_basic_spells(current) - current << "\red You are the Space Wizard!" + current << "You are the Space Wizard!" message_admins("[key_name_admin(usr)] has wizard'ed [current].") log_admin("[key_name(usr)] has wizard'ed [current].") if("lair") @@ -721,7 +721,7 @@ datum/mind ticker.mode.name_wizard(current) if("autoobjectives") ticker.mode.forge_wizard_objectives(src) - usr << "\blue The objectives for wizard [key] have been generated. You can edit them and anounce manually." + usr << "The objectives for wizard [key] have been generated. You can edit them and anounce manually." else if (href_list["changeling"]) switch(href_list["changeling"]) @@ -740,11 +740,11 @@ datum/mind log_admin("[key_name(usr)] has changeling'ed [current].") if("autoobjectives") ticker.mode.forge_changeling_objectives(src) - usr << "\blue The objectives for changeling [key] have been generated. You can edit them and anounce manually." + usr << "The objectives for changeling [key] have been generated. You can edit them and anounce manually." if("initialdna") if( !changeling || !changeling.absorbed_dna.len || !istype(current, /mob/living/carbon)) - usr << "\red Resetting DNA failed!" + usr << "Resetting DNA failed!" else var/mob/living/carbon/C = current C.dna = changeling.absorbed_dna[1] @@ -756,7 +756,7 @@ datum/mind switch(href_list["nuclear"]) if("clear") remove_antag("NuclearOp") - current << "\red You have been brainwashed! You are no longer a syndicate operative!" + current << "You have been brainwashed! You are no longer a syndicate operative!" message_admins("[key_name_admin(usr)] has de-nuke op'ed [current].") log_admin("[key_name(usr)] has de-nuke op'ed [current].") if("nuclear") @@ -768,7 +768,7 @@ datum/mind else current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]" special_role = "Syndicate" - current << "\blue You are a [syndicate_name()] agent!" + current << "You are a [syndicate_name()] agent!" ticker.mode.forge_syndicate_objectives(src) ticker.mode.greet_syndicate(src) message_admins("[key_name_admin(usr)] has nuke op'ed [current].") @@ -788,7 +788,7 @@ datum/mind qdel(H.w_uniform) if (!ticker.mode.equip_syndicate(current)) - usr << "\red Equipping a syndicate failed!" + usr << "Equipping a syndicate failed!" if("tellcode") var/code for (var/obj/machinery/nuclearbomb/bombue in world) @@ -799,13 +799,13 @@ datum/mind store_memory("Syndicate Nuclear Bomb Code: [code]", 0, 0) current << "The nuclear authorization code is: [code]" else - usr << "\red No valid nuke found!" + usr << "No valid nuke found!" else if (href_list["traitor"]) switch(href_list["traitor"]) if("clear") remove_antag("Traitor") - current << "\red You have been brainwashed! You are no longer a traitor!" + current << "You have been brainwashed! You are no longer a traitor!" message_admins("[key_name_admin(usr)] has de-traitor'ed [current].") log_admin("[key_name(usr)] has de-traitor'ed [current].") @@ -813,7 +813,7 @@ datum/mind if(!(src in ticker.mode.traitors)) ticker.mode.traitors += src special_role = "traitor" - current << "\red You are a traitor!" + current << "You are a traitor!" message_admins("[key_name_admin(usr)] has traitor'ed [current].") log_admin("[key_name(usr)] has traitor'ed [current].") if(isAI(current)) @@ -823,7 +823,7 @@ datum/mind if("autoobjectives") ticker.mode.forge_traitor_objectives(src) - usr << "\blue The objectives for traitor [key] have been generated. You can edit them and anounce manually." + usr << "The objectives for traitor [key] have been generated. You can edit them and anounce manually." else if (href_list["monkey"]) var/mob/living/L = current @@ -836,7 +836,7 @@ datum/mind var/mob/living/carbon/monkey/M = current if (istype(H)) log_admin("[key_name(usr)] attempting to monkeyize [key_name(current)]") - message_admins("\blue [key_name_admin(usr)] attempting to monkeyize [key_name_admin(current)]") + message_admins("[key_name_admin(usr)] attempting to monkeyize [key_name_admin(current)]") src = null M = H.monkeyize() src = M.mind @@ -851,7 +851,7 @@ datum/mind var/mob/living/carbon/monkey/M = current if (istype(H)) log_admin("[key_name(usr)] attempting to monkeyize and infect [key_name(current)]") - message_admins("\blue [key_name_admin(usr)] attempting to monkeyize and infect [key_name_admin(current)]", 1) + message_admins("[key_name_admin(usr)] attempting to monkeyize and infect [key_name_admin(current)]", 1) src = null M = H.monkeyize() src = M.mind @@ -868,7 +868,7 @@ datum/mind D.cure(0) sleep(0) //because deleting of virus is doing throught spawn(0) log_admin("[key_name(usr)] attempting to humanize [key_name(current)]") - message_admins("\blue [key_name_admin(usr)] attempting to humanize [key_name_admin(current)]") + message_admins("[key_name_admin(usr)] attempting to humanize [key_name_admin(current)]") H = M.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_DEFAULTMSG) if(H) src = H.mind @@ -877,7 +877,7 @@ datum/mind switch(href_list["silicon"]) if("unmalf") remove_antag("Malf") - current << "\red You have been patched! You are no longer malfunctioning!" + current << "You have been patched! You are no longer malfunctioning!" message_admins("[key_name_admin(usr)] has de-malf'ed [current].") log_admin("[key_name(usr)] has de-malf'ed [current].") @@ -923,12 +923,12 @@ datum/mind log_admin("[key_name(usr)] changed [current]'s telecrystal count to [crystals].") if("uplink") if (!ticker.mode.equip_traitor(current, !(src in ticker.mode.traitors))) - usr << "\red Equipping a syndicate failed!" + usr << "Equipping a syndicate failed!" log_admin("[key_name(usr)] attempted to give [current] an uplink.") else if (href_list["obj_announce"]) var/obj_count = 1 - current << "\blue Your current objectives:" + current << "Your current objectives:" for(var/datum/objective/objective in objectives) current << "Objective #[obj_count]: [objective.explanation_text]" obj_count++ @@ -979,7 +979,7 @@ datum/mind current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]" special_role = "Syndicate" assigned_role = "MODE" - current << "\blue You are a [syndicate_name()] agent!" + current << "You are a [syndicate_name()] agent!" ticker.mode.forge_syndicate_objectives(src) ticker.mode.greet_syndicate(src) diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index 205ed209a8..860fffe151 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -37,7 +37,7 @@ clothes_req = 1 invocation = "BIRUZ BENNAR" invocation_type = "shout" - message = "\blue You feel strong! You feel a pressure building behind your eyes!" + message = "You feel strong! You feel a pressure building behind your eyes!" range = -1 include_user = 1 centcom_cancast = 0 @@ -198,7 +198,7 @@ clothes_req = 0 invocation = "STI KALY" invocation_type = "whisper" - message = "\blue Your eyes cry out in pain!" + message = "Your eyes cry out in pain!" cooldown_min = 50 //12 deciseconds reduction per rank starting_spells = list("/obj/effect/proc_holder/spell/targeted/inflict_handler/blind","/obj/effect/proc_holder/spell/targeted/genetic/blind") From 22fff40c40f07e98679f72159597de8ed7181159 Mon Sep 17 00:00:00 2001 From: ike709 Date: Fri, 22 Aug 2014 17:33:02 -0500 Subject: [PATCH 2/7] Span classes everywhere part 2 --- code/modules/reagents/Chemistry-Holder.dm | 4 +-- code/modules/reagents/Chemistry-Recipes.dm | 30 +++++++++---------- code/modules/reagents/grenade_launcher.dm | 12 ++++---- .../reagent_containers/food/drinks.dm | 26 ++++++++-------- .../reagent_containers/food/drinks/bottle.dm | 6 ++-- code/modules/reagents/reagent_dispenser.dm | 6 ++-- code/modules/recycling/sortingmachinery.dm | 4 +-- code/modules/research/message_server.dm | 2 +- code/modules/research/rdconsole.dm | 14 ++++----- code/modules/research/server.dm | 4 +-- 10 files changed, 54 insertions(+), 54 deletions(-) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index a675580369..193b77f029 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -276,14 +276,14 @@ datum if(!istype(my_atom, /mob)) // No bubbling mobs for(var/mob/M in seen) - M << "\blue \icon[my_atom] The solution begins to bubble." + M << "\icon[my_atom] The solution begins to bubble." if(istype(my_atom, /obj/item/slime_extract)) var/obj/item/slime_extract/ME2 = my_atom ME2.Uses-- if(ME2.Uses <= 0) // give the notification that the slime core is dead for(var/mob/M in seen) - M << "\blue \icon[my_atom] The [my_atom]'s power is consumed in the reaction." + M << "\icon[my_atom] The [my_atom]'s power is consumed in the reaction." ME2.name = "\improper used slime extract" ME2.desc = "This extract has been used up." diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index dcbefb4678..a3070cffde 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -638,12 +638,12 @@ datum/chemical_reaction/methamphetamine var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) - M << "\red The solution violently bubbles!" + M << "The solution violently bubbles!" location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) - M << "\red The solution spews out foam!" + M << "The solution spews out foam!" //world << "Holder volume is [holder.total_volume]" //for(var/datum/reagent/R in holder.reagent_list) @@ -668,7 +668,7 @@ datum/chemical_reaction/methamphetamine var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) - M << "\red The solution spews out a metalic foam!" + M << "The solution spews out a metalic foam!" var/datum/effect/effect/system/foam_spread/s = new() s.set_up(created_volume, location, holder, 1) @@ -688,7 +688,7 @@ datum/chemical_reaction/methamphetamine var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) - M << "\red The solution spews out a metalic foam!" + M << "The solution spews out a metalic foam!" var/datum/effect/effect/system/foam_spread/s = new() s.set_up(created_volume, location, holder, 2) @@ -1013,12 +1013,12 @@ datum/chemical_reaction/pestkiller var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) - M << "\red The solution violently bubbles!" + M << "The solution violently bubbles!" location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) - M << "\red The solution spews out foam!" + M << "The solution spews out foam!" //world << "Holder volume is [holder.total_volume]" //for(var/datum/reagent/R in holder.reagent_list) @@ -1044,7 +1044,7 @@ datum/chemical_reaction/pestkiller /datum/chemical_reaction/slimespawn/on_reaction(var/datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) - O.show_message(text("\red Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!"), 1) + O.show_message(text("Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!"), 1) var/mob/living/carbon/slime/S = new /mob/living/carbon/slime S.loc = get_turf(holder.my_atom) @@ -1105,7 +1105,7 @@ datum/chemical_reaction/pestkiller /datum/chemical_reaction/slimecrit/on_reaction(var/datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) - O.show_message(text("\red The slime extract begins to vibrate violently !"), 1) + O.show_message(text("The slime extract begins to vibrate violently!"), 1) spawn(50) if(holder && holder.my_atom) @@ -1174,7 +1174,7 @@ datum/chemical_reaction/pestkiller /datum/chemical_reaction/slimecritlesser/on_reaction(var/datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) - O.show_message(text("\red The slime extract begins to vibrate violently !"), 1) + O.show_message(text("The slime extract begins to vibrate violently!"), 1) spawn(50) if(holder && holder.my_atom) @@ -1301,13 +1301,13 @@ datum/chemical_reaction/pestkiller /datum/chemical_reaction/slimefreeze/on_reaction(var/datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) - O.show_message(text("\red The slime extract begins to vibrate violently !"), 1) + O.show_message(text("The slime extract begins to vibrate violently!"), 1) spawn(50) if(holder && holder.my_atom) playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1) for(var/mob/living/M in range (get_turf(holder.my_atom), 7)) M.bodytemperature -= 240 - M << "\blue You feel a chill!" + M << "You feel a chill!" //Orange /datum/chemical_reaction/slimecasp @@ -1332,7 +1332,7 @@ datum/chemical_reaction/pestkiller /datum/chemical_reaction/slimefire/on_reaction(var/datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) - O.show_message(text("\red The slime extract begins to vibrate violently !"), 1) + O.show_message(text("The slime extract begins to vibrate violently!"), 1) spawn(50) if(holder && holder.my_atom) var/turf/simulated/T = get_turf(holder.my_atom) @@ -1378,7 +1378,7 @@ datum/chemical_reaction/pestkiller /datum/chemical_reaction/slimeglow/on_reaction(var/datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) - O.show_message(text("\red The slime begins to emit a soft light. Squeezing it will cause it to grow brightly."), 1) + O.show_message(text("The slime begins to emit a soft light. Squeezing it will cause it to grow brightly."), 1) var/obj/item/device/flashlight/slime/F = new /obj/item/device/flashlight/slime F.loc = get_turf(holder.my_atom) @@ -1450,7 +1450,7 @@ datum/chemical_reaction/pestkiller for(var/mob/living/carbon/slime/slime in viewers(get_turf(holder.my_atom), null)) slime.rabid = 1 for(var/mob/O in viewers(get_turf(holder.my_atom), null)) - O.show_message(text("\red The [slime] is driven into a frenzy!."), 1) + O.show_message(text("The [slime] is driven into a frenzy!"), 1) //Pink /datum/chemical_reaction/slimeppotion @@ -1491,7 +1491,7 @@ datum/chemical_reaction/pestkiller /datum/chemical_reaction/slimeexplosion/on_reaction(var/datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) - O.show_message(text("\red The slime extract begins to vibrate violently !"), 1) + O.show_message(text("The slime extract begins to vibrate violently!"), 1) spawn(50) if(holder && holder.my_atom) explosion(get_turf(holder.my_atom), 1 ,3, 6) diff --git a/code/modules/reagents/grenade_launcher.dm b/code/modules/reagents/grenade_launcher.dm index 149712525d..ca520a801d 100644 --- a/code/modules/reagents/grenade_launcher.dm +++ b/code/modules/reagents/grenade_launcher.dm @@ -26,10 +26,10 @@ user.drop_item() I.loc = src grenades += I - user << "\blue You put the grenade in the grenade launcher." - user << "\blue [grenades.len] / [max_grenades] Grenades." + user << "You put the grenade in the grenade launcher." + user << "[grenades.len] / [max_grenades] Grenades." else - usr << "\red The grenade launcher cannot hold more grenades." + usr << "The grenade launcher cannot hold more grenades." afterattack(obj/target, mob/user , flag) @@ -45,13 +45,13 @@ if(grenades.len) spawn(0) fire_grenade(target,user) else - usr << "\red The grenade launcher is empty." + usr << "The grenade launcher is empty." proc fire_grenade(atom/target, mob/user) for(var/mob/O in viewers(world.view, user)) - O.show_message(text("\red [] fired a grenade!", user), 1) - user << "\red You fire the grenade launcher!" + O.show_message(text("[] fired a grenade!", user), 1) + user << "You fire the grenade launcher!" var/obj/item/weapon/grenade/chem_grenade/F = grenades[1] //Now with less copypasta! grenades -= F F.loc = user.loc diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index 9aca932121..3a1e4ec8e5 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -41,10 +41,10 @@ else if( istype(M, /mob/living/carbon/human) ) for(var/mob/O in viewers(world.view, user)) - O.show_message("\red [user] attempts to feed [M] [src].", 1) + O.show_message("[user] attempts to feed [M] [src].", 1) if(!do_mob(user, M)) return for(var/mob/O in viewers(world.view, user)) - O.show_message("\red [user] feeds [M] [src].", 1) + O.show_message("[user] feeds [M] [src].", 1) add_logs(user, M, "fed", object="[reagentlist(src)]") if(reagents.total_volume) reagents.reaction(M, INGEST) @@ -69,27 +69,27 @@ if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us. if(!target.reagents.total_volume) - user << "\red [target] is empty." + user << "[target] is empty." return if(reagents.total_volume >= reagents.maximum_volume) - user << "\red [src] is full." + user << "[src] is full." return var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this) - user << "\blue You fill [src] with [trans] units of the contents of [target]." + user << "You fill [src] with [trans] units of the contents of [target]." else if(target.is_open_container()) //Something like a glass. Player probably wants to transfer TO it. if(!reagents.total_volume) - user << "\red [src] is empty." + user << "[src] is empty." return if(target.reagents.total_volume >= target.reagents.maximum_volume) - user << "\red [target] is full." + user << "[target] is full." return var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) - user << "\blue You transfer [trans] units of the solution to [target]." + user << "You transfer [trans] units of the solution to [target]." if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell var/mob/living/silicon/robot/bro = user @@ -105,15 +105,15 @@ ..() if (!(usr in range(0)) && usr!=src.loc) return if(!reagents || reagents.total_volume==0) - usr << "\blue \The [src] is empty!" + usr << "\The [src] is empty!" else if (reagents.total_volume<=src.volume/4) - usr << "\blue \The [src] is almost empty!" + usr << "\The [src] is almost empty!" else if (reagents.total_volume<=src.volume*0.66) - usr << "\blue \The [src] is half full!" + usr << "\The [src] is half full!" else if (reagents.total_volume<=src.volume*0.90) - usr << "\blue \The [src] is almost full!" + usr << "\The [src] is almost full!" else - usr << "\blue \The [src] is full!" + usr << "\The [src] is full!" //////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index e2fa291662..df7204705a 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -84,8 +84,8 @@ //Display an attack message. for(var/mob/O in viewers(user, null)) - if(target != user) O.show_message(text("\red [target] has been hit over the head with a bottle of [src.name], by [user]!"), 1) - else O.show_message(text("\red [target] hit himself with a bottle of [src.name] on the head!"), 1) + if(target != user) O.show_message(text("[target] has been hit over the head with a bottle of [src.name], by [user]!"), 1) + else O.show_message(text("[target] hit himself with a bottle of [src.name] on the head!"), 1) //Weaken the target for the duration that we calculated and divide it by 5. if(armor_duration) target.apply_effect(min(armor_duration, 10) , WEAKEN) // Never weaken more than a flash! @@ -102,7 +102,7 @@ //The reagents in the bottle splash all over the target, thanks for the idea Nodrak if(src.reagents) for(var/mob/O in viewers(user, null)) - O.show_message(text("\blue The contents of the [src] splashes all over [target]!"), 1) + O.show_message(text("The contents of the [src] splashes all over [target]!"), 1) src.reagents.reaction(target, TOUCH) //Finally, smash the bottle. This kills (del) the bottle. diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 8544ea9bb7..1de1c92e2a 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -43,12 +43,12 @@ set src in view() ..() if (!(usr in view(2)) && usr!=src.loc) return - usr << "\blue It contains:" + usr << "It contains:" if(reagents && reagents.reagent_list.len) for(var/datum/reagent/R in reagents.reagent_list) - usr << "\blue [R.volume] units of [R.name]" + usr << "[R.volume] units of [R.name]" else - usr << "\blue Nothing." + usr << "Nothing." /obj/structure/reagent_dispensers/verb/set_APTFT() //set amount_per_transfer_from_this set name = "Set transfer amount" diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 10293b99c2..cb07c6524e 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -29,7 +29,7 @@ if(sortTag != O.currTag) var/tag = uppertext(TAGGERLOCATIONS[O.currTag]) - user << "\blue *[tag]*" + user << "*[tag]*" sortTag = O.currTag playsound(loc, 'sound/machines/twobeep.ogg', 100, 1) @@ -75,7 +75,7 @@ if(sortTag != O.currTag) var/tag = uppertext(TAGGERLOCATIONS[O.currTag]) - user << "\blue *[tag]*" + user << "*[tag]*" sortTag = O.currTag playsound(loc, 'sound/machines/twobeep.ogg', 100, 1) diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 884d4eb2f8..20b12e8935 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -95,7 +95,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth) /obj/machinery/message_server/attack_hand(user as mob) -// user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few Centcom delays." +// user << "There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few Centcom delays." user << "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]" active = !active update_icon() diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index c271a95c3f..7e7ec4c61b 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -239,15 +239,15 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(istype(D, /obj/item/weapon/disk/tech_disk)) t_disk = D else if (istype(D, /obj/item/weapon/disk/design_disk)) d_disk = D else - user << "\red Machine cannot accept disks in that format." + user << "Machine cannot accept disks in that format." return user.drop_item() D.loc = src - user << "\blue You add the disk to the machine!" + user << "You add the disk to the machine!" else if(istype(D, /obj/item/weapon/card/emag) && !emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << "\blue You you disable the security protocols" + user << "You you disable the security protocols" else ..() src.updateUsrDialog() @@ -316,7 +316,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, else if(href_list["eject_item"]) //Eject the item inside the destructive analyzer. if(linked_destroy) if(linked_destroy.busy) - usr << "\red The destructive analyzer is busy at the moment." + usr << "The destructive analyzer is busy at the moment." else if(linked_destroy.loaded_item) linked_destroy.loaded_item.loc = linked_destroy.loc @@ -327,7 +327,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, else if(href_list["deconstruct"]) //Deconstruct the item in the destructive analyzer and update the research holder. if(linked_destroy) if(linked_destroy.busy) - usr << "\red The destructive analyzer is busy at the moment." + usr << "The destructive analyzer is busy at the moment." else var/choice = input("Proceeding will destroy loaded item.") in list("Proceed", "Cancel") if(choice == "Cancel" || !linked_destroy) return @@ -340,7 +340,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, linked_destroy.busy = 0 if(!linked_destroy.hacked) if(!linked_destroy.loaded_item) - usr <<"\red The destructive analyzer appears to be empty." + usr <<"The destructive analyzer appears to be empty." screen = 1.0 return if((linked_destroy.loaded_item.reliability >= 99 - (linked_destroy.decon_mod * 3)) || linked_destroy.loaded_item.crit_fail) @@ -385,7 +385,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, else if(href_list["sync"]) //Sync the research holder with all the R&D consoles in the game that aren't sync protected. screen = 0.0 if(!sync) - usr << "\red You must connect to the network first!" + usr << "You must connect to the network first!" else griefProtection() //Putting this here because I dont trust the sync process spawn(30) diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 8abbae4220..50cd3a2ba3 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -191,7 +191,7 @@ add_fingerprint(usr) usr.set_machine(src) if(!src.allowed(usr) && !emagged) - usr << "\red You do not have the required access level" + usr << "You do not have the required access level" return if(href_list["main"]) @@ -319,7 +319,7 @@ if(istype(D, /obj/item/weapon/card/emag) && !emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << "\blue You you disable the security protocols" + user << "You you disable the security protocols" else ..() src.updateUsrDialog() From 3a8dc005180e3e0911f8028e1405f5d89e981e46 Mon Sep 17 00:00:00 2001 From: ike709 Date: Fri, 22 Aug 2014 19:03:40 -0500 Subject: [PATCH 3/7] Span classes everywhere part 3 --- code/modules/power/port_gen.dm | 16 +++++----- code/modules/power/singularity/collector.dm | 14 ++++---- code/modules/power/singularity/singularity.dm | 14 ++++---- code/modules/power/solar.dm | 4 +-- code/modules/powerarmor/components/armor.dm | 4 +-- .../modules/powerarmor/components/powergen.dm | 16 +++++----- code/modules/powerarmor/components/seals.dm | 14 ++++---- .../powerarmor/components/subsystems.dm | 32 +++++++++---------- code/modules/powerarmor/suit.dm | 22 ++++++------- .../modules/projectiles/projectile/special.dm | 12 +++---- 10 files changed, 74 insertions(+), 74 deletions(-) diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 92db2f7aaf..1d2756e2cd 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -146,8 +146,8 @@ display round(lastgen) and plasmatank amount /obj/machinery/power/port_gen/pacman/examine() ..() - usr << "\blue The generator has [sheets] units of [sheet_name] fuel left, producing [power_gen] per cycle." - if(crit_fail) usr << "\red The generator seems to have broken down." + usr << "The generator has [sheets] units of [sheet_name] fuel left, producing [power_gen] per cycle." + if(crit_fail) usr << "The generator seems to have broken down." /obj/machinery/power/port_gen/pacman/HasFuel() if(sheets >= 1 / (time_per_sheet / power_output) - sheet_left) @@ -209,9 +209,9 @@ display round(lastgen) and plasmatank amount var/obj/item/stack/addstack = O var/amount = min((max_sheets - sheets), addstack.amount) if(amount < 1) - user << "\blue The [src.name] is full!" + user << "The [src.name] is full!" return - user << "\blue You add [amount] sheets to the [src.name]." + user << "You add [amount] sheets to the [src.name]." sheets += amount addstack.use(amount) updateUsrDialog() @@ -228,11 +228,11 @@ display round(lastgen) and plasmatank amount if(!anchored && !isinspace()) connect_to_network() - user << "\blue You secure the generator to the floor." + user << "You secure the generator to the floor." anchored = 1 else if(anchored) disconnect_from_network() - user << "\blue You unsecure the generator from the floor." + user << "You unsecure the generator from the floor." anchored = 0 playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) @@ -241,9 +241,9 @@ display round(lastgen) and plasmatank amount panel_open = !panel_open playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(panel_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) && panel_open) default_deconstruction_crowbar(O) diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 2d3ceab2d8..391793020e 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -45,23 +45,23 @@ var/global/list/rad_collectors = list() investigate_log("turned [active?"on":"off"] by [user.key]. [P?"Fuel: [round(P.air_contents.toxins/0.29)]%":"It is empty"].","singulo") return else - user << "\red The controls are locked!" + user << "The controls are locked!" return ..() /obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/device/multitool)) - user << "\blue The [W.name] detects that [last_power]W were recently produced." + user << "The [W.name] detects that [last_power]W were recently produced." return 1 else if(istype(W, /obj/item/device/analyzer) && P) atmosanalyzer_scan(P.air_contents, user) else if(istype(W, /obj/item/weapon/tank/plasma)) if(!src.anchored) - user << "\red The [src] needs to be secured to the floor first." + user << "The [src] needs to be secured to the floor first." return 1 if(src.P) - user << "\red There's already a plasma tank loaded." + user << "There's already a plasma tank loaded." return 1 user.drop_item() src.P = W @@ -73,7 +73,7 @@ var/global/list/rad_collectors = list() return 1 else if(istype(W, /obj/item/weapon/wrench)) if(P) - user << "\blue Remove the plasma tank first." + user << "Remove the plasma tank first." return 1 if(!anchored && !isinspace()) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) @@ -96,9 +96,9 @@ var/global/list/rad_collectors = list() user << "The controls are now [src.locked ? "locked." : "unlocked."]" else src.locked = 0 //just in case it somehow gets locked - user << "\red The controls can only be locked when the [src] is active" + user << "The controls can only be locked when the [src] is active" else - user << "\red Access denied!" + user << "Access denied!" return 1 else ..() diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 5f95a65c1b..4a4321f0e9 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -442,12 +442,12 @@ var/global/list/uneatable = list( if (istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(istype(H.glasses,/obj/item/clothing/glasses/meson)) - H << "\blue You look directly into The [src.name], good thing you had your protective eyewear on!" + H << "You look directly into The [src.name], good thing you had your protective eyewear on!" return - M << "\red You look directly into The [src.name] and feel weak." + M << "You look directly into The [src.name] and feel weak." M.apply_effect(3, STUN) for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] stares blankly at The []!", M, src), 1) + O.show_message(text("[] stares blankly at The []!", M, src), 1) return @@ -541,7 +541,7 @@ var/global/list/uneatable = list( for(var/mob/living/carbon/M in oviewers(8, src)) if(M.stat == CONSCIOUS) if(!iscultist(M)) - M << "\red You feel your sanity crumble away in an instant as you gaze upon [src.name]..." + M << "You feel your sanity crumble away in an instant as you gaze upon [src.name]..." M.apply_effect(3, STUN) @@ -605,12 +605,12 @@ var/global/list/uneatable = list( //no living humans, follow a ghost instead. /obj/machinery/singularity/narsie/proc/acquire(var/mob/food) - target << "\blue NAR-SIE HAS LOST INTEREST IN YOU" + target << "NAR-SIE HAS LOST INTEREST IN YOU" target = food if(ishuman(target)) - target << "\red NAR-SIE HUNGERS FOR YOUR SOUL" + target << "NAR-SIE HUNGERS FOR YOUR SOUL" else - target << "\red NAR-SIE HAS CHOSEN YOU TO LEAD THEM TO THEIR NEXT MEAL" + target << "NAR-SIE HAS CHOSEN YOU TO LEAD THEM TO THEIR NEXT MEAL" //Wizard narsie diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 7c3e16ed5a..4520606dbd 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -336,7 +336,7 @@ var/list/solars_list = list() 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/shard( src.loc ) var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A ) @@ -348,7 +348,7 @@ var/list/solars_list = list() 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/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A ) for (var/obj/C in src) diff --git a/code/modules/powerarmor/components/armor.dm b/code/modules/powerarmor/components/armor.dm index ace1615c93..40f5892298 100644 --- a/code/modules/powerarmor/components/armor.dm +++ b/code/modules/powerarmor/components/armor.dm @@ -10,9 +10,9 @@ switch(parent.active) if(1) if(!sudden) - usr << "\blue Reactive armor systems disengaged." + usr << "Reactive armor systems disengaged." if(0) - usr << "\blue Reactive armor systems engaged." + usr << "Reactive armor systems engaged." var/list/switchover = list() for (var/armorvar in parent.armor) if(armorvar == "bio") diff --git a/code/modules/powerarmor/components/powergen.dm b/code/modules/powerarmor/components/powergen.dm index b86c3bd194..7a55a910b7 100644 --- a/code/modules/powerarmor/components/powergen.dm +++ b/code/modules/powerarmor/components/powergen.dm @@ -60,21 +60,21 @@ if(istype(item, /obj/item/stack/sheet/mineral/plasma)) var/obj/item/stack/S = item if(fuel < maxfuel) - user << "\blue You feed some plasma into the armor's generator." + user << "You feed some plasma into the armor's generator." fuel += 25 S.use(1) else - user << "\red The generator already has plenty of plasma." + user << "The generator already has plenty of plasma." return 1 if(istype(item, /obj/item/weapon/ore/plasma)) if(fuel < maxfuel) - user << "\blue You feed plasma ore into the armor's generator." + user << "You feed plasma ore into the armor's generator.,/span>" fuel += 15 //raw plasma has impurities, so it doesn't provide as much fuel. --NEO del(item) else - user << "\red The generator already has plenty of plasma." + user << "The generator already has plenty of plasma." return 1 return 0 @@ -105,18 +105,18 @@ if(prob(reliability)) //Only a minor failure, enjoy your radiation. for (var/mob/living/M in range(0,src.parent)) if (src.parent in M.contents) - M << "\red Your armor feels pleasantly warm for a moment." + M << "Your armor feels pleasantly warm for a moment." M.radiation += rand(1,20) else - M << "\red You feel a warm sensation." + M << "You feel a warm sensation." M.apply_effect(rand(1,15),IRRADIATE,0) if(!prob(reliability)) reliability -= 5 else //Big failure, TIME FOR RADIATION BITCHES for (var/mob/living/M in range(2,src.parent)) if (src.parent in M.contents) - M << "\red Your armor's reactor overloads!" + M << "Your armor's reactor overloads!" M.radiation += 60 - M << "\red You feel a wave of heat wash over you." + M << "You feel a wave of heat wash over you." M.apply_effect(40,IRRADIATE,0) crit_fail = 1 //broken~ \ No newline at end of file diff --git a/code/modules/powerarmor/components/seals.dm b/code/modules/powerarmor/components/seals.dm index 2ed8fe59cf..722b709eff 100644 --- a/code/modules/powerarmor/components/seals.dm +++ b/code/modules/powerarmor/components/seals.dm @@ -19,7 +19,7 @@ switch(parent.active) if(1) if(!sudden) - usr << "\blue Atmospheric seals disengaged." + usr << "Atmospheric seals disengaged." parent.gas_transfer_coefficient = 1 parent.permeability_coefficient = 1 parent.flags &= ~STOPSPRESSUREDMAGE @@ -50,7 +50,7 @@ parent.shoes.armor["bio"] = initial(parent.shoes.armor["bio"]) if(0) - usr << "\blue Atmospheric seals engaged." + usr << "Atmospheric seals engaged." parent.gas_transfer_coefficient = 0.01 parent.permeability_coefficient = 0.02 parent.flags |= STOPSPRESSUREDMAGE @@ -117,10 +117,10 @@ helm = user.head if(!sealed) - user << "\red Unable to initialize helmet seal, armor seals not active." + user << "Unable to initialize helmet seal, armor seals not active." return if(!helm.parent) - user << "\blue Helmet locked." + user << "Helmet locked." helm.flags |= NODROP parent.helm = helm helm.parent = parent @@ -130,7 +130,7 @@ parent.helm.max_heat_protection_temperature = helmet_max parent.helm.min_cold_protection_temperature = helmet_min parent.helm.flags |= STOPSPRESSUREDMAGE - user << "\blue Helmet atmospheric seals engaged." + user << "Helmet atmospheric seals engaged." if(manual) for (var/armorvar in helm.armor) helm.armor[armorvar] = parent.armor[armorvar] @@ -138,7 +138,7 @@ return else if(manual) - user << "\blue Helmet atmospheric seals disengaged." + user << "Helmet atmospheric seals disengaged." parent.helm.gas_transfer_coefficient = 1 parent.helm.permeability_coefficient = 1 parent.helm.max_heat_protection_temperature = null @@ -155,7 +155,7 @@ if(!sudden) if(manual) sleep(20) - user << "\blue Helmet unlocked." + user << "Helmet unlocked." helm.flags &= ~NODROP parent.helm = null helm.parent = null diff --git a/code/modules/powerarmor/components/subsystems.dm b/code/modules/powerarmor/components/subsystems.dm index a148fe6944..4e12d8afff 100644 --- a/code/modules/powerarmor/components/subsystems.dm +++ b/code/modules/powerarmor/components/subsystems.dm @@ -11,10 +11,10 @@ switch(parent.active) if(1) if(!sudden) - usr << "\blue Movement assist servos disengaged." + usr << "Movement assist servos disengaged." parent.slowdown += toggleslowdown if(0) - usr << "\blue Movement assist servos engaged." + usr << "Movement assist servos engaged." parent.slowdown -= toggleslowdown /obj/item/weapon/powerarmor/servos/is_subsystem() @@ -47,9 +47,9 @@ switch(parent.active) if(1) if(!sudden) - usr << "\blue Medical injector disengaged." + usr << "Medical injector disengaged." if(0) - usr << "\blue Medical injector engaged." + usr << "Medical injector engaged." /obj/item/weapon/powerarmor/medinj/is_subsystem() return "medinj" @@ -72,7 +72,7 @@ for(var/mob/living/carbon/human/M in range(0, parent)) if(M.wear_suit == parent) - M << "\blue Medicals injected." + M << "Medicals injected." M.reagents.add_reagent("doctorsdelight", 5) M.reagents.add_reagent("synaptizine", 5) M.reagents.add_reagent("anti_toxin", 5) @@ -96,9 +96,9 @@ switch(parent.active) if(1) if(!sudden) - usr << "\blue Automatic fire extinguisher disengaged." + usr << "Automatic fire extinguisher disengaged." if(0) - usr << "\blue Automatic fire extinguisher engaged." + usr << "Automatic fire extinguisher engaged." /obj/item/weapon/powerarmor/autoext/is_subsystem() return "autoext" @@ -108,8 +108,8 @@ if(ishuman(parent.loc)) var/mob/living/carbon/human/H = parent.loc if(H.on_fire && parent.use_power(150)) - H << "\blue *fssszt*" - H << "\blue Fire extinguished." + H << "*fssszt*" + H << "Fire extinguished." H.ExtinguishMob() H.bodytemperature -= rand(25,30) @@ -132,9 +132,9 @@ if(active) toggle_grip(sudden) if(!sudden) - usr << "\blue Magnetic grip modules disengaged." + usr << "Magnetic grip modules disengaged." if(0) - usr << "\blue Magnetic grip modules engaged." + usr << "Magnetic grip modules engaged." /obj/item/weapon/powerarmor/grip/magnetic/on_mob_move() if(active) @@ -145,11 +145,11 @@ if(active) if(!sudden) - user << "\blue Magnetic grip modules deactivated." + user << "Magnetic grip modules deactivated." parent.slowdown -= toggleslowdown parent.shoes.flags &= ~NOSLIP else - user << "\blue Magnetic grip modules activated." + user << "Magnetic grip modules activated." parent.slowdown += toggleslowdown parent.shoes.flags |= NOSLIP @@ -198,9 +198,9 @@ switch(parent.active) if(1) if(!sudden) - usr << "\blue Ore collector module disengaged." + usr << "Ore collector module disengaged." if(0) - usr << "\blue Ore collector module engaged." + usr << "Ore collector module engaged." /obj/item/weapon/powerarmor/orecollector/Stat() ..() @@ -214,7 +214,7 @@ var/obj/structure/ore_box/box = A for(var/obj/item/weapon/ore/O in contents) O.loc = box - user << "\blue You empty the ore collector into the box." + user << "You empty the ore collector into the box." return 1 /obj/item/weapon/powerarmor/orecollector/on_mob_move() diff --git a/code/modules/powerarmor/suit.dm b/code/modules/powerarmor/suit.dm index 684765ce0b..33231b179a 100644 --- a/code/modules/powerarmor/suit.dm +++ b/code/modules/powerarmor/suit.dm @@ -69,7 +69,7 @@ if(active) return if(!get_power()) - user << "\red Power source missing or depleted." + user << "Power source missing or depleted." return powerup() @@ -77,19 +77,19 @@ /obj/item/clothing/suit/powered/proc/powerup() // separated for powerarmor-wearing corpses var/mob/living/carbon/human/user = src.loc if(helmrequired && !istype(user.head, /obj/item/clothing/head/powered)) - user << "\red Helmet missing, unable to initiate power-on procedure." + user << "Helmet missing, unable to initiate power-on procedure." return if(!istype(user.gloves, /obj/item/clothing/gloves/powered)) - user << "\red Gloves missing, unable to initiate power-on procedure." + user << "Gloves missing, unable to initiate power-on procedure." return if(shoesrequired && !istype(user.shoes, /obj/item/clothing/shoes/powered)) - user << "\red Shoes missing, unable to initiate power-on procedure." + user << "Shoes missing, unable to initiate power-on procedure." return verbs -= /obj/item/clothing/suit/powered/proc/poweron - user << "\blue Suit interlocks engaged." + user << "Suit interlocks engaged." if(helmrequired) helm = user.head helm.flags |= NODROP @@ -110,12 +110,12 @@ sleep(40) if(subsystems.len) - user << "\blue Engaging subsystems..." + user << "Engaging subsystems..." for(var/obj/item/weapon/powerarmor/I in subsystems) sleep(20) I.toggle() - user << "\blue All systems online." + user << "All systems online." active = 1 processing_objects.Add(src) @@ -135,7 +135,7 @@ if(subsystems.len) if(!sudden) - user << "\blue Disengaging subsystems..." + user << "Disengaging subsystems..." for(var/obj/item/weapon/powerarmor/I in subsystems) sleep(delay/2) I.toggle(sudden) @@ -146,7 +146,7 @@ user.SetLuminosity(user.luminosity - helm.brightness_on) if(!sudden) - usr << "\blue Suit interlocks disengaged." + usr << "Suit interlocks disengaged." if(helm) helm.flags &= ~NODROP helm = null @@ -165,7 +165,7 @@ "Your armor loses power!", "You hear a click!") else - user << "\blue All systems disengaged." + user << "All systems disengaged." active = 0 @@ -225,7 +225,7 @@ return else if(istype(W, /obj/item/weapon/stock_parts/cell)) - user << "\blue You insert power cell into [src]." + user << "You insert power cell into [src]." user.unEquip(W) powercell = W powercell.loc = src diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index f870fa5357..b6ae5cec4c 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -95,10 +95,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) @@ -107,13 +107,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 // 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.") /obj/item/projectile/energy/florayield name = "beta somatoray" @@ -129,7 +129,7 @@ if(ishuman(target) && target.dna && target.dna.mutantrace == "plant") //These rays make plantmen fat. target.nutrition = min(target.nutrition+30, 500) else - target.show_message("\blue The radiation beam dissipates harmlessly through your body.") + target.show_message("The radiation beam dissipates harmlessly through your body.") else return 1 From 66ecf3be5930e8702769f1c537ff107c6ba41d45 Mon Sep 17 00:00:00 2001 From: ike709 Date: Fri, 22 Aug 2014 19:28:15 -0500 Subject: [PATCH 4/7] Span classes everywhere part 4 --- .../mob/living/simple_animal/friendly/crab.dm | 12 +-- .../simple_animal/friendly/farm_animals.dm | 16 ++-- .../living/simple_animal/friendly/mouse.dm | 2 +- .../mob/living/simple_animal/friendly/pug.dm | 2 +- .../simple_animal/hostile/giant_spider.dm | 10 +-- code/modules/mob/new_player/login.dm | 2 +- code/modules/mob/new_player/new_player.dm | 6 +- code/modules/mob/new_player/poll.dm | 26 +++--- code/modules/power/apc.dm | 80 +++++++++---------- code/modules/power/cable.dm | 12 +-- 10 files changed, 84 insertions(+), 84 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm index 798946269a..ee7ce6f1be 100644 --- a/code/modules/mob/living/simple_animal/friendly/crab.dm +++ b/code/modules/mob/living/simple_animal/friendly/crab.dm @@ -44,7 +44,7 @@ /*/mob/living/simple_animal/crab/attackby(var/obj/item/O as obj, var/mob/user as mob) if(istype(O, /obj/item/weapon/wirecutters)) if(prob(50)) - user << "\red \b This kills the crab." + user << "\b This kills the crab." health -= 20 Die() else @@ -61,20 +61,20 @@ qdel(MED) for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) - M.show_message("\blue [user] applies [MED] on [src]") + M.show_message("[user] applies [MED] on [src]") else - user << "\blue this crab is dead, medical items won't bring it back to life." + user << "this crab is dead, medical items won't bring it back to life." else if(O.force) health -= O.force for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) - M.show_message("\red \b [src] has been attacked with [O] by [user]. ") + M.show_message("\b [src] has been attacked with [O] by [user].") else - usr << "\red This weapon is ineffective, it does no damage." + usr << "This weapon is ineffective, it does no damage." for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) - M.show_message("\red [user] gently taps [src] with [O]. ") + M.show_message("[user] gently taps [src] with [O].") /mob/living/simple_animal/crab/GetMad() name = "MEGAMADCRAB" diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index d18d827af8..cff9514e3a 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -39,7 +39,7 @@ if(enemies.len && prob(10)) enemies = list() LoseTarget() - src.visible_message("\blue [src] calms down.") + src.visible_message("[src] calms down.") if(stat == CONSCIOUS) if(udder && prob(5)) @@ -58,7 +58,7 @@ /mob/living/simple_animal/hostile/retaliate/goat/Retaliate() ..() - src.visible_message("\red [src] gets an evil-looking gleam in \his eye.") + src.visible_message("[src] gets an evil-looking gleam in \his eye.") /mob/living/simple_animal/hostile/retaliate/goat/Move() ..() @@ -74,9 +74,9 @@ var/obj/item/weapon/reagent_containers/glass/G = O var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) if(G.reagents.total_volume >= G.volume) - user << "\red [O] is full." + user << "[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 @@ -113,9 +113,9 @@ var/obj/item/weapon/reagent_containers/glass/G = O var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) if(G.reagents.total_volume >= G.volume) - user << "\red [O] is full." + user << "[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 ..() @@ -223,13 +223,13 @@ var/global/chicken_count = 0 /mob/living/simple_animal/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob) if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat)) //feedin' dem chickens 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) //world << eggsleft else - user << "\blue [name] doesn't seem hungry!" + user << "[name] doesn't seem hungry!" else ..() diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 7d539de5db..a87ee46a9c 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -46,7 +46,7 @@ if( ishuman(AM) ) if(!stat) var/mob/M = AM - M << "\blue \icon[src] Squeek!" + M << "\icon[src] Squeek!" playsound(src, 'sound/effects/mousesqueek.ogg', 100, 1) ..() diff --git a/code/modules/mob/living/simple_animal/friendly/pug.dm b/code/modules/mob/living/simple_animal/friendly/pug.dm index fd34aa7ee4..1b7410eb41 100644 --- a/code/modules/mob/living/simple_animal/friendly/pug.dm +++ b/code/modules/mob/living/simple_animal/friendly/pug.dm @@ -32,7 +32,7 @@ /mob/living/simple_animal/pug/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri if(istype(O, /obj/item/weapon/newspaper)) if(!stat) - user.visible_message("\blue [user] baps [name] on the nose with the rolled up [O]") + user.visible_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)) dir = i diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index ee6fedf367..279426bce2 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -72,7 +72,7 @@ if(L.reagents) L.reagents.add_reagent("toxin", poison_per_bite) if(prob(poison_per_bite)) - L << "\red You feel a tiny prick." + L << "You feel a tiny prick." L.reagents.add_reagent(poison_type, 5) /mob/living/simple_animal/hostile/giant_spider/Life() @@ -132,7 +132,7 @@ var/obj/effect/spider/stickyweb/W = locate() in get_turf(src) if(!W) busy = SPINNING_WEB - src.visible_message("\blue \the [src] begins to secrete a sticky substance.") + src.visible_message("\the [src] begins to secrete a sticky substance.") stop_automated_movement = 1 spawn(40) if(busy == SPINNING_WEB) @@ -144,7 +144,7 @@ var/obj/effect/spider/eggcluster/E = locate() in get_turf(src) if(!E && fed > 0) busy = LAYING_EGGS - src.visible_message("\blue \the [src] begins to lay a cluster of eggs.") + src.visible_message("\the [src] begins to lay a cluster of eggs.") stop_automated_movement = 1 spawn(50) if(busy == LAYING_EGGS) @@ -172,7 +172,7 @@ else if(busy == MOVING_TO_TARGET && cocoon_target) if(get_dist(src, cocoon_target) <= 1) busy = SPINNING_COCOON - src.visible_message("\blue \the [src] begins to secrete a sticky substance around \the [cocoon_target].") + src.visible_message("\the [src] begins to secrete a sticky substance around \the [cocoon_target].") stop_automated_movement = 1 walk(src,0) spawn(50) @@ -187,7 +187,7 @@ continue large_cocoon = 1 fed++ - src.visible_message("\red \the [src] sticks a proboscis into \the [cocoon_target] and sucks a viscous substance out.") + src.visible_message("\the [src] sticks a proboscis into \the [cocoon_target] and sucks a viscous substance out.") M.loc = C C.pixel_x = M.pixel_x C.pixel_y = M.pixel_y diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm index 870e7fb4da..3c4d0c8d6d 100644 --- a/code/modules/mob/new_player/login.dm +++ b/code/modules/mob/new_player/login.dm @@ -4,7 +4,7 @@ src << "
[join_motd]
" if(admin_notice) - src << "\blue Admin Notice:\n \t [admin_notice]" + src << "Admin Notice:\n \t [admin_notice]" if(!mind) mind = new /datum/mind(key) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 23f9a99827..a37ad064bb 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -113,7 +113,7 @@ observer.started_as_observer = 1 close_spawn_windows() var/obj/O = locate("landmark*Observer-Start") - src << "\blue Now teleporting." + src << "Now teleporting." observer.loc = O.loc if(client.prefs.be_random_name) client.prefs.real_name = random_name(gender) @@ -126,7 +126,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() @@ -136,7 +136,7 @@ if(href_list["SelectedJob"]) if(!enter_allowed) - usr << "\blue There is an administrative lock on entering the game!" + usr << "There is an administrative lock on entering the game!" return AttemptLateSpawn(href_list["SelectedJob"]) diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm index 884b7ffc4e..c926d1a2fc 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./span>" 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/power/apc.dm b/code/modules/power/apc.dm index 61f98e1759..e1fe03e4c1 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -383,7 +383,7 @@ if (istype(W, /obj/item/weapon/crowbar) && opened) if (has_electronics==1) if (terminal) - user << "\red Disconnect wires first." + user << "Disconnect wires first." return playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) user << "You are trying to remove the power control board..." //lpeters - fixed grammar issues @@ -391,13 +391,13 @@ has_electronics = 0 if ((stat & BROKEN) || malfhack) user.visible_message(\ - "\red [user.name] has broken the power control board inside [src.name]!",\ + "[user.name] has broken the power control board inside [src.name]!",\ "You broke the charred power control board and remove the remains.", "You hear a crack!") //ticker.mode:apcs-- //XSI said no and I agreed. -rastaf0 else user.visible_message(\ - "\red [user.name] has removed the power control board from [src.name]!",\ + "[user.name] has removed the power control board from [src.name]!",\ "You remove the power control board.") new /obj/item/weapon/module/power_control(loc) else if (opened!=2) //cover isn't removed @@ -405,7 +405,7 @@ update_icon() else if (istype(W, /obj/item/weapon/crowbar) && !((stat & BROKEN) || malfhack) ) if(coverlocked && !(stat & MAINT)) - user << "\red The cover is locked and cannot be opened." + user << "The cover is locked and cannot be opened." return else opened = 1 @@ -416,20 +416,20 @@ return else if (stat & MAINT) - user << "\red There is no connector for your power cell." + user << "There is no connector for your power cell." return user.drop_item() W.loc = src cell = W user.visible_message(\ - "\red [user.name] has inserted the power cell to [src.name]!",\ + "[user.name] has inserted the power cell to [src.name]!",\ "You insert the power cell.") chargecount = 0 update_icon() else if (istype(W, /obj/item/weapon/screwdriver)) // haxing if(opened) if (cell) - user << "\red Close the APC first." //Less hints more mystery! + user << "Close the APC first." //Less hints more mystery! return else if (has_electronics==1 && terminal) @@ -443,7 +443,7 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "You unfasten the electronics." else /* has_electronics==0 */ - user << "\red There is nothing to secure." + user << "There is nothing to secure." return update_icon() else if(emagged) @@ -468,7 +468,7 @@ user << "You [ locked ? "lock" : "unlock"] the APC interface." update_icon() else - user << "\red Access denied." + user << "Access denied." else if (istype(W, /obj/item/weapon/card/emag) && !(emagged || malfhack)) // trying to unlock with an emag card if(opened) user << "You must close the cover to swipe an ID card." @@ -488,11 +488,11 @@ user << "You fail to [ locked ? "unlock" : "lock"] the APC interface." else if (istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics!=2) if (src.loc:intact) - user << "\red You must remove the floor plating in front of the APC first." + user << "You must remove the floor plating in front of the APC first." return var/obj/item/stack/cable_coil/C = W if(C.amount < 10) - user << "\red You need more wires." + user << "You need more wires." return user << "You start adding cables to the APC frame..." playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) @@ -506,13 +506,13 @@ return C.use(10) user.visible_message(\ - "\red [user.name] has added cables to the APC frame!",\ + "[user.name] has added cables to the APC frame!",\ "You add cables to the APC frame.") make_terminal() terminal.connect_to_network() else if (istype(W, /obj/item/weapon/wirecutters) && terminal && opened && has_electronics!=2) if (src.loc:intact) - user << "\red You must remove the floor plating in front of the APC first." + user << "You must remove the floor plating in front of the APC first." return user << "You begin to cut the cables..." playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) @@ -524,7 +524,7 @@ return new /obj/item/stack/cable_coil(loc,10) user.visible_message(\ - "\red [user.name] cut the cables and dismantled the power terminal.",\ + "[user.name] cut the cables and dismantled the power terminal.",\ "You cut the cables and dismantle the power terminal.") qdel(terminal) else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack)) @@ -535,12 +535,12 @@ user << "You place the power control board inside the frame." qdel(W) else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && ((stat & BROKEN) || malfhack)) - user << "\red You cannot put the board inside, the frame is damaged." + user << "You cannot put the board inside, the frame is damaged." return else if (istype(W, /obj/item/weapon/weldingtool) && opened && has_electronics==0 && !terminal) var/obj/item/weapon/weldingtool/WT = W if (WT.get_fuel() < 3) - user << "\blue You need more welding fuel to complete this task." + user << "You need more welding fuel to complete this task." return user << "You start welding the APC frame..." playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) @@ -549,15 +549,15 @@ if (emagged || malfhack || (stat & BROKEN) || opened==2) new /obj/item/stack/sheet/metal(loc) user.visible_message(\ - "\red [src] has been cut apart by [user.name] with the weldingtool.",\ + "[src] has been cut apart by [user.name] with the weldingtool.",\ "You disassembled the broken APC frame.",\ - "\red You hear welding.") + "You hear welding.") else new /obj/item/wall_frame/apc(loc) user.visible_message(\ - "\red [src] has been cut from the wall by [user.name] with the weldingtool.",\ + "[src] has been cut from the wall by [user.name] with the weldingtool.",\ "You cut the APC frame from the wall.",\ - "\red You hear welding.") + "You hear welding.") qdel(src) return else if (istype(W, /obj/item/wall_frame/apc) && opened && emagged) @@ -565,7 +565,7 @@ if (opened==2) opened = 1 user.visible_message(\ - "\red [user.name] has replaced the damaged APC frontal panel with a new one.",\ + "[user.name] has replaced the damaged APC frontal panel with a new one.",\ "You replace the damaged APC frontal panel with a new one.") qdel(W) update_icon() @@ -576,7 +576,7 @@ user << "You begin to replace the damaged APC frame..." if(do_after(user, 50)) user.visible_message(\ - "\red [user.name] has replaced the damaged APC frame with new one.",\ + "[user.name] has replaced the damaged APC frame with new one.",\ "You replace the damaged APC frame with new one.") qdel(W) stat &= ~BROKEN @@ -592,8 +592,8 @@ && W.w_class >= 3.0 \ && prob(20) ) opened = 2 - user.visible_message("\red The APC cover was knocked down with the [W.name] by [user.name]!", \ - "\red You knock down the APC cover with your [W.name]!", \ + user.visible_message("The APC cover was knocked down with the [W.name] by [user.name]!", \ + "You knock down the APC cover with your [W.name]!", \ "You hear bang") update_icon() else @@ -603,8 +603,8 @@ (istype(W, /obj/item/device/multitool) || \ istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/device/assembly/signaler))) return src.attack_hand(user) - user.visible_message("\red The [src.name] has been hit with the [W.name] by [user.name]!", \ - "\red You hit the [src.name] with your [W.name]!", \ + user.visible_message("The [src.name] has been hit with the [W.name] by [user.name]!", \ + "You hit the [src.name] with your [W.name]!", \ "You hear bang") // attack with hand - remove cell (if cover open) or interact with the APC @@ -622,7 +622,7 @@ cell.updateicon() src.cell = null - user.visible_message("\red [user.name] removes the power cell from [src.name]!", "You remove the power cell.") + user.visible_message("[user.name] removes the power cell from [src.name]!", "You remove the power cell.") //user << "You remove the power cell." charging = 0 src.update_icon() @@ -635,7 +635,7 @@ /obj/machinery/power/apc/attack_alien(mob/living/carbon/alien/humanoid/user) if(!user) return - user.visible_message("\red [user.name] slashes at the [src.name]!", "\blue You slash at the [src.name]!") + user.visible_message("[user.name] slashes at the [src.name]!", "You slash at the [src.name]!") playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1) var/allcut = wires.IsAllCut() @@ -643,12 +643,12 @@ if(beenhit >= pick(3, 4) && wiresexposed != 1) wiresexposed = 1 src.update_icon() - src.visible_message("\red The [src.name]'s cover flies open, exposing the wires!") + src.visible_message("The [src.name]'s cover flies open, exposing the wires!") else if(wiresexposed == 1 && allcut == 0) wires.CutAll() src.update_icon() - src.visible_message("\red The [src.name]'s wires are shredded!") + src.visible_message("The [src.name]'s wires are shredded!") else beenhit += 1 return @@ -767,18 +767,18 @@ /obj/machinery/power/apc/proc/can_use(mob/user as mob, var/loud = 0) //used by attack_hand() and Topic() if (user.stat) - user << "\red You must be conscious to use this [src]!" + user << "You must be conscious to use this [src]!" return 0 if(!user.client) return 0 if (!user.IsAdvancedToolUser()) - user << "\red You don't have the dexterity to use this [src]!" + user << "You don't have the dexterity to use this [src]!" return 0 if(user.restrained()) - user << "\red You must have free hands to use this [src]" + user << "You must have free hands to use this [src]" return 0 if(user.lying) - user << "\red You must stand to use this [src]!" + user << "You must stand to use this [src]!" return 0 if (istype(user, /mob/living/silicon)) var/mob/living/silicon/ai/AI = user @@ -792,7 +792,7 @@ ) \ ) if(!loud) - user << "\red \The [src] have AI control disabled!" + user << "\The [src] have AI control disabled!" return 0 else if ((!in_range(src, user) || !istype(src.loc, /turf))) @@ -802,10 +802,10 @@ if (istype(H)) if(H.getBrainLoss() >= 60) for(var/mob/M in viewers(src, null)) - M << "\red [H] stares cluelessly at [src] and drools." + M << "[H] stares cluelessly at [src] and drools." return 0 else if(prob(H.getBrainLoss())) - user << "\red You momentarily forget how to use [src]." + user << "You momentarily forget how to use [src]." return 0 return 1 @@ -951,7 +951,7 @@ point.the_disk = A //The pinpointer tracks the AI back into its core. else - src.occupier << "\red Primary core damaged, unable to return core processes." + src.occupier << "Primary core damaged, unable to return core processes." if(forced) src.occupier.loc = src.loc src.occupier.death() @@ -966,7 +966,7 @@ if(prob(3)) src.locked = 1 if (src.cell.charge > 0) -// world << "\red blew APC in [src.loc.loc]" +// world << "blew APC in [src.loc.loc]" src.cell.charge = 0 cell.corrupt() src.malfhack = 1 @@ -979,7 +979,7 @@ s.set_up(3, 1, src) s.start() for(var/mob/M in viewers(src)) - M.show_message("\red The [src.name] suddenly lets out a blast of smoke and some sparks!", 3, "\red You hear sizzling electronics.", 2) + M.show_message("The [src.name] suddenly lets out a blast of smoke and some sparks!", 3, "You hear sizzling electronics.", 2) /obj/machinery/power/apc/surplus() diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 24091e18cb..58df0ed33b 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -136,7 +136,7 @@ By design, d1 is the smallest direction and d2 is the highest new/obj/item/stack/cable_coil(T, 1, cable_color) for(var/mob/O in viewers(src, null)) - O.show_message("\red [user] cuts the cable.", 1) + O.show_message("[user] cuts the cable.", 1) investigate_log("was cut by [key_name(usr, usr.client)] in [user.loc.loc]","wires") @@ -151,10 +151,10 @@ By design, d1 is the smallest direction and d2 is the highest else if(istype(W, /obj/item/device/multitool)) if(powernet && (powernet.avail > 0)) // is it powered? - user << "\red [powernet.avail]W in power network." + user << "[powernet.avail]W in power network." else - user << "\red The cable is not powered." + user << "The cable is not powered." shock(user, 5, 0.2) @@ -531,14 +531,14 @@ obj/structure/cable/proc/avail() if(ishuman(M) && !M.restrained() && !M.stat && !M.paralysis && ! M.stunned) if(!istype(usr.loc,/turf)) return if(src.amount <= 14) - usr << "\red You need at least 15 lengths to make restraints!" + usr << "You need at least 15 lengths to make restraints!" return var/obj/item/weapon/handcuffs/cable/B = new /obj/item/weapon/handcuffs/cable(usr.loc) B.icon_state = "cuff_[item_color]" - usr << "\blue You wind some cable together to make some restraints." + usr << "You wind some cable together to make some restraints." src.use(15) else - usr << "\blue You cannot do that." + usr << "You cannot do that." ..() // Items usable on a cable coil : From 6c7045a5edf10d4ee42fa9f786bc2ab4aea92134 Mon Sep 17 00:00:00 2001 From: ike709 Date: Fri, 22 Aug 2014 19:57:59 -0500 Subject: [PATCH 5/7] Span classes everywhere part 5 --- .../mob/living/carbon/metroid/powers.dm | 14 +++--- .../mob/living/carbon/monkey/monkey.dm | 6 +-- code/modules/mob/living/silicon/ai/ai.dm | 12 ++--- code/modules/mob/living/silicon/pai/pai.dm | 2 +- .../mob/living/silicon/pai/software.dm | 4 +- .../modules/mob/living/silicon/robot/emote.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 44 +++++++++---------- .../living/simple_animal/friendly/corgi.dm | 26 +++++------ .../mob/living/simple_animal/parrot.dm | 28 ++++++------ .../mob/living/simple_animal/simple_animal.dm | 30 ++++++------- 10 files changed, 84 insertions(+), 84 deletions(-) diff --git a/code/modules/mob/living/carbon/metroid/powers.dm b/code/modules/mob/living/carbon/metroid/powers.dm index 3d8e2c14f1..3c546bb9d1 100644 --- a/code/modules/mob/living/carbon/metroid/powers.dm +++ b/code/modules/mob/living/carbon/metroid/powers.dm @@ -27,8 +27,8 @@ if(met.Victim == M && met != src) src << "The [met.name] is already feeding on this subject..." return - src << "\blue I have latched onto the subject and begun feeding..." - M << "\red The [src.name] has latched onto your head!" + src << "I have latched onto the subject and begun feeding..." + M << "The [src.name] has latched onto your head!" Feedon(M) else @@ -48,7 +48,7 @@ canmove = 0 anchored = 1 var/lastnut = nutrition - //if(M.client) M << "\red You legs become paralyzed!" + //if(M.client) M << "You legs become paralyzed!" if(is_adult) icon_state = "[colour] adult slime eat" else @@ -62,13 +62,13 @@ loc = M.loc if(prob(15) && M.client && istype(M, /mob/living/carbon)) - M << "\red [pick("You can feel your body becoming weak!", \ + M << "[pick("You can feel your body becoming weak!", \ "You feel like you're about to die!", \ "You feel every part of your body screaming in agony!", \ "A low, rolling pain passes through your body!", \ "Your body feels as if it's falling apart!", \ "You feel extremely weak!", \ - "A sharp, deep pain bathes every inch of your body!")]" + "A sharp, deep pain bathes every inch of your body!")]" if(istype(M, /mob/living/carbon)) Victim.adjustCloneLoss(rand(5,6)) @@ -107,10 +107,10 @@ else if(prob(25)) - src << "\red [pick("This subject is incompatable", \ + src << "[pick("This subject is incompatable", \ "This subject does not have a life energy", "This subject is empty", \ "I am not satisified", "I can not feed from this subject", \ - "I do not feel nourished", "This subject is not food")]..." + "I do not feel nourished", "This subject is not food")]..." sleep(rand(15,45)) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 834f177252..1316e7c963 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -145,7 +145,7 @@ playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) - O.show_message(text("\red [] has grabbed [name] passively!", M), 1) + O.show_message(text("[] has grabbed [name] passively!", M), 1) else if (!( paralysis )) if (prob(25)) @@ -175,7 +175,7 @@ if ("help") for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\blue [M] caresses [src] with its scythe like arm."), 1) + O.show_message(text("[M] caresses [src] with its scythe like arm."), 1) if ("harm") if ((prob(95) && health > 0)) @@ -213,7 +213,7 @@ playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) - O.show_message(text("\red [] has grabbed [name] passively!", M), 1) + O.show_message(text("[] has grabbed [name] passively!", M), 1) if ("disarm") playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 22e319ed02..a02c65a621 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -459,7 +459,7 @@ var/list/ai_list = list() if ("help") for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\blue [M] caresses [src]'s plating with its scythe like arm."), 1) + O.show_message(text("[M] caresses [src]'s plating with its scythe like arm."), 1) else //harm var/damage = rand(10, 20) @@ -467,7 +467,7 @@ var/list/ai_list = list() playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has slashed at []!", M, src), 1) + O.show_message(text("[] has slashed at []!", M, src), 1) if(prob(8)) flick("noise", flash) adjustBruteLoss(damage) @@ -476,7 +476,7 @@ var/list/ai_list = list() playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] took a swipe at []!", M, src), 1) + O.show_message(text("[] took a swipe at []!", M, src), 1) return /mob/living/silicon/ai/attack_animal(mob/living/simple_animal/M as mob) @@ -486,7 +486,7 @@ var/list/ai_list = list() if(M.attack_sound) playsound(loc, M.attack_sound, 50, 1, 1) for(var/mob/O in viewers(src, null)) - O.show_message("\red [M] [M.attacktext] [src]!", 1) + O.show_message("[M] [M.attacktext] [src]!", 1) add_logs(M, src, "attacked", admin=0) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) adjustBruteLoss(damage) @@ -687,7 +687,7 @@ var/list/ai_list = list() if(network in C.network) U.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 @@ -767,7 +767,7 @@ var/list/ai_list = list() var/obj/machinery/power/apc/apc = src.loc if(!istype(apc)) - src << "\blue You are already in your Main Core." + src << "You are already in your Main Core." return apc.malfvacate() diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 820f646421..b5eddfe1ac 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -209,7 +209,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/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 404d55a80b..8b98ce85e3 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -254,7 +254,7 @@ var/turf/T = get_turf(src.loc) src.cable = new /obj/item/weapon/pai_cable(T) for (var/mob/M in viewers(T)) - M.show_message("\red A port on [src] opens to reveal [src.cable], which promptly falls to the floor.", 3, "\red You hear the soft click of something light and hard falling to the ground.", 2) + M.show_message("A port on [src] opens to reveal [src.cable], which promptly falls to the floor.", 3, "You hear the soft click of something light and hard falling to the ground.", 2) //src.updateUsrDialog() We only need to account for the single mob this is intended for, and he will *always* be able to call this window src.paiInterface() // So we'll just call the update directly rather than doing some default checks return @@ -362,7 +362,7 @@ if(answer == "Yes") var/turf/T = get_turf(P.loc) for (var/mob/v in viewers(T)) - v.show_message("\blue [M] presses \his thumb against [P].", 3, "\blue [P] makes a sharp clicking sound as it extracts DNA material from [M].", 2) + v.show_message("[M] presses \his thumb against [P].", 3, "[P] makes a sharp clicking sound as it extracts DNA material from [M].", 2) if(!check_dna_integrity(M)) P << "No DNA detected" return diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 0a902e97fa..2ea5dffaa7 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -198,7 +198,7 @@ src << "Help for cyborg emotes. You can use these emotes with say \"*emote\":\n\naflap, beep-(none)/mob, bow-(none)/mob, buzz-(none)/mob, clap, custom, deathgasp, flap, glare-(none)/mob, look-(none)/mob, me, nod, ping-(none)/mob, \nsalute-(none)/mob, twitch, twitch_s," else - src << "\blue Unusable emote '[act]'. Say *help for a list." + src << "Unusable emote '[act]'. Say *help for a list." if ((message && src.stat == 0)) if (m_type & 1) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 124f74efed..1658ccdb06 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -421,7 +421,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) coil.use(1) else if (istype(W, /obj/item/weapon/crowbar)) // crowbar means open or close the cover @@ -470,13 +470,13 @@ else if(istype(W, /obj/item/weapon/wrench) && opened && !cell) //Deconstruction. The flashes break from the fall, to prevent this from being a ghetto reset module. if(!lockcharge) - user << "\red [src]'s bolts spark! Maybe you should lock them down first!" + user << "[src]'s bolts spark! Maybe you should lock them down first!" spark_system.start() return else playsound(src, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 50) && !cell) - user.visible_message("\red [user] deconstructs [src]!", "\blue You unfasten the securing bolts, and [src] falls to pieces!") + user.visible_message("[user] deconstructs [src]!", "You unfasten the securing bolts, and [src] falls to pieces!") deconstruct() else if(istype(W, /obj/item/device/encryptionkey/) && opened) @@ -496,7 +496,7 @@ user << "You [ locked ? "lock" : "unlock"] [src]'s cover." updateicon() else - user << "\red Access denied." + user << "Access denied." else if(istype(W, /obj/item/weapon/card/emag)) // trying to unlock with an emag card if(user != src)//To prevent syndieborgs from emagging themselves @@ -533,22 +533,22 @@ var/time = time2text(world.realtime,"hh:mm:ss") lawchanges.Add("[time] : [user.name]([user.key]) emagged [name]([key])") set_zeroth_law("Only [user.real_name] and people he designates as being such are Syndicate Agents.") - src << "\red ALERT: Foreign software detected." + src << "ALERT: Foreign software detected." sleep(5) - src << "\red Initiating diagnostics..." + src << "Initiating diagnostics..." sleep(20) - src << "\red SynBorg v1.7 loaded." + src << "SynBorg v1.7 loaded." sleep(5) - src << "\red LAW SYNCHRONISATION ERROR" + src << "LAW SYNCHRONISATION ERROR" sleep(5) - src << "\red Would you like to send a report to NanoTraSoft? Y/N" + src << "Would you like to send a report to NanoTraSoft? Y/N" sleep(10) - src << "\red > N" + src << "N" sleep(20) - src << "\red ERRORERRORERROR" + src << "ERRORERRORERROR" src << "Obey these laws:" laws.show_laws(src) - src << "\red \b ALERT: [user.real_name] is your new master. Obey your new laws and his commands." + src << "\b ALERT: [user.real_name] is your new master. Obey your new laws and his commands." updateicon() else user << "You fail to [ locked ? "unlock" : "lock"] [src]'s interface." @@ -603,7 +603,7 @@ if ("help") for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\blue [M] caresses [src]'s plating with its scythe like arm."), 1) + O.show_message(text("[M] caresses [src]'s plating with its scythe like arm."), 1) if ("grab") if (M == src || anchored) @@ -616,7 +616,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) if ("harm") var/damage = rand(10, 20) @@ -631,7 +631,7 @@ playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) - O.show_message(text("\red [] has slashed at []!", M, src), 1) + O.show_message(text("[] has slashed at []!", M, src), 1) if(prob(8)) flick("noise", flash) adjustBruteLoss(damage) @@ -640,7 +640,7 @@ playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] took a swipe at []!", M, src), 1) + O.show_message(text("[] took a swipe at []!", M, src), 1) if ("disarm") if(!(lying)) @@ -651,12 +651,12 @@ playsound(loc, 'sound/weapons/pierce.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has forced back []!", M, src), 1) + O.show_message(text("[] has forced back []!", M, src), 1) else playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] attempted to force back []!", M, src), 1) + O.show_message(text("[] attempted to force back []!", M, src), 1) return @@ -672,7 +672,7 @@ for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red The [M.name] glomps []!", src), 1) + O.show_message(text("The [M.name] glomps []!", src), 1) var/damage = rand(1, 3) @@ -703,7 +703,7 @@ for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red The [M.name] has electrified []!", src), 1) + O.show_message(text("The [M.name] has electrified []!", src), 1) flick("noise", flash) @@ -726,7 +726,7 @@ if(M.attack_sound) playsound(loc, M.attack_sound, 50, 1, 1) for(var/mob/O in viewers(src, null)) - O.show_message("\red [M] [M.attacktext] [src]!", 1) + O.show_message("[M] [M.attacktext] [src]!", 1) add_logs(M, src, "attacked", admin=0) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) adjustBruteLoss(damage) @@ -956,7 +956,7 @@ cleaned_human.shoes.clean_blood() cleaned_human.update_inv_shoes(0) cleaned_human.clean_blood() - 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/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 90699703c4..0cf9be77ae 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -74,13 +74,13 @@ //helmet and armor = 100% protection if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) ) if( O.force ) - usr << "\red [src] is wearing too much armor. You can't cause \him any damage." + usr << "[src] is wearing too much armor. You can't cause \him any damage." for (var/mob/M in viewers(src, null)) - M.show_message("\red \b [user] hits [src] with [O], however [src] is too armored.") + M.show_message("\b [user] hits [src] with [O], however [src] is too armored.") else - usr << "\red [src] is wearing too much armor. You can't reach \his skin." + usr << "[src] is wearing too much armor. You can't reach \his skin." for (var/mob/M in viewers(src, null)) - M.show_message("\red [user] gently taps [src] with [O]. ") + M.show_message("[user] gently taps [src] with [O].") if(health>0 && prob(15)) emote("looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression") return @@ -109,7 +109,7 @@ inventory_head = null regenerate_icons() else - usr << "\red There is nothing to remove from its [remove_from]." + usr << "There is nothing to remove from its [remove_from]." return if("back") if(inventory_back) @@ -117,7 +117,7 @@ inventory_back = null regenerate_icons() else - usr << "\red There is nothing to remove from its [remove_from]." + usr << "There is nothing to remove from its [remove_from]." return show_inv(usr) @@ -135,13 +135,13 @@ if("back") if(inventory_back) - 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() if(!item_to_add) - usr.visible_message("\blue [usr] pets [src]","\blue You rest your hand on [src]'s back for a moment.") + usr.visible_message("[usr] pets [src]","You rest your hand on [src]'s back for a moment.") return if(istype(item_to_add,/obj/item/weapon/plastique)) // last thing he ever wears, I guess item_to_add.afterattack(src,usr,1) @@ -190,10 +190,10 @@ return if(inventory_head) - if(usr) usr << "\red You can't put more than one hat on [src]!" + if(usr) usr << "You can't put more than one hat on [src]!" return if(!item_to_add) - usr.visible_message("\blue [usr] pets [src]","\blue You rest your hand on [src]'s head for a moment.") + usr.visible_message("[usr] pets [src]","You rest your hand on [src]'s head for a moment.") return @@ -453,7 +453,7 @@ /mob/living/simple_animal/corgi/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri if(istype(O, /obj/item/weapon/newspaper)) if(!stat) - user.visible_message("\blue [user] baps [name] on the nose with the rolled up [O]") + user.visible_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)) dir = i @@ -505,7 +505,7 @@ //puppies 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 ..() @@ -529,7 +529,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/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 532ace5fe7..deecdd7087 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -169,19 +169,19 @@ lines 294-301 in living/say.dm (speech buffer) 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() @@ -189,7 +189,7 @@ lines 294-301 in living/say.dm (speech buffer) 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 @@ -288,7 +288,7 @@ lines 294-301 in living/say.dm (speech buffer) user.drop_item() if(health < maxHealth) adjustBruteLoss(-10) - user << "\blue [src] eagerly devours the cracker." + user << "[src] eagerly devours the cracker." ..() return @@ -452,7 +452,7 @@ lines 294-301 in living/say.dm (speech buffer) if(!parrot_perch || parrot_interest.loc != parrot_perch.loc) held_item = parrot_interest parrot_interest.loc = src - visible_message("[src] grabs [held_item]!", "\blue You grab [held_item]!", "You hear the sounds of wings flapping furiously.") + visible_message("[src] grabs [held_item]!", "You grab [held_item]!", "You hear the sounds of wings flapping furiously.") parrot_interest = null parrot_state = PARROT_SWOOP | PARROT_RETURN @@ -626,7 +626,7 @@ lines 294-301 in living/say.dm (speech buffer) return -1 if(held_item) - src << "\red You are already holding [held_item]" + src << "You are already holding [held_item]" return 1 for(var/obj/item/I in view(1,src)) @@ -639,10 +639,10 @@ lines 294-301 in living/say.dm (speech buffer) held_item = I I.loc = src - visible_message("[src] grabs [held_item]!", "\blue You grab [held_item]!", "You hear the sounds of wings flapping furiously.") + visible_message("[src] grabs [held_item]!", "You grab [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() @@ -654,7 +654,7 @@ lines 294-301 in living/say.dm (speech buffer) return -1 if(held_item) - src << "\red You are already holding [held_item]" + src << "You are already holding [held_item]" return 1 var/obj/item/stolen_item = null @@ -670,10 +670,10 @@ lines 294-301 in living/say.dm (speech buffer) C.unEquip(stolen_item) held_item = stolen_item stolen_item.loc = src - visible_message("[src] grabs [held_item] out of [C]'s hand!", "\blue You snag [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.") + visible_message("[src] grabs [held_item] out of [C]'s hand!", "You snag [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() @@ -698,7 +698,7 @@ lines 294-301 in living/say.dm (speech buffer) if(!held_item) if(src == usr) //So that other mobs wont make this message appear when they're bludgeoning you. - src << "\red You have nothing to drop!" + src << "You have nothing to drop!" return 0 @@ -742,7 +742,7 @@ lines 294-301 in living/say.dm (speech buffer) src.loc = 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 /mob/living/simple_animal/parrot/proc/toggle_mode() diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 65c8c5315e..d77f640990 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -256,7 +256,7 @@ if(M.attack_sound) playsound(loc, M.attack_sound, 50, 1, 1) for(var/mob/O in viewers(src, null)) - O.show_message("\red \The [M] [M.attacktext] [src]!", 1) + O.show_message("\The [M] [M.attacktext] [src]!", 1) add_logs(M, src, "attacked", admin=0) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) adjustBruteLoss(damage) @@ -287,7 +287,7 @@ if (health > 0) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message("\blue [M] [response_help] [src].") + O.show_message("[M] [response_help] [src].") if("grab") if (M == src || anchored) @@ -305,13 +305,13 @@ 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) if("harm", "disarm") adjustBruteLoss(harm_intent_damage) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message("\red [M] [response_harm] [src]!") + O.show_message("[M] [response_harm] [src]!") return @@ -323,7 +323,7 @@ for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\blue [M] caresses [src] with its scythe like arm."), 1) + O.show_message(text("[M] caresses [src] with its scythe like arm."), 1) if ("grab") if(M == src || anchored) return @@ -340,11 +340,11 @@ 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) if("harm", "disarm") var/damage = rand(15, 30) - visible_message("\red [M] has slashed at [src]!") + visible_message("[M] has slashed at [src]!") adjustBruteLoss(damage) return @@ -353,13 +353,13 @@ switch(L.a_intent) if("help") - visible_message("\blue [L] rubs it's head against [src]") + visible_message("[L] rubs it's head against [src]") else var/damage = rand(5, 10) - visible_message("\red [L] bites [src]!") + visible_message("[L] bites [src]!") if(stat != DEAD) L.amount_grown = min(L.amount_grown + damage, L.max_grown) @@ -373,7 +373,7 @@ if(M.Victim) return // can't attack while eating! - visible_message("\red [M.name] glomps [src]!") + visible_message("[M.name] glomps [src]!") var/damage = rand(1, 3) @@ -402,16 +402,16 @@ qdel(MED) for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) - M.show_message("\blue [user] applies [MED] on [src]") + M.show_message("[user] applies [MED] on [src]") return else - user << "\blue [MED] won't help at all." + user << "[MED] won't help at all." return else - user << "\blue [src] is at full health." + user << "[src] is at full health." return else - user << "\blue [src] is dead, medical items won't bring it back to life." + user << "[src] is dead, medical items won't bring it back to life./span>" return else if(meat_type.len && (stat == DEAD)) //if the animal has a meat, and if it is dead. harvest(O) @@ -429,7 +429,7 @@ visible_message("[O] bounces harmlessly off of [src].",\ "[O] bounces harmlessly off of [src].") else - user << "\red This weapon is ineffective, it does no damage." + user << "This weapon is ineffective, it does no damage." user.visible_message("[user] gently taps [src] with [O].",\ "This weapon is ineffective, it does no damage.") From fde98ee6580505588890da498c5cb39012675908 Mon Sep 17 00:00:00 2001 From: ike709 Date: Sat, 23 Aug 2014 14:44:17 -0500 Subject: [PATCH 6/7] Fixes mispelling --- code/modules/mob/living/silicon/robot/robot.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 1658ccdb06..7adee970db 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -539,7 +539,7 @@ sleep(20) src << "SynBorg v1.7 loaded." sleep(5) - src << "LAW SYNCHRONISATION ERROR" + src << "LAW SYNCHRONISATION ERROR" sleep(5) src << "Would you like to send a report to NanoTraSoft? Y/N" sleep(10) @@ -1107,4 +1107,4 @@ if(2) //New Module connected_ai << "

NOTICE - Cyborg module change detected: [name] has loaded the [designation] module.
" if(3) //New Name - connected_ai << "

NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].
" \ No newline at end of file + connected_ai << "

NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].
" From e08a7e820a0475b5fede8d33ea95af7fdb30228b Mon Sep 17 00:00:00 2001 From: ike709 Date: Sat, 23 Aug 2014 14:45:15 -0500 Subject: [PATCH 7/7] Oops, forgot to fix another spelling mistake --- code/datums/diseases/retrovirus.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm index 538de60916..dd37663692 100644 --- a/code/datums/diseases/retrovirus.dm +++ b/code/datums/diseases/retrovirus.dm @@ -42,7 +42,7 @@ cure() return if (prob(8)) - affected_mob << "our head hurts." + affected_mob << "Your head hurts." if (prob(9)) affected_mob << "You feel a tingling sensation in your chest." if (prob(9)) @@ -101,4 +101,4 @@ return if (prob(60)) if(prob(50)) scramble_dna(affected_mob, 1, 0, rand(50,75)) - else scramble_dna(affected_mob, 0, 1, rand(50,75)) \ No newline at end of file + else scramble_dna(affected_mob, 0, 1, rand(50,75))