From 8ac1a1f8bb5229fdbca2dd06d9de17fa4b109b94 Mon Sep 17 00:00:00 2001 From: GrrrKitten Date: Fri, 9 Feb 2024 18:20:59 -0500 Subject: [PATCH 1/3] Standardizes lesser and hugger respawn to 1 minute --- code/__DEFINES/xeno.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm index 2761bc12acf0..ade33244cf5b 100644 --- a/code/__DEFINES/xeno.dm +++ b/code/__DEFINES/xeno.dm @@ -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 SECONDS) From 25203fe2bfc26b1cf3e621a06ec81e6c7b7f9487 Mon Sep 17 00:00:00 2001 From: GrrrKitten Date: Fri, 9 Feb 2024 19:01:17 -0500 Subject: [PATCH 2/3] fixes typo 1 seconds -> 1 minutes --- code/__DEFINES/xeno.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm index ade33244cf5b..e78a14a8d8b4 100644 --- a/code/__DEFINES/xeno.dm +++ b/code/__DEFINES/xeno.dm @@ -720,4 +720,4 @@ #define FRENZY_DAMAGE_MULTIPLIER 2 #define JOIN_AS_FACEHUGGER_DELAY (1 MINUTES) -#define JOIN_AS_LESSER_DRONE_DELAY (1 SECONDS) +#define JOIN_AS_LESSER_DRONE_DELAY (1 MINUTES) From 7aa4b82f684bf3a68b2bf2286c4886cc13bd003c Mon Sep 17 00:00:00 2001 From: GrrrKitten Date: Fri, 9 Feb 2024 19:01:43 -0500 Subject: [PATCH 3/3] makes respawn messages use the new time for lessers/huggers --- code/modules/mob/living/carbon/xenomorph/hive_status.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status.dm b/code/modules/mob/living/carbon/xenomorph/hive_status.dm index bb67eaa055a8..543d0fd26335 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_status.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_status.dm @@ -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).")) + 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 @@ -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).")) return FALSE if(totalXenos.len <= 0)