From 16a138f2d9814efc2827ddf96e5742f0078563c6 Mon Sep 17 00:00:00 2001 From: Spaghetti-Bit Date: Mon, 1 Jul 2024 17:20:31 -0700 Subject: [PATCH] Fixes https://github.com/ParadiseSS13/Paradise/issues/26072 --- code/game/machinery/vendors/vending.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/machinery/vendors/vending.dm b/code/game/machinery/vendors/vending.dm index 2b5d970c5b34..a159c607269f 100644 --- a/code/game/machinery/vendors/vending.dm +++ b/code/game/machinery/vendors/vending.dm @@ -980,9 +980,15 @@ if(!HAS_TRAIT(attacker, TRAIT_PACIFISM)) add_attack_logs(attacker, target, "shoved into a vending machine ([src])") tilt(target, from_combat = TRUE) + target.visible_message("[attacker] slams [target] into [src]!", \ + "You get slammed into [src] by [attacker]!", \ + "You hear a loud crunch.") else if(HAS_TRAIT_FROM(attacker, TRAIT_PACIFISM, GHOST_ROLE)) // should only apply to the ghost bar add_attack_logs(attacker, target, "shoved into a vending machine ([src]), but flattened themselves.") tilt(attacker, crit = TRUE, from_anywhere = TRUE) // get fucked + target.visible_message("[attacker] tries to slam [target] into [src], but falls face first into [src]!", \ + "You get pushed into [src] by [attacker], but narrowly move out of the way as it tips over ontop of [attacker]!", \ + "You hear a loud crunch.") else attacker.visible_message("[attacker] lightly presses [target] against [src].", "You lightly press [target] against [src], you don't want to hurt [target.p_them()]!") return TRUE