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

Locking Dropships now resets Ovipositor timer instead of after hijack. #6799

Closed
wants to merge 1 commit into from
Closed

Locking Dropships now resets Ovipositor timer instead of after hijack. #6799

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions code/modules/shuttle/computers/dropship_computer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,14 @@
set_lz_resin_allowed(TRUE)
stop_playing_launch_announcement_alarm()

var/hivenumber = XENO_HIVE_NORMAL
if(istype(xeno))
hivenumber = xeno.hivenumber
var/datum/hive_status/hive = GLOB.hive_datum[hivenumber]
if(hive.living_xeno_queen)
var/datum/action/xeno_action/onclick/grow_ovipositor/ovi_ability = get_action(hive.living_xeno_queen, /datum/action/xeno_action/onclick/grow_ovipositor)
ovi_ability.reduce_cooldown(ovi_ability.xeno_cooldown)

to_chat(xeno, SPAN_XENONOTICE("You override the doors."))
xeno_message(SPAN_XENOANNOUNCE("The doors of the metal bird have been overridden! Rejoice!"), 3, xeno.hivenumber)
message_admins("[key_name(xeno)] has locked the dropship '[dropship]'", xeno.x, xeno.y, xeno.z)
Expand Down Expand Up @@ -313,9 +321,6 @@
hive.abandon_on_hijack()
var/original_evilution = hive.evolution_bonus
hive.override_evilution(XENO_HIJACK_EVILUTION_BUFF, TRUE)
if(hive.living_xeno_queen)
var/datum/action/xeno_action/onclick/grow_ovipositor/ovi_ability = get_action(hive.living_xeno_queen, /datum/action/xeno_action/onclick/grow_ovipositor)
ovi_ability.reduce_cooldown(ovi_ability.xeno_cooldown)
addtimer(CALLBACK(hive, TYPE_PROC_REF(/datum/hive_status, override_evilution), original_evilution, FALSE), XENO_HIJACK_EVILUTION_TIME)

// Notify the yautja too so they stop the hunt
Expand Down
Loading