summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/scripts_athena.conf2
2 files changed, 2 insertions, 1 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 0279a43cc..78ca99ae4 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -39,6 +39,7 @@ Playtester
Date Added
======
07/09
+ * Disabled socket enchant npc. [Musashiden]
* Added some missing Rachel Warps [Playtester]
* Added a fix to npc/other/books.txt [Playtester]
07/07
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index e7db84c3b..088879bac 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -52,7 +52,7 @@ npc: npc/merchants/alchemist.txt
npc: npc/merchants/icecream.txt
npc: npc/merchants/quivers.txt
npc: npc/merchants/kunai_maker.txt
-npc: npc/merchants/socket_enchant.txt
+//npc: npc/merchants/socket_enchant.txt
// Temp Shops
// Removed in kRO (because Scrolls have been added into mobs drops)
//npc: npc/merchants/scrolls_arrows.txt