Merge pull request #6989 from Citadel-Station-13/upstream-merge-38226

[MIRROR] Roboticists now have access to open the R&D windoors.
This commit is contained in:
LetterJay
2018-06-03 16:19:59 -05:00
committed by GitHub
5 changed files with 14 additions and 22 deletions
+1 -1
View File
@@ -22918,7 +22918,7 @@
/obj/structure/table/reinforced,
/obj/machinery/door/window/southright{
name = "Research and Development Desk";
req_access_txt = "7"
req_one_access_txt = "7;29"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "rnd";
+5 -10
View File
@@ -72556,7 +72556,7 @@
/obj/item/pen,
/obj/machinery/door/window/southleft{
name = "Research Lab Desk";
req_access_txt = "7"
req_one_access_txt = "7;29"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "rndlab1";
@@ -76089,7 +76089,7 @@
/obj/machinery/door/window/southleft{
dir = 4;
name = "Research Lab Desk";
req_access_txt = "7"
req_one_access_txt = "7;29"
},
/obj/machinery/door/window/westleft,
/obj/effect/turf_decal/delivery,
@@ -76754,7 +76754,7 @@
/obj/machinery/door/window/southleft{
dir = 8;
name = "Research Lab Desk";
req_access_txt = "7"
req_one_access_txt = "7;29"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "rndlab2";
@@ -92690,11 +92690,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
"dQF" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
"dQG" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
@@ -100047,7 +100042,7 @@
/obj/machinery/autolathe,
/obj/machinery/door/window/southleft{
name = "Research Lab Desk";
req_access_txt = "7"
req_one_access_txt = "7;29"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -134174,7 +134169,7 @@ dNC
dNC
dOT
dPM
dQF
dOb
dRE
dSC
dTA
+4 -4
View File
@@ -51651,7 +51651,7 @@
/obj/machinery/door/window/eastright{
dir = 2;
name = "Research and Development Desk";
req_access_txt = "7"
req_one_access_txt = "7;29"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "research_shutters";
@@ -55830,7 +55830,7 @@
/obj/machinery/door/window/eastright{
dir = 4;
name = "Research and Development Desk";
req_access_txt = "7"
req_one_access_txt = "7;29"
},
/obj/item/folder/white{
pixel_x = 4;
@@ -56670,7 +56670,7 @@
/obj/machinery/door/window/eastleft{
dir = 1;
name = "Research and Development Deliveries";
req_access_txt = "7"
req_one_access_txt = "7;29"
},
/obj/structure/window/reinforced{
dir = 8
@@ -76251,7 +76251,7 @@
/obj/machinery/door/window/eastright{
dir = 2;
name = "Research and Development Desk";
req_access_txt = "7"
req_one_access_txt = "7;29"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -20534,7 +20534,7 @@
/obj/item/pen,
/obj/machinery/door/window/southleft{
name = "Research Lab Desk";
req_access_txt = "7"
req_one_access_txt = "7;29"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "rndlab1";
@@ -21487,7 +21487,7 @@
/obj/machinery/door/window/southleft{
dir = 4;
name = "Research Lab Desk";
req_access_txt = "7"
req_one_access_txt = "7;29"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "rndlab1";
@@ -21207,9 +21207,6 @@
icon_state = "platingdmg3"
},
/area/maintenance/department/cargo)
"bdA" = (
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"bdB" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -25766,7 +25763,7 @@
/obj/machinery/door/window/eastright{
dir = 2;
name = "Research and Development Desk";
req_access_txt = "7"
req_one_access_txt = "7;29"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "research_shutters_2";
@@ -91348,7 +91345,7 @@ aPY
bau
aLf
aFi
bdA
aFi
beI
beI
bgD