diff options
| author | Haru <haru@dotalux.com> | 2015-12-31 23:40:48 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-12-31 23:40:48 +0100 |
| commit | 0e990045fc308ca58421eda25838d3b9e7a10afa (patch) | |
| tree | 7966898e283b6759f226bd8222de161fb64772c2 /npc/custom/etc/marriage.txt | |
| parent | e95c473c694f4fccb40584f3e6a00323f91e36ee (diff) | |
| parent | 32a42eeee18b16d9f904a409974dda575f3966c2 (diff) | |
| download | hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.tar.gz hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.tar.bz2 hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.tar.xz hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.zip | |
Merge branch 'AnnieRuru-request_29' into hercules
Closes #1000 as merged
Diffstat (limited to 'npc/custom/etc/marriage.txt')
| -rw-r--r-- | npc/custom/etc/marriage.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt index ab1b48c30..1d6d21c2a 100644 --- a/npc/custom/etc/marriage.txt +++ b/npc/custom/etc/marriage.txt @@ -13,7 +13,7 @@ //============================================================ // Configuration Variables: -- script marriage_init -1,{ +- script marriage_init FAKE_NPC,{ OnInit: set $@wed_allow, 0; //If 1, allows same sex marriages. set $@wed_veil, 0; //Set to 0 to disable veil check on the bride |