summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-12-11 22:51:24 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-12-11 22:51:24 +0000
commit7842f20f6031cb3a3674d8da7b02878aea0dee44 (patch)
treed3912b0d85ee6339ae2d86f2be4fbd52a0b7ec9c
parentdfd139cb383aca0e62125efe34abe9f298e309db (diff)
parent72edac8e4c15827d150b6bf46cea3f767705eeec (diff)
downloadserverdata-7842f20f6031cb3a3674d8da7b02878aea0dee44.tar.gz
serverdata-7842f20f6031cb3a3674d8da7b02878aea0dee44.tar.bz2
serverdata-7842f20f6031cb3a3674d8da7b02878aea0dee44.tar.xz
serverdata-7842f20f6031cb3a3674d8da7b02878aea0dee44.zip
Merge branch 'Balthasar_not_Orum' into 'master'
Eljas still referred to Orum instead of Balthasar See merge request legacy/serverdata!716
-rw-r--r--world/map/npc/030-2/eljas.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/world/map/npc/030-2/eljas.txt b/world/map/npc/030-2/eljas.txt
index 9437c3d5..93270299 100644
--- a/world/map/npc/030-2/eljas.txt
+++ b/world/map/npc/030-2/eljas.txt
@@ -38,7 +38,7 @@ L_HaveList1:
menu
"What were the childrens names again?", L_ListNames,
"Look, I have Santa's List.", L_SantasList,
- "I have Santa's List.(follow Orum and his evil deeds)", L_SantasFakeList,
+ "I have Santa's List.(follow Balthasar and his evil deeds)", L_SantasFakeList,
"Christmas?", L_Christmas,
"I am interested in magical research.", L_Research,
"Nothing, I have to go.", L_Close;