Merge remote-tracking branch 'origin/new_brig_remap' into new_brig_remap

cmss13-devs · Nov 14, 2023 · e7b2c90 · e7b2c90
2 parents cf1f506 + d95ffcd
commit e7b2c90
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -65897,6 +65897,10 @@
 	phone_id = "Brig Warden's Office";
 	pixel_y = 32
 	},
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 8;
+	name = "ship-grade camera"
+	},
 /turf/open/floor/almayer{
 	dir = 5;
 	icon_state = "red"
@@ -67206,7 +67210,7 @@
 	req_one_access_txt = "3;19"
 	},
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "plate"
 	},
 /area/almayer/living/briefing)
 "tdc" = (