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

Adds armblade implant and support for item implants #6010

Merged
merged 4 commits into from
Feb 13, 2021

Conversation

TiviPlus
Copy link
Member

About The Pull Request

title

Changelog

🆑
add: Unobtainable armblade implant
code: support for item-focused implants and bodypart-only implants
/:cl:

@tgstation-server tgstation-server added Code Improvement Changes for adhering to code standards and codebase maintainability. Feature New interesting mechanics with new interesting bugs Sprites Changes to .dmi file. labels Feb 11, 2021
Co-authored-by: XSlayer300 <35091844+XSlayer300@users.noreply.github.com>
@github-actions github-actions bot added the Merge Conflict Pull request is in a conflicted state with base branch. label Feb 13, 2021
Comment on lines +25 to +31
///Takes the held item and puts it into it's predestined slot
/obj/item/implant/deployitem/proc/put_in_slots()
switch(part.name)
if(BODY_ZONE_R_ARM)
implant_owner.put_in_r_hand(helditem)
if(BODY_ZONE_L_ARM)
implant_owner.put_in_l_hand(helditem)
Copy link
Member

Choose a reason for hiding this comment

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

should probably be able to put in other slots as well

@tgstation-server tgstation-server removed the Merge Conflict Pull request is in a conflicted state with base branch. label Feb 13, 2021
@SplinterGP SplinterGP merged commit eb13aab into tgstation:master Feb 13, 2021
@TiviPlus TiviPlus deleted the armblade branch February 13, 2021 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Changes for adhering to code standards and codebase maintainability. Feature New interesting mechanics with new interesting bugs Sprites Changes to .dmi file.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants