diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 89316f2eb65..5f7accf0610 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -1114,13 +1114,6 @@
},
/obj/machinery/holopad,
/obj/effect/landmark/start/depsec/medical,
-/obj/machinery/button/door/directional/west{
- id = "MedbayFoyer";
- name = "Medbay Doors Control";
- normaldoorcontrol = 1;
- pixel_x = -35;
- pixel_y = -56
- },
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/medical)
"atM" = (
@@ -10177,6 +10170,11 @@
},
/obj/structure/cable,
/obj/effect/turf_decal/tile/red/full,
+/obj/machinery/button/door/directional/south{
+ id = "MedbayFoyer";
+ name = "Medbay Doors Control";
+ normaldoorcontrol = 1
+ },
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/medical)
"cZe" = (
@@ -14166,6 +14164,11 @@
/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/stack/sheet/mineral/plasma,
/obj/machinery/light/directional/north,
+/obj/machinery/button/door/directional/north{
+ id = "pharmacy_shutters3";
+ name = "Pharmacy Shutter Controls";
+ req_access = list("pharmacy")
+ },
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
"ekq" = (
@@ -34333,6 +34336,10 @@
/obj/machinery/computer/records/medical,
/obj/structure/cable,
/obj/effect/turf_decal/tile/red/full,
+/obj/machinery/button/door/directional/north{
+ id = "medsecprivacy";
+ name = "Privacy Shutters Control"
+ },
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/medical)
"kzr" = (
@@ -50445,6 +50452,16 @@
/obj/machinery/cell_charger,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"pxV" = (
+/obj/machinery/chem_master,
+/obj/effect/turf_decal/tile/yellow/full,
+/obj/machinery/button/door/directional/north{
+ id = "pharmacy_shutters";
+ name = "Pharmacy Shutter Controls";
+ req_access = list("pharmacy")
+ },
+/turf/open/floor/iron/white/smooth_large,
+/area/station/medical/pharmacy)
"pxX" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
@@ -54446,12 +54463,6 @@
dir = 4
},
/obj/effect/landmark/start/chemist,
-/obj/machinery/button/door/directional/north{
- id = "pharmacy_shutters";
- name = "Pharmacy Shutter Controls";
- pixel_y = 55;
- req_access = list("pharmacy")
- },
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
"qMz" = (
@@ -54565,12 +54576,6 @@
dir = 5
},
/obj/effect/landmark/start/depsec/medical,
-/obj/machinery/button/door/directional/east{
- id = "medsecprivacy";
- name = "Privacy Shutters Control";
- pixel_x = -32;
- pixel_y = 56
- },
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/checkpoint/medical)
"qNE" = (
@@ -70632,16 +70637,6 @@
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/iron,
/area/station/command/gateway)
-"vPV" = (
-/obj/structure/cable,
-/obj/machinery/button/door/directional/north{
- id = "pharmacy_shutters3";
- name = "Pharmacy Shutter Controls";
- pixel_y = 55;
- req_access = list("pharmacy")
- },
-/turf/open/floor/iron/white,
-/area/station/medical/pharmacy)
"vQh" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -244122,7 +244117,7 @@ dEV
ieZ
azw
ekn
-vPV
+fTC
fHk
azw
tJV
@@ -245920,7 +245915,7 @@ lso
dEV
bai
azw
-dmI
+pxV
qMv
vDh
azw
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index 8dc542f6ee3..1c33e4fc418 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -4869,6 +4869,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
+"axg" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/machinery/button/elevator/directional/north{
+ id = "tram_cargo_lift";
+ req_access = list("mining")
+ },
+/obj/machinery/lift_indicator/directional/north{
+ linked_elevator_id = "tram_cargo_lift"
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"axp" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
@@ -6101,6 +6114,10 @@
/obj/effect/turf_decal/trimline/neutral/filled/warning{
dir = 1
},
+/obj/machinery/destination_sign/indicator/directional/north,
+/obj/machinery/button/tram/directional/north{
+ id = "middle_part"
+ },
/turf/open/floor/iron,
/area/station/hallway/primary/tram/center)
"aGQ" = (
@@ -6404,13 +6421,6 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/medical)
-"aII" = (
-/obj/machinery/destination_sign/indicator,
-/obj/machinery/button/tram/directional/north{
- id = "left_part"
- },
-/turf/closed/wall,
-/area/station/hallway/primary/tram/left)
"aIJ" = (
/obj/machinery/flasher/directional/east{
id = "medcell"
@@ -6997,15 +7007,6 @@
/obj/effect/spawner/random/food_or_drink/refreshing_beverage,
/turf/open/floor/iron/grimy,
/area/station/hallway/secondary/entry)
-"aMD" = (
-/obj/machinery/destination_sign/indicator{
- dir = 1
- },
-/obj/machinery/button/tram/directional/south{
- id = "left_part"
- },
-/turf/closed/wall,
-/area/station/hallway/primary/tram/left)
"aME" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing/corner{
@@ -9203,6 +9204,13 @@
/obj/machinery/smartfridge/chemistry/virology/preloaded,
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"bvc" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/machinery/door/window/left/directional/north,
+/turf/open/floor/iron/white,
+/area/station/science/research)
"bvk" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -11160,6 +11168,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/cargo/lobby)
+"cbN" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/machinery/button/elevator/directional/west{
+ id = "tram_cargo_lift";
+ req_access = list("mining")
+ },
+/obj/machinery/lift_indicator/directional/west{
+ linked_elevator_id = "tram_cargo_lift"
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"cch" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/lattice/catwalk,
@@ -12561,13 +12582,6 @@
/obj/machinery/light/directional/east,
/turf/open/floor/catwalk_floor,
/area/station/command/teleporter)
-"cDa" = (
-/obj/structure/closet/secure_closet/brig/genpop,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/siding/thinplating/corner,
-/turf/open/floor/iron/dark,
-/area/station/security/execution/transfer)
"cDd" = (
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
@@ -15091,9 +15105,8 @@
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 4
},
-/obj/machinery/door/window/right/directional/south{
- name = "Elevator Access"
- },
+/obj/machinery/drone_dispenser,
+/obj/structure/window/spawner,
/turf/open/floor/iron/dark,
/area/station/science/lower)
"dxC" = (
@@ -15286,13 +15299,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/tram/center)
-"dCf" = (
-/obj/machinery/destination_sign/indicator,
-/obj/machinery/button/tram/directional/north{
- id = "right_part"
- },
-/turf/closed/wall,
-/area/station/hallway/primary/tram/right)
"dCr" = (
/obj/effect/turf_decal/sand,
/obj/machinery/light/directional/west,
@@ -16955,6 +16961,12 @@
/obj/effect/turf_decal/siding/thinplating/corner{
dir = 8
},
+/obj/machinery/lift_indicator/directional/west{
+ linked_elevator_id = "tram_upper_center_lift"
+ },
+/obj/machinery/button/elevator/directional/west{
+ id = "tram_upper_center_lift"
+ },
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
"ekB" = (
@@ -17503,6 +17515,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/trimline/yellow/filled/line,
/obj/effect/turf_decal/trimline/neutral/filled/warning,
+/obj/machinery/destination_sign/indicator/directional/south,
+/obj/machinery/button/tram/directional/south{
+ id = "right_part"
+ },
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
"ewK" = (
@@ -18452,6 +18468,13 @@
/obj/machinery/door/window/left/directional/south{
name = "Elevator Access"
},
+/obj/machinery/lift_indicator/directional/west{
+ linked_elevator_id = "tram_sci_lift"
+ },
+/obj/machinery/button/elevator/directional/west{
+ id = "tram_sci_lift";
+ req_access = list("science")
+ },
/turf/open/floor/iron/dark,
/area/station/science/lower)
"eQE" = (
@@ -19530,13 +19553,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood/parquet,
/area/station/medical/psychology)
-"fld" = (
-/obj/machinery/button/tram/directional/north{
- id = "middle_part"
- },
-/obj/machinery/destination_sign/indicator,
-/turf/closed/wall,
-/area/station/hallway/primary/tram/center)
"flf" = (
/obj/machinery/door/airlock/security{
name = "Interrogation"
@@ -19583,15 +19599,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron,
/area/station/security/checkpoint/engineering)
-"flX" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/machinery/door/window/right/directional/north{
- name = "Elevator Access"
- },
-/turf/open/floor/iron/white,
-/area/station/science/research)
"flZ" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -21722,6 +21729,10 @@
/obj/effect/turf_decal/trimline/neutral/filled/warning{
dir = 1
},
+/obj/machinery/destination_sign/indicator/directional/north,
+/obj/machinery/button/tram/directional/north{
+ id = "left_part"
+ },
/turf/open/floor/iron,
/area/station/hallway/primary/tram/left)
"geA" = (
@@ -21848,9 +21859,6 @@
dir = 4
},
/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/effect/turf_decal/siding/thinplating/corner{
- dir = 8
- },
/obj/machinery/button/elevator/directional/south{
id = "tram_perma_lift"
},
@@ -24917,17 +24925,6 @@
/obj/machinery/teleport/hub,
/turf/open/floor/plating,
/area/station/command/teleporter)
-"htI" = (
-/obj/machinery/button/elevator{
- pixel_y = -4;
- id = "tram_upper_center_lift"
- },
-/obj/machinery/lift_indicator{
- pixel_y = 6;
- linked_elevator_id = "tram_upper_center_lift"
- },
-/turf/closed/wall,
-/area/station/hallway/primary/tram/center)
"htJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/white/end{
@@ -25236,17 +25233,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"hBP" = (
-/obj/machinery/lift_indicator{
- pixel_y = 6;
- linked_elevator_id = "tram_lower_center_lift"
- },
-/obj/machinery/button/elevator{
- pixel_y = -4;
- id = "tram_lower_center_lift"
- },
-/turf/closed/wall,
-/area/station/maintenance/department/medical)
"hBV" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 4
@@ -25828,13 +25814,6 @@
/obj/effect/turf_decal/stripes/white/full,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/lobby)
-"hNs" = (
-/obj/machinery/lift_indicator{
- pixel_y = -4;
- linked_elevator_id = "tram_sci_lift"
- },
-/turf/closed/wall,
-/area/station/science/lab)
"hNx" = (
/obj/machinery/door/airlock/external{
name = "Port Docking Bay 2"
@@ -26392,16 +26371,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"hZZ" = (
-/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/machinery/button/elevator/directional/south{
- id = "tram_perma_lift"
- },
-/obj/machinery/lift_indicator/directional/south{
- linked_elevator_id = "tram_perma_lift"
- },
-/turf/open/floor/iron,
-/area/station/security/brig)
"iae" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -26868,10 +26837,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
-"iih" = (
-/obj/effect/turf_decal/trimline/brown/filled/line,
-/turf/closed/wall,
-/area/station/cargo/miningdock)
"iij" = (
/obj/machinery/door/airlock/security/glass{
name = "Security Post - Research Division"
@@ -26965,7 +26930,8 @@
/obj/structure/industrial_lift/public,
/obj/machinery/elevator_control_panel/directional/west{
linked_elevator_id = "tram_cargo_lift";
- preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
+ preset_destination_names = list("2"="Lower Deck","3"="Upper Deck");
+ req_access = list("mining")
},
/obj/effect/landmark/lift_id{
specific_lift_id = "tram_cargo_lift"
@@ -27687,9 +27653,7 @@
},
/obj/machinery/light/directional/north,
/obj/item/folder/white,
-/obj/machinery/keycard_auth{
- pixel_y = 24
- },
+/obj/machinery/keycard_auth/directional/north,
/turf/open/floor/iron/cafeteria{
dir = 5
},
@@ -27780,18 +27744,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/cargo/miningdock/oresilo)
-"iBa" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 1
- },
-/obj/machinery/button/elevator/directional/north{
- id = "tram_cargo_lift"
- },
-/obj/machinery/lift_indicator/directional/north{
- linked_elevator_id = "tram_cargo_lift"
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"iBm" = (
/obj/machinery/light/directional/west,
/obj/structure/bed{
@@ -30765,15 +30717,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
-"jEO" = (
-/obj/machinery/destination_sign/indicator{
- dir = 1
- },
-/obj/machinery/button/tram/directional/south{
- id = "middle_part"
- },
-/turf/closed/wall,
-/area/station/hallway/primary/tram/center)
"jEP" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -31658,18 +31601,6 @@
/obj/effect/spawner/random/bureaucracy/pen,
/turf/open/floor/iron,
/area/station/commons/fitness)
-"jVY" = (
-/obj/effect/turf_decal/trimline/neutral/filled/line{
- dir = 1
- },
-/obj/machinery/button/elevator/directional/north{
- id = "tram_dorm_lift"
- },
-/obj/machinery/lift_indicator/directional/north{
- linked_elevator_id = "tram_dorm_lift"
- },
-/turf/open/floor/iron,
-/area/station/commons/dorms)
"jWb" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
@@ -33202,7 +33133,7 @@
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 10
},
-/obj/effect/turf_decal/siding/thinplating,
+/obj/machinery/door/window/left/directional/south,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
"kAX" = (
@@ -33726,6 +33657,12 @@
/area/station/hallway/secondary/command)
"kIM" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/machinery/lift_indicator/directional/west{
+ linked_elevator_id = "tram_lower_center_lift"
+ },
+/obj/machinery/button/elevator/directional/west{
+ id = "tram_lower_center_lift"
+ },
/turf/open/floor/iron,
/area/station/hallway/secondary/construction/engineering)
"kJy" = (
@@ -34565,10 +34502,10 @@
/area/station/hallway/primary/tram/center)
"kYr" = (
/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/effect/turf_decal/siding/thinplating,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
+/obj/machinery/door/window/right/directional/south,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
"kYs" = (
@@ -35351,12 +35288,6 @@
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 1
},
-/obj/machinery/button/elevator/directional/north{
- id = "tram_lower_center_lift"
- },
-/obj/machinery/lift_indicator/directional/north{
- linked_elevator_id = "tram_lower_center_lift"
- },
/turf/open/floor/iron,
/area/station/hallway/secondary/construction/engineering)
"llZ" = (
@@ -40610,17 +40541,6 @@
/obj/effect/turf_decal/trimline/neutral/filled/line,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"nkd" = (
-/obj/machinery/lift_indicator{
- pixel_y = 6;
- linked_elevator_id = "tram_upper_center_lift"
- },
-/obj/machinery/button/elevator{
- pixel_y = -4;
- id = "tram_upper_center_lift"
- },
-/turf/closed/wall,
-/area/station/service/janitor)
"nku" = (
/obj/machinery/portable_atmospherics/pump,
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -41283,15 +41203,6 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/misc/asteroid,
/area/station/medical/chemistry)
-"nwQ" = (
-/obj/machinery/destination_sign/indicator{
- dir = 1
- },
-/obj/machinery/button/tram/directional/south{
- id = "right_part"
- },
-/turf/closed/wall,
-/area/station/hallway/primary/tram/right)
"nxf" = (
/obj/structure/industrial_lift/tram/subfloor/window,
/obj/structure/window/reinforced/tram/front{
@@ -41355,6 +41266,18 @@
},
/turf/open/floor/glass/reinforced,
/area/station/security/brig)
+"nyN" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 4
+ },
+/obj/machinery/button/elevator/directional/east{
+ id = "tram_lower_center_lift"
+ },
+/obj/machinery/lift_indicator/directional/east{
+ linked_elevator_id = "tram_lower_center_lift"
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/tram/center)
"nyV" = (
/obj/effect/turf_decal/siding/thinplating{
dir = 1
@@ -42121,6 +42044,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/yellow/filled/line,
/obj/effect/turf_decal/trimline/neutral/filled/warning,
+/obj/machinery/destination_sign/indicator/directional/south,
+/obj/machinery/button/tram/directional/south{
+ id = "middle_part"
+ },
/turf/open/floor/iron,
/area/station/hallway/primary/tram/center)
"nOI" = (
@@ -42750,6 +42677,18 @@
dir = 5
},
/area/station/command/heads_quarters/rd)
+"nZM" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 1
+ },
+/obj/machinery/button/elevator/directional/north{
+ id = "tram_dorm_lift"
+ },
+/obj/machinery/lift_indicator/directional/north{
+ linked_elevator_id = "tram_dorm_lift"
+ },
+/turf/open/floor/iron,
+/area/station/commons/fitness/recreation)
"nZP" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
@@ -44545,6 +44484,10 @@
},
/obj/effect/turf_decal/trimline/yellow/filled/line,
/obj/effect/turf_decal/trimline/neutral/filled/warning,
+/obj/machinery/destination_sign/indicator/directional/south,
+/obj/machinery/button/tram/directional/south{
+ id = "left_part"
+ },
/turf/open/floor/iron,
/area/station/hallway/primary/tram/left)
"oNp" = (
@@ -44614,7 +44557,11 @@
},
/obj/effect/turf_decal/trimline/purple/filled/line,
/obj/machinery/button/elevator/directional/south{
- id = "tram_sci_lift"
+ id = "tram_sci_lift";
+ req_access = list("science")
+ },
+/obj/machinery/lift_indicator/directional/south{
+ linked_elevator_id = "tram_sci_lift"
},
/turf/open/floor/iron/white,
/area/station/science/research)
@@ -44639,6 +44586,7 @@
},
/obj/item/storage/toolbox/mechanical,
/obj/item/stack/cable_coil,
+/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/white,
/area/station/science/lab)
"oPs" = (
@@ -49289,6 +49237,15 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron,
/area/station/service/janitor)
+"qxg" = (
+/obj/machinery/elevator_control_panel/directional/south{
+ linked_elevator_id = "tram_sci_lift";
+ pixel_y = 0;
+ preset_destination_names = list("2"="Lower Deck","3"="Upper Deck");
+ req_access = list("science")
+ },
+/turf/closed/wall,
+/area/station/science/lower)
"qxm" = (
/turf/closed/wall,
/area/station/maintenance/starboard/central)
@@ -49509,13 +49466,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/maintenance/tram/right)
-"qBL" = (
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
-/obj/machinery/door/airlock/mining{
- name = "Mining Office"
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"qBQ" = (
/obj/effect/turf_decal/trimline/white/filled/corner{
dir = 8
@@ -50465,6 +50415,18 @@
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/storage)
+"qUs" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 1
+ },
+/obj/machinery/button/elevator/directional/north{
+ id = "tram_dorm_lift"
+ },
+/obj/machinery/lift_indicator/directional/north{
+ linked_elevator_id = "tram_dorm_lift"
+ },
+/turf/open/floor/iron,
+/area/station/commons/dorms)
"qUy" = (
/obj/machinery/camera/directional/south{
c_tag = "Civilian - Holodeck South";
@@ -51729,6 +51691,13 @@
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 9
},
+/obj/machinery/elevator_control_panel/directional/north{
+ linked_elevator_id = "tram_sci_lift";
+ pixel_y = 32;
+ pixel_x = -32;
+ preset_destination_names = list("2"="Lower Deck","3"="Upper Deck");
+ req_access = list("science")
+ },
/turf/open/floor/iron/white,
/area/station/science/research)
"rre" = (
@@ -53833,18 +53802,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/break_room)
-"sjN" = (
-/obj/effect/turf_decal/trimline/neutral/filled/line{
- dir = 1
- },
-/obj/machinery/lift_indicator/directional/north{
- linked_elevator_id = "tram_dorm_lift"
- },
-/obj/machinery/button/elevator/directional/north{
- id = "tram_dorm_lift"
- },
-/turf/open/floor/iron,
-/area/station/commons/fitness/recreation)
"skb" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/trimline/brown/filled/line{
@@ -55237,6 +55194,10 @@
/obj/effect/turf_decal/trimline/neutral/filled/warning{
dir = 1
},
+/obj/machinery/destination_sign/indicator/directional/north,
+/obj/machinery/button/tram/directional/north{
+ id = "right_part"
+ },
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
"sHh" = (
@@ -56542,7 +56503,6 @@
/obj/machinery/rnd/production/circuit_imprinter/department/science,
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/stripes/line,
-/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/station/science/lab)
"tdu" = (
@@ -59620,15 +59580,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
-"umP" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/machinery/door/window/left/directional/north{
- name = "Elevator Access"
- },
-/turf/open/floor/iron/white,
-/area/station/science/research)
"umQ" = (
/obj/structure/flora/bush/leavy/style_random,
/obj/structure/flora/tree/palm/style_random,
@@ -61806,6 +61757,16 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/center)
+"vcV" = (
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/machinery/button/elevator/directional/south{
+ id = "tram_perma_lift"
+ },
+/obj/machinery/lift_indicator/directional/south{
+ linked_elevator_id = "tram_perma_lift"
+ },
+/turf/open/floor/iron,
+/area/station/security/brig)
"vde" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -61842,7 +61803,6 @@
"veB" = (
/obj/effect/turf_decal/siding/thinplating/dark,
/obj/structure/window/spawner,
-/obj/machinery/drone_dispenser,
/turf/open/floor/iron/dark,
/area/station/science/lower)
"veS" = (
@@ -64143,14 +64103,8 @@
/turf/open/floor/plating/elevatorshaft,
/area/station/commons/dorms)
"vUq" = (
-/obj/structure/table,
/obj/structure/industrial_lift/public,
/obj/effect/turf_decal/trimline/dark_red/warning,
-/obj/machinery/elevator_control_panel{
- linked_elevator_id = "tram_sci_lift";
- preset_destination_names = list("2"="Lower Deck","3"="Upper Deck");
- pixel_y = 3
- },
/turf/open/floor/plating/elevatorshaft,
/area/station/science/lower)
"vUt" = (
@@ -67996,12 +67950,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
-/obj/machinery/button/elevator/directional/south{
- id = "tram_sci_lift"
- },
-/obj/machinery/lift_indicator/directional/south{
- linked_elevator_id = "tram_sci_lift"
- },
/turf/open/floor/iron/white,
/area/station/science/lower)
"xAB" = (
@@ -68201,6 +68149,12 @@
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
},
+/obj/machinery/button/elevator/directional/west{
+ id = "tram_upper_center_lift"
+ },
+/obj/machinery/lift_indicator/directional/west{
+ linked_elevator_id = "tram_upper_center_lift"
+ },
/turf/open/floor/iron,
/area/station/hallway/primary/tram/center)
"xFf" = (
@@ -68369,12 +68323,6 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain)
-"xJR" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 1
- },
-/turf/closed/wall,
-/area/station/cargo/miningdock)
"xKe" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
@@ -68538,17 +68486,6 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
-"xNk" = (
-/obj/machinery/button/elevator{
- pixel_y = -4;
- id = "tram_cargo_lift"
- },
-/obj/machinery/lift_indicator{
- pixel_y = 6;
- linked_elevator_id = "tram_cargo_lift"
- },
-/turf/closed/wall,
-/area/station/maintenance/department/cargo)
"xNm" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner,
/turf/open/floor/iron,
@@ -85134,7 +85071,7 @@ aci
acv
acH
sXc
-cDa
+msg
jWs
jWs
jWs
@@ -90826,7 +90763,7 @@ ncF
aRx
luC
ncF
-jVY
+qUs
wbb
kiS
elr
@@ -99547,7 +99484,7 @@ ekB
ekB
gSQ
ekB
-nkd
+ekB
xWY
pbc
xWY
@@ -113412,7 +113349,7 @@ uGW
ujI
pYH
uGW
-iBa
+axg
kDi
cJX
uGW
@@ -113669,9 +113606,9 @@ uGW
fbH
cZB
uGW
-xJR
-qBL
-iih
+eyR
+kDi
+cJX
uGW
kot
nmz
@@ -115512,7 +115449,7 @@ uxh
veB
wkw
vUq
-sPp
+qxg
xJj
gwS
fCh
@@ -151440,7 +151377,7 @@ lCO
nca
rQi
iNc
-hZZ
+vcV
yji
yji
yji
@@ -153782,13 +153719,13 @@ jfp
lPY
eaT
oMZ
-aII
+yiM
cFs
bEt
lkr
rib
cFs
-aMD
+yiM
gek
pyf
aEa
@@ -156362,7 +156299,7 @@ yiM
vcJ
ojT
yiM
-sjN
+nZM
heD
nnQ
rgm
@@ -165087,7 +165024,7 @@ izU
fnb
kDN
fnb
-htI
+izU
izU
dno
ago
@@ -167403,13 +167340,13 @@ vyH
aEj
rOu
nOB
-fld
+izU
xVH
xXU
fBK
ycE
aMY
-jEO
+izU
aGP
agj
bPh
@@ -169211,7 +169148,7 @@ kNT
pUR
rOu
rSo
-aHA
+nyN
fnb
fWX
eSz
@@ -169468,7 +169405,7 @@ kNT
wuH
rzZ
whp
-hBP
+whz
whz
whz
clT
@@ -178694,7 +178631,7 @@ cTU
ohS
eaI
ohS
-xNk
+lZW
wFz
lZW
lZW
@@ -178951,7 +178888,7 @@ exr
pZA
uax
aZQ
-axF
+cbN
kMn
qza
ePw
@@ -180788,10 +180725,10 @@ doC
aKy
iZz
rNQ
-hNs
+tPZ
ezw
ezw
-umP
+bmQ
hTG
oPT
nZs
@@ -181024,13 +180961,13 @@ wgQ
iMj
wPN
ewz
-dCf
+bMb
brm
puY
qyI
bTT
brm
-nwQ
+bMb
sGU
uHU
wNV
@@ -181048,7 +180985,7 @@ tdm
tPZ
ezw
ezw
-bmQ
+bvc
oOk
oPT
ixY
@@ -181305,7 +181242,7 @@ uOj
tPZ
ezw
ezw
-flX
+bmQ
hTG
oPT
cjE
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index 6b79508589e..014cb3cf9de 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -11,6 +11,11 @@
var/id = null
var/initialized_button = 0
var/silicon_access_disabled = FALSE
+ ///The light mask used in the icon file for emissive layer
+ var/light_mask = null
+ light_power = 0.5 // Minimums, we want the button to glow if it has a mask, not light an area
+ light_range = 1.5
+ light_color = LIGHT_COLOR_DARK_BLUE
armor_type = /datum/armor/machinery_button
idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.02
resistance_flags = LAVA_PROOF | FIRE_PROOF
@@ -66,6 +71,8 @@
/obj/machinery/button/update_overlays()
. = ..()
+ if(light_mask && !(machine_stat & (NOPOWER|BROKEN)) && !panel_open)
+ . += emissive_appearance(icon, light_mask, src, alpha = alpha)
if(!panel_open)
return
if(device)
diff --git a/code/modules/industrial_lift/elevator_button.dm b/code/modules/industrial_lift/elevator_button.dm
index ba97bb67001..465f42fee5c 100644
--- a/code/modules/industrial_lift/elevator_button.dm
+++ b/code/modules/industrial_lift/elevator_button.dm
@@ -150,15 +150,16 @@
/obj/machinery/button/elevator
name = "elevator button"
desc = "Go back. Go back. Go back. Can you operate the elevator."
- icon_state = "launcher"
- skin = "launcher"
+ icon_state = "hallctrl"
+ skin = "hallctrl"
device_type = /obj/item/assembly/control/elevator
req_access = list()
id = 1
+ light_mask = "hall-light-mask"
/obj/machinery/button/elevator/Initialize(mapload, ndir, built)
. = ..()
// Kind of a cop-out
AddElement(/datum/element/contextual_screentip_bare_hands, lmb_text = "Call Elevator")
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/button/elevator, 28)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/button/elevator, 32)
diff --git a/code/modules/industrial_lift/elevator_panel.dm b/code/modules/industrial_lift/elevator_panel.dm
index 4b1b883c96b..3b308f42510 100644
--- a/code/modules/industrial_lift/elevator_panel.dm
+++ b/code/modules/industrial_lift/elevator_panel.dm
@@ -15,9 +15,9 @@
desc = "\"In case of emergency, please use the stairs.\" Thus, always use the stairs."
density = FALSE
- icon = 'icons/obj/airlock_machines.dmi'
- icon_state = "airlock_control_standby"
- base_icon_state = "airlock_control"
+ icon = 'icons/obj/stationobjs.dmi'
+ icon_state = "elevpanel0"
+ base_icon_state = "elevpanel"
power_channel = AREA_USAGE_ENVIRON
// Indestructible until someone wants to make these constructible, with all the chaos that implies
@@ -45,6 +45,11 @@
var/last_move_target
/// TimerID to our door reset timer, made by emergency opening doors
var/door_reset_timerid
+ /// The light mask overlay we use
+ light_power = 0.5 // Minimums, we want the button to glow if it has a mask, not light an area
+ light_range = 1.5
+ light_color = LIGHT_COLOR_DARK_BLUE
+ var/light_mask = "elev-light-mask"
/obj/machinery/elevator_control_panel/Initialize(mapload)
. = ..()
@@ -359,4 +364,12 @@
door_reset_timerid = null
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/elevator_control_panel, 30)
+/obj/machinery/elevator_control_panel/update_overlays()
+ . = ..()
+ if(!light_mask)
+ return
+
+ if(!(machine_stat & (NOPOWER|BROKEN)) && !panel_open)
+ . += emissive_appearance(icon, light_mask, src, alpha = alpha)
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/elevator_control_panel, 31)
diff --git a/code/modules/industrial_lift/lift_indicator.dm b/code/modules/industrial_lift/lift_indicator.dm
index b5fa4061318..e30d42f588d 100644
--- a/code/modules/industrial_lift/lift_indicator.dm
+++ b/code/modules/industrial_lift/lift_indicator.dm
@@ -3,8 +3,8 @@
* A lift indicator aka an elevator hall lantern w/ floor number
*/
/obj/machinery/lift_indicator
- name = "lift floor indicator"
- desc = "Indicates what floor the lift is on and which way it's going."
+ name = "elevator indicator"
+ desc = "Indicates what floor the elevator is at and which way it's going."
icon = 'icons/obj/machines/lift_indicator.dmi'
icon_state = "lift_indo-base"
base_icon_state = "lift_indo-"
@@ -16,12 +16,12 @@
density = FALSE
light_range = 1
- light_power = 0.5
- light_color = "#F8E398"
+ light_power = 1
+ light_color = LIGHT_COLOR_DARK_BLUE
luminosity = 1
maptext_x = 17
- maptext_y = 12
+ maptext_y = 21
maptext_width = 4
maptext_height = 8
@@ -64,13 +64,13 @@
var/dirtext
switch(current_lift_direction)
if(UP)
- dirtext = "heading upwards"
+ dirtext = "travelling upwards"
if(DOWN)
- dirtext = "heading downwards"
+ dirtext = "travelling downwards"
else
dirtext = "stopped"
- . += span_notice("The lift is on floor [current_lift_floor], [dirtext].")
+ . += span_notice("The elevator is at floor [current_lift_floor], [dirtext].")
/**
* Update state, and only process if lift is moving.
@@ -152,7 +152,7 @@
return
set_light(l_on = TRUE)
- maptext = {"[current_lift_floor]
"}
+ maptext = {"[current_lift_floor]
"}
/obj/machinery/lift_indicator/update_overlays()
. = ..()
@@ -170,4 +170,4 @@
. += mutable_appearance(icon, arrow_icon_state)
. += emissive_appearance(icon, "[arrow_icon_state]e", offset_spokesman = src, alpha = src.alpha)
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/lift_indicator, 38)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/lift_indicator, 32)
diff --git a/code/modules/industrial_lift/tram/tram_machinery.dm b/code/modules/industrial_lift/tram/tram_machinery.dm
index 951212e749e..386bec813dd 100644
--- a/code/modules/industrial_lift/tram/tram_machinery.dm
+++ b/code/modules/industrial_lift/tram/tram_machinery.dm
@@ -621,10 +621,9 @@ GLOBAL_LIST_EMPTY(tram_doors)
layer = BELOW_OBJ_LAYER
/obj/machinery/destination_sign/indicator
- icon_state = "indicator_central_idle"
+ icon_state = "indicator_off"
base_icon_state = "indicator_"
- light_power = 2
- light_range = 1.7
+ light_range = 1.5
light_color = LIGHT_COLOR_DARK_BLUE
light_mask = "indicator_off_e"
@@ -869,11 +868,7 @@ GLOBAL_LIST_EMPTY(tram_doors)
device_type = /obj/item/assembly/control/tram
req_access = list()
id = 1
- light_power = 0.5
- light_range = 1.5
- light_color = LIGHT_COLOR_DARK_BLUE
- /// The light mask used in the icon file for emissive layer
- var/light_mask = "tram-light-mask"
+ light_mask = "tram-light-mask"
/// The specific lift id of the tram we're calling.
var/lift_id = MAIN_STATION_TRAM
@@ -888,15 +883,8 @@ GLOBAL_LIST_EMPTY(tram_doors)
. += span_notice("There's a small inscription on the button...")
. += span_notice("THIS CALLS THE TRAM! IT DOES NOT OPERATE IT! The console on the tram tells it where to go!")
-/obj/machinery/button/tram/update_overlays()
- . = ..()
- if(!light_mask)
- return
-
- if(!(machine_stat & (NOPOWER|BROKEN)) && !panel_open)
- . += emissive_appearance(icon, light_mask, src, alpha = alpha)
-
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/window/tram/left, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/window/tram/right, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/tram_controls, 0)
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/button/tram, 2)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/destination_sign/indicator, 32)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/button/tram, 32)
diff --git a/icons/obj/machines/lift_indicator.dmi b/icons/obj/machines/lift_indicator.dmi
index b0d9f763f2a..878606ae489 100644
Binary files a/icons/obj/machines/lift_indicator.dmi and b/icons/obj/machines/lift_indicator.dmi differ
diff --git a/icons/obj/machines/tram_sign.dmi b/icons/obj/machines/tram_sign.dmi
index 5c8e80b7bfb..1043153c4e3 100644
Binary files a/icons/obj/machines/tram_sign.dmi and b/icons/obj/machines/tram_sign.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 3942107fed5..52ff9ddca6a 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/tgui/packages/tgui/interfaces/ElevatorPanel.tsx b/tgui/packages/tgui/interfaces/ElevatorPanel.tsx
index d214917665a..ab0a16c42fe 100644
--- a/tgui/packages/tgui/interfaces/ElevatorPanel.tsx
+++ b/tgui/packages/tgui/interfaces/ElevatorPanel.tsx
@@ -54,7 +54,7 @@ export const ElevatorPanel = (props, context) => {
const calculatedHeight = clamp(all_floor_data.length * 90, 400, 600);
return (
-
+
{!lift_exists && }