From 559a55aae7f92520380bd89992d98dabfa089b82 Mon Sep 17 00:00:00 2001 From: Woodratt Date: Thu, 5 Oct 2023 12:29:22 -0700 Subject: [PATCH 1/2] Adjusts the central elevator so it can go to the basement, as per union demands. --- maps/cynosure/cynosure-1.dmm | 30 ++++++++++++------------------ maps/cynosure/cynosure-2.dmm | 12 ++++-------- maps/cynosure/cynosure-3.dmm | 6 +++--- maps/cynosure/cynosure_areas.dm | 7 +++++++ maps/cynosure/cynosure_elevator.dm | 2 ++ 5 files changed, 28 insertions(+), 29 deletions(-) diff --git a/maps/cynosure/cynosure-1.dmm b/maps/cynosure/cynosure-1.dmm index 5a8a3fd177..02bd7f7be1 100644 --- a/maps/cynosure/cynosure-1.dmm +++ b/maps/cynosure/cynosure-1.dmm @@ -281,7 +281,7 @@ specialfunctions = 4 }, /turf/simulated/floor/plating, -/area/surface/station/construction/elevator) +/area/surface/station/hallway/primary/bmt/east) "aG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1355,8 +1355,8 @@ /turf/simulated/floor/plating, /area/surface/station/maintenance/medical/south) "cN" = ( -/turf/simulated/wall/concrete, -/area/surface/station/construction/elevator) +/turf/simulated/floor/tiled/techfloor/grid, +/area/surface/station/hallway/primary/bmt/east) "cO" = ( /turf/simulated/mineral/ignore_mapgen/sif, /area/surface/cave/unexplored/deep) @@ -1836,7 +1836,7 @@ /area/surface/station/maintenance/storage/emergency/bmtswest) "dP" = ( /turf/simulated/wall/r_concrete, -/area/surface/station/construction/elevator) +/area/surface/station/hallway/primary/bmt/east) "dQ" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/borderfloorwhite{ @@ -4031,10 +4031,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/borderfloor/corner{ dir = 4 }, -/obj/effect/floor_decal/corner/green/border{ +/obj/effect/floor_decal/corner/green/bordercorner{ dir = 4 }, /turf/simulated/floor/tiled, @@ -4976,7 +4976,7 @@ /area/surface/station/engineering/hallway/bmt) "kr" = ( /turf/simulated/floor/plating, -/area/surface/station/construction/elevator) +/area/surface/station/hallway/primary/bmt/east) "ks" = ( /turf/simulated/wall/concrete, /area/surface/station/hallway/secondary/bmt/eaststairwell) @@ -18672,14 +18672,8 @@ /turf/simulated/floor/plating, /area/surface/station/maintenance/storage/emergency/bmtswest) "MK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green/bordercorner{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/obj/turbolift_map_holder/cynosure/center, +/turf/simulated/floor/plating, /area/surface/station/hallway/primary/bmt/east) "ML" = ( /obj/machinery/conveyor{ @@ -61144,7 +61138,7 @@ Ur Rh Rh iA -MK +hs Qz QZ rP @@ -61399,10 +61393,10 @@ HS dT pi Ai +eE TQ TQ TQ -IO TQ TQ YR @@ -61912,7 +61906,7 @@ dP kr kr kr -kr +MK dP IO IO diff --git a/maps/cynosure/cynosure-2.dmm b/maps/cynosure/cynosure-2.dmm index f6c6bbdb58..4c95fc19f0 100644 --- a/maps/cynosure/cynosure-2.dmm +++ b/maps/cynosure/cynosure-2.dmm @@ -36378,10 +36378,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/surface/station/ai/upload) -"qbj" = ( -/obj/turbolift_map_holder/cynosure/center, -/turf/unsimulated/mask, -/area/surface/station/hallway/primary/groundfloor/east) "qbC" = ( /obj/machinery/door/firedoor/border_only, /obj/structure/grille, @@ -52932,8 +52928,8 @@ dir = 8 }, /obj/item/reagent_containers/hypospray/autoinjector/detox{ - filled_reagents = list("anti_toxin" = 10); amount_per_transfer_from_this = 10; + filled_reagents = list("anti_toxin" = 10); volume = 10 }, /turf/simulated/floor/tiled/freezer, @@ -53161,13 +53157,13 @@ /obj/item/storage/firstaid/regular, /obj/item/storage/pill_bottle/spaceacillin, /obj/item/reagent_containers/hypospray/autoinjector/detox{ - filled_reagents = list("anti_toxin" = 10); amount_per_transfer_from_this = 10; + filled_reagents = list("anti_toxin" = 10); volume = 10 }, /obj/item/reagent_containers/hypospray/autoinjector/detox{ - filled_reagents = list("anti_toxin" = 10); amount_per_transfer_from_this = 10; + filled_reagents = list("anti_toxin" = 10); volume = 10 }, /turf/simulated/floor/wood, @@ -91543,7 +91539,7 @@ fRF mOM mOM mOM -qbj +mOM fRF lQW ekU diff --git a/maps/cynosure/cynosure-3.dmm b/maps/cynosure/cynosure-3.dmm index a5b9cff7cb..45640b3ce3 100644 --- a/maps/cynosure/cynosure-3.dmm +++ b/maps/cynosure/cynosure-3.dmm @@ -21939,8 +21939,8 @@ "olt" = ( /obj/structure/bed/chair/wood/pine{ color = "#3a6ecf"; - name = "undersized chair"; - desc = "Damn, that's uncomfortable..." + desc = "Damn, that's uncomfortable..."; + name = "undersized chair" }, /turf/simulated/floor/wood, /area/unionoffice) @@ -30628,8 +30628,8 @@ /obj/item/storage/firstaid/regular, /obj/item/storage/pill_bottle/spaceacillin, /obj/item/reagent_containers/hypospray/autoinjector/detox{ - filled_reagents = list("anti_toxin"=10); amount_per_transfer_from_this = 10; + filled_reagents = list("anti_toxin"=10); volume = 10 }, /turf/simulated/floor/tiled, diff --git a/maps/cynosure/cynosure_areas.dm b/maps/cynosure/cynosure_areas.dm index 008c549aad..a4535508fb 100644 --- a/maps/cynosure/cynosure_areas.dm +++ b/maps/cynosure/cynosure_areas.dm @@ -1407,6 +1407,13 @@ lift_announce_str = "Arriving at Second Floor: Atmospherics. EVA. CE Office. Locker Rooms." holomap_color = HOLOMAP_AREACOLOR_ENGINEERING +/area/turbolift/center_bmt + name = "lift (basement)" + lift_floor_label = "Basement" + lift_floor_name = "Basement" + lift_announce_str = "Arriving at Basement: Mining.Storage. Toxins. Vault." + base_turf = /turf/simulated/floor + /area/turbolift/center_gnd name = "lift (ground floor)" lift_floor_label = "Ground Floor" diff --git a/maps/cynosure/cynosure_elevator.dm b/maps/cynosure/cynosure_elevator.dm index 8a72b2514c..0c9b0e1862 100644 --- a/maps/cynosure/cynosure_elevator.dm +++ b/maps/cynosure/cynosure_elevator.dm @@ -19,10 +19,12 @@ icon = 'icons/obj/turbolift_preview_3x3.dmi' name = "Cynosure turbolift map placeholder - Center" dir = WEST + depth = 3 lift_size_x = 3 lift_size_y = 3 areas_to_use = list( + /area/turbolift/center_bmt, /area/turbolift/center_gnd, /area/turbolift/center_snd ) From 81eff37e99061b780ab766cf600c22ead55c5637 Mon Sep 17 00:00:00 2001 From: Woodratt Date: Thu, 5 Oct 2023 12:40:32 -0700 Subject: [PATCH 2/2] Update cynosure_areas.dm --- maps/cynosure/cynosure_areas.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/cynosure/cynosure_areas.dm b/maps/cynosure/cynosure_areas.dm index a4535508fb..61e11b1f5d 100644 --- a/maps/cynosure/cynosure_areas.dm +++ b/maps/cynosure/cynosure_areas.dm @@ -1370,7 +1370,7 @@ name = "lift (basement)" lift_floor_label = "Basement" lift_floor_name = "Basement" - lift_announce_str = "Arriving at Basement: Mining.Storage. Toxins. Vault." + lift_announce_str = "Arriving at Basement: Mining. Storage. Toxins. Vault." base_turf = /turf/simulated/floor /area/turbolift/west_gnd @@ -1411,7 +1411,7 @@ name = "lift (basement)" lift_floor_label = "Basement" lift_floor_name = "Basement" - lift_announce_str = "Arriving at Basement: Mining.Storage. Toxins. Vault." + lift_announce_str = "Arriving at Basement: Mining. Storage. Toxins. Vault." base_turf = /turf/simulated/floor /area/turbolift/center_gnd