From 8eb20ffa7dbc6ece5a7054f0b2df2c369b5dd0de Mon Sep 17 00:00:00 2001 From: "Ossa88 (SYNAPSE)" Date: Wed, 27 May 2026 00:34:59 -0700 Subject: [PATCH 1/7] Removes required shop trait from shops as it was a forced category --- .../SpaceRuins/spacemall_modular.dmm | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/spacemall_modular.dmm b/_maps/RandomRuins/SpaceRuins/spacemall_modular.dmm index d40ba28b1f4..4ea9fda8421 100644 --- a/_maps/RandomRuins/SpaceRuins/spacemall_modular.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacemall_modular.dmm @@ -1896,8 +1896,7 @@ /area/ruin/space/has_grav/spacemall/maint) "iT" = ( /obj/effect/landmark/modular_marker/shop{ - required_size = "8x5"; - placement_traits = list("shop") + required_size = "8x5" }, /turf/open/floor/modular_guide, /area/ruin/space/has_grav/spacemall/shop) @@ -2019,8 +2018,7 @@ /area/ruin/space/has_grav/spacemall) "jr" = ( /obj/effect/landmark/modular_marker/shop{ - required_size = "8x4"; - placement_traits = list("shop") + required_size = "8x4" }, /turf/open/floor/modular_guide, /area/ruin/space/has_grav/spacemall/shop2) @@ -2840,8 +2838,7 @@ /area/ruin/space/has_grav/spacemall/shop) "nF" = ( /obj/effect/landmark/modular_marker/shop{ - required_size = "6x7"; - placement_traits = list("shop") + required_size = "6x7" }, /turf/open/floor/modular_guide, /area/ruin/space/has_grav/spacemall/shop2) @@ -2991,8 +2988,7 @@ /area/ruin/space/has_grav/spacemall/maint) "or" = ( /obj/effect/landmark/modular_marker/shop{ - required_size = "6x5"; - placement_traits = list("shop") + required_size = "6x5" }, /turf/open/floor/modular_guide, /area/ruin/space/has_grav/spacemall/shop) @@ -5885,7 +5881,8 @@ "CD" = ( /obj/effect/landmark/modular_marker/shop{ required_size = "8x5"; - placement_traits = list("shop","noop") + placement_traits = list("noop"); + forced_category = null }, /turf/open/floor/modular_guide, /area/ruin/space/has_grav/spacemall/shop) @@ -6235,9 +6232,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall/dorms) "DW" = ( -/obj/effect/landmark/modular_marker/shop{ - placement_traits = list("shop") - }, +/obj/effect/landmark/modular_marker/shop, /turf/open/floor/modular_guide, /area/ruin/space/has_grav/spacemall/shop2) "DZ" = ( @@ -9228,7 +9223,6 @@ /area/ruin/space/has_grav/spacemall/maint) "Rl" = ( /obj/effect/landmark/modular_marker/shop{ - placement_traits = list("shop"); required_size = "6x5" }, /turf/open/floor/modular_guide, From fc2a566709b52040382436f8fdfa20fb710c47ae Mon Sep 17 00:00:00 2001 From: "Ossa88 (SYNAPSE)" Date: Wed, 27 May 2026 00:35:22 -0700 Subject: [PATCH 2/7] removes the global noop forbidden for noop required rooms --- _maps/PentestMaps/BeachRuins/beach_fishing_hut_modular.dmm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/_maps/PentestMaps/BeachRuins/beach_fishing_hut_modular.dmm b/_maps/PentestMaps/BeachRuins/beach_fishing_hut_modular.dmm index 16efae07603..5252bea8179 100644 --- a/_maps/PentestMaps/BeachRuins/beach_fishing_hut_modular.dmm +++ b/_maps/PentestMaps/BeachRuins/beach_fishing_hut_modular.dmm @@ -521,7 +521,8 @@ /obj/effect/landmark/modular_marker/small{ placement_traits = list("faction_pirate","enemy_pirate"); approved_rooms = list(/datum/map_template/modular_room/pirate/pirate_9x4_v1,/datum/map_template/modular_room/pirate/pirate_9x4_v2); - required_size = "9x4" + required_size = "9x4"; + forbidden_room_traits = null }, /turf/open/floor/modular_guide, /area/ruin/beach) @@ -627,7 +628,8 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "Vt" = ( /obj/effect/landmark/modular_marker/small{ - placement_traits = list("noop","faction_pirate","enemy_pirate") + placement_traits = list("noop","faction_pirate","enemy_pirate"); + forbidden_room_traits = null }, /turf/open/floor/modular_guide, /area/ruin/beach) From 701cfc9807b2fdf98096731ce4f0b46c82d00482 Mon Sep 17 00:00:00 2001 From: "Ossa88 (SYNAPSE)" Date: Wed, 27 May 2026 00:35:46 -0700 Subject: [PATCH 3/7] applies a blanket forbidden noop to cause accidental nooped rooms into non nooped locations --- modular_pentest/modules/modular_ruins/_modular_marker.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modular_pentest/modules/modular_ruins/_modular_marker.dm b/modular_pentest/modules/modular_ruins/_modular_marker.dm index 3ea3496b49d..e13df24c4f1 100644 --- a/modular_pentest/modules/modular_ruins/_modular_marker.dm +++ b/modular_pentest/modules/modular_ruins/_modular_marker.dm @@ -40,7 +40,9 @@ /// Optional: List of room traits that are forbidden (rooms with ANY of these traits will not spawn here) /// Example: list(MODULAR_ENV_VACUUM) - prevents rooms with vacuum from spawning on breathable planets - var/list/forbidden_room_traits = null + var/list/forbidden_room_traits = list( + MODULAR_NOOP // Exclude NOOP rooms by default, since they have no connections and often cause placement failures + ) /// Whether to pick randomly among compatible rooms or use the highest weighted one var/random_selection = TRUE From 186532aaa0cf71b95e5dd52188ffbcaffbf93c2c Mon Sep 17 00:00:00 2001 From: "Ossa88 (SYNAPSE)" Date: Wed, 27 May 2026 00:36:06 -0700 Subject: [PATCH 4/7] nulls forbidden room trait --- modular_pentest/modules/modular_ruins/ruins/proving_grounds.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modular_pentest/modules/modular_ruins/ruins/proving_grounds.dm b/modular_pentest/modules/modular_ruins/ruins/proving_grounds.dm index 31f35042a87..42a57eb762a 100644 --- a/modular_pentest/modules/modular_ruins/ruins/proving_grounds.dm +++ b/modular_pentest/modules/modular_ruins/ruins/proving_grounds.dm @@ -7,6 +7,8 @@ /datum/map_template/ruin/space/pentest/syndicircle this_ruin_uses_modular_rooms = TRUE +// LANDMARKS + /obj/effect/landmark/modular_marker/proving_grounds required_size = "14x14" placement_traits = list( @@ -14,6 +16,7 @@ MODULAR_LOOT_MAJOR, MODULAR_ENEMY_SYNDICATE ) + forbidden_room_traits = null /obj/effect/landmark/modular_marker/proving_grounds/northeast name = "Proving Grounds Marker - Northeast" From 953686d5c30da8b53e72aadac6e760b19f3e753c Mon Sep 17 00:00:00 2001 From: "Ossa88 (SYNAPSE)" Date: Wed, 27 May 2026 00:37:00 -0700 Subject: [PATCH 5/7] relocates shop landmark file location --- modular_pentest/modules/modular_ruins/ruins/shops.dm | 8 ++++++++ .../modules/modular_ruins/ruins/small_rooms.dm | 8 +++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/modular_pentest/modules/modular_ruins/ruins/shops.dm b/modular_pentest/modules/modular_ruins/ruins/shops.dm index b6191e9f63c..3c0b5fc33da 100644 --- a/modular_pentest/modules/modular_ruins/ruins/shops.dm +++ b/modular_pentest/modules/modular_ruins/ruins/shops.dm @@ -7,6 +7,14 @@ */ +// LANDMARKS + +/obj/effect/landmark/modular_marker/shop + required_size = "6x6" + forced_category = MODULAR_ROOM_SHOP + +// MAP TEMPLATES + /datum/map_template/modular_room/shop abstract_type = /datum/map_template/modular_room/shop room_category = MODULAR_ROOM_SHOP diff --git a/modular_pentest/modules/modular_ruins/ruins/small_rooms.dm b/modular_pentest/modules/modular_ruins/ruins/small_rooms.dm index 9e64851a56b..abbcfc813b4 100644 --- a/modular_pentest/modules/modular_ruins/ruins/small_rooms.dm +++ b/modular_pentest/modules/modular_ruins/ruins/small_rooms.dm @@ -10,12 +10,12 @@ */ +// LANDMARKS + /obj/effect/landmark/modular_marker/mall_bedrooms_2x2 name = "Small Bedroom Marker - 2x2" required_size = "2x2" - placement_traits = list( - MODULAR_ROOM_BEDROOM - ) + forced_category = MODULAR_ROOM_BEDROOM approved_rooms = list( /datum/map_template/modular_room/bedroom/bedroom_2x2_v1, @@ -30,6 +30,8 @@ /datum/map_template/modular_room/bedroom/bedroom_2x2_v10 ) +// MAP TEMPLATES + /datum/map_template/modular_room/bedroom abstract_type = /datum/map_template/modular_room/bedroom room_category = MODULAR_ROOM_BEDROOM From 738cfb9eb3b8ebf0622a1253ec16b73e6cfb9a27 Mon Sep 17 00:00:00 2001 From: "Ossa88 (SYNAPSE)" Date: Wed, 27 May 2026 00:37:09 -0700 Subject: [PATCH 6/7] see last commit --- modular_pentest/modules/modular_ruins/_modular_marker.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modular_pentest/modules/modular_ruins/_modular_marker.dm b/modular_pentest/modules/modular_ruins/_modular_marker.dm index e13df24c4f1..5a770ffeae9 100644 --- a/modular_pentest/modules/modular_ruins/_modular_marker.dm +++ b/modular_pentest/modules/modular_ruins/_modular_marker.dm @@ -219,10 +219,6 @@ required_size = "5x10" forced_category = MODULAR_ROOM_HALLWAY -/obj/effect/landmark/modular_marker/shop - required_size = "6x6" - forced_category = MODULAR_ROOM_SHOP - /** * ## Visual Guide Turfs * From 211b4347cfa943e14a524db81b5a21cc878e305c Mon Sep 17 00:00:00 2001 From: "Ossa88 (SYNAPSE)" Date: Wed, 27 May 2026 01:10:31 -0700 Subject: [PATCH 7/7] Opps wrong varible --- _maps/RandomRuins/SpaceRuins/spacemall_modular.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/RandomRuins/SpaceRuins/spacemall_modular.dmm b/_maps/RandomRuins/SpaceRuins/spacemall_modular.dmm index 4ea9fda8421..a53100398ff 100644 --- a/_maps/RandomRuins/SpaceRuins/spacemall_modular.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacemall_modular.dmm @@ -5882,7 +5882,7 @@ /obj/effect/landmark/modular_marker/shop{ required_size = "8x5"; placement_traits = list("noop"); - forced_category = null + forbidden_room_traits = null }, /turf/open/floor/modular_guide, /area/ruin/space/has_grav/spacemall/shop)