Skip to content

Commit

Permalink
hot fix (#115)
Browse files Browse the repository at this point in the history
  • Loading branch information
homexp13 authored Aug 24, 2024
1 parent 084d8c3 commit 89f61eb
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions code/modules/shuttle/marine_dropship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -439,9 +439,6 @@
if(D.mode != SHUTTLE_IDLE && D.mode != SHUTTLE_RECHARGING)
to_chat(user, span_warning("The bird's mind is currently active. We need to wait until it's more vulnerable..."))
return FALSE
var/datum/game_mode/infestation/distress/points_defence/mode = SSticker.mode
if(mode.allow_hijack())
return TRUE
var/list/living_player_list = count_humans_and_xenos(SSmapping.levels_by_any_trait(list(ZTRAIT_GROUND)), COUNT_IGNORE_ALIVE_SSD)
if(length_char(GLOB.alive_human_list) && ((living_player_list[1] / length_char(GLOB.alive_human_list)) > ALIVE_HUMANS_FOR_CALLDOWN))
to_chat(user, span_warning("There's too many tallhosts still on the ground. They interfere with our psychic field. We must dispatch them before we are able to do this."))
Expand Down Expand Up @@ -697,8 +694,7 @@
to_chat(X, span_warning("Our hive lacks the psychic prowess to hijack the bird."))
return
var/list/living_player_list = SSticker.mode.count_humans_and_xenos(list(X.z), COUNT_IGNORE_ALIVE_SSD)
var/datum/game_mode/infestation/distress/points_defence/mode = SSticker.mode
if(living_player_list[1] > 5 || mode.allow_hijack())
if(living_player_list[1] > 5)
to_chat(X, span_xenowarning("There is still prey left to hunt!"))
return
switch(M.mode)
Expand All @@ -719,8 +715,7 @@

if(href_list["abduct"])
var/list/living_player_list = SSticker.mode.count_humans_and_xenos(list(X.z), COUNT_IGNORE_ALIVE_SSD)
var/datum/game_mode/infestation/distress/points_defence/mode = SSticker.mode
if(living_player_list[1] > 5 || mode.allow_hijack())
if(living_player_list[1] > 5)
to_chat(X, span_xenowarning("There is still prey left to hunt!"))
return

Expand Down

0 comments on commit 89f61eb

Please sign in to comment.