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

Queen Maturity Timer #6585

Merged
merged 12 commits into from
Jul 21, 2024
Merged

Queen Maturity Timer #6585

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e39130a
uh oh
blackcrystall Jun 28, 2024
5b88dad
seconds
blackcrystall Jun 28, 2024
8e8e67e
fix
blackcrystall Jun 28, 2024
9db61dd
text grammar
blackcrystall Jun 28, 2024
6b532ce
skill issue
blackcrystall Jun 28, 2024
e0baefd
Merge branch 'master' into queen_fix
blackcrystall Jul 8, 2024
24db0f0
f
Jul 19, 2024
65f6d28
Merge branch 'master' into queen_fix
blackcrystall Jul 19, 2024
8631da9
а
Jul 20, 2024
1da79f4
Revert "а"
Jul 20, 2024
a31fc8a
I have no idea what different here
Jul 20, 2024
2cbd3a8
Merge branch 'master' into queen_fix
blackcrystall Jul 20, 2024
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
8 changes: 5 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
View file
Open in desktop
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
Loading