Merge pull request #9169 from EmeraldSundisk/delta2chapel

Adds a holy driver to Delta Station.
This commit is contained in:
kevinz000
2019-08-26 19:37:17 -07:00
committed by GitHub

View File

@@ -122824,7 +122824,6 @@
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
"eat" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
icon_state = "1-8"
},
@@ -123561,9 +123560,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -123574,6 +123570,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"ebU" = (
@@ -123816,7 +123815,6 @@
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
"ecw" = (
/obj/structure/bodycontainer/morgue,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
@@ -126412,6 +126410,13 @@
/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior,
/turf/open/floor/engine,
/area/science/mixing)
"fwr" = (
/obj/machinery/door/poddoor{
id = "chapelgun";
name = "Chapel Launcher Door"
},
/turf/open/floor/plating,
/area/chapel/office)
"fFK" = (
/obj/machinery/ore_silo,
/obj/effect/turf_decal/tile/neutral{
@@ -126430,6 +126435,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall/r_wall,
/area/science/circuit)
"fHS" = (
/obj/structure/sign/warning/vacuum,
/turf/closed/wall/r_wall,
/area/chapel/office)
"fLR" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
@@ -126462,6 +126471,15 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
/area/science/circuit)
"gJj" = (
/obj/machinery/door/window/northleft{
name = "Mass Driver"
},
/obj/machinery/mass_driver{
name = "Holy Driver"
},
/turf/open/floor/plating,
/area/chapel/office)
"gKr" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -126479,6 +126497,22 @@
},
/turf/open/floor/plasteel/white,
/area/science/misc_lab)
"gNJ" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"gNS" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/tile/neutral{
@@ -126543,6 +126577,10 @@
},
/turf/open/floor/plating,
/area/quartermaster/storage)
"hei" = (
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/r_wall,
/area/chapel/office)
"hic" = (
/obj/structure/table/reinforced,
/obj/item/integrated_electronics/analyzer,
@@ -126604,6 +126642,22 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
"hLO" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/delivery,
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 3;
name = "3maintenance loot spawner"
},
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
"hNZ" = (
/obj/structure/chair/office/light{
dir = 8
@@ -126650,6 +126704,9 @@
},
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"iyd" = (
/turf/open/space,
/area/space/nearstation)
"iQh" = (
/obj/structure/bodycontainer/morgue{
dir = 1
@@ -126714,6 +126771,9 @@
},
/turf/open/floor/plasteel,
/area/science/research/abandoned)
"jhK" = (
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
"jjN" = (
/obj/structure/table/reinforced,
/obj/machinery/camera{
@@ -126811,6 +126871,28 @@
/obj/machinery/chem_master,
/turf/open/floor/plasteel/dark,
/area/medical/medbay/central)
"jPA" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/computer/pod/old{
density = 0;
icon = 'icons/obj/airlock_machines.dmi';
icon_state = "airlock_control_standby";
id = "chapelgun";
name = "Mass Driver Controller";
pixel_x = 0;
pixel_y = -24
},
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"jRy" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -126864,6 +126946,19 @@
},
/turf/open/floor/plasteel,
/area/maintenance/port)
"kzR" = (
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/door/airlock/maintenance_hatch{
name = "Chapel Maintenance";
req_access_txt = "27"
},
/turf/open/floor/plasteel,
/area/chapel/office)
"kLu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -127095,6 +127190,33 @@
},
/turf/open/floor/engine,
/area/science/mixing)
"mXJ" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"nht" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/light,
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"nyN" = (
/obj/machinery/vending/kink,
/turf/open/floor/plating,
@@ -127103,6 +127225,19 @@
/obj/machinery/atmospherics/pipe/simple/general/hidden,
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
"owr" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"oIl" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -127281,6 +127416,12 @@
/obj/effect/spawner/lootdrop/keg,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"qMR" = (
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/turf/open/floor/plating,
/area/chapel/office)
"rhO" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -127430,6 +127571,14 @@
},
/turf/open/floor/engine,
/area/engine/supermatter)
"uZN" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 2;
name = "2maintenance loot spawner"
},
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
"vhA" = (
/obj/item/clothing/under/color/grey,
/turf/open/floor/plating,
@@ -127567,6 +127716,25 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/science/research)
"xWZ" = (
/obj/structure/bodycontainer/morgue{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"xXn" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output,
/turf/open/floor/engine/vacuum,
@@ -159675,12 +159843,12 @@ dWI
dZf
dZM
eat
dLY
dLY
dLY
dLY
dLY
dLY
dZN
dZN
dZN
dZN
fHS
dZN
dLY
dLY
aad
@@ -159930,20 +160098,20 @@ dWJ
dLW
dYu
dZg
dYu
dYu
dZg
ebR
dLW
ecQ
edl
aad
jhK
jhK
kzR
owr
mXJ
gJj
qMR
fwr
aaa
aaa
aad
iyd
aaa
aaa
aad
iyd
aaa
aaa
aaa
@@ -160187,14 +160355,14 @@ dTw
dTw
dTw
dTw
dLX
dLW
dLW
dLW
ecv
dNt
edl
aad
hLO
uZN
hei
gNJ
jPA
dTw
dTw
dTw
aad
aad
aad
@@ -160447,8 +160615,8 @@ dTw
dZN
dZN
dZN
dZN
dZN
xWZ
nht
dTw
dTw
dTw