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

Split Emag in half #1426

Merged
merged 19 commits into from
Jul 9, 2024
Merged

Conversation

WarMechanic
Copy link
Contributor

@WarMechanic WarMechanic commented Jun 22, 2024

About the PR

Splits the functionality of Emag into two different items:

  • Cryptographic Sequencer (4tc), which can emag everything except doors.
  • Airlock Access Override (6tc), which can only emag doors.

Why / Balance

Emag is a very big item which makes it hard to balance. On one hand, its a gimmick enabler by creating special interactions with station machines. On the other hand, it is very efficient at breaking and entering anywhere with a door. Most players will want to buy the Emag for one function or the other.

By splitting Emag into these two functions, the collective cost of Emag will stay at 10 but Syndicate players will have more agency over what they want to do in a round with budget cuts. The cost of either item can be interpolated based on which one is more powerful.

Technical details

Adds whitelist and blacklist variables to the Emag component.

Media

https://youtu.be/c0NuEvLdc_U
image
image

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

No

Changelog

🆑

  • add: Split the Emag into the Cryptographic Sequencer and the Airlock Access Override.

@github-actions github-actions bot added Changes: YML Changes any yml files Changes: C# Changes any cs files labels Jun 22, 2024
@WarMechanic WarMechanic marked this pull request as draft June 22, 2024 07:58
@deltanedas
Copy link
Member

This PR is currently awaiting a sprite for the AAO.

doesnt tg have it

@WarMechanic
Copy link
Contributor Author

This PR is currently awaiting a sprite for the AAO.

doesnt tg have it

it does but it also has different cryptographic sequencer and id card sprites which would look out of place here. i guess i could use it temporarily for testing but i dont know how attributions work so i dont want to bother lol.
i got someone on discord to work on a new sprite so we good.

@github-actions github-actions bot added the Changes: Localization Changes any ftl files label Jun 22, 2024
@WarMechanic WarMechanic marked this pull request as ready for review June 22, 2024 09:40
Signed-off-by: WarMechanic <[email protected]>
@github-actions github-actions bot added the Changes: Sprite Changes any png or json in an rsi label Jun 22, 2024
Copy link
Contributor

github-actions bot commented Jun 22, 2024

RSI Diff Bot; head commit 47c9025 merging into ddd1c28
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Tools/doorjack.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 47c9025

@Lyndomen
Copy link
Contributor

I think the admin team is really excited about this, and look forward to it if it is implemented.

Resources/Locale/en-US/deltav/store/uplink-catalog.ftl Outdated Show resolved Hide resolved
Resources/Locale/en-US/emag/emag.ftl Outdated Show resolved Hide resolved
Resources/Locale/en-US/store/uplink-catalog.ftl Outdated Show resolved Hide resolved
Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml Outdated Show resolved Hide resolved
Content.Shared/Emag/Components/EmagComponent.cs Outdated Show resolved Hide resolved
Content.Shared/Emag/Systems/EmagSystem.cs Outdated Show resolved Hide resolved
Content.Shared/Emag/Systems/EmagSystem.cs Outdated Show resolved Hide resolved
@WarMechanic
Copy link
Contributor Author

all requested changes are resolved, all checks have passed and it still works in game so it looks good to me

@WarMechanic
Copy link
Contributor Author

only a week away

@NullWanderer
Copy link
Contributor

@deltanedas @DEATHB4DEFEAT Have your things been properly addressed?

Copy link
Contributor

@NullWanderer NullWanderer left a comment

Choose a reason for hiding this comment

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

Only have a few small nitpicks, but they don't matter enough for me to actually type them out and click the request changes button

@NullWanderer NullWanderer merged commit 4227c24 into DeltaV-Station:master Jul 9, 2024
15 checks passed
ProphetCrow added a commit to ProphetCrow/Delta-v-testenv that referenced this pull request Jul 10, 2024
This reverts commit 4227c24.

# Conflicts:
#	Resources/Locale/en-US/deltav/store/uplink-catalog.ftl
#	Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
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: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants