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.

Sign up for GitHub

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

Jump to bottom

Project ARES: Nerve Gas Control #5643

Merged
merged 22 commits into from
Apr 16, 2024
Merged

Project ARES: Nerve Gas Control #5643

merged 22 commits into from
Apr 16, 2024

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Feb 2, 2024 •
edited by github-actions bot
Loading

About the pull request

Allows nerve gas to be deployed from the AI Core vent system by use of the APOLLO and ARES Interface consoles.

Explain why it's good for the game

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Added Nerve Gas Release control buttons to the ARES and APOLLO interfaces, allowing the AI core to be secured from large groups or xenomorphs. Built in cooldowns should prevent fatalities.
/:cl:

@realforest2001 realforest2001 added this to the Project ARES milestone Feb 2, 2024
@github-actions github-actions bot added Mapping did you remember to save in tgm format? UI deletes nanoui/html Feature Feature coder badge labels Feb 2, 2024
@realforest2001 realforest2001 mentioned this pull request Feb 2, 2024
Closed
Nanu308
Nanu308 approved these changes Feb 3, 2024
View reviewed changes
maps/map_files/USS_Almayer/USS_Almayer.dmm Outdated Show resolved Hide resolved
@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Feb 3, 2024
@github-actions GitHub Actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Feb 11, 2024
@Drulikar Drulikar added Stale Exempt PR can't go stale and removed Stale beg a maintainer to review your PR labels Feb 14, 2024
harryob
harryob previously requested changes Feb 22, 2024
View reviewed changes
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

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

and just, generally, as a structural question - why are there 3 copy pasted interfaces for ares stuff? i don't see why it couldn't have been accomplished more OOPly

code/game/machinery/ARES/ARES_interface.dm Outdated Show resolved Hide resolved
code/game/machinery/ARES/ARES_interface_apollo.dm Outdated Show resolved Hide resolved
code/game/machinery/ARES/apollo_pda.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft February 22, 2024 16:11
@realforest2001 realforest2001 marked this pull request as ready for review February 25, 2024 14:43
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Mar 4, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Mar 4, 2024
@cm13-github
Copy link
Contributor

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

Drulikar
Drulikar requested changes Mar 7, 2024
View reviewed changes
code/game/machinery/ARES/ARES_interface.dm Outdated Show resolved Hide resolved
code/game/machinery/ARES/ARES_interface.dm Outdated Show resolved Hide resolved
code/game/machinery/ARES/ARES_interface_apollo.dm Outdated Show resolved Hide resolved
code/game/machinery/ARES/apollo_pda.dm Outdated Show resolved Hide resolved
code/game/machinery/ARES/ARES_interface.dm Show resolved Hide resolved
tgui/packages/tgui/interfaces/AresInterface.jsx Outdated Show resolved Hide resolved
code/game/machinery/ARES/ARES_interface_apollo.dm Show resolved Hide resolved
tgui/packages/tgui/interfaces/AresInterface.jsx Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft March 7, 2024 03:36
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Apr 3, 2024
@cm13-github
Copy link
Contributor

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

Drulikar
Drulikar requested changes Apr 6, 2024
View reviewed changes
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

Width issue appears resolved, but there's a few other gripes about the layout of this interface. Stunning seems better, but still pretty ineffective against xenos.

WJ interface arbitrarily starts left aligning buttons when all other buttons so far have been right aligned:
image

Its also a bit weird that only this interface has it as a separate section whereas the other interface has it just as a button in the main section. I'd be inclined to say that it should appear as a separate section for the other interface, but this isn't a big deal.

Vent selection has tooltipPosition left as auto so the tooltip frequently changes where it wants to place itself - just pick a direction and it will be fine. I also would recommend listing these out or at the bare minimum find a fixed with you're happy with so they don't constantly move around as you click to confirm them.

vent

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Apr 7, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Apr 7, 2024
@cm13-github
Copy link
Contributor

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

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

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Apr 16, 2024
@cm13-github
Copy link
Contributor

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

@realforest2001 realforest2001 marked this pull request as ready for review April 16, 2024 16:13
Drulikar
Drulikar requested changes Apr 16, 2024
View reviewed changes
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

UI issues appear to be resolved. Just a couple minor refactoring things that should better future proof things.

code/game/machinery/ARES/ARES_interface_admin.dm Outdated Show resolved Hide resolved
code/game/machinery/ARES/ARES_interface_admin.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar added this pull request to the merge queue Apr 16, 2024
Merged via the queue into cmss13-devs:master with commit a94a1f8 Apr 16, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Apr 16, 2024
@cm13-github
Automatic changelog for PR #5643 [ci skip]
4d9c9e9
@realforest2001 realforest2001 deleted the project/ares/gascontrol branch May 10, 2024 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Drulikar Drulikar Drulikar approved these changes

@Nanu308 Nanu308 Nanu308 approved these changes

@harryob harryob Awaiting requested review from harryob

Assignees
No one assigned
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Stale Exempt PR can't go stale UI deletes nanoui/html
Projects
None yet
Milestone
Project ARES
Development

Successfully merging this pull request may close these issues.
5 participants
@realforest2001 @cm13-github @Drulikar @harryob @Nanu308