diff --git a/_maps/RandomRuins/SpaceRuins/derelict3.dmm b/_maps/RandomRuins/SpaceRuins/derelict3.dmm index 37b726dc75b..c5a0b2c0123 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict3.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict3.dmm @@ -12,11 +12,6 @@ /obj/structure/lattice, /turf/template_noop, /area/space/nearstation) -"e" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/template_noop, -/area/space/nearstation) (1,1,1) = {" a @@ -301,7 +296,7 @@ a d d a -e +d d b a diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm index b4afe5213cc..5eb0f68693c 100644 --- a/_maps/RandomZLevels/wildwest.dmm +++ b/_maps/RandomZLevels/wildwest.dmm @@ -581,11 +581,6 @@ }, /turf/open/space, /area/space/nearstation) -"cu" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/open/space, -/area/space/nearstation) "cv" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/carpet, @@ -17103,7 +17098,7 @@ br br br br -cu +br br aa aa @@ -26366,7 +26361,7 @@ br br br br -cu +br br aa aa @@ -26609,7 +26604,7 @@ aa aa aa br -cu +br br br br @@ -27652,7 +27647,7 @@ aG aG aG br -cu +br br aa aa @@ -28148,7 +28143,7 @@ aa aa aa aa -cu +br br aa aa diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index d3eee3ac982..9dc50887542 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -24818,23 +24818,6 @@ /obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/research) -"buH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - dir = 4 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" - }, -/turf/open/floor/plasteel/white, -/area/science/research) "buI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ dir = 1 @@ -52687,11 +52670,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) -"sNJ" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/open/space, -/area/space/nearstation) "sOs" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, @@ -55678,11 +55656,6 @@ }, /turf/open/floor/plating, /area/medical/break_room) -"xLe" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) "xOq" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -64881,7 +64854,7 @@ vul auP vul aaf -sNJ +aaf aaa aaa aaa @@ -78710,11 +78683,11 @@ fbS fyS aai gXs -xLe +gXs aaa aaa aaa -xLe +gXs aaa aaa aaa @@ -78967,11 +78940,11 @@ jUA aft abz gXs -xLe +gXs aaa aaa aaa -xLe +gXs aaa aaa aaa @@ -79228,7 +79201,7 @@ aaa aaa aaa aaa -xLe +gXs aaa aiU aln @@ -79481,8 +79454,8 @@ fbS aft abz gXs -xLe -xLe +gXs +gXs aaf aaf aaf diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index e2572f4644d..93a96976245 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -64832,7 +64832,6 @@ dir = 4 }, /obj/structure/lattice, -/obj/structure/lattice, /turf/open/space, /area/space/nearstation) "cqo" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 50dcef9c901..66197faed6a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -37091,19 +37091,6 @@ "bJd" = ( /turf/open/floor/engine/n2o, /area/engine/atmos) -"bJe" = ( -/obj/structure/lattice, -/obj/structure/grille, -/obj/structure/lattice, -/obj/structure/lattice, -/turf/closed/wall/r_wall, -/area/space/nearstation) -"bJf" = ( -/obj/structure/lattice, -/obj/structure/grille, -/obj/structure/lattice, -/turf/closed/wall/r_wall, -/area/space/nearstation) "bJg" = ( /obj/machinery/telecomms/message_server/preset, /turf/open/floor/circuit/telecomms/mainframe, @@ -37726,12 +37713,6 @@ }, /turf/open/floor/engine/n2o, /area/engine/atmos) -"bKK" = ( -/obj/structure/grille, -/obj/structure/lattice, -/obj/structure/lattice, -/turf/closed/wall/r_wall, -/area/space/nearstation) "bKL" = ( /obj/machinery/telecomms/processor/preset_two, /turf/open/floor/circuit/telecomms/mainframe, @@ -124220,9 +124201,9 @@ ckI bAR aaf aaa -bJf +bzj aaf -bKK +bzj aaf aaa aaa @@ -125763,7 +125744,7 @@ ckM cmf cmf aaa -bKK +bzj aaa aaa aaa @@ -126020,7 +126001,7 @@ bCC bCC ckM aaf -bKK +bzj aaa aaa aaa @@ -126277,7 +126258,7 @@ cme bCC cjo aaa -bKK +bzj aaf aaa aaa @@ -127280,19 +127261,19 @@ bzj bzj bzj bzj -bJe +bzi bzj bzj aai bzj bzj bzj -bKK bzj bzj bzj bzj -bJe +bzj +bzi bzj aai bzj @@ -127794,19 +127775,19 @@ bzi bzi bzi bzi -bJf +bzj bzi bzi bzi bzi bzi bzi -bJf +bzj bzi bzi bzi bzi -bJf +bzj aaf aaf aaf @@ -128309,7 +128290,7 @@ bzj siF bzj bzj -bKK +bzj bzj bzj bzj @@ -128320,7 +128301,7 @@ bzj bzj bzj bzj -bKK +bzj bzj bzj anS diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 4e8153c1829..49fd7a1baa7 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -38494,7 +38494,6 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bRC" = ( -/obj/structure/lattice, /obj/structure/window/reinforced{ dir = 8 }, @@ -48086,11 +48085,6 @@ }, /turf/closed/wall, /area/library/lounge) -"cyL" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/closed/mineral, -/area/chapel/asteroid/monastery) "cyM" = ( /obj/structure/lattice, /turf/closed/mineral, @@ -54978,12 +54972,6 @@ /obj/structure/piano, /turf/open/floor/plasteel/dark, /area/maintenance/department/crew_quarters/dorms) -"pmj" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space, -/area/space/nearstation) "pnU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ dir = 4; @@ -55243,12 +55231,6 @@ icon_state = "wood-broken5" }, /area/maintenance/department/engine) -"pWb" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) "pWm" = ( /obj/machinery/door/window/southleft{ dir = 4; @@ -57396,11 +57378,6 @@ }, /turf/open/floor/circuit/telecomms, /area/science/xenobiology) -"uwj" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) "uwX" = ( /obj/machinery/field/generator, /turf/open/floor/plating, @@ -80035,7 +80012,7 @@ cfN aaa aaa aaa -cyL +cyM cfN cfN cfN @@ -88497,7 +88474,7 @@ ePB imB cdm aht -uwj +aht aht aht aht @@ -91846,7 +91823,7 @@ bXk abI aaa aaa -pmj +aby aaa aaa aaa @@ -95684,7 +95661,7 @@ bJP aaa aby aht -pWb +fon aaa aht aaa diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index a8dd685292e..a977b077a4c 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -28,8 +28,10 @@ /obj/structure/lattice/Initialize(mapload) . = ..() for(var/obj/structure/lattice/LAT in loc) - if(LAT != src) - QDEL_IN(LAT, 0) + if(LAT == src) + continue + stack_trace("multiple lattices found in ([loc.x], [loc.y], [loc.z])") + return INITIALIZE_HINT_QDEL /obj/structure/lattice/blob_act(obj/structure/blob/B) return