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

Standardizes both Lesser Drone and Facehugger respawn times to 1 Minute #5691

Closed
wants to merge 3 commits into from
Closed

Standardizes both Lesser Drone and Facehugger respawn times to 1 Minute #5691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ac1a1f
Standardizes lesser and hugger respawn to 1 minute
GrrrKitten Feb 9, 2024
25203fe
fixes typo 1 seconds -> 1 minutes
GrrrKitten Feb 10, 2024
7aa4b82
makes respawn messages use the new time for lessers/huggers
GrrrKitten Feb 10, 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
4 changes: 2 additions & 2 deletions code/__DEFINES/xeno.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,5 +719,5 @@

#define FRENZY_DAMAGE_MULTIPLIER 2

#define JOIN_AS_FACEHUGGER_DELAY (3 MINUTES)
#define JOIN_AS_LESSER_DRONE_DELAY (30 SECONDS)
#define JOIN_AS_FACEHUGGER_DELAY (1 MINUTES)
#define JOIN_AS_LESSER_DRONE_DELAY (1 MINUTES)
Comment on lines +722 to +723
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am fine with an increased lesser drone delay.

I do not think we need to make face huggers spawn faster when they already can spawn instantly if they successfully hug.

4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/hive_status.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,7 @@
return FALSE
if(world.time - user.timeofdeath < JOIN_AS_FACEHUGGER_DELAY)
var/time_left = round((user.timeofdeath + JOIN_AS_FACEHUGGER_DELAY - world.time) / 10)
to_chat(user, SPAN_WARNING("You ghosted too recently. You cannot become a facehugger until 3 minutes have passed ([time_left] seconds remaining)."))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could the timer not be done as DisplayTimeText(JOIN_AS_FACEHUGGER_DELAY)?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for the lesser drone timer

to_chat(user, SPAN_WARNING("You ghosted too recently. You cannot become a facehugger until 1 minute has passed ([time_left] seconds remaining)."))
return FALSE
if(totalXenos.len <= 0)
//This is to prevent people from joining as Forsaken Huggers on the pred ship
Expand Down Expand Up @@ -911,7 +911,7 @@

if(world.time - user.timeofdeath < JOIN_AS_LESSER_DRONE_DELAY)
var/time_left = round((user.timeofdeath + JOIN_AS_LESSER_DRONE_DELAY - world.time) / 10)
to_chat(user, SPAN_WARNING("You ghosted too recently. You cannot become a lesser drone until 30 seconds have passed ([time_left] seconds remaining)."))
to_chat(user, SPAN_WARNING("You ghosted too recently. You cannot become a lesser drone until 1 minute has passed ([time_left] seconds remaining)."))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try using DisplayTimeText as Beagle had suggested.

return FALSE

if(totalXenos.len <= 0)
Expand Down
Loading