Skip to content

fixes backwards smooth group ordering on wall resprite #1057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
00-Steven merged 1 commit into from
May 14, 2026
+19 −19
Merged

fixes backwards smooth group ordering on wall resprite #1057

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions modular_doppler/sprite_swaps/code/walls.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,101 +3,101 @@
/turf/closed/wall
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/wall.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/wall/r_wall
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/reinforced_wall.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/wall/ice
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/icedmetal_wall.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

// Mineral walls

/turf/closed/wall/mineral/silver
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/silver_wall.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/wall/mineral/uranium
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/uranium_wall.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/wall/mineral/wood
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/wood_wall.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/wall/mineral/iron
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/iron_wall.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/wall/mineral/titanium
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/shuttle_wall.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ|SMOOTH_DIAGONAL_CORNERS
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_TITANIUM_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_SHUTTLE_PARTS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_TITANIUM_WALLS + SMOOTH_GROUP_WALLS

/turf/closed/wall/mineral/titanium/nodiagonal
icon = MAP_SWITCH('modular_doppler/sprite_swaps/icons/turfs/walls/shuttle_wall.dmi', 'icons/turf/walls/misc_wall.dmi')
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_TITANIUM_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_SHUTTLE_PARTS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_TITANIUM_WALLS + SMOOTH_GROUP_WALLS

/turf/closed/wall/mineral/titanium/overspace
icon = MAP_SWITCH('modular_doppler/sprite_swaps/icons/turfs/walls/shuttle_wall.dmi', 'icons/turf/walls/misc_wall.dmi')
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ|SMOOTH_DIAGONAL_CORNERS
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_TITANIUM_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_SHUTTLE_PARTS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_TITANIUM_WALLS + SMOOTH_GROUP_WALLS

/turf/closed/wall/mineral/titanium/survival
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/survival_pod_walls.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/wall/mineral/titanium/survival/nodiagonal
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/survival_pod_walls.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

// Material walls

/turf/closed/wall/material
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/material_wall.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

// Indestructible walls

/turf/closed/indestructible/reinforced
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/reinforced_wall.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/indestructible/reinforced/titanium
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/shuttle_wall.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/indestructible/riveted
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/riveted.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
smoothing_groups = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/indestructible/riveted/uranium
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/uranium_wall.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/indestructible/wood
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/wood_wall.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/indestructible/iron
icon = 'modular_doppler/sprite_swaps/icons/turfs/walls/iron_wall.dmi'
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
canSmoothWith = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS
Loading