From 303ceb3bbf084ac666c7f70b0797cc5cc45ea4da Mon Sep 17 00:00:00 2001 From: ryo_saeba Date: Sun, 8 Aug 2010 21:03:32 +0000 Subject: [PATCH] Merge split lines. git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@13576 282e977c-c81d-0410-88c4-b93c2d0d6712 --- armour/shield/DShieldm.arc | 3 +-- armour/shield/DShieldms.arc | 4 +--- armour/shield/DShields.arc | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/armour/shield/DShieldm.arc b/armour/shield/DShieldm.arc index 2bc4bf0ac..28a8b095b 100644 --- a/armour/shield/DShieldm.arc +++ b/armour/shield/DShieldm.arc @@ -11,8 +11,7 @@ animation DShieldm anim_speed 5 client_anim_random 1 msg - There is a strong evil spirit in the shield - trying to dominate you. + There is a strong evil spirit in the shield trying to dominate you. endmsg Cha -3 resist_fire 30 diff --git a/armour/shield/DShieldms.arc b/armour/shield/DShieldms.arc index 934012603..923c7a3e1 100644 --- a/armour/shield/DShieldms.arc +++ b/armour/shield/DShieldms.arc @@ -12,9 +12,7 @@ anim_speed 4 client_anim_random 1 Cha -5 msg - There is a powerful evil spirit in the - shield dominating your mind. You are - struggling to retain control of yourself. + There is a powerful evil spirit in the shield dominating your mind. You are struggling to retain control of yourself. endmsg resist_fire 30 resist_drain 100 diff --git a/armour/shield/DShields.arc b/armour/shield/DShields.arc index 1e3e8fdf6..2d31e3140 100644 --- a/armour/shield/DShields.arc +++ b/armour/shield/DShields.arc @@ -11,8 +11,7 @@ animation DShields anim_speed 5 client_anim_random 1 msg - There is a strong evil spirit in the shield - trying to dominate you. + There is a strong evil spirit in the shield trying to dominate you. endmsg Cha -3 resist_fire 30