Skip to content

Commit

Permalink
Hopefully fixes hijack bug (#5261)
Browse files Browse the repository at this point in the history
# About the pull request
Will hopefully stop hijack ending the round prematurely.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
# 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:
fix: Hijack should no longer end the round immediately.
/:cl:
  • Loading branch information
realforest2001 authored Dec 21, 2023
1 parent 3b493e3 commit d00463b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions code/__DEFINES/dcs/signals/signals_global.dm
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"
1 change: 0 additions & 1 deletion code/controllers/subsystem/ticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,6 @@ SUBSYSTEM_DEF(ticker)

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


/datum/controller/subsystem/ticker/proc/hijack_ocurred()
if(mode)
mode.is_in_endgame = TRUE
Expand Down
2 changes: 2 additions & 0 deletions code/modules/shuttle/dropship_hijack.dm
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
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

0 comments on commit d00463b

Please sign in to comment.