cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Various minor fixes to Emergency Shuttles (#28620)

Browse Source 
* Various minor fixes to Emergency Shuttles (#84613)

## About The Pull Request
Another another continuation of fixing issues on shuttles. This one is
mostly just fixing a few shuttles flying in the wrong direction. Next PR
should be the last one for shuttle fixes as there's only a few more
scattered around.
<details>
  <summary>Spoiler warning</summary>

- Fixed the following shuttles flying in unexpected directions:
escape_pod_large.dmm, emergency_humpback.dmm, emergency_monastery.dmm,
emergency_birdboat.dmm, emergency_birdshot.dmm
- Removed use of /turf/closed/wall/mineral/titanium/overspace on
emergency_birdshot.dmm

</details>

## Why It's Good For The Game
it's just more bug fixes for shuttles

## Changelog
🆑
fix: Fixed the following shuttles flying in unexpected directions: Pubby
escape pod, Humpback emergency shuttle, Pubby monastery shuttle,
Birdboat emergency shuttle, Birdshot emergency shuttle

/🆑

* Various minor fixes to Emergency Shuttles

---------

Co-authored-by: aaaa1023 <74441292+aaaa1023@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-07-04 22:09:40 +05:30
committed by GitHub
co-authored by aaaa1023
parent 44e3883910
commit a2e0134186
5 changed files with 390 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/shuttles/emergency_birdboat.dmm
+2 -1
View File
@@ -158,7 +158,8 @@
/obj/docking_port/mobile/emergency{
dir = 8;
name = "Birdboat emergency escape shuttle";
port_direction = 4
port_direction = 2;
preferred_direction = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
_maps/shuttles/emergency_birdshot.dmm
+101 -103
View File
@@ -9,9 +9,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape)
"ax" = (
/turf/closed/wall/mineral/titanium/overspace,
/area/shuttle/escape)
"aQ" = (
/obj/effect/decal/cleanable/insectguts,
/turf/open/floor/mineral/plastitanium/red,
@@ -88,6 +85,23 @@
},
/turf/open/floor/mineral/titanium/tiled/white,
/area/shuttle/escape)
"eY" = (
/obj/machinery/light/small/directional/south,
/obj/structure/table,
/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = -6;
pixel_y = 14
},
/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 3;
pixel_y = 2
},
/obj/item/cigarette/dromedary{
pixel_x = 8;
pixel_y = 15
},
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape)
"fd" = (
/obj/effect/decal/cleanable/plastic,
/turf/open/floor/glass/reinforced,
@@ -117,13 +131,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"gk" = (
/obj/structure/window/reinforced/survival_pod/spawner/directional/north,
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/power_store/cell,
/turf/open/floor/glass/reinforced,
/area/shuttle/escape)
"gl" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
@@ -194,31 +201,10 @@
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plating,
/area/shuttle/escape)
"iI" = (
/obj/machinery/light/small/directional/south,
/obj/structure/table,
/obj/item/reagent_containers/cup/glass/bottle/vodka{
pixel_x = -6;
pixel_y = 14
},
/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = 3;
pixel_y = 2
},
/obj/item/cigarette/dromedary{
pixel_x = 8;
pixel_y = 15
},
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape)
"iU" = (
/obj/effect/decal/cleanable/insectguts,
/turf/open/floor/mineral/titanium/tiled,
/area/shuttle/escape)
"jn" = (
/obj/structure/lattice,
/turf/template_noop,
/area/shuttle/escape)
"jt" = (
/obj/effect/decal/cleanable/glass,
/turf/open/floor/glass/reinforced,
@@ -240,16 +226,6 @@
/obj/item/trash/cheesie,
/turf/open/floor/mineral/titanium/tiled,
/area/shuttle/escape)
"ll" = (
/obj/machinery/door/airlock/titanium{
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency{
dir = 8;
name = "birdshot emergency shuttle"
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"lp" = (
/obj/machinery/door/airlock/titanium{
name = "Emergency Shuttle Airlock"
@@ -295,6 +271,10 @@
},
/turf/open/floor/glass/reinforced,
/area/shuttle/escape)
"mU" = (
/obj/structure/lattice,
/turf/template_noop,
/area/shuttle/escape)
"no" = (
/obj/item/trash/popcorn/caramel,
/turf/open/floor/mineral/titanium,
@@ -405,11 +385,6 @@
},
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape)
"qF" = (
/obj/structure/lattice,
/obj/item/stack/rods/two,
/turf/template_noop,
/area/shuttle/escape)
"ry" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
@@ -553,6 +528,17 @@
/obj/machinery/power/shuttle_engine/heater,
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"zL" = (
/obj/machinery/door/airlock/titanium{
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency{
dir = 8;
name = "birdshot emergency shuttle";
port_direction = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"zV" = (
/obj/structure/toilet{
dir = 4
@@ -560,6 +546,11 @@
/obj/item/trash/can/food/beans,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"Aw" = (
/obj/structure/lattice,
/obj/item/stack/rods/two,
/turf/template_noop,
/area/shuttle/escape)
"Ay" = (
/obj/item/shard{
pixel_y = 19
@@ -700,6 +691,13 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"HS" = (
/obj/structure/window/reinforced/survival_pod/spawner/directional/north,
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/power_store/cell,
/turf/open/floor/glass/reinforced,
/area/shuttle/escape)
"Id" = (
/obj/structure/chair{
dir = 4
@@ -1001,15 +999,15 @@ nQ
nQ
nQ
nQ
ax
LX
LX
rZ
LX
ax
LX
nQ
nQ
nQ
ax
LX
rZ
LX
LX
@@ -1018,7 +1016,7 @@ LX
LX
LX
LX
ax
LX
nQ
"}
(2,1,1) = {"
@@ -1030,12 +1028,12 @@ nQ
nQ
nQ
nQ
ax
LX
LX
LX
ON
Ko
iI
eY
LX
rZ
LX
@@ -1058,7 +1056,7 @@ nQ
nQ
nQ
nQ
ax
LX
rZ
rZ
LX
@@ -1086,7 +1084,7 @@ vk
(4,1,1) = {"
nQ
nQ
ax
LX
LX
LX
LX
@@ -1183,26 +1181,26 @@ WH
De
ye
LX
jn
mU
nQ
ax
LX
LX
LX
hF
LX
LX
ax
LX
nQ
nQ
jn
mU
Sm
hF
LX
rZ
LX
ax
LX
nQ
ax
LX
LX
nQ
nQ
@@ -1214,23 +1212,23 @@ yj
MW
rZ
rZ
jn
jn
jn
jn
mU
mU
mU
mU
IN
pl
ry
jn
jn
jn
jn
jn
mU
mU
mU
mU
mU
mp
ig
Kh
Uh
jn
mU
nQ
nQ
nQ
@@ -1248,20 +1246,20 @@ nQ
nQ
nQ
nQ
jn
mU
IN
cr
oC
jn
mU
nQ
nQ
nQ
nQ
gk
HS
ig
fd
AK
jn
mU
nQ
nQ
nQ
@@ -1276,23 +1274,23 @@ nO
MW
rZ
rZ
jn
jn
jn
jn
mU
mU
mU
mU
bx
ig
ry
jn
jn
jn
jn
jn
mU
mU
mU
mU
mU
Vo
jt
oN
IK
jn
mU
nQ
nQ
nQ
@@ -1307,27 +1305,27 @@ xg
De
eR
LX
jn
mU
nQ
ax
LX
LX
LX
hF
LX
LX
ax
LX
nQ
nQ
jn
mU
Sm
hF
LX
rZ
LX
ax
LX
nQ
bo
jn
mU
nQ
nQ
"}
@@ -1359,7 +1357,7 @@ ho
LX
LX
RW
jn
mU
nQ
"}
(13,1,1) = {"
@@ -1389,14 +1387,14 @@ Ly
Oq
tb
MC
jn
mU
LX
ST
"}
(14,1,1) = {"
nQ
nQ
ax
LX
LX
LX
LX
@@ -1422,7 +1420,7 @@ LX
VA
Em
Ay
jn
mU
"}
(15,1,1) = {"
nQ
@@ -1430,7 +1428,7 @@ nQ
nQ
nQ
nQ
ax
LX
rZ
rZ
LX
@@ -1451,7 +1449,7 @@ tu
xC
tj
Iv
jn
mU
fv
ce
"}
@@ -1464,7 +1462,7 @@ nQ
nQ
nQ
nQ
ax
LX
LX
LX
dv
@@ -1481,7 +1479,7 @@ eH
oL
ho
kH
qF
Aw
sU
LX
bo
@@ -1497,16 +1495,16 @@ nQ
nQ
nQ
nQ
ax
LX
Xy
rZ
Xy
ax
LX
nQ
nQ
nQ
ax
ll
LX
zL
LX
lp
rZ
@@ -1514,6 +1512,6 @@ LX
rZ
rZ
rZ
ax
LX
nQ
"}
_maps/shuttles/emergency_humpback.dmm
+4 -1
View File
@@ -750,7 +750,10 @@
/obj/machinery/door/airlock/grunge{
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency,
/obj/docking_port/mobile/emergency{
port_direction = 4;
preferred_direction = 2
},
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/escape)
"UR" = (
_maps/shuttles/emergency_monastery.dmm
+280 -281
View File
File diff suppressed because it is too large Load Diff
_maps/shuttles/escape_pod_large.dmm
+3 -1
View File
@@ -58,7 +58,9 @@
/obj/machinery/door/airlock/titanium{
name = "Shuttle Airlock"
},
/obj/docking_port/mobile/monastery,
/obj/docking_port/mobile/monastery{
port_direction = 2
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"W" = (