Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Zombie pirates #6159

Closed
wants to merge 5,685 commits into from
Closed

Zombie pirates #6159

wants to merge 5,685 commits into from

Conversation

DarkWorldsArtist
Copy link
Contributor

Description:

Added zombie pirate stuff

Changes:

  • Adds zombie pirates as a killable option
  • Adds teleport scroll to cl
  • Adds zombie pirates as task option (zombie, pirates)
  • Added code for openable, currently does not function (improper export in osjs)

Other checks:

  • I have tested all my changes thoroughly.

TastyPumPum and others added 30 commits July 24, 2024 19:42
@TastyPumPum
Add Refund of charges to Colosseum (oldschoolgg#5956)
156f0db
@gc
Exit handling + test bot status (oldschoolgg#5967)
80017e4
@gc
Redis test changes
d0e19ec
@gc
Remove wiki/contributor bitfields
13821d9
@gc
Remove unneeded date cast on raw sql
262a53d
@gc
Prevent errors on pin trip
e435d7e
@gc
Dont queue sendToChannelID anymore
6e9a36a
@gc
Add add/remove item functions to startup scripts
08d1dde
@gc
Fix startup scripts
852950c
@gc
Fix preStartup
44b3167
@gc
Add cl_array column
0331c45
@gc
Test fixes
5761c8f
@gc
Roles task rewrite (oldschoolgg#5982)
ad6d6d4
@gc
Remove old sync_roles command
98904fa
@gc
Use a promise-queue for roles task and return file
f24a0a4
@gc
Roles task improvements/fixes
dcc3a22
@gc
Fix some issues
cd9f3be
@gc
Fixes
21a3778
@gc
Roles task fixes
13836a0
@nwjgit
Fix CA & few adjustments (oldschoolgg#5981)
f3d124d
@gc
Fix docker (oldschoolgg#5987)
d0193ff
@gc
Add rebase cmd action (oldschoolgg#5988)
cc17c1c
@gc
Remove rebase command stuff (oldschoolgg#5989)
ee2be2d
@DaughtersOfNyx
Fix incorrect command name in Hunt (oldschoolgg#5986)
23a85fe
@DaughtersOfNyx
Fix typo in the finished hunting message (oldschoolgg#5978)
cf085e4
@nwjgit
Allow multiple combat options for PVM trips (oldschoolgg#5962)
eb0dc0a
@DaughtersOfNyx
Remove prospector items from Falador Hard Diary req (oldschoolgg#5977)
99adf76
@TastyPumPum
Add Valamore Farming Patches (oldschoolgg#5966)
7816fe4
@nwjgit
quest/lamp fixes (oldschoolgg#5949)
bdc6f78
@minimicronano
Update setup steps to mention db schema update (oldschoolgg#5947)
83d9fa7
DayV-git and others added 26 commits October 27, 2024 21:20
@DayV-git
Fix alch agility items choice (oldschoolgg#6127)
5e0090b
@DayV-git
Add function to fix some message formatting (oldschoolgg#6145)
b70f0a0
@DayV-git
Allow gear preset equip command to use similar items (for globals) (o…
5f88977 
…ldschoolgg#6135)
@Felris
Add armoured zombie (oldschoolgg#6140)
d72d687
@nwjgit
update SETUP.md (oldschoolgg#6123)
9dccdda
@gc
Cleanup snapshots/linting
e668eb8
@nwjgit
Forester's ration (oldschoolgg#6042)
2418e2e
@gc
Add new bso items
13cf2a6
@gc
Wiki updates
1d7c075
@gc
Add developing page to wiki and do some cleanup/fixes
053d477
@gc
Add bso changelog
1147eed
@DarkWorldsArtist
zombie pirates
08f62a0 
initial code wip
@DarkWorldsArtist
comment thing
b408d8f 
read comment
@DarkWorldsArtist
comma removal
e37afc0 
removed unnecessary commas
@DarkWorldsArtist
comma removal 2
da90a2a 
removed unnecessary commas again
@DarkWorldsArtist
lint
fdea8e7 
lint
@DarkWorldsArtist
updated rates
1d49262 
as above
@gamrbing
Wiki: fix toa typo (oldschoolgg#6154)
5a54080
@00justas
Ability to create the skull sceptre (oldschoolgg#6139)
31d24a8
@nwjgit
Fix ash sanctifier (oldschoolgg#6117)
8d171cf
@Lajnux
Rebalance construction xp rates (oldschoolgg#6156)
300f046
@DayV-git
Add loot pictures to impling clues (oldschoolgg#6155)
5dbf90d
@TastyPumPum
Add CAs to the Dt2 Bosses (oldschoolgg#6161)
7c539dc
@gc
Update CA wiki page
8585a6b
@Lajnux
Mining effect fix (oldschoolgg#6118)
96933cd
@DarkWorldsArtist
Merge branch 'master' into zombie-pirates
3182a4a
@gc
Copy link
Collaborator

gc commented Nov 3, 2024

I've updated osjs and if you merge master it should be available now to import.

@gc gc closed this Nov 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Status: Waiting For Changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.