From adec66804b4b517da43459cd2a4348df635381d4 Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 1 Mar 2021 17:41:23 +0200 Subject: [PATCH] Bear Step (#11246) --- code/game/objects/items/weapons/traps.dm | 6 ++++-- html/changelogs/geeves-bear_step.yml | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/geeves-bear_step.yml diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index 3628773922c..f23f512003a 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -125,6 +125,10 @@ bear.instant_aggro() /obj/item/trap/Crossed(atom/movable/AM) + if(ishuman(AM)) + var/mob/living/carbon/human/H = AM + if(H.shoes?.item_flags & LIGHTSTEP) + return if(deployed && isliving(AM)) var/mob/living/L = AM L.visible_message( @@ -138,8 +142,6 @@ deployed = FALSE update_icon() shake_animation() - ..() - /obj/item/trap/update_icon() icon_state = "[icon_base][deployed]" diff --git a/html/changelogs/geeves-bear_step.yml b/html/changelogs/geeves-bear_step.yml new file mode 100644 index 00000000000..4292e5c4ad0 --- /dev/null +++ b/html/changelogs/geeves-bear_step.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Light Step shoes now let you avoid bear traps." \ No newline at end of file