From 32f4bff5cd0becc2e6b9ce6b71b8a1d1f4c7b4e8 Mon Sep 17 00:00:00 2001 From: Regen Date: Sun, 4 Nov 2018 20:26:59 +0000 Subject: [PATCH 1/2] Add attack log to changeling tentacle aggressive pull --- code/game/gamemodes/changeling/powers/mutations.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index b61096a8939..9fdc614ef49 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -277,6 +277,7 @@ return C.visible_message("[src] impales [C] with [I]!", "[src] impales you with [I]!") + add_attack_logs(src, C, "[src] pulled [C] with a tentacle, attacking them with [I]") C.apply_damage(I.force, BRUTE, "chest") do_item_attack_animation(C, used_item = I) add_blood(C) From 97b25b8208328f10ec028796852a84a9879a9d3c Mon Sep 17 00:00:00 2001 From: Regen Date: Sun, 4 Nov 2018 20:50:09 +0000 Subject: [PATCH 2/2] Adds the rest of the attack logs --- code/game/gamemodes/changeling/powers/mutations.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 9fdc614ef49..0c8d22b5a8b 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -277,7 +277,7 @@ return C.visible_message("[src] impales [C] with [I]!", "[src] impales you with [I]!") - add_attack_logs(src, C, "[src] pulled [C] with a tentacle, attacking them with [I]") + add_attack_logs(src, C, "[src] pulled [C] with a tentacle, attacking them with [I]") //Attack log is here so we can fetch the item they're stabbing with. C.apply_damage(I.force, BRUTE, "chest") do_item_attack_animation(C, used_item = I) add_blood(C) @@ -293,6 +293,7 @@ var/obj/item/I = target if(!I.anchored) to_chat(firer, "You pull [I] towards yourself.") + add_attack_logs(src, I, "[src] pulled [I] towards them with a tentacle") H.throw_mode_on() I.throw_at(H, 10, 2) . = 1 @@ -305,6 +306,7 @@ switch(firer.a_intent) if(INTENT_HELP) C.visible_message("[L] is pulled by [H]'s tentacle!","A tentacle grabs you and pulls you towards [H]!") + add_attack_logs(H, L, "[H] pulled [L] towards them with a tentacle") C.throw_at(get_step_towards(H,C), 8, 2) return 1 @@ -313,10 +315,12 @@ if(I) if(C.drop_item()) C.visible_message("[I] is yanked out of [C]'s hand by [src]!","A tentacle pulls [I] away from you!") + add_attack_logs(src, C, "[src] has grabbed [I] out of [C]'s hand with a tentacle") on_hit(I) //grab the item as if you had hit it directly with the tentacle return 1 else to_chat(firer, "You can't seem to pry [I] out of [C]'s hands!") + add_attack_logs(src, C, "[src] tried to grab [I] out of [C]'s hand with a tentacle, but failed") return 0 else to_chat(firer, "[C] has nothing in hand to disarm!") @@ -324,6 +328,7 @@ if(INTENT_GRAB) C.visible_message("[L] is grabbed by [H]'s tentacle!","A tentacle grabs you and pulls you towards [H]!") + add_attack_logs(src, C, "[src] has grabbed [C] and pulled them towards [H] with a tentacle") C.throw_at(get_step_towards(H,C), 8, 2, callback=CALLBACK(H, /mob/proc/tentacle_grab, C)) return 1