mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
[MIRROR] Makes it so cargo security doesnt get stuck in mining station. (#27691)
* Makes it so cargo security doesnt get stuck in mining station. (#83209) By default, cargo security officers have "Mining" access (e.g. the mining dock) but not mining station access. This combined with the fact the mining station dock on lavaland are emergency access going in, but mining station access going out, can easily end up with a cargo security officer getting stuck down there. Why its good for the game: Being stuck in lavaland due to access jank is not fun. ## Changelog 🆑 Webcomicartist fix: The lavaland mining shuttle doors no longer trap cargo security on lavaland due to access weirdness. /🆑 * Makes it so cargo security doesnt get stuck in mining station. --------- Co-authored-by: KingkumaArt <69398298+KingkumaArt@users.noreply.github.com>
This commit is contained in:
SkyratBot
+114
-113
@@ -586,13 +586,6 @@
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/eva)
|
||||
"dO" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
name = "Mining Station Maintenance"
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/service)
|
||||
"dP" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
@@ -646,17 +639,6 @@
|
||||
},
|
||||
/turf/open/misc/asteroid/basalt/lava_land_surface,
|
||||
/area/lavaland/surface/outdoors)
|
||||
"ew" = (
|
||||
/obj/machinery/door/airlock/external{
|
||||
name = "Mining External Airlock"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
|
||||
cycle_id = "lavaland_services_north"
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/service)
|
||||
"ez" = (
|
||||
/obj/structure/chair/comfy/teal{
|
||||
dir = 4
|
||||
@@ -1028,16 +1010,6 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/iron/smooth,
|
||||
/area/mine/laborcamp/quarters)
|
||||
"gw" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
name = "Mining Station Maintenance"
|
||||
},
|
||||
/obj/structure/cable,
|
||||
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/service/comms)
|
||||
"gx" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
@@ -2050,17 +2022,6 @@
|
||||
/obj/effect/turf_decal/tile/red/fourcorners,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/mine/laborcamp/security)
|
||||
"lM" = (
|
||||
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/unres,
|
||||
/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station,
|
||||
/obj/machinery/door/airlock/external/glass{
|
||||
name = "Mining Shuttle Airlock"
|
||||
},
|
||||
/turf/open/floor/iron/dark/textured_large,
|
||||
/area/mine/production)
|
||||
"lN" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
name = "Mining Station Maintenance"
|
||||
@@ -2858,6 +2819,12 @@
|
||||
/obj/effect/spawner/random/trash/mess,
|
||||
/turf/open/floor/iron/white,
|
||||
/area/mine/laborcamp/production)
|
||||
"ps" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/power/smes/super/full,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/service)
|
||||
"pu" = (
|
||||
/obj/item/chair/stool{
|
||||
pixel_x = -2;
|
||||
@@ -3167,6 +3134,17 @@
|
||||
},
|
||||
/turf/open/floor/iron/smooth,
|
||||
/area/mine/laborcamp)
|
||||
"rr" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/door/airlock/external{
|
||||
name = "Mining External Airlock"
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
|
||||
cycle_id = "lavaland_services_north"
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/service)
|
||||
"rv" = (
|
||||
/obj/effect/turf_decal/trimline/brown/filled/line,
|
||||
/turf/open/floor/iron/dark/smooth_edge{
|
||||
@@ -3434,6 +3412,15 @@
|
||||
dir = 4
|
||||
},
|
||||
/area/mine/cafeteria)
|
||||
"tg" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
name = "Mining Station Maintenance"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/service)
|
||||
"ti" = (
|
||||
/obj/structure/table,
|
||||
/obj/effect/turf_decal/trimline/blue/filled/line{
|
||||
@@ -3448,14 +3435,6 @@
|
||||
},
|
||||
/turf/open/misc/asteroid/basalt/lava_land_surface,
|
||||
/area/lavaland/surface/outdoors)
|
||||
"tk" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
name = "Mining Station Maintenance"
|
||||
},
|
||||
/obj/structure/cable,
|
||||
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/service)
|
||||
"tr" = (
|
||||
/obj/structure/closet/secure_closet/brig,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
@@ -3555,15 +3534,6 @@
|
||||
dir = 8
|
||||
},
|
||||
/area/mine/laborcamp)
|
||||
"uc" = (
|
||||
/obj/structure/lattice/catwalk/mining,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/item/toy/plush/shark{
|
||||
desc = "A plushie depicting a somewhat cartoonish shark. The tag calls it a 'hákarl', noting that it was made by an obscure furniture manufacturer in old Scandinavia. This one seems to have some cable wiring sticking out of its mouth."
|
||||
},
|
||||
/turf/open/lava/smooth/lava_land_surface,
|
||||
/area/lavaland/surface/outdoors)
|
||||
"ui" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
@@ -3696,6 +3666,14 @@
|
||||
/obj/effect/turf_decal/trimline/blue/filled/line,
|
||||
/turf/open/floor/iron/white/smooth_corner,
|
||||
/area/mine/medical)
|
||||
"vc" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
name = "Mining Station Maintenance"
|
||||
},
|
||||
/obj/structure/cable,
|
||||
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/service)
|
||||
"vd" = (
|
||||
/obj/structure/railing/corner{
|
||||
dir = 1
|
||||
@@ -4099,11 +4077,6 @@
|
||||
"xB" = (
|
||||
/turf/closed/wall,
|
||||
/area/mine/maintenance/public/north)
|
||||
"xC" = (
|
||||
/obj/machinery/power/smes/super/full,
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/labor)
|
||||
"xD" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/mine/maintenance/service/comms)
|
||||
@@ -4130,6 +4103,16 @@
|
||||
/obj/effect/turf_decal/sand/plating/volcanic,
|
||||
/turf/open/floor/plating/lavaland_atmos,
|
||||
/area/mine/maintenance/service/disposals)
|
||||
"xI" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
name = "Mining Station Maintenance"
|
||||
},
|
||||
/obj/structure/cable,
|
||||
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/service/comms)
|
||||
"xJ" = (
|
||||
/obj/machinery/vending/coffee,
|
||||
/obj/effect/turf_decal/tile/blue/fourcorners,
|
||||
@@ -4451,6 +4434,18 @@
|
||||
/obj/effect/turf_decal/tile/blue/fourcorners,
|
||||
/turf/open/floor/iron,
|
||||
/area/mine/cafeteria)
|
||||
"zI" = (
|
||||
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/unres,
|
||||
/obj/machinery/door/airlock/external/glass{
|
||||
name = "Mining Shuttle Airlock"
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
|
||||
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
|
||||
/turf/open/floor/iron/dark/textured_large,
|
||||
/area/mine/production)
|
||||
"zJ" = (
|
||||
/obj/machinery/mineral/processing_unit_console,
|
||||
/turf/closed/wall,
|
||||
@@ -4583,6 +4578,21 @@
|
||||
"AJ" = (
|
||||
/turf/closed/wall,
|
||||
/area/mine/maintenance/service/disposals)
|
||||
"AK" = (
|
||||
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
|
||||
/obj/effect/mapping_helpers/airlock/unres,
|
||||
/obj/effect/turf_decal/trimline/brown/filled/line{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/trimline/brown/filled/mid_joiner{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/airlock/external/glass{
|
||||
name = "Mining Shuttle Airlock"
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
|
||||
/turf/open/floor/iron/dark/textured_large,
|
||||
/area/mine/production)
|
||||
"AL" = (
|
||||
/obj/structure/chair/comfy/brown,
|
||||
/obj/machinery/camera/autoname/directional/north{
|
||||
@@ -4982,6 +4992,11 @@
|
||||
/obj/effect/turf_decal/sand/plating/volcanic,
|
||||
/turf/open/floor/plating/lavaland_atmos,
|
||||
/area/lavaland/surface/outdoors)
|
||||
"Ee" = (
|
||||
/obj/machinery/power/smes/super/full,
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/labor)
|
||||
"Eg" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
@@ -6317,12 +6332,6 @@
|
||||
dir = 8
|
||||
},
|
||||
/area/mine/lounge)
|
||||
"Mj" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/power/smes/super/full,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/service)
|
||||
"Mr" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/plating,
|
||||
@@ -7143,6 +7152,17 @@
|
||||
/obj/structure/closet/toolcloset,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/service)
|
||||
"Rx" = (
|
||||
/obj/machinery/door/airlock/external{
|
||||
name = "Mining External Airlock"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
|
||||
cycle_id = "lavaland_services_north"
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/service)
|
||||
"RB" = (
|
||||
/obj/structure/railing/corner{
|
||||
dir = 1
|
||||
@@ -7190,21 +7210,6 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/iron/smooth,
|
||||
/area/mine/laborcamp/quarters)
|
||||
"RW" = (
|
||||
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
|
||||
/obj/effect/mapping_helpers/airlock/unres,
|
||||
/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station,
|
||||
/obj/effect/turf_decal/trimline/brown/filled/line{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/trimline/brown/filled/mid_joiner{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/airlock/external/glass{
|
||||
name = "Mining Shuttle Airlock"
|
||||
},
|
||||
/turf/open/floor/iron/dark/textured_large,
|
||||
/area/mine/production)
|
||||
"RY" = (
|
||||
/obj/effect/spawner/structure/window,
|
||||
/turf/open/floor/plating,
|
||||
@@ -7494,6 +7499,13 @@
|
||||
},
|
||||
/turf/open/floor/iron/dark/smooth_edge,
|
||||
/area/mine/laborcamp/security)
|
||||
"TV" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
name = "Mining Station Maintenance"
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/service)
|
||||
"TW" = (
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
name = "Mining Station Storage"
|
||||
@@ -7610,17 +7622,6 @@
|
||||
},
|
||||
/turf/open/floor/iron/freezer,
|
||||
/area/mine/living_quarters)
|
||||
"UF" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/door/airlock/external{
|
||||
name = "Mining External Airlock"
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
|
||||
cycle_id = "lavaland_services_north"
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/service)
|
||||
"UK" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/turf_decal/siding/wideplating_new{
|
||||
@@ -8005,6 +8006,15 @@
|
||||
/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/storage)
|
||||
"Xb" = (
|
||||
/obj/structure/lattice/catwalk/mining,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/item/toy/plush/shark{
|
||||
desc = "A plushie depicting a somewhat cartoonish shark. The tag calls it a 'hákarl', noting that it was made by an obscure furniture manufacturer in old Scandinavia. This one seems to have some cable wiring sticking out of its mouth."
|
||||
},
|
||||
/turf/open/lava/smooth/lava_land_surface,
|
||||
/area/lavaland/surface/outdoors)
|
||||
"Xd" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
|
||||
dir = 1
|
||||
@@ -8314,15 +8324,6 @@
|
||||
dir = 1
|
||||
},
|
||||
/area/mine/laborcamp/quarters)
|
||||
"Yy" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
name = "Mining Station Maintenance"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
|
||||
/turf/open/floor/plating,
|
||||
/area/mine/maintenance/service)
|
||||
"YF" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
@@ -28269,7 +28270,7 @@ Zt
|
||||
Zt
|
||||
Zt
|
||||
Zt
|
||||
xC
|
||||
Ee
|
||||
ve
|
||||
RD
|
||||
RD
|
||||
@@ -29810,7 +29811,7 @@ Xw
|
||||
aj
|
||||
aj
|
||||
aj
|
||||
uc
|
||||
Xb
|
||||
aj
|
||||
aj
|
||||
aj
|
||||
@@ -38006,7 +38007,7 @@ ni
|
||||
rZ
|
||||
ni
|
||||
ON
|
||||
dO
|
||||
TV
|
||||
xD
|
||||
xD
|
||||
xD
|
||||
@@ -38516,12 +38517,12 @@ Ue
|
||||
AA
|
||||
gB
|
||||
ON
|
||||
Mj
|
||||
ps
|
||||
gq
|
||||
ER
|
||||
tk
|
||||
vc
|
||||
YR
|
||||
gw
|
||||
xI
|
||||
DF
|
||||
Kn
|
||||
xD
|
||||
@@ -39029,7 +39030,7 @@ pU
|
||||
Dx
|
||||
cm
|
||||
FL
|
||||
ew
|
||||
Rx
|
||||
Ao
|
||||
Ao
|
||||
aW
|
||||
@@ -39286,7 +39287,7 @@ pU
|
||||
aD
|
||||
cV
|
||||
fi
|
||||
UF
|
||||
rr
|
||||
Jh
|
||||
cr
|
||||
JS
|
||||
@@ -39545,7 +39546,7 @@ ON
|
||||
ON
|
||||
ON
|
||||
ON
|
||||
Yy
|
||||
tg
|
||||
ON
|
||||
ON
|
||||
ON
|
||||
@@ -47022,11 +47023,11 @@ GL
|
||||
Jl
|
||||
rv
|
||||
TJ
|
||||
RW
|
||||
AK
|
||||
cc
|
||||
XM
|
||||
CM
|
||||
lM
|
||||
zI
|
||||
Ec
|
||||
BP
|
||||
BP
|
||||
|
||||
Reference in New Issue
Block a user