Shotgun and tweaks #9
Merged
Conversation
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
Merge From Master
Fox-McCloud
pushed a commit
that referenced
this pull request
Dec 14, 2014
Tastyfish
pushed a commit
to Tastyfish/Paradise
that referenced
this pull request
May 31, 2016
Some work in detective office and a new room
Merged
mattgroy
pushed a commit
to mattgroy/Paradise
that referenced
this pull request
Nov 10, 2023
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> <!-- Include a small to medium description of what your PR changes. --> <!-- Document all changes, as not doing this may delay reviews or even discourage maintainers from merging your PR! --> <!-- If your PR fixes an issue, add "Fixes ParadiseSS13#1234" somewhere in the PR description. This will automatically close the bug upon PR submission. --> * Span Defines for better code * Title Screen, which is a real image, not an object in the world. Adds procs for changing it. <!-- 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. --> Title Screen for Widescreen support :cl: code: Span defines for cleaner code add: Title Screen /: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. --> <!-- 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 a PR has no impact on players (i.e. a code refactor that does not change functionality) then the entire Changelog heading and contents can be removed. --> --------- Co-authored-by: Furior <68264134+Furrior@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mostly an Aesthetic Patch
-Implements Riot Shotguns (holds 6 shells instead of the combat shotty's 8 and comes loaded with beanbag rounds); these will be added to the armory along with a locker for more ammo in the very near future.
-Updates a number of sprites, primarily energy/laser guns, though a few other devices have been updated as well.