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.

Sign up for GitHub

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

Jump to bottom

Hopefully fixes hijack bug #5261

Merged
merged 3 commits into from
Dec 21, 2023
Merged

Hopefully fixes hijack bug #5261

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70c99d2
hope
realforest2001 Dec 20, 2023
95a804b
hijack fix?
realforest2001 Dec 20, 2023
ced41c5
x
realforest2001 Dec 20, 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
1 change: 1 addition & 0 deletions code/__DEFINES/dcs/signals/signals_global.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,4 @@
#define COMSIG_GLOB_GENERATOR_SET_OVERLOADING "!generator_set_overloading"

#define COMSIG_GLOB_HIJACK_IMPACTED "!hijack_impacted"
#define COMSIG_GLOB_HIJACK_LANDED "!hijack_landed"
2 changes: 2 additions & 0 deletions code/controllers/subsystem/ticker.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,8 @@ SUBSYSTEM_DEF(ticker)

winset(C, null, "mainwindow.icon=[SSticker.mode.taskbar_icon]")

/datum/controller/subsystem/ticker/proc/hijack_wait()
addtimer(CALLBACK(SSticker, PROC_REF(hijack_ocurred)), 20 SECONDS)
realforest2001 marked this conversation as resolved.
Show resolved Hide resolved

/datum/controller/subsystem/ticker/proc/hijack_ocurred()
if(mode)
Expand Down
2 changes: 2 additions & 0 deletions code/modules/shuttle/dropship_hijack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
// Break the ultra-reinforced windows.
// Break the briefing windows.
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_HIJACK_IMPACTED)
RegisterSignal(SSdcs, COMSIG_GLOB_HIJACK_LANDED, PROC_REF(finish_landing))

// Sleep while the explosions do their job
var/explosion_alive = TRUE
Expand All @@ -62,6 +63,7 @@
break
sleep(10)

/datum/dropship_hijack/almayer/proc/finish_landing()
SShijack.announce_status_on_crash()
SSticker.hijack_ocurred()

Expand Down
1 change: 1 addition & 0 deletions code/modules/shuttle/shuttles/dropship.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@
affected_mob.apply_effect(3, WEAKEN)

SEND_GLOBAL_SIGNAL(COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING)
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_HIJACK_LANDED)

/datum/map_template/shuttle/alamo
name = "Alamo"
Expand Down
Loading