From a86de57c051a6728bca45c46a2d5ef5255d1beae Mon Sep 17 00:00:00 2001 From: hornygranny Date: Thu, 20 Feb 2014 12:11:00 -0800 Subject: [PATCH] Fixes #2726 --- code/game/gamemodes/blob/theblob.dm | 2 +- code/game/objects/effects/spiders.dm | 4 +-- code/modules/flufftext/Hallucination.dm | 2 +- .../mob/living/carbon/monkey/monkey.dm | 28 +++++++++---------- .../mob/living/simple_animal/constructs.dm | 6 ++-- .../living/simple_animal/hostile/syndicate.dm | 4 +-- .../modules/mob/living/simple_animal/shade.dm | 2 +- .../mob/living/simple_animal/simple_animal.dm | 2 +- .../reagent_containers/food/drinks/bottle.dm | 4 +-- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index fb9a9f2e828..cf6d5fc1fd2 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -149,7 +149,7 @@ /obj/effect/blob/attackby(var/obj/item/weapon/W, var/mob/user) playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) - src.visible_message("\red The [src.name] has been attacked with \the [W][(user ? " by [user]." : ".")]") + src.visible_message("The [src.name] has been attacked with \the [W][(user ? " by [user]." : ".")]") var/damage = 0 switch(W.damtype) if("fire") diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index ff4f3eda79f..34ab1305cd5 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -22,9 +22,9 @@ /obj/effect/spider/attackby(var/obj/item/weapon/W, var/mob/user) if(W.attack_verb.len) - visible_message("\red \The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]") + visible_message("\The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]") else - visible_message("\red \The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]") + visible_message("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]") var/damage = W.force / 4.0 diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index e24385675db..c7a4cfab4fb 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -300,7 +300,7 @@ proc/check_panel(mob/M) if(prob(15)) if(weapon_name) my_target << sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')) - my_target.show_message("\red [my_target] has been attacked with [weapon_name] by [src.name] ", 1) + my_target.show_message("[my_target] has been attacked with [weapon_name] by [src.name] ", 1) my_target.halloss += 8 if(prob(20)) my_target.eye_blurry += 3 if(prob(33)) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 9b2ba66aae2..74dcd6c73be 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -99,7 +99,7 @@ contract_disease(D,1,0) else for(var/mob/O in viewers(src, null)) - O.show_message("\red [M.name] has attempted to bite [name]!", 1) + O.show_message("[M.name] has attempted to bite [name]!", 1) return /mob/living/carbon/monkey/attack_hand(mob/living/carbon/human/M as mob) @@ -122,7 +122,7 @@ if (prob(75)) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has punched [name]!", M), 1) + O.show_message(text("[] has punched [name]!", M), 1) playsound(loc, "punch", 25, 1, -1) var/damage = rand(5, 10) @@ -133,7 +133,7 @@ spawn( 0 ) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has knocked out [name]!", M), 1) + O.show_message(text("[] has knocked out [name]!", M), 1) return adjustBruteLoss(damage) updatehealth() @@ -141,7 +141,7 @@ playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has attempted to punch [name]!", M), 1) + O.show_message(text("[] has attempted to punch [name]!", M), 1) else if (M.a_intent == "grab") if (M == src || anchored) @@ -165,13 +165,13 @@ 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 pushed down [name]!", M), 1) + O.show_message(text("[] has pushed down [name]!", M), 1) else if(drop_item()) 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 disarmed [name]!", M), 1) + O.show_message(text("[] has disarmed [name]!", M), 1) return /mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M as mob) @@ -199,18 +199,18 @@ Paralyse(rand(10, 15)) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has wounded [name]!", M), 1) + O.show_message(text("[] has wounded [name]!", M), 1) else for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has slashed [name]!", M), 1) + O.show_message(text("[] has slashed [name]!", M), 1) adjustBruteLoss(damage) updatehealth() 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 [] has attempted to lunge at [name]!", M), 1) + O.show_message(text("[] has attempted to lunge at [name]!", M), 1) if ("grab") if (M == src || anchored) @@ -234,12 +234,12 @@ Weaken(15) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has tackled down [name]!", M), 1) + O.show_message(text("[] has tackled down [name]!", M), 1) else if(drop_item()) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] has disarmed [name]!", M), 1) + O.show_message(text("[] has disarmed [name]!", M), 1) adjustBruteLoss(damage) updatehealth() return @@ -251,7 +251,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) @@ -269,7 +269,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) @@ -299,7 +299,7 @@ for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message(text("\red The [M.name] has shocked []!", src), 1) + O.show_message(text("The [M.name] has shocked []!", src), 1) Weaken(power) if (stuttering < power) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index fe3fac63c90..1692721f2f7 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -111,7 +111,7 @@ adjustBruteLoss(damage) 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("[src] has been attacked with [O] by [user].") else usr << "\red This weapon is ineffective, it does no damage." for(var/mob/M in viewers(src, null)) @@ -153,7 +153,7 @@ adjustBruteLoss(damage) 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("[src] has been attacked with [O] by [user].") else for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) @@ -277,7 +277,7 @@ adjustBruteLoss(damage) 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("[src] has been attacked with [O] by [user].") else for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 4896ea69979..bc096921a7c 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -64,9 +64,9 @@ if (O.damtype == HALLOSS) damage = 0 health -= damage - visible_message("\red \b [src] has been attacked with [O] by [user]. ") + visible_message("[src] has been attacked with [O] by [user].") else - visible_message("\red \b [src] blocks [O] with its shield! ") + visible_message("[src] blocks [O] with its shield!") else usr << "\red This weapon is ineffective, it does no damage." visible_message("\red [user] gently taps [src] with [O]. ") diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index 2390a5957c2..e312604681f 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -51,7 +51,7 @@ health -= damage 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("[src] has been attacked with [O] by [user].") else usr << "\red This weapon is ineffective, it does no damage." for(var/mob/M in viewers(src, null)) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 2aad136b1c3..443ff993fb7 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -412,7 +412,7 @@ adjustBruteLoss(damage) 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(""+"[src] has been attacked with [O] by [user].") /mob/living/simple_animal/movement_delay() var/tally = 0 //Incase I need to add stuff other than "speed" later diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index a50c3690d39..3879daa66b7 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -93,8 +93,8 @@ else //Default attack message and don't weaken the target. for(var/mob/O in viewers(user, null)) - if(target != user) O.show_message(text("\red [target] has been attacked with a bottle of [src.name], by [user]!"), 1) - else O.show_message(text("\red [target] has attacked himself with a bottle of [src.name]!"), 1) + if(target != user) O.show_message(text("[target] has been attacked with a bottle of [src.name], by [user]!"), 1) + else O.show_message(text("[target] has attacked himself with a bottle of [src.name]!"), 1) //Attack logs add_logs(user, target, "attacked", object="bottle")