summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog.txt2
-rw-r--r--src/map/atcommand.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 64e8f1fc3..dc87a7211 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,4 +1,6 @@
Date Added
+12/9
+ * Adjusted some messages in @marry [MouseJstr]
12/8
* Fixed @rings [MouseJstr]
* Added @marry, @divorce, and @rings [MouseJstr]
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 32f0e4bef..503e64e7d 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -7442,7 +7442,7 @@ atcommand_marry(const int fd, struct map_session_data* sd,
}
if (pc_marriage(pl_sd1, pl_sd2) == 0) {
- clif_displaymessage(fd, "The marriage has failed.. talk to the judge..");
+ clif_displaymessage(fd, "They are married.. wish them well");
return 0;
} else
return -1;