Merge remote-tracking branch 'upstream/master'

ErdGinalD · Aug 9, 2024 · 3d804c7 · 3d804c7
2 parents 618c7d1 + 3f75f3b
commit 3d804c7
Show file tree

Hide file tree

Showing 288 changed files with 18,126 additions and 10,172 deletions.
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm
@@ -307,12 +307,7 @@
 	dir = 1
 	},
 /obj/machinery/light,
-/obj/machinery/requests_console{
-	department = "Mining Outpost";
-	departmentType = 2;
-	name = "Mining Outpost Requests Console";
-	pixel_y = -30
-	},
+/obj/machinery/requests_console/directional/south,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkyellowcorners"
@@ -366,13 +361,7 @@
 	name = "north bump";
 	pixel_y = 28
 	},
-/obj/machinery/requests_console{
-	announcementConsole = 1;
-	department = "Quartermaster's Desk";
-	departmentType = 5;
-	name = "Quartermaster Requests Console";
-	pixel_x = 30
-	},
+/obj/machinery/requests_console/directional/east,
 /obj/structure/closet/secure_closet/quartermaster/lavaland,
 /turf/simulated/floor/carpet,
 /area/mine/outpost/quartermaster)
@@ -639,12 +628,7 @@
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
-/obj/machinery/requests_console{
-	department = "Mining Outpost";
-	departmentType = 2;
-	name = "Mining Outpost Requests Console";
-	pixel_x = 30
-	},
+/obj/machinery/requests_console/directional/east,
 /obj/item/radio/intercom{
 	name = "north bump";
 	pixel_y = 28
@@ -1390,12 +1374,7 @@
 "dM" = (
 /obj/effect/spawner/random_spawners/cobweb_left_rare,
 /obj/effect/decal/cleanable/glass,
-/obj/machinery/requests_console{
-	department = "Mining Outpost";
-	departmentType = 2;
-	name = "Mining Outpost Requests Console";
-	pixel_x = -30
-	},
+/obj/machinery/requests_console/directional/west,
 /turf/simulated/floor/plating,
 /area/mine/outpost/maintenance/east)
 "dN" = (
@@ -8880,10 +8859,7 @@
 	},
 /area/mine/outpost/cafeteria)
 "PJ" = (
-/obj/machinery/requests_console{
-	department = "Labor Camp";
-	pixel_y = 32
-	},
+/obj/machinery/requests_console/directional/north,
 /obj/effect/turf_decal/arrows/red{
 	dir = 1
 	},