-
Notifications
You must be signed in to change notification settings - Fork 522
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# About the pull request Overhauls ARES and makes it actually feel like a part of the ship and not a square box. Adds individual processors for different ARES systems that interact with oneanother to produce the same effects as we normally have. Bioscans require the bioscan processor to be functional, however will not broadcast if the interface processor is not functioning. The interface processor handles ARES communications (excluding Apollo) and is chiefly responsible for logging things to the ARES Console. This console can be used to review logs of all ARES' messages/announcements, Bioscans, the Apollo Link logs etc. <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> # Explain why it's good for the game Adds a little immersion and use for ARES. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: add: Added an admin button for an ARES bioscan. Slightly refactored how Bioscans trigger for marines, relying on an ARES processor. add: Added individual proccessors for ARES systems. These are WIP and will eventually have damage and repair interactions. add: Added an ARES interaction console in the AI Core room, which holds logs for most ARES functions. add: Added the ability for ARES console to call ERT or Distress. add: Added motion triggers in ARES core and shipside comms that send alerts over Apollo. add: Added a 1to1 conversation feature between ARES and users of the interface console. add: Added preset open versions of blended poddoors. add: Added a console for directing Working Joes. This is largely WIP for future PR(s). add: Added subtypes of air pipes that don't explode on hijack, used these in ARES core. maptweak: Remodelled ARES Core onto a fake-z, and added the new processors. fix: door_control buttons now respect being indestructable when processing explosions. maptweak: Fixed the M39s overflowing in brig armory due to use of landmarks. /:cl: --------- Co-authored-by: harryob <[email protected]>
- Loading branch information
1 parent
86a1e10
commit 9dd2c0d
Showing
65 changed files
with
7,588 additions
and
2,076 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/// Generic access for 1:1 conversations with ARES and unrestricted commands. | ||
#define ARES_ACCESS_BASIC 0 | ||
/// Secure Access, can read ARES Announcements and Bioscans. | ||
#define ARES_ACCESS_COMMAND 1 | ||
#define ARES_ACCESS_JOE 2 | ||
/// CL, can read Apollo Log and also Delete Announcements. | ||
#define ARES_ACCESS_CORPORATE 3 | ||
/// Senior Command, can Delete Bioscans. | ||
#define ARES_ACCESS_SENIOR 4 | ||
/// Synth, CE & Commanding Officer, can read the access log. | ||
#define ARES_ACCESS_CE 5 | ||
#define ARES_ACCESS_SYNTH 6 | ||
#define ARES_ACCESS_CO 7 | ||
/// High Command, can read the deletion log. | ||
#define ARES_ACCESS_HIGH 8 | ||
#define ARES_ACCESS_WY_COMMAND 9 | ||
/// Debugging. Allows me to view everything without using a high command rank. Unlikely to stay in a full merge. | ||
#define ARES_ACCESS_DEBUG 10 | ||
|
||
#define ARES_RECORD_ANNOUNCE "Announcement Record" | ||
#define ARES_RECORD_ANTIAIR "AntiAir Control Log" | ||
#define ARES_RECORD_ASRS "Requisition Record" | ||
#define ARES_RECORD_BIOSCAN "Bioscan Record" | ||
#define ARES_RECORD_BOMB "Orbital Bombardment Record" | ||
#define ARES_RECORD_DELETED "Deleted Record" | ||
#define ARES_RECORD_SECURITY "Security Update" | ||
#define ARES_RECORD_MAINTENANCE "Maintenance Ticket" | ||
#define ARES_RECORD_ACCESS "Access Ticket" | ||
|
||
/// Not by ARES logged through marine_announcement() | ||
#define ARES_LOG_NONE 0 | ||
/// Logged with all announcements | ||
#define ARES_LOG_MAIN 1 | ||
/// Logged in the security updates | ||
#define ARES_LOG_SECURITY 2 | ||
|
||
/// Access levels specifically for Working Joe management console | ||
#define APOLLO_ACCESS_REQUEST 0 | ||
#define APOLLO_ACCESS_REPORTER 1 | ||
#define APOLLO_ACCESS_TEMP 2 | ||
#define APOLLO_ACCESS_AUTHED 3 | ||
#define APOLLO_ACCESS_JOE 4 | ||
#define APOLLO_ACCESS_DEBUG 5 | ||
|
||
/// Ticket statuses, both for Access and Maintenance | ||
#define TICKET_PENDING "pending" | ||
#define TICKET_ASSIGNED "assigned" | ||
#define TICKET_REJECTED "rejected" | ||
#define TICKET_CANCELLED "cancelled" | ||
#define TICKET_COMPLETED "complete" | ||
|
||
/// Cooldowns | ||
#define COOLDOWN_ARES_SENSOR 60 SECONDS | ||
#define COOLDOWN_ARES_ACCESS_CONTROL 20 SECONDS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.