Skip to content

Commit

Permalink
Acid runner cannot get acid stacks from nested humans (#3772)
Browse files Browse the repository at this point in the history
# About the pull request

If a human is in a nest, the acid runner won't get any acid from it
If a human is stage 4 or 5 (about to burst), the runner won't get acid
either, to prevent circumventing the above change.

# Explain why it's good for the game

It's against the rules anyways

# Changelog

:cl:
add: Acid runners don't get acid from slashing nested humans
add: Very late-stage marines do not give acid
/:cl:
  • Loading branch information
BeagleGaming1 authored Jul 9, 2023
1 parent 481be46 commit 69a7e7a
Showing 1 changed file with 16 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,27 @@
. += "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.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))

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) //very late stage hugged in case 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)
Expand Down

0 comments on commit 69a7e7a

Please sign in to comment.