From ddaf5e02dd6a41526bca77b43691ba81dd86cbcb Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 10 Jul 2024 22:46:10 -0700 Subject: [PATCH 1/6] Update Embryo.dm --- code/modules/mob/living/carbon/xenomorph/Embryo.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm index d0890bd3cf37..eb65d171f00e 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -84,13 +84,13 @@ var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] //Low temperature seriously hampers larva growth (as in, way below livable), so does stasis if(!hive.hardcore) // Cannot progress if the hive has entered hardcore mode. - if(affected_mob.in_stasis || affected_mob.bodytemperature < 170) + if(affected_mob.in_stasis == STASIS_IN_CRYO_CELL) //cryotube in medical bay stops growth + return + else if(affected_mob.in_stasis || affected_mob.bodytemperature < 170) if(stage < 5) - counter += 0.33 * hive.larva_gestation_multiplier * delta_time + counter += 0.4 * hive.larva_gestation_multiplier * delta_time if(stage == 4) // Stasis affects late-stage less - counter += 0.11 * hive.larva_gestation_multiplier * delta_time - else if(HAS_TRAIT(affected_mob, TRAIT_NESTED)) //Hosts who are nested in resin nests provide an ideal setting, larva grows faster - counter += 1.5 * hive.larva_gestation_multiplier * delta_time //Currently twice as much, can be changed + counter += 0.2 * hive.larva_gestation_multiplier * delta_time else if(stage < 5) counter += 1 * hive.larva_gestation_multiplier * delta_time From d198717b393a796f6ba37e31e12214a43592e8a2 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 10 Jul 2024 22:54:30 -0700 Subject: [PATCH 2/6] Update Embryo.dm --- code/modules/mob/living/carbon/xenomorph/Embryo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm index eb65d171f00e..f95b9c5d47a9 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -90,7 +90,7 @@ if(stage < 5) counter += 0.4 * hive.larva_gestation_multiplier * delta_time if(stage == 4) // Stasis affects late-stage less - counter += 0.2 * hive.larva_gestation_multiplier * delta_time + counter += 0.04 * hive.larva_gestation_multiplier * delta_time else if(stage < 5) counter += 1 * hive.larva_gestation_multiplier * delta_time From d569076d939b617fe830925ae44837f038644a87 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 10 Jul 2024 23:28:06 -0700 Subject: [PATCH 3/6] cryo tube thing already exists in the code, woops --- code/modules/mob/living/carbon/xenomorph/Embryo.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm index f95b9c5d47a9..6c40f956b447 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -84,9 +84,7 @@ var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] //Low temperature seriously hampers larva growth (as in, way below livable), so does stasis if(!hive.hardcore) // Cannot progress if the hive has entered hardcore mode. - if(affected_mob.in_stasis == STASIS_IN_CRYO_CELL) //cryotube in medical bay stops growth - return - else if(affected_mob.in_stasis || affected_mob.bodytemperature < 170) + if(affected_mob.in_stasis || affected_mob.bodytemperature < 170) if(stage < 5) counter += 0.4 * hive.larva_gestation_multiplier * delta_time if(stage == 4) // Stasis affects late-stage less From 872008aefc84b3b76472008ac8c569b1d246a9bc Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sat, 13 Jul 2024 06:52:49 -0700 Subject: [PATCH 4/6] convert early stage damage/pain to knockdown to account for longer nested time --- code/modules/mob/living/carbon/xenomorph/Embryo.dm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm index 6c40f956b447..26cc165b75a5 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -104,12 +104,10 @@ if(2) if(prob(4)) if(!HAS_TRAIT(src, TRAIT_KNOCKEDOUT)) - affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) affected_mob.visible_message(SPAN_DANGER("[affected_mob] starts shaking uncontrollably!"), \ SPAN_DANGER("You feel something moving inside you! You start shaking uncontrollably!")) - affected_mob.apply_effect(1, PARALYZE) + affected_mob.apply_effect(3, PARALYZE) affected_mob.make_jittery(105) - affected_mob.take_limb_damage(1) if(prob(2)) var/message = SPAN_WARNING("[pick("Your chest hurts a little bit", "Your stomach hurts")].") to_chat(affected_mob, message) @@ -125,12 +123,10 @@ affected_mob.emote("[pick("sneeze", "cough")]") if(prob(5)) if(!HAS_TRAIT(src, TRAIT_KNOCKEDOUT)) - affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) affected_mob.visible_message(SPAN_DANGER("\The [affected_mob] starts shaking uncontrollably!"), \ SPAN_DANGER("You feel something moving inside you! You start shaking uncontrollably!")) - affected_mob.apply_effect(2, PARALYZE) + affected_mob.apply_effect(4, PARALYZE) affected_mob.make_jittery(105) - affected_mob.take_limb_damage(1) if(4) if(prob(2)) affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) @@ -144,7 +140,7 @@ affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) affected_mob.visible_message(SPAN_DANGER("[affected_mob] starts shaking uncontrollably!"), \ SPAN_DANGER("You feel something moving inside you! You start shaking uncontrollably!")) - affected_mob.apply_effect(3, PARALYZE) + affected_mob.apply_effect(5, PARALYZE) affected_mob.make_jittery(105) affected_mob.take_limb_damage(1) if(5) From 19488c60a27378a4f256d888ed2ad4afff5747d9 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:32:43 -0700 Subject: [PATCH 5/6] per review --- .../mob/living/carbon/xenomorph/Embryo.dm | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm index 26cc165b75a5..59e5934d8711 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -106,8 +106,11 @@ if(!HAS_TRAIT(src, TRAIT_KNOCKEDOUT)) affected_mob.visible_message(SPAN_DANGER("[affected_mob] starts shaking uncontrollably!"), \ SPAN_DANGER("You feel something moving inside you! You start shaking uncontrollably!")) - affected_mob.apply_effect(3, PARALYZE) + affected_mob.apply_effect(1, PARALYZE) affected_mob.make_jittery(105) + if(!HAS_TRAIT(affected_mob, TRAIT_NESTED)) + affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) + affected_mob.take_limb_damage(1) if(prob(2)) var/message = SPAN_WARNING("[pick("Your chest hurts a little bit", "Your stomach hurts")].") to_chat(affected_mob, message) @@ -117,7 +120,7 @@ to_chat(affected_mob, message) else if(prob(1)) to_chat(affected_mob, SPAN_WARNING("Your muscles ache.")) - if(prob(20)) + if((prob(20)) && (!HAS_TRAIT(affected_mob, TRAIT_NESTED))) affected_mob.take_limb_damage(1) else if(prob(2)) affected_mob.emote("[pick("sneeze", "cough")]") @@ -125,24 +128,29 @@ if(!HAS_TRAIT(src, TRAIT_KNOCKEDOUT)) affected_mob.visible_message(SPAN_DANGER("\The [affected_mob] starts shaking uncontrollably!"), \ SPAN_DANGER("You feel something moving inside you! You start shaking uncontrollably!")) - affected_mob.apply_effect(4, PARALYZE) + affected_mob.apply_effect(2, PARALYZE) affected_mob.make_jittery(105) + if(!HAS_TRAIT(affected_mob, TRAIT_NESTED)) + affected_mob.take_limb_damage(1) + affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) if(4) if(prob(2)) - affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) var/message = pick("Your chest hurts badly", "It becomes difficult to breathe", "Your heart starts beating rapidly, and each beat is painful") message = SPAN_WARNING("[message].") to_chat(affected_mob, message) if(prob(50)) affected_mob.emote("scream") + if(!HAS_TRAIT(affected_mob, TRAIT_NESTED)) + affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) if(prob(6)) if(!HAS_TRAIT(src, TRAIT_KNOCKEDOUT)) - affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) affected_mob.visible_message(SPAN_DANGER("[affected_mob] starts shaking uncontrollably!"), \ SPAN_DANGER("You feel something moving inside you! You start shaking uncontrollably!")) - affected_mob.apply_effect(5, PARALYZE) + affected_mob.apply_effect(3, PARALYZE) affected_mob.make_jittery(105) - affected_mob.take_limb_damage(1) + if(!HAS_TRAIT(affected_mob, TRAIT_NESTED)) + affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) + affected_mob.take_limb_damage(1) if(5) become_larva() if(7) // Stage 6 is while we are trying to find a candidate in become_larva From 901f664a7127c8ad54055f6168a392d9552d94fd Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:35:14 -0700 Subject: [PATCH 6/6] mistake --- code/modules/mob/living/carbon/xenomorph/Embryo.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm index 59e5934d8711..e461119a8fab 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -138,10 +138,10 @@ var/message = pick("Your chest hurts badly", "It becomes difficult to breathe", "Your heart starts beating rapidly, and each beat is painful") message = SPAN_WARNING("[message].") to_chat(affected_mob, message) + if(!HAS_TRAIT(affected_mob, TRAIT_NESTED)) + affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) if(prob(50)) affected_mob.emote("scream") - if(!HAS_TRAIT(affected_mob, TRAIT_NESTED)) - affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK) if(prob(6)) if(!HAS_TRAIT(src, TRAIT_KNOCKEDOUT)) affected_mob.visible_message(SPAN_DANGER("[affected_mob] starts shaking uncontrollably!"), \