-
Notifications
You must be signed in to change notification settings - Fork 580
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request This pull request adds support for marines to strap a backpack onto allied xenos. The xeno cannot view the contents of the bag nor interact with it any way other than through a new shake verb. Marines also have access to the new shake verb for any emptyable storage item. Shaking a storage item that is either in your hands or back slot has a high chance to drop out a single item. Xenos that shake an empty backpack also have a low chance to drop the backpack on the ground. Strapping on, unstrapping, and accessing any allied xeno backpack does take some time to complete. The item class size of gardener and healer fruit has been lowered to medium, but they occupy more space in a bag than a regular medium item (so only five can fit in a typical bag). The intention of this change is to allow a bag loaded with either fruit (for xenos) or medical supplies (for marines) that a xeno can go out and distribute, but its primarily on a marine to facilitate this. Sprites were created by Jean 'Docteur' Corbeau aka SubjectD9341. ![Preview](https://user-images.githubusercontent.com/76988376/196059419-9833c1a5-5d6e-4354-b9c6-1f8c0ff3bd5a.png) **NOTE:** _**Some sprites in above are no longer accurate. See updated images below...**_ ![Defender](https://user-images.githubusercontent.com/76988376/207441985-a89accaf-482c-4d94-8fad-cd04737adef7.png) ![SentDroneSpitter](https://user-images.githubusercontent.com/76988376/207442096-b67daf74-8618-4c9f-83b4-d3b3cd067aa0.png) ![RunnerPraeWarrior](https://user-images.githubusercontent.com/76988376/207442390-a32fac4e-2e26-4337-86f0-5c7cc4b8b344.png) Sprite progress (though ultimately up to them how far they want to go): - [X] Medic bag on Drone - [X] Regular bag on Drone - [X] Medic bag on Defender - [X] Regular bag on Defender - [X] Medic bag on Sentinel - [X] Regular bag on Sentinel - [X] Medic bag on Runner - [X] Regular bag on Runner - [X] Medic bag on Warrior - [X] Regular bag on Warrior - [X] Medic bag on Spitter - [X] Regular bag on Spitter - [X] Medic bag on Praetorian - [X] Regular bag on Praetorian Any unlisted castes aren't planned at this time. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding, and may discourage maintainers from reviewing or merging your PR. This section is not strictly required for (non-controversial) fix PRs or backend PRs. --> Opens up more interactions between marines and xenos, namely for friendly "greenos". Encourages more cooperation between a friendly xeno faction because equipping and loading of these backpacks can only be performed by a marine; a xeno can only shake items out or shake the bag off. Allowing fruit to be placed in bags is primarily to allow a medic roony to either provide healing to xenos by shaking out some fruit, or to marines by shaking out some medical supplies. ## Changelog <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: Drathek, SubjectD9341 add: Standard issue marine backpacks can now be equipped to most allied xenos (Runners/Praetorians/Drones/Defenders/Warriors/Sentinels/Spitters) and accessed. Use a pack in help intent on a xeno to strap it to her after a duration. Access it with an empty hand in help intent after a duration. Drag a xeno with a pack to you when you have an empty hand to unstrap it from her after a duration. add: Added the Shake verb to storage items. Humans and xenos can now shake emptyable inventories which has a 75% chance to drop an item if there are any. Xenos also have a 25% chance to cause the pack fall off them when empty. balance: Resin fruit is now class size medium but size cost large so five can fit in a backpack. soundadd: Emptying a storage item now uses the existing rustle sound (or whatever use_sound its configured to use). soundadd: Unequipping a backpack now uses the existing rustle sound (or whatever use_sound its configured to use). imageadd: Added sprites for regular and medical packs on Runners/Praetorians/Drones/Defenders/Warriors/Sentinels/Spitters. code: Any storage item that is STORAGE_ALLOW_EMPTY now either adds/removes empty_verb and toggle_click_empty depending on if the user is a xeno. code: Refactored /atom/movable/vis_obj/xeno_wounds so it can be more generic as just vis_obj (now it will be used by both wounds and packs and packs don't need to be xeno_wounds) and use VIS_INHERIT_DIR instead of a signal. fix: Xeno wounds no longer inherit hive color. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. -->
- Loading branch information
Showing
21 changed files
with
284 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.