From 020a6d57edecaa0ffc7388d2255e585e16e99efd Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 18 Jun 2023 15:51:58 +0200 Subject: [PATCH] [MIRROR] Fix logging for tabling and disposal shoving [MDB IGNORE] (#21828) * Fix logging for tabling and disposal shoving (#76017) ## About The Pull Request fixes #69837 ## Why It's Good For The Game accurate combat logs ## Changelog :cl: admin: fix combat logs for tabling and disposal shoving /:cl: * Fix logging for tabling and disposal shoving --------- Co-authored-by: Couls --- code/game/objects/structures/tables_racks.dm | 2 +- code/modules/recycling/disposal/bin.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index d19e0858bc2..6134ae6bad6 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -324,7 +324,7 @@ span_userdanger("You're shoved onto \the [src] by [shover.name]!"), span_hear("You hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, src) to_chat(shover, span_danger("You shove [target.name] onto \the [src]!")) target.throw_at(src, 1, 1, null, FALSE) //1 speed throws with no spin are basically just forcemoves with a hard collision check - log_combat(src, target, "shoved", "onto [src] (table)") + log_combat(shover, target, "shoved", "onto [src] (table)") return COMSIG_CARBON_SHOVE_HANDLED /obj/structure/table/greyscale diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index 8258a67b345..8ba36404683 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -560,7 +560,7 @@ target.visible_message(span_danger("[shover.name] shoves [target.name] into \the [src]!"), span_userdanger("You're shoved into \the [src] by [target.name]!"), span_hear("You hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, src) to_chat(src, span_danger("You shove [target.name] into \the [src]!")) - log_combat(src, target, "shoved", "into [src] (disposal bin)") + log_combat(shover, target, "shoved", "into [src] (disposal bin)") return COMSIG_CARBON_SHOVE_HANDLED ///Called when a push broom is trying to sweep items onto the turf this object is standing on. Garbage will be moved inside.