skelsoft
679b5025cc
Merge remote-tracking branch 'upstream/master'
2021-08-17 06:06:32 +10:00
ceikry
8d16b3d4e4
Add check for NS completion for silver sickle
2021-08-16 06:59:44 -05:00
Ceikry
ab17195f16
Merge branch 'funny-spirit-quest' into 'master'
...
Nature Spirit quest
See merge request 2009scape/2009scape!228
2021-08-16 02:22:10 +00:00
Ceikry
b23aa7bc0d
Nature Spirit quest
2021-08-16 02:22:10 +00:00
ceikry
0e2f51f851
Clear + disable prayers (more cleanup)
2021-08-13 17:24:36 -05:00
ceikry
aa1e6f9ea0
finalized prayer changes
2021-08-13 17:08:33 -05:00
ceikry
a27008fd37
Wrap up prayer changes
2021-08-13 17:03:53 -05:00
ceikry
54c2ae11f6
Refactor prayer changes into a more organized location
2021-08-13 17:00:36 -05:00
ceikry
6f175869e7
Fixed an exploit with prayer point decrementing
2021-08-13 16:56:22 -05:00
ceikry
f24af733ca
Merge remote-tracking branch 'origin/master'
2021-08-13 12:08:29 -05:00
ceikry
3135f14e7a
Fixed a bug with clipping assignment
2021-08-13 12:08:24 -05:00
Ceikry
222c6fda52
Merge branch 'master' into 'master'
...
Turoth spawn and config fixes
See merge request 2009scape/2009scape!227
2021-08-13 14:51:57 +00:00
Woahscam
c072f9e1f9
Turoth spawn and config fixes
2021-08-13 14:51:57 +00:00
Ceikry
a938319f49
Merge branch 'master' into 'master'
...
Changes to ExaminePacket.java
See merge request 2009scape/2009scape!226
2021-08-13 13:29:45 +00:00
Woahscam
18c052fe7c
Changes to ExaminePacket.java
2021-08-13 13:29:45 +00:00
ceikry
73550a50ef
Merge remote-tracking branch 'origin/master'
2021-08-13 07:50:04 -05:00
ceikry
2f6a65012f
Poisoning items without free inventory space should no longer nuke the product from existence
2021-08-13 07:49:57 -05:00
Ceikry
87fd94dd76
Merge branch 'master' into 'master'
...
Examine: Pizzas, Pies, Barrows Gear and Damaged Books
See merge request 2009scape/2009scape!225
2021-08-13 12:40:06 +00:00
skelsoft
33a81b6ce9
Examine: Pizzas, Pies, Barrows Gear and Damaged Books
2021-08-13 12:40:05 +00:00
skelsoft
fd7f786a53
Examine: Pizzas, Pies, Barrows Gear and Damaged Books
...
- All pizzas, and half-eaten pizzas now have corrected examine text
- Burnt pizza correct examine text
- Cooked slimy eel is now correctly droppable (why the hell did it have a destroy option in the first place?)
- All crayfish (burnt, raw, cooked) and the Crayfish cage now correctly tradeable and droppable
- All crayfish (incl Crayfish Cage) now have correct examine text
- All Damaged God Books (Guthix, Saradomin, Zamorak) now have correct examine text
- All pies (incl. partly-made Mud/Fish/Wild/Admiral/Garden/Summer pies, Burnt pie and noted pies) have correct examine text
- All Ahrim's equipment corrected examine text.
- All Dharok's equipment corrected examine text.
- All Guthan's equipment corrected examine text.
- All Karil's equipment corrected examine text.
- All Torag's equipment corrected examine text.
- All Verac's equipment corrected examine text.
2021-08-13 10:04:22 +10:00
skelsoft
1d6c0d83f6
Merge remote-tracking branch 'upstream/master'
2021-08-13 08:08:03 +10:00
ceikry
095fff41c5
Merge remote-tracking branch 'origin/master'
2021-08-12 10:11:11 -05:00
ceikry
36260209bd
New content api method
2021-08-12 10:11:05 -05:00
Ceikry
74ce91f62f
Merge branch 'master' into 'master'
...
Fix: Cooking Overhaul, Draynor Seed Market, and Port Sarim Examines
See merge request 2009scape/2009scape!224
2021-08-11 23:43:50 +00:00
skelsoft
44055b41c1
Fix: Cooking Overhaul, Draynor Seed Market, and Port Sarim Examines
2021-08-11 23:43:50 +00:00
skelsoft
e732f904bf
Fix: Cooking Overhaul, Draynor Seed Market, and Port Sarim Examines
...
- Most object examines in Port Sarim have been accounted for and added
- Stuffed Swordfish, Shelf, Barrel, Fish Barrel, Large Table, Crate, Crate (stacked), Plant, Clock, Chest, Small Table, Counter, two Ladders, three Crates, Painting (Landscape), Drawers, Chair, Bookcase, Bed, Dresser, Range, Candles, Cabinet, Axe Cabinet, Staircase, Charms and Mirror objects located within Port Sarim now have the proper examine text added
- Draynor Seed Market shop name correction
- Draynor Seed Market shop stock correction (can now correctly buy some low-level Farming seeds)
- Cooking Overhaul:
- Removed stinky OSRS Dark Crab from the CookableItems.java
- Can now correctly cook Crayfish
- Can now correctly consume Cooked Crayfish for 2HP.
- Can now correctly cook Mud pies
- Correct burn levels for Shrimp, Crayfish, Karambwanji, Salmon, Tuna, Cave Eel, Bass, Karambwan, Chicken, Ugthanki Meat, Rabbit, Crab Meat, Thin Snail, Lean Snail, Fat Snail, Bread, Cake, Beef, Rat Meat, Yak Meat, Bear Meat, Plain Pizza, Cooked Chompy, Roast Bird, Roast Rabbit, Redberry Pie, Meat Pie, Mud Pie, Apple Pie, Garden Pie, Fish Pie, Admiral Pie, Scrambled Egg, Fried Onions, Fried Mushrooms
- Cooking EXP corrections:
- Cooking Shrimp EXP corrected from 45 EXP -> 30 EXP
- Cooking Salmon EXP corrected from 58 EXP -> 90 EXP
- Cooking Karambwan EXP corrected from 80 -> 190 EXP
- Cooking Roast Beast meat EXP corrected from 82 EXP -> 99 EXP
- Cooking Roast Rabbit EXP corrected from 70 EXP -> 72 EXP
- Cooking Fried Mushrooms EXP corrected from 120 EXP -> 60 EXP
2021-08-12 09:33:44 +10:00
skelsoft
9288ca7ff7
Merge remote-tracking branch 'upstream/master'
2021-08-12 07:01:57 +10:00
ceikry
cee6de084f
Fixed potential exploit with the bonegrinder
2021-08-11 15:48:10 -05:00
ceikry
5262e2f855
I swear to god Arios...
2021-08-11 15:35:20 -05:00
ceikry
1359a70681
Fixed a bug with slayer
2021-08-11 10:05:20 -05:00
ceikry
cdc3d65fe8
Improved MS security
2021-08-10 22:16:48 -05:00
ceikry
b4b26cb583
Arios does it again part 4124571293: euh
2021-08-10 09:15:28 -05:00
ceikry
751741c248
Why was this not ignored intellij?
2021-08-10 09:07:56 -05:00
ceikry
aeddd72790
More junk management server code cleanup
2021-08-10 09:06:11 -05:00
ceikry
8efd877a11
Trying to patch up some junky code in the management server
2021-08-10 00:02:47 -05:00
ceikry
7859c87565
Cleanup CTZ/ServerStore
2021-08-09 19:03:09 -05:00
Ceikry
edf5b0738c
Merge branch 'bork_daily_reset' into 'master'
...
Changed Bork to use daily reset.
See merge request 2009scape/2009scape!220
2021-08-10 00:02:05 +00:00
Ceikry
92979e77b4
Merge branch 'wiz_guild_fix' into 'master'
...
Code Cleanup - Wizards Guild uses ContentAPI now.
See merge request 2009scape/2009scape!221
2021-08-10 00:00:36 +00:00
Ceikry
197c230f11
Merge branch 'server_run_fix' into 'master'
...
Removed space causing parser error.
See merge request 2009scape/2009scape!222
2021-08-09 23:59:50 +00:00
NixWigton
aa4b121ac2
Removed space causing parser error.
2021-08-09 18:52:04 -05:00
NixWigton
b750225b7b
Code Cleanup - Wizards Guild uses ContentAPI now.
2021-08-09 18:41:12 -05:00
NixWigton
d60644511c
Changed Bork to use daily reset.
2021-08-09 18:34:56 -05:00
Ceikry
95c38775b2
Merge branch 'wiz_guild_fix' into 'master'
...
Allow boosts to be used to enter wizard's guild.
See merge request 2009scape/2009scape!219
2021-08-09 23:32:43 +00:00
Ceikry
bb8992b16e
Merge branch 'master' into 'master'
...
Fix: Rats, Shades and their Robes, misc fixes
See merge request 2009scape/2009scape!215
2021-08-09 23:31:10 +00:00
skelsoft
a68318ab01
Fix: Rats, Shades and their Robes, misc fixes
2021-08-09 23:31:10 +00:00
Ceikry
3da5832540
Merge branch 'cutscene_fix' into 'master'
...
Fixed issue where interface options disappear after cutscenes.
See merge request 2009scape/2009scape!218
2021-08-09 23:29:22 +00:00
NixWigton
0d55dff842
Fixed issue where interface options disappear after cutscenes.
2021-08-09 16:34:39 -05:00
NixWigton
f2b18539d2
Allow boosts to be used to enter wizard's guild.
2021-08-09 16:30:15 -05:00
ceikry
aa6bf95006
Massive varp/varbit related refactoring + new client command
2021-08-09 13:20:07 -05:00
ceikry
3c5c702e7e
Remove potentially problematic while loops
2021-08-08 23:40:14 -05:00
