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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7f92d31
Initial, not complete
morrowwolf Sep 11, 2023
e38901b
Compiling, no SD stuff yet, needs tweaking, EvacAuthority is dead
morrowwolf Sep 11, 2023
4d9286b
Review 1
morrowwolf Sep 15, 2023
6dbc30e
Review 1-B
morrowwolf Sep 15, 2023
e163402
Alright first test time
morrowwolf Sep 15, 2023
263df75
announcement updates
morrowwolf Sep 16, 2023
b78f1be
Fuel pump sentries
morrowwolf Sep 18, 2023
ef25443
partial liaison changes
morrowwolf Sep 18, 2023
8865b2b
Merge remote-tracking branch 'upstream/master' into hijack-objectives
morrowwolf Sep 18, 2023
f55e0ba
Finish CL pod stuff
morrowwolf Sep 18, 2023
413ac67
Deployed turrets turn off without power
morrowwolf Sep 20, 2023
c34cb00
Merge remote-tracking branch 'upstream/master' into hijack-objectives
morrowwolf Sep 28, 2023
8b7381f
Merge remote-tracking branch 'upstream/master' into hijack-objectives
morrowwolf Oct 2, 2023
81b35ec
Merge remote-tracking branch 'upstream/master' into hijack-objectives
morrowwolf Oct 4, 2023
3ba8923
hijack p2
Zonespace27 Oct 16, 2023
d22e194
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into h…
Zonespace27 Oct 17, 2023
c8b5cb6
Update hijack.dm
Zonespace27 Oct 17, 2023
617653c
more changes
Zonespace27 Oct 17, 2023
88fbd69
Merge branch 'hijack-objectives-2' of https://github.com/Zonespace27/…
Zonespace27 Oct 17, 2023
4174ade
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into h…
Zonespace27 Oct 17, 2023
6d6c13b
okay i figured out why
Zonespace27 Oct 17, 2023
a5556c0
temp
Zonespace27 Oct 17, 2023
2827e03
overheat
Zonespace27 Oct 17, 2023
d80f3b2
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into h…
Zonespace27 Oct 20, 2023
78b7829
xenoes can slash reactors to stop overload
Zonespace27 Oct 25, 2023
910ec05
remove old SD bits
Zonespace27 Oct 30, 2023
0d54541
ARES announce
Zonespace27 Oct 30, 2023
e1c96d1
Update code/game/gamemodes/extended/infection.dm
Zonespace27 Oct 30, 2023
ab78b81
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into h…
Zonespace27 Nov 6, 2023
521dd23
inop
Zonespace27 Nov 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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