Merge pull request #6189 from TheFurryFeline/TFF-Xenobio_Fixes_Yet_Again

Xenobio Tweaks. Again.
This commit is contained in:
Novacat
2019-11-14 16:41:18 -05:00
committed by GitHub
2 changed files with 169 additions and 127 deletions
+101 -77
View File
@@ -17682,10 +17682,6 @@
icon_state = "tube1";
pixel_y = 0
},
/obj/machinery/light_switch{
dir = 4;
pixel_x = -28
},
/turf/simulated/floor/reinforced,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"aHt" = (
@@ -17797,10 +17793,6 @@
/obj/machinery/light{
dir = 4
},
/obj/machinery/light_switch{
dir = 8;
pixel_x = 24
},
/turf/simulated/floor/reinforced,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"aHD" = (
@@ -19830,24 +19822,29 @@
/obj/machinery/button/remote/blast_door{
id = "xenobiopen5";
name = "Pen 5 Containment";
pixel_x = -30;
pixel_x = -20;
pixel_y = -8;
req_access = list(55)
},
/obj/machinery/button/remote/blast_door{
id = "xenobiopen3";
name = "Pen 3 Containment";
pixel_x = -30;
pixel_x = -20;
pixel_y = 8;
req_access = list(55)
},
/obj/machinery/button/remote/blast_door{
id = "xenobiodiv3";
name = "Divider 3 Blast Doors";
pixel_x = -38;
pixel_x = -25;
pixel_y = 0;
req_access = list(55)
},
/obj/machinery/alarm{
dir = 4;
pixel_x = -35;
pixel_y = 0
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"aLu" = (
@@ -20685,65 +20682,17 @@
/turf/simulated/floor/reinforced,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"aMQ" = (
/obj/machinery/button/remote/blast_door{
id = "xenobiodiv5";
name = "Divider 5 Blast Doors";
pixel_x = -38;
pixel_y = 0;
req_access = list(55)
},
/obj/machinery/button/remote/blast_door{
id = "xenobiopen5";
name = "Pen 5 Containment";
pixel_x = -30;
pixel_y = 8;
req_access = list(55)
},
/obj/machinery/light{
dir = 8;
icon_state = "tube1";
pixel_y = 0
},
/obj/machinery/button/remote/blast_door{
id = "xenobiopen7";
name = "Pen 7 Containment";
pixel_x = -30;
pixel_y = -8;
req_access = list(55)
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"aMR" = (
/obj/machinery/button/remote/blast_door{
id = "xenobiodiv7";
name = "Divider 7 Blast Doors";
pixel_x = -30;
pixel_y = -5;
req_access = list(55)
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/machinery/button/remote/blast_door{
id = "xenobiopen9";
name = "Pen 9 Containment";
pixel_x = -30;
pixel_y = 8
},
/obj/machinery/light{
dir = 1
},
/obj/structure/cable/green{
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc/super{
dir = 1;
pixel_y = 24
},
/obj/machinery/button/remote/airlock{
id = "phoroncelldoor9";
name = "Phoron Cell 9 Doorlock";
pixel_x = -38;
pixel_y = 0;
specialfunctions = 4
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
@@ -21048,14 +20997,10 @@
},
/area/tcommsat/chamber)
"aNu" = (
/obj/machinery/light{
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/obj/machinery/light_switch{
dir = 4;
pixel_x = -28
},
/turf/simulated/floor/reinforced,
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"aNv" = (
/obj/machinery/door/blast/regular{
@@ -25868,6 +25813,46 @@
},
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/evidence)
"aUJ" = (
/obj/machinery/button/remote/blast_door{
id = "xenobiodiv5";
name = "Divider 5 Blast Doors";
pixel_x = -30;
pixel_y = 0;
req_access = list(55)
},
/obj/machinery/button/remote/blast_door{
id = "xenobiopen5";
name = "Pen 5 Containment";
pixel_x = -22;
pixel_y = 8;
req_access = list(55)
},
/obj/machinery/light{
dir = 8;
icon_state = "tube1";
pixel_y = 0
},
/obj/machinery/button/remote/blast_door{
id = "xenobiopen7";
name = "Pen 7 Containment";
pixel_x = -22;
pixel_y = -8;
req_access = list(55)
},
/obj/machinery/alarm{
dir = 4;
pixel_x = -35;
pixel_y = 0
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"aUK" = (
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/reinforced,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"aUL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/green{
icon_state = "intact";
@@ -26309,6 +26294,45 @@
},
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/brig)
"aVn" = (
/obj/machinery/button/remote/blast_door{
id = "xenobiodiv7";
name = "Divider 7 Blast Doors";
pixel_x = -30;
pixel_y = -5;
req_access = list(55)
},
/obj/machinery/button/remote/blast_door{
id = "xenobiopen9";
name = "Pen 9 Containment";
pixel_x = -30;
pixel_y = 8
},
/obj/machinery/light{
dir = 1
},
/obj/structure/cable/green{
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc/super{
dir = 1;
pixel_y = 24
},
/obj/machinery/button/remote/airlock{
id = "phoroncelldoor9";
name = "Phoron Cell 9 Doorlock";
pixel_x = -38;
pixel_y = 0;
specialfunctions = 4
},
/obj/machinery/light_switch{
dir = 1;
pixel_x = 0;
pixel_y = 38
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"aVo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -34142,7 +34166,7 @@ aHs
aIX
aIy
aMP
aNu
aUK
aIX
aIy
aOJ
@@ -34714,7 +34738,7 @@ aNk
aNv
aND
aHc
aMR
aVn
aOj
aJa
aWK
@@ -34851,7 +34875,7 @@ aLt
aJB
aMi
aKZ
aMQ
aUJ
aNl
aNw
aKZ
@@ -34990,7 +35014,7 @@ aJC
aKo
aPB
aJa
aJa
aMQ
aMj
aPB
aJa
@@ -35132,7 +35156,7 @@ aJD
aKp
aMf
aMk
aJD
aMR
aOA
aMf
aNU
@@ -35274,7 +35298,7 @@ aJE
aKq
aPB
aJa
aJa
aNu
aMj
aPB
aJa
+68 -50
View File
@@ -15282,19 +15282,10 @@
/turf/simulated/wall,
/area/hydroponics)
"azu" = (
/obj/machinery/shower{
dir = 4;
icon_state = "shower";
pixel_x = 5;
pixel_y = 0
},
/obj/structure/curtain/open/shower,
/obj/machinery/camera/network/research{
icon_state = "camera";
dir = 5
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_south_airlock)
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/reinforced,
/turf/simulated/shuttle/plating/carry,
/area/shuttle/tether/surface)
"azv" = (
/obj/structure/sign/double/barsign{
dir = 8
@@ -16965,10 +16956,19 @@
/turf/simulated/floor/tiled,
/area/rnd/research/testingrange)
"aBJ" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/reinforced,
/turf/simulated/shuttle/plating/carry,
/area/shuttle/tether/surface)
/obj/machinery/shower{
dir = 4;
icon_state = "shower";
pixel_x = 5;
pixel_y = 0
},
/obj/structure/curtain/open/shower,
/obj/machinery/camera/network/research{
dir = 1;
icon_state = "camera"
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_south_airlock)
"aBK" = (
/obj/machinery/door/firedoor/glass,
/obj/effect/floor_decal/borderfloorblack,
@@ -22083,21 +22083,14 @@
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_main)
"aJA" = (
/obj/machinery/door/firedoor/glass/hidden,
/obj/structure/disposalpipe/segment{
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
icon_state = "intact-scrubbers";
dir = 4
},
/obj/structure/cable/green{
icon_state = "4-8"
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/machinery/alarm{
alarm_id = "pen_nine";
breach_detection = 0;
dir = 1;
icon_state = "alarm0";
pixel_y = -22
},
/turf/simulated/floor/tiled,
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
"aJB" = (
/obj/machinery/light{
@@ -22118,16 +22111,11 @@
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_hallway)
"aJD" = (
/obj/structure/disposalpipe/segment{
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/structure/cable/green{
d1 = 2;
d2 = 4;
icon_state = "2-4"
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
@@ -23482,6 +23470,11 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/machinery/alarm{
dir = 1;
pixel_x = 30;
pixel_y = -22
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_main)
"aMr" = (
@@ -26240,14 +26233,14 @@
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_main)
"aSd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
/obj/machinery/door/firedoor/glass/hidden,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
icon_state = "intact-scrubbers";
dir = 4
/obj/structure/cable/green{
icon_state = "4-8"
},
/turf/simulated/floor/tiled/dark,
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_main)
"aSe" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
@@ -26268,6 +26261,23 @@
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_main)
"aSg" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/structure/cable/green{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
"aSh" = (
/obj/machinery/light{
dir = 1
@@ -26469,6 +26479,14 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/machinery/alarm{
dir = 1;
pixel_x = 30;
pixel_y = -22
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
"aSt" = (
@@ -36742,7 +36760,7 @@ aNZ
aOf
aOo
aHM
azu
aBJ
aOf
aOR
aPP
@@ -36757,7 +36775,7 @@ aRy
aRa
aRQ
aSc
aJA
aSd
aCO
aCO
aCO
@@ -36898,8 +36916,8 @@ aQM
aRz
aPQ
aRR
aSd
aJD
aJA
aSg
aLR
aOh
aLM
@@ -37182,7 +37200,7 @@ aQM
aQp
aPS
aRR
aSd
aJD
aSs
aEs
aLQ
@@ -45256,7 +45274,7 @@ aNk
aNl
aNJ
aNP
aBJ
azu
aKU
abg
aOk
@@ -45398,7 +45416,7 @@ aNl
aNl
aNK
aNP
aBJ
azu
aKU
abg
aOk
@@ -45540,7 +45558,7 @@ aNm
aNl
aNK
aNP
aBJ
azu
aKU
abg
aOk