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

Project ARES - Resurrection #3298

Merged
merged 54 commits into from
Jun 28, 2023
Merged

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented May 11, 2023

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.

Explain why it's good for the game

Adds a little immersion and use for ARES.

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 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:

@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Feature Feature coder badge labels May 11, 2023
@realforest2001 realforest2001 marked this pull request as draft May 11, 2023 23:54
@realforest2001 realforest2001 marked this pull request as ready for review May 12, 2023 00:00
@Drulikar
Copy link
Contributor

The linter does not like the order of includes. Should be in alphabetical order but it might be inconsistent with symbols.

The include at line 723 is out of order (#include "code\game\machinery\ARES_ARES_defines.dm", expected #include "code\game\machinery\autolathe.dm")

@realforest2001 realforest2001 marked this pull request as draft May 12, 2023 00:12
@realforest2001
Copy link
Member Author

The linter does not like the order of includes. Should be in alphabetical order but it might be inconsistent with symbols.

The include at line 723 is out of order (#include "code\game\machinery\ARES_ARES_defines.dm", expected #include "code\game\machinery\autolathe.dm")

Noticed. It doesn't like folders, puts them after non-foldered stuff.

@Drulikar
Copy link
Contributor

Drulikar commented May 12, 2023

The hard deletes are just a random occurrence until we figure out what nightmare inserts (I assume) trigger them. Should be unrelated to this PR. Will have that one re-run.

Edit: Seems related, but not sure why only on one map.

Running this map locally, at roundstart there is a missing nightmare insert:
image
Would be weird to cause specifically your new ares structures to hard delete though.

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.

Nothing else sticks out to me just reading the code.

code/defines/procs/announcement.dm Outdated Show resolved Hide resolved
code/game/machinery/ARES/ARES_procs.dm Show resolved Hide resolved
code/game/machinery/ARES/ARES.dm Outdated Show resolved Hide resolved
code/game/machinery/ARES/ARES.dm Show resolved Hide resolved
code/game/machinery/ARES/ARES.dm Show resolved Hide resolved
@realforest2001
Copy link
Member Author

The hard deletes are just a random occurrence until we figure out what nightmare inserts (I assume) trigger them. Should be unrelated to this PR. Will have that one re-run.

Edit: Seems related, but not sure why only on one map.

Running this map locally, at roundstart there is a missing nightmare insert: image Would be weird to cause specifically your new ares structures to hard delete though.

I have no idea why this is unhappy with me, it appears to me that the nightmare insert is gone entirely?

@Drulikar
Copy link
Contributor

I have no idea why this is unhappy with me, it appears to me that the nightmare insert is gone entirely?

Yeah, I am addressing it in #3305 so I wouldn't worry about it here. Only if your ares structures still are showing up as problems.

@realforest2001 realforest2001 force-pushed the project/ARES branch 2 times, most recently from 224b6fa to 1c7c6da Compare May 14, 2023 18:33
@I3LiP
Copy link
Contributor

I3LiP commented May 15, 2023

Generally I really like this, especially being able to go back and review the logs.

However I'm not too sure about the ARES Core remodel and the way it janks the (less than a week old) IO area.

Am happy to contribute some designs if you would like.

@Chrismmar Chrismmar mentioned this pull request Jun 27, 2023
3 tasks
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jun 28, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jun 28, 2023
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.

get out of my tracker

Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

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

sprites are pretty straightforward and look good to me

approved!

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Jun 28, 2023
@harryob harryob added this pull request to the merge queue Jun 28, 2023
Merged via the queue into cmss13-devs:master with commit 9dd2c0d Jun 28, 2023
27 checks passed
cm13-github added a commit that referenced this pull request Jun 28, 2023
github-actions bot added a commit that referenced this pull request Jun 28, 2023
@Watermelon914 Watermelon914 added this to the Project ARES milestone Jul 4, 2023
@realforest2001 realforest2001 deleted the project/ARES branch July 10, 2023 18:12
github-merge-queue bot pushed a commit that referenced this pull request Jul 24, 2023
# About the pull request
Further to #3298 develops the Apollo Maintenance Controller to be
functional properly.
At present it only functions for maintenance tickets, but will
eventually allow for proper use of access tickets, and remote access of
the console by working joes (hopefully)
<!-- 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
# 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: Adds functional maintenance ticket control to the Apollo Console
add: Adds a unique ID system for each ticket. Credit to Ben10083 for the
idea.
add: Adds procs for vents to spew gas within a radius. Not currently
usable without proccall.
code: Starts work on Access Tickets.
code: START of contribs from Ben10083 
add: ARES now announces when Bioscan fails.
code: new procs to see if ARES can talk, or log something. Bioscan proc
renamed for consistency.
admin: Admins can now force an ARES announcement or communication if
subsystem is offline.
add: new emergency protocol from ARES; call General Quarters, which sets
the ship to immediate Red Alert.
add: New APOLLO maintenance ticket categories; Janitorial and Support.
Fire now a priority ticket
qol: Claimed APOLLO tickets can be unclaimed
qol: APOLLO tickets can be rejected/completed if unclaimed by any
Working Joe
code: END of contribs from Ben10083
/:cl:

---------

Co-authored-by: Ben10083 <[email protected]>
Co-authored-by: Ben <[email protected]>
Co-authored-by: harryob <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game. Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Development

Successfully merging this pull request may close these issues.