From 9d7aaa882b76c3f34b504ea7e95eb6df44d903f4 Mon Sep 17 00:00:00 2001 From: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> Date: Wed, 6 Sep 2023 17:30:32 -0400 Subject: [PATCH 1/4] Update Embryo.dm --- 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 95c0d420b3e5..1fae2ac45d8b 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -14,6 +14,8 @@ var/flags_embryo = FALSE // Used in /ciphering/predator property /// The ckey of any player hugger that made this embryo var/hugger_ckey + /// The total time the person is hugged divided by stages until burst + var/per_stage_hugged_time = CONFIG_GET(number/embryo_burst_timer) / 5 /obj/item/alien_embryo/Initialize(mapload, ...) . = ..() @@ -76,8 +78,6 @@ /obj/item/alien_embryo/proc/process_growth(delta_time) var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] - /// The total time the person is hugged divided by stages until burst - var/per_stage_hugged_time = CONFIG_GET(number/embryo_burst_timer) / 5 //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) From 4d786d5306d4cc9f2f156f8e530ce0ffc4534db0 Mon Sep 17 00:00:00 2001 From: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> Date: Wed, 6 Sep 2023 17:30:37 -0400 Subject: [PATCH 2/4] Update prop_positive.dm --- code/modules/reagents/chemistry_properties/prop_positive.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry_properties/prop_positive.dm b/code/modules/reagents/chemistry_properties/prop_positive.dm index 65099aa3e462..65e0aacd4159 100644 --- a/code/modules/reagents/chemistry_properties/prop_positive.dm +++ b/code/modules/reagents/chemistry_properties/prop_positive.dm @@ -498,7 +498,7 @@ H.take_limb_damage(0,rand(20,40)) H.vomit() else - A.counter = 90 + A.counter = per_stage_hugged_time /datum/chem_property/positive/antiparasitic/process_overdose(mob/living/M, potency = 1) M.apply_damage(potency, TOX) From edfffd4cda0c818f3d3c08a166bc9b754fc160a1 Mon Sep 17 00:00:00 2001 From: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> Date: Wed, 6 Sep 2023 17:35:24 -0400 Subject: [PATCH 3/4] Update Embryo.dm --- code/modules/mob/living/carbon/xenomorph/Embryo.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm index 1fae2ac45d8b..2a3ff577a245 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -15,10 +15,11 @@ /// The ckey of any player hugger that made this embryo var/hugger_ckey /// The total time the person is hugged divided by stages until burst - var/per_stage_hugged_time = CONFIG_GET(number/embryo_burst_timer) / 5 + var/per_stage_hugged_time = 90 //Set in Initialize due to config /obj/item/alien_embryo/Initialize(mapload, ...) . = ..() + per_stage_hugged_time = CONFIG_GET(number/embryo_burst_timer) / 5 if(istype(loc, /mob/living)) affected_mob = loc affected_mob.status_flags |= XENO_HOST From 59da13017416b86ead9cceade7e447c2e8329620 Mon Sep 17 00:00:00 2001 From: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> Date: Wed, 6 Sep 2023 17:38:52 -0400 Subject: [PATCH 4/4] Update prop_positive.dm --- .../chemistry_properties/prop_positive.dm | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/code/modules/reagents/chemistry_properties/prop_positive.dm b/code/modules/reagents/chemistry_properties/prop_positive.dm index 65e0aacd4159..7f476cecf2c5 100644 --- a/code/modules/reagents/chemistry_properties/prop_positive.dm +++ b/code/modules/reagents/chemistry_properties/prop_positive.dm @@ -481,24 +481,24 @@ description = "Antimicrobial property specifically targeting parasitic pathogens in the body disrupting their growth and potentially killing them." rarity = PROPERTY_UNCOMMON -/datum/chem_property/positive/antiparasitic/process(mob/living/M, potency = 1, delta_time) - if(!ishuman(M)) - return - var/mob/living/carbon/human/H = M - for(var/content in H.contents) - var/obj/item/alien_embryo/A = content - if(A && istype(A)) - if(A.counter > 0) - A.counter = A.counter - potency - H.take_limb_damage(0,POTENCY_MULTIPLIER_MEDIUM*potency) +/datum/chem_property/positive/antiparasitic/process(mob/living/current_mob, potency = 1, delta_time) + if(!ishuman(current_mob)) + return + var/mob/living/carbon/human/current_human = current_mob + for(var/content in current_human.contents) + var/obj/item/alien_embryo/embryo = content + if(embryo && istype(embryo)) + if(embryo.counter > 0) + embryo.counter = embryo.counter - potency + current_human.take_limb_damage(0,POTENCY_MULTIPLIER_MEDIUM*potency) else - A.stage-- - if(A.stage <= 0)//if we reach this point, the embryo dies and the occupant takes a nasty amount of acid damage - qdel(A) - H.take_limb_damage(0,rand(20,40)) - H.vomit() + embryo.stage-- + if(embryo.stage <= 0)//if we reach this point, the embryo dies and the occupant takes a nasty amount of acid damage + qdel(embryo) + current_human.take_limb_damage(0,rand(20,40)) + current_human.vomit() else - A.counter = per_stage_hugged_time + embryo.counter = embryo.per_stage_hugged_time /datum/chem_property/positive/antiparasitic/process_overdose(mob/living/M, potency = 1) M.apply_damage(potency, TOX)