Merge remote-tracking branch 'origin/master'

This commit is contained in:
Flint
2020-01-13 18:32:45 -06:00
2 changed files with 2 additions and 3 deletions
+1 -2
View File
@@ -52418,9 +52418,8 @@
dir = 4
},
/obj/machinery/door/airlock/research{
abandoned = "47, 9";
name = "Genetics Lab";
req_access_txt = "47"
req_access_txt = "9"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -27981,7 +27981,7 @@
},
/obj/machinery/door/airlock/research{
name = "Xenobiology Lab";
req_access_txt = "55"
req_one_access_txt = "55, 9"
},
/obj/structure/cable,
/turf/open/floor/plasteel/dark,