mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-28 23:59:40 +01:00
Merge pull request #2050 from CHOMPStationBot/upstream-merge-10444
[MIRROR] Slopes! ◤◢◣◥
This commit is contained in:
Nadyr
File diff suppressed because it is too large
Load Diff
@@ -172,6 +172,9 @@
|
||||
},
|
||||
/turf/simulated/floor/airless,
|
||||
/area/shuttle/gecko_cr_wreck)
|
||||
"eu" = (
|
||||
/turf/template_noop,
|
||||
/area/shuttle/gecko_cr_cockpit_wreck)
|
||||
"eA" = (
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
@@ -851,6 +854,12 @@
|
||||
/obj/machinery/computer/shuttle_control/explore/gecko_cr_wreck,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/shuttle/gecko_cr_cockpit_wreck)
|
||||
"qD" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/shuttle/gecko_cr_engineering_wreck)
|
||||
"qL" = (
|
||||
/turf/simulated/wall/rshull,
|
||||
/area/shuttle/gecko_cr_cockpit_wreck)
|
||||
@@ -1195,6 +1204,10 @@
|
||||
},
|
||||
/turf/simulated/floor/airless,
|
||||
/area/shuttle/gecko_cr_wreck)
|
||||
"xo" = (
|
||||
/obj/item/weapon/material/shard/shrapnel,
|
||||
/turf/template_noop,
|
||||
/area/shuttle/gecko_cr_cockpit_wreck)
|
||||
"xT" = (
|
||||
/obj/effect/floor_decal/industrial/outline/grey,
|
||||
/obj/structure/fuel_port/empty{
|
||||
@@ -1208,6 +1221,12 @@
|
||||
"xU" = (
|
||||
/turf/template_noop,
|
||||
/area/shuttle/gecko_cr_wreck)
|
||||
"xW" = (
|
||||
/obj/structure/hull_corner/long_vert{
|
||||
dir = 6
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/shuttle/gecko_cr_cockpit_wreck)
|
||||
"ye" = (
|
||||
/obj/structure/handrail{
|
||||
dir = 8
|
||||
@@ -1446,6 +1465,12 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/gecko_cr_cockpit_wreck)
|
||||
"CM" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 1
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/shuttle/gecko_cr_engineering_wreck)
|
||||
"CW" = (
|
||||
/turf/simulated/wall/rshull,
|
||||
/area/shuttle/gecko_cr_engineering_wreck)
|
||||
@@ -1584,6 +1609,12 @@
|
||||
/obj/item/weapon/material/shard,
|
||||
/turf/template_noop,
|
||||
/area/shuttle/gecko_cr_engineering_wreck)
|
||||
"Fq" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 8
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/shuttle/gecko_cr_cockpit_wreck)
|
||||
"Fx" = (
|
||||
/obj/effect/floor_decal/industrial/warning/corner,
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
@@ -1821,6 +1852,10 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/gecko_cr_cockpit_wreck)
|
||||
"Jo" = (
|
||||
/obj/structure/hull_corner,
|
||||
/turf/template_noop,
|
||||
/area/shuttle/gecko_cr_cockpit_wreck)
|
||||
"JE" = (
|
||||
/obj/machinery/computer/ship/helm{
|
||||
req_one_access = list()
|
||||
@@ -3226,9 +3261,9 @@ WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
eu
|
||||
xW
|
||||
eP
|
||||
eP
|
||||
eP
|
||||
eP
|
||||
@@ -3267,12 +3302,12 @@ WP
|
||||
"}
|
||||
(7,1,1) = {"
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
eP
|
||||
eu
|
||||
xW
|
||||
eP
|
||||
eP
|
||||
eP
|
||||
uw
|
||||
Nr
|
||||
GF
|
||||
Nr
|
||||
@@ -3348,7 +3383,7 @@ aL
|
||||
Su
|
||||
Su
|
||||
Su
|
||||
WP
|
||||
qD
|
||||
WP
|
||||
"}
|
||||
(9,1,1) = {"
|
||||
@@ -3439,7 +3474,7 @@ WP
|
||||
"}
|
||||
(11,1,1) = {"
|
||||
WP
|
||||
WP
|
||||
Fq
|
||||
qL
|
||||
wG
|
||||
aF
|
||||
@@ -3478,7 +3513,7 @@ Su
|
||||
Su
|
||||
Su
|
||||
Su
|
||||
WP
|
||||
qD
|
||||
"}
|
||||
(12,1,1) = {"
|
||||
WP
|
||||
@@ -3611,7 +3646,7 @@ WP
|
||||
"}
|
||||
(15,1,1) = {"
|
||||
WP
|
||||
WP
|
||||
Jo
|
||||
qL
|
||||
wG
|
||||
ic
|
||||
@@ -3650,7 +3685,7 @@ Su
|
||||
Su
|
||||
Su
|
||||
Su
|
||||
WP
|
||||
CM
|
||||
"}
|
||||
(16,1,1) = {"
|
||||
WP
|
||||
@@ -3778,7 +3813,7 @@ pG
|
||||
Su
|
||||
Su
|
||||
Su
|
||||
WP
|
||||
CM
|
||||
WP
|
||||
"}
|
||||
(19,1,1) = {"
|
||||
@@ -3788,7 +3823,7 @@ WP
|
||||
OX
|
||||
NK
|
||||
jg
|
||||
eP
|
||||
uw
|
||||
uw
|
||||
NK
|
||||
uw
|
||||
@@ -3828,9 +3863,9 @@ WP
|
||||
WP
|
||||
WP
|
||||
FV
|
||||
WP
|
||||
FV
|
||||
WP
|
||||
eu
|
||||
xo
|
||||
eu
|
||||
OX
|
||||
NK
|
||||
NK
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -106,6 +106,12 @@
|
||||
"ka" = (
|
||||
/turf/simulated/wall/shull,
|
||||
/area/shuttle/mackerel_lc_wreck)
|
||||
"kf" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 1
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/shuttle/mackerel_lc_wreck)
|
||||
"kU" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
|
||||
/obj/machinery/light/small{
|
||||
@@ -732,6 +738,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/mackerel_lc_wreck)
|
||||
"Qq" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/shuttle/mackerel_lc_wreck)
|
||||
"Qu" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/random/empty_or_lootable_crate,
|
||||
@@ -957,13 +969,13 @@ WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
BB
|
||||
TC
|
||||
oG
|
||||
oe
|
||||
ka
|
||||
ka
|
||||
ka
|
||||
WP
|
||||
Qq
|
||||
WP
|
||||
"}
|
||||
(3,1,1) = {"
|
||||
@@ -982,7 +994,7 @@ WP
|
||||
WP
|
||||
BB
|
||||
WP
|
||||
WP
|
||||
oG
|
||||
oe
|
||||
Zb
|
||||
bI
|
||||
@@ -1007,13 +1019,13 @@ ka
|
||||
WP
|
||||
WP
|
||||
BB
|
||||
WP
|
||||
oG
|
||||
NI
|
||||
oq
|
||||
tV
|
||||
ka
|
||||
ka
|
||||
WP
|
||||
kf
|
||||
WP
|
||||
"}
|
||||
(5,1,1) = {"
|
||||
@@ -1114,7 +1126,7 @@ tV
|
||||
ka
|
||||
ka
|
||||
ka
|
||||
WP
|
||||
Qq
|
||||
"}
|
||||
(9,1,1) = {"
|
||||
WP
|
||||
@@ -1214,7 +1226,7 @@ tV
|
||||
ka
|
||||
ka
|
||||
ka
|
||||
WP
|
||||
kf
|
||||
"}
|
||||
(13,1,1) = {"
|
||||
WP
|
||||
@@ -1307,13 +1319,13 @@ ka
|
||||
WP
|
||||
BB
|
||||
WP
|
||||
WP
|
||||
oG
|
||||
NI
|
||||
Zb
|
||||
ca
|
||||
NI
|
||||
oq
|
||||
WP
|
||||
oG
|
||||
BB
|
||||
"}
|
||||
(17,1,1) = {"
|
||||
@@ -1332,7 +1344,7 @@ WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
BB
|
||||
TC
|
||||
oe
|
||||
oq
|
||||
oq
|
||||
@@ -1357,13 +1369,13 @@ WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
oG
|
||||
oG
|
||||
oe
|
||||
oe
|
||||
oe
|
||||
oe
|
||||
BB
|
||||
TC
|
||||
WP
|
||||
"}
|
||||
(19,1,1) = {"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1246,6 +1246,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/salamander)
|
||||
"rP" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 8
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/shuttle/salamander_head)
|
||||
"sb" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 8
|
||||
@@ -1255,12 +1261,22 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/salamander_engineering)
|
||||
"ts" = (
|
||||
/obj/structure/hull_corner,
|
||||
/turf/template_noop,
|
||||
/area/shuttle/salamander)
|
||||
"tA" = (
|
||||
/obj/machinery/pointdefense{
|
||||
id_tag = "salamander_pd"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/salamander_engineering)
|
||||
"uf" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 1
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/shuttle/salamander_galley)
|
||||
"ur" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/grille,
|
||||
@@ -1292,6 +1308,10 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/salamander_cockpit)
|
||||
"wq" = (
|
||||
/obj/structure/hull_corner,
|
||||
/turf/template_noop,
|
||||
/area/shuttle/salamander_engineering)
|
||||
"wF" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible{
|
||||
dir = 6
|
||||
@@ -1405,6 +1425,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/shuttle/salamander)
|
||||
"Bu" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/shuttle/salamander_engineering)
|
||||
"BW" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
|
||||
@@ -1878,6 +1904,12 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/salamander_engineering)
|
||||
"WI" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/shuttle/salamander)
|
||||
"WN" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
@@ -2028,7 +2060,7 @@ WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
wq
|
||||
Wj
|
||||
dj
|
||||
fn
|
||||
@@ -2037,7 +2069,7 @@ Wj
|
||||
dj
|
||||
fn
|
||||
Wj
|
||||
WP
|
||||
Bu
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
@@ -2152,7 +2184,7 @@ WP
|
||||
"}
|
||||
(9,1,1) = {"
|
||||
WP
|
||||
WP
|
||||
ts
|
||||
VT
|
||||
VT
|
||||
Wj
|
||||
@@ -2165,7 +2197,7 @@ lV
|
||||
Wj
|
||||
VT
|
||||
VT
|
||||
WP
|
||||
WI
|
||||
WP
|
||||
"}
|
||||
(10,1,1) = {"
|
||||
@@ -2386,7 +2418,7 @@ WP
|
||||
"}
|
||||
(22,1,1) = {"
|
||||
WP
|
||||
WP
|
||||
rP
|
||||
Tg
|
||||
br
|
||||
cq
|
||||
@@ -2399,7 +2431,7 @@ mR
|
||||
bI
|
||||
qu
|
||||
mR
|
||||
WP
|
||||
uf
|
||||
WP
|
||||
"}
|
||||
(23,1,1) = {"
|
||||
|
||||
@@ -40,6 +40,12 @@
|
||||
},
|
||||
/turf/simulated/floor/airless,
|
||||
/area/shuttle/salamander_wreck_q2)
|
||||
"bq" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/shuttle/salamander_wreck)
|
||||
"br" = (
|
||||
/obj/structure/window/reinforced/tinted,
|
||||
/obj/structure/toilet{
|
||||
@@ -1355,6 +1361,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint/airless,
|
||||
/area/shuttle/salamander_wreck)
|
||||
"zx" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 8
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/shuttle/salamander_wreck_head)
|
||||
"zO" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
@@ -1473,6 +1485,12 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/salamander_wreck_galley)
|
||||
"EE" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/shuttle/salamander_wreck_engineering)
|
||||
"Fu" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden{
|
||||
dir = 5
|
||||
@@ -1609,6 +1627,10 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint/airless,
|
||||
/area/shuttle/salamander_wreck)
|
||||
"KB" = (
|
||||
/obj/structure/hull_corner,
|
||||
/turf/template_noop,
|
||||
/area/shuttle/salamander_wreck_engineering)
|
||||
"KX" = (
|
||||
/obj/structure/handrail,
|
||||
/obj/random/empty_or_lootable_crate,
|
||||
@@ -1708,6 +1730,12 @@
|
||||
/obj/structure/girder,
|
||||
/turf/simulated/floor/airless,
|
||||
/area/shuttle/salamander_wreck)
|
||||
"PF" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 1
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/shuttle/salamander_wreck_galley)
|
||||
"PN" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 8
|
||||
@@ -1982,6 +2010,10 @@
|
||||
oxygen = 0
|
||||
},
|
||||
/area/shuttle/salamander_wreck)
|
||||
"Xj" = (
|
||||
/obj/structure/hull_corner,
|
||||
/turf/template_noop,
|
||||
/area/shuttle/salamander_wreck)
|
||||
"Xn" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 8
|
||||
@@ -2082,7 +2114,7 @@ WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
KB
|
||||
Wj
|
||||
nP
|
||||
fn
|
||||
@@ -2091,7 +2123,7 @@ Wj
|
||||
nP
|
||||
fn
|
||||
Wj
|
||||
WP
|
||||
EE
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
@@ -2206,7 +2238,7 @@ WP
|
||||
"}
|
||||
(9,1,1) = {"
|
||||
WP
|
||||
WP
|
||||
Xj
|
||||
VT
|
||||
VT
|
||||
Wj
|
||||
@@ -2219,7 +2251,7 @@ lV
|
||||
Wj
|
||||
VT
|
||||
VT
|
||||
WP
|
||||
bq
|
||||
WP
|
||||
"}
|
||||
(10,1,1) = {"
|
||||
@@ -2440,7 +2472,7 @@ WP
|
||||
"}
|
||||
(22,1,1) = {"
|
||||
WP
|
||||
WP
|
||||
zx
|
||||
Tg
|
||||
br
|
||||
cq
|
||||
@@ -2453,7 +2485,7 @@ mR
|
||||
bI
|
||||
qu
|
||||
mR
|
||||
WP
|
||||
PF
|
||||
WP
|
||||
"}
|
||||
(23,1,1) = {"
|
||||
|
||||
+70549
-1
File diff suppressed because it is too large
Load Diff
@@ -11,10 +11,11 @@
|
||||
/area/ship/ert/barracks)
|
||||
"ac" = (
|
||||
/obj/machinery/light/no_nightshift,
|
||||
/obj/machinery/porta_turret/stationary/CIWS,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/dock_port)
|
||||
"ad" = (
|
||||
/obj/machinery/porta_turret/stationary/CIWS,
|
||||
/obj/structure/hull_corner,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/dock_port)
|
||||
"ae" = (
|
||||
@@ -150,15 +151,48 @@
|
||||
/obj/item/device/mapping_unit/ert,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/ert/commander)
|
||||
"ar" = (
|
||||
/obj/structure/table/rack/steel,
|
||||
/obj/item/toy/plushie/squid/blue{
|
||||
desc = "A small, cute and loveable squid friend. This one is blue. Despite the name, it seems no more or less deadly than your regular plush squid.";
|
||||
name = "NT 'Deathsquid' Plushie"
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/outline/grey,
|
||||
/obj/item/device/mapping_unit/deathsquad,
|
||||
/obj/item/device/holomap_beacon/deathsquad,
|
||||
/obj/item/device/holomap_beacon/deathsquad,
|
||||
/obj/item/device/holomap_beacon/deathsquad,
|
||||
/obj/item/device/holomap_beacon/deathsquad,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/ert/barracks)
|
||||
"as" = (
|
||||
/obj/machinery/light_switch{
|
||||
pixel_y = 23
|
||||
},
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/item/device/flashlight/lamp,
|
||||
/obj/item/device/holomap_beacon/ert,
|
||||
/obj/item/device/holomap_beacon/ert,
|
||||
/obj/item/device/mapping_unit/ert,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/ert/commander)
|
||||
"at" = (
|
||||
/obj/structure/cable/yellow{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/ert/commander)
|
||||
"av" = (
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/ert/gunnery)
|
||||
"ax" = (
|
||||
/obj/structure/shuttle/engine/propulsion{
|
||||
dir = 4
|
||||
/obj/structure/hull_corner{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/turf/simulated/shuttle/plating/airless/carry,
|
||||
/area/shuttle/ert_ship_boat)
|
||||
"aC" = (
|
||||
/obj/machinery/pointdefense{
|
||||
@@ -176,6 +210,10 @@
|
||||
/obj/fiftyspawner/tritium,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/ert/eng_storage)
|
||||
"aF" = (
|
||||
/obj/machinery/porta_turret/stationary/CIWS,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/atmos)
|
||||
"aI" = (
|
||||
/obj/structure/cable/yellow{
|
||||
d1 = 1;
|
||||
@@ -345,8 +383,16 @@
|
||||
/obj/machinery/light/no_nightshift,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/atmos)
|
||||
"bU" = (
|
||||
/obj/structure/hull_corner/long_horiz{
|
||||
dir = 5
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/hallways_aft)
|
||||
"bW" = (
|
||||
/obj/machinery/porta_turret/stationary/CIWS,
|
||||
/obj/structure/hull_corner/long_horiz{
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/atmos)
|
||||
"ch" = (
|
||||
@@ -372,9 +418,10 @@
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/ert/dock_port)
|
||||
"cu" = (
|
||||
/obj/machinery/shipsensors,
|
||||
/obj/machinery/light/no_nightshift,
|
||||
/obj/machinery/porta_turret/stationary/CIWS,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/engineering)
|
||||
/area/ship/ert/barracks)
|
||||
"cv" = (
|
||||
/obj/machinery/shield_gen,
|
||||
/obj/effect/floor_decal/industrial/outline/blue,
|
||||
@@ -677,7 +724,7 @@
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/ert/barracks)
|
||||
"dW" = (
|
||||
/obj/machinery/light/no_nightshift{
|
||||
/obj/structure/hull_corner{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/pointdefense{
|
||||
@@ -685,6 +732,13 @@
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/gunnery)
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "vonbraun_pd"
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/gunnery)
|
||||
/turf/space,
|
||||
/area/space)
|
||||
"dX" = (
|
||||
/obj/structure/cable/yellow{
|
||||
d1 = 1;
|
||||
@@ -805,7 +859,9 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/ship/ert/engine)
|
||||
"eD" = (
|
||||
/obj/machinery/porta_turret/stationary/CIWS,
|
||||
/obj/structure/hull_corner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/med)
|
||||
"eF" = (
|
||||
@@ -1310,8 +1366,22 @@
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/hangar)
|
||||
"hW" = (
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "vonbraun_pd"
|
||||
},
|
||||
/obj/machinery/light/no_nightshift{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/hangar)
|
||||
"hY" = (
|
||||
/obj/machinery/porta_turret/stationary/CIWS,
|
||||
/obj/structure/hull_corner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/dock_star)
|
||||
"ia" = (
|
||||
@@ -1350,6 +1420,15 @@
|
||||
/obj/machinery/light/no_nightshift{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "vonbraun_pd"
|
||||
},
|
||||
/obj/machinery/light/no_nightshift{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/hangar)
|
||||
"ij" = (
|
||||
@@ -1622,7 +1701,9 @@
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/ship/ert/barracks)
|
||||
"kO" = (
|
||||
/obj/machinery/porta_turret/stationary/CIWS,
|
||||
/obj/structure/hull_corner{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/barracks)
|
||||
"kP" = (
|
||||
@@ -2931,6 +3012,7 @@
|
||||
/obj/machinery/light/no_nightshift{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/porta_turret/stationary/CIWS,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/eng_storage)
|
||||
"qJ" = (
|
||||
@@ -3177,8 +3259,12 @@
|
||||
/obj/machinery/pointdefense{
|
||||
id_tag = "vonbraun_pd"
|
||||
},
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "vonbraun_pd"
|
||||
},
|
||||
/obj/structure/hull_corner,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/hallways_aft)
|
||||
/area/ship/ert/barracks)
|
||||
"sC" = (
|
||||
/obj/structure/cable/yellow{
|
||||
d1 = 4;
|
||||
@@ -3663,11 +3749,11 @@
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/ship/ert/med_surg)
|
||||
"wr" = (
|
||||
/obj/machinery/shipsensors{
|
||||
dir = 1
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "vonbraun_pd"
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/atmos)
|
||||
/area/ship/ert/hallways_aft)
|
||||
"wt" = (
|
||||
/obj/structure/table/steel_reinforced,
|
||||
/obj/item/weapon/storage/firstaid/bonemed{
|
||||
@@ -3688,6 +3774,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/ert/med)
|
||||
"wG" = (
|
||||
/obj/structure/hull_corner/long_horiz{
|
||||
dir = 5
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/engine)
|
||||
"wO" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
@@ -4593,7 +4685,13 @@
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/ship/ert/armoury_st)
|
||||
"BI" = (
|
||||
/obj/machinery/porta_turret/stationary/CIWS,
|
||||
/obj/structure/hull_corner/long_horiz{
|
||||
dir = 5
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/engineering)
|
||||
"BK" = (
|
||||
/obj/machinery/shipsensors,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/engineering)
|
||||
"BM" = (
|
||||
@@ -5160,6 +5258,7 @@
|
||||
/obj/machinery/light/no_nightshift{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/porta_turret/stationary/CIWS,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/dock_star)
|
||||
"FP" = (
|
||||
@@ -5413,7 +5512,9 @@
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/ert/engine)
|
||||
"GJ" = (
|
||||
/obj/machinery/porta_turret/stationary/CIWS,
|
||||
/obj/structure/hull_corner{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/eng_storage)
|
||||
"GK" = (
|
||||
@@ -6275,15 +6376,12 @@
|
||||
battery_lock = 0
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/outline/grey,
|
||||
<<<<<<< HEAD
|
||||
||||||| parent of d41e3bb7a8... Merge pull request #10091 from KillianKirilenko/kk-adminships
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
|
||||
=======
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{
|
||||
pixel_y = 6
|
||||
},
|
||||
@@ -6300,7 +6398,6 @@
|
||||
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{
|
||||
pixel_y = -4
|
||||
},
|
||||
>>>>>>> d41e3bb7a8... Merge pull request #10091 from KillianKirilenko/kk-adminships
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/ert/armoury_st)
|
||||
"LA" = (
|
||||
@@ -6398,6 +6495,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/ship/ert/armoury_dl)
|
||||
"LX" = (
|
||||
/obj/structure/hull_corner/long_horiz{
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/hallways_aft)
|
||||
"LZ" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
@@ -6661,6 +6764,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/ert/gunnery)
|
||||
"Nu" = (
|
||||
/obj/structure/hull_corner/long_horiz{
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/engine)
|
||||
"Nz" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 1
|
||||
@@ -6685,14 +6794,10 @@
|
||||
"NI" = (
|
||||
/obj/structure/table/rack,
|
||||
/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid,
|
||||
<<<<<<< HEAD
|
||||
||||||| parent of a7910d7968... Merge pull request #9712 from KillianKirilenko/kk-shuttle
|
||||
/obj/item/weapon/storage/belt/explorer/pathfinder,
|
||||
=======
|
||||
/obj/item/weapon/storage/belt/explorer/pathfinder{
|
||||
name = "ERT Commander's belt"
|
||||
},
|
||||
>>>>>>> a7910d7968... Merge pull request #9712 from KillianKirilenko/kk-shuttle
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/ert/commander)
|
||||
"NJ" = (
|
||||
@@ -6951,6 +7056,7 @@
|
||||
/obj/machinery/light/no_nightshift{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/porta_turret/stationary/CIWS,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/gunnery)
|
||||
"ON" = (
|
||||
@@ -7152,6 +7258,19 @@
|
||||
"Pq" = (
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/ert/med)
|
||||
"Pw" = (
|
||||
/obj/machinery/shipsensors{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/atmos)
|
||||
"Py" = (
|
||||
/obj/machinery/light/no_nightshift{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/porta_turret/stationary/CIWS,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/med)
|
||||
"PA" = (
|
||||
/obj/machinery/recharge_station,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
@@ -7201,6 +7320,10 @@
|
||||
"PO" = (
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/gunnery)
|
||||
"PP" = (
|
||||
/obj/machinery/porta_turret/stationary/CIWS,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/engineering)
|
||||
"PS" = (
|
||||
/obj/machinery/shield_capacitor,
|
||||
/obj/effect/floor_decal/industrial/outline/blue,
|
||||
@@ -7334,6 +7457,12 @@
|
||||
"QT" = (
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/ship/ert/med)
|
||||
"QV" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/shuttle/plating/airless/carry,
|
||||
/area/shuttle/ert_ship_boat)
|
||||
"QX" = (
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/machinery/computer/shuttle_control/explore/ert_ship_boat{
|
||||
@@ -7759,12 +7888,6 @@
|
||||
"Tl" = (
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/ship/ert/hangar)
|
||||
"Tr" = (
|
||||
/obj/machinery/shipsensors{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/med_surg)
|
||||
"Tx" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
|
||||
@@ -7885,6 +8008,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/ship/ert/armoury_dl)
|
||||
"UI" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/med)
|
||||
"UJ" = (
|
||||
/obj/structure/cable/yellow{
|
||||
d1 = 1;
|
||||
@@ -8376,11 +8505,11 @@
|
||||
/turf/simulated/wall/shull,
|
||||
/area/ship/ert/engineering)
|
||||
"YO" = (
|
||||
/obj/machinery/light/no_nightshift{
|
||||
dir = 8
|
||||
/obj/structure/hull_corner{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/ert/med_surg)
|
||||
/turf/space,
|
||||
/area/space)
|
||||
"YP" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/fuel{
|
||||
dir = 8
|
||||
@@ -13587,7 +13716,7 @@ Hf
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
kL
|
||||
lZ
|
||||
ZL
|
||||
lZ
|
||||
yz
|
||||
@@ -14137,7 +14266,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
lZ
|
||||
ZL
|
||||
Hf
|
||||
Hf
|
||||
ok
|
||||
@@ -14157,7 +14286,7 @@ RO
|
||||
XH
|
||||
Hf
|
||||
Hf
|
||||
lZ
|
||||
ZL
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -14279,7 +14408,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
lZ
|
||||
Nu
|
||||
Hf
|
||||
Hf
|
||||
op
|
||||
@@ -14299,7 +14428,7 @@ SE
|
||||
cY
|
||||
Hf
|
||||
Hf
|
||||
lZ
|
||||
wG
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -14421,7 +14550,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
ZL
|
||||
lZ
|
||||
Hf
|
||||
Hf
|
||||
vd
|
||||
@@ -14441,7 +14570,7 @@ Hf
|
||||
Hf
|
||||
Hf
|
||||
Hf
|
||||
ZL
|
||||
lZ
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -14704,7 +14833,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
bO
|
||||
Pw
|
||||
kJ
|
||||
pV
|
||||
kP
|
||||
@@ -14726,7 +14855,7 @@ JG
|
||||
VC
|
||||
XW
|
||||
XW
|
||||
YR
|
||||
BK
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -14988,7 +15117,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
bO
|
||||
aF
|
||||
kJ
|
||||
pV
|
||||
kT
|
||||
@@ -15010,7 +15139,7 @@ XW
|
||||
XW
|
||||
XW
|
||||
XW
|
||||
YR
|
||||
PP
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -15272,7 +15401,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
wr
|
||||
bO
|
||||
kJ
|
||||
pV
|
||||
ls
|
||||
@@ -15294,7 +15423,7 @@ XW
|
||||
XW
|
||||
XW
|
||||
XW
|
||||
cu
|
||||
YR
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -15555,7 +15684,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
Ib
|
||||
wr
|
||||
DS
|
||||
yl
|
||||
tK
|
||||
@@ -15579,7 +15708,7 @@ kh
|
||||
Gv
|
||||
nY
|
||||
DS
|
||||
Ib
|
||||
wr
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -15697,7 +15826,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
Ib
|
||||
LX
|
||||
DS
|
||||
pA
|
||||
HR
|
||||
@@ -15721,7 +15850,7 @@ Ai
|
||||
Xh
|
||||
yG
|
||||
DS
|
||||
Ib
|
||||
bU
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -15839,7 +15968,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
sB
|
||||
Ib
|
||||
DS
|
||||
cS
|
||||
cS
|
||||
@@ -15863,7 +15992,7 @@ lu
|
||||
cS
|
||||
cS
|
||||
DS
|
||||
sB
|
||||
Ib
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -17258,7 +17387,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
Sr
|
||||
cu
|
||||
Zo
|
||||
Bo
|
||||
ia
|
||||
@@ -18536,7 +18665,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
Sr
|
||||
cu
|
||||
Zo
|
||||
Bo
|
||||
sr
|
||||
@@ -18678,7 +18807,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
kO
|
||||
sB
|
||||
Zo
|
||||
Bo
|
||||
Bo
|
||||
@@ -19813,7 +19942,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
Sr
|
||||
cu
|
||||
Zo
|
||||
Zo
|
||||
do
|
||||
@@ -19841,7 +19970,7 @@ xz
|
||||
HC
|
||||
ZT
|
||||
ZT
|
||||
Fd
|
||||
Py
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -19982,7 +20111,7 @@ VJ
|
||||
KI
|
||||
KI
|
||||
ZT
|
||||
eD
|
||||
UI
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -21954,13 +22083,13 @@ FP
|
||||
vK
|
||||
xO
|
||||
WC
|
||||
ax
|
||||
HO
|
||||
HO
|
||||
yg
|
||||
HK
|
||||
yg
|
||||
HO
|
||||
ax
|
||||
HO
|
||||
WC
|
||||
Zx
|
||||
nl
|
||||
@@ -22096,13 +22225,13 @@ Vq
|
||||
vK
|
||||
xO
|
||||
WC
|
||||
WC
|
||||
HO
|
||||
HO
|
||||
WC
|
||||
WC
|
||||
WC
|
||||
HO
|
||||
WC
|
||||
HO
|
||||
WC
|
||||
Mx
|
||||
dq
|
||||
@@ -22238,13 +22367,13 @@ Vq
|
||||
vK
|
||||
xO
|
||||
WC
|
||||
WC
|
||||
ax
|
||||
HO
|
||||
WC
|
||||
WC
|
||||
WC
|
||||
HO
|
||||
WC
|
||||
QV
|
||||
WC
|
||||
aK
|
||||
Sh
|
||||
@@ -22814,7 +22943,7 @@ za
|
||||
za
|
||||
za
|
||||
za
|
||||
hW
|
||||
ib
|
||||
MZ
|
||||
dq
|
||||
jv
|
||||
@@ -22822,7 +22951,7 @@ ij
|
||||
dq
|
||||
MZ
|
||||
MZ
|
||||
Jg
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -22939,7 +23068,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
nr
|
||||
dW
|
||||
vK
|
||||
vK
|
||||
wh
|
||||
@@ -22963,7 +23092,7 @@ GY
|
||||
GY
|
||||
MZ
|
||||
MZ
|
||||
Cr
|
||||
YO
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -23225,7 +23354,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
PO
|
||||
dW
|
||||
vK
|
||||
vK
|
||||
ej
|
||||
@@ -23245,7 +23374,7 @@ Cr
|
||||
MZ
|
||||
MZ
|
||||
MZ
|
||||
aC
|
||||
YO
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -23368,8 +23497,8 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
nr
|
||||
pE
|
||||
dW
|
||||
vK
|
||||
pE
|
||||
OM
|
||||
yz
|
||||
@@ -23386,7 +23515,7 @@ yz
|
||||
CR
|
||||
MZ
|
||||
MZ
|
||||
Cr
|
||||
YO
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -23511,7 +23640,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
PO
|
||||
dW
|
||||
PO
|
||||
PO
|
||||
yz
|
||||
@@ -23527,7 +23656,7 @@ yz
|
||||
yz
|
||||
ci
|
||||
MZ
|
||||
Tr
|
||||
YO
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
|
||||
@@ -138,6 +138,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/hangar)
|
||||
"ay" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/med)
|
||||
"aB" = (
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 8
|
||||
@@ -662,8 +668,16 @@
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/armoury_st)
|
||||
"bT" = (
|
||||
<<<<<<< HEAD
|
||||
/obj/machinery/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
||||||| parent of d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
=======
|
||||
/obj/structure/hull_corner/long_horiz{
|
||||
dir = 10
|
||||
>>>>>>> d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/hangar)
|
||||
@@ -947,7 +961,9 @@
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/armoury_st)
|
||||
"cS" = (
|
||||
/obj/machinery/porta_turret/stationary/syndie/CIWS,
|
||||
/obj/structure/hull_corner/long_horiz{
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/armoury_st)
|
||||
"cW" = (
|
||||
@@ -1102,7 +1118,9 @@
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/recreation)
|
||||
"dI" = (
|
||||
/obj/machinery/porta_turret/stationary/syndie/CIWS,
|
||||
/obj/structure/hull_corner/long_horiz{
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/med)
|
||||
"dJ" = (
|
||||
@@ -1283,6 +1301,10 @@
|
||||
/obj/item/weapon/reagent_containers/glass/beaker/large,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/ship/manta/med)
|
||||
"eC" = (
|
||||
/obj/machinery/porta_turret/stationary/syndie/CIWS,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/holding)
|
||||
"eF" = (
|
||||
/obj/machinery/chemical_dispenser/biochemistry/full,
|
||||
/obj/structure/table/steel_reinforced,
|
||||
@@ -1293,9 +1315,6 @@
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/ship/manta/med)
|
||||
"eG" = (
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/hallways_port)
|
||||
"eH" = (
|
||||
/obj/machinery/porta_turret/stationary/syndie/CIWS,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/hallways_port)
|
||||
@@ -1545,9 +1564,11 @@
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/ship/manta/med)
|
||||
"fZ" = (
|
||||
/obj/machinery/porta_turret/stationary/syndie/CIWS,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/recreation)
|
||||
/obj/structure/hull_corner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/space,
|
||||
/area/space)
|
||||
"gb" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
@@ -1793,9 +1814,16 @@
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/bridge)
|
||||
"hq" = (
|
||||
<<<<<<< HEAD
|
||||
/obj/machinery/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
},
|
||||
||||||| parent of d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
},
|
||||
=======
|
||||
>>>>>>> d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/hallways_port)
|
||||
"hs" = (
|
||||
@@ -2295,10 +2323,8 @@
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/hangar)
|
||||
"jd" = (
|
||||
/obj/structure/shuttle/engine/propulsion{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/obj/structure/hull_corner,
|
||||
/turf/simulated/shuttle/plating/airless/carry,
|
||||
/area/shuttle/manta_ship_boat)
|
||||
"je" = (
|
||||
/turf/simulated/wall/rshull,
|
||||
@@ -2323,11 +2349,19 @@
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/bridge)
|
||||
"jh" = (
|
||||
<<<<<<< HEAD
|
||||
/obj/machinery/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
},
|
||||
||||||| parent of d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
},
|
||||
=======
|
||||
/obj/machinery/porta_turret/stationary/syndie/CIWS,
|
||||
>>>>>>> d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/recreation)
|
||||
/area/ship/manta/armoury_st)
|
||||
"jl" = (
|
||||
/obj/structure/bed/chair/bay/shuttle{
|
||||
dir = 4
|
||||
@@ -2638,10 +2672,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/hallways_aft)
|
||||
"kO" = (
|
||||
/obj/machinery/porta_turret/stationary/syndie/CIWS,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/hallways_star)
|
||||
"kP" = (
|
||||
/obj/structure/closet/crate{
|
||||
dir = 1
|
||||
@@ -2654,6 +2684,12 @@
|
||||
"kW" = (
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/recreation)
|
||||
"lc" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/shuttle/plating/airless/carry,
|
||||
/area/shuttle/manta_ship_boat)
|
||||
"le" = (
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 1
|
||||
@@ -3617,14 +3653,25 @@
|
||||
/turf/space,
|
||||
/area/space)
|
||||
"pi" = (
|
||||
<<<<<<< HEAD
|
||||
/obj/machinery/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
},
|
||||
||||||| parent of d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
},
|
||||
=======
|
||||
/obj/machinery/porta_turret/stationary/syndie/CIWS,
|
||||
>>>>>>> d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/dock_star)
|
||||
/area/ship/manta/med)
|
||||
"pn" = (
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/hallways_star)
|
||||
/obj/structure/hull_corner{
|
||||
dir = 1
|
||||
},
|
||||
/turf/space,
|
||||
/area/space)
|
||||
"pw" = (
|
||||
/obj/machinery/firealarm/alarms_hidden{
|
||||
dir = 4;
|
||||
@@ -3744,7 +3791,7 @@
|
||||
/obj/machinery/atmospherics/unary/engine{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/turf/simulated/shuttle/plating/airless/carry,
|
||||
/area/shuttle/manta_ship_boat)
|
||||
"qn" = (
|
||||
/turf/simulated/floor/wood,
|
||||
@@ -3845,6 +3892,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/hallways_aft)
|
||||
"qI" = (
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/dock_star)
|
||||
"qJ" = (
|
||||
/obj/machinery/alarm/alarms_hidden{
|
||||
dir = 4;
|
||||
@@ -4058,8 +4111,16 @@
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/engineering)
|
||||
"rR" = (
|
||||
<<<<<<< HEAD
|
||||
/obj/machinery/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
||||||| parent of d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
=======
|
||||
/obj/structure/hull_corner/long_horiz{
|
||||
dir = 10
|
||||
>>>>>>> d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/holding)
|
||||
@@ -4272,7 +4333,9 @@
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/ship/manta/med)
|
||||
"sZ" = (
|
||||
/obj/machinery/porta_turret/stationary/syndie/CIWS,
|
||||
/obj/structure/hull_corner{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/holding)
|
||||
"th" = (
|
||||
@@ -4330,11 +4393,19 @@
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/manta/barracks)
|
||||
"ts" = (
|
||||
<<<<<<< HEAD
|
||||
/obj/machinery/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
||||||| parent of d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
=======
|
||||
/obj/structure/hull_corner/long_horiz{
|
||||
dir = 9
|
||||
>>>>>>> d71d84c517... Merge pull request #10444 from KillianKirilenko/kk-ships
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/hallways_star)
|
||||
/turf/space,
|
||||
/area/space)
|
||||
"tt" = (
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 1
|
||||
@@ -4353,6 +4424,10 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/hallways_port)
|
||||
"tB" = (
|
||||
/obj/machinery/porta_turret/stationary/syndie/CIWS,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/recreation)
|
||||
"tE" = (
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 1
|
||||
@@ -4424,6 +4499,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/hangar)
|
||||
"tR" = (
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/dock_port)
|
||||
"tV" = (
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
dir = 4
|
||||
@@ -4550,7 +4631,7 @@
|
||||
/area/shuttle/manta_ship_boat)
|
||||
"ux" = (
|
||||
/obj/structure/shuttle/engine/propulsion,
|
||||
/turf/simulated/floor/reinforced,
|
||||
/turf/simulated/shuttle/plating/airless/carry,
|
||||
/area/shuttle/manta_ship_boat)
|
||||
"uy" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
@@ -4775,6 +4856,12 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/ship/manta/engine)
|
||||
"vC" = (
|
||||
/obj/structure/hull_corner/long_horiz{
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/hallways_port)
|
||||
"vD" = (
|
||||
/obj/machinery/door/blast/regular/open{
|
||||
dir = 4;
|
||||
@@ -5895,6 +5982,12 @@
|
||||
/obj/item/weapon/gun/energy/plasmastun,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/armoury_st)
|
||||
"zw" = (
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/recreation)
|
||||
"zx" = (
|
||||
/obj/structure/table/rack,
|
||||
/obj/item/weapon/gun/energy/stunrevolver,
|
||||
@@ -6122,6 +6215,11 @@
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/embedded_controller/radio/simple_docking_controller{
|
||||
id_tag = "manta_boarding_shuttle";
|
||||
pixel_x = -11;
|
||||
pixel_y = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/shuttle/manta_ship_boat)
|
||||
"Aw" = (
|
||||
@@ -6771,6 +6869,10 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/hallways_star)
|
||||
"DS" = (
|
||||
/obj/structure/hull_corner,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/gunnery)
|
||||
"DY" = (
|
||||
/turf/simulated/wall/shull,
|
||||
/area/ship/manta/teleporter)
|
||||
@@ -8118,6 +8220,12 @@
|
||||
"KJ" = (
|
||||
/turf/simulated/wall/rshull,
|
||||
/area/ship/manta/teleporter)
|
||||
"KK" = (
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/holding)
|
||||
"KL" = (
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 8
|
||||
@@ -8159,6 +8267,12 @@
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/manta/barracks/bed_2)
|
||||
"KY" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/gunnery)
|
||||
"KZ" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
@@ -8316,6 +8430,17 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/engineering)
|
||||
"LQ" = (
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/embedded_controller/radio/simple_docking_controller{
|
||||
dir = 4;
|
||||
id_tag = "manta_boarding_shuttle_dock";
|
||||
pixel_x = -22
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/hangar)
|
||||
"LS" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible{
|
||||
dir = 4
|
||||
@@ -8369,6 +8494,12 @@
|
||||
"LZ" = (
|
||||
/turf/simulated/wall/shull,
|
||||
/area/ship/manta/hallways_star)
|
||||
"Ma" = (
|
||||
/obj/structure/hull_corner/long_vert{
|
||||
dir = 5
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/engine)
|
||||
"Mb" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
@@ -8653,6 +8784,12 @@
|
||||
/obj/structure/railing,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/ship/manta/engine)
|
||||
"Nj" = (
|
||||
/obj/structure/hull_corner/long_horiz{
|
||||
dir = 5
|
||||
},
|
||||
/turf/space,
|
||||
/area/space)
|
||||
"No" = (
|
||||
/obj/structure/bed/chair/comfy/black{
|
||||
dir = 8
|
||||
@@ -9951,6 +10088,12 @@
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/hallways_port)
|
||||
"Tu" = (
|
||||
/obj/structure/hull_corner/long_vert{
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/engine)
|
||||
"Tv" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
@@ -10061,6 +10204,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/hallways_port)
|
||||
"TO" = (
|
||||
/obj/structure/hull_corner{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/holding)
|
||||
"TS" = (
|
||||
/obj/item/modular_computer/console/preset/mercenary{
|
||||
dir = 4
|
||||
@@ -10694,6 +10843,10 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/engineering)
|
||||
"Xb" = (
|
||||
/obj/structure/hull_corner,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/hallways_port)
|
||||
"Xd" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 8
|
||||
@@ -10956,6 +11109,12 @@
|
||||
/obj/structure/catwalk,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/ship/manta/magazine)
|
||||
"Yc" = (
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "mercenary_pd"
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/ship/manta/hallways_port)
|
||||
"Yd" = (
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/ship/manta/bridge)
|
||||
@@ -17259,20 +17418,20 @@ yz
|
||||
yz
|
||||
yz
|
||||
Hr
|
||||
Hr
|
||||
Hr
|
||||
nJ
|
||||
Hr
|
||||
Hr
|
||||
rT
|
||||
Hr
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
kW
|
||||
tB
|
||||
kW
|
||||
kW
|
||||
jh
|
||||
kW
|
||||
zw
|
||||
kW
|
||||
yz
|
||||
yz
|
||||
@@ -17406,10 +17565,10 @@ CF
|
||||
CF
|
||||
CF
|
||||
CF
|
||||
rT
|
||||
Hr
|
||||
KY
|
||||
Hr
|
||||
nJ
|
||||
DS
|
||||
lm
|
||||
lm
|
||||
lm
|
||||
@@ -17559,7 +17718,7 @@ cW
|
||||
Jq
|
||||
lm
|
||||
lm
|
||||
kW
|
||||
fZ
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -17702,7 +17861,7 @@ gf
|
||||
Db
|
||||
lm
|
||||
lm
|
||||
kW
|
||||
Nj
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -17823,7 +17982,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
Hr
|
||||
rT
|
||||
CF
|
||||
CF
|
||||
CF
|
||||
@@ -17844,7 +18003,7 @@ Yi
|
||||
hD
|
||||
CQ
|
||||
lm
|
||||
jh
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -17987,7 +18146,7 @@ gh
|
||||
gd
|
||||
lm
|
||||
lm
|
||||
kW
|
||||
Nj
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -18107,7 +18266,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
eH
|
||||
Xb
|
||||
CF
|
||||
CF
|
||||
CF
|
||||
@@ -18129,7 +18288,7 @@ gh
|
||||
gf
|
||||
ik
|
||||
lm
|
||||
fZ
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -18248,7 +18407,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
eG
|
||||
Yc
|
||||
ht
|
||||
ht
|
||||
ht
|
||||
@@ -18272,7 +18431,7 @@ gh
|
||||
io
|
||||
lm
|
||||
lm
|
||||
kW
|
||||
Nj
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -18390,7 +18549,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
eG
|
||||
vC
|
||||
ht
|
||||
kP
|
||||
ht
|
||||
@@ -18414,7 +18573,7 @@ gk
|
||||
MV
|
||||
js
|
||||
lm
|
||||
kW
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -18815,7 +18974,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
eG
|
||||
vC
|
||||
ht
|
||||
kT
|
||||
op
|
||||
@@ -18957,7 +19116,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
eH
|
||||
hq
|
||||
ht
|
||||
Cf
|
||||
ov
|
||||
@@ -19098,7 +19257,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
aE
|
||||
bG
|
||||
ZT
|
||||
ZT
|
||||
ZT
|
||||
@@ -19240,7 +19399,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
aE
|
||||
cS
|
||||
ZT
|
||||
hU
|
||||
lj
|
||||
@@ -19382,7 +19541,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
bG
|
||||
aE
|
||||
ZT
|
||||
ic
|
||||
bR
|
||||
@@ -19523,7 +19682,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
aE
|
||||
jh
|
||||
ZT
|
||||
ZT
|
||||
ic
|
||||
@@ -19665,7 +19824,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
aE
|
||||
cS
|
||||
ZT
|
||||
ZT
|
||||
ih
|
||||
@@ -19807,7 +19966,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
cS
|
||||
aE
|
||||
ZT
|
||||
ZT
|
||||
ZT
|
||||
@@ -19993,7 +20152,7 @@ Bn
|
||||
GA
|
||||
vw
|
||||
WF
|
||||
yo
|
||||
tR
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -20135,8 +20294,8 @@ Zy
|
||||
xd
|
||||
RZ
|
||||
WF
|
||||
FZ
|
||||
WA
|
||||
Ma
|
||||
WA
|
||||
WA
|
||||
yz
|
||||
@@ -20374,7 +20533,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
aE
|
||||
cS
|
||||
ZT
|
||||
ZT
|
||||
ZT
|
||||
@@ -20516,7 +20675,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
bT
|
||||
ag
|
||||
Vp
|
||||
Vp
|
||||
Vp
|
||||
@@ -20665,7 +20824,7 @@ fw
|
||||
au
|
||||
fw
|
||||
oZ
|
||||
au
|
||||
LQ
|
||||
tQ
|
||||
wX
|
||||
zI
|
||||
@@ -20945,10 +21104,10 @@ yz
|
||||
ce
|
||||
dk
|
||||
ec
|
||||
da
|
||||
jd
|
||||
je
|
||||
je
|
||||
je
|
||||
da
|
||||
tW
|
||||
xe
|
||||
@@ -21939,8 +22098,8 @@ yz
|
||||
ce
|
||||
dk
|
||||
ec
|
||||
da
|
||||
jd
|
||||
lc
|
||||
je
|
||||
je
|
||||
je
|
||||
da
|
||||
@@ -22833,8 +22992,8 @@ rJ
|
||||
xB
|
||||
ZW
|
||||
PK
|
||||
pi
|
||||
WA
|
||||
Ly
|
||||
Tu
|
||||
WA
|
||||
WA
|
||||
yz
|
||||
@@ -22975,7 +23134,7 @@ FH
|
||||
Ik
|
||||
Cn
|
||||
PK
|
||||
Ly
|
||||
qI
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -23357,7 +23516,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
cr
|
||||
pi
|
||||
dl
|
||||
dl
|
||||
kl
|
||||
@@ -23500,7 +23659,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
cI
|
||||
dI
|
||||
dl
|
||||
ky
|
||||
nf
|
||||
@@ -23784,7 +23943,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
cr
|
||||
cI
|
||||
dl
|
||||
dl
|
||||
ny
|
||||
@@ -24211,7 +24370,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
cr
|
||||
pi
|
||||
dl
|
||||
dl
|
||||
rM
|
||||
@@ -24354,7 +24513,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
cI
|
||||
dI
|
||||
dl
|
||||
rM
|
||||
rM
|
||||
@@ -24520,7 +24679,7 @@ hW
|
||||
xv
|
||||
LZ
|
||||
mT
|
||||
pn
|
||||
ts
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -24638,7 +24797,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
cr
|
||||
cI
|
||||
dl
|
||||
dl
|
||||
rM
|
||||
@@ -24662,7 +24821,7 @@ Mb
|
||||
MM
|
||||
mT
|
||||
mT
|
||||
pn
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -24781,7 +24940,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
dI
|
||||
ay
|
||||
dl
|
||||
rM
|
||||
ch
|
||||
@@ -24803,7 +24962,7 @@ ch
|
||||
hN
|
||||
Th
|
||||
mT
|
||||
kO
|
||||
ts
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -24945,7 +25104,7 @@ ch
|
||||
hS
|
||||
mT
|
||||
mT
|
||||
pn
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -25065,7 +25224,7 @@ yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
cr
|
||||
pi
|
||||
dl
|
||||
ch
|
||||
ch
|
||||
@@ -25228,7 +25387,7 @@ cM
|
||||
ch
|
||||
ch
|
||||
mT
|
||||
pn
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -25500,17 +25659,17 @@ ch
|
||||
ch
|
||||
ch
|
||||
ch
|
||||
sZ
|
||||
TO
|
||||
rS
|
||||
rS
|
||||
rR
|
||||
ch
|
||||
ch
|
||||
ch
|
||||
ch
|
||||
ch
|
||||
ch
|
||||
KK
|
||||
sZ
|
||||
ch
|
||||
ch
|
||||
ch
|
||||
ch
|
||||
ch
|
||||
ch
|
||||
pn
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
@@ -25637,20 +25796,20 @@ yz
|
||||
yz
|
||||
yz
|
||||
rS
|
||||
KK
|
||||
rS
|
||||
rS
|
||||
rR
|
||||
rS
|
||||
eC
|
||||
rS
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
yz
|
||||
rS
|
||||
eC
|
||||
rS
|
||||
rS
|
||||
rR
|
||||
rS
|
||||
KK
|
||||
rS
|
||||
yz
|
||||
yz
|
||||
|
||||
@@ -143,7 +143,7 @@
|
||||
vessel_mass = 8000
|
||||
vessel_size = SHIP_SIZE_LARGE
|
||||
initial_generic_waypoints = list("manta_ship_near_fore", "manta_ship_near_aft", "manta_ship_near_port", "manta_ship_near_star", "manta_ship_port", "manta_ship_star", "manta_ship_base_dock", "omship_spawn_manta_lander")
|
||||
// initial_restricted_waypoints = list("Mercenary Cruiser's Bay" = list("omship_spawn_manta_lander"))
|
||||
initial_restricted_waypoints = list("Mercenary Cruiser's Bay" = list("omship_spawn_manta_lander"))
|
||||
|
||||
/obj/effect/landmark/map_data/manta_ship
|
||||
height = 1
|
||||
|
||||
Reference in New Issue
Block a user