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

Hijack Objectives & Self Destruct #4699

Merged
merged 30 commits into from
Nov 6, 2023

Conversation

Zonespace27
Copy link
Contributor

@Zonespace27 Zonespace27 commented Oct 16, 2023

About the pull request

This PR adds hijack objectives to be held for lifeboats to safely launch and lifepods to have a better chance not to crash.

These objectives are currently:
https://cdn.discordapp.com/attachments/604397850675380234/1150809693556592711/image.png

This PR removes the auto launch of lifepods/boats after 10 minutes

This PR adds red alert sentries at fuel pumps

This PR adds Corporate liaison evac shuttle now can be launched at any time even if evac has not been called

This PR kills EvacuationAuthority

This PR adds an optional self destruct method once fuel is at 100%. Should the marines be confident in their hold, they can move to engineering and hold it for 5-15 minutes (time dependent on how many fusion reactors are overloaded, use a multitiool on them to do so) to manually melt down the fusion reactors, detonating the accumulated fuel and acting as a self destruct.

Explain why it's good for the game

Hijack is stale, let's work on making it not stale.

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑 Morrow, Zonespace
add: Added objectives to hijack. You now must hold different sections of the ship to successfully launch lifeboats or pods
add: The areas that contribute to hijack objectives are the lifeboat pumps, astronav, and engineering
add: Fuel pumps now have red alert sentries
add: Corporate liaison evac shuttle now can be launched at any time even if evac has not been called
add: You can now self-destruct the ship by overloading the fusion generators in engineering once lifeboat fuel is at 100%.
del: Removed auto launch of lifeboats and pods
code: Refactored EvacuationAuthority into SShijack
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? UI deletes nanoui/html Feature Feature coder badge labels Oct 16, 2023
@Zonespace27 Zonespace27 added Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Testmerge Candidate we'll test this while you're asleep and the server has 10 players Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Sprites Remove the soul from the game. UI deletes nanoui/html Mapping did you remember to save in tgm format? and removed Sprites Remove the soul from the game. UI deletes nanoui/html Mapping did you remember to save in tgm format? labels Oct 16, 2023
@Zonespace27 Zonespace27 requested a review from fira October 30, 2023 02:46
Copy link
Member

@fira fira left a comment

Choose a reason for hiding this comment

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

Re Went through everything, just one minor thing but looking good to me 👍

code/game/machinery/fusion_engine.dm Outdated Show resolved Hide resolved
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 3, 2023
@cm13-github
Copy link
Contributor

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

@Zonespace27 Zonespace27 marked this pull request as ready for review November 6, 2023 06:07
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 6, 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.

lgtm

@harryob harryob added this pull request to the merge queue Nov 6, 2023
Merged via the queue into cmss13-devs:master with commit 0991f38 Nov 6, 2023
27 checks passed
cm13-github added a commit that referenced this pull request Nov 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Mapping did you remember to save in tgm format? Sprites Remove the soul from the game. Testmerge Candidate we'll test this while you're asleep and the server has 10 players UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants