summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-06-07 21:30:59 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-06-07 21:30:59 +0000
commit0493f971848371f284a1e714624898c086e858a1 (patch)
treee5155a31cc29d68e51b7ba196144077eb9dd3136
parent34de3398db7ce20652c7431ff88633be7ec7b855 (diff)
parentc4974ce7cc7b1ceb614145b9dc80a7cff1c2148e (diff)
downloadclassic-serverdata-0493f971848371f284a1e714624898c086e858a1.tar.gz
classic-serverdata-0493f971848371f284a1e714624898c086e858a1.tar.bz2
classic-serverdata-0493f971848371f284a1e714624898c086e858a1.tar.xz
classic-serverdata-0493f971848371f284a1e714624898c086e858a1.zip
Merge branch 'upmarmu' into 'master'
Upmarmu exhaustion constant See merge request legacy/serverdata!665
-rw-r--r--world/map/db/const.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index f277da84..6490a6f5 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -150,6 +150,7 @@ SC_COOLDOWN_R 74
SC_COOLDOWN_AR 75
SC_COOLDOWN_ENCH 76
SC_COOLDOWN_KOY 77
+SC_COOLDOWN_UPMARMU 78
// Emotions
EMOTE_DISGUST 1