Skip to content

Commit

Permalink
Fix Rust heretic's mansus grasp on doors (BeeStation#9783)
Browse files Browse the repository at this point in the history
* Update rust_lore.dm

Allow doors to be rusted

* Update rust_lore.dm

Shion improvements

* Update rust_lore.dm
  • Loading branch information
lowwy authored Sep 13, 2023
1 parent eb59ed5 commit 1985d1c
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion code/modules/antagonists/heretic/knowledge/rust_lore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,16 @@

/datum/heretic_knowledge/rust_fist/proc/on_mansus_grasp(mob/living/source, mob/living/target)
SIGNAL_HANDLER
if(source.a_intent == INTENT_HARM && !iscarbon(target))
var/static/list/always_hit_typecache = typecacheof(list(
/mob/living/carbon,
/mob/living/silicon,
/mob/living/simple_animal/bot,
/obj/item/storage/secure/safe/caps_spare,
/obj/machinery/door,
/obj/mecha
))
// The reason this is not simply an isturf is because we likely don't want to hit random machinery like holopads and such!
if(source.a_intent == INTENT_HARM && !is_type_in_typecache(target, always_hit_typecache))
return
return target.rust_heretic_act()

Expand Down

0 comments on commit 1985d1c

Please sign in to comment.