From 94b0cbb16b749bab3ffc1cba4fafe736b0e0b4bb Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Thu, 25 May 2023 17:51:55 +0100 Subject: [PATCH] light light pass --- .../engine_submaps_vr/tether/engine_sme.dmm | 9 ++- maps/tether/submaps/tether_centcom.dmm | 6 +- maps/tether/tether-01-surface1.dmm | 3 + maps/tether/tether-03-surface3.dmm | 1 + maps/tether/tether-05-station1.dmm | 58 +++++++++++++++---- 5 files changed, 63 insertions(+), 14 deletions(-) diff --git a/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm b/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm index 0b831f3f23c..8180975429b 100644 --- a/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm +++ b/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm @@ -134,6 +134,9 @@ /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 1 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor, /area/engineering/engine_room) "az" = ( @@ -1591,6 +1594,10 @@ /obj/item/device/geiger/wall/south, /turf/template_noop, /area/template_noop) +"UW" = ( +/obj/machinery/light, +/turf/simulated/floor, +/area/engineering/engine_room) (1,1,1) = {" aa @@ -1966,7 +1973,7 @@ bQ cf cq cB -aE +UW cJ cY cN diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm index 65e216ed525..3333aeb76d4 100644 --- a/maps/tether/submaps/tether_centcom.dmm +++ b/maps/tether/submaps/tether_centcom.dmm @@ -1297,7 +1297,7 @@ /area/centcom/specops) "dG" = ( /obj/machinery/conveyor{ - dir = 4; + dir = 8; id = "QMLoad2" }, /turf/simulated/shuttle/floor, @@ -6614,10 +6614,10 @@ name = "Shuttle Hatch" }, /obj/machinery/conveyor{ - dir = 4; + dir = 8; id = "QMLoad2" }, -/turf/simulated/shuttle/plating, +/turf/simulated/shuttle/floor, /area/shuttle/supply) "BM" = ( /obj/effect/floor_decal/fancy_shuttle{ diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index be6b4515a9c..44d85843029 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -20656,6 +20656,9 @@ dir = 4; pixel_x = 24 }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore/office) "aHU" = ( diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 653eccfe256..1cb9e939137 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -9068,6 +9068,7 @@ /obj/machinery/vending/snack{ dir = 1 }, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aov" = ( diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 0105eaff52b..0b23ae96685 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -6139,6 +6139,9 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/hallway) "any" = ( @@ -9291,6 +9294,7 @@ pixel_x = 2; pixel_y = 6 }, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/quartermaster/delivery) "awM" = ( @@ -9920,11 +9924,11 @@ "ayN" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/simple, /obj/machinery/conveyor{ - dir = 4; + dir = 8; id = "QMLoad2" }, -/obj/effect/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/storage) "ayP" = ( @@ -14090,6 +14094,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/machinery/light/floortube{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/foyer) "beU" = ( @@ -22594,6 +22601,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/wood, /area/quartermaster/qm) "jab" = ( @@ -24221,7 +24231,7 @@ /area/gateway/prep_room) "kHf" = ( /obj/machinery/conveyor_switch/oneway{ - //convdir = -1; //Incompatable with new behavior -Reo + //convdir = -1; //Incompatable with new behavior -Reo; id = "QMLoad2" }, /obj/machinery/light{ @@ -25032,6 +25042,11 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) +"lps" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light/floortube, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) "lqr" = ( /obj/machinery/atmospherics/binary/passive_gate, /obj/machinery/light/small{ @@ -25830,6 +25845,19 @@ }, /turf/simulated/floor/grass, /area/quartermaster/qm) +"mbB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration) "mcE" = ( /obj/structure/table/rack/shelf, /obj/item/weapon/tank/oxygen, @@ -30857,6 +30885,16 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"sAy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/floortube{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) "sBs" = ( /obj/structure/cable/green{ d1 = 1; @@ -30870,7 +30908,7 @@ /area/quartermaster/office) "sBQ" = ( /obj/machinery/conveyor{ - dir = 4; + dir = 8; id = "QMLoad2" }, /turf/simulated/floor, @@ -46935,12 +46973,12 @@ aBM lje tIs saQ -aEw +lps uqB uqB uqB uqB -tQu +sAy oPH tHB bOm @@ -47718,7 +47756,7 @@ bYN kRk bpT aWH -cto +afD cto cto cto @@ -47726,13 +47764,13 @@ cto cto cto bpT -cto +afD cto cto fez -afD +cto iaf -vLG +mbB gVQ hbc htA