summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2019-04-04Merge branch 'items' into 'master's20190408Micksha1-1/+59
2019-04-04add warlord plate and fur bootsMicksha1-1/+59
2019-04-04Merge branch 'jesusalva/teelog' into 'master'Micksha2-0/+4
2019-04-04Allow @t and @l (@tee and @log) to all GM 1 and above.Jesusaves2-0/+4
2019-04-04Merge branch 'jesusalva/tutorial' into 'master'Micksha5-9/+396
2019-04-04Implement `@tutorial` and add the tutorial book in 001-2-5.Jesusaves5-9/+396
2019-04-04Merge branch 'jesusalva/itemdb' into 'master'Micksha1-856/+14
2019-04-04Fix Iron and Concentration Potion.Jesusaves1-856/+14
2019-04-03Merge branch 'jesusalva/alige' into 'master'Jesusaves2-67/+71
2019-04-03Update Alige script file for better user experience.Jesusaves2-67/+71
2019-03-29Merge branch 'skills2' into 'master'Micksha2-0/+61
2019-03-29non-magic passive skillsMicksha2-0/+61
2019-03-29Merge branch 'jesusalva/calamity' into 'master'Micksha16-2/+410
2019-03-29I need a way to get the Master Book.Jesusaves16-2/+410
2019-03-29Merge branch 'flag' into 'master'Micksha2-0/+28
2019-03-29add the flag npc for unmounting locations in ArtisMicksha2-0/+28
2019-03-29Merge branch 'rowboat_improvements' into 'master'Micksha5-43/+117
2019-03-29Merge branch 'rowboat_improvements' of https://gitlab.com/toams/serverdata in...toams5-43/+117
2019-03-11Update from herculesAndrei Karas2-2/+13
2019-03-09Merge branch 'jesusalva/slides' into 'master's20190311Micksha1-4/+4
2019-03-09Replace eight calls for warp on npc/000-2-1 by slide calls (in legacy syntax)Jesusaves1-4/+4
2019-03-08Merge branch 'jesusalva/fakerandom' into 'master'Micksha2-3/+20
2019-03-08Make Alan's Wood Breaking pseudo-random.Jesusaves2-3/+20
2019-03-06Merge branch 'jesusalva/resync' into 'master'Micksha2-0/+41
2019-03-06Implements @resyncJesusaves2-0/+41
2019-03-05Merge branch 'jesusalva/Peter' into 'master'Micksha8-576/+623
2019-03-05... That's why you shouldn't code with an empty stomach and without taking anJesusaves8-576/+623
2019-03-05Merge branch 'Mick-Mona' into 'master'Micksha4-50/+179
2019-03-05Replace gettimetick(2) with has_instance2(), because quest.count2 is not big ...Micksha4-50/+179
2019-03-05Merge branch 'jesusalva/sandwhich' into 'master'Micksha13-8/+609
2019-03-05Update the quest to address Micksha notes.Jesusaves13-8/+609
2019-03-04Merge branch 'jesusalva/miscimprovements' into 'master'Micksha2-0/+2
2019-03-04These minor improvements are important for the game.Jesusaves2-0/+2
2019-03-03Merge branch 'Yannika' into 'master'Micksha2-0/+21
2019-03-03adding Yannika NPCMicksha2-0/+21
2019-03-03Merge branch 'sandwiches' into 'master'Micksha1-0/+81
2019-03-03add the three first sandwichesMicksha1-0/+81
2019-03-01Remove extra white spacesAndrei Karas18-60/+60
2019-03-01Add ci checks for bad new lines or trailing white spacesAndrei Karas3-0/+43
2019-03-01Fix move command error and style in rowboat npcAndrei Karas1-7/+6
2019-02-28Merge branch 'jesusalva/hugolinus' into 'master'Micksha1-0/+2
2019-02-28Allow @ hugo and @ linus to all GMs with access to @ gotoJesusaves1-0/+2
2019-02-28Merge branch 'jesusalva/manhole' into 'master'Micksha3-7/+125
2019-02-28The four sewer mouths in Artis. They all behave differently.Jesusaves3-7/+125
2019-02-28Merge branch 'darktileset' into 'master'Micksha12-1/+110
2019-02-28add mana ghost mob and Valia NPCMicksha12-1/+110
2019-02-28Merge branch 'jesusalva/GuidedTour' into 'master'Micksha3-1/+17
2019-02-28Guide players by hand to get started on the game.Jesusaves3-1/+17
2019-02-13Merge branch 'toams/rowboat' into 'master'Micksha24-15/+713
2019-02-13Toams/rowboat + Micksha/galmatiaMicksha24-15/+713