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

Battery rack update #8382

Merged
merged 21 commits into from
Dec 9, 2023
Merged

Conversation

MLGTASTICa
Copy link
Contributor

@MLGTASTICa MLGTASTICa commented Dec 7, 2023

About The Pull Request

Fixes battery racks not working by default
Adds quick-toggles to battery racks
Adds more examine text + the ability to remove batteries either by hand attack or by examine
Fixes code related to capacitor and battery insertion
Adds the new better and updates sprites
Also updates power generator sprites

Why It's Good For The Game

Fix is always good

Testing

Tested on local , built a powerrack from zero , tested insertion and removal , examine removal and hand removal , power charging and discharging.
Also tested the new generator sprites , made sure they update properly.

Changelog

🆑
fix: Fixed Battery racks not working
add: Added the abiltity to remove batteries from the battery racks (by examine or by hand attack)
add: Added visual status updates to the battery rack
add: Added more examine info to the battery racks.
add: Updated power generator sprites (taken from the #8380
fix: Fixed battery racks not accepting new batteries / capacitors
balance: Battery racks no longer require 3 cells by default , they now require 1 capacitor and 20 cable coil
/:cl:

MLGTASTICa and others added 15 commits December 29, 2022 20:54
Bumps [webpack](https://github.com/webpack/webpack) from 5.51.1 to 5.76.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](webpack/webpack@v5.51.1...v5.76.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
…bpack-5.76.0

Bump webpack from 5.51.1 to 5.76.0 in /tgui
Bumps [fastify](https://github.com/fastify/fastify) from 3.20.2 to 3.29.4.
- [Release notes](https://github.com/fastify/fastify/releases)
- [Commits](fastify/fastify@v3.20.2...v3.29.4)

---
updated-dependencies:
- dependency-name: fastify
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](json5/json5@v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
…stify-3.29.4

Bump fastify from 3.20.2 to 3.29.4 in /tgui
…on5-1.0.2

Bump json5 from 1.0.1 to 1.0.2 in /tgui
@MLGTASTICa
Copy link
Contributor Author

image
Ingame sprite

code/modules/power/batteryrack.dm Outdated Show resolved Hide resolved
code/modules/power/batteryrack.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Merge Conflict Merge Conflict label Dec 8, 2023
@hyperioo
Copy link
Contributor

hyperioo commented Dec 8, 2023

Sprite conflict after merging #8380

@hyperioo hyperioo merged commit 8ec1ce7 into discordia-space:master Dec 9, 2023
6 checks passed
@Kurgis
Copy link
Contributor

Kurgis commented Feb 26, 2024

add: Updated power generator sprites (taken from the #8380

There seems to of been an oversight, no modification was made to the power.dmi. They were removed in this commit: 3c10e27

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Merge Conflict Merge Conflict
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants