Skip to content

Commit

Permalink
[MIRROR] Fugitive Hunters can spawn early if emergency shuttle is cal…
Browse files Browse the repository at this point in the history
…led (#2164)

* Fugitive Hunters can spawn early if emergency shuttle is called (#81612)

## About The Pull Request
In the event of a shuttle call, fugitive hunters will spawn early.
(Hunters will still spawn 10 minutes after the fugitives if the shuttle
is idle)
## Why It's Good For The Game
Hunters are currently able to spawn way too late to ever have a chance
to interact with the fugitives, this is lame for both parties involved.
## Changelog
:cl: PapaMichael
balance: Fugitive hunters will spawn early if the emergency shuttle is
called.
/:cl:

* Fugitive Hunters can spawn early if emergency shuttle is called

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: PapaMichael <[email protected]>
  • Loading branch information
3 people authored Feb 29, 2024
1 parent 6e7ab31 commit 7f83a81
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions code/modules/events/ghost_role/fugitive_event.dm
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
HUNTER_PACK_BOUNTY,
HUNTER_PACK_PSYKER,
)
addtimer(CALLBACK(src, PROC_REF(spawn_hunters), hunter_backstory), 10 MINUTES)
addtimer(CALLBACK(src, PROC_REF(check_spawn_hunters), hunter_backstory, 10 MINUTES), 1 MINUTES)
role_name = "fugitive hunter"
return SUCCESSFUL_SPAWN

Expand Down Expand Up @@ -103,7 +103,13 @@
S.put_in_hands(A)
new /obj/item/autosurgeon(landing_turf)

//security team gets called in after 10 minutes of prep to find the refugees
/datum/round_event/ghost_role/fugitives/proc/check_spawn_hunters(backstory, remaining_time)
//if the emergency shuttle has been called, spawn hunters now to give them a chance
if(remaining_time == 0 || SSshuttle.emergency.mode != EMERGENCY_IDLE_OR_RECALLED)
spawn_hunters(backstory)
return
addtimer(CALLBACK(src, PROC_REF(check_spawn_hunters), backstory, remaining_time - 1 MINUTES), 1 MINUTES)

/datum/round_event/ghost_role/fugitives/proc/spawn_hunters(backstory)
var/list/candidates = SSpolling.poll_ghost_candidates("Do you wish to be considered for a group of [backstory]?", check_jobban = ROLE_FUGITIVE_HUNTER, pic_source = /obj/machinery/sleeper, role_name_text = backstory)
shuffle_inplace(candidates)
Expand Down

0 comments on commit 7f83a81

Please sign in to comment.