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.

Sign up for GitHub

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

Jump to bottom

Adds armor stands and rewrites target dummies. #4615

Merged
merged 2 commits into from
Dec 13, 2024
Merged

Adds armor stands and rewrites target dummies. #4615

merged 2 commits into from
Dec 13, 2024

Conversation

MistakeNot4892
Copy link
Contributor

@MistakeNot4892 MistakeNot4892 commented Dec 7, 2024 •
edited
Loading

  • Adds an craftable armor stand that can hold gear for display.
  • Removes magnets (used for moving target stakes around; has never worked well and is not in use.
  • Rewrites target stakes and training dummies, adds straw and archery butt versions.
  • Makes target stakes and straw dummies craftable.

Icons by @PlayerDeer.

@MistakeNot4892 MistakeNot4892 added the ready for review This PR is ready for review and merge. label Dec 7, 2024
out-of-phaze
out-of-phaze previously approved these changes Dec 7, 2024
View reviewed changes
MistakeNot4892
MistakeNot4892 commented Dec 7, 2024
View reviewed changes
code/game/objects/structures/armor_stand.dm Outdated
if(length(gear_to_slot) == 1)
removed_item = gear_to_slot[1]
else
removed_item = input(user, "Which piece of equipment would you like to remove?", "Armor Stand") as null|anything in gear_to_slot
Copy link
Contributor Author

@MistakeNot4892 MistakeNot4892 Dec 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

This isn't going to work with the weakref changes oops.

@MistakeNot4892 MistakeNot4892 added awaiting author This PR is awaiting action from the author before it can be merged. and removed ready for review This PR is ready for review and merge. labels Dec 9, 2024
@out-of-phaze out-of-phaze dismissed their stale review December 9, 2024 01:08

armor stand needs fixes

@MistakeNot4892 MistakeNot4892 added the work in progress This PR is under development and shouldn't be merged. label Dec 9, 2024
@MistakeNot4892 MistakeNot4892 changed the title Adding several low tech armor/weapon props. Adds armor stands and rewrites target dummies. Dec 9, 2024
@MistakeNot4892
Copy link
Contributor Author

Updating this one got a bit out of hand, PR header is updated.

@MistakeNot4892 MistakeNot4892 added ready for review This PR is ready for review and merge. and removed awaiting author This PR is awaiting action from the author before it can be merged. work in progress This PR is under development and shouldn't be merged. labels Dec 9, 2024
@out-of-phaze out-of-phaze merged commit cd7da77 into NebulaSS13:dev Dec 13, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@out-of-phaze out-of-phaze out-of-phaze approved these changes

Assignees
No one assigned
Labels
ready for review This PR is ready for review and merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MistakeNot4892 @out-of-phaze