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.

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

Item size tweaks (and bonus medipen resprite) #3509

Merged
merged 4 commits into from
Dec 3, 2024

Conversation

thgvr
Copy link
Member

@thgvr thgvr commented Oct 9, 2024

About The Pull Request

Tweaks various item sizes (basically off of vibes) in order to make them more reasonable and in line with volumetric storage.

image

Also resprites medipens. They're pretty cool. Design inspired by infrared_baron.

Changelog

🆑
add: Allows hand radios to be held on your neck slot
balance: Adjusted the item size of various guns and misc objects, see pr #3509 for more info
imageadd: Overhauled the look of autoinjectors
/:cl:

@github-actions github-actions bot added Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Oct 9, 2024
@github-actions github-actions bot requested a review from FalloutFalcon October 9, 2024 04:47
Copy link
Member

@rye-rice rye-rice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this goes insanely hard, feel free to screenshot

still wish there was like, a middle ground between small and normal, and normal and bulky, but spritewise this is amazing

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 22, 2024
@Sun-Soaked
Copy link
Member

looms ominously

@thgvr
Copy link
Member Author

thgvr commented Oct 27, 2024

code for all this is weird, it doesn't work with medkits. i'll probably save those for later.

@thgvr
Copy link
Member Author

thgvr commented Nov 3, 2024

ill fix this soon

@Sun-Soaked
Copy link
Member

ill fix this soon

o o

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Dec 3, 2024
@thgvr thgvr marked this pull request as ready for review December 3, 2024 12:13
@thgvr thgvr requested a review from a team as a code owner December 3, 2024 12:13
Copy link
Member

@Sun-Soaked Sun-Soaked left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

@Sun-Soaked Sun-Soaked added this pull request to the merge queue Dec 3, 2024
Merged via the queue into shiptest-ss13:master with commit 0f1d35c Dec 3, 2024
16 checks passed
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 27, 2024
<!-- 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. -->

## About The Pull Request
Tweaks various item sizes (basically off of vibes) in order to make them
more reasonable and in line with volumetric storage.


![image](https://github.com/user-attachments/assets/edf28cf6-482e-4390-bd4f-7243d84de677)


Also resprites medipens. They're pretty cool. Design inspired by
infrared_baron.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Changelog

:cl:
add: Allows hand radios to be held on your neck slot
balance: Adjusted the item size of various guns and misc objects, see pr
shiptest-ss13#3509 for more info
imageadd: Overhauled the look of autoinjectors
/: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. -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants