Upstream 24-7-31

StrangeWeirdKitten · Jul 31, 2024 · 3d3c08d · 3d3c08d
1 parent f71887f
commit 3d3c08d
Show file tree

Hide file tree

Showing 10 changed files with 12,322 additions and 12,516 deletions.
diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -27451,7 +27451,7 @@
 /turf/open/floor/iron/smooth_large,
 /area/station/engineering/engine_smes)
 "ceo" = (
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /obj/machinery/computer/station_alert{
 	dir = 4
 	},
@@ -61168,7 +61168,7 @@
 /turf/open/floor/iron/smooth_large,
 /area/station/engineering/gravity_generator)
 "wIx" = (
-/obj/machinery/keycard_auth/directional/west,
+/obj/machinery/keycard_auth/wall_mounted/directional/west,
 /obj/machinery/pdapainter/supply,
 /obj/machinery/computer/security/telescreen/cargo/directional/north,
 /obj/machinery/camera/directional/west{

diff --git a/_maps/map_files/LimaStation/LimaStation.dmm b/_maps/map_files/LimaStation/LimaStation.dmm
@@ -5317,7 +5317,7 @@
 "chZ" = (
 /obj/machinery/pdapainter,
 /obj/structure/cable,
-/obj/machinery/keycard_auth/directional/east,
+/obj/machinery/keycard_auth/wall_mounted/directional/east,
 /obj/item/stamp/head/hop{
 	pixel_x = 7;
 	pixel_y = 10
@@ -10228,7 +10228,7 @@
 /obj/item/radio/intercom/directional/south{
 	pixel_y = -40
 	},
-/obj/machinery/keycard_auth/directional/south{
+/obj/machinery/keycard_auth/wall_mounted/directional/south{
 	pixel_y = -24
 	},
 /obj/effect/turf_decal/siding/wood{
@@ -13650,7 +13650,7 @@
 	pixel_y = 35;
 	req_access = list("hos")
 	},
-/obj/machinery/keycard_auth/directional/north{
+/obj/machinery/keycard_auth/wall_mounted/directional/north{
 	pixel_x = 6;
 	pixel_y = 24
 	},
@@ -20641,7 +20641,7 @@
 /obj/machinery/modular_computer/preset/research{
 	dir = 8
 	},
-/obj/machinery/keycard_auth/directional/east,
+/obj/machinery/keycard_auth/wall_mounted/directional/east,
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/iron/showroomfloor,
 /area/station/command/heads_quarters/rd)
@@ -41245,7 +41245,7 @@
 /obj/machinery/modular_computer/preset/engineering{
 	dir = 1
 	},
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /obj/effect/turf_decal/trimline/yellow/filled/end,
 /turf/open/floor/iron/dark,
 /area/station/command/bridge)
@@ -52772,7 +52772,7 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/port)
 "tEk" = (
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /obj/machinery/light/directional/south,
 /turf/open/floor/carpet/royalblue,
 /area/station/command/heads_quarters/qm)

diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
@@ -38414,14 +38414,6 @@
 /obj/effect/landmark/generic_maintenance_landmark,
 /turf/open/floor/pod,
 /area/station/maintenance/floor4/starboard/aft)
-"jZs" = (
-/obj/machinery/keycard_auth/directional/north{
-	pixel_x = -22
-	},
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/incident_display/bridge/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
 "jZA" = (
 /obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron/dark/side{
@@ -65149,11 +65141,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer4,
 /turf/open/floor/plating,
 /area/station/hallway/floor1/aft)
-"qMO" = (
-/obj/machinery/light/directional/east,
-/obj/machinery/smartfridge/drying,
-/turf/open/floor/iron/kitchen,
-/area/station/service/kitchen)
 "qMV" = (
 /obj/machinery/atmospherics/components/unary/portables_connector,
 /obj/effect/turf_decal/bot,
@@ -251987,7 +251974,7 @@ vhd
 fAz
 gyr
 gyr
-qMO
+elG
 sFt
 sxt
 sal