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 #4391

Closed
wants to merge 14 commits into from
Closed

Conversation

morrowwolf
Copy link
Member

@morrowwolf morrowwolf commented Sep 11, 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 will eventually add an optional second phase of the hijack objectives that allows an attempt at 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
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
del: Removed auto launch of lifeboats and pods
code: Refactored EvacuationAuthority into SShijack
/:cl:

@github-actions github-actions bot added Feature Feature coder badge Removal snap Code Improvement Make the code longer labels Sep 11, 2023
@morrowwolf morrowwolf added the Work in Progress Will never be finished label Sep 11, 2023
code/controllers/subsystem/hijack.dm Outdated Show resolved Hide resolved
code/controllers/subsystem/hijack.dm Outdated Show resolved Hide resolved
code/controllers/subsystem/hijack.dm Outdated Show resolved Hide resolved
code/game/gamemodes/extended/infection.dm Outdated Show resolved Hide resolved
code/modules/admin/player_panel/player_panel.dm Outdated Show resolved Hide resolved
code/modules/mob/new_player/new_player.dm Outdated Show resolved Hide resolved
@harry3124

This comment was marked as off-topic.

@ghost

This comment was marked as off-topic.

Comment on lines +17 to +20
name = "Hijack"
wait = 2 SECONDS
flags = SS_NO_INIT | SS_KEEP_TIMING
priority = SS_PRIORITY_HIJACK
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
name = "Hijack"
wait = 2 SECONDS
flags = SS_NO_INIT | SS_KEEP_TIMING
priority = SS_PRIORITY_HIJACK
name = "Hijack"
wait = 2 SECONDS
flags = SS_NO_INIT | SS_KEEP_TIMING
priority = SS_PRIORITY_HIJACK

var/evac_admin_denied = FALSE

///Whether or not self destruct has been disabled by admins
//var/evac_self_destruct_denied = FALSE // Re-enable for SD stuff - Morrow
Copy link
Member

Choose a reason for hiding this comment

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

squint

To do:

Self destruct code
Thinking something like finish main objectives and then can blow fuel resevoir as a "self destruct" via engineering and a hold
Copy link
Member

Choose a reason for hiding this comment

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

drafts are for wips !!!

@@ -43,6 +43,7 @@ Regardless of where it's detonated, or how, a successful detonation will end the
All of the necessary difines are stored under mode.dm in defines.
*/

/*
Copy link
Member

Choose a reason for hiding this comment

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

delete all this garbage when you're through with it

@@ -297,29 +297,25 @@
if(SSticker.current_state != GAME_STATE_PLAYING)
return

var/living_player_list[] = count_humans_and_xenos(EvacuationAuthority.get_affected_zlevels())
var/living_player_list[] = count_humans_and_xenos(get_affected_zlevels())
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
var/living_player_list[] = count_humans_and_xenos(get_affected_zlevels())
var/list/living_player_list = count_humans_and_xenos(get_affected_zlevels())

alive_mobs |= current_mob
shake_camera(current_mob, 110, 4)

for(var/mob/current_mob in alive_mobs)
Copy link
Member

Choose a reason for hiding this comment

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

as anything

continue
current_mob.death(create_cause_data("nuclear explosion"))

for(var/mob/current_mob in (alive_mobs + dead_mobs))
Copy link
Member

Choose a reason for hiding this comment

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

as anything

if(current_mob && current_mob.loc)
var/turf/current_mob_turf = get_turf(current_mob)
if(z == current_mob_turf.z)
if(istype(current_mob.loc, /obj/structure/closet/secure_closet/freezer/fridge))
Copy link
Member

Choose a reason for hiding this comment

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

we should remove this so people can cry soul removal

@@ -21,6 +22,9 @@ export const EscapePodConsole = (_props, context) => {
case 4:
statusMessage = 'NO EVACUATION';
buttonColor = 'neutral';
if (data.launch_without_evac) {
operable = 1;
Copy link
Member

Choose a reason for hiding this comment

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

not your fault but why are we using 0s and 1s as booleans as if this was DreamMaker

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Oct 4, 2023
@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 Oct 4, 2023
@cm13-github
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Feature Feature coder badge Removal snap Work in Progress Will never be finished
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants