Skip to content

Commit

Permalink
Cloth Golems can no longer be infested by Legions (ParadiseSS13#26287)
Browse files Browse the repository at this point in the history
* ClothGolemFix

* Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

---------

Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
  • Loading branch information
Sirryan2002 and S34NW authored Jul 29, 2024
1 parent 122ede4 commit dfca6b8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 0 deletions.
4 changes: 4 additions & 0 deletions code/modules/mob/living/carbon/human/species/_species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1168,3 +1168,7 @@ It'll return null if the organ doesn't correspond, so include null checks when u
add_attack_logs(user, target, "vampirebit")
return TRUE
//end vampire codes

/// Is this species able to be legion infested?
/datum/species/proc/can_be_legion_infested()
return TRUE
3 changes: 3 additions & 0 deletions code/modules/mob/living/carbon/human/species/golem.dm
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,9 @@
new /obj/structure/cloth_pile(get_turf(H), H)
..()

/datum/species/golem/cloth/can_be_legion_infested()
return FALSE // can't infest a pile of cloth,

/obj/structure/cloth_pile
name = "pile of bandages"
desc = "It emits a strange aura, as if there was still life within it..."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,8 @@
..()

/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H)
if(H?.dna?.species && !H.dna.species.can_be_legion_infested())
return
visible_message("<span class='warning'>[name] burrows into the flesh of [H]!</span>")
var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L
if(HAS_TRAIT(H, TRAIT_DWARF)) //dwarf legions aren't just fluff!
Expand Down

0 comments on commit dfca6b8

Please sign in to comment.