From cebb274ec1b63885910c28ea31eb1baa4843170b Mon Sep 17 00:00:00 2001 From: Roxy <75404941+TealSeer@users.noreply.github.com> Date: Thu, 6 Nov 2025 14:29:37 -0500 Subject: [PATCH] Fix overlapping smoothing groups --- code/__DEFINES/icon_smoothing.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index 4f12de242b0..8499727c4c8 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -221,11 +221,6 @@ DEFINE_BITFIELD(smoothing_junction, list( #define SMOOTH_GROUP_SPIDER_WEB_WALL_TOUGH S_OBJ(73) // /obj/structure/spider/stickyweb/sealed/thick #define SMOOTH_GROUP_SPIDER_WEB_WALL_MIRROR S_OBJ(74) // /obj/structure/spider/stickyweb/sealed/reflector -//SKYRAT EDIT ADDITION -#define SMOOTH_GROUP_SHUTTERS S_OBJ(75) - -#define SMOOTH_GROUP_WATER S_OBJ(76) ///obj/effect/abstract/liquid_turf -//SKYRAT EDIT END #define SMOOTH_GROUP_GRAV_FIELD S_OBJ(75) #define SMOOTH_GROUP_GIRDER S_OBJ(76) #define SMOOTH_GROUP_TEST_WALL S_OBJ(77) // I'm a lazy bum who doesn't want to increment all of these up by 1 ~Lemon @@ -240,6 +235,11 @@ DEFINE_BITFIELD(smoothing_junction, list( #define SMOOTH_GROUP_PLATFORMS_PAPER S_OBJ(86) ///obj/structure/platform/paper #define SMOOTH_GROUP_BOULDER_PLATFORM S_OBJ(87) ///obj/structure/lattice/catwalk/boulder +//SKYRAT EDIT ADDITION +#define SMOOTH_GROUP_SHUTTERS S_OBJ(88) + +#define SMOOTH_GROUP_WATER S_OBJ(89) ///obj/effect/abstract/liquid_turf +//SKYRAT EDIT END /// Performs the work to set smoothing_groups and canSmoothWith. /// An inlined function used in both turf/Initialize and atom/Initialize.