From 1fed23f77a4e8ebe36f32ea2baf98eea0c778f71 Mon Sep 17 00:00:00 2001 From: Roxy <75404941+TealSeer@users.noreply.github.com> Date: Mon, 21 Jul 2025 18:00:20 -0400 Subject: [PATCH] Fix admin pie smite (#4284) ## About The Pull Request The pie smite was getting the splat component on the pie and then calling the splat proc directly, which is kind of gross but also it was passing the wrong value for one of the arguments (it passed the splat component for the first argument when it should have been passing the pie) -- changed the code to instead send the signal that triggers the proc cause that's cleaner and also makes it actually work. Also move the file to the bubber folder cause why not ## Why It's Good For The Game Fixes #4282 ## Proof Of Testing
Screenshots/Videos image
## Changelog :cl: fix: fixed admin pie smite not working /:cl: --- .../code => modular_zubbers/code/modules/admin}/smites/pie.dm | 3 +-- tgstation.dme | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) rename {modular_skyrat/modules/admin/code => modular_zubbers/code/modules/admin}/smites/pie.dm (61%) diff --git a/modular_skyrat/modules/admin/code/smites/pie.dm b/modular_zubbers/code/modules/admin/smites/pie.dm similarity index 61% rename from modular_skyrat/modules/admin/code/smites/pie.dm rename to modular_zubbers/code/modules/admin/smites/pie.dm index a4b71fdca96..3e3c1931548 100644 --- a/modular_skyrat/modules/admin/code/smites/pie.dm +++ b/modular_zubbers/code/modules/admin/smites/pie.dm @@ -5,5 +5,4 @@ /datum/smite/pie/effect(client/user, mob/living/target) . = ..() var/obj/item/food/pie/cream/nostun/creamy = new(get_turf(target)) - var/datum/component/splat/splat_handler = creamy.GetComponent(/datum/component/splat) - splat_handler.splat(splat_handler, target) + SEND_SIGNAL(creamy, COMSIG_MOVABLE_IMPACT, target) diff --git a/tgstation.dme b/tgstation.dme index 286665e5376..473ba4f1aaa 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7199,7 +7199,6 @@ #include "modular_skyrat\modules\admin\code\loud_say.dm" #include "modular_skyrat\modules\admin\code\player_ranks.dm" #include "modular_skyrat\modules\admin\code\sooc.dm" -#include "modular_skyrat\modules\admin\code\smites\pie.dm" #include "modular_skyrat\modules\advanced_engineering\code\adv_engineering.dm" #include "modular_skyrat\modules\advanced_shuttles\code\closet.dm" #include "modular_skyrat\modules\advanced_shuttles\code\computer.dm" @@ -9076,6 +9075,7 @@ #include "modular_zubbers\code\game\turfs\open\openspace.dm" #include "modular_zubbers\code\game\turfs\open\sand.dm" #include "modular_zubbers\code\modules\_defines.dm" +#include "modular_zubbers\code\modules\admin\smites\pie.dm" #include "modular_zubbers\code\modules\admin\verbs\admin.dm" #include "modular_zubbers\code\modules\admin\verbs\debug.dm" #include "modular_zubbers\code\modules\alt_anomaly_refinery\anomaly_refinery.dm"