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

Engineering machinery and consoles area detection refactor #26716

Merged
merged 17 commits into from
Oct 10, 2024

Conversation

Migratingcocofruit
Copy link
Contributor

@Migratingcocofruit Migratingcocofruit commented Sep 7, 2024

What Does This PR Do

Replaces the hardcoded station z level checks on the gravity generator, station alert console, atmos alert console, central atmos console with area checks. Moved the hardcoded networks that were being added to cameras when an alert was activated to variables of /area. Engineering console now gets its networks from the area it is placed in.
Also fixes a bug where some atmos alarms wouldn't show in the atmos alert console(despite showing on station alerts) due to the console only showing alerts from the master alarm of each relevant area while some of those had no master alarm.

Why It's Good For The Game

The gravity generator and most engineering consoles are all hardcoded to only work on the station. This means you can't use them in ruins. Now that possibility exists. This means places like the syndie base can now have atmos monitoring and control as well as a gravity generator.
I originally made these changes as part of a planned ruin for engineering practice, but considering these changes aren't specific to that ruin I decided to make them their own PR.

Images of changes

Testing

  • Activated and shutdown the gravgen. Made sure gravity was removed and restored and that mob were slammed to the ground properly
  • Verified the appropriate alerts showed up on each console
  • Verified the correct cameras show up on the engineering monitor when an alert is activated
  • Repeated all tests on the syndie base with alarms and APCs that were varedited to report alerts(the syndie type doesn't by default)

Declaration

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑
tweak: Grav gen, atmos alert console, atmos control console, engineering camera monitor, station alert console now all determine their relevant areas and devices depending on the area they are placed on instead of hardcoded checks for things being on station.
fix: Atmos alerts now properly show on the atmos alert console
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally label Sep 8, 2024
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Sep 10, 2024
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Sep 11, 2024
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Sep 12, 2024
code/game/machinery/computer/atmos_alert.dm Outdated Show resolved Hide resolved
code/game/machinery/computer/atmos_controllers.dm Outdated Show resolved Hide resolved
code/modules/tgui/modules/atmos_control.dm Outdated Show resolved Hide resolved
code/modules/power/gravitygenerator.dm Outdated Show resolved Hide resolved
code/modules/power/gravitygenerator.dm Outdated Show resolved Hide resolved
Copy link
Contributor

This pull request seems to be stale as there have been no changes in 14 days, please make changes within 7 days or the PR will be closed. If you believe this is a mistake, please inform a development team member on Discord.

@github-actions github-actions bot added the Stale This PR has been left inactive and requires an update. label Sep 29, 2024
@github-actions github-actions bot removed the Stale This PR has been left inactive and requires an update. label Sep 30, 2024
@Migratingcocofruit Migratingcocofruit changed the title Engineering machinery and console station area detection refactor Engineering machinery and console area detection refactor Oct 3, 2024
@Migratingcocofruit Migratingcocofruit changed the title Engineering machinery and console area detection refactor Engineering machinery and consoles area detection refactor Oct 3, 2024
code/modules/tgui/modules/atmos_control.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/station_area.dm Show resolved Hide resolved
code/game/machinery/computer/atmos_alert.dm Outdated Show resolved Hide resolved
code/game/machinery/computer/atmos_alert.dm Outdated Show resolved Hide resolved
code/game/machinery/computer/atmos_controllers.dm Outdated Show resolved Hide resolved
code/modules/power/gravitygenerator.dm Outdated Show resolved Hide resolved
code/modules/power/gravitygenerator.dm Outdated Show resolved Hide resolved
code/game/machinery/computer/station_alert.dm Outdated Show resolved Hide resolved
code/modules/tgui/modules/atmos_control.dm Outdated Show resolved Hide resolved
code/modules/tgui/modules/atmos_control.dm Outdated Show resolved Hide resolved
@lewcc lewcc requested a review from silverplatedelta October 9, 2024 19:06
@S34NW S34NW added the Refactor This PR will clean up the code but have the same ingame outcome label Oct 10, 2024
@S34NW S34NW added this pull request to the merge queue Oct 10, 2024
Merged via the queue into ParadiseSS13:master with commit 26a884e Oct 10, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting review This PR is awaiting review from the review team Refactor This PR will clean up the code but have the same ingame outcome
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants