From fa3e6dd24c040a0812f4fd2b5bc8dac66cae826f Mon Sep 17 00:00:00 2001 From: MrMelbert Date: Sun, 19 Nov 2023 21:38:58 -0600 Subject: [PATCH 1/2] Wires Lima AI chamber, fix tube --- _maps/map_files/LimaStation/LimaStation.dmm | 81 +++++++++++++-------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/_maps/map_files/LimaStation/LimaStation.dmm b/_maps/map_files/LimaStation/LimaStation.dmm index c202bde2b77f..3bfde02b03c1 100644 --- a/_maps/map_files/LimaStation/LimaStation.dmm +++ b/_maps/map_files/LimaStation/LimaStation.dmm @@ -11661,7 +11661,6 @@ pixel_x = -28; pixel_y = 8 }, -/obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, /obj/machinery/door/window/brigdoor/left/directional/north{ name = "Primary AI Core Access"; @@ -11669,6 +11668,7 @@ }, /obj/effect/turf_decal/delivery/white, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "efV" = ( @@ -12057,7 +12057,6 @@ dir = 8; network = list("aicore") }, -/obj/structure/cable, /obj/machinery/door/window/brigdoor/left/directional/south{ name = "Primary AI Core Access"; req_access = list("ai_upload") @@ -16234,9 +16233,9 @@ /obj/machinery/power/smes{ charge = 5e+006 }, -/obj/structure/cable, /obj/machinery/light/cold/directional/east, /obj/effect/turf_decal/delivery/red, +/obj/structure/cable, /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "fIQ" = ( @@ -21439,11 +21438,11 @@ /turf/open/floor/plating, /area/station/maintenance/port/lower) "hAx" = ( -/obj/structure/transit_tube/station/dispenser{ - dir = 1 - }, /obj/machinery/status_display/ai/directional/south, /obj/effect/turf_decal/tile/dark_blue/fourcorners, +/obj/structure/transit_tube/station/dispenser/reverse{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "hAN" = ( @@ -25177,6 +25176,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, /obj/machinery/door/firedoor/heavy, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) "iLP" = ( @@ -25324,6 +25324,7 @@ pixel_x = -4 }, /obj/item/paper_bin, +/obj/structure/cable, /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "iOn" = ( @@ -28348,6 +28349,7 @@ dir = 8; network = list("aicore") }, +/obj/structure/cable, /turf/open/floor/circuit/telecomms, /area/station/ai_monitored/turret_protected/ai) "jRZ" = ( @@ -29474,7 +29476,6 @@ pixel_x = 23; pixel_y = 20 }, -/obj/structure/cable, /obj/effect/turf_decal/bot_white, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/mapping_helpers/requests_console/announcement, @@ -31068,6 +31069,7 @@ /area/station/science/xenobiology) "kKA" = ( /mob/living/simple_animal/bot/secbot/pingsky, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/station/ai_monitored/turret_protected/aisat_interior) "kKB" = ( @@ -32287,6 +32289,7 @@ /area/station/engineering/main) "lfI" = ( /obj/machinery/status_display/ai/directional/south, +/obj/structure/cable, /turf/open/floor/circuit/telecomms, /area/station/ai_monitored/turret_protected/ai) "lfS" = ( @@ -33661,8 +33664,8 @@ pixel_y = -22 }, /obj/effect/turf_decal/bot, -/obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "lAp" = ( @@ -33953,11 +33956,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/department/eva) -"lFv" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark/telecomms, -/area/station/ai_monitored/turret_protected/ai) "lFA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -34094,9 +34092,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/cargo) "lHH" = ( -/obj/structure/transit_tube/station/dispenser{ - dir = 1 - }, +/obj/structure/transit_tube/station/dispenser/reverse/flipped, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/maint) "lHZ" = ( @@ -38994,7 +38990,14 @@ dir = 4 }, /obj/structure/cable/multilayer/connected, -/obj/effect/turf_decal/box/red, +/obj/effect/turf_decal/arrows/red{ + dir = 4; + pixel_x = -15 + }, +/obj/effect/turf_decal/box/red/corners{ + dir = 4 + }, +/obj/effect/turf_decal/box/red/corners, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "noo" = ( @@ -41762,6 +41765,7 @@ "oiW" = ( /obj/effect/landmark/atmospheric_sanity/ignore_area, /obj/effect/baseturf_helper/reinforced_plating, +/obj/structure/cable, /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "ojg" = ( @@ -42032,6 +42036,7 @@ "oml" = ( /obj/structure/table/reinforced, /obj/machinery/fax, +/obj/structure/cable, /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "omn" = ( @@ -42305,6 +42310,7 @@ /area/station/maintenance/port/fore) "orT" = ( /obj/structure/sign/poster/official/state_laws/directional/south, +/obj/structure/cable, /turf/open/floor/circuit/telecomms, /area/station/ai_monitored/turret_protected/ai) "orW" = ( @@ -43143,8 +43149,11 @@ /turf/open/floor/iron/white, /area/station/medical/chemistry) "oGL" = ( -/obj/structure/cable, /obj/machinery/telecomms/relay/preset/station, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable, /turf/open/floor/circuit/telecomms, /area/station/ai_monitored/turret_protected/ai) "oGM" = ( @@ -47978,6 +47987,7 @@ charge = 5e+006 }, /obj/structure/cable, +/obj/effect/turf_decal/delivery/red, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "qkE" = ( @@ -57715,13 +57725,13 @@ /turf/open/floor/iron, /area/station/hallway/primary/upper) "tpy" = ( -/obj/structure/cable, /obj/machinery/camera{ c_tag = "AI Chamber - Starboard"; dir = 4; network = list("aicore") }, /obj/machinery/ntnet_relay, +/obj/structure/cable, /turf/open/floor/circuit/telecomms, /area/station/ai_monitored/turret_protected/ai) "tpC" = ( @@ -58375,10 +58385,14 @@ /turf/open/floor/iron, /area/station/security/courtroom) "tCG" = ( -/obj/machinery/power/terminal{ +/obj/effect/turf_decal/arrows/red{ + dir = 4; + pixel_x = -15 + }, +/obj/effect/turf_decal/box/red/corners, +/obj/effect/turf_decal/box/red/corners{ dir = 4 }, -/obj/effect/turf_decal/box/red, /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "tCH" = ( @@ -59077,8 +59091,8 @@ /turf/open/floor/iron, /area/station/cargo/miningdock) "tPA" = ( -/obj/structure/cable, /obj/machinery/status_display/ai/directional/east, +/obj/structure/cable, /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "tPE" = ( @@ -60401,7 +60415,6 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/station/ai_monitored/turret_protected/aisat/maint) "unb" = ( -/obj/structure/cable, /obj/effect/turf_decal/bot_white, /obj/machinery/ai_slipper{ uses = 10 @@ -61878,6 +61891,7 @@ "uMU" = ( /obj/machinery/status_display/ai/directional/west, /obj/machinery/photocopier, +/obj/structure/cable, /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "uMX" = ( @@ -68057,8 +68071,8 @@ pixel_y = 22 }, /obj/effect/turf_decal/bot, -/obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "xaY" = ( @@ -69376,6 +69390,11 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"xwV" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/turf/open/floor/iron/dark/telecomms, +/area/station/ai_monitored/turret_protected/ai) "xwZ" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -71659,12 +71678,12 @@ }, /area/station/cargo/miningdock) "ykm" = ( -/obj/structure/cable, /obj/machinery/ai_slipper{ uses = 10 }, /obj/effect/turf_decal/bot_white, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "ykw" = ( @@ -184773,7 +184792,7 @@ wkj wyy qZb kAt -yaw +tEP iym tUi wyy @@ -186061,7 +186080,7 @@ jmS btB jmS ilq -btB +brm hin wkj wkj @@ -186575,7 +186594,7 @@ hin uum hin ilq -mVD +xwV hin hin wkj @@ -187083,13 +187102,13 @@ bYt wkj hin hin -lFv +xwV ilq hin cRE hin ilq -lFv +xwV hin hin wkj @@ -187598,7 +187617,7 @@ xzK wkj hin brm -rPN +rzf gwx gZk gwx From 7f44a22dd1c77bf10cc15ef9a9599c217409dd02 Mon Sep 17 00:00:00 2001 From: MrMelbert Date: Sun, 7 Jan 2024 20:53:03 -0600 Subject: [PATCH 2/2] Bwah --- _maps/map_files/LimaStation/LimaStation.dmm | 36 ++++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/_maps/map_files/LimaStation/LimaStation.dmm b/_maps/map_files/LimaStation/LimaStation.dmm index 3bfde02b03c1..1cb1fbcaec33 100644 --- a/_maps/map_files/LimaStation/LimaStation.dmm +++ b/_maps/map_files/LimaStation/LimaStation.dmm @@ -10990,20 +10990,9 @@ /turf/open/floor/iron/dark/textured, /area/station/science/ordnance) "dRB" = ( -/obj/structure/table/reinforced, /obj/machinery/status_display/ai/directional/west, -/obj/item/clipboard{ - pixel_y = 7 - }, -/obj/item/folder/yellow{ - pixel_y = 9 - }, -/obj/item/electronics/apc{ - pixel_y = 8 - }, -/obj/item/electronics/airlock{ - pixel_y = 5 - }, +/obj/effect/turf_decal/bot_white, +/obj/structure/filingcabinet/chestdrawer, /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "dRF" = ( @@ -39586,8 +39575,21 @@ /obj/structure/table/reinforced, /obj/machinery/airalarm/directional/west, /obj/item/toy/talking/ai{ - pixel_y = 6; - pixel_x = 18 + pixel_y = 8; + pixel_x = 20 + }, +/obj/item/clipboard{ + pixel_y = 7 + }, +/obj/item/folder/yellow{ + pixel_y = 9 + }, +/obj/item/electronics/apc{ + pixel_y = 1; + pixel_x = 1 + }, +/obj/item/electronics/airlock{ + pixel_y = 5 }, /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) @@ -42037,6 +42039,7 @@ /obj/structure/table/reinforced, /obj/machinery/fax, /obj/structure/cable, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "omn" = ( @@ -54541,7 +54544,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "spY" = ( -/obj/machinery/firealarm/directional/north, +/obj/structure/sign/poster/official/ion_rifle/directional/north, /turf/open/floor/circuit/telecomms, /area/station/ai_monitored/turret_protected/ai) "sqq" = ( @@ -61892,6 +61895,7 @@ /obj/machinery/status_display/ai/directional/west, /obj/machinery/photocopier, /obj/structure/cable, +/obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "uMX" = (