-
Notifications
You must be signed in to change notification settings - Fork 196
Thumb Tack Darts #1788
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
Open
BlitzTheSquishy
wants to merge
5
commits into
TheDenSS14:master
Choose a base branch
from
BlitzTheSquishy:ow-my-thumb
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Thumb Tack Darts #1788
Conversation
This file contains hidden or 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
bigsantino1
pushed a commit
to bigsantino1/TheDen
that referenced
this pull request
Sep 23, 2025
station map gets inhands
bigsantino1
pushed a commit
to bigsantino1/TheDen
that referenced
this pull request
Sep 23, 2025
<!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> <!-- NOTE: All code submitted to this repository is ALWAYS licensed under the AGPL-3.0-or-later license. The REUSE Specification headers or separate .license files indicate a secondary license (e.g., MPL or MIT) solely to facilitate integration for projects that do not use the AGPL license. This secondary license does not replace the fact that AGPL-3.0-or-later remains the primary and binding license. Uncomment and modify the following line if you wish to change the license from the default of AGPL.--> <!--- LICENSE: AGPL --> ## About the PR <!-- What did you change? --> Yoinked [TheDenSS14#1788](impstation/imp-station-14#1788) from Impstation Yoinked [#36036](space-wizards/space-station-14#36036), [#36017](space-wizards/space-station-14#36017), [#33676](space-wizards/space-station-14#33676), [#35433](space-wizards/space-station-14#35433), [#34984](space-wizards/space-station-14#34984), [#35974](space-wizards/space-station-14#35974), [#35151](space-wizards/space-station-14#35151), [#35323](space-wizards/space-station-14#35323), [#33689](space-wizards/space-station-14#33689), and [#32849](space-wizards/space-station-14#32849) from Wizden. Apologies in advance to the poor maintainer that gets to review this. ## Why / Balance <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> Crazy idea, but theoretically speaking, you should be able to see what's in your hand. Go on, try it. I said try it but I bet you didn't even look down SMH. ## Technical details <!-- Summary of code changes for easier review. --> Added a fuck ton of pngs, adjusted meta.jsons, and added a couple calls to them where needed in .ymls. ## Media <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. --> <img width="192" height="230" alt="image" src="https://github.com/user-attachments/assets/b4d824fb-acb4-4cbd-ac9f-c171fb4390c0" /> <img width="256" height="256" alt="image" src="https://github.com/user-attachments/assets/f9da7b2d-8691-469a-a6df-633d136005d4" /> <img width="320" height="320" alt="image" src="https://github.com/user-attachments/assets/3dd5047c-0bc9-42b7-89b9-23e3d9f07427" /> <img width="320" height="320" alt="image" src="https://github.com/user-attachments/assets/fb14a8bd-577d-4e61-9837-dd850578a804" /> <img width="320" height="320" alt="image" src="https://github.com/user-attachments/assets/242f703a-9943-4dfe-86cb-7c15d2154a69" /> <img width="320" height="320" alt="image" src="https://github.com/user-attachments/assets/b349823d-15f8-4be4-b7fc-0e562975c8cb" /> <img width="945" height="826" alt="image" src="https://github.com/user-attachments/assets/5c70c876-d939-4723-b938-ee5e607c1c03" /> <img width="936" height="739" alt="image" src="https://github.com/user-attachments/assets/c9381c67-b0da-4f4e-b33d-323d6274f37f" /> <img width="320" height="320" alt="image" src="https://github.com/user-attachments/assets/cae6c302-3eca-491b-8ca4-21b92c9b54ed" /> <img width="320" height="320" alt="image" src="https://github.com/user-attachments/assets/fc2779bd-6e62-4b91-84bc-0e5736e59124" /> <img width="1456" height="1199" alt="image" src="https://github.com/user-attachments/assets/4b2b4013-65c6-4ecf-88b7-f9760dec8fa6" /> <img width="1455" height="1199" alt="image" src="https://github.com/user-attachments/assets/b6ecf309-b1c3-42e9-b844-6f9c53f81c5f" /> <img width="256" height="256" alt="image" src="https://github.com/user-attachments/assets/383a0d47-dc17-48ff-86f1-d80a882b3eac" /> <img width="1600" height="1600" alt="image" src="https://github.com/user-attachments/assets/a1ec2d13-4572-4c2d-bf8c-13c7d6c67599" /> <img width="960" height="960" alt="image" src="https://github.com/user-attachments/assets/993e02b5-5b07-4411-b1d6-ae2d8710d2dc" /> <img width="864" height="864" alt="image" src="https://github.com/user-attachments/assets/3aaa02b5-6845-4c92-968c-3bd27ecfd014" /> <img width="710" height="711" alt="image" src="https://github.com/user-attachments/assets/b22f24d4-8f88-4524-85ee-4db038d0ff84" /> <img width="775" height="775" alt="image" src="https://github.com/user-attachments/assets/76f883bb-a5b9-4351-8c23-33d0779e470d" /> <img width="646" height="647" alt="image" src="https://github.com/user-attachments/assets/1c02b6a8-3cca-4986-b704-8b647bebe8c6" /> <img width="773" height="776" alt="image" src="https://github.com/user-attachments/assets/3e411a97-936e-4689-b70a-3468df7b3c1c" /> <img width="776" height="776" alt="image" src="https://github.com/user-attachments/assets/c292a597-42a2-41d0-bfb9-317d6be6588a" /> <img width="352" height="316" alt="image" src="https://github.com/user-attachments/assets/1b47e778-190c-4260-95d0-9ff88d1aa354" /> <img width="303" height="217" alt="image" src="https://github.com/user-attachments/assets/bf46641d-937b-444f-9017-7fc11912bab1" /> ## Requirements <!-- Confirm the following by placing an X in the brackets [X]: --> - [X ] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [X ] I have added media to this PR or it does not require an ingame showcase. - [X ] I have tested any changes or additions. - [X ] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content. <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion --> ## Breaking changes <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 - add: Added in-hand sprites for various medical items, - add: Added in-hand sprites for various roboticist items. - add: Added in-hand sprites for various general tools such as the GPS and Station Map. - add: Added in-hand sprites for most produce items. - add: Added in-hand sprites for various trinkets - add: Added in-hand sprites for a variety of grenades and throwables. - add: You can now put the snake plushie around your neck! - remove: Removed the staff's free time.
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Contributor
Collaborator
|
linter fail. |
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: Sprite
Changes: YML
Status: Merge Conflict
This PR contains an unhandled merge conflict.
Status: Needs Review
This PR needs a review from a maintainer.
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.
About the PR
Added thumb tacks that you can put into foam darts for evil intents
Why / Balance
Just a little funny, they only do 1 single damage and are time consuming to make large amounts
Technical details
Media
Requirements
Breaking changes
Changelog
🆑