From c4caddf12e3c58ef10a73cf8d996e695b01a25bd Mon Sep 17 00:00:00 2001 From: Beagle <56142455+BeagleGaming1@users.noreply.github.com> Date: Tue, 20 Jun 2023 14:40:12 -0400 Subject: [PATCH 1/6] Automatic changelog for PR #3470 [ci skip] --- html/changelogs/AutoChangeLog-pr-3470.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3470.yml diff --git a/html/changelogs/AutoChangeLog-pr-3470.yml b/html/changelogs/AutoChangeLog-pr-3470.yml new file mode 100644 index 000000000000..3d4a4ce22710 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3470.yml @@ -0,0 +1,4 @@ +author: "Morrow" +delete-after: True +changes: + - rscadd: "Re-added the nuke that you can buy via intel at tier 4. Only purchasable past 120 minutes. Requires holding both groundside comms towers for authorization decryption before being able to be armed." \ No newline at end of file From bdea9be6e5ddf6b6b7a35a6a6c2b01e44b3b065d Mon Sep 17 00:00:00 2001 From: Beagle <56142455+BeagleGaming1@users.noreply.github.com> Date: Thu, 29 Jun 2023 20:14:11 -0400 Subject: [PATCH 2/6] nest --- .../carbon/xenomorph/mutators/strains/runner/acid.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm index a2699a4f0f40..65775f27fe21 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm @@ -70,13 +70,17 @@ . += "FOR THE HIVE!: in [caboom_left] seconds" /datum/behavior_delegate/runner_acider/melee_attack_additional_effects_target(mob/living/carbon/target_mob) - if (ishuman(target_mob)) + if(ishuman(target_mob)) var/mob/living/carbon/human/target_human = target_mob - if (target_human.stat == DEAD) + if(target_human.buckled && istype(target_human.buckled, /obj/structure/bed/nest)) return - for(var/datum/effects/acid/AA in target_mob.effects_list) - qdel(AA) + if(target_human.stat == DEAD) + return + + for(var/datum/effects/acid/acid_effect in target_mob.effects_list) + qdel(acid_effect) break + if(isxeno_human(target_mob)) if(target_mob.lying) modify_acid(acid_slash_regen_lying) From 1dfb4643dc0781e2fc061c08b5844962651d05eb Mon Sep 17 00:00:00 2001 From: Beagle <56142455+BeagleGaming1@users.noreply.github.com> Date: Fri, 30 Jun 2023 02:43:41 -0400 Subject: [PATCH 3/6] changes --- .../xenomorph/mutators/strains/runner/acid.dm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm index 65775f27fe21..400b79e711e8 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm @@ -70,7 +70,7 @@ . += "FOR THE HIVE!: in [caboom_left] seconds" /datum/behavior_delegate/runner_acider/melee_attack_additional_effects_target(mob/living/carbon/target_mob) - if(ishuman(target_mob)) + if(ishuman(target_mob)) //Will acid be applied to the mob var/mob/living/carbon/human/target_human = target_mob if(target_human.buckled && istype(target_human.buckled, /obj/structure/bed/nest)) return @@ -81,12 +81,17 @@ qdel(acid_effect) break - if(isxeno_human(target_mob)) + new /datum/effects/acid(target_mob, bound_xeno, initial(bound_xeno.caste_type)) + if(isxeno_human(target_mob)) //Will the runner get acid stacks + if(/obj/item/alien_embryo in target_mob.contents) + var/obj/item/alien_embryo/embryo + if(embryo.stage >= 4) //Late stage hugged incase the runner unnests them + return + if(target_mob.lying) modify_acid(acid_slash_regen_lying) - else - modify_acid(acid_slash_regen_standing) - new /datum/effects/acid(target_mob, bound_xeno, initial(bound_xeno.caste_type)) + return + modify_acid(acid_slash_regen_standing) /datum/behavior_delegate/runner_acider/on_life() modify_acid(acid_passive_regen) From b359263b6bb1376582804a8ea158909b923f8ef8 Mon Sep 17 00:00:00 2001 From: Beagle <56142455+BeagleGaming1@users.noreply.github.com> Date: Sat, 1 Jul 2023 00:45:44 -0400 Subject: [PATCH 4/6] I'm meant to actually test my code? --- .../carbon/xenomorph/mutators/strains/runner/acid.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm index 400b79e711e8..e5ada21a9e11 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm @@ -83,10 +83,9 @@ new /datum/effects/acid(target_mob, bound_xeno, initial(bound_xeno.caste_type)) if(isxeno_human(target_mob)) //Will the runner get acid stacks - if(/obj/item/alien_embryo in target_mob.contents) - var/obj/item/alien_embryo/embryo - if(embryo.stage >= 4) //Late stage hugged incase the runner unnests them - return + var/obj/item/alien_embryo/embryo = locate(/obj/item/alien_embryo) in target_mob.contents + if(embryo?.stage >= 4) //Late stage hugged incase the runner unnests them + return if(target_mob.lying) modify_acid(acid_slash_regen_lying) From 0c34c4a18cb9e3fefc1d28bcc00683a17cf72419 Mon Sep 17 00:00:00 2001 From: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> Date: Sun, 9 Jul 2023 02:13:21 -0400 Subject: [PATCH 5/6] Update acid.dm --- .../mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm index e5ada21a9e11..3cbe23649a34 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm @@ -84,7 +84,7 @@ new /datum/effects/acid(target_mob, bound_xeno, initial(bound_xeno.caste_type)) if(isxeno_human(target_mob)) //Will the runner get acid stacks var/obj/item/alien_embryo/embryo = locate(/obj/item/alien_embryo) in target_mob.contents - if(embryo?.stage >= 4) //Late stage hugged incase the runner unnests them + if(embryo?.stage >= 5) //very late stage hugged in case the runner unnests them return if(target_mob.lying) From 507e023bc50c40d2f73a56a17e52af93ff9d4cf0 Mon Sep 17 00:00:00 2001 From: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> Date: Sun, 9 Jul 2023 02:56:54 -0400 Subject: [PATCH 6/6] Update acid.dm --- .../mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm index 3cbe23649a34..7a2196a3c209 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm @@ -84,7 +84,7 @@ new /datum/effects/acid(target_mob, bound_xeno, initial(bound_xeno.caste_type)) if(isxeno_human(target_mob)) //Will the runner get acid stacks var/obj/item/alien_embryo/embryo = locate(/obj/item/alien_embryo) in target_mob.contents - if(embryo?.stage >= 5) //very late stage hugged in case the runner unnests them + if(embryo?.stage >= 4) //very late stage hugged in case the runner unnests them return if(target_mob.lying)