Skip to content

nature autotiling #3

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

Draft
FalloutFalcon wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

nature autotiling #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26b389b
autotiling
FalloutFalcon Nov 5, 2025
715519f
yea
FalloutFalcon Nov 5, 2025
953a1e1
yea
FalloutFalcon Nov 5, 2025
0b53844
beach rough and cave
FalloutFalcon Nov 5, 2025
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
Binary file added icons/obj/smooth_structures/apoc/beach.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions icons/obj/smooth_structures/apoc/beach.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
output_name = "beach"
template = "bitmask/diagonal_32x32.toml"

[icon_size]
x = 50
y = 50

[output_icon_size]
x = 50
y = 50

[cut_pos]
x = 25
y = 25
0 ...modules/carpets/icons/blackgoldcarpet.dmi → ...tructures/apoc/carpet/blackgoldcarpet.dmi
View file
Open in desktop
File renamed without changes.
0 ...modules/carpets/icons/blackgoldcarpet.png → ...tructures/apoc/carpet/blackgoldcarpet.png
View file
Open in desktop
File renamed without changes
0 ...es/carpets/icons/blackgoldcarpet.png.toml → ...ures/apoc/carpet/blackgoldcarpet.png.toml
View file
Open in desktop
File renamed without changes.
0 ...dules/carpets/icons/blacksilvercarpet.dmi → ...uctures/apoc/carpet/blacksilvercarpet.dmi
View file
Open in desktop
File renamed without changes.
0 ...dules/carpets/icons/blacksilvercarpet.png → ...uctures/apoc/carpet/blacksilvercarpet.png
View file
Open in desktop
File renamed without changes
0 .../carpets/icons/blacksilvercarpet.png.toml → ...es/apoc/carpet/blacksilvercarpet.png.toml
View file
Open in desktop
File renamed without changes.
Binary file added icons/obj/smooth_structures/apoc/carpet/bluegoldcarpet.dmi
View file
Open in desktop
Binary file not shown.
0 .../modules/carpets/icons/bluegoldcarpet.png → ...structures/apoc/carpet/bluegoldcarpet.png
View file
Open in desktop
File renamed without changes
0 ...les/carpets/icons/bluegoldcarpet.png.toml → ...tures/apoc/carpet/bluegoldcarpet.png.toml
View file
Open in desktop
File renamed without changes.
0 ...odules/carpets/icons/bluesilvercarpet.dmi → ...ructures/apoc/carpet/bluesilvercarpet.dmi
View file
Open in desktop
File renamed without changes.
0 ...odules/carpets/icons/bluesilvercarpet.png → ...ructures/apoc/carpet/bluesilvercarpet.png
View file
Open in desktop
File renamed without changes
0 ...s/carpets/icons/bluesilvercarpet.png.toml → ...res/apoc/carpet/bluesilvercarpet.png.toml
View file
Open in desktop
File renamed without changes.
0 ...apoc/modules/carpets/icons/cyancarpet.dmi → ...oth_structures/apoc/carpet/cyancarpet.dmi
View file
Open in desktop
File renamed without changes.
0 ...apoc/modules/carpets/icons/cyancarpet.png → ...oth_structures/apoc/carpet/cyancarpet.png
View file
Open in desktop
File renamed without changes
0 ...modules/carpets/icons/cyancarpet.png.toml → ...tructures/apoc/carpet/cyancarpet.png.toml
View file
Open in desktop
File renamed without changes.
0 ...modules/carpets/icons/greengoldcarpet.dmi → ...tructures/apoc/carpet/greengoldcarpet.dmi
View file
Open in desktop
File renamed without changes.
0 ...modules/carpets/icons/greengoldcarpet.png → ...tructures/apoc/carpet/greengoldcarpet.png
View file
Open in desktop
File renamed without changes
0 ...es/carpets/icons/greengoldcarpet.png.toml → ...ures/apoc/carpet/greengoldcarpet.png.toml
View file
Open in desktop
File renamed without changes.
0 ...dules/carpets/icons/orangehotelcarpet.dmi → ...uctures/apoc/carpet/orangehotelcarpet.dmi
View file
Open in desktop
File renamed without changes.
0 ...dules/carpets/icons/orangehotelcarpet.png → ...uctures/apoc/carpet/orangehotelcarpet.png
View file
Open in desktop
File renamed without changes
0 .../carpets/icons/orangehotelcarpet.png.toml → ...es/apoc/carpet/orangehotelcarpet.png.toml
View file
Open in desktop
File renamed without changes.
0 ...ules/carpets/icons/orangesilvercarpet.dmi → ...ctures/apoc/carpet/orangesilvercarpet.dmi
View file
Open in desktop
File renamed without changes.
0 ...ules/carpets/icons/orangesilvercarpet.png → ...ctures/apoc/carpet/orangesilvercarpet.png
View file
Open in desktop
File renamed without changes
0 ...carpets/icons/orangesilvercarpet.png.toml → ...s/apoc/carpet/orangesilvercarpet.png.toml
View file
Open in desktop
File renamed without changes.
0 ...odules/carpets/icons/purplegoldcarpet.dmi → ...ructures/apoc/carpet/purplegoldcarpet.dmi
View file
Open in desktop
File renamed without changes.
0 ...odules/carpets/icons/purplegoldcarpet.png → ...ructures/apoc/carpet/purplegoldcarpet.png
View file
Open in desktop
File renamed without changes
0 ...s/carpets/icons/purplegoldcarpet.png.toml → ...res/apoc/carpet/purplegoldcarpet.png.toml
View file
Open in desktop
File renamed without changes.
0 ...c/modules/carpets/icons/redgoldcarpet.dmi → ..._structures/apoc/carpet/redgoldcarpet.dmi
View file
Open in desktop
File renamed without changes.
0 ...c/modules/carpets/icons/redgoldcarpet.png → ..._structures/apoc/carpet/redgoldcarpet.png
View file
Open in desktop
File renamed without changes
0 ...ules/carpets/icons/redgoldcarpet.png.toml → ...ctures/apoc/carpet/redgoldcarpet.png.toml
View file
Open in desktop
File renamed without changes.
0 ...modules/carpets/icons/redsilvercarpet.dmi → ...tructures/apoc/carpet/redsilvercarpet.dmi
View file
Open in desktop
File renamed without changes.
0 ...modules/carpets/icons/redsilvercarpet.png → ...tructures/apoc/carpet/redsilvercarpet.png
View file
Open in desktop
File renamed without changes
0 ...es/carpets/icons/redsilvercarpet.png.toml → ...ures/apoc/carpet/redsilvercarpet.png.toml
View file
Open in desktop
File renamed without changes.
Binary file added icons/obj/smooth_structures/apoc/cave.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions icons/obj/smooth_structures/apoc/cave.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
output_name = "beach"
template = "bitmask/diagonal_32x32.toml"

[icon_size]
x = 50
y = 50

[output_icon_size]
x = 50
y = 50

[cut_pos]
x = 25
y = 25
Binary file added icons/obj/smooth_structures/apoc/dirt.dmi
View file
Open in desktop
Binary file not shown.
Binary file added icons/obj/smooth_structures/apoc/dirt.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions icons/obj/smooth_structures/apoc/dirt.png.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
output_name = "dirt"
template = "bitmask/diagonal_32x32.toml"

[icon_size]
x = 50
y = 50

[output_icon_size]
x = 50
y = 50

[cut_pos]
x = 25
y = 25
Binary file added icons/obj/smooth_structures/apoc/grass.dmi
View file
Open in desktop
Binary file not shown.
Binary file added icons/obj/smooth_structures/apoc/grass.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions icons/obj/smooth_structures/apoc/grass.png.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
output_name = "grass"
template = "bitmask/diagonal_32x32.toml"

[icon_size]
x = 50
y = 50

[output_icon_size]
x = 50
y = 50

[cut_pos]
x = 25
y = 25
Binary file added icons/obj/smooth_structures/apoc/rough.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions icons/obj/smooth_structures/apoc/rough.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
output_name = "beach"
template = "bitmask/diagonal_32x32.toml"

[icon_size]
x = 50
y = 50

[output_icon_size]
x = 50
y = 50

[cut_pos]
x = 25
y = 25
22 changes: 11 additions & 11 deletions modular_zapoc/modules/carpets/code/carpets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,75 @@
/turf/open/floor/carpet/apoc
icon = 'modular_zapoc/modules/carpets/icons/redgoldcarpet.dmi'
icon = 'icons/obj/smooth_structures/apoc/carpet/redgoldcarpet.dmi'
icon_state = "redgoldcarpet-255"
base_icon_state = "redgoldcarpet"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET
canSmoothWith = SMOOTH_GROUP_CARPET

/turf/open/floor/carpet/apoc/redsilver
icon = 'modular_zapoc/modules/carpets/icons/redsilvercarpet.dmi'
icon = 'icons/obj/smooth_structures/apoc/carpet/redsilvercarpet.dmi'
icon_state = "redsilvercarpet-255"
base_icon_state = "redsilvercarpet"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_RED
canSmoothWith = SMOOTH_GROUP_CARPET_RED

/turf/open/floor/carpet/apoc/bluegold
icon = 'modular_zapoc/modules/carpets/icons/bluegoldcarpet.dmi'
icon = 'icons/obj/smooth_structures/apoc/carpet/bluegoldcarpet.dmi'
icon_state = "bluegoldcarpet-255"
base_icon_state = "bluegoldcarpet"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_ROYAL_BLUE
canSmoothWith = SMOOTH_GROUP_CARPET_ROYAL_BLUE

/turf/open/floor/carpet/apoc/bluesilver
icon = 'modular_zapoc/modules/carpets/icons/bluesilvercarpet.dmi'
icon = 'icons/obj/smooth_structures/apoc/carpet/bluesilvercarpet.dmi'
icon_state = "bluesilvercarpet-255"
base_icon_state = "bluesilvercarpet"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_BLUE
canSmoothWith = SMOOTH_GROUP_CARPET_BLUE

/turf/open/floor/carpet/apoc/cyan
icon = 'modular_zapoc/modules/carpets/icons/cyancarpet.dmi'
icon = 'icons/obj/smooth_structures/apoc/carpet/cyancarpet.dmi'
icon_state = "cyancarpet-255"
base_icon_state = "cyancarpet"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_CYAN
canSmoothWith = SMOOTH_GROUP_CARPET_CYAN

/turf/open/floor/carpet/apoc/blackgold
icon = 'modular_zapoc/modules/carpets/icons/blackgoldcarpet.dmi'
icon = 'icons/obj/smooth_structures/apoc/carpet/blackgoldcarpet.dmi'
icon_state = "blackgoldcarpet-255"
base_icon_state = "blackgoldcarpet"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_ROYAL_BLACK
canSmoothWith = SMOOTH_GROUP_CARPET_ROYAL_BLACK

/turf/open/floor/carpet/apoc/blacksilver
icon = 'modular_zapoc/modules/carpets/icons/blacksilvercarpet.dmi'
icon = 'icons/obj/smooth_structures/apoc/carpet/blacksilvercarpet.dmi'
icon_state = "blacksilvercarpet-255"
base_icon_state = "blacksilvercarpet"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_BLACK
canSmoothWith = SMOOTH_GROUP_CARPET_BLACK

/turf/open/floor/carpet/apoc/purplegold
icon = 'modular_zapoc/modules/carpets/icons/purplegoldcarpet.dmi'
icon = 'icons/obj/smooth_structures/apoc/carpet/purplegoldcarpet.dmi'
icon_state = "purplegoldcarpet-255"
base_icon_state = "purplegoldcarpet"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_PURPLE
canSmoothWith = SMOOTH_GROUP_CARPET_PURPLE

/turf/open/floor/carpet/apoc/greengold
icon = 'modular_zapoc/modules/carpets/icons/greengoldcarpet.dmi'
icon = 'icons/obj/smooth_structures/apoc/carpet/greengoldcarpet.dmi'
icon_state = "greengoldcarpet-255"
base_icon_state = "greengoldcarpet"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_GREEN
canSmoothWith = SMOOTH_GROUP_CARPET_GREEN

/turf/open/floor/carpet/apoc/orangesilver
icon = 'modular_zapoc/modules/carpets/icons/orangesilvercarpet.dmi'
icon = 'icons/obj/smooth_structures/apoc/carpet/orangesilvercarpet.dmi'
icon_state = "orangesilvercarpet-255"
base_icon_state = "orangesilvercarpet"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_ORANGE
canSmoothWith = SMOOTH_GROUP_CARPET_ORANGE

/turf/open/floor/carpet/apoc/hotel
icon = 'modular_zapoc/modules/carpets/icons/orangehotelcarpet.dmi'
icon = 'icons/obj/smooth_structures/apoc/carpet/orangehotelcarpet.dmi'
icon_state = "orangehotelcarpet-255"
base_icon_state = "orangehotelcarpet"
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET_DONK
Expand Down
Binary file removed modular_zapoc/modules/carpets/icons/bluegoldcarpet.dmi
View file
Open in desktop
Binary file not shown.
46 changes: 46 additions & 0 deletions modular_zapoc/modules/floors/code/autocutting.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/turf/open/misc/grass
icon_state = "grass1"
icon = 'modular_zapoc/modules/floors/icons/tiles.dmi'
smooth_icon = 'icons/obj/smooth_structures/apoc/grass.dmi'

/turf/open/misc/dirt
icon = 'modular_zapoc/modules/floors/icons/tiles.dmi'
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_FLOOR_GRASS
canSmoothWith = SMOOTH_GROUP_FLOOR_GRASS + SMOOTH_GROUP_CLOSED_TURFS
var/smooth_icon = 'icons/obj/smooth_structures/apoc/dirt.dmi'

/turf/open/misc/dirt/Initialize(mapload)
. = ..()
if(smoothing_flags)
var/matrix/translation = new
translation.Translate(LARGE_TURF_SMOOTHING_X_OFFSET, LARGE_TURF_SMOOTHING_Y_OFFSET)
transform = translation
icon = smooth_icon

/turf/open/misc/dirt/dark
smooth_icon = null

/turf/open/misc/dirt/jungle
smooth_icon = null

/*
/turf/open/misc/beach/vamp
base_icon_state = "beach"
icon = 'icons/obj/smooth_structures/apoc/beach.dmi'

smoothing_flags = SMOOTH_BITMASK
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_FLOOR_GRASS
canSmoothWith = SMOOTH_GROUP_FLOOR_GRASS + SMOOTH_GROUP_CLOSED_TURFS
smooth_broken = TRUE
smooth_burnt = TRUE
layer = HIGH_TURF_LAYER

/turf/open/misc/beach/vamp/Initialize(mapload)
. = ..()
if(smoothing_flags)
var/matrix/translation = new
translation.Translate(LARGE_TURF_SMOOTHING_X_OFFSET, LARGE_TURF_SMOOTHING_Y_OFFSET)
transform = translation
//icon = smooth_icon
*/
Binary file added modular_zapoc/modules/floors/icons/tiles.dmi
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// DM Environment file for tgstation.dme.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\computers\code\app_types.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\computers\code\app.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\computers\code\computer.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\frenzy\code\frenzy.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\combat\code\blocking\blocking.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\combat\code\blocking\blocking_hud.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\combat\code\blocking\blocking_keybind.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\combat\code\face_target.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\vampire_the_masquerade\code\blood_sorcery\pyramid.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement 

Missing include for modular_darkpack\modules\vampire_the_masquerade\code\blood_sorcery\mysticism.dm.
// All manual changes should be made outside the BEGIN_ and END_ blocks.
// New source code should be placed in .dm files: choose File/New --> Code File.

Expand Down Expand Up @@ -7091,4 +7091,5 @@
#include "modular_darkpack\modules\z_travel\code\manhole.dm"
#include "modular_darkpack\modules\z_travel\code\transfer_point.dm"
#include "modular_zapoc\modules\carpets\code\carpets.dm"
#include "modular_zapoc\modules\floors\code\autocutting.dm"
// END_INCLUDE
Loading