cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes admin buildmode from gibbing you (#10199)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-02-20 05:39:50 -07:00
committed by GitHub
parent 7e80962c40
commit 935d63736f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/falling_object_vr.dm
View File

@@ -8,6 +8,10 @@
var/falling_type = /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita var/falling_type = /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita
var/crushing = TRUE var/crushing = TRUE
/obj/effect/falling_effect/New(loc, type, var/crushing_type = TRUE)
crushing = crushing_type
..()
/obj/effect/falling_effect/Initialize(mapload, type) /obj/effect/falling_effect/Initialize(mapload, type)
..() ..()
if(type) if(type)

6
code/modules/admin/verbs/buildmode.dm
View File

@@ -659,12 +659,10 @@ CHOMP Remove end */
return return
if(pa.Find("left") && !pa.Find("ctrl")) if(pa.Find("left") && !pa.Find("ctrl"))
if(ispath(holder.buildmode.objholder)) if(ispath(holder.buildmode.objholder))
var/obj/effect/falling_effect/FE = new /obj/effect/falling_effect(get_turf(object), holder.buildmode.objholder) new /obj/effect/falling_effect(get_turf(object), holder.buildmode.objholder, FALSE)
FE.crushing = FALSE
else if(pa.Find("right")) else if(pa.Find("right"))
if(ispath(holder.buildmode.objholder)) if(ispath(holder.buildmode.objholder))
var/obj/effect/falling_effect/FE = new /obj/effect/falling_effect(get_turf(object), holder.buildmode.objholder) new /obj/effect/falling_effect(get_turf(object), holder.buildmode.objholder, TRUE)
FE.crushing = TRUE
else if(pa.Find("ctrl")) else if(pa.Find("ctrl"))
holder.buildmode.objholder = object.type holder.buildmode.objholder = object.type
to_chat(user, span_notice("[object]([object.type]) copied to buildmode.")) to_chat(user, span_notice("[object]([object.type]) copied to buildmode."))