[MIRROR] Fixes a bunch of small issues on various Whiteships (#28484)

* Fixes a bunch of small issues on various Whiteships (#84404)

## About The Pull Request
A lot of White ships in the game had minor issues like the camera eye
being way offset in the shuttle navigation console or the ship just
flying backwards through space. I also caught a few active turfs on
shuttle engine plating.

<details>
  <summary>Full changes</summary>

- Fixed camera offset issues on: whiteship_birdshot.dmm,
whiteship_donut.dmm, whiteship_personalshuttle.dmm, whiteship_pubby.dmm,
whiteship_obelisk.dmm, whiteship_tram.dmm, whiteship_kilo.dmm,
whiteship_cere.dmm

- Fixed whiteship_pubby.dmm, whiteship_kilo.dmm flying in the wrong
direction

- Removed use of /turf/closed/wall/mineral/titanium/overspace on
whiteship_birdshot.dmm: These aren't used on any other whiteship so I
assume it was used incorrectly here.

- Fixed spelling of "aggressive" in shuttle manipulator for Birdshot's
Whiteship.

- Replaced platings that were active turfs with their airless variants
on: whiteship_obelisk.dmm, whiteship_personalshuttle.dmm,
whiteship_kilo.dmm

- Added an autodoc comment to x_offset and y_offset for shuttles.

- Fixed whiteship_birdshot.dmm not being able to spawn.

</details>

## Why It's Good For The Game
makes the shuttle navigation console easier to use if you can actually
see the ship, also ships drifting sideways through hyperspace is funny
but (probably) unintended.

## Changelog
🆑
fix: Fixed the camera offset for the navigation console on a handful of
Whiteships.
fix: Fixed the Pubby Whiteship drifting sideways through hyperspace when
in flight.
fix: Fixed the Kilo Whiteship flying backwards through hyperspace when
in flight.
fix: The Birdshot Whiteship should actually be able to spawn now.
spellcheck: fixed spelling of "aggressive" in the shuttle manipulator
description for the Birdshot Whiteship.
/🆑

* Fixes a bunch of small issues on various Whiteships

---------

Co-authored-by: aaaa1023 <74441292+aaaa1023@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-06-30 12:57:22 +05:30
committed by GitHub
co-authored by aaaa1023
parent ed03d06415
commit db7c9f0d7e
11 changed files with 369 additions and 370 deletions
+90 -101
View File
@@ -26,9 +26,6 @@
/obj/machinery/meter,
/turf/open/floor/catwalk_floor,
/area/shuttle/abandoned/engine)
"bp" = (
/turf/closed/wall/mineral/titanium/overspace,
/area/shuttle/abandoned/engine)
"bq" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
@@ -177,19 +174,6 @@
},
/turf/open/floor/iron,
/area/shuttle/abandoned/bar)
"fW" = (
/obj/machinery/porta_turret/centcom_shuttle/weak{
dir = 4
},
/turf/closed/wall/mineral/titanium/overspace,
/area/shuttle/abandoned/crew)
"gj" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/small,
/area/shuttle/abandoned/bridge)
"gs" = (
/obj/machinery/power/terminal{
dir = 4
@@ -212,6 +196,14 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/iron/textured,
/area/shuttle/abandoned/cargo)
"gD" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
dir = 1;
x_offset = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/small,
/area/shuttle/abandoned/bridge)
"gV" = (
/obj/effect/turf_decal/box/white/corners{
dir = 4
@@ -233,6 +225,12 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor,
/area/shuttle/abandoned/crew)
"hz" = (
/obj/machinery/porta_turret/centcom_shuttle/weak{
dir = 4
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/crew)
"hT" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/firedoor,
@@ -285,6 +283,12 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/dark/small,
/area/shuttle/abandoned/bridge)
"jC" = (
/obj/machinery/porta_turret/centcom_shuttle/weak{
dir = 4
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/pod)
"jY" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/suit_storage_unit/standard_unit,
@@ -339,9 +343,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/iron/smooth_large,
/area/shuttle/abandoned/cargo)
"ma" = (
/turf/closed/wall/mineral/titanium/overspace,
/area/shuttle/abandoned/cargo)
"mU" = (
/obj/structure/toilet{
pixel_y = 8
@@ -415,6 +416,27 @@
},
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"ow" = (
/obj/structure/table/greyscale,
/obj/machinery/recharger{
pixel_x = -13;
pixel_y = 11
},
/obj/machinery/cell_charger{
pixel_x = 4;
pixel_y = 11
},
/obj/item/stock_parts/cell/high{
pixel_x = 4;
pixel_y = 11
},
/obj/item/storage/toolbox/emergency{
pixel_y = 2
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/security/telescreen/entertainment/directional/north,
/turf/open/floor/iron/dark/small,
/area/shuttle/abandoned/bridge)
"pg" = (
/obj/effect/turf_decal/tile/bar/opposingcorners,
/obj/structure/table,
@@ -537,9 +559,6 @@
},
/turf/open/floor/iron/small,
/area/shuttle/abandoned/medbay)
"ry" = (
/turf/closed/wall/mineral/titanium/overspace,
/area/shuttle/abandoned/bar)
"rO" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -598,9 +617,6 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/catwalk_floor,
/area/shuttle/abandoned/engine)
"uk" = (
/turf/closed/wall/mineral/titanium/overspace,
/area/shuttle/abandoned/pod)
"ur" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -784,6 +800,12 @@
},
/turf/open/floor/iron/small,
/area/shuttle/abandoned/cargo)
"zZ" = (
/obj/machinery/porta_turret/centcom_shuttle/weak{
dir = 4
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/bridge)
"Av" = (
/obj/machinery/atmospherics/components/trinary/filter{
dir = 1
@@ -852,6 +874,21 @@
},
/turf/open/floor/plating,
/area/shuttle/abandoned/pod)
"Cl" = (
/obj/structure/table,
/obj/machinery/cell_charger{
pixel_y = 11
},
/obj/item/stock_parts/cell/high{
pixel_y = 11
},
/obj/item/stack/cable_coil{
pixel_y = -1
},
/obj/item/multitool,
/obj/machinery/light/small/directional/north,
/turf/open/floor/catwalk_floor,
/area/shuttle/abandoned/engine)
"Cw" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/firedoor,
@@ -1023,27 +1060,6 @@
},
/turf/open/floor/iron/cafeteria,
/area/shuttle/abandoned/bar)
"Hk" = (
/obj/structure/table/greyscale,
/obj/machinery/recharger{
pixel_x = -13;
pixel_y = 11
},
/obj/machinery/cell_charger{
pixel_x = 4;
pixel_y = 11
},
/obj/item/stock_parts/cell/high{
pixel_x = 4;
pixel_y = 11
},
/obj/item/storage/toolbox/emergency{
pixel_y = 2
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/security/telescreen/entertainment/directional/north,
/turf/open/floor/iron/dark/small,
/area/shuttle/abandoned/bridge)
"Ht" = (
/obj/structure/rack,
/obj/item/tank/internals/anesthetic{
@@ -1166,12 +1182,6 @@
},
/turf/open/floor/iron,
/area/shuttle/abandoned/bar)
"Lj" = (
/obj/machinery/porta_turret/centcom_shuttle/weak{
dir = 4
},
/turf/closed/wall/mineral/titanium/overspace,
/area/shuttle/abandoned/pod)
"Ll" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -1194,21 +1204,6 @@
},
/turf/open/floor/catwalk_floor,
/area/shuttle/abandoned/crew)
"Nl" = (
/obj/structure/table,
/obj/machinery/cell_charger{
pixel_y = 11
},
/obj/item/stock_parts/cell/high{
pixel_y = 11
},
/obj/item/stack/cable_coil{
pixel_y = -1
},
/obj/item/multitool,
/obj/machinery/light/small/directional/north,
/turf/open/floor/catwalk_floor,
/area/shuttle/abandoned/engine)
"NK" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/crew)
@@ -1273,12 +1268,6 @@
},
/turf/open/floor/iron/grimy,
/area/shuttle/abandoned/crew)
"Qf" = (
/obj/machinery/porta_turret/centcom_shuttle/weak{
dir = 4
},
/turf/closed/wall/mineral/titanium/overspace,
/area/shuttle/abandoned/bridge)
"Ql" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/official/random/directional/north,
@@ -1411,6 +1400,9 @@
},
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/crew)
"VE" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/bar)
"VL" = (
/obj/machinery/shower/directional/south,
/obj/item/soap,
@@ -1448,9 +1440,6 @@
/obj/machinery/light/built/directional/west,
/turf/open/floor/carpet/green,
/area/shuttle/abandoned/bar)
"WG" = (
/turf/closed/wall/mineral/titanium/overspace,
/area/shuttle/abandoned/bridge)
"WW" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
@@ -1538,9 +1527,9 @@
(1,1,1) = {"
lt
lt
bp
Gi
BH
bp
Gi
lt
lt
lt
@@ -1552,15 +1541,15 @@ lt
lt
lt
lt
bp
Gi
BH
bp
Gi
lt
lt
"}
(2,1,1) = {"
lt
bp
Gi
Om
oe
Gi
@@ -1578,7 +1567,7 @@ BH
Gi
oe
Om
bp
Gi
lt
"}
(3,1,1) = {"
@@ -1588,7 +1577,7 @@ Wu
RH
Gi
oe
bp
Gi
lt
lt
lt
@@ -1596,7 +1585,7 @@ lt
lt
lt
lt
bp
Gi
oe
Gi
qn
@@ -1620,7 +1609,7 @@ lt
lt
lt
Gi
Nl
Cl
Zn
Jt
gs
@@ -1674,7 +1663,7 @@ Gi
lt
"}
(7,1,1) = {"
ma
Tg
kQ
DK
er
@@ -1694,7 +1683,7 @@ uF
uF
BR
kQ
ma
Tg
"}
(8,1,1) = {"
kQ
@@ -1835,7 +1824,7 @@ wd
Tg
"}
(14,1,1) = {"
fW
hz
NK
NK
NK
@@ -1855,7 +1844,7 @@ Zy
NK
NK
NK
fW
hz
"}
(15,1,1) = {"
lt
@@ -1928,7 +1917,7 @@ lt
"}
(18,1,1) = {"
lt
uk
PN
pv
pv
pv
@@ -1946,7 +1935,7 @@ KR
JP
JP
JP
WG
XB
lt
"}
(19,1,1) = {"
@@ -2013,7 +2002,7 @@ JP
JP
UK
Uu
gj
gD
XB
lt
lt
@@ -2021,23 +2010,23 @@ lt
(22,1,1) = {"
lt
lt
uk
PN
pv
xr
qO
pv
ry
VE
lt
lt
lt
lt
lt
WG
XB
JP
Hk
ow
Bs
JP
WG
XB
lt
lt
"}
@@ -2045,10 +2034,10 @@ lt
lt
lt
lt
uk
PN
BZ
BZ
Lj
jC
lt
lt
lt
@@ -2056,10 +2045,10 @@ lt
lt
lt
lt
Qf
zZ
YJ
YJ
WG
XB
lt
lt
lt
+22 -20
View File
@@ -482,6 +482,16 @@
"vH" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/engine)
"wh" = (
/obj/machinery/light/small/directional/east,
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
dir = 1;
x_offset = 0;
y_offset = 10
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/bridge)
"wI" = (
/obj/structure/bed,
/obj/item/bedsheet/captain,
@@ -495,16 +505,6 @@
},
/turf/open/floor/wood,
/area/shuttle/abandoned/bridge)
"wM" = (
/obj/structure/cable,
/obj/structure/cable/layer1,
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/reinforced/titaniumglass,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high,
/turf/open/floor/catwalk_floor/iron_dark,
/area/shuttle/abandoned/cargo)
"wN" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/fueltank,
@@ -573,6 +573,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/bridge)
"BU" = (
/obj/structure/cable,
/obj/structure/cable/layer1,
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/reinforced/titaniumglass,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high,
/turf/open/floor/catwalk_floor/iron_dark,
/area/shuttle/abandoned/cargo)
"Cp" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -682,14 +692,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
/area/shuttle/abandoned/cargo)
"Hw" = (
/obj/machinery/light/small/directional/east,
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/bridge)
"HI" = (
/obj/machinery/power/port_gen/pacman/pre_loaded,
/obj/structure/cable,
@@ -1143,7 +1145,7 @@ WF
gK
US
gK
wM
BU
aG
oB
DC
@@ -1245,7 +1247,7 @@ kP
EQ
aQ
Fj
Hw
wh
su
"}
(12,1,1) = {"
+20 -18
View File
@@ -53,7 +53,7 @@
/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/abandoned)
"cm" = (
"br" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/stock_parts/cell/high,
/turf/open/floor/iron/airless,
@@ -232,6 +232,17 @@
},
/turf/open/floor/iron/airless,
/area/shuttle/abandoned)
"xb" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
dir = 1;
x_offset = 0;
y_offset = 9
},
/obj/effect/decal/cleanable/dirt,
/obj/item/disk/holodisk/donutstation/whiteship,
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron/airless,
/area/shuttle/abandoned)
"Bw" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sink/directional/east,
@@ -318,6 +329,11 @@
/obj/structure/tank_dispenser,
/turf/open/floor/iron/airless,
/area/shuttle/abandoned)
"HP" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/stock_parts/cell/high/empty,
/turf/open/floor/plating/airless,
/area/shuttle/abandoned)
"Ic" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/wallframe/apc,
@@ -387,11 +403,6 @@
/obj/item/stack/rods,
/turf/open/floor/iron/airless,
/area/shuttle/abandoned)
"NG" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/stock_parts/cell/high/empty,
/turf/open/floor/plating/airless,
/area/shuttle/abandoned)
"Ot" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/portable_atmospherics/canister/air,
@@ -466,15 +477,6 @@
},
/turf/open/floor/iron/airless,
/area/shuttle/abandoned)
"XY" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/obj/item/disk/holodisk/donutstation/whiteship,
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron/airless,
/area/shuttle/abandoned)
"YO" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/directional/south,
@@ -557,7 +559,7 @@ an
ar
ac
PT
NG
HP
ui
ac
KL
@@ -645,7 +647,7 @@ ui
PT
gf
Xd
XY
xb
bq
"}
(9,1,1) = {"
@@ -683,7 +685,7 @@ aq
aq
al
ac
cm
br
Hi
Cg
bq
+146 -144
View File
@@ -1,4 +1,14 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"ae" = (
/obj/machinery/power/shuttle_engine/heater{
dir = 8
},
/obj/structure/window/reinforced/spawner/directional/east,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/bar)
"bl" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -90,6 +100,19 @@
},
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"fs" = (
/obj/machinery/cell_charger,
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
/obj/item/stock_parts/cell/emproof/empty{
pixel_y = 7;
pixel_x = 5
},
/obj/effect/turf_decal/tile/brown,
/turf/open/floor/iron/white/corner{
dir = 8
},
/area/shuttle/abandoned/cargo)
"fL" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/corner{
@@ -200,15 +223,6 @@
},
/turf/open/floor/plating,
/area/shuttle/abandoned/bridge)
"jr" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/power/shuttle_engine/propulsion/left{
dir = 8
},
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"jM" = (
/obj/structure/table,
/obj/machinery/microwave{
@@ -231,29 +245,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/shuttle/abandoned/cargo)
"ku" = (
/obj/machinery/door/airlock/external/ruin{
name = "External Freight Airlock"
},
"kE" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
dir = 8
},
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/obj/docking_port/mobile{
callTime = 250;
can_move_docking_ports = 1;
dir = 2;
shuttle_id = "whiteship";
launch_status = 0;
movement_force = list("KNOCKDOWN"=0,"THROW"=0);
name = "Mining Shuttle";
port_direction = 4;
preferred_direction = 8
/obj/machinery/power/shuttle_engine/propulsion/left{
dir = 8
},
/turf/open/floor/plating,
/area/shuttle/abandoned/cargo)
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"kG" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
@@ -320,15 +320,6 @@
/obj/structure/cable,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/abandoned/bridge)
"mX" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/power/shuttle_engine/propulsion{
dir = 8
},
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"nt" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -348,15 +339,6 @@
/obj/structure/cable,
/turf/open/floor/mineral/titanium/tiled/white,
/area/shuttle/abandoned/bridge)
"oQ" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/power/shuttle_engine/propulsion/right{
dir = 8
},
/turf/open/floor/plating,
/area/shuttle/abandoned/bar)
"pI" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
@@ -398,6 +380,16 @@
/obj/effect/decal/cleanable/robot_debris,
/turf/open/floor/plating,
/area/shuttle/abandoned/cargo)
"rh" = (
/obj/machinery/power/shuttle_engine/heater{
dir = 8
},
/obj/structure/window/reinforced/spawner/directional/east,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"ry" = (
/obj/machinery/porta_turret/centcom_shuttle/weak{
dir = 4;
@@ -409,15 +401,6 @@
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/bar)
"rC" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/power/shuttle_engine/propulsion/right{
dir = 8
},
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"rX" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
@@ -447,6 +430,35 @@
/obj/machinery/power/apc/auto_name/directional/south,
/turf/open/floor/plating,
/area/shuttle/abandoned/cargo)
"sU" = (
/obj/effect/turf_decal/trimline/white/line,
/obj/effect/turf_decal/trimline/white/filled/warning{
dir = 1
},
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
dir = 4;
view_range = 14;
y_offset = 5;
x_offset = 0
},
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/button/door{
id = "whiteship_windows";
name = "NTMS-037 Windows Blast Door Control";
pixel_x = -24;
pixel_y = 6
},
/obj/machinery/button/door{
id = "whiteship_bridge";
name = "NTMS-037 Bridge Blast Door Control";
pixel_x = -24;
pixel_y = -6
},
/turf/open/floor/pod/light,
/area/shuttle/abandoned/bridge)
"tf" = (
/obj/machinery/atmospherics/components/tank/air,
/obj/effect/turf_decal/stripes/line{
@@ -514,6 +526,24 @@
/obj/item/shovel,
/turf/open/floor/plating,
/area/shuttle/abandoned/cargo)
"wy" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/power/shuttle_engine/propulsion/left{
dir = 8
},
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/bar)
"wT" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/power/shuttle_engine/propulsion{
dir = 8
},
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"xh" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/cargo)
@@ -534,6 +564,29 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"yV" = (
/obj/machinery/door/airlock/external/ruin{
name = "External Freight Airlock"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/obj/docking_port/mobile{
callTime = 250;
can_move_docking_ports = 1;
dir = 2;
shuttle_id = "whiteship";
launch_status = 0;
movement_force = list("KNOCKDOWN"=0,"THROW"=0);
name = "Mining Shuttle";
port_direction = 8;
preferred_direction = 4
},
/turf/open/floor/plating,
/area/shuttle/abandoned/cargo)
"zl" = (
/obj/effect/turf_decal/trimline/white/line{
dir = 8
@@ -566,19 +619,6 @@
/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/pod/light,
/area/shuttle/abandoned/bridge)
"zu" = (
/obj/machinery/cell_charger,
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
/obj/item/stock_parts/cell/emproof/empty{
pixel_y = 7;
pixel_x = 5
},
/obj/effect/turf_decal/tile/brown,
/turf/open/floor/iron/white/corner{
dir = 8
},
/area/shuttle/abandoned/cargo)
"zJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/cigbutt,
@@ -860,16 +900,6 @@
/obj/structure/cable,
/turf/open/floor/mineral/titanium/tiled/yellow,
/area/shuttle/abandoned/engine)
"MI" = (
/obj/machinery/power/shuttle_engine/heater{
dir = 8
},
/obj/structure/window/reinforced/spawner/directional/east,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"Nh" = (
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/abandoned/engine)
@@ -901,16 +931,6 @@
/obj/item/storage/box/donkpockets,
/turf/open/floor/bamboo,
/area/shuttle/abandoned/bar)
"OZ" = (
/obj/machinery/power/shuttle_engine/heater{
dir = 8
},
/obj/structure/window/reinforced/spawner/directional/east,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plating,
/area/shuttle/abandoned/bar)
"Pe" = (
/obj/machinery/button/door/directional/north{
id = "whiteship_port";
@@ -924,15 +944,6 @@
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/plating,
/area/shuttle/abandoned/cargo)
"Pz" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/power/shuttle_engine/propulsion/left{
dir = 8
},
/turf/open/floor/plating,
/area/shuttle/abandoned/bar)
"PR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
@@ -960,6 +971,15 @@
/obj/structure/cable,
/turf/open/floor/mineral/titanium/tiled/yellow,
/area/shuttle/abandoned/engine)
"QQ" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/power/shuttle_engine/propulsion/right{
dir = 8
},
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/bar)
"QR" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
@@ -1024,33 +1044,6 @@
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/cargo)
"Ta" = (
/obj/effect/turf_decal/trimline/white/line,
/obj/effect/turf_decal/trimline/white/filled/warning{
dir = 1
},
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
dir = 4;
view_range = 14
},
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/button/door{
id = "whiteship_windows";
name = "NTMS-037 Windows Blast Door Control";
pixel_x = -24;
pixel_y = 6
},
/obj/machinery/button/door{
id = "whiteship_bridge";
name = "NTMS-037 Bridge Blast Door Control";
pixel_x = -24;
pixel_y = -6
},
/turf/open/floor/pod/light,
/area/shuttle/abandoned/bridge)
"Tf" = (
/obj/structure/table,
/obj/effect/turf_decal/trimline/brown/filled/shrink_ccw{
@@ -1152,6 +1145,15 @@
},
/turf/open/floor/wood/tile,
/area/shuttle/abandoned/crew)
"Yu" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/power/shuttle_engine/propulsion/right{
dir = 8
},
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"YM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
@@ -1205,9 +1207,9 @@
(1,1,1) = {"
Nh
jr
mX
rC
kE
wT
Yu
Nh
Gu
Gu
@@ -1220,13 +1222,13 @@ Gu
"}
(2,1,1) = {"
Nh
MI
MI
MI
rh
rh
rh
CG
jr
mX
rC
kE
wT
Yu
gL
Gu
Gu
@@ -1239,9 +1241,9 @@ Ss
bl
eT
CG
MI
MI
MI
rh
rh
rh
CG
Gu
Gu
@@ -1318,8 +1320,8 @@ NV
NV
nN
NV
Pz
oQ
wy
QQ
BS
Gu
"}
@@ -1330,20 +1332,20 @@ bF
eD
Nt
iI
Ta
sU
mH
NV
OZ
OZ
ae
ae
Of
Gu
"}
(10,1,1) = {"
ku
yV
Bk
vM
Wj
zu
fs
iI
qu
YV
+6 -6
View File
@@ -206,7 +206,7 @@
/obj/machinery/power/shuttle_engine/propulsion/left{
dir = 4
},
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"mQ" = (
/obj/structure/cable,
@@ -271,14 +271,14 @@
dir = 4
},
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"ot" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
dir = 4;
view_range = 14;
x_offset = -3;
y_offset = -3
x_offset = -2;
y_offset = -7
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/dark_blue/anticorner{
@@ -438,7 +438,7 @@
/obj/effect/turf_decal/stripes{
dir = 4
},
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"zj" = (
/obj/structure/cable,
@@ -699,7 +699,7 @@
/obj/machinery/power/shuttle_engine/propulsion/right{
dir = 4
},
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"PR" = (
/obj/structure/table/wood,
+5 -6
View File
@@ -90,7 +90,7 @@
/obj/machinery/power/shuttle_engine/propulsion/right{
dir = 1
},
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"cM" = (
/turf/template_noop,
@@ -100,7 +100,7 @@
dir = 1
},
/obj/structure/window/reinforced/spawner/directional/south,
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"cY" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -372,9 +372,8 @@
"DT" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
dir = 1;
view_range = 14;
x_offset = -3;
y_offset = -3
x_offset = 0;
y_offset = -5
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/mineral/plastitanium,
@@ -523,7 +522,7 @@
/obj/machinery/power/shuttle_engine/propulsion/left{
dir = 1
},
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"WL" = (
/obj/machinery/light/cold/no_nightlight/directional/west,
+43 -43
View File
@@ -54,6 +54,19 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/shuttle/abandoned)
"bM" = (
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high,
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/siding/purple{
dir = 9
},
/obj/item/stack/cable_coil,
/obj/item/multitool,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/white/diagonal,
/area/shuttle/abandoned)
"bP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
@@ -268,15 +281,6 @@
/obj/machinery/recharger,
/turf/open/floor/pod/light,
/area/shuttle/abandoned)
"lV" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
y_offset = 2;
x_offset = -7
},
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
/area/shuttle/abandoned)
"mh" = (
/obj/effect/turf_decal/trimline/purple/filled/corner{
dir = 8
@@ -403,19 +407,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/shuttle/abandoned)
"qS" = (
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high,
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/siding/purple{
dir = 9
},
/obj/item/stack/cable_coil,
/obj/item/multitool,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/white/diagonal,
/area/shuttle/abandoned)
"re" = (
/obj/structure/cable,
/obj/effect/turf_decal/bot_white,
@@ -536,24 +527,6 @@
/obj/machinery/light/small/built/directional/west,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned)
"vB" = (
/obj/machinery/door/airlock/external/ruin,
/obj/effect/turf_decal/loading_area/white{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/docking_port/mobile{
dir = 8;
shuttle_id = "whiteship";
launch_status = 0;
name = "White Ship";
port_direction = 2
},
/turf/open/floor/plating,
/area/shuttle/abandoned)
"vJ" = (
/obj/effect/turf_decal/trimline/purple/filled/line,
/obj/effect/decal/cleanable/dirt,
@@ -603,6 +576,15 @@
"zY" = (
/turf/template_noop,
/area/template_noop)
"Ak" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
y_offset = 2;
x_offset = -8
},
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
/area/shuttle/abandoned)
"AA" = (
/obj/effect/turf_decal/trimline/purple/filled/line,
/mob/living/basic/ant{
@@ -816,6 +798,24 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/shuttle/abandoned)
"IO" = (
/obj/machinery/door/airlock/external/ruin,
/obj/effect/turf_decal/loading_area/white{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/docking_port/mobile{
dir = 8;
shuttle_id = "whiteship";
launch_status = 0;
name = "White Ship";
port_direction = 4
},
/turf/open/floor/plating,
/area/shuttle/abandoned)
"Je" = (
/obj/effect/turf_decal/bot_white,
/obj/machinery/power/port_gen/pacman{
@@ -1411,14 +1411,14 @@ Sc
"}
(10,1,1) = {"
Fw
lV
Ak
Np
nQ
jT
RZ
Ef
Sc
qS
bM
YP
Nr
Pu
@@ -1560,7 +1560,7 @@ zY
zY
Sc
jT
vB
IO
jT
Sc
zY
+33 -31
View File
@@ -496,25 +496,6 @@
},
/turf/open/floor/iron/smooth_large,
/area/shuttle/abandoned/engine)
"ca" = (
/obj/structure/cable,
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high,
/obj/item/multitool{
pixel_x = 7;
pixel_y = 5
},
/obj/item/stack/cable_coil{
pixel_x = -5;
pixel_y = 6
},
/obj/effect/turf_decal/stripes/white/line{
dir = 9
},
/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron/smooth_large,
/area/shuttle/abandoned/engine)
"cg" = (
/obj/structure/sign/warning/fire,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -841,6 +822,25 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/mineral/titanium/white/airless,
/area/shuttle/abandoned/cargo)
"ed" = (
/obj/structure/cable,
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high,
/obj/item/multitool{
pixel_x = 7;
pixel_y = 5
},
/obj/item/stack/cable_coil{
pixel_x = -5;
pixel_y = 6
},
/obj/effect/turf_decal/stripes/white/line{
dir = 9
},
/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron/smooth_large,
/area/shuttle/abandoned/engine)
"ez" = (
/obj/structure/window/reinforced/survival_pod/spawner/directional/south,
/obj/effect/turf_decal/bot_red,
@@ -876,6 +876,18 @@
dir = 1
},
/area/shuttle/abandoned/crew)
"il" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
dir = 8;
x_offset = 0;
y_offset = 13
},
/obj/effect/turf_decal/stripes/white/corner{
dir = 1
},
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned/bridge)
"iz" = (
/obj/structure/chair/comfy/shuttle,
/obj/effect/turf_decal/bot_white,
@@ -1162,16 +1174,6 @@
/obj/structure/lattice,
/turf/template_noop,
/area/shuttle/abandoned/cargo)
"Ft" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
dir = 8
},
/obj/effect/turf_decal/stripes/white/corner{
dir = 1
},
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned/bridge)
"FQ" = (
/obj/item/shard/titanium,
/obj/structure/grille/broken,
@@ -1567,7 +1569,7 @@ RK
dn
yd
OL
Ft
il
dx
"}
(5,1,1) = {"
@@ -1603,7 +1605,7 @@ da
cl
Rs
ad
ca
ed
NU
bx
ad
+1 -1
View File
@@ -24,7 +24,7 @@
/datum/map_template/shuttle/whiteship/birdshot
suffix = "birdshot"
name = "NT Patrol Bee"
description = "A small patrol vessel with a central corridor connecting all rooms. Features 2 small cargo bays and a brig. Spawns with an agressive and deadly Gelatinous Cube"
description = "A small patrol vessel with a central corridor connecting all rooms. Features 2 small cargo bays and a brig. Spawns with an aggressive and deadly Gelatinous Cube"
/datum/map_template/shuttle/whiteship/kilo
suffix = "kilo"
@@ -20,7 +20,9 @@
// Traits forbided for custom docking
var/list/locked_traits = list(ZTRAIT_RESERVED, ZTRAIT_CENTCOM, ZTRAIT_AWAY)
var/view_range = 0
///x offset for where the camera eye will spawn. Starts from shuttle's docking port
var/x_offset = 0
///y offset for where the camera eye will spawn. Starts from the shuttle's docking port
var/y_offset = 0
var/list/whitelist_turfs = list(/turf/open/space, /turf/open/floor/plating, /turf/open/lava, /turf/open/openspace)
var/see_hidden = FALSE
+1
View File
@@ -379,6 +379,7 @@
"whiteship_tram",
"whiteship_personalshuttle",
"whiteship_obelisk",
"whiteship_birdshot",
)
/// Helper proc that tests to ensure all whiteship templates can spawn at their docking port, and logs their sizes