From e7e3ed1fd2a8adce4544be6f7c96172cd6efaf4d Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 8 Sep 2021 22:18:18 +0200 Subject: [PATCH] [MIRROR] "You step on the floor!" caltrop fixes (#8064) * "You step on the floor!" caltrop fixes (#61279) The chat feedback for stepping on an object with a caltrop component still erroneously reads out the turf instead of the object. * "You step on the floor!" caltrop fixes Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/datums/components/caltrop.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index 3d4dcb8146c..128a13f552e 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -91,8 +91,8 @@ if(!(flags & CALTROP_SILENT) && !H.has_status_effect(/datum/status_effect/caltropped)) H.apply_status_effect(/datum/status_effect/caltropped) H.visible_message( - span_danger("[H] steps on [source]."), - span_userdanger("You step on [source]!") + span_danger("[H] steps on [parent]."), + span_userdanger("You step on [parent]!") ) H.apply_damage(damage, BRUTE, picked_def_zone, wound_bonus = CANT_WOUND)