3 files changed, 25 insertions, 20 deletions
diff --git a/npc/012-5/nicholas.txt b/npc/012-5/nicholas.txt
index 9d1c5bb2f..7a741fd6f 100644
--- a/npc/012-5/nicholas.txt
+++ b/npc/012-5/nicholas.txt
@@ -90,6 +90,8 @@ L_Menu:
         l("I want to forge One Handed Weapons!"),
         l("I want to forge Shields!"),
         l("I want to forge Quivers!"),
+        rif(getskilllv(TMW2_CRAFT), l("I would like to remove an item options")),
+        rif(getskilllv(TMW2_CRAFT), l("I would like to change an item options")),
         l("Nothing, thanks!");
 
     mes "";
@@ -105,7 +107,29 @@ L_Menu:
         goto L_Shield;
     case 4:
         goto L_Quiver;
-
+    case 5:
+        SmithTweakReset();
+        goto L_Menu;
+    case 6:
+        mesn;
+        mesq l("Well, that will cost you @@ GP, upfront. You may also fail and will only have one attempt.", format_number(8000));
+        next;
+        if (Zeny == 8000) {
+            mesn;
+            mesc l("It's very risky, so think well! You'll be limited to your own craft skills."), 1;
+            next;
+            if (askyesno() == ASK_YES) {
+                if (SmithTweakSystem()) {
+                    Zeny-=8000;
+                } else {
+                    Zeny-=5000;
+                    next;
+                    mesn;
+                    mesq l("How bad for you... I'll give you a discount. I'm sorry for your own lack of skill!");
+                }
+            }
+        }
+        goto L_Menu;
     }
     close;
 
diff --git a/npc/craft/tweak.txt b/npc/craft/tweak.txt
index 9bc786d33..61435a2e0 100644
--- a/npc/craft/tweak.txt
+++ b/npc/craft/tweak.txt
@@ -56,11 +56,6 @@ function	script	SmithTweakSystem	{
         return false;
     }
 
-    // Eh, apply some stuff for testing
-    if (is_gm() && !CRAFTSYS_CURRENT) {
-        CRAFTSYS_CURRENT=CRGROUP_BASE;
-        CRAFTSYS[CRGROUP_BASE]=10;
-    }
     csys_Apply(.@id);
     mesc l("SUCCESS! Congratulations, the item was improved!"), 3;
     return true;
diff --git a/npc/guilds/forge.txt b/npc/guilds/forge.txt
index 0d192e9fe..b6f26f65b 100644
--- a/npc/guilds/forge.txt
+++ b/npc/guilds/forge.txt
@@ -5,20 +5,6 @@
 //  Guild Facility - Blacksmith Area
 
 guilds,24,27,0	script	Guild Blacksmith	NPC_NO_SPRITE,{
-    select
-        l("Forge a new item"),
-        rif(is_staff(), "Tweak an item"),
-        l("Remove an item tweaks");
-    mes "";
-    if (@menu == 2) {
-        SmithTweakSystem();
-        close;
-    }
-    if (@menu == 3) {
-        SmithTweakReset();
-        close;
-    }
-
     // Script begins here
     do
     {