diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm index 7cdaa54020b..fa4f71418e1 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm @@ -2159,11 +2159,6 @@ }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/cargodise_freighter/trauma) -"IA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/kitchen, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) "IP" = ( /obj/machinery/vending/dinnerware, /turf/open/floor/iron/kitchen, @@ -3039,12 +3034,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/kitchen, /area/ruin/space/has_grav/cargodise_freighter/kitchen) -"WE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) "WJ" = ( /obj/effect/turf_decal/tile/yellow/half{ dir = 4 @@ -4066,7 +4055,7 @@ Ey WQ Gg Zq -WE +wd YY Gg UL @@ -4635,7 +4624,7 @@ vH vH Gg gc -IA +FT FT FT JC diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm index ac334d9edf7..808950d1caf 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm @@ -7615,7 +7615,6 @@ "Qy" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/suit_storage_unit/industrial/hauler, -/obj/machinery/suit_storage_unit/industrial/hauler, /obj/effect/turf_decal/tile/brown/half{ dir = 8 }, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm index 0589f45fba1..8232aa56a5d 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm @@ -7213,7 +7213,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm/directional/west, /obj/machinery/suit_storage_unit/industrial/hauler, -/obj/machinery/suit_storage_unit/industrial/hauler, /obj/effect/turf_decal/tile/brown/half{ dir = 8 }, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm index 5514e997812..a7294b23f63 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm @@ -6335,7 +6335,6 @@ "Qy" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/suit_storage_unit/industrial/hauler, -/obj/machinery/suit_storage_unit/industrial/hauler, /obj/effect/turf_decal/tile/brown/half{ dir = 8 }, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm index 5ebeb664840..1a0adf42c2a 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm @@ -6955,7 +6955,6 @@ "Qy" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/suit_storage_unit/industrial/hauler, -/obj/machinery/suit_storage_unit/industrial/hauler, /obj/effect/turf_decal/tile/brown/half{ dir = 8 }, diff --git a/_maps/RandomZLevels/blackmesa.dmm b/_maps/RandomZLevels/blackmesa.dmm index a4484e7711d..187a8793e96 100644 --- a/_maps/RandomZLevels/blackmesa.dmm +++ b/_maps/RandomZLevels/blackmesa.dmm @@ -5090,9 +5090,6 @@ /turf/open/floor/iron/smooth, /area/awaymission/black_mesa/entrance_internal_hall) "cTO" = ( -/obj/machinery/power/emitter/energycannon{ - dir = 8 - }, /obj/machinery/power/emitter/energycannon{ dir = 8 }, @@ -6329,9 +6326,6 @@ /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/lambda_teleporter) "fjj" = ( -/obj/machinery/power/emitter/energycannon{ - dir = 4 - }, /obj/machinery/power/emitter/energycannon{ dir = 4 }, diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm index f763ff4a75c..cac5f1c7143 100644 --- a/_maps/map_files/NSVBlueshift/Blueshift.dmm +++ b/_maps/map_files/NSVBlueshift/Blueshift.dmm @@ -7548,10 +7548,6 @@ }, /obj/effect/mapping_helpers/requests_console/information, /obj/effect/mapping_helpers/requests_console/assistance, -/obj/machinery/requests_console/directional/west{ - department = "Toxins Lab"; - name = "Toxins Requests Console" - }, /obj/effect/mapping_helpers/requests_console/information, /obj/effect/mapping_helpers/requests_console/assistance, /obj/effect/turf_decal/bot, @@ -20850,7 +20846,7 @@ /obj/structure/railing, /obj/machinery/elevator_control_panel/directional/south{ linked_elevator_id = "publicElevator"; - preset_destination_names = list("2"="Lower Deck","3"="Upper Deck") + preset_destination_names = list("2"="Lower Deck","3"="Upper Deck") }, /turf/open/floor/plating/elevatorshaft, /area/station/hallway/primary/central) @@ -91796,7 +91792,6 @@ "pnj" = ( /obj/machinery/hydroponics/constructable, /obj/structure/flora/bush/sparsegrass, -/obj/machinery/hydroponics/constructable, /turf/open/floor/grass, /area/station/security/prison/garden) "pnk" = ( @@ -135000,7 +134995,6 @@ /obj/effect/turf_decal/box/white{ color = "#52B4E9" }, -/obj/machinery/portable_atmospherics/canister/anesthetic_mix, /obj/effect/turf_decal/tile/blue{ dir = 4 }, diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 706a9c71528..03d9738edd3 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -2144,10 +2144,6 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 }, -/obj/machinery/button/door/directional/south{ - id = "genetics_shutters"; - name = "Genetics Shutters" - }, /obj/item/storage/box/monkeycubes{ pixel_x = 6; pixel_y = 9 @@ -16605,7 +16601,6 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 }, -/obj/machinery/firealarm/directional/east, /obj/structure/bed/dogbed{ anchored = 1; name = "Markus's bed" diff --git a/tools/maplint/lints/multiple_machinery.yml b/tools/maplint/lints/multiple_machinery.yml new file mode 100644 index 00000000000..942d72b401e --- /dev/null +++ b/tools/maplint/lints/multiple_machinery.yml @@ -0,0 +1,4 @@ +/obj/machinery: + banned_neighbors: + /obj/machinery: + identical: true diff --git a/tools/maplint/source/lint.py b/tools/maplint/source/lint.py index 4af9ad5c1cf..ee86d29be52 100644 --- a/tools/maplint/source/lint.py +++ b/tools/maplint/source/lint.py @@ -66,7 +66,13 @@ class BannedNeighbor: def matches(self, identified: Content, neighbor: Content): if self.identical: - return neighbor == identified + if identified.path != neighbor.path: + return False + + if identified.var_edits != neighbor.var_edits: + return False + + return True if self.typepath is not None: if self.typepath.matches_path(neighbor.path):