diff --git a/code/modules/unit_tests/map_tests.dm b/code/modules/unit_tests/map_tests.dm index 6b458c61ab..38eb847879 100644 --- a/code/modules/unit_tests/map_tests.dm +++ b/code/modules/unit_tests/map_tests.dm @@ -207,15 +207,32 @@ /datum/unit_test/ladder_test/Run() for(var/obj/structure/ladder/L in world) var/turf/T = get_turf(L) + TEST_ASSERT(T, "[L.x].[L.y].[L.z]: Map - Ladder on invalid turf") if(!T) - TEST_FAIL("[L.x].[L.y].[L.z]: Map - Ladder on invalid turf") continue if(L.allowed_directions & UP) - if(!L.target_up) - TEST_FAIL("[T.x].[T.y].[T.z]: Map - Ladder allows upward movement, but had no ladder above it") + TEST_ASSERT(L.target_up, "[T.x].[T.y].[T.z]: Map - Ladder allows upward movement, but had no ladder above it") if(L.allowed_directions & DOWN) - if(!L.target_down) - TEST_FAIL("[T.x].[T.y].[T.z]: Map - Ladder allows downward movement, but had no ladder beneath it") - if(T.density) - TEST_FAIL("[L.x].[L.y].[L.z]: Map - Ladder is inside a wall") + TEST_ASSERT(L.target_down, "[T.x].[T.y].[T.z]: Map - Ladder allows downward movement, but had no ladder beneath it") + + TEST_ASSERT(!T.density, "[L.x].[L.y].[L.z]: Map - Ladder is inside a wall") + +/// Test the smes on the map +/datum/unit_test/smes_validity + +/datum/unit_test/smes_validity/Run() + var/failed = FALSE + var/list/used_tags = list() + + for(var/obj/machinery/power/smes/buildable/unit in world) + if(unit.RCon_tag == initial(unit.RCon_tag)) + continue + if(unit.RCon_tag in used_tags) + TEST_NOTICE(src, "[unit.x].[unit.y].[unit.z]: Map - Smes has an already used RCon_tag: \"[unit.RCon_tag]\"") + failed = TRUE + continue + used_tags += unit.RCon_tag + + if(failed) + TEST_FAIL("Map has smes with duplicated RCon_tag") diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index fe1e6bb980..356c861817 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -1920,7 +1920,7 @@ dir = 1 }, /obj/machinery/power/smes/buildable/offmap_spawn{ - RCon_tag = "Talon Port SMES" + RCon_tag = "Talon SMES Primary" }, /obj/structure/cable/green{ icon_state = "0-4" @@ -3920,7 +3920,7 @@ /area/talon_v2/crew_quarters/sec_room) "mT" = ( /obj/machinery/power/smes/buildable/offmap_spawn{ - RCon_tag = "Talon Port SMES" + RCon_tag = "Talon Boat SMES" }, /obj/structure/cable/yellow, /turf/simulated/floor/tiled/techfloor, @@ -9511,7 +9511,7 @@ /area/talon_v2/crew_quarters/sec_room) "GP" = ( /obj/machinery/power/smes/buildable/offmap_spawn{ - RCon_tag = "Talon Port SMES" + RCon_tag = "Talon SMES Secondary" }, /obj/structure/cable/green{ icon_state = "0-4" @@ -12329,7 +12329,7 @@ pixel_y = -32 }, /obj/machinery/power/smes/buildable/offmap_spawn{ - RCon_tag = "Talon Port SMES" + RCon_tag = "Talon SMES Tertiary" }, /obj/structure/cable/green{ icon_state = "0-4" diff --git a/modular_chomp/maps/cetus/cetus-3.dmm b/modular_chomp/maps/cetus/cetus-3.dmm index c8d118030b..1a2adf088c 100644 --- a/modular_chomp/maps/cetus/cetus-3.dmm +++ b/modular_chomp/maps/cetus/cetus-3.dmm @@ -39385,7 +39385,7 @@ icon_state = "0-5" }, /obj/machinery/power/smes/buildable/engine_default{ - RCon_tag = "Telecommunications Satellite" + RCon_tag = "AI Chamber" }, /obj/item/smes_coil, /obj/item/smes_coil, @@ -40048,7 +40048,7 @@ icon_state = "0-4" }, /obj/machinery/power/smes/buildable/engine_default{ - RCon_tag = "Telecommunications Satellite" + RCon_tag = "AI Server" }, /obj/item/smes_coil, /obj/item/smes_coil,