8 files changed, 15 insertions, 22 deletions
diff --git a/world/map/npc/items/check_wand.txt b/world/map/npc/items/check_wand.txt
index 43190a85..5a339049 100644
--- a/world/map/npc/items/check_wand.txt
+++ b/world/map/npc/items/check_wand.txt
@@ -48,8 +48,7 @@ L_Loop:
 L_SetWand:
     set @Wand, $@WandsPwr[@wand_loop];
     set @WandID, $@WandsAnim[@wand_loop];
-    callfunc "MorganState";
-    if (@morgan == 2)
+    if (QL_MORGAN == 2)
         goto L_SetCastOnce;
     goto L_Return;
 
@@ -60,8 +59,7 @@ L_LoopAgain:
     goto L_Loop;
 
 L_SetCastOnce:
-    set @morgan_tmp, 3;
-    callfunc "SetMorganMask";
+    set QL_MORGAN, 3;
     goto L_Return;
 
 L_Return:
diff --git a/world/map/npc/items/magic_gm_top_hat.txt b/world/map/npc/items/magic_gm_top_hat.txt
index f4f6b078..129aa5c0 100644
--- a/world/map/npc/items/magic_gm_top_hat.txt
+++ b/world/map/npc/items/magic_gm_top_hat.txt
@@ -9,7 +9,7 @@ function|script|ActivateMagicGMTophat
     // Display an effect
     misceffect FX_CHANNELLING_CAST, strcharinfo(0);
     // Log the usage of this spell
-    gmcommand "@l "+strcharinfo(0)+" used the Magic GM Top Hat.";
+    gmlog strcharinfo(0)+" used the Magic GM Top Hat.";
     return;
 
 L_Inventory:
diff --git a/world/map/npc/items/require_stat.txt b/world/map/npc/items/require_stat.txt
index 40200ea9..87ecf22a 100644
--- a/world/map/npc/items/require_stat.txt
+++ b/world/map/npc/items/require_stat.txt
@@ -4,23 +4,20 @@
 //            This is passed automagically when called in an equip script.
 //  @bStat    The stat to check against.
 //            Usually one of: bStr, bAgi, bVit, bInt, bDex, bLuk;
-//            but can be anything that works with readparam().
+//            but can be anything that works with .
 //  @minbStatVal The minimum stat value to accept this item.
 // ------------------------------------------------------------
 
 function|script|RequireStat
 {
-    set @bStatVal, readparam(@bStat);
+    set @bStatVal, @bStat;
     // If the requirement isn't met, we set an unequip trigger.
     // The item is now removed.
-    if (@bStatVal < @minbStatVal)
+    if (@bStat < @minbStatVal)
         goto L_Unequip;
-    goto L_Return;
+    return;
 
 L_Unequip:
     callfunc "UnequipLater";
-    goto L_Return;
-
-L_Return:
     return;
 }
diff --git a/world/map/npc/items/restricted_item.txt b/world/map/npc/items/restricted_item.txt
index c0084408..9bd1c3d5 100644
--- a/world/map/npc/items/restricted_item.txt
+++ b/world/map/npc/items/restricted_item.txt
@@ -13,8 +13,8 @@ function|script|RestrictedItem
     message strcharinfo(0), "This item repells you with extreme force. It does not seem to be meant for you.";
     callfunc "UnequipLater";
     if (getgmlevel()) goto L_Return;
-    gmcommand "@wgm Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
-    gmcommand "@l Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
+    wgm "Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
+    gmlog "Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
     goto L_Return;
 
 L_Return:
diff --git a/world/map/npc/items/scissors.txt b/world/map/npc/items/scissors.txt
index 44dbbac8..640cc1c5 100644
--- a/world/map/npc/items/scissors.txt
+++ b/world/map/npc/items/scissors.txt
@@ -5,10 +5,10 @@ function|script|useScissors
     message strcharinfo(0), "Whoops!";
     heal -20 - rand(Hp >> 1), 0;
     getitem "Scissors", 1;
-    end;
+    return;
 
 L_Change:
     setlook LOOK_HAIR_STYLE, rand(20);
     getitem "Scissors", 1;
-    end;
+    return;
 }
diff --git a/world/map/npc/items/shock_sweet.txt b/world/map/npc/items/shock_sweet.txt
index 1ae787e3..4de758d1 100644
--- a/world/map/npc/items/shock_sweet.txt
+++ b/world/map/npc/items/shock_sweet.txt
@@ -4,12 +4,12 @@ function|script|useShockSweet
         goto L_Change;
     message strcharinfo(0), "Yuck, this tastes like earwax!";
     heal -20 - (Hp >> 2), 0;
-    end;
+    return;
 
 L_Change:
     setlook LOOK_HAIR_COLOR, HC_WHITE;
     message strcharinfo(0), "Gah! That was some strong stuff!";
     sc_start sc_poison, 1, 20;
     misceffect 15, strcharinfo(0);
-    end;
+    return;
 }
diff --git a/world/map/npc/items/unequipcb.txt b/world/map/npc/items/unequipcb.txt
index 1d269d3a..649b2912 100644
--- a/world/map/npc/items/unequipcb.txt
+++ b/world/map/npc/items/unequipcb.txt
@@ -1,8 +1,6 @@
-// For now this has to use a real map name, but the effect happens
-// on any map because of the -1 at the end.
 // Note: the client (I think) has a display bug if this is called
 // during the intial connection's equip hook
-017-9,0,0,0|script|UnequipCB|-1
+-|script|UnequipCB|32767
 {
     end;
 
diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt
index e1ca89ee..dd8bc71e 100644
--- a/world/map/npc/items/warpTowels.txt
+++ b/world/map/npc/items/warpTowels.txt
@@ -152,7 +152,7 @@ L_End:
     set @NextLocationX, 0;
     set @NextLocationY, 0;
     set @warpTowelName$, "";
-    end;
+    return;
 }
 
 function|script|MultiWarpTowel