From 395fc64b2e286b5f90f1413377b7916f1b4bf66c Mon Sep 17 00:00:00 2001 From: synystersparx <56812592+synystersparx@users.noreply.github.com> Date: Fri, 22 Nov 2019 10:30:28 -0600 Subject: [PATCH] Changeling Arm only functions as crowbar with help intent active (#7481) Fixes #7477 I tested this with attacking a robot and a regular wall with help intent on/off. It seems there's something custom with walls for changeling so please consider any side effects of changing the iscrowbar logic. One thing is, even with help intent you will attack humans when clicking them. While this fix allows robots to be attacked by the changeling arm, it can not do so on help, which may seem inconsistent. --- code/game/gamemodes/changeling/implements/items.dm | 3 ++- html/changelogs/synystersparx-PR-7477.yml | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/synystersparx-PR-7477.yml diff --git a/code/game/gamemodes/changeling/implements/items.dm b/code/game/gamemodes/changeling/implements/items.dm index 309956db2e8..bf0ee6df9a5 100644 --- a/code/game/gamemodes/changeling/implements/items.dm +++ b/code/game/gamemodes/changeling/implements/items.dm @@ -48,7 +48,8 @@ QDEL_IN(src, 1) /obj/item/melee/arm_blade/iscrowbar() - return TRUE + if(creator.a_intent == I_HELP) return TRUE + return FALSE /obj/item/melee/arm_blade/resolve_attackby(atom/A, mob/living/user, var/click_parameters) if(istype(A,/turf/simulated/floor) && user.a_intent != I_HELP) diff --git a/html/changelogs/synystersparx-PR-7477.yml b/html/changelogs/synystersparx-PR-7477.yml new file mode 100644 index 00000000000..59d579f149d --- /dev/null +++ b/html/changelogs/synystersparx-PR-7477.yml @@ -0,0 +1,4 @@ +author: SynysterSparx +delete-after: True +changes: + - bugfix: "Changeling arm can now be used to attack robots. Still able to open robot maintenance hatch and other crowbar things with it if in help mode."