--- a/ggrtf.tf	Sun Mar 22 07:30:43 2009 +0000
+++ b/ggrtf.tf	Sun Mar 22 07:41:05 2009 +0000
@@ -105,22 +105,24 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Macros which may be re-defined by user or in other modules
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-/def msd = /echo %*
-/def msw = /echo -p %*
-/def msq = /echo -p @{BCwhite}GgrTF@{n}: %*
-/def mss = /if (opt_skspam=~"on") /substitute -p @{BCwhite}GgrTF@{n}: %*%;/endif
+/def -i msd = /echo %*
+/def -i msw = /echo -p %*
+/def -i msq = /echo -p @{BCwhite}GgrTF@{n}: %*
+/def -i mss = /substitute -p %*
+
 /def -i gerror = /msq @{BCred}ERROR!@{n} %*
 /def -i gwarning = /msq @{BCred}WARNING!@{n} %*
 /def -i gsend = %*
 
-/def msr_real = @@party report %*
-/def msp = /if (opt_verbose=~"on") @@party say %*%;/else /msq %*%;/endif
-/def mse = /if (opt_verbose=~"on") @@party say emote %*%;/else /msq %*%;/endif
-/def msb = @party report %*
+/def -i msk = /if (opt_skspam=~"on") /substitute -p @{BCwhite}GgrTF@{n}: %*%;/endif
+/def -i msp = /if (opt_verbose=~"on") @@party say %*%;/else /msq %*%;/endif
+/def -i mse = /if (opt_verbose=~"on") @@party say emote %*%;/else /msq %*%;/endif
+/def -i msr_real = @@party report %*
+/def -i msb = @party report %*
 
-/def dig_grave = @@dig grave
-/def eat_corpse = @@get corpse%;@@eat corpse
-/def get_corpse = @@get corpse
+/def -i dig_grave = @@dig grave
+/def -i eat_corpse = @@get corpse%;@@eat corpse
+/def -i get_corpse = @@get corpse
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1599,7 +1601,7 @@
 	/set skill_st=on%;\
 	/set skill_st2=off%;\
 	/set cast_info=SK%;/set cast_info_n=%;/set cast_info_t=%;@@cast info%;\
-	/mss @{BCyellow} ---- SKILL START ---- @{n} (@{Cyellow}%{cnt_skills}@{n})%;\
+	/msk @{BCyellow} ---- SKILL START ---- @{n} (@{Cyellow}%{cnt_skills}@{n})%;\
 	/gstatus_update%;/prexecfuncs %{event_skill_start}
 
 
@@ -1610,7 +1612,7 @@
 	/set skill_st2=on%;\
 	/set cast_info=%;\
 	/set cnt_sktime=$[cnt_sktime+time() - skill_t]%;\
-	/mss @{Cbggreen} ---- SKILL DONE ---- @{n} @{Cyellow}$[prgetstime(skill_t)]@{n}%;\
+	/msk @{Cbggreen} ---- SKILL DONE ---- @{n} @{Cyellow}$[prgetstime(skill_t)]@{n}%;\
 	/gstatus_update%;/prexecfuncs %{event_skill_done}
 
 
@@ -1735,7 +1737,7 @@
 
 ;; Grab target via several methods
 /def -i -F -p9999 -mregexp -t"^You are now targetting ([A-Za-z ,.'-]+)\.$" gbattle_target3 =\
-	/mss @{BCyellow}Targetting@{n} -> @{BCred}%{P1}@{n}%;\
+	/msk @{BCyellow}Targetting@{n} -> @{BCred}%{P1}@{n}%;\
 	/test gbattle_target({P1})
 
 ;; Get shape
@@ -2150,7 +2152,6 @@
 	/msw +-------+------------+
 
 /def -i -E(slots_st==1) -p9999 -mregexp -t"^  You have (.*) free ([a-z]*) slots?\.$" gslots_mangle2 =\
-	/substitute -ag%;\
 	/let _tslot=%{P2}%;\
 	/if     ({P1}=~"no")	/let _tnum=0%;\
 	/elseif ({P1}=~"one")	/let _tnum=1%;\
@@ -2172,7 +2173,7 @@
 	/else \
 		/let _tcol=BCred%;\
 	/endif%;\
-	/msw | @{%{_tcol}}$[pad(_tnum,5)]@{n} | $[pad(_tslot,-10)] |%;\
+	/mss | @{%{_tcol}}$[pad(_tnum,5)]@{n} | $[pad(_tslot,-10)] |%;\
 	/if (_tslot=~"torso")\
 		/set slots_st=0%;\
 		/msw +--------------------+%;\

--- a/gm-magical.tf	Sun Mar 22 07:30:43 2009 +0000
+++ b/gm-magical.tf	Sun Mar 22 07:41:05 2009 +0000
@@ -136,7 +136,7 @@
 	/set spell_hastes=0%;\
 	/set spell_ghastes=0%;\
 	/set cast_info=SP%;/set cast_info_n=%;/set cast_info_t=%;@@cast info%;\
-	/mss @{BCyellow} ---- SPELL START ---- @{n} (@{Cyellow}%{cnt_casts}@{n}) %{_cere}%;\
+	/msk @{BCyellow} ---- SPELL START ---- @{n} (@{Cyellow}%{cnt_casts}@{n}) %{_cere}%;\
 	/gstatus_update%;/prexecfuncs %{event_spell_start}
 
 
@@ -148,7 +148,7 @@
 	/set spell_st2=on%;\
 	/set cast_info=%;\
 	/set cnt_ctime=$[cnt_ctime+time()-spell_t]%;\
-	/mss @{Cbggreen} ---- SPELL DONE ---- @{n} in [@{BCred}%{spell_rcount}@{n}] @{BCgreen}rounds!@{n} @{Cyellow}$[prgetstime(spell_t)]@{n}%;\
+	/msk @{Cbggreen} ---- SPELL DONE ---- @{n} in [@{BCred}%{spell_rcount}@{n}] @{BCgreen}rounds!@{n} @{Cyellow}$[prgetstime(spell_t)]@{n}%;\
 	/gstatus_update%;/prexecfuncs %{event_spell_done}