diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index f1f564047046e..639911aec470d 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -70698,38 +70698,15 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/camera/autoname{ - dir = 6 - }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/sign/poster/official/moth1{ - pixel_y = 32 - }, -/obj/structure/chair{ - dir = 4 - }, /obj/machinery/camera/autoname{ dir = 9 }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, /turf/open/floor/iron/showroomfloor, /area/science/aft) "rjN" = (