[MIRROR] Interdyne pirates fixes (No GBP) [MDB IGNORE] (#21938)

* Interdyne pirates fixes (No GBP) (#76044)

* Interdyne pirates fixes (No GBP)

---------

Co-authored-by: Hoolny <84478872+SethLafuente@users.noreply.github.com>
Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-06-20 12:24:22 +00:00
committed by GitHub
co-authored by Hoolny Jolly-66
parent 0f1920489c
commit 7ea3c5d837
2 changed files with 165 additions and 81 deletions
+60 -16
View File
@@ -45,13 +45,15 @@
"ag" = (
/obj/machinery/door/airlock/hatch{
id_tag = "piratebridgebolt";
name = "Bridge"
name = "Bridge";
req_access = null
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"ah" = (
@@ -113,7 +115,7 @@
dir = 4
},
/obj/machinery/door/window/brigdoor/right/directional/west{
req_access = list("surgery")
req_access = list("syndicate")
},
/obj/structure/bed,
/turf/open/floor/iron/dark,
@@ -198,24 +200,33 @@
/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
/obj/machinery/portable_atmospherics/canister/healium,
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/item/wrench/medical,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"aJ" = (
/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
/obj/machinery/computer/operating,
/obj/item/disk/surgery/debug,
/obj/machinery/defibrillator_mount/charging{
pixel_y = 28
},
/obj/item/disk/surgery/brainwashing{
name = "Interdyne Brainwashing Protocol Surgery Disk";
pixel_x = -8
},
/obj/item/disk/surgery/sleeper_protocol{
name = "Interdyne Sleeper Protocal Surgery Disk";
pixel_x = 1
},
/obj/item/disk/surgery/forgottenship{
name = "Interdyne Advanced Surgery Procedures Disk";
pixel_x = 9
},
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"aK" = (
/obj/machinery/door/airlock/external/glass/ruin{
cyclelinkedairlock = null;
cyclelinkeddir = 666666;
id_tag = "pirateportexternal";
req_access = list("surgery")
req_access = null
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
@@ -236,19 +247,20 @@
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"aL" = (
/obj/machinery/door/airlock/external/glass/ruin{
cyclelinkedairlock = null;
cyclelinkeddir = 666666;
id_tag = "pirateportexternal";
req_access = list("surgery")
req_access = null
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"aM" = (
@@ -315,6 +327,8 @@
/obj/machinery/suit_storage_unit/medical,
/obj/item/mod/module/defibrillator/combat,
/obj/item/mod/module/tether,
/obj/item/screwdriver/nuke,
/obj/item/mod/module/surgical_processor/preloaded,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"bl" = (
@@ -334,7 +348,9 @@
/obj/structure/table/reinforced/plastitaniumglass,
/obj/item/gun/medbeam,
/obj/item/gun/syringe/rapidsyringe,
/obj/item/pen/sleepy,
/obj/item/pen/sleepy{
name = "Interdyne Chem Pen"
},
/obj/item/defibrillator/compact/combat/loaded,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
@@ -343,6 +359,8 @@
/obj/machinery/suit_storage_unit/medical,
/obj/item/mod/module/defibrillator/combat,
/obj/item/mod/module/tether,
/obj/item/screwdriver/nuke,
/obj/item/mod/module/surgical_processor/preloaded,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"bu" = (
@@ -358,7 +376,7 @@
/obj/structure/window/reinforced/unanchored/spawner/directional/north,
/obj/structure/bed,
/obj/machinery/door/window/brigdoor/right/directional/west{
req_access = list("surgery")
req_access = list("syndicate")
},
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
@@ -428,20 +446,28 @@
/obj/machinery/suit_storage_unit/medical,
/obj/item/mod/module/defibrillator/combat,
/obj/item/mod/module/tether,
/obj/item/screwdriver/nuke,
/obj/item/mod/module/surgical_processor/preloaded,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"bX" = (
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"dV" = (
/obj/machinery/door/airlock/hatch,
/obj/machinery/door/airlock/hatch{
req_access = null
},
/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"ek" = (
/obj/machinery/door/airlock/hatch,
/obj/machinery/door/airlock/hatch{
req_access = null
},
/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"ep" = (
@@ -467,7 +493,7 @@
dir = 8
},
/obj/machinery/door/window/brigdoor/right/directional/south{
req_access = list("surgery")
req_access = list("syndicate")
},
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
@@ -493,7 +519,7 @@
dir = 1
},
/obj/machinery/door/window/brigdoor/left/directional/east{
req_access = list("surgery")
req_access = list("syndicate")
},
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
@@ -595,6 +621,9 @@
/obj/item/cautery/advanced,
/obj/item/cautery/advanced,
/obj/item/cautery/advanced,
/obj/item/surgical_drapes,
/obj/item/surgical_drapes,
/obj/item/surgical_drapes,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"wf" = (
@@ -655,9 +684,14 @@
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"yi" = (
/obj/machinery/door/airlock/hatch,
/obj/machinery/door/airlock/hatch{
id_tag = "piratebridgebolt";
name = "Bridge";
req_access = null
},
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"BT" = (
@@ -691,6 +725,7 @@
/obj/item/reagent_containers/cup/beaker/meta/salbutamol{
list_reagents = list(/datum/reagent/medicine/c2/convermol = 180)
},
/obj/item/wrench/medical,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"ED" = (
@@ -770,6 +805,15 @@
/obj/machinery/light/no_nightlight/directional/north,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"SD" = (
/obj/machinery/door/airlock/hatch{
req_access = null
},
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"Tr" = (
/obj/machinery/porta_turret/syndicate/energy/heavy{
faction = list("pirate","Syndicate");
@@ -1018,7 +1062,7 @@ aj
aJ
aS
aj
yi
SD
aj
aj
ED
+105 -65
View File
@@ -121,12 +121,6 @@
/obj/effect/mob_spawn/ghost_role/human/pirate/grey/shitter,
/turf/open/floor/plating,
/area/shuttle/pirate)
"dO" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/burnt_floor,
/obj/structure/cable,
/turf/open/floor/plating,
/area/shuttle/pirate)
"ei" = (
/obj/structure/sign/poster/random/directional/east,
/turf/open/floor/plating,
@@ -157,10 +151,6 @@
/obj/structure/closet/crate,
/turf/open/floor/plating,
/area/shuttle/pirate)
"gf" = (
/obj/structure/broken_flooring,
/turf/open/floor/plating,
/area/shuttle/pirate)
"gg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
@@ -189,11 +179,6 @@
/obj/effect/spawner/random/maintenance/five,
/turf/open/floor/iron,
/area/shuttle/pirate)
"hr" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/cup/glass/coffee,
/turf/open/floor/wood,
/area/shuttle/pirate)
"ht" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/spawner/random/maintenance/six,
@@ -232,6 +217,13 @@
/obj/item/reagent_containers/cup/glass/coffee,
/turf/open/floor/plating,
/area/shuttle/pirate)
"iM" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/burnt_floor,
/obj/structure/cable,
/obj/item/assembly/flash,
/turf/open/floor/plating,
/area/shuttle/pirate)
"je" = (
/turf/template_noop,
/area/template_noop)
@@ -264,6 +256,19 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/plating,
/area/shuttle/pirate)
"kJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/broken_floor,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/obj/effect/spawner/random/maintenance/eight,
/obj/item/knife/combat,
/turf/open/floor/iron,
/area/shuttle/pirate)
"lk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/broken_floor,
@@ -313,18 +318,6 @@
dir = 1
},
/area/shuttle/pirate)
"nI" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/broken_floor,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/obj/effect/spawner/random/maintenance/eight,
/turf/open/floor/iron,
/area/shuttle/pirate)
"nJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/structure/steam_vent,
@@ -513,6 +506,11 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/plating,
/area/shuttle/pirate)
"sL" = (
/obj/structure/broken_flooring,
/obj/item/melee/baseball_bat,
/turf/open/floor/plating,
/area/shuttle/pirate)
"sN" = (
/obj/item/flashlight,
/turf/open/floor/plating/rust,
@@ -529,10 +527,11 @@
/obj/item/clothing/head/helmet/space/eva,
/turf/open/floor/iron,
/area/shuttle/pirate)
"tk" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
"tl" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/cup/glass/coffee,
/obj/item/assembly/flash,
/turf/open/floor/wood,
/area/shuttle/pirate)
"tJ" = (
/obj/structure/reagent_dispensers/fueltank,
@@ -617,6 +616,11 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/shuttle/pirate)
"wn" = (
/obj/effect/mapping_helpers/burnt_floor,
/obj/item/melee/baton/security/cattleprod/teleprod,
/turf/open/floor/plating,
/area/shuttle/pirate)
"wE" = (
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 6
@@ -754,6 +758,14 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/closed/wall,
/area/shuttle/pirate)
"yQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
/obj/item/knife/butcher,
/turf/open/floor/iron,
/area/shuttle/pirate)
"yU" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -785,10 +797,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"zT" = (
/obj/structure/sign/poster/contraband/missing_gloves/directional/north,
/turf/open/floor/plating/rust,
/area/shuttle/pirate)
"Aa" = (
/obj/machinery/duct,
/obj/effect/spawner/random/structure/tank_holder,
@@ -813,11 +821,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"AG" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/shuttle/pirate)
"AR" = (
/obj/structure/toilet{
dir = 8
@@ -966,6 +969,11 @@
/obj/effect/spawner/random/engineering/toolbox,
/turf/open/floor/plating,
/area/shuttle/pirate)
"FD" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/shuttle_scrambler,
/turf/open/floor/plating,
/area/shuttle/pirate)
"FI" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -1000,6 +1008,12 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/shuttle/pirate)
"GG" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/item/nullrod/tribal_knife,
/turf/open/floor/iron,
/area/shuttle/pirate)
"GI" = (
/obj/machinery/light/small/directional/west,
/obj/effect/mob_spawn/ghost_role/human/pirate/grey/shitter{
@@ -1007,6 +1021,12 @@
},
/turf/open/floor/iron,
/area/shuttle/pirate)
"GK" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/item/assembly/flash,
/turf/open/floor/iron,
/area/shuttle/pirate)
"Ha" = (
/obj/effect/spawner/random/structure/crate_empty,
/turf/open/floor/iron,
@@ -1035,10 +1055,22 @@
/obj/effect/spawner/random/engineering/atmospherics_portable,
/turf/open/floor/plating,
/area/shuttle/pirate)
"II" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/burnt_floor,
/obj/structure/broken_flooring,
/obj/item/melee/baton/security/cattleprod/telecrystalprod,
/turf/open/floor/plating,
/area/shuttle/pirate)
"IY" = (
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/shuttle/pirate)
"Jd" = (
/obj/structure/sign/poster/contraband/missing_gloves/directional/north,
/obj/machinery/computer/piratepad_control,
/turf/open/floor/plating/rust,
/area/shuttle/pirate)
"Jq" = (
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating,
@@ -1100,6 +1132,11 @@
},
/turf/open/floor/iron,
/area/shuttle/pirate)
"LD" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/item/flashlight/flashdark,
/turf/open/floor/plating,
/area/shuttle/pirate)
"LE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/item/reagent_containers/cup/glass/coffee,
@@ -1121,6 +1158,12 @@
},
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"MS" = (
/obj/effect/spawner/random/trash/mess,
/obj/item/stack/sheet/mineral/plasma/thirty,
/obj/item/knife/butcher,
/turf/open/floor/plating,
/area/shuttle/pirate)
"Nm" = (
/obj/effect/spawner/random/structure/closet_maintenance,
/obj/item/storage/box/lights/mixed,
@@ -1187,12 +1230,6 @@
},
/turf/open/floor/plating,
/area/shuttle/pirate)
"Pj" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/burnt_floor,
/obj/structure/broken_flooring,
/turf/open/floor/plating,
/area/shuttle/pirate)
"Pn" = (
/turf/closed/wall,
/area/template_noop)
@@ -1279,10 +1316,9 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/shuttle/pirate)
"SA" = (
/obj/effect/spawner/random/trash/mess,
/obj/item/stack/sheet/mineral/plasma/thirty,
/turf/open/floor/plating,
"Sy" = (
/obj/machinery/loot_locator,
/turf/open/floor/plating/rust,
/area/shuttle/pirate)
"Ti" = (
/obj/effect/mapping_helpers/burnt_floor,
@@ -1325,6 +1361,10 @@
"Uv" = (
/turf/open/floor/plating/rust,
/area/shuttle/pirate)
"UG" = (
/obj/machinery/piratepad,
/turf/open/floor/plating/rust,
/area/shuttle/pirate)
"UJ" = (
/obj/machinery/power/shuttle_engine/propulsion{
dir = 8
@@ -1584,7 +1624,7 @@ Pg
uY
Wc
Wy
gf
sL
Yj
Ox
Qm
@@ -1604,7 +1644,7 @@ Su
iL
Yj
cH
tk
GK
OG
hk
PM
@@ -1612,7 +1652,7 @@ Sh
BL
Yj
NI
SA
MS
zB
"}
(9,1,1) = {"
@@ -1626,7 +1666,7 @@ Ch
oy
QO
gg
AG
GG
aA
IY
Kq
@@ -1685,7 +1725,7 @@ yN
yU
bB
Sh
hr
tl
Tq
ro
zB
@@ -1696,7 +1736,7 @@ HD
XX
vJ
ZU
RU
wn
Nm
Vw
vz
@@ -1719,7 +1759,7 @@ QO
Ac
Wc
Mo
fj
LD
bp
vI
Sh
@@ -1770,7 +1810,7 @@ zB
(17,1,1) = {"
pk
pk
QO
yQ
NI
Ws
Vd
@@ -1796,7 +1836,7 @@ EC
Ts
VT
lB
Pj
II
zB
Sh
Bh
@@ -1808,7 +1848,7 @@ Pn
(19,1,1) = {"
je
zB
NI
FD
AZ
RU
ox
@@ -1817,7 +1857,7 @@ CY
fj
DG
ZU
nI
kJ
Sh
Gb
xm
@@ -1832,7 +1872,7 @@ NI
yU
FI
bv
dO
iM
cJ
tU
ZU
@@ -1886,8 +1926,8 @@ je
je
je
pk
zT
Uv
Jd
UG
pw
yI
ti
@@ -1910,7 +1950,7 @@ JI
Uv
sN
Am
Uv
Sy
pk
pk
ZU