From a766cb39d6a4630063c537bf0da452f4daa08d51 Mon Sep 17 00:00:00 2001 From: Jacquerel Date: Wed, 7 Jan 2026 05:13:24 +0000 Subject: [PATCH] Reset pixel x/y of tactical objects when hiding behind them (#94717) ## About The Pull Request Fixes #94180 When you pick up an item with the "tactical" component you hide behind it, this is primarily applied to potted plants and cardboard cutouts. Potted plants are the kind fo item that mappers occasionally like to adjust the position of to make them look like they're on desks or something, however if you hid behind an offset plant then it would maintain the offset until dropped meaning that you could appear to be in the wrong tile. When you pick up an item you can hide behind it will now first reset its apparent position. ## Changelog :cl: fix: When you pick up a plant pot and hide behind it you will now also move it in front of you, in case it is visually far away from your position /:cl: --- code/datums/components/tactical.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/datums/components/tactical.dm b/code/datums/components/tactical.dm index 732e43ee766..334d517f6f6 100644 --- a/code/datums/components/tactical.dm +++ b/code/datums/components/tactical.dm @@ -48,6 +48,10 @@ ADD_TRAIT(user, TRAIT_UNKNOWN_APPEARANCE, REF(src)) current_slot = slot + source.pixel_x = source.base_pixel_x + source.pixel_y = source.base_pixel_y + source.pixel_w = source.base_pixel_w + source.pixel_z = source.base_pixel_z on_icon_update(source)