2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-02 16:49:03 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

[PR #564] [MERGED] Added Shop assistants, Fixed #551 and #563 #4787

New Issue
Closed
opened 2026-05-26 12:21:53 +00:00 by Dark98 · 0 comments
Dark98 commented 2026-05-26 12:21:53 +00:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/564
Author: @halogod35
Created: 1/29/2023
Status: ✅ Merged
Merged: 1/29/2023
Merged by: @Dark98

Base: master ← Head: shop-assistants

📝 Commits (7)

📊 Changes

2 files changed (+194 additions, -122 deletions)

View changed files

📝 2006Scape Server/data/cfg/spawns.json (+156 -86)
📝 2006Scape Server/src/main/java/com/rs2/game/shops/Shops.java (+38 -36)

📄 Description

In this PR, I have added Shop assistants to:

  • Al-Kharid
  • Edgeville
  • Falador
  • Karamja
  • Lumbridge*
  • Rimmington
  • Varrock
  • Zanaris (Lost City)

*The previous Lumby shop assistant is now Varrock Swordshop assistant

This PR also fixes issues #551 and #563

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/2006-Scape/2006Scape/pull/564 **Author:** [@halogod35](https://github.com/halogod35) **Created:** 1/29/2023 **Status:** ✅ Merged **Merged:** 1/29/2023 **Merged by:** [@Dark98](https://github.com/Dark98) **Base:** `master` ← **Head:** `shop-assistants` --- ### 📝 Commits (7) - [`515c1e9`](https://github.com/2006-Scape/2006Scape/commit/515c1e92442f291736823727ba6412b131cfd394) Updated all shops to correct quanities - [`54ffc65`](https://github.com/2006-Scape/2006Scape/commit/54ffc6544f3b374bbaa73fc977f179c8da23e02a) fixed shop quantities - [`472f058`](https://github.com/2006-Scape/2006Scape/commit/472f058fa699f57fd7b39130086d04887d742cdd) Updated shop items, quantities, and names - [`c80bef7`](https://github.com/2006-Scape/2006Scape/commit/c80bef7d576aac86b54f0460d40049ca8d6cced0) Updated shop names, items, and quantities - [`222d7bc`](https://github.com/2006-Scape/2006Scape/commit/222d7bc107ae17dca698d4bd2d31e7af902f2144) Merge branch '2006-Scape:master' into master - [`ba9387e`](https://github.com/2006-Scape/2006Scape/commit/ba9387e633481df8a891113aabe6207938080717) Added shop assistants, fixed issues #551 and #563 - [`e7ada53`](https://github.com/2006-Scape/2006Scape/commit/e7ada53d90d18778b6c0f0b7f4fe4705e6e9eb84) Added shop assistants, fixed issues #551 and #563 ### 📊 Changes **2 files changed** (+194 additions, -122 deletions) <details> <summary>View changed files</summary> 📝 `2006Scape Server/data/cfg/spawns.json` (+156 -86) 📝 `2006Scape Server/src/main/java/com/rs2/game/shops/Shops.java` (+38 -36) </details> ### 📄 Description In this PR, I have added Shop assistants to: - Al-Kharid - Edgeville - Falador - Karamja - Lumbridge* - Rimmington - Varrock - Zanaris (Lost City) *The previous Lumby shop assistant is now Varrock Swordshop assistant This PR also fixes issues #551 and #563 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
Dark98 added the pull-request label 2026-05-26 12:21:53 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
Cannot Reproduce
Difficulty: Easy
Difficulty: Easy
Difficulty: Hard
Difficulty: Medium
Documentation
enhancement
Highest Priority of Type
New Content
New Content
pull-request
Mirrored from GitHub Pull Request
 QoL
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Dark98
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: 2006-Scape/2006Scape#4787
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?