Merge branch 'master' into translate

ss220club · Feb 6, 2024 · 84d6d16 · 84d6d16
2 parents 712b20f + f665624
commit 84d6d16
Show file tree

Hide file tree

Showing 209 changed files with 1,997 additions and 2,069 deletions.
diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
@@ -199,6 +199,7 @@
 	name = "mission briefing"
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/item/paper/monitorkey,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/syndicate_listening_station)
 "un" = (

diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
@@ -24822,9 +24822,10 @@
 "cEm" = (
 /obj/machinery/requests_console{
 	department = "Cargo Bay";
-	departmentType = 2;
-	name = "Quartermaster RC";
-	pixel_x = 30
+	departmentType = 5;
+	name = "Quartermaster Requests Console";
+	pixel_x = 30;
+	announcementConsole = 1
 	},
 /obj/machinery/photocopier,
 /turf/simulated/floor/plasteel{
@@ -95994,12 +95995,16 @@
 /turf/simulated/floor/carpet/royalblack,
 /area/station/command/office/captain)
 "xNF" = (
-/obj/machinery/door/window{
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/obj/effect/mapping_helpers/airlock/polarized,
+/obj/machinery/door/window/classic/normal{
 	dir = 8;
 	name = "Robotics Surgery"
 	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
+/obj/effect/mapping_helpers/airlock/windoor/access/any/science/robotics{
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"