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

cherry pick portable charger #2206

Merged
merged 4 commits into from
Nov 24, 2024
Merged

Conversation

deltanedas
Copy link
Member

@deltanedas deltanedas commented Nov 15, 2024

About the PR

it was skipped because of bad circumstances, so this brings it back

Why / Balance

i heard someone say they heard someone say that secoffs were putting 4x4 lasers in a 4x4 charger in their bag to always carry guns around, however:

  • that space would already be used for a gun so theres no tardis, only charging
  • suit storage fits guns too
  • t3 sec on upstream so already that wouldve been very rare

Changelog
🆑

  • add: Re-enabled the portable recharger Tier 3 Arsenal tech.

icekot8 and others added 2 commits November 15, 2024 20:15
* sys

* item

* ahm.

* Update Content.Server/Power/Components/ChargerComponent.cs

---------

Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
@deltanedas deltanedas requested review from IamVelcroboy and a team as code owners November 15, 2024 20:18
@github-actions github-actions bot added Status: Needs Review Changes: YML Changes any yml files Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an rsi and removed Status: Needs Review labels Nov 15, 2024
Copy link
Contributor

github-actions bot commented Nov 15, 2024

RSI Diff Bot; head commit 33f71f5 merging into 2f47a36
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Power/portable_recharger.rsi

State Old New Status
charging-equipped-BACKPACK Added
charging-unlit Added
charging Added
inhand-left Added
inhand-right Added

Edit: diff updated after 33f71f5

@MilonPL MilonPL added S: Awaiting Changes Do not merge due to requested changes and removed Status: Needs Review labels Nov 17, 2024
@MilonPL MilonPL merged commit 1180730 into DeltaV-Station:master Nov 24, 2024
13 checks passed
@deltanedas deltanedas deleted the recharger-ops branch November 24, 2024 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Awaiting Changes Do not merge due to requested changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants