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

Disables marine joins after hijack #3689

Closed
wants to merge 2 commits into from
Closed

Disables marine joins after hijack #3689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a1fea0
stops latejoining after hijack
realforest2001 Jun 21, 2023
384173a
x
realforest2001 Jun 25, 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/controllers/subsystem/ticker.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,3 +486,4 @@ SUBSYSTEM_DEF(ticker)
if(mode)
mode.is_in_endgame = TRUE
mode.force_end_at = (world.time + 25 MINUTES)
enter_allowed = FALSE
9 changes: 2 additions & 7 deletions code/modules/shuttle/dropship_hijack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,6 @@

addtimer(CALLBACK(src, PROC_REF(do_dropship_incoming_sound)), 13 SECONDS)

addtimer(CALLBACK(src, PROC_REF(disable_latejoin)), 3 MINUTES) // latejoin cryorines have 3 minutes to get the hell out

/datum/dropship_hijack/almayer/proc/do_dropship_incoming_sound()
for(var/area/internal_area in shuttle.shuttle_areas)
playsound_area(internal_area, 'sound/effects/dropship_incoming.ogg', vol = 75)
Expand All @@ -165,11 +163,8 @@
/datum/dropship_hijack/almayer/proc/do_dropship_collision_sound()
playsound_z(SSmapping.levels_by_any_trait(list(ZTRAIT_MARINE_MAIN_SHIP)), 'sound/effects/dropship_crash.ogg', volume = 75)

/datum/dropship_hijack/almayer/proc/disable_latejoin()
enter_allowed = FALSE

/datum/dropship_hijack/almayer/proc/get_crashsite_turf(ship_section)
var/list/turfs = list()
/datum/dropship_hijack/almayer/proc/get_crashsite_area(ship_section)
Copy link
Contributor

Choose a reason for hiding this comment

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

You are currently reverting a change to a renamed proc here.

Copy link
Contributor

@Drulikar Drulikar Jun 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Same as the first var inside; I recommend dealing with conflicts with a 3 way merge tool (vsc supports this if you configure it) so you can view local, remote, and still have a panel to manually write changes that would combine the two blocks.

var/list/areas = list()
switch(ship_section)
if("Upper deck Foreship")
turfs += get_area_turfs(/area/almayer/shipboard/brig/armory)
Expand Down
5 changes: 1 addition & 4 deletions code/modules/shuttles/marine_ferry.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@
shake_camera(affected_mob, 10, 1)
affected_mob.apply_effect(3, WEAKEN)

addtimer(CALLBACK(src, PROC_REF(disable_latejoin)), 3 MINUTES) // latejoin cryorines have 3 minutes to get the hell out
enter_allowed = FALSE

var/list/turfs_trg = get_shuttle_turfs(T_trg, info_datums) //Final destination turfs <insert bad jokey reference here>

Expand Down Expand Up @@ -555,9 +555,6 @@
var/datum/game_mode/colonialmarines/colonial_marines = SSticker.mode
colonial_marines.add_current_round_status_to_end_results("Hijack")

/datum/shuttle/ferry/marine/proc/disable_latejoin()
enter_allowed = FALSE


/datum/shuttle/ferry/marine/short_jump()

Expand Down