Skip to content

Commit

Permalink
Hijack Objectives & Self Destruct (#4699)
Browse files Browse the repository at this point in the history
# 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
<details>
<summary>Screenshots & Videos</summary>

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

</details>


# Changelog

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

---------

Co-authored-by: Morrow <[email protected]>
Co-authored-by: fira <[email protected]>
  • Loading branch information
3 people committed Nov 6, 2023
1 parent fcac33e commit 0991f38
Show file tree
Hide file tree
Showing 42 changed files with 1,681 additions and 1,570 deletions.
2 changes: 2 additions & 0 deletions code/__DEFINES/atmospherics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

#define T0C 273.15 // 0degC
#define T20C 293.15 // 20degC
#define T90C 363.15 // 90degC
#define T120C 393.15 // 120degC
#define TCMB 2.7 // -270.3degC
#define ICE_COLONY_TEMPERATURE 223 //-50degC
#define SOROKYNE_TEMPERATURE 223 // Same as Ice for now
Expand Down
9 changes: 6 additions & 3 deletions code/__DEFINES/dcs/signals/signals_global.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,11 @@
#define COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING "!groundside_forsaken_handling"

/// From
#define COMSIG_GLOB_YAUTJA_ARMORY_OPENED "yautja_armory_opened"
#define COMSIG_GLOB_YAUTJA_ARMORY_OPENED "!yautja_armory_opened"

/// From /proc/biohazard_lockdown()
#define COMSIG_GLOB_RESEARCH_LOCKDOWN "research_lockdown_closed"
#define COMSIG_GLOB_RESEARCH_LIFT "research_lockdown_opened"
#define COMSIG_GLOB_RESEARCH_LOCKDOWN "!research_lockdown_closed"
#define COMSIG_GLOB_RESEARCH_LIFT "!research_lockdown_opened"

/// From /obj/structure/machinery/power/fusion_engine/proc/set_overloading() : (set_overloading)
#define COMSIG_GLOB_GENERATOR_SET_OVERLOADING "!generator_set_overloading"
13 changes: 13 additions & 0 deletions code/__DEFINES/hijack.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#define EVACUATION_TYPE_NONE 0
#define EVACUATION_TYPE_ADDITIVE 1
#define EVACUATION_TYPE_MULTIPLICATIVE 2

#define HIJACK_ANNOUNCE "ARES Emergency Procedures"
#define XENO_HIJACK_ANNOUNCE "You sense something unusual..."

#define EVACUATION_STATUS_NOT_INITIATED 0
#define EVACUATION_STATUS_INITIATED 1

#define HIJACK_OBJECTIVES_NOT_STARTED 0
#define HIJACK_OBJECTIVES_STARTED 1
#define HIJACK_OBJECTIVES_COMPLETE 2
2 changes: 2 additions & 0 deletions code/__DEFINES/subsystems.dm
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
#define SS_INIT_INFLUXDRIVER 28
#define SS_INIT_GARBAGE 24
#define SS_INIT_EVENTS 23.5
#define SS_INIT_HIJACK 22.6
#define SS_INIT_REDIS 22.5
#define SS_INIT_REAGENTS 22.1
#define SS_INIT_MAPPING 22
Expand Down Expand Up @@ -177,6 +178,7 @@
#define SS_PRIORITY_FAST_OBJECTS 105
#define SS_PRIORITY_OBJECTS 104
#define SS_PRIORITY_DECORATOR 99
#define SS_PRIORITY_HIJACK 97
#define SS_PRIORITY_POWER 95
#define SS_PRIORITY_EFFECTS 92
#define SS_PRIORITY_MACHINERY 90
Expand Down
Loading

0 comments on commit 0991f38

Please sign in to comment.