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

Componentizes power cells #4855

Merged
merged 4 commits into from
Nov 9, 2023
Merged

Conversation

Zonespace27
Copy link
Contributor

@Zonespace27 Zonespace27 commented Nov 6, 2023

About the pull request

Creates a new, flexible component for power cells. Eventually, anything powered will use a cell component instead of holding a ref to a /obj/item/cell or having a charge variable.

Converts NVGs over to the new system as an example, the rest will come in time.

Minor rework of how emp_act() works

Explain why it's good for the game

Cells are one of the most obvious things to be componentized, and componentizing them allows cells to be added to new objects in a very easy manner.

Testing Photographs and Procedure

Screenshots & Videos

Works

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 6, 2023
@cm13-github
Copy link
Contributor

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

@Zonespace27 Zonespace27 added the Code Improvement Make the code longer label Nov 6, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 6, 2023
Copy link
Member

@fira fira left a comment

Choose a reason for hiding this comment

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

Looks good to me codewise, will probably test it later

code/datums/components/cell.dm Show resolved Hide resolved
@fira
Copy link
Member

fira commented Nov 7, 2023

Tested it, looks good to me, might just need a way to modify the examine text behavior in the future to fit objects depending on where we stick it

@harryob harryob added this pull request to the merge queue Nov 9, 2023
Merged via the queue into cmss13-devs:master with commit 41b2e51 Nov 9, 2023
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants