From b7d599186a792e5b7ec3f65192f36b5676692ab0 Mon Sep 17 00:00:00 2001 From: Notamaniac Date: Wed, 14 Dec 2022 19:07:51 +0000 Subject: [PATCH 1/2] Fixes basalt katana visible message --- code/game/objects/items/weaponry.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index f10668df567f..9b233909e896 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -294,7 +294,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 if (user.getStaminaLoss() >= 100) user.throw_at(landing_turf, 2, 2) user.Paralyze(4 SECONDS) - user.visible_message(span_warning("You're too tired tired to finish the roll!")) + to_chat(user, span_warning("You're too tired tired to finish the roll!")) + user.visible_message(span_notice("[user] collapses on the ground, exhausted!")) else playsound(user, 'yogstation/sound/items/dodgeroll.ogg', 50, TRUE) user.apply_status_effect(STATUS_EFFECT_DODGING) From 1499f5fe19e57695fea02d15e04cc842074eda83 Mon Sep 17 00:00:00 2001 From: Notamaniac Date: Thu, 15 Dec 2022 11:16:51 +0000 Subject: [PATCH 2/2] Typo + moves everything to one line --- code/game/objects/items/weaponry.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 9b233909e896..52e65430bb28 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -294,8 +294,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 if (user.getStaminaLoss() >= 100) user.throw_at(landing_turf, 2, 2) user.Paralyze(4 SECONDS) - to_chat(user, span_warning("You're too tired tired to finish the roll!")) - user.visible_message(span_notice("[user] collapses on the ground, exhausted!")) + user.visible_message(span_notice("[user] collapses on the ground, exhausted!"), span_warning("You're too tired to finish the roll!")) else playsound(user, 'yogstation/sound/items/dodgeroll.ogg', 50, TRUE) user.apply_status_effect(STATUS_EFFECT_DODGING)