Skip to content

Commit

Permalink
Queen Maturity Timer (#6585)
Browse files Browse the repository at this point in the history
# About the pull request

I don't remember very good, but in game still exist forever at 1m timer
of queen maturity, now it's viewing seconds too and stop showing it'self
when you reach mature stage on queen

# Changelog

:cl: BlackCrystalic
fix: Queen maturity timer
/:cl:

---------

Co-authored-by: Deleted user <ghost>
  • Loading branch information
blackcrystall authored Jul 21, 2024
1 parent d4dcf8a commit c8efd81
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,9 @@

/mob/living/carbon/xenomorph/queen/proc/make_combat_effective()
queen_aged = TRUE
if(queen_age_timer_id != TIMER_ID_NULL)
deltimer(queen_age_timer_id)
queen_age_timer_id = TIMER_ID_NULL

give_combat_abilities()
recalculate_actions()
Expand Down Expand Up @@ -545,9 +548,8 @@

. += "Pooled Larvae: [stored_larvae]"
. += "Leaders: [xeno_leader_num] / [hive?.queen_leader_limit]"
if(queen_age_timer_id != TIMER_ID_NULL)
var/time_left = time2text(timeleft(queen_age_timer_id) + 1 MINUTES, "mm") // We add a minute so that it basically ceilings the value.
. += "Maturity: [time_left == 1? "[time_left] minute" : "[time_left] minutes"] remaining"
if(!queen_aged && queen_age_timer_id != TIMER_ID_NULL)
. += "Maturity: [time2text(timeleft(queen_age_timer_id), "mm:ss")] remaining"

/mob/living/carbon/xenomorph/queen/proc/set_orders()
set category = "Alien"
Expand Down

0 comments on commit c8efd81

Please sign in to comment.