02-10 merge #102

02-10 merge

_maps/RandomRuins/SpaceRuins/listeningstation.dmm

@@ -234,7 +234,6 @@
 	anchored = 1
 	},
 /obj/machinery/door/window/brigdoor{
-	dir = 2;
 	req_access = list("syndicate");
 	name = "Self Destruct Option"
 	},
@@ -305,9 +304,6 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/listeningstation)
 "rr" = (
-/obj/machinery/door/airlock{
-	name = "Emergency Backup"
-	},
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -392,7 +388,6 @@
 /area/ruin/space/has_grav/listeningstation)
 "xh" = (
 /obj/machinery/computer/records/medical/syndie{
-	dir = 2;
 	req_access = list("syndicate")
 	},
 /obj/machinery/light/small/directional/north,
@@ -813,6 +808,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/door/airlock{
+	name = "Emergency Backup"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/listeningstation)
 "RK" = (

_maps/RandomRuins/SpaceRuins/skyrat/wreckedhomestead.dmm

@@ -84,11 +84,6 @@
 /obj/effect/mapping_helpers/burnt_floor,
 /turf/open/floor/iron/airless,
 /area/ruin/unpowered)
-"oa" = (
-/obj/machinery/rnd/bepis,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/iron/airless,
-/area/ruin/unpowered)
 "on" = (
 /obj/structure/closet/secure_closet/brig,
 /obj/structure/window/reinforced/spawner/directional/west,
@@ -133,6 +128,11 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron/dark/airless,
 /area/ruin/unpowered)
+"tP" = (
+/obj/machinery/cryo_cell,
+/obj/effect/mapping_helpers/burnt_floor,
+/turf/open/floor/plating/airless,
+/area/ruin/unpowered)
 "ve" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer{
 	dir = 1
@@ -160,11 +160,6 @@
 	},
 /turf/open/floor/plating/airless,
 /area/ruin/unpowered)
-"Az" = (
-/obj/machinery/cryo_cell,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating/airless,
-/area/ruin/unpowered)
 "Bf" = (
 /turf/closed/wall/mineral/titanium,
 /area/ruin/unpowered)
@@ -1209,7 +1204,7 @@ wY
 Bf
 Wp
 Bf
-Az
+tP
 Dh
 ve
 mP
@@ -1276,7 +1271,7 @@ Wv
 kN
 dL
 Bf
-oa
+kN
 Bf
 Bf
 Bf

_maps/RandomZLevels/blackmesa.dmm

@@ -5008,7 +5008,7 @@
 /turf/open/floor/iron/smooth_large,
 /area/awaymission/black_mesa/entrance_internal_hall)
 "cPC" = (
-/mob/living/simple_animal/hostile/blob/blobspore/independent,
+/mob/living/basic/blob_minion/spore,
 /obj/structure/blob/normal,
 /turf/open/floor/engine,
 /area/awaymission/black_mesa/hecu_zone_test_chambers)
@@ -9388,7 +9388,7 @@
 /turf/open/floor/iron/white,
 /area/awaymission/black_mesa/hecu_zone_camp)
 "ldC" = (
-/mob/living/simple_animal/hostile/blob/blobbernaut/independent,
+/mob/living/basic/blob_minion/blobbernaut,
 /obj/structure/blob/normal,
 /turf/open/floor/engine,
 /area/awaymission/black_mesa/hecu_zone_test_chambers)