From a80a95fde31e8d3c5544ead4fc529903cdd3ce1c Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Tue, 25 Jun 2024 11:33:45 -0400 Subject: [PATCH 1/3] smoothing groups --- .../turfs/dirt.dm | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/code/modules/fantasystation_map_generation/turfs/dirt.dm b/code/modules/fantasystation_map_generation/turfs/dirt.dm index 21eae6e7decf2..c7f7bf8dd2e3d 100644 --- a/code/modules/fantasystation_map_generation/turfs/dirt.dm +++ b/code/modules/fantasystation_map_generation/turfs/dirt.dm @@ -5,13 +5,13 @@ gender = PLURAL icon = 'icons/turf/fantasystation/grass.dmi' - icon_state = "grass" + icon_state = "grass-255" base_icon_state = "grass" tiled_dirt = FALSE smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SGROUP_FANTASY_GRASS - canSmoothWith = SGROUP_FANTASY_GRASS + SMOOTH_GROUP_CLOSED_TURFS + canSmoothWith = SMOOTH_GROUP_CLOSED_TURFS + SGROUP_FANTASY_GRASS layer = HIGH_TURF_LAYER initial_gas_mix = OPENTURF_DEFAULT_ATMOS @@ -37,13 +37,13 @@ gender = PLURAL icon = 'icons/turf/fantasystation/sand.dmi' - icon_state = "sand" + icon_state = "sand-255" base_icon_state = "sand" tiled_dirt = FALSE smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SGROUP_DESERT_SAND - canSmoothWith = SGROUP_FANTASY_GRASS +SGROUP_DESERT_SAND + SMOOTH_GROUP_CLOSED_TURFS + canSmoothWith = SMOOTH_GROUP_CLOSED_TURFS + SGROUP_DESERT_SAND + SGROUP_FANTASY_GRASS layer = HIGH_TURF_LAYER initial_gas_mix = OPENTURF_DEFAULT_ATMOS @@ -70,13 +70,13 @@ gender = PLURAL icon = 'icons/turf/fantasystation/dry_dirt.dmi' - icon_state = "dry_dirt" + icon_state = "dry_dirt-255" base_icon_state = "dry_dirt" tiled_dirt = FALSE smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SGROUP_CRACKED_EARTH - canSmoothWith = SGROUP_FANTASY_GRASS +SGROUP_DESERT_SAND + SGROUP_CRACKED_EARTH + SMOOTH_GROUP_CLOSED_TURFS + canSmoothWith = SMOOTH_GROUP_CLOSED_TURFS + SGROUP_CRACKED_EARTH + SGROUP_DESERT_SAND + SGROUP_FANTASY_GRASS layer = HIGH_TURF_LAYER - 0.001 initial_gas_mix = OPENTURF_DEFAULT_ATMOS @@ -103,13 +103,13 @@ gender = PLURAL icon = 'icons/turf/fantasystation/dirt.dmi' - icon_state = "dirt" + icon_state = "dirt-255" base_icon_state = "dirt" tiled_dirt = FALSE smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SGROUP_ROCKY_SOIL - canSmoothWith = SGROUP_FANTASY_GRASS +SGROUP_DESERT_SAND + SGROUP_CRACKED_EARTH + SGROUP_ROCKY_SOIL + SMOOTH_GROUP_CLOSED_TURFS + canSmoothWith = SMOOTH_GROUP_CLOSED_TURFS + SGROUP_DESERT_SAND + SGROUP_CRACKED_EARTH + SGROUP_ROCKY_SOIL + SGROUP_FANTASY_GRASS layer = HIGH_TURF_LAYER - 0.002 initial_gas_mix = OPENTURF_DEFAULT_ATMOS @@ -135,13 +135,13 @@ gender = PLURAL icon = 'icons/turf/fantasystation/mud.dmi' - icon_state = "mud" + icon_state = "mud-255" base_icon_state = "mud" tiled_dirt = FALSE smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SGROUP_FANTASY_DIRT - canSmoothWith = SGROUP_FANTASY_GRASS +SGROUP_DESERT_SAND + SGROUP_CRACKED_EARTH + SGROUP_ROCKY_SOIL + SGROUP_FANTASY_DIRT + SMOOTH_GROUP_CLOSED_TURFS + canSmoothWith = SMOOTH_GROUP_CLOSED_TURFS + SGROUP_DESERT_SAND + SGROUP_CRACKED_EARTH + SGROUP_ROCKY_SOIL + SGROUP_FANTASY_DIRT + SGROUP_FANTASY_GRASS layer = HIGH_TURF_LAYER - 0.003 initial_gas_mix = OPENTURF_DEFAULT_ATMOS @@ -170,13 +170,13 @@ gender = PLURAL icon = 'icons/turf/fantasystation/clay.dmi' - icon_state = "clay" + icon_state = "clay-255" base_icon_state = "clay" tiled_dirt = FALSE smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SGROUP_FIRE_CLAY - canSmoothWith = SGROUP_FANTASY_GRASS +SGROUP_DESERT_SAND + SGROUP_CRACKED_EARTH + SGROUP_ROCKY_SOIL + SGROUP_FANTASY_DIRT + SGROUP_FIRE_CLAY + SMOOTH_GROUP_CLOSED_TURFS + canSmoothWith = SMOOTH_GROUP_CLOSED_TURFS + SGROUP_DESERT_SAND + SGROUP_CRACKED_EARTH + SGROUP_ROCKY_SOIL + SGROUP_FANTASY_DIRT + SGROUP_FIRE_CLAY + SGROUP_FANTASY_GRASS layer = HIGH_TURF_LAYER - 0.004 initial_gas_mix = OPENTURF_DEFAULT_ATMOS From 51d8415451cae9b388c7c7c25e1effca72eb9bbd Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Tue, 25 Jun 2024 11:48:50 -0400 Subject: [PATCH 2/3] fixes an out of place define --- code/modules/fantasystation_map_generation/turfs/dirt.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/fantasystation_map_generation/turfs/dirt.dm b/code/modules/fantasystation_map_generation/turfs/dirt.dm index c7f7bf8dd2e3d..158d02289229f 100644 --- a/code/modules/fantasystation_map_generation/turfs/dirt.dm +++ b/code/modules/fantasystation_map_generation/turfs/dirt.dm @@ -76,7 +76,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SGROUP_CRACKED_EARTH - canSmoothWith = SMOOTH_GROUP_CLOSED_TURFS + SGROUP_CRACKED_EARTH + SGROUP_DESERT_SAND + SGROUP_FANTASY_GRASS + canSmoothWith = SMOOTH_GROUP_CLOSED_TURFS + SGROUP_DESERT_SAND + SGROUP_CRACKED_EARTH + SGROUP_FANTASY_GRASS layer = HIGH_TURF_LAYER - 0.001 initial_gas_mix = OPENTURF_DEFAULT_ATMOS From 700f2c00170f9fbb69879ae3741fbf1420456f1d Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Tue, 25 Jun 2024 12:02:26 -0400 Subject: [PATCH 3/3] fixes some other ci stuff --- .../fantasystation_map_generation/random_resources/trees.dm | 2 +- .../turf_farms/turf_farm_component.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/fantasystation_map_generation/random_resources/trees.dm b/code/modules/fantasystation_map_generation/random_resources/trees.dm index f2134c855d37d..f33c85810fd98 100644 --- a/code/modules/fantasystation_map_generation/random_resources/trees.dm +++ b/code/modules/fantasystation_map_generation/random_resources/trees.dm @@ -42,7 +42,7 @@ /obj/structure/flora/fantasy_tree/stump name = "stump" desc = "This represents our promise to the elves, and the world itself. To cut down as many trees as possible." - icon_state = "tree_stump" + icon_state = "tree_1_stump" density = FALSE delete_on_harvest = TRUE seethrough = FALSE diff --git a/code/modules/fantasystation_map_generation/turf_farms/turf_farm_component.dm b/code/modules/fantasystation_map_generation/turf_farms/turf_farm_component.dm index 94f9952e5e8b1..01cc6b51c1421 100644 --- a/code/modules/fantasystation_map_generation/turf_farms/turf_farm_component.dm +++ b/code/modules/fantasystation_map_generation/turf_farms/turf_farm_component.dm @@ -17,7 +17,8 @@ /datum/component/turf_farm/Destroy(force) UnregisterSignal(turf_parent, list(COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_EXAMINE, COMSIG_QDELETING)) - UnregisterSignal(tracked_farm, COMSIG_QDELETING) + if(tracked_farm) + UnregisterSignal(tracked_farm, COMSIG_QDELETING) QDEL_NULL(tracked_farm) turf_parent = null return ..()