1 files changed, 13 insertions, 14 deletions
diff --git a/npc/001-4/traps.txt b/npc/001-4/traps.txt
index e51bc5e30..2b71d5184 100644
--- a/npc/001-4/traps.txt
+++ b/npc/001-4/traps.txt
@@ -5,23 +5,20 @@
 //   Traps.
 
 function	script	SteelTrap	{
-    //if (!(isin(@map$, @x, @y, @x, @y))) goto L_Away;
-    if (getnpctimer(0) == 0) goto L_armar;
-    goto L_disparar;
-
-L_Away:
-    mesn strcharinfo(0);
-    mesq l("Something seems off with that!");
-    return;
-
-L_armar:
-    initnpctimer;
-    setnpcdisplay @object_name$, NPC_TRAP_ONLINE;
-    return;
+    // It was disarmed
+    if (getnpctimer(0) == 0)
+    {
+        initnpctimer;
+        setnpcdisplay @object_name$, NPC_TRAP_ONLINE;
+        return;
+    }
 
-L_disparar:
+    // Fire!!
     setnpctimer 9000;
     setnpcdisplay @object_name$, NPC_TRAP_TRIGGERED;
+
+    // Boom - Hurt players and/or stun monsters
+    // This means you can - and SHOULD - lead Forains into these traps
     if (playerattached())
     {
         percentheal -80, 0;
@@ -31,6 +28,8 @@ L_disparar:
         sc_start SC_WALKSPEED,15000,70;
         sc_start SC_SLEEP,3000,0;
     }
+
+    // A minor special effect and we're done.
     specialeffect 11;
     return;
 }