mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-23 03:57:48 +01:00
Merge pull request #13479 from Heroman3003/tether-cent-ae-fix
Maybe-hopefully fixes active edges on Tether Centcom
This commit is contained in:
Novacat
@@ -456,6 +456,20 @@
|
||||
/obj/machinery/status_display/supply_display,
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/centcom)
|
||||
"bn" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
dir = 1;
|
||||
frequency = 1380;
|
||||
id_tag = null
|
||||
},
|
||||
/obj/effect/map_helper/airlock/atmos/pump_out_internal,
|
||||
/obj/machinery/embedded_controller/radio/airlock/docking_port{
|
||||
frequency = 1380;
|
||||
id_tag = "ccboat";
|
||||
pixel_y = 29
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/ccboat)
|
||||
"bo" = (
|
||||
/obj/structure/sign/department/bar,
|
||||
/turf/simulated/wall/r_wall,
|
||||
@@ -500,6 +514,25 @@
|
||||
/obj/structure/sign/warning/nosmoking_2,
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/centcom/terminal)
|
||||
"by" = (
|
||||
/obj/machinery/airlock_sensor{
|
||||
dir = 8;
|
||||
frequency = 1380;
|
||||
id_tag = null;
|
||||
pixel_x = 24
|
||||
},
|
||||
/obj/effect/map_helper/airlock/sensor/chamber_sensor,
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
dir = 1;
|
||||
frequency = 1380;
|
||||
id_tag = null
|
||||
},
|
||||
/obj/effect/map_helper/airlock/atmos/pump_out_internal,
|
||||
/obj/machinery/light/small{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/ccboat)
|
||||
"bz" = (
|
||||
/obj/structure/sign/securearea{
|
||||
desc = "A warning sign which reads 'HIGH VOLTAGE'";
|
||||
@@ -524,6 +557,24 @@
|
||||
},
|
||||
/turf/simulated/shuttle/floor,
|
||||
/area/shuttle/supply)
|
||||
"bC" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
frequency = 1380;
|
||||
id_tag = null
|
||||
},
|
||||
/obj/effect/map_helper/airlock/atmos/chamber_pump,
|
||||
/obj/effect/shuttle_landmark/shuttle_initializer/ccboat,
|
||||
/obj/effect/overmap/visitable/ship/landable/ccboat,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/ccboat)
|
||||
"bD" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
frequency = 1380;
|
||||
id_tag = null
|
||||
},
|
||||
/obj/effect/map_helper/airlock/atmos/chamber_pump,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/ccboat)
|
||||
"bE" = (
|
||||
/obj/effect/floor_decal/fancy_shuttle{
|
||||
fancy_shuttle_tag = "tram"
|
||||
@@ -538,6 +589,41 @@
|
||||
/area/shuttle/escape{
|
||||
base_turf = /turf/simulated/floor/tiled/techfloor/grid
|
||||
})
|
||||
"bF" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/blast/angled/open{
|
||||
id = "ccshuttleshutter"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/ccboat)
|
||||
"bG" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/door/blast/angled/open{
|
||||
dir = 4;
|
||||
id = "ccshuttleshutter"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/ccboat)
|
||||
"bH" = (
|
||||
/obj/machinery/atmospherics/unary/engine{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/ccboat)
|
||||
"bJ" = (
|
||||
/obj/structure/table/rack,
|
||||
/obj/item/weapon/storage/box/pillbottles,
|
||||
@@ -1031,12 +1117,6 @@
|
||||
icon_state = "dark"
|
||||
},
|
||||
/area/centcom/specops)
|
||||
"df" = (
|
||||
/obj/machinery/atmospherics/unary/engine{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/airless,
|
||||
/area/shuttle/ccboat)
|
||||
"dh" = (
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/centcom/bar)
|
||||
@@ -1899,16 +1979,6 @@
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/centcom/specops)
|
||||
"gh" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
frequency = 1380;
|
||||
id_tag = null
|
||||
},
|
||||
/obj/effect/map_helper/airlock/atmos/chamber_pump,
|
||||
/obj/effect/shuttle_landmark/shuttle_initializer/ccboat,
|
||||
/obj/effect/overmap/visitable/ship/landable/ccboat,
|
||||
/turf/simulated/floor/airless,
|
||||
/area/shuttle/ccboat)
|
||||
"gj" = (
|
||||
/obj/machinery/vending/cola{
|
||||
name = "hacked Robust Softdrinks";
|
||||
@@ -2092,25 +2162,6 @@
|
||||
/area/centcom/security{
|
||||
name = "\improper CentCom Residential Security"
|
||||
})
|
||||
"gN" = (
|
||||
/obj/machinery/airlock_sensor{
|
||||
dir = 8;
|
||||
frequency = 1380;
|
||||
id_tag = null;
|
||||
pixel_x = 24
|
||||
},
|
||||
/obj/effect/map_helper/airlock/sensor/chamber_sensor,
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
dir = 1;
|
||||
frequency = 1380;
|
||||
id_tag = null
|
||||
},
|
||||
/obj/effect/map_helper/airlock/atmos/pump_out_internal,
|
||||
/obj/machinery/light/small{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/airless,
|
||||
/area/shuttle/ccboat)
|
||||
"gP" = (
|
||||
/obj/structure/table/rack,
|
||||
/obj/item/clothing/under/color/green,
|
||||
@@ -3782,22 +3833,6 @@
|
||||
/obj/item/weapon/melee/energy/sword/red,
|
||||
/turf/unsimulated/floor/techfloor_grid,
|
||||
/area/tdome/tdome1)
|
||||
"mS" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/door/blast/angled/open{
|
||||
dir = 4;
|
||||
id = "ccshuttleshutter"
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/shuttle/ccboat)
|
||||
"mT" = (
|
||||
/obj/machinery/camera/network/crescent,
|
||||
/obj/structure/table/reinforced,
|
||||
@@ -5479,19 +5514,6 @@
|
||||
},
|
||||
/turf/unsimulated/floor/techfloor_grid,
|
||||
/area/tdome/tdome1)
|
||||
"vY" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/blast/angled/open{
|
||||
id = "ccshuttleshutter"
|
||||
},
|
||||
/turf/simulated/floor,
|
||||
/area/shuttle/ccboat)
|
||||
"vZ" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/effect/floor_decal/borderfloorblack{
|
||||
@@ -5617,14 +5639,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/centcom/control)
|
||||
"ww" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
frequency = 1380;
|
||||
id_tag = null
|
||||
},
|
||||
/obj/effect/map_helper/airlock/atmos/chamber_pump,
|
||||
/turf/simulated/floor/airless,
|
||||
/area/shuttle/ccboat)
|
||||
"wx" = (
|
||||
/obj/structure/bed/chair/shuttle{
|
||||
dir = 1
|
||||
@@ -6632,20 +6646,6 @@
|
||||
"Cj" = (
|
||||
/turf/simulated/shuttle/floor,
|
||||
/area/shuttle/supply)
|
||||
"Cl" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
dir = 1;
|
||||
frequency = 1380;
|
||||
id_tag = null
|
||||
},
|
||||
/obj/effect/map_helper/airlock/atmos/pump_out_internal,
|
||||
/obj/machinery/embedded_controller/radio/airlock/docking_port{
|
||||
frequency = 1380;
|
||||
id_tag = "ccboat";
|
||||
pixel_y = 29
|
||||
},
|
||||
/turf/simulated/floor/airless,
|
||||
/area/shuttle/ccboat)
|
||||
"Cn" = (
|
||||
/turf/unsimulated/wall,
|
||||
/area/centcom/main_hall)
|
||||
@@ -25757,7 +25757,7 @@ gn
|
||||
mY
|
||||
zN
|
||||
uf
|
||||
mS
|
||||
bG
|
||||
uf
|
||||
sX
|
||||
sX
|
||||
@@ -25893,11 +25893,11 @@ sX
|
||||
WO
|
||||
uf
|
||||
uf
|
||||
mS
|
||||
mS
|
||||
bG
|
||||
bG
|
||||
go
|
||||
Cl
|
||||
gh
|
||||
bn
|
||||
bC
|
||||
gn
|
||||
wr
|
||||
uf
|
||||
@@ -26032,14 +26032,14 @@ nJ
|
||||
px
|
||||
uf
|
||||
uf
|
||||
mS
|
||||
bG
|
||||
uf
|
||||
vq
|
||||
bP
|
||||
Bn
|
||||
go
|
||||
gN
|
||||
ww
|
||||
by
|
||||
bD
|
||||
xJ
|
||||
wm
|
||||
HU
|
||||
@@ -26172,7 +26172,7 @@ ZQ
|
||||
ac
|
||||
nJ
|
||||
px
|
||||
vY
|
||||
bF
|
||||
Bc
|
||||
DW
|
||||
uf
|
||||
@@ -26314,7 +26314,7 @@ ZQ
|
||||
ac
|
||||
nJ
|
||||
px
|
||||
vY
|
||||
bF
|
||||
LB
|
||||
cX
|
||||
qL
|
||||
@@ -26328,7 +26328,7 @@ uf
|
||||
vi
|
||||
YD
|
||||
cY
|
||||
df
|
||||
bH
|
||||
pR
|
||||
nJ
|
||||
ac
|
||||
@@ -26456,7 +26456,7 @@ ZQ
|
||||
ac
|
||||
nJ
|
||||
px
|
||||
vY
|
||||
bF
|
||||
Ti
|
||||
nA
|
||||
sp
|
||||
@@ -26598,7 +26598,7 @@ ZQ
|
||||
ac
|
||||
nJ
|
||||
px
|
||||
vY
|
||||
bF
|
||||
UE
|
||||
CK
|
||||
jK
|
||||
@@ -26612,7 +26612,7 @@ uf
|
||||
fG
|
||||
YD
|
||||
cY
|
||||
df
|
||||
bH
|
||||
pR
|
||||
nJ
|
||||
ac
|
||||
@@ -26740,7 +26740,7 @@ ZQ
|
||||
ac
|
||||
nJ
|
||||
px
|
||||
vY
|
||||
bF
|
||||
VJ
|
||||
vG
|
||||
uf
|
||||
@@ -26884,7 +26884,7 @@ nJ
|
||||
px
|
||||
uf
|
||||
uf
|
||||
mS
|
||||
bG
|
||||
uf
|
||||
vq
|
||||
bP
|
||||
@@ -27029,8 +27029,8 @@ sX
|
||||
sX
|
||||
uf
|
||||
uf
|
||||
mS
|
||||
mS
|
||||
bG
|
||||
bG
|
||||
pw
|
||||
tT
|
||||
tT
|
||||
@@ -27177,7 +27177,7 @@ UC
|
||||
uf
|
||||
uf
|
||||
uf
|
||||
mS
|
||||
bG
|
||||
uf
|
||||
sX
|
||||
sX
|
||||
|
||||
Reference in New Issue
Block a user