From c2282bdb18698c3cc37d8bcbec0b47dc62b96b24 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 15 Jun 2022 18:18:23 +0200 Subject: [PATCH] [MIRROR] Getting shoved into a closet will now mention that the shover shoved you into the closet instead of yourself. [MDB IGNORE] (#14332) * Getting shoved into a closet will now mention that the shover shoved you into the closet instead of yourself. (#67769) Webedit oh no! Changed the message the user receives by getting shoved into the closet to mention that the shover shoved them into the closet instead of themselves. * Getting shoved into a closet will now mention that the shover shoved you into the closet instead of yourself. Co-authored-by: Pickle-Coding <58013024+Pickle-Coding@users.noreply.github.com> --- code/game/objects/structures/crates_lockers/closets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 3614936bb4f..b9e2967e794 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -715,7 +715,7 @@ target.Knockdown(SHOVE_KNOCKDOWN_SOLID) update_icon() 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) + span_userdanger("You're shoved into \the [src] by [shover.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] (locker/crate)") return COMSIG_CARBON_SHOVE_HANDLED