From 1ff673db0d206ac411df3f7267973a1d33a4fc61 Mon Sep 17 00:00:00 2001 From: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Date: Fri, 6 Nov 2020 19:46:08 -0800 Subject: [PATCH] Fixes catwalks smoothing with lattices (#54829) --- code/__DEFINES/icon_smoothing.dm | 1 + code/game/objects/structures/lattice.dm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index 239d8a29db4..b9964437c80 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -103,6 +103,7 @@ DEFINE_BITFIELD(smoothing_flags, list( #define SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE S_OBJ(24) ///obj/structure/window/shuttle #define SMOOTH_GROUP_LATTICE S_OBJ(30) ///obj/structure/lattice +#define SMOOTH_GROUP_CATWALK S_OBJ(31) ///obj/structure/lattice/catwalk #define SMOOTH_GROUP_AIRLOCK S_OBJ(40) ///obj/machinery/door/airlock diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index eacfe6142e7..bde9f9a4020 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -77,8 +77,8 @@ base_icon_state = "catwalk" number_of_mats = 2 smoothing_flags = SMOOTH_BITMASK - smoothing_groups = list(SMOOTH_GROUP_LATTICE, SMOOTH_GROUP_OPEN_FLOOR) - canSmoothWith = list(SMOOTH_GROUP_LATTICE) + smoothing_groups = list(SMOOTH_GROUP_LATTICE, SMOOTH_GROUP_CATWALK, SMOOTH_GROUP_OPEN_FLOOR) + canSmoothWith = list(SMOOTH_GROUP_CATWALK) obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP /obj/structure/lattice/catwalk/deconstruction_hints(mob/user)