From 5c75ddb4c2e990e010a8034d5d9a9a6e2dc4df4e Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Date: Sun, 24 May 2026 11:01:46 +0100 Subject: [PATCH] smooth mineral walls (#32016) --- code/__DEFINES/icon_smoothing_defines.dm | 43 ++++++++----------- code/game/objects/structures/false_walls.dm | 32 +++++++------- code/game/objects/structures/window.dm | 4 +- code/game/turfs/simulated/minerals.dm | 8 ++-- .../turfs/simulated/walls_indestructible.dm | 14 +++--- code/game/turfs/simulated/walls_mineral.dm | 19 +------- 6 files changed, 49 insertions(+), 71 deletions(-) diff --git a/code/__DEFINES/icon_smoothing_defines.dm b/code/__DEFINES/icon_smoothing_defines.dm index c1f3feb3b33..525ccd6b9f0 100644 --- a/code/__DEFINES/icon_smoothing_defines.dm +++ b/code/__DEFINES/icon_smoothing_defines.dm @@ -69,7 +69,7 @@ DEFINE_BITFIELD(smoothing_flags, list( #define SMOOTH_GROUP_MATERIAL_WALLS S_TURF(23) ///turf/simulated/wall/material #define SMOOTH_GROUP_SYNDICATE_WALLS S_TURF(24) ///turf/simulated/wall/r_wall/syndicate, /turf/simulated/indestructible/syndicate #define SMOOTH_GROUP_HOTEL_WALLS S_TURF(25) ///turf/simulated/indestructible/hotelwall -#define SMOOTH_GROUP_MINERAL_WALLS S_TURF(26) ///turf/simulated/mineral, /obj/structure/falsewall/rock_ancient +#define SMOOTH_GROUP_ROCK_WALLS S_TURF(26) ///turf/simulated/mineral, /obj/structure/falsewall/rock_ancient #define SMOOTH_GROUP_BOSS_WALLS S_TURF(27) ///turf/simulated/indestructible/riveted/boss #define SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS S_TURF(28) ///turf/simulated/wall/mineral/titanium/survival @@ -83,31 +83,24 @@ DEFINE_BITFIELD(smoothing_flags, list( /* /obj included */ #define SMOOTH_GROUP_WALLS S_OBJ(0) ///turf/simulated/wall, /obj/structure/falsewall -#define SMOOTH_GROUP_URANIUM_WALLS S_OBJ(1) ///turf/simulated/wall/mineral/uranium, /obj/structure/falsewall/uranium -#define SMOOTH_GROUP_GOLD_WALLS S_OBJ(2) ///turf/simulated/wall/mineral/gold, /obj/structure/falsewall/gold -#define SMOOTH_GROUP_SILVER_WALLS S_OBJ(3) ///turf/simulated/wall/mineral/silver, /obj/structure/falsewall/silver -#define SMOOTH_GROUP_DIAMOND_WALLS S_OBJ(4) ///turf/simulated/wall/mineral/diamond, /obj/structure/falsewall/diamond -#define SMOOTH_GROUP_PLASMA_WALLS S_OBJ(5) ///turf/simulated/wall/mineral/plasma, /obj/structure/falsewall/plasma -#define SMOOTH_GROUP_BANANIUM_WALLS S_OBJ(6) ///turf/simulated/wall/mineral/bananium, /obj/structure/falsewall/bananium -#define SMOOTH_GROUP_SANDSTONE_WALLS S_OBJ(7) ///turf/simulated/wall/mineral/sandstone, /obj/structure/falsewall/sandstone -#define SMOOTH_GROUP_WOOD_WALLS S_OBJ(8) ///turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood -#define SMOOTH_GROUP_IRON_WALLS S_OBJ(9) ///turf/simulated/wall/mineral/iron, /obj/structure/falsewall/iron -#define SMOOTH_GROUP_ABDUCTOR_WALLS S_OBJ(10) ///turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor -#define SMOOTH_GROUP_TITANIUM_WALLS S_OBJ(11) ///turf/simulated/wall/mineral/titanium, /obj/structure/falsewall/titanium -#define SMOOTH_GROUP_ASTEROID_WALLS S_OBJ(12) ///turf/simulated/mineral, /obj/structure/falsewall/rock_ancient -#define SMOOTH_GROUP_PLASTITANIUM_WALLS S_OBJ(13) ///turf/simulated/wall/mineral/plastitanium, /obj/structure/falsewall/plastitanium -#define SMOOTH_GROUP_SURVIVAL_TIANIUM_POD S_OBJ(14) ///turf/simulated/wall/mineral/titanium/survival/pod, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod -#define SMOOTH_GROUP_HIERO_WALL S_OBJ(15) ///obj/effect/temp_visual/elite_tumor_wall, /obj/effect/temp_visual/hierophant/wall -#define SMOOTH_GROUP_BRASS_WALL S_OBJ(16) ///turf/simulated/wall/mineral/brass, /obj/structure/falsewall/brass -#define SMOOTH_GROUP_REGULAR_WALLS S_OBJ(17) ///turf/simulated/wall, /obj/structure/falsewall -#define SMOOTH_GROUP_REINFORCED_WALLS S_OBJ(18) ///turf/simulated/wall/r_wall, /obj/structure/falsewall/reinforced -#define SMOOTH_GROUP_CULT_WALLS S_OBJ(19) ///turf/simulated/wall/cult -#define SMOOTH_GROUP_BACKROOMS_WALLS S_OBJ(20) ///turf/simulated/wall/backrooms, /obj/structure/falsewall/backrooms +#define SMOOTH_GROUP_MINERAL_WALLS S_OBJ(1) ///turf/simulated/wall/mineral, /obj/structure/falsewall variants for said mineral walls. +#define SMOOTH_GROUP_IRON_WALLS S_OBJ(2) ///turf/simulated/wall/mineral/iron, /obj/structure/falsewall/iron +#define SMOOTH_GROUP_ABDUCTOR_WALLS S_OBJ(3) ///turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor +#define SMOOTH_GROUP_TITANIUM_WALLS S_OBJ(4) ///turf/simulated/wall/mineral/titanium, /obj/structure/falsewall/titanium +#define SMOOTH_GROUP_ASTEROID_WALLS S_OBJ(5) ///turf/simulated/mineral, /obj/structure/falsewall/rock_ancient +#define SMOOTH_GROUP_PLASTITANIUM_WALLS S_OBJ(6) ///turf/simulated/wall/mineral/plastitanium, /obj/structure/falsewall/plastitanium +#define SMOOTH_GROUP_SURVIVAL_TIANIUM_POD S_OBJ(7) ///turf/simulated/wall/mineral/titanium/survival/pod, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod +#define SMOOTH_GROUP_HIERO_WALL S_OBJ(8) ///obj/effect/temp_visual/elite_tumor_wall, /obj/effect/temp_visual/hierophant/wall +#define SMOOTH_GROUP_BRASS_WALL S_OBJ(9) ///turf/simulated/wall/mineral/brass, /obj/structure/falsewall/brass +#define SMOOTH_GROUP_REGULAR_WALLS S_OBJ(10) ///turf/simulated/wall, /obj/structure/falsewall +#define SMOOTH_GROUP_REINFORCED_WALLS S_OBJ(11) ///turf/simulated/wall/r_wall, /obj/structure/falsewall/reinforced +#define SMOOTH_GROUP_CULT_WALLS S_OBJ(12) ///turf/simulated/wall/cult +#define SMOOTH_GROUP_BACKROOMS_WALLS S_OBJ(13) ///turf/simulated/wall/backrooms, /obj/structure/falsewall/backrooms -#define SMOOTH_GROUP_WINDOW_FULLTILE S_OBJ(21) ///turf/simulated/indestructible/fakeglass, /obj/structure/window/full/basic, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /obj/structure/window/full/reinforced -#define SMOOTH_GROUP_WINDOW_FULLTILE_BRASS S_OBJ(22) ///obj/structure/window/brass/fulltile -#define SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM S_OBJ(23) ///turf/simulated/indestructible/fakeglass/plastitanium, /obj/structure/window/plasma/reinforced/plastitanium -#define SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE S_OBJ(24) ///obj/structure/window/shuttle +#define SMOOTH_GROUP_WINDOW_FULLTILE S_OBJ(14) ///turf/simulated/indestructible/fakeglass, /obj/structure/window/full/basic, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /obj/structure/window/full/reinforced +#define SMOOTH_GROUP_WINDOW_FULLTILE_BRASS S_OBJ(15) ///obj/structure/window/brass/fulltile +#define SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM S_OBJ(16) ///turf/simulated/indestructible/fakeglass/plastitanium, /obj/structure/window/plasma/reinforced/plastitanium +#define SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE S_OBJ(17) ///obj/structure/window/shuttle #define SMOOTH_GROUP_LATTICE S_OBJ(30) ///obj/structure/lattice diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 9f666388d5c..7f6fb4f20f9 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -222,8 +222,8 @@ walltype = /turf/simulated/wall/mineral/uranium var/active = FALSE var/last_event = 0 - smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_URANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_URANIUM_WALLS) + smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_MINERAL_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_MINERAL_WALLS) /obj/structure/falsewall/uranium/Initialize(mapload) . = ..() @@ -241,8 +241,8 @@ base_icon_state = "gold_wall" mineral = /obj/item/stack/sheet/mineral/gold walltype = /turf/simulated/wall/mineral/gold - smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_GOLD_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_GOLD_WALLS) + smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_MINERAL_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_MINERAL_WALLS) /obj/structure/falsewall/silver name = "silver wall" @@ -252,8 +252,8 @@ base_icon_state = "silver_wall" mineral = /obj/item/stack/sheet/mineral/silver walltype = /turf/simulated/wall/mineral/silver - smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SILVER_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SILVER_WALLS) + smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_MINERAL_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_MINERAL_WALLS) /obj/structure/falsewall/diamond name = "diamond wall" @@ -263,8 +263,8 @@ base_icon_state = "diamond_wall" mineral = /obj/item/stack/sheet/mineral/diamond walltype = /turf/simulated/wall/mineral/diamond - smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_DIAMOND_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_DIAMOND_WALLS) + smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_MINERAL_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_MINERAL_WALLS) max_integrity = 800 @@ -276,8 +276,8 @@ base_icon_state = "plasma_wall" mineral = /obj/item/stack/sheet/mineral/plasma walltype = /turf/simulated/wall/mineral/plasma - smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_PLASMA_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_PLASMA_WALLS) + smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_MINERAL_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_MINERAL_WALLS) cares_about_temperature = TRUE /obj/structure/falsewall/plasma/item_interaction(mob/living/user, obj/item/used, list/modifiers) @@ -320,8 +320,8 @@ base_icon_state = "bananium_wall" mineral = /obj/item/stack/sheet/mineral/bananium walltype = /turf/simulated/wall/mineral/bananium - smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BANANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_BANANIUM_WALLS) + smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_MINERAL_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_MINERAL_WALLS) /obj/structure/falsewall/sandstone name = "sandstone wall" @@ -331,8 +331,8 @@ base_icon_state = "sandstone_wall" mineral = /obj/item/stack/sheet/mineral/sandstone walltype = /turf/simulated/wall/mineral/sandstone - smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SANDSTONE_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SANDSTONE_WALLS) + smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_MINERAL_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_MINERAL_WALLS) /obj/structure/falsewall/wood name = "wooden wall" @@ -342,8 +342,8 @@ base_icon_state = "wood_wall" mineral = /obj/item/stack/sheet/wood walltype = /turf/simulated/wall/mineral/wood - smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WOOD_WALLS) + smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_MINERAL_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_MINERAL_WALLS) /obj/structure/falsewall/iron name = "rough metal wall" diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 37c2216a2c0..a6b36df1d79 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -962,8 +962,8 @@ icon_state = "clockwork_window-0" base_icon_state = "clockwork_window" smoothing_flags = SMOOTH_BITMASK - smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WINDOW_FULLTILE_BRASS, SMOOTH_GROUP_BRASS_WALL, SMOOTH_GROUP_WOOD_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE_BRASS, SMOOTH_GROUP_BRASS_WALL, SMOOTH_GROUP_WOOD_WALLS) + smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WINDOW_FULLTILE_BRASS, SMOOTH_GROUP_BRASS_WALL, SMOOTH_GROUP_MINERAL_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE_BRASS, SMOOTH_GROUP_BRASS_WALL, SMOOTH_GROUP_MINERAL_WALLS) fulltile = TRUE flags = PREVENT_CLICK_UNDER dir = FULLTILE_WINDOW_DIR diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index dcb17c7477d..ce6112c2bce 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -7,8 +7,8 @@ icon_state = "smoothrocks-0" base_icon_state = "smoothrocks" smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER - smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_MINERAL_WALLS) - canSmoothWith = list(SMOOTH_GROUP_MINERAL_WALLS) + smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_ROCK_WALLS) + canSmoothWith = list(SMOOTH_GROUP_ROCK_WALLS) baseturf = /turf/simulated/floor/plating/asteroid/airless opacity = TRUE density = TRUE @@ -210,8 +210,8 @@ /turf/simulated/mineral/ancient name = "ancient rock" desc = "A rare asteroid rock that appears to be resistant to all mining tools except pickaxes!" - smoothing_groups = list(SMOOTH_GROUP_MINERAL_WALLS, SMOOTH_GROUP_ASTEROID_WALLS) - canSmoothWith = list(SMOOTH_GROUP_MINERAL_WALLS, SMOOTH_GROUP_ASTEROID_WALLS) + smoothing_groups = list(SMOOTH_GROUP_ROCK_WALLS, SMOOTH_GROUP_ASTEROID_WALLS) + canSmoothWith = list(SMOOTH_GROUP_ROCK_WALLS, SMOOTH_GROUP_ASTEROID_WALLS) mine_time = 6 SECONDS color = COLOR_ANCIENT_ROCK layer = MAP_EDITOR_TURF_LAYER diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm index 7edc955f606..11f37f228da 100644 --- a/code/game/turfs/simulated/walls_indestructible.dm +++ b/code/game/turfs/simulated/walls_indestructible.dm @@ -130,14 +130,14 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen) icon = 'icons/turf/walls/32x40uranium_wall.dmi' icon_state = "uranium_wall-0" base_icon_state = "uranium_wall" - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_URANIUM_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_MINERAL_WALLS) /turf/simulated/wall/indestructible/wood icon = 'icons/turf/walls/32x40wood_wall.dmi' icon_state = "wood_wall-0" base_icon_state = "wood_wall" - smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WOOD_WALLS) + smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_MINERAL_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_MINERAL_WALLS) /turf/simulated/wall/indestructible/alien name = "alien wall" @@ -201,8 +201,8 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen) /turf/simulated/wall/indestructible/fakeglass/brass icon = 'icons/obj/smooth_structures/windows/32x40clockwork_window.dmi' base_icon_state = "clockwork_window" - smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE_BRASS, SMOOTH_GROUP_BRASS_WALL, SMOOTH_GROUP_WOOD_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE_BRASS, SMOOTH_GROUP_BRASS_WALL, SMOOTH_GROUP_WOOD_WALLS) + smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE_BRASS, SMOOTH_GROUP_BRASS_WALL, SMOOTH_GROUP_MINERAL_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE_BRASS, SMOOTH_GROUP_BRASS_WALL, SMOOTH_GROUP_MINERAL_WALLS) edge_overlay_file = 'icons/obj/smooth_structures/windows/clockwork_window_edges.dmi' /turf/simulated/wall/indestructible/fakeglass/plastitanium @@ -239,8 +239,8 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen) icon_state = "smoothrocks-0" base_icon_state = "smoothrocks" smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER - smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_MINERAL_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_MINERAL_WALLS) + smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_ROCK_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_ROCK_WALLS) color = COLOR_ROCK /turf/simulated/wall/indestructible/rock/snow diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index ebb7ad61837..9498c7e1f25 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -5,6 +5,8 @@ canSmoothWith = null var/last_event = 0 var/active = FALSE + smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_MINERAL_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_MINERAL_WALLS) /turf/simulated/wall/mineral/shuttleRotate(rotation) return //This override is needed to properly rotate the object when on a shuttle that is rotated. @@ -17,8 +19,6 @@ base_icon_state = "gold_wall" sheet_type = /obj/item/stack/sheet/mineral/gold explosion_block = 0 //gold is a soft metal you dingus. - smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_GOLD_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_GOLD_WALLS) /turf/simulated/wall/mineral/silver name = "silver wall" @@ -27,8 +27,6 @@ icon_state = "silver_wall-0" base_icon_state = "silver_wall" sheet_type = /obj/item/stack/sheet/mineral/silver - smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SILVER_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SILVER_WALLS) /turf/simulated/wall/mineral/diamond name = "diamond wall" @@ -38,8 +36,6 @@ base_icon_state = "diamond_wall" sheet_type = /obj/item/stack/sheet/mineral/diamond explosion_block = 3 - smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_DIAMOND_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_DIAMOND_WALLS) rust_resistance = RUST_RESISTANCE_REINFORCED /turf/simulated/wall/mineral/bananium @@ -49,8 +45,6 @@ icon_state = "bananium_wall-0" base_icon_state = "bananium_wall" sheet_type = /obj/item/stack/sheet/mineral/bananium - smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BANANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_BANANIUM_WALLS) /turf/simulated/wall/mineral/sandstone name = "sandstone wall" @@ -60,8 +54,6 @@ base_icon_state = "sandstone_wall" sheet_type = /obj/item/stack/sheet/mineral/sandstone explosion_block = 0 - smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SANDSTONE_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SANDSTONE_WALLS) /turf/simulated/wall/mineral/uranium name = "uranium wall" @@ -70,8 +62,6 @@ icon_state = "uranium_wall-0" base_icon_state = "uranium_wall" sheet_type = /obj/item/stack/sheet/mineral/uranium - smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_URANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_URANIUM_WALLS) rust_resistance = RUST_RESISTANCE_REINFORCED /turf/simulated/wall/mineral/uranium/Initialize(mapload) @@ -87,8 +77,6 @@ base_icon_state = "plasma_wall" sheet_type = /obj/item/stack/sheet/mineral/plasma thermal_conductivity = 0.04 - smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_PLASMA_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_PLASMA_WALLS) /turf/simulated/wall/mineral/plasma/attack_by(obj/item/attacking, mob/user, params) if(..()) @@ -149,8 +137,6 @@ sheet_type = /obj/item/stack/sheet/wood hardness = 70 explosion_block = 0 - smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS) - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WOOD_WALLS) /turf/simulated/wall/mineral/wood/attack_by(obj/item/attacking, mob/user, params) if(..()) @@ -169,7 +155,6 @@ desc = "A solidly wooden wall. It's a bit weaker than a wall made with metal." girder_type = /obj/structure/barricade/wooden hardness = 50 - canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS) /turf/simulated/wall/mineral/iron name = "rough metal wall"