diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index ff27bbd65dc..63a7b2b2f93 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -219,6 +219,8 @@ DEFINE_BITFIELD(smoothing_junction, list( #define SMOOTH_GROUP_PLATFORMS_PIZZA S_OBJ(85) ///obj/structure/platform/pizza #define SMOOTH_GROUP_PLATFORMS_PAPER S_OBJ(86) ///obj/structure/platform/paper +#define SMOOTH_GROUP_BOULDER_PLATFORM S_OBJ(89) ///obj/structure/lattice/catwalk/boulder + /// Performs the work to set smoothing_groups and canSmoothWith. /// An inlined function used in both turf/Initialize and atom/Initialize. #define SETUP_SMOOTHING(...) \ diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 34279684ce1..4791a50f6fe 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -196,12 +196,11 @@ /obj/structure/lattice/catwalk/boulder name = "boulder platform" desc = "A boulder, floating on the molten hot deadly lava. More like a BOATlder." - icon = 'icons/obj/ore.dmi' - icon_state = "boulder_platform" + icon = 'icons/obj/smooth_structures/boulder_platform.dmi' + icon_state = "boulder_platform-0" base_icon_state = "boulder_platform" - smoothing_flags = NONE - smoothing_groups = null - canSmoothWith = null + smoothing_groups = SMOOTH_GROUP_BOULDER_PLATFORM + canSmoothWith = SMOOTH_GROUP_BOULDER_PLATFORM + SMOOTH_GROUP_FLOOR_LAVA build_material = null /// The type of particle to make before the platform collapses. var/warning_particle = /particles/smoke/ash @@ -224,10 +223,9 @@ . = ..() /obj/structure/lattice/catwalk/boulder/proc/pre_self_destruct() - if(istype(loc, /turf/open/lava/plasma)) - add_overlay("plasma_cracks") - else - add_overlay("lava_cracks") + var/mutable_appearance/cracks_overlay = mutable_appearance('icons/obj/ore.dmi', istype(loc, /turf/open/lava/plasma) ? "plasma_cracks" : "lava_cracks", src) + cracks_overlay.blend_mode = BLEND_INSET_OVERLAY + add_overlay(cracks_overlay) animate(src, alpha = 0, time = 2 SECONDS, pixel_y = -16, easing = QUAD_EASING|EASE_IN) addtimer(CALLBACK(src, PROC_REF(self_destruct)), 2 SECONDS) diff --git a/icons/obj/ore.dmi b/icons/obj/ore.dmi index 5346161a9e7..81a7cb03fdf 100644 Binary files a/icons/obj/ore.dmi and b/icons/obj/ore.dmi differ diff --git a/icons/obj/smooth_structures/boulder_platform.dmi b/icons/obj/smooth_structures/boulder_platform.dmi new file mode 100644 index 00000000000..34c99f2dd5c Binary files /dev/null and b/icons/obj/smooth_structures/boulder_platform.dmi differ diff --git a/icons/obj/smooth_structures/boulder_platform.png b/icons/obj/smooth_structures/boulder_platform.png new file mode 100644 index 00000000000..ac31e2b79be Binary files /dev/null and b/icons/obj/smooth_structures/boulder_platform.png differ diff --git a/icons/obj/smooth_structures/boulder_platform.png.toml b/icons/obj/smooth_structures/boulder_platform.png.toml new file mode 100644 index 00000000000..9bc68fe5cd5 --- /dev/null +++ b/icons/obj/smooth_structures/boulder_platform.png.toml @@ -0,0 +1,2 @@ +output_name = "boulder_platform" +template = "bitmask/diagonal_32x32.toml"