From 935d63736fa8201aad2b51aff6b9240f1c4c0f0c Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Thu, 20 Feb 2025 05:39:50 -0700 Subject: [PATCH] [MIRROR] Fixes admin buildmode from gibbing you (#10199) Co-authored-by: Cameron Lennox --- code/game/objects/items/falling_object_vr.dm | 4 ++++ code/modules/admin/verbs/buildmode.dm | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/falling_object_vr.dm b/code/game/objects/items/falling_object_vr.dm index e51f8790d5..dc7ad3c592 100644 --- a/code/game/objects/items/falling_object_vr.dm +++ b/code/game/objects/items/falling_object_vr.dm @@ -8,6 +8,10 @@ var/falling_type = /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita var/crushing = TRUE +/obj/effect/falling_effect/New(loc, type, var/crushing_type = TRUE) + crushing = crushing_type + ..() + /obj/effect/falling_effect/Initialize(mapload, type) ..() if(type) diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm index b4447a9ef0..fcb7553ded 100644 --- a/code/modules/admin/verbs/buildmode.dm +++ b/code/modules/admin/verbs/buildmode.dm @@ -659,12 +659,10 @@ CHOMP Remove end */ return if(pa.Find("left") && !pa.Find("ctrl")) if(ispath(holder.buildmode.objholder)) - var/obj/effect/falling_effect/FE = new /obj/effect/falling_effect(get_turf(object), holder.buildmode.objholder) - FE.crushing = FALSE + new /obj/effect/falling_effect(get_turf(object), holder.buildmode.objholder, FALSE) else if(pa.Find("right")) if(ispath(holder.buildmode.objholder)) - var/obj/effect/falling_effect/FE = new /obj/effect/falling_effect(get_turf(object), holder.buildmode.objholder) - FE.crushing = TRUE + new /obj/effect/falling_effect(get_turf(object), holder.buildmode.objholder, TRUE) else if(pa.Find("ctrl")) holder.buildmode.objholder = object.type to_chat(user, span_notice("[object]([object.type]) copied to buildmode."))