Merge branch 'master' into upstream-merge-38649

This commit is contained in:
deathride58
2018-07-06 01:34:12 -04:00
committed by GitHub
837 changed files with 15447 additions and 7458 deletions
+29
View File
@@ -0,0 +1,29 @@
.dockerignore
.editorconfig
.travis.yml
GPLv3.txt
LICENSE
README.md
TGS3.json
.github
.gitignore
.gitattributes
.git/hooks
.git/info
.git/modules
.git/objects
.git/refs
.vs*
tools
cfg
data
SQL
tgui/node_modules
tgstation.dmb
tgstation.int
tgstation.rsc
tgstation.lk
tgstation.dyn.rsc
libmariadb.dll
rust_g.dll
Dockerfile
+38
View File
@@ -0,0 +1,38 @@
FROM i386/ubuntu:xenial as build
WORKDIR /rust_g
RUN apt-get update && apt-get install -y --no-install-recommends \
git \
libssl-dev \
ca-certificates \
rustc \
cargo \
pkg-config \
&& git init \
&& git remote add origin https://github.com/tgstation/rust-g
#TODO: find a way to read these from .travis.yml or a common source eventually
ENV RUST_G_VERSION=0.3.0
RUN git fetch --depth 1 origin $RUST_G_VERSION \
&& git checkout FETCH_HEAD \
&& cargo build --release
FROM tgstation/byond:512.1427
EXPOSE 1337
WORKDIR /tgstation
COPY . .
RUN mkdir data && mkdir -p /root/.byond/bin
VOLUME [ "/tgstation/config", "/tgstation/data" ]
RUN DreamMaker -max_errors 0 tgstation.dme
COPY --from=build /rust_g/target/release/librust_g.so /root/.byond/bin/rust_g
ENTRYPOINT [ "DreamDaemon", "tgstation.dmb", "-port", "1337", "-trusted", "-close", "-verbose" ]
@@ -1102,7 +1102,7 @@
},
/obj/structure/table/wood,
/obj/item/twohanded/spear,
/obj/item/clothing/head/helmet/roman/legionaire,
/obj/item/clothing/head/helmet/roman/legionnaire,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"cO" = (
@@ -21,11 +21,17 @@
/turf/open/floor/plasteel/freezer,
/area/ruin/powered/seedvault)
"f" = (
/obj/machinery/plantgenes/seedvault,
/obj/machinery/plantgenes/seedvault{
pixel_y = 6
},
/obj/structure/table/wood,
/turf/open/floor/plasteel/freezer,
/area/ruin/powered/seedvault)
"g" = (
/obj/structure/table/wood,
/obj/machinery/smartfridge/disks{
pixel_y = 2
},
/turf/open/floor/plasteel/freezer,
/area/ruin/powered/seedvault)
"h" = (
@@ -294,7 +294,7 @@
/area/ruin/space/has_grav/abandonedzoo)
"aP" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/glass/bottle/liver_enhance_virion,
/obj/item/reagent_containers/glass/bottle/random_virus,
/obj/item/reagent_containers/dropper,
/turf/open/floor/plasteel{
icon_state = "dark"
+2 -7
View File
@@ -167,7 +167,6 @@
/area/tcommsat/chamber)
"aG" = (
/obj/structure/grille/broken,
/obj/item/clothing/gloves/combat,
/turf/open/floor/plasteel/airless,
/area/tcommsat/chamber)
"aH" = (
@@ -625,7 +624,7 @@
/turf/open/floor/plating,
/area/tcommsat/chamber)
"cd" = (
/obj/item/storage/belt/utility/full/engi,
/obj/item/storage/toolbox/syndicate,
/turf/open/floor/plasteel/airless,
/area/tcommsat/chamber)
"ce" = (
@@ -906,10 +905,6 @@
/obj/machinery/teleport/hub,
/turf/open/floor/plating,
/area/tcommsat/chamber)
"SH" = (
/obj/item/dildo/random,
/turf/open/floor/plating/airless,
/area/tcommsat/chamber)
(1,1,1) = {"
aa
@@ -2707,7 +2702,7 @@ ac
bw
bw
bw
SH
ac
ca
cf
bw
+4 -22
View File
@@ -4355,24 +4355,6 @@
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/hotel/power)
"Dv" = (
/obj/item/vending_refill/kink,
/obj/item/vending_refill/kink,
/obj/item/vending_refill/kink,
/obj/item/vending_refill/kink,
/obj/item/vending_refill/kink,
/obj/item/vending_refill/kink,
/obj/structure/closet,
/turf/open/floor/plasteel/neutral,
/area/ruin/space/has_grav/hotel/custodial)
"Fy" = (
/obj/machinery/vending/kink,
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/hotel/workroom)
"MK" = (
/obj/effect/spawner/lootdrop/keg,
/turf/open/floor/plating,
/area/ruin/space/has_grav/hotel)
(1,1,1) = {"
aa
@@ -5383,7 +5365,7 @@ ee
dH
cZ
eJ
MK
aw
fi
fQ
fQ
@@ -6111,7 +6093,7 @@ kC
kn
lg
jG
Dv
ml
mp
mw
mJ
@@ -7270,7 +7252,7 @@ di
di
ea
ep
Fy
dV
di
eT
fp
@@ -7550,7 +7532,7 @@ di
di
di
dV
Fy
dV
di
eW
ft
@@ -273,6 +273,11 @@
/obj/machinery/light,
/turf/open/floor/plasteel/vault/side,
/area/ruin/space/has_grav/turretedoutpost)
"aZ" = (
/obj/structure/rack,
/obj/item/clothing/head/helmet/riot,
/turf/open/floor/plasteel/vault/side,
/area/ruin/space/has_grav/turretedoutpost)
"ba" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/breadslice/meat,
@@ -281,13 +286,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/turretedoutpost)
"Kw" = (
/obj/structure/rack,
/obj/item/multitool/ai_detect,
/turf/open/floor/plasteel/vault/side{
dir = 8
},
/area/ruin/space/has_grav/turretedoutpost)
"Nu" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -295,10 +293,6 @@
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/turretedoutpost)
"YF" = (
/obj/effect/spawner/lootdrop/keg,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/turretedoutpost)
(1,1,1) = {"
aa
@@ -390,7 +384,7 @@ al
ad
ad
ay
Kw
aF
aL
aF
ad
@@ -473,7 +467,7 @@ az
az
az
az
aW
aZ
ad
al
ab
@@ -688,7 +682,7 @@ ad
aj
ak
ad
YF
al
ad
aK
aP
+134 -238
View File
@@ -2853,7 +2853,6 @@
/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"hk" = (
/turf/open/floor/plating/asteroid/snow/ice,
/obj/effect/turf_decal/stripes/corner,
/obj/machinery/conveyor_switch/oneway{
id = "snowdin_belt_mine";
@@ -2893,7 +2892,6 @@
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/gateway)
"ho" = (
/turf/open/floor/plating/asteroid/snow/ice,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/loading_area,
/turf/open/floor/plating/snowed/cavern,
@@ -3854,13 +3852,6 @@
/obj/effect/landmark/vr_spawn/snowdin,
/turf/open/floor/plasteel/floorgrime,
/area/awaymission/snowdin/post/garage)
"jv" = (
/turf/open/floor/plating/asteroid/snow/ice,
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
"jw" = (
/obj/structure/table,
/obj/item/paper/pamphlet/gateway,
@@ -3940,13 +3931,6 @@
},
/turf/open/floor/plating/snowed/smoothed,
/area/awaymission/snowdin/outside)
"jE" = (
/turf/open/floor/plating/asteroid/snow/ice,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
"jF" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
@@ -4377,7 +4361,6 @@
},
/area/awaymission/snowdin/post)
"kK" = (
/turf/open/floor/plating/asteroid/snow/ice,
/obj/machinery/conveyor{
dir = 2;
id = "snowdin_belt_mine"
@@ -9211,23 +9194,10 @@
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/cave)
"xl" = (
/obj/effect/baseturf_helper/asteroid/snow,
/turf/closed/wall/ice,
/area/shuttle/snowdin/elevator1)
"xm" = (
/obj/structure/window/reinforced/fulltile/ice,
/obj/structure/grille,
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator1)
"xn" = (
/obj/machinery/door/airlock/public/glass{
name = "Elevator Access"
/turf/open/floor/plasteel/elevatorshaft{
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator1)
"xo" = (
/turf/closed/wall/ice,
/area/shuttle/snowdin/elevator1)
/area/awaymission/snowdin/cave)
"xp" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
@@ -9278,18 +9248,6 @@
},
/turf/open/floor/engine/cult,
/area/awaymission/snowdin/post/mining_dock)
"xv" = (
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator1)
"xw" = (
/obj/machinery/computer/shuttle/snowdin/mining{
dir = 2;
name = "Excavation Elevator Console";
possible_destinations = "snowdin_excavation_top;snowdin_excavation_down";
shuttleId = "snowdin_excavation"
},
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator1)
"xx" = (
/obj/effect/spawner/lootdrop/crate_spawner,
/turf/open/floor/plasteel/neutral,
@@ -9378,26 +9336,20 @@
},
/area/awaymission/snowdin/post/mining_dock)
"xK" = (
/obj/machinery/door/airlock/public/glass{
name = "Elevator Access"
},
/obj/docking_port/mobile/elevator{
dir = 4;
height = 6;
id = "snowdin_excavation";
name = "excavation elevator";
width = 6
},
/obj/docking_port/stationary{
area_type = /area/awaymission/snowdin/cave;
dir = 4;
dwidth = 3;
height = 6;
id = "snowdin_excavation_top";
name = "snowdin excavation top";
roundstart_template = /datum/map_template/shuttle/snowdin/excavation;
width = 6
},
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator1)
/turf/open/floor/plasteel/elevatorshaft{
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/awaymission/snowdin/cave)
"xL" = (
/obj/machinery/atmospherics/pipe/manifold/orange/visible{
dir = 8
@@ -9424,6 +9376,7 @@
/area/awaymission/snowdin/post/mining_dock)
"xP" = (
/obj/docking_port/stationary{
area_type = /area/awaymission/snowdin/post/mining_dock;
dir = 4;
dwidth = 3;
height = 6;
@@ -9431,7 +9384,7 @@
name = "snowdin excavation down";
width = 6
},
/turf/open/floor/plating,
/turf/open/floor/plasteel/elevatorshaft,
/area/awaymission/snowdin/post/mining_dock)
"xQ" = (
/obj/effect/turf_decal/stripes/line{
@@ -9861,20 +9814,6 @@
},
/turf/open/floor/engine/vacuum,
/area/awaymission/snowdin/cave)
"zb" = (
/obj/structure/window/reinforced/fulltile/ice,
/obj/structure/grille,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
dir = 4;
frequency = 1442;
id_tag = "snowdin_toxins_mine_1";
name = "toxin out"
},
/turf/open/floor/plating,
/area/awaymission/snowdin/cave)
"zc" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 8
@@ -13339,9 +13278,6 @@
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"Jl" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/mining/glass{
name = "Mining Dock";
req_access_txt = "48"
@@ -13384,9 +13320,6 @@
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
"Jr" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/mining/glass{
name = "Mining Dock";
req_access_txt = "48"
@@ -13546,20 +13479,6 @@
dir = 4
},
/area/awaymission/snowdin/post/mining_main)
"JR" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator2)
"JS" = (
/obj/machinery/door/airlock/public/glass{
name = "Elevator Access"
},
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator2)
"JT" = (
/turf/closed/wall,
/area/shuttle/snowdin/elevator2)
"JU" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -13622,19 +13541,6 @@
dir = 8
},
/area/awaymission/snowdin/post/mining_main)
"Kd" = (
/obj/machinery/computer/shuttle/snowdin/mining,
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator2)
"Ke" = (
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator2)
"Kf" = (
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator2)
"Kg" = (
/obj/structure/ore_box,
/obj/effect/turf_decal/bot,
@@ -13696,27 +13602,18 @@
},
/area/awaymission/snowdin/post/mining_main)
"Kn" = (
/obj/machinery/door/airlock/public/glass{
name = "Elevator Access"
},
/obj/docking_port/mobile/elevator{
dir = 4;
dwidth = 2;
height = 5;
id = "snowdin_mining";
name = "mining elevator";
width = 5
},
/obj/docking_port/stationary{
area_type = /area/awaymission/snowdin/post/mining_main;
dir = 4;
dwidth = 2;
height = 5;
id = "snowdin_mining_top";
name = "snowdin mining top";
roundstart_template = /datum/map_template/shuttle/snowdin/mining;
width = 5
},
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator2)
/turf/open/floor/plasteel/elevatorshaft,
/area/awaymission/snowdin/post/mining_main)
"Ko" = (
/obj/machinery/light{
dir = 4
@@ -13766,7 +13663,7 @@
name = "snowdin mining bottom";
width = 5
},
/turf/open/floor/plating,
/turf/open/floor/plasteel/elevatorshaft,
/area/awaymission/snowdin/post/mining_dock)
"Ku" = (
/obj/machinery/light{
@@ -13835,10 +13732,6 @@
},
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/mining_main)
"KC" = (
/obj/machinery/light/small,
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator2)
"KD" = (
/obj/structure/ore_box,
/obj/effect/turf_decal/bot,
@@ -13912,8 +13805,8 @@
},
/area/awaymission/snowdin/post/mining_main)
"KP" = (
/turf/closed/wall/rust,
/area/shuttle/snowdin/elevator2)
/turf/open/floor/plasteel/elevatorshaft,
/area/awaymission/snowdin/post/mining_main)
"KQ" = (
/obj/machinery/computer/shuttle/snowdin/mining{
dir = 8
@@ -14014,6 +13907,9 @@
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"ND" = (
/turf/open/floor/plasteel/elevatorshaft,
/area/awaymission/snowdin/post/mining_dock)
"OF" = (
/obj/machinery/door/airlock/external{
name = "Ready Room";
@@ -28100,7 +27996,7 @@ wS
wS
ai
yf
zb
yt
ai
wS
wS
@@ -28184,10 +28080,10 @@ IY
Go
Jx
KP
JR
KP
Kn
JR
JT
KP
KP
KT
Go
ac
@@ -28339,7 +28235,7 @@ ii
yb
an
yf
zb
yt
yf
ai
ai
@@ -28440,11 +28336,11 @@ Gq
Gq
Go
Jx
JR
Kd
Ke
KC
JR
KP
KP
KP
KP
KP
KT
GP
ac
@@ -28697,11 +28593,11 @@ Iy
Iy
Go
Jy
JS
Ke
Ke
Ke
JS
KP
KP
KP
KP
KP
KU
GP
ac
@@ -28954,11 +28850,11 @@ GP
GP
GP
Jx
JR
Kf
Ke
Ke
JR
KP
KP
KP
KP
KP
KT
GP
ac
@@ -29211,10 +29107,10 @@ ae
ae
Go
Jx
JT
JR
JS
JR
KP
KP
KP
KP
KP
KT
GP
@@ -30131,11 +30027,11 @@ ae
aj
xa
xl
xm
xn
xl
xl
xK
xm
xo
xl
xl
an
ii
ii
@@ -30387,12 +30283,12 @@ ae
ae
aj
xa
xm
xv
xv
xv
xv
xm
xl
xl
xl
xl
xl
xl
yp
ii
wS
@@ -30644,12 +30540,12 @@ ae
wQ
ai
xb
xn
xv
xv
xv
xv
xn
xl
xl
xl
xl
xl
xl
yq
ii
wS
@@ -30901,12 +30797,12 @@ ae
wQ
ai
xb
xn
xv
xv
xv
xv
xn
xl
xl
xl
xl
xl
xl
yq
an
ii
@@ -31158,12 +31054,12 @@ ae
wQ
wS
xa
xm
xw
xv
xv
xv
xm
xl
xl
xl
xl
xl
xl
yr
an
ii
@@ -31415,12 +31311,12 @@ ae
wQ
wS
xa
xo
xm
xn
xn
xm
xo
xl
xl
xl
xl
xl
xl
yp
an
an
@@ -62364,11 +62260,11 @@ IO
wL
wE
JH
wL
wL
ND
ND
Kt
wL
wL
ND
ND
KX
wE
bh
@@ -62621,11 +62517,11 @@ IQ
wL
wE
JH
wL
wL
wL
wL
wL
ND
ND
ND
ND
ND
KX
wE
bh
@@ -62878,11 +62774,11 @@ wL
wL
wE
JI
wL
wL
wL
wL
wL
ND
ND
ND
ND
ND
KY
wE
bh
@@ -63135,11 +63031,11 @@ wL
wL
wE
JH
wL
wL
wL
wL
wL
ND
ND
ND
ND
ND
KX
wE
bh
@@ -63392,11 +63288,11 @@ wL
wL
wD
JH
wL
wL
wL
wL
wL
ND
ND
ND
ND
ND
KX
wD
bh
@@ -64151,7 +64047,7 @@ oZ
oZ
oZ
hk
jE
sl
Gk
GN
Hj
@@ -64664,7 +64560,7 @@ oZ
oZ
oZ
oZ
jv
By
xW
xW
xW
@@ -65339,12 +65235,12 @@ eJ
wE
wV
xg
wL
wL
wL
ND
ND
ND
xP
wL
wL
ND
ND
yz
yR
wD
@@ -65596,12 +65492,12 @@ eJ
wD
wW
xg
wL
wL
wL
wL
wL
wL
ND
ND
ND
ND
ND
ND
yA
wM
zm
@@ -65853,12 +65749,12 @@ wD
wP
wX
xg
wL
wL
wL
wL
wL
wL
ND
ND
ND
ND
ND
ND
yB
xy
zn
@@ -66111,11 +66007,11 @@ wP
wW
xh
wW
wL
wL
wL
wL
wL
ND
ND
ND
ND
ND
yB
xy
zn
@@ -66369,10 +66265,10 @@ wW
xh
wW
wW
wW
wL
wL
wL
ND
ND
ND
ND
yC
yS
zm
@@ -66627,9 +66523,9 @@ xi
wW
wW
wW
wL
wL
wL
ND
ND
ND
yD
yT
wE
+1 -1
View File
@@ -1640,7 +1640,7 @@
pixel_y = 32
},
/obj/item/paper/fluff/awaymissions/caves/shipment_notice,
/obj/item/paper/fluff/awaymissions/caves/saftey_notice,
/obj/item/paper/fluff/awaymissions/caves/safety_notice,
/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"fb" = (
+149 -240
View File
@@ -9263,23 +9263,10 @@
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/cave)
"xl" = (
/obj/effect/baseturf_helper/asteroid/snow,
/turf/closed/wall/ice,
/area/shuttle/snowdin/elevator1)
"xm" = (
/obj/structure/window/reinforced/fulltile/ice,
/obj/structure/grille,
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator1)
"xn" = (
/obj/machinery/door/airlock/public/glass{
name = "Elevator Access"
/turf/open/floor/plasteel/elevatorshaft{
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator1)
"xo" = (
/turf/closed/wall/ice,
/area/shuttle/snowdin/elevator1)
/area/awaymission/snowdin/cave)
"xp" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
@@ -9330,18 +9317,6 @@
},
/turf/open/floor/engine/cult,
/area/awaymission/snowdin/post/mining_dock)
"xv" = (
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator1)
"xw" = (
/obj/machinery/computer/shuttle/snowdin/mining{
dir = 2;
name = "Excavation Elevator Console";
possible_destinations = "snowdin_excavation_top;snowdin_excavation_down";
shuttleId = "snowdin_excavation"
},
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator1)
"xx" = (
/obj/effect/spawner/lootdrop/crate_spawner,
/turf/open/floor/plasteel/neutral,
@@ -9430,26 +9405,20 @@
},
/area/awaymission/snowdin/post/mining_dock)
"xK" = (
/obj/machinery/door/airlock/public/glass{
name = "Elevator Access"
},
/obj/docking_port/mobile/elevator{
dir = 4;
height = 6;
id = "snowdin_excavation";
name = "excavation elevator";
width = 6
},
/obj/docking_port/stationary{
area_type = /area/awaymission/snowdin/cave;
dir = 4;
dwidth = 3;
height = 6;
id = "snowdin_excavation_top";
name = "snowdin excavation top";
roundstart_template = /datum/map_template/shuttle/snowdin/excavation;
width = 6
},
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator1)
/turf/open/floor/plasteel/elevatorshaft{
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/awaymission/snowdin/cave)
"xL" = (
/obj/machinery/atmospherics/pipe/manifold/orange/visible{
dir = 8
@@ -9476,6 +9445,7 @@
/area/awaymission/snowdin/post/mining_dock)
"xP" = (
/obj/docking_port/stationary{
area_type = /area/awaymission/snowdin/post/mining_dock;
dir = 4;
dwidth = 3;
height = 6;
@@ -9483,7 +9453,7 @@
name = "snowdin excavation down";
width = 6
},
/turf/open/floor/plating,
/turf/open/floor/plasteel/elevatorshaft,
/area/awaymission/snowdin/post/mining_dock)
"xQ" = (
/obj/effect/turf_decal/stripes/line{
@@ -9917,20 +9887,6 @@
},
/turf/open/floor/engine/vacuum,
/area/awaymission/snowdin/cave)
"zb" = (
/obj/structure/window/reinforced/fulltile/ice,
/obj/structure/grille,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
dir = 4;
frequency = 1442;
id_tag = "snowdin_toxins_mine_1";
name = "toxin out"
},
/turf/open/floor/plating,
/area/awaymission/snowdin/cave)
"zc" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 8
@@ -12308,13 +12264,6 @@
/obj/effect/turf_decal/loading_area,
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
"FP" = (
/turf/open/floor/plating/asteroid/snow/ice,
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
"FQ" = (
/obj/effect/light_emitter{
name = "outdoor light";
@@ -12366,13 +12315,6 @@
},
/turf/open/floor/plating/asteroid/snow/ice,
/area/awaymission/snowdin/cave/cavern)
"FX" = (
/turf/open/floor/plating/asteroid/snow/ice,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
"FY" = (
/turf/open/floor/plating/asteroid/snow/ice,
/obj/machinery/conveyor{
@@ -13442,9 +13384,6 @@
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"Jl" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/mining/glass{
name = "Mining Dock";
req_access_txt = "48"
@@ -13487,9 +13426,6 @@
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
"Jr" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/mining/glass{
name = "Mining Dock";
req_access_txt = "48"
@@ -13650,23 +13586,8 @@
},
/area/awaymission/snowdin/post/mining_main)
"JQ" = (
/obj/effect/baseturf_helper/asteroid/snow,
/turf/closed/wall/rust,
/area/shuttle/snowdin/elevator2)
"JR" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator2)
"JS" = (
/obj/machinery/door/airlock/public/glass{
name = "Elevator Access"
},
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator2)
"JT" = (
/turf/closed/wall,
/area/shuttle/snowdin/elevator2)
/turf/open/floor/plasteel/elevatorshaft,
/area/awaymission/snowdin/post/mining_main)
"JU" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -13729,19 +13650,6 @@
dir = 8
},
/area/awaymission/snowdin/post/mining_main)
"Kd" = (
/obj/machinery/computer/shuttle/snowdin/mining,
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator2)
"Ke" = (
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator2)
"Kf" = (
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator2)
"Kg" = (
/obj/structure/ore_box,
/obj/effect/turf_decal/bot,
@@ -13803,27 +13711,18 @@
},
/area/awaymission/snowdin/post/mining_main)
"Kn" = (
/obj/machinery/door/airlock/public/glass{
name = "Elevator Access"
},
/obj/docking_port/mobile/elevator{
dir = 4;
dwidth = 2;
height = 5;
id = "snowdin_mining";
name = "mining elevator";
width = 5
},
/obj/docking_port/stationary{
area_type = /area/awaymission/snowdin/post/mining_main;
dir = 4;
dwidth = 2;
height = 5;
id = "snowdin_mining_top";
name = "snowdin mining top";
roundstart_template = /datum/map_template/shuttle/snowdin/mining;
width = 5
},
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator2)
/turf/open/floor/plasteel/elevatorshaft,
/area/awaymission/snowdin/post/mining_main)
"Ko" = (
/obj/machinery/light{
dir = 4
@@ -13873,7 +13772,7 @@
name = "snowdin mining bottom";
width = 5
},
/turf/open/floor/plating,
/turf/open/floor/plasteel/elevatorshaft,
/area/awaymission/snowdin/post/mining_dock)
"Ku" = (
/obj/machinery/light{
@@ -13942,10 +13841,6 @@
},
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/mining_main)
"KC" = (
/obj/machinery/light/small,
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator2)
"KD" = (
/obj/structure/ore_box,
/obj/effect/turf_decal/bot,
@@ -14018,9 +13913,6 @@
dir = 4
},
/area/awaymission/snowdin/post/mining_main)
"KP" = (
/turf/closed/wall/rust,
/area/shuttle/snowdin/elevator2)
"KQ" = (
/obj/machinery/computer/shuttle/snowdin/mining{
dir = 8
@@ -14156,6 +14048,20 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"WK" = (
/turf/open/floor/plating/asteroid/snow/ice,
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
"XO" = (
/turf/open/floor/plating/asteroid/snow/ice,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
"Yn" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -14163,6 +14069,9 @@
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/garage)
"Ys" = (
/turf/open/floor/plasteel/elevatorshaft,
/area/awaymission/snowdin/post/mining_dock)
(1,1,1) = {"
aa
@@ -28201,7 +28110,7 @@ wS
wS
ai
yf
zb
yt
ai
wS
wS
@@ -28285,10 +28194,10 @@ IY
Go
Jx
JQ
JR
JQ
Kn
JR
JT
JQ
JQ
KT
Go
ac
@@ -28440,7 +28349,7 @@ ii
yb
an
yf
zb
yt
yf
ai
ai
@@ -28541,11 +28450,11 @@ Gq
Gq
Go
Jx
JR
Kd
Ke
KC
JR
JQ
JQ
JQ
JQ
JQ
KT
GP
ac
@@ -28798,11 +28707,11 @@ Iy
Iy
Go
Jy
JS
Ke
Ke
Ke
JS
JQ
JQ
JQ
JQ
JQ
KU
GP
ac
@@ -29055,11 +28964,11 @@ GP
GP
GP
Jx
JR
Kf
Ke
Ke
JR
JQ
JQ
JQ
JQ
JQ
KT
GP
ac
@@ -29312,11 +29221,11 @@ ae
ae
Go
Jx
JT
JR
JS
JR
KP
JQ
JQ
JQ
JQ
JQ
KT
GP
ac
@@ -30232,11 +30141,11 @@ ae
aj
xa
xl
xm
xn
xl
xl
xK
xm
xo
xl
xl
an
ii
ii
@@ -30488,12 +30397,12 @@ ae
ae
aj
xa
xm
xv
xv
xv
xv
xm
xl
xl
xl
xl
xl
xl
yp
ii
wS
@@ -30745,12 +30654,12 @@ ae
wQ
ai
xb
xn
xv
xv
xv
xv
xn
xl
xl
xl
xl
xl
xl
yq
ii
wS
@@ -31002,12 +30911,12 @@ ae
wQ
ai
xb
xn
xv
xv
xv
xv
xn
xl
xl
xl
xl
xl
xl
yq
an
ii
@@ -31259,12 +31168,12 @@ ae
wQ
wS
xa
xm
xw
xv
xv
xv
xm
xl
xl
xl
xl
xl
xl
yr
an
ii
@@ -31516,12 +31425,12 @@ ae
wQ
wS
xa
xo
xm
xn
xn
xm
xo
xl
xl
xl
xl
xl
xl
yp
an
an
@@ -62465,11 +62374,11 @@ IO
wL
wE
JH
wL
wL
Ys
Ys
Kt
wL
wL
Ys
Ys
KX
wE
bh
@@ -62722,11 +62631,11 @@ IQ
wL
wE
JH
wL
wL
wL
wL
wL
Ys
Ys
Ys
Ys
Ys
KX
wE
bh
@@ -62979,11 +62888,11 @@ wL
wL
wE
JI
wL
wL
wL
wL
wL
Ys
Ys
Ys
Ys
Ys
KY
wE
bh
@@ -63236,11 +63145,11 @@ wL
wL
wE
JH
wL
wL
wL
wL
wL
Ys
Ys
Ys
Ys
Ys
KX
wE
bh
@@ -63493,11 +63402,11 @@ wL
wL
wD
JH
wL
wL
wL
wL
wL
Ys
Ys
Ys
Ys
Ys
KX
wD
bh
@@ -64252,7 +64161,7 @@ oZ
oZ
oZ
FN
FX
XO
Gk
GN
Hj
@@ -64765,7 +64674,7 @@ oZ
oZ
oZ
oZ
FP
WK
xW
xW
xW
@@ -65440,12 +65349,12 @@ eJ
wE
wV
xg
wL
wL
wL
Ys
Ys
Ys
xP
wL
wL
Ys
Ys
yz
yR
wD
@@ -65697,12 +65606,12 @@ eJ
wD
wW
xg
wL
wL
wL
wL
wL
wL
Ys
Ys
Ys
Ys
Ys
Ys
yA
wM
zm
@@ -65954,12 +65863,12 @@ wD
wP
wX
xg
wL
wL
wL
wL
wL
wL
Ys
Ys
Ys
Ys
Ys
Ys
yB
xy
zn
@@ -66212,11 +66121,11 @@ wP
wW
xh
wW
wL
wL
wL
wL
wL
Ys
Ys
Ys
Ys
Ys
yB
xy
zn
@@ -66470,10 +66379,10 @@ wW
xh
wW
wW
wW
wL
wL
wL
Ys
Ys
Ys
Ys
yC
yS
zm
@@ -66728,9 +66637,9 @@ xi
wW
wW
wW
wL
wL
wL
Ys
Ys
Ys
yD
yT
wE
+10 -13
View File
@@ -7778,10 +7778,7 @@
dir = 2;
id = "UO45_air_in"
},
/turf/open/floor/engine{
name = "air floor";
initial_gas_mix = "n2=10580;o2=2644"
},
/turf/open/floor/engine/air,
/area/awaymission/undergroundoutpost45/engineering)
"pG" = (
/obj/structure/cable{
@@ -8023,10 +8020,7 @@
external_pressure_bound = 120;
name = "server vent"
},
/turf/open/floor/circuit{
name = "Server Base";
initial_gas_mix = "n2=500,TEMP=80"
},
/turf/open/floor/circuit/telecomms/server,
/area/awaymission/undergroundoutpost45/research)
"qi" = (
/obj/machinery/atmospherics/pipe/simple{
@@ -8394,10 +8388,7 @@
/obj/machinery/rnd/server{
req_access = null
},
/turf/open/floor/circuit{
name = "Server Base";
initial_gas_mix = "n2=500,TEMP=80"
},
/turf/open/floor/circuit/telecomms/server,
/area/awaymission/undergroundoutpost45/research)
"qQ" = (
/obj/machinery/atmospherics/pipe/manifold{
@@ -12603,6 +12594,12 @@
/obj/effect/mapping_helpers/planet_z,
/turf/open/space,
/area/space/nearstation)
"KE" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/circuit/telecomms/server,
/area/awaymission/undergroundoutpost45/research)
(1,1,1) = {"
aa
@@ -37925,7 +37922,7 @@ gz
gz
gz
gz
qh
KE
qP
qh
gz
File diff suppressed because it is too large Load Diff
+86 -78
View File
@@ -897,7 +897,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/airlock/engineering{
name = "Auxiliary Construction Storage";
req_access_txt = "10;32;47;48"
req_one_access_txt = "10;32;47;48"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
@@ -9053,11 +9053,9 @@
/turf/open/floor/plasteel/redblue,
/area/maintenance/port/fore)
"ayW" = (
/obj/machinery/vending/autodrobe{
req_access_txt = "0"
},
/obj/machinery/light/small,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/vending/autodrobe/all_access,
/turf/open/floor/plasteel/redblue/redside{
dir = 8
},
@@ -19222,9 +19220,6 @@
/turf/open/floor/plasteel/neutral,
/area/quartermaster/qm)
"aUs" = (
/obj/machinery/computer/security/mining{
dir = 8
},
/obj/machinery/status_display{
pixel_x = 32
},
@@ -19233,6 +19228,9 @@
dir = 8;
name = "cargo camera"
},
/obj/machinery/computer/security/qm{
dir = 8
},
/turf/open/floor/plasteel/brown{
dir = 4
},
@@ -27903,13 +27901,16 @@
pixel_x = 26;
pixel_y = 8
},
/obj/machinery/plantgenes,
/obj/machinery/plantgenes{
pixel_y = 6
},
/obj/machinery/camera{
c_tag = "Hydroponics";
dir = 8;
name = "service camera"
},
/obj/effect/turf_decal/delivery,
/obj/structure/table,
/turf/open/floor/plasteel,
/area/hydroponics)
"bnn" = (
@@ -28550,7 +28551,10 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"boC" = (
/obj/machinery/smartfridge/disks,
/obj/machinery/smartfridge/disks{
pixel_y = 2
},
/obj/structure/table,
/turf/open/floor/plasteel,
/area/hydroponics)
"boD" = (
@@ -28842,14 +28846,11 @@
},
/area/security/execution/transfer)
"bpg" = (
/obj/machinery/computer/security{
name = "Labor Camp Monitoring";
network = list("labor")
},
/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
/obj/machinery/computer/security/labor,
/turf/open/floor/plasteel/red,
/area/security/execution/transfer)
"bph" = (
@@ -30117,12 +30118,12 @@
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/heads/hos)
"brC" = (
/obj/machinery/computer/security{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/computer/security/hos{
dir = 1
},
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/heads/hos)
"brD" = (
@@ -32400,7 +32401,7 @@
/obj/machinery/camera/motion{
c_tag = "AI Chamber - Fore";
name = "motion-sensitive ai camera";
network = list("ai")
network = list("aichamber")
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/dark,
@@ -32854,7 +32855,8 @@
"bxe" = (
/obj/machinery/camera/motion{
c_tag = "Vault";
dir = 4
dir = 4;
network = list("vault")
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -40848,7 +40850,7 @@
c_tag = "Telecomms - Monitoring";
dir = 2;
name = "telecomms camera";
network = list("ss13","tcomm")
network = list("ss13","tcomms")
},
/turf/open/floor/plasteel/grimy,
/area/tcommsat/computer)
@@ -41332,7 +41334,7 @@
c_tag = "AI Chamber - Aft";
dir = 1;
name = "motion-sensitive ai camera";
network = list("ai")
network = list("aichamber")
},
/turf/open/floor/plasteel/vault,
/area/ai_monitored/turret_protected/ai)
@@ -45721,12 +45723,8 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the AI's satellite.";
dir = 4;
name = "Research Monitor";
network = list("minisat");
pixel_y = 2
/obj/machinery/computer/security/telescreen/minisat{
dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -45767,12 +45765,8 @@
/obj/machinery/light{
dir = 8
},
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the Engine.";
/obj/machinery/computer/security/telescreen/ce{
dir = 4;
layer = 4;
name = "Engine Monitor";
network = list("engine");
pixel_x = -30
},
/mob/living/simple_animal/parrot/Poly,
@@ -49046,6 +49040,10 @@
/obj/item/stack/packageWrap,
/obj/item/hand_labeler,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/computer/security/telescreen/vault{
dir = 8;
pixel_x = 26
},
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"ccD" = (
@@ -49056,7 +49054,7 @@
c_tag = "Telecomms - Chamber Port";
dir = 4;
name = "telecomms camera";
network = list("ss13","tcomm")
network = list("ss13","tcomms")
},
/turf/open/floor/plasteel/vault/telecomms{
dir = 8
@@ -49500,7 +49498,7 @@
/obj/machinery/camera/motion{
c_tag = "AI - Upload";
name = "motion-sensitive ai camera";
network = list("minisat")
network = list("aiupload")
},
/turf/open/floor/plasteel/vault,
/area/ai_monitored/turret_protected/ai_upload)
@@ -50943,7 +50941,7 @@
c_tag = "Telecomms - Chamber Starboard";
dir = 8;
name = "telecomms camera";
network = list("ss13","tcomm")
network = list("ss13","tcomms")
},
/turf/open/floor/plasteel/vault/telecomms{
dir = 8
@@ -52599,7 +52597,7 @@
/obj/machinery/camera/motion{
c_tag = "Bridge - Captain's Emergency Escape";
dir = 4;
name = "command camera"
name = "motion-sensitive command camera"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -54725,7 +54723,7 @@
c_tag = "Telecomms - Cooling Room";
dir = 8;
name = "telecomms camera";
network = list("ss13","tcomm")
network = list("ss13","tcomms")
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
@@ -63602,9 +63600,7 @@
},
/area/crew_quarters/locker)
"cGO" = (
/obj/machinery/vending/autodrobe{
req_access_txt = "0"
},
/obj/machinery/vending/autodrobe/all_access,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -67894,6 +67890,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Storage";
network = list("ss13","medbay");
dir = 4;
name = "medbay camera"
},
@@ -71812,6 +71809,7 @@
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Medbay - Waiting Room";
network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -71951,6 +71949,7 @@
"cYc" = (
/obj/machinery/camera{
c_tag = "Medbay - Break Room";
network = list("ss13","medbay");
dir = 2;
name = "medbay camera"
},
@@ -72628,6 +72627,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/camera{
c_tag = "Medbay - Fore Port";
network = list("ss13","medbay");
dir = 8;
name = "medbay camera"
},
@@ -72709,6 +72709,7 @@
/obj/item/stack/medical/ointment,
/obj/machinery/camera{
c_tag = "Medbay - Sleepers";
network = list("ss13","medbay");
dir = 2;
name = "medbay camera"
},
@@ -75477,9 +75478,9 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Chemistry";
network = list("ss13","medbay");
dir = 8;
name = "medbay camera";
network = list("ss13","medbay")
name = "medbay camera"
},
/turf/open/floor/plasteel/whiteyellow/corner,
/area/medical/chemistry)
@@ -76308,6 +76309,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Center";
network = list("ss13","medbay");
dir = 2;
name = "medbay camera"
},
@@ -77164,19 +77166,17 @@
/area/science/research/abandoned)
"djp" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/glass/fifty,
/obj/machinery/cell_charger,
/turf/open/floor/plasteel/white/side,
/area/science/circuit)
"djq" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/rnd/production/protolathe/department/science,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/white/side,
/area/science/circuit)
"djr" = (
/obj/machinery/autolathe,
/turf/open/floor/plasteel/white/side,
/area/science/circuit)
"djs" = (
@@ -77700,6 +77700,7 @@
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Medbay - Port";
network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -77798,6 +77799,7 @@
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Medbay - Starboard";
network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -78542,12 +78544,11 @@
/area/crew_quarters/abandoned_gambling_den)
"dmr" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stock_parts/cell/super,
/obj/item/stock_parts/cell/super,
/obj/structure/sign/departments/science{
pixel_x = -32
},
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/cell/high,
/turf/open/floor/plasteel/white/side{
dir = 4
},
@@ -79282,7 +79283,8 @@
pixel_x = -26
},
/obj/effect/decal/cleanable/dirt,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/cell/high,
/turf/open/floor/plasteel/white/side{
dir = 4
},
@@ -80849,8 +80851,6 @@
pixel_y = -32
},
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/super,
/obj/item/stock_parts/cell/super,
/turf/open/floor/plasteel/white/side{
dir = 1
},
@@ -80884,16 +80884,16 @@
},
/area/science/circuit)
"drD" = (
/obj/machinery/vending/assist,
/turf/open/floor/plasteel/white/side{
dir = 1
},
/area/science/circuit)
"drE" = (
/obj/machinery/bookbinder,
/obj/structure/sign/poster/official/build{
pixel_y = -32
},
/obj/structure/table/reinforced,
/obj/item/storage/fancy/donut_box,
/turf/open/floor/plasteel/white/side{
dir = 1
},
@@ -80902,11 +80902,11 @@
/obj/machinery/light_switch{
pixel_x = 36
},
/obj/machinery/libraryscanner,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
},
/obj/machinery/vending/assist,
/turf/open/floor/plasteel/white/corner{
dir = 1
},
@@ -81250,6 +81250,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Cloning Lab";
network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -81309,6 +81310,7 @@
/obj/item/clothing/neck/stethoscope,
/obj/machinery/camera{
c_tag = "Medbay - Cryogenics";
network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -81775,6 +81777,7 @@
/obj/machinery/iv_drip,
/obj/machinery/camera{
c_tag = "Medbay - Recovery Room";
network = list("ss13","medbay");
dir = 8;
name = "medbay camera"
},
@@ -83171,6 +83174,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Genetics Lab";
network = list("ss13","medbay");
dir = 4;
name = "medbay camera"
},
@@ -83802,6 +83806,7 @@
/obj/item/storage/box/disks,
/obj/machinery/camera{
c_tag = "Medbay - Genetics Desk";
network = list("ss13","medbay");
dir = 4;
name = "medbay camera"
},
@@ -84109,6 +84114,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Surgery";
network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -84703,6 +84709,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/camera{
c_tag = "Medbay - Aft Port";
network = list("ss13","medbay");
dir = 8;
name = "medbay camera"
},
@@ -84761,6 +84768,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Chief Medical Officer's Office";
network = list("ss13","medbay");
dir = 8;
name = "medbay camera"
},
@@ -85669,14 +85677,12 @@
/turf/open/floor/wood,
/area/crew_quarters/abandoned_gambling_den)
"dBR" = (
/obj/machinery/vending/boozeomat{
req_access_txt = "0"
},
/obj/machinery/light/small,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/random{
pixel_y = -32
},
/obj/machinery/vending/boozeomat/all_access,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"dBS" = (
@@ -85983,8 +85989,9 @@
/obj/structure/table/glass,
/obj/item/clipboard,
/obj/item/toy/figure/cmo,
/obj/machinery/status_display{
pixel_x = -32
/obj/machinery/computer/security/telescreen/cmo{
dir = 4;
pixel_x = -30
},
/turf/open/floor/plasteel/neutral/side{
dir = 4
@@ -86031,6 +86038,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Aft Starboard";
network = list("ss13","medbay");
dir = 4;
name = "medbay camera"
},
@@ -88056,16 +88064,12 @@
/area/science/test_area)
"dGY" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the testing site.";
dir = 4;
layer = 4;
name = "Testing Site Telescreen";
network = list("toxins")
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/computer/security/telescreen/toxins{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/mixing)
"dGZ" = (
@@ -89064,6 +89068,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "Medbay - Morgue";
network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -89175,6 +89180,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Chief Medical Officer's Quarters";
network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -90372,17 +90378,8 @@
/obj/item/target,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
active_power_usage = 0;
c_tag = "Bomb Test Site";
desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site.";
dir = 4;
invuln = 1;
light = null;
name = "hardened testing camera";
network = list("toxins");
start_active = 1;
use_power = 0
/obj/machinery/camera/preset/toxins{
dir = 4
},
/turf/open/floor/plating/airless,
/area/science/test_area)
@@ -92475,6 +92472,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Virology - Containment Lock";
network = list("ss13","medbay");
dir = 8;
name = "virology camera"
},
@@ -92987,6 +92985,7 @@
},
/obj/machinery/camera{
c_tag = "Virology - Break Room";
network = list("ss13","medbay");
dir = 8;
name = "virology camera"
},
@@ -94693,6 +94692,7 @@
},
/obj/machinery/camera{
c_tag = "Virology - Lab";
network = list("ss13","medbay");
name = "virology camera"
},
/obj/effect/turf_decal/bot,
@@ -94712,6 +94712,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/camera{
c_tag = "Virology - Hallway";
network = list("ss13","medbay");
dir = 8;
name = "virology camera"
},
@@ -96415,6 +96416,7 @@
},
/obj/machinery/camera{
c_tag = "Virology - Cells";
network = list("ss13","medbay");
dir = 8;
name = "virology camera"
},
@@ -99717,7 +99719,7 @@
"gUH" = (
/obj/machinery/light,
/obj/structure/table/reinforced,
/obj/machinery/computer/libraryconsole/bookmanagement,
/obj/item/stack/sheet/metal/ten,
/turf/open/floor/plasteel/white/side{
dir = 1
},
@@ -100149,6 +100151,12 @@
/obj/effect/mapping_helpers/airlock/locked,
/turf/open/floor/engine,
/area/science/mixing)
"oMw" = (
/obj/docking_port/stationary/public_mining_dock{
dir = 4
},
/turf/open/floor/plating,
/area/construction/mining/aux_base)
"oNd" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -143475,7 +143483,7 @@ aeF
aeF
aeF
aeF
aeF
oMw
aeF
aeF
aeF
File diff suppressed because it is too large Load Diff
+24 -15
View File
@@ -1683,7 +1683,7 @@
},
/obj/machinery/power/apc{
dir = 4;
name = "Starboard Bow Maintenace APC";
name = "Starboard Bow Maintenance APC";
areastring = "/area/maintenance/starboard/fore";
pixel_x = 26
},
@@ -2113,7 +2113,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/power/apc{
dir = 8;
name = "Fore Maintenace APC";
name = "Fore Maintenance APC";
areastring = "/area/maintenance/fore";
pixel_x = -26;
pixel_y = 3
@@ -15110,6 +15110,9 @@
codes_txt = "patrol;next_patrol=9.4-EnteringDorms";
location = "9.3-Engi"
},
/obj/structure/cable/white{
icon_state = "2-4"
},
/turf/open/floor/plasteel/neutral,
/area/engine/break_room)
"aFF" = (
@@ -15470,6 +15473,7 @@
name = "Engineering Foyer APC";
pixel_y = -26
},
/obj/structure/cable/white,
/turf/open/floor/plasteel/yellow/corner{
dir = 8
},
@@ -16215,7 +16219,7 @@
/area/hydroponics)
"aHO" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Hydroponic's Maintenance";
name = "Hydroponics Maintenance";
req_access_txt = "35"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -17841,6 +17845,7 @@
/obj/item/seeds/wheat,
/obj/item/reagent_containers/food/snacks/grown/tomato,
/obj/effect/turf_decal/bot,
/obj/item/paper/guides/jobs/hydroponics,
/turf/open/floor/plasteel/vault/side{
dir = 1
},
@@ -17858,6 +17863,7 @@
},
/obj/item/seeds/tower,
/obj/effect/turf_decal/bot,
/obj/item/book/manual/hydroponics_pod_people,
/turf/open/floor/plasteel/vault/side{
dir = 1
},
@@ -25433,7 +25439,6 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"bbQ" = (
/obj/machinery/jukebox,
/turf/open/floor/wood{
icon_state = "wood-broken5"
},
@@ -30950,6 +30955,14 @@
},
/turf/open/floor/plating/airless,
/area/maintenance/disposal/incinerator)
"coR" = (
/obj/effect/turf_decal/bot,
/obj/machinery/smartfridge/disks{
pixel_y = 2
},
/obj/structure/table/glass,
/turf/open/floor/plasteel/neutral,
/area/hydroponics)
"csX" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/white{
@@ -32217,13 +32230,6 @@
},
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"mJQ" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/delivery,
/obj/item/book/manual/hydroponics_pod_people,
/obj/item/paper/guides/jobs/hydroponics,
/turf/open/floor/plasteel/neutral,
/area/hydroponics)
"mQi" = (
/turf/closed/wall/rust,
/area/maintenance/starboard/central)
@@ -35406,8 +35412,11 @@
},
/area/hallway/primary/starboard)
"uuj" = (
/obj/machinery/plantgenes,
/obj/machinery/plantgenes{
pixel_y = 6
},
/obj/effect/turf_decal/bot,
/obj/structure/table/glass,
/turf/open/floor/plasteel/neutral,
/area/hydroponics)
"uuJ" = (
@@ -74137,7 +74146,7 @@ bxN
sIB
cfz
ewT
mJQ
aKX
lyp
bIJ
aOj
@@ -74394,7 +74403,7 @@ arY
aHM
aIG
aJP
aKX
aKW
aMk
aNr
aHM
@@ -74651,7 +74660,7 @@ aGG
aHM
aIH
aJP
aKW
coR
aMk
aNr
aOh
+114 -164
View File
@@ -2249,9 +2249,7 @@
c_tag = "Brig Prison Hallway";
network = list("ss13","prison")
},
/obj/machinery/computer/security/telescreen{
desc = "Used for watching Prison Wing holding areas.";
name = "Prison Monitor";
/obj/machinery/computer/security/telescreen/prison{
network = list("prison");
pixel_y = 30
},
@@ -4378,7 +4376,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"amz" = (
/obj/machinery/computer/security{
/obj/machinery/computer/security/hos{
dir = 8
},
/turf/open/floor/carpet,
@@ -5072,10 +5070,7 @@
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"aok" = (
/obj/machinery/computer/security{
name = "Labor Camp Monitoring";
network = list("labor")
},
/obj/machinery/computer/security/labor,
/turf/open/floor/plasteel/dark,
/area/security/brig)
"aol" = (
@@ -5936,6 +5931,10 @@
},
/area/security/brig)
"aqA" = (
/obj/machinery/computer/security/telescreen/interrogation{
dir = 8;
pixel_x = 30
},
/turf/open/floor/plasteel/red/side{
dir = 5
},
@@ -6269,7 +6268,8 @@
"arz" = (
/obj/machinery/camera{
c_tag = "Brig Interrogation";
dir = 8
dir = 8;
network = list("interrogation")
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
@@ -7310,6 +7310,7 @@
"aud" = (
/obj/machinery/camera/motion{
c_tag = "Vault";
network = list("vault");
dir = 1
},
/obj/machinery/light,
@@ -7813,7 +7814,6 @@
dir = 4;
pixel_x = 28
},
/obj/machinery/cryopod,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"avm" = (
@@ -10281,6 +10281,9 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"aBA" = (
/obj/machinery/computer/security/telescreen/vault{
pixel_y = 30
},
/obj/machinery/computer/security/mining,
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
@@ -10460,7 +10463,7 @@
/turf/open/floor/plasteel/arrival,
/area/crew_quarters/fitness/recreation)
"aBV" = (
/obj/machinery/vending/kink,
/obj/structure/closet/wardrobe/green,
/turf/open/floor/plasteel/arrival,
/area/crew_quarters/fitness/recreation)
"aBW" = (
@@ -10692,7 +10695,8 @@
pixel_y = 32
},
/obj/machinery/disposal/deliveryChute{
name = "Crate Disposal Chute"
name = "Crate Disposal Chute";
pixel_y = 6
},
/obj/structure/window/reinforced{
dir = 4
@@ -10784,7 +10788,8 @@
/obj/item/aiModule/supplied/quarantine,
/obj/machinery/camera/motion{
c_tag = "AI Upload Port";
dir = 4
dir = 4;
network = list("aiupload")
},
/obj/item/aiModule/reset,
/obj/machinery/flasher{
@@ -10831,7 +10836,8 @@
/obj/item/aiModule/supplied/freeform,
/obj/machinery/camera/motion{
c_tag = "AI Upload Starboard";
dir = 8
dir = 8;
network = list("aiupload")
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -11050,7 +11056,6 @@
/turf/open/floor/plasteel/white/side,
/area/crew_quarters/dorms)
"aDk" = (
/obj/machinery/cryopod,
/turf/open/floor/plasteel/white/corner{
icon_state = "whitecorner";
dir = 8
@@ -11263,7 +11268,8 @@
/obj/machinery/holopad,
/obj/machinery/camera/motion{
c_tag = "AI Upload Center";
dir = 1
dir = 1;
network = list("aiupload")
},
/obj/item/radio/intercom{
broadcasting = 1;
@@ -12348,10 +12354,7 @@
/turf/open/floor/plasteel/neutral/side,
/area/storage/primary)
"aGk" = (
/obj/machinery/vending/boozeomat{
products = list(/obj/item/reagent_containers/food/drinks/bottle/rum = 1, /obj/item/reagent_containers/food/drinks/bottle/wine = 1, /obj/item/reagent_containers/food/drinks/ale = 1, /obj/item/reagent_containers/food/drinks/drinkingglass = 6, /obj/item/reagent_containers/food/drinks/ice = 1, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 4);
req_access_txt = "20"
},
/obj/machinery/vending/boozeomat/pubby_captain,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -16566,6 +16569,10 @@
/obj/machinery/light{
dir = 4
},
/obj/machinery/computer/security/telescreen/auxbase{
dir = 8;
pixel_x = 30
},
/turf/open/floor/plasteel,
/area/construction/mining/aux_base)
"aRH" = (
@@ -19097,7 +19104,10 @@
},
/area/hydroponics)
"aXW" = (
/obj/machinery/plantgenes,
/obj/machinery/plantgenes{
pixel_y = 6
},
/obj/structure/table,
/turf/open/floor/plasteel/green/corner{
dir = 4
},
@@ -21322,14 +21332,14 @@
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"bdM" = (
/obj/machinery/computer/security/mining{
dir = 8
},
/obj/machinery/requests_console{
department = "Mining";
departmentType = 0;
pixel_x = 32
},
/obj/machinery/computer/security/mining{
dir = 8
},
/turf/open/floor/plasteel/brown/corner,
/area/quartermaster/miningdock)
"bdQ" = (
@@ -22051,13 +22061,13 @@
},
/area/quartermaster/qm)
"bfD" = (
/obj/machinery/computer/security/mining{
dir = 8
},
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
/obj/machinery/computer/security/qm{
dir = 8
},
/turf/open/floor/plasteel/brown{
dir = 6
},
@@ -23841,6 +23851,7 @@
},
/obj/machinery/camera{
c_tag = "Genetics Cloning Foyer";
network = list("ss13","medbay");
dir = 2
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -24227,12 +24238,8 @@
dir = 1
},
/obj/item/integrated_electronics/debugger,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the other eggheads from the comfort of the circuitry lab.";
dir = 2;
name = "RnD Monitor";
network = list("rd");
pixel_y = 32
/obj/machinery/computer/security/telescreen/circuitry{
pixel_y = 30
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -24240,13 +24247,9 @@
/area/science/explab)
"blV" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal/fifty{
pixel_x = -2;
pixel_y = 2
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/science,
/obj/item/stack/sheet/metal/ten,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -24257,12 +24260,8 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the other eggheads from the comfort of the circuitry lab.";
dir = 2;
name = "RnD Monitor";
network = list("rd");
pixel_y = 32
/obj/machinery/computer/security/telescreen/circuitry{
pixel_y = 30
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -24409,6 +24408,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay Security Post";
network = list("ss13","medbay");
dir = 4
},
/obj/structure/closet/secure_closet/security/med,
@@ -24650,10 +24650,10 @@
/obj/machinery/cell_charger{
pixel_y = 5
},
/obj/item/stock_parts/cell/super,
/obj/item/stock_parts/cell/super,
/obj/item/stock_parts/cell/super,
/obj/item/stock_parts/cell/super,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/cell/high,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -24992,7 +24992,9 @@
/turf/open/floor/engine,
/area/science/explab)
"bnZ" = (
/obj/machinery/rnd/production/techfab/department/science,
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-10"
},
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -25236,6 +25238,7 @@
/obj/structure/bed/roller,
/obj/machinery/camera{
c_tag = "Medbay Entrance";
network = list("ss13","medbay");
dir = 1
},
/turf/open/floor/plasteel/whiteblue/side,
@@ -26126,7 +26129,7 @@
/obj/machinery/camera{
c_tag = "Genetics Monkey Pen Fore";
dir = 4;
network = list("ss13","rd")
network = list("ss13","medbay")
},
/obj/machinery/light/small{
dir = 8
@@ -26738,6 +26741,7 @@
/obj/machinery/dna_scannernew,
/obj/machinery/camera{
c_tag = "Genetics Cloning";
network = list("ss13","medbay");
dir = 4
},
/obj/machinery/airalarm/unlocked{
@@ -27475,6 +27479,7 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/machinery/disposal/bin,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bum" = (
@@ -27762,6 +27767,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Medbay Port Hallway";
network = list("ss13","medbay");
dir = 4
},
/obj/machinery/airalarm{
@@ -28451,7 +28457,6 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bwV" = (
/obj/machinery/disposal/bin,
/turf/open/floor/plasteel/whiteyellow/corner,
/area/medical/chemistry)
"bwW" = (
@@ -29672,7 +29677,7 @@
/obj/machinery/camera{
c_tag = "Genetics Monkey Pen Aft";
dir = 4;
network = list("ss13","rd")
network = list("ss13","medbay")
},
/obj/structure/flora/ausbushes/grassybush,
/obj/machinery/light/small{
@@ -30323,20 +30328,16 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
/obj/machinery/computer/security/telescreen{
desc = "Used for watching surgery.";
dir = 8;
layer = 4;
name = "Surgery Telescreen";
network = list("surgery");
pixel_x = 30
},
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/computer/security/telescreen/cmo{
dir = 8;
pixel_x = 30
},
/turf/open/floor/plasteel/cmo,
/area/crew_quarters/heads/cmo)
"bBl" = (
@@ -30694,7 +30695,7 @@
/obj/machinery/camera{
c_tag = "Genetics";
dir = 1;
network = list("ss13","rd")
network = list("ss13","medbay")
},
/turf/open/floor/plasteel/whitepurple/side,
/area/medical/genetics)
@@ -30750,6 +30751,7 @@
/obj/structure/closet/emcloset,
/obj/machinery/camera{
c_tag = "Virology Airlock";
network = list("ss13","medbay");
dir = 2
},
/obj/effect/turf_decal/stripes/line{
@@ -31882,7 +31884,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/effect/landmark/blobstart,
/obj/item/melee/baton/cattleprod{
cell = new /obj/item/stock_parts/cell/high()
preload_cell_type = /obj/item/stock_parts/cell/high
},
/turf/open/floor/plasteel/dark,
/area/medical/exam_room)
@@ -32010,13 +32012,11 @@
pixel_x = 4;
pixel_y = 6
},
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the RD's goons and the AI's satellite from the safety of his office.";
name = "Research Monitor";
network = list("rd","minisat");
pixel_y = -32
},
/obj/structure/table/glass,
/obj/machinery/computer/security/telescreen/rd{
dir = 1;
pixel_y = -26
},
/turf/open/floor/plasteel/darkpurple/side,
/area/crew_quarters/heads/hor)
"bEV" = (
@@ -33218,6 +33218,7 @@
"bHY" = (
/obj/machinery/camera{
c_tag = "Virology";
network = list("ss13","medbay");
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -33276,6 +33277,7 @@
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Medbay Equipment Room";
network = list("ss13","medbay");
dir = 1
},
/turf/open/floor/plasteel/whiteblue/side,
@@ -33342,6 +33344,7 @@
"bIm" = (
/obj/machinery/camera{
c_tag = "Medbay Recovery Room";
network = list("ss13","medbay");
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -34800,7 +34803,7 @@
"bLX" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/airlock/atmos/glass{
/obj/machinery/door/airlock/atmos{
name = "Atmospherics";
req_access_txt = "24"
},
@@ -38261,6 +38264,9 @@
c_tag = "Chief Engineer's Office";
dir = 2
},
/obj/machinery/computer/security/telescreen/ce{
pixel_y = 30
},
/turf/open/floor/plasteel/yellow/side{
dir = 1
},
@@ -38961,46 +38967,21 @@
/area/crew_quarters/heads/chief)
"bWs" = (
/obj/structure/rack,
/obj/item/circuitboard/computer/robotics{
pixel_x = -2;
pixel_y = 2
},
/obj/item/circuitboard/computer/mecha_control{
pixel_x = 1;
pixel_y = -1
},
/obj/effect/spawner/lootdrop/techstorage/RnD_secure,
/turf/open/floor/plasteel/darkred,
/area/storage/tech)
"bWt" = (
/obj/structure/rack,
/obj/item/circuitboard/computer/crew{
pixel_x = -1;
pixel_y = 1
},
/obj/item/circuitboard/computer/card{
pixel_x = 2;
pixel_y = -2
},
/obj/item/circuitboard/computer/communications{
pixel_x = 5;
pixel_y = -5
},
/obj/machinery/camera{
c_tag = "Secure Tech Storage";
dir = 1
},
/obj/effect/spawner/lootdrop/techstorage/command,
/turf/open/floor/plasteel/darkred,
/area/storage/tech)
"bWu" = (
/obj/structure/rack,
/obj/item/circuitboard/computer/borgupload{
pixel_x = -1;
pixel_y = 1
},
/obj/item/circuitboard/computer/aiupload{
pixel_x = 2;
pixel_y = -2
},
/obj/effect/spawner/lootdrop/techstorage/AI,
/turf/open/floor/plasteel/darkred,
/area/storage/tech)
"bWv" = (
@@ -41269,9 +41250,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 30
},
/obj/item/gps{
gpstag = "ENG0"
},
/obj/item/gps/engineering,
/turf/open/floor/plating,
/area/engine/engineering)
"ccS" = (
@@ -41897,7 +41876,7 @@
dir = 2;
layer = 4;
name = "Telecomms Telescreen";
network = list("tcomm");
network = list("tcomms");
pixel_y = 28
},
/obj/structure/disposalpipe/segment{
@@ -43111,16 +43090,7 @@
/turf/open/floor/carpet,
/area/library/lounge)
"cjV" = (
/obj/machinery/camera{
active_power_usage = 0;
c_tag = "Bomb Testing Asteroid Fore";
desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site. An external light is attached to the top.";
invuln = 1;
luminosity = 3;
name = "Hardened Bomb-Test Camera";
network = list("ss13","rd","toxins");
use_power = 0
},
/obj/machinery/camera/preset/toxins,
/turf/open/floor/plating/asteroid/airless,
/area/asteroid/nearstation/bomb_site)
"cjZ" = (
@@ -43872,7 +43842,7 @@
/obj/machinery/camera/motion{
c_tag = "Telecomms External Port";
dir = 8;
network = list("tcomm")
network = list("tcomms")
},
/turf/open/space,
/area/space/nearstation)
@@ -43934,7 +43904,7 @@
/obj/machinery/camera/motion{
c_tag = "Telecomms External Starboard";
dir = 4;
network = list("tcomm")
network = list("tcomms")
},
/turf/open/space,
/area/space/nearstation)
@@ -44062,16 +44032,9 @@
/turf/open/floor/circuit/telecomms/mainframe,
/area/tcommsat/server)
"cnp" = (
/obj/machinery/camera{
active_power_usage = 0;
/obj/machinery/camera/preset/toxins{
c_tag = "Bomb Testing Asteroid Aft";
desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site. An external light is attached to the top.";
dir = 1;
invuln = 1;
luminosity = 3;
name = "Hardened Bomb-Test Camera";
network = list("ss13","rd","toxins");
use_power = 0
dir = 1
},
/turf/open/floor/plating/asteroid/airless,
/area/asteroid/nearstation/bomb_site)
@@ -44110,7 +44073,7 @@
/obj/machinery/camera/motion{
c_tag = "Telecomms Server Room";
dir = 1;
network = list("ss13","tcomm")
network = list("tcomms")
},
/turf/open/floor/plasteel/dark/telecomms,
/area/tcommsat/server)
@@ -44141,7 +44104,7 @@
/obj/machinery/camera/motion{
c_tag = "Telecomms External Port Aft";
dir = 2;
network = list("tcomm")
network = list("tcomms")
},
/turf/open/space,
/area/space/nearstation)
@@ -44150,7 +44113,7 @@
/obj/machinery/camera/motion{
c_tag = "Telecomms External Starboard Aft";
dir = 2;
network = list("tcomm")
network = list("tcomms")
},
/turf/open/space,
/area/space/nearstation)
@@ -46893,7 +46856,7 @@
/area/library)
"cAu" = (
/obj/structure/table/wood,
/obj/item/clothing/head/pharoah,
/obj/item/clothing/head/pharaoh,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/vault{
dir = 5
@@ -46995,7 +46958,7 @@
/turf/open/floor/plasteel/dark,
/area/library)
"cBk" = (
/obj/machinery/vending/boozeomat/maint,
/obj/machinery/vending/boozeomat/pubby_maint,
/turf/closed/wall,
/area/maintenance/department/crew_quarters/dorms)
"cBl" = (
@@ -47308,7 +47271,7 @@
},
/area/science/xenobiology)
"cPO" = (
/obj/machinery/jukebox,
/obj/item/chair/stool,
/turf/open/floor/wood{
icon_state = "wood-broken7"
},
@@ -48948,12 +48911,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"hOd" = (
/obj/machinery/autolathe,
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/science/explab)
"hOx" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -49159,6 +49116,9 @@
},
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"iqc" = (
/turf/open/floor/plasteel/stairs/right,
/area/maintenance/department/crew_quarters/dorms)
"itl" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -49226,7 +49186,7 @@
/obj/machinery/camera{
c_tag = "Telecomms External Fore";
dir = 1;
network = list("SS13","tcomm");
network = list("tcomms");
start_active = 1
},
/obj/structure/cable/yellow{
@@ -49443,10 +49403,6 @@
},
/turf/closed/wall/r_wall,
/area/engine/engineering)
"jqN" = (
/obj/effect/spawner/lootdrop/keg,
/turf/open/floor/wood,
/area/maintenance/department/crew_quarters/dorms)
"jrG" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -49815,10 +49771,6 @@
},
/turf/open/floor/plating/airless,
/area/engine/engineering)
"koO" = (
/obj/effect/spawner/lootdrop/keg,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
"kpK" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
@@ -49924,7 +49876,10 @@
},
/area/hallway/primary/central)
"kEW" = (
/obj/machinery/smartfridge/disks,
/obj/machinery/smartfridge/disks{
pixel_y = 2
},
/obj/structure/table,
/turf/open/floor/plasteel,
/area/hydroponics)
"kFm" = (
@@ -50953,7 +50908,7 @@
/obj/machinery/camera/motion{
c_tag = "Telecomms Monitoring";
dir = 2;
network = list("ss13","tcomm")
network = list("tcomms")
},
/obj/structure/cable{
icon_state = "2-8"
@@ -52249,7 +52204,7 @@
/obj/machinery/camera/motion{
c_tag = "Telecomms External Access";
dir = 1;
network = list("ss13","tcomm")
network = list("tcomms")
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -52338,11 +52293,6 @@
"rHA" = (
/turf/open/floor/plasteel,
/area/construction/mining/aux_base)
"rHP" = (
/obj/structure/lattice,
/obj/structure/reagent_dispensers/keg/aphro/strong,
/turf/open/space,
/area/space/nearstation)
"rJg" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/obj/machinery/light/small{
@@ -52467,7 +52417,7 @@
/turf/open/floor/plating,
/area/engine/engineering)
"sbk" = (
/obj/machinery/vending/kink,
/obj/structure/girder,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
"sbY" = (
@@ -52962,6 +52912,10 @@
/obj/item/pen,
/turf/open/floor/plasteel/dark,
/area/science/explab)
"tCP" = (
/obj/docking_port/stationary/public_mining_dock,
/turf/open/floor/plating,
/area/construction/mining/aux_base)
"tDn" = (
/obj/item/wrench,
/turf/open/floor/plating,
@@ -54432,10 +54386,6 @@
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"yap" = (
/obj/machinery/computer/cryopod,
/turf/closed/wall,
/area/crew_quarters/dorms)
"ybX" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
@@ -54473,7 +54423,7 @@
/obj/machinery/camera{
c_tag = "Engineering Telecomms Access";
dir = 8;
network = list("tcomm")
network = list("tcomms")
},
/obj/machinery/light{
dir = 4
@@ -76948,7 +76898,7 @@ uoS
rJZ
uoS
uoS
uoS
tCP
xOC
jAy
rHA
@@ -88701,7 +88651,7 @@ aaa
aaa
aaa
aby
rHP
abI
abO
abX
acg
@@ -91046,7 +90996,7 @@ aaa
aaa
aiS
qPB
gNv
iqc
ngp
cBr
cBs
@@ -91564,7 +91514,7 @@ cBo
alQ
alb
cBw
jqN
alb
aiS
aiS
aiS
@@ -92596,7 +92546,7 @@ aiS
aiS
aob
eaw
koO
ajv
ajv
cnX
aiS
@@ -94661,7 +94611,7 @@ aaa
aaa
apX
apX
yap
apX
avl
fIu
dbi
@@ -96248,7 +96198,7 @@ bjx
bjw
qDJ
vmG
hOd
bnZ
pDP
nBL
bqs
File diff suppressed because it is too large Load Diff
+94 -94
View File
@@ -1,4 +1,4 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/turf/open/space/basic,
/area/space)
@@ -13642,7 +13642,7 @@
/turf/open/floor/grass,
/area/centcom/holding)
"Qm" = (
/obj/singularity/wizard,
/obj/singularity/wizard/mapped,
/turf/open/indestructible/binary,
/area/fabric_of_reality)
"Qu" = (
@@ -16070,7 +16070,7 @@ fX
fX
fX
fX
fY
fX
fX
fX
fX
@@ -16841,7 +16841,7 @@ fX
fX
fX
fX
fX
fY
fX
fX
fX
@@ -18119,21 +18119,21 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
aa
aa
aa
@@ -18376,21 +18376,21 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
aa
aa
aa
@@ -18633,21 +18633,21 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
aa
aa
aa
@@ -18890,21 +18890,21 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
aa
aa
aa
@@ -19147,21 +19147,21 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
aa
aa
aa
@@ -19404,21 +19404,21 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
fX
aa
aa
aa
+4 -1
View File
@@ -1,5 +1,8 @@
{
"map_name": "Runtime Station",
"map_path": "map_files/debug",
"map_file": "runtimestation.dmm"
"map_file": "runtimestation.dmm",
"shuttles": {
"cargo": "cargo_delta"
}
}
+5 -5
View File
@@ -78,18 +78,18 @@
/turf/open/floor/plating,
/area/shuttle/arrival)
"p" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"q" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"r" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -114,13 +114,13 @@
/turf/open/floor/plating/airless,
/area/shuttle/arrival)
"v" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"w" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light/small{
+2 -2
View File
@@ -211,14 +211,14 @@
},
/area/shuttle/arrival)
"u" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/arrival)
"v" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
+2 -2
View File
@@ -124,14 +124,14 @@
/turf/open/floor/plating,
/area/shuttle/arrival)
"q" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/arrival)
"r" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
+1 -1
View File
@@ -85,7 +85,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"o" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
+4 -4
View File
@@ -4,7 +4,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/assault_pod)
"c" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
@@ -45,20 +45,20 @@
/turf/open/floor/plating,
/area/shuttle/assault_pod)
"D" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"H" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"L" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light,
+2 -1
View File
@@ -78,7 +78,8 @@
/area/shuttle/auxillary_base)
"X" = (
/obj/machinery/camera{
dir = 1
dir = 1;
network = list("auxbase")
},
/obj/structure/mining_shuttle_beacon,
/turf/open/floor/plating,
+1 -1
View File
@@ -146,4 +146,4 @@ g
g
g
n
"}
"}
+10 -10
View File
@@ -73,7 +73,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -82,7 +82,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"ax" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -94,7 +94,7 @@
/turf/closed/wall/mineral/titanium/interior,
/area/shuttle/escape)
"aE" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/item/radio/intercom{
@@ -131,7 +131,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aK" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aL" = (
@@ -210,19 +210,19 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aY" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aZ" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ba" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -345,7 +345,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bw" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/item/radio/intercom{
@@ -355,7 +355,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bx" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/extinguisher_cabinet{
@@ -427,7 +427,7 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"bK" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
+2 -2
View File
@@ -138,7 +138,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aC" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aD" = (
@@ -214,7 +214,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aM" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig,
+11 -11
View File
@@ -53,11 +53,11 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"al" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"am" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -87,7 +87,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ar" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -157,7 +157,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aE" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/plasteel/dark,
@@ -174,7 +174,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aH" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/plasteel/dark,
@@ -215,14 +215,14 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aN" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aO" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
@@ -232,7 +232,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aP" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/structure/window/reinforced{
dir = 1;
pixel_y = 2
@@ -255,13 +255,13 @@
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
"aS" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aT" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light,
@@ -286,7 +286,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aW" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aX" = (
+11 -11
View File
@@ -18,7 +18,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"ag" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
@@ -44,7 +44,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"am" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -53,7 +53,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ao" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -71,7 +71,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"ar" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/extinguisher_cabinet{
@@ -113,7 +113,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aA" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aB" = (
@@ -179,17 +179,17 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aJ" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aK" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aL" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium,
@@ -224,7 +224,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aS" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/window/reinforced{
@@ -233,7 +233,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aT" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/structure/window/reinforced{
@@ -242,7 +242,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aU" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium,
+14 -14
View File
@@ -251,11 +251,11 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aS" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aT" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -283,7 +283,7 @@
},
/area/shuttle/escape)
"aW" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -294,7 +294,7 @@
},
/area/shuttle/escape)
"aX" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig{
icon_state = "darkred";
dir = 1;
@@ -302,7 +302,7 @@
},
/area/shuttle/escape)
"aY" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig{
icon_state = "darkred";
dir = 5;
@@ -330,7 +330,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bd" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -339,7 +339,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bf" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/machinery/flasher{
@@ -381,7 +381,7 @@
/turf/open/floor/mech_bay_recharge_floor,
/area/shuttle/escape)
"bk" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -412,7 +412,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bp" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/flasher{
@@ -479,7 +479,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bw" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig{
@@ -489,7 +489,7 @@
},
/area/shuttle/escape)
"bx" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig{
@@ -509,7 +509,7 @@
},
/area/shuttle/escape)
"bz" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig{
@@ -658,7 +658,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bW" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/window/reinforced{
@@ -667,7 +667,7 @@
/turf/open/floor/plasteel/neutral,
/area/shuttle/escape)
"bX" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/structure/window/reinforced{
+6 -6
View File
@@ -18,7 +18,7 @@
/turf/open/floor/noslip,
/area/shuttle/escape)
"af" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/bluespace,
@@ -43,7 +43,7 @@
/turf/open/floor/noslip,
/area/shuttle/escape)
"aj" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/bluespace,
@@ -53,7 +53,7 @@
/turf/open/floor/bluespace,
/area/shuttle/escape)
"al" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/bluespace,
@@ -71,7 +71,7 @@
/turf/open/floor/noslip,
/area/shuttle/escape)
"ao" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/extinguisher_cabinet{
@@ -154,11 +154,11 @@
/turf/open/floor/noslip,
/area/shuttle/escape)
"aC" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/noslip,
/area/shuttle/escape)
"aD" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/noslip,
+3 -3
View File
@@ -17,7 +17,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"e" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/dark,
@@ -74,7 +74,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"n" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/plating,
@@ -109,7 +109,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"s" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/structure/extinguisher_cabinet{
+12 -12
View File
@@ -240,14 +240,14 @@
/turf/open/floor/plasteel/cmo,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/escape)
"aw" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
@@ -326,7 +326,7 @@
},
/area/shuttle/escape)
"aH" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/item/radio/intercom{
@@ -672,7 +672,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bx" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"by" = (
@@ -709,12 +709,12 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bC" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bD" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/machinery/status_display{
pixel_y = 32
},
@@ -722,7 +722,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bE" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -771,7 +771,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bM" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/status_display{
@@ -780,7 +780,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bN" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -823,7 +823,7 @@
},
/area/shuttle/escape)
"bU" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -1059,7 +1059,7 @@
},
/area/shuttle/escape)
"cB" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
@@ -1077,7 +1077,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"cG" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light,
+4 -4
View File
@@ -74,7 +74,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"s" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -154,7 +154,7 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"H" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -201,7 +201,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"S" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/light{
@@ -210,7 +210,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"T" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/light/small{
+11 -11
View File
@@ -65,7 +65,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ar" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"as" = (
@@ -74,7 +74,7 @@
name = "Station Intercom (General)";
pixel_y = 27
},
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -220,7 +220,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aE" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
@@ -314,7 +314,7 @@
name = "Station Intercom (General)";
pixel_y = -31
},
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light,
@@ -362,7 +362,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bd" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/plasteel/floorgrime,
@@ -377,13 +377,13 @@
/turf/open/floor/plasteel/floorgrime,
/area/shuttle/escape)
"bh" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bi" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bj" = (
@@ -436,7 +436,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bs" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -713,7 +713,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bV" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -816,7 +816,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ca" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light,
@@ -835,7 +835,7 @@
/turf/open/floor/plasteel/floorgrime,
/area/shuttle/escape)
"cd" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/machinery/light{
+12 -12
View File
@@ -40,7 +40,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"h" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -49,7 +49,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"j" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -68,7 +68,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"m" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/machinery/light/small{
@@ -116,25 +116,25 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"v" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"w" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"x" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"y" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/machinery/light{
@@ -149,7 +149,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"A" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/light{
@@ -171,7 +171,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"C" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"D" = (
@@ -218,7 +218,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"K" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -231,7 +231,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"M" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -261,7 +261,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"R" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"S" = (
+4 -4
View File
@@ -15,7 +15,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"e" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/cult,
@@ -40,7 +40,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"i" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/plasteel/cult,
@@ -49,7 +49,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"k" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/plasteel/cult,
@@ -67,7 +67,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"n" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/extinguisher_cabinet{
+9 -9
View File
@@ -12,7 +12,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ad" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/newscaster/security_unit{
@@ -24,11 +24,11 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"ae" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"af" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/item/radio/intercom{
@@ -67,7 +67,7 @@
},
/area/shuttle/escape)
"ak" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/status_display{
@@ -240,7 +240,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"aD" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/status_display{
@@ -253,7 +253,7 @@
/turf/open/floor/plasteel/neutral,
/area/shuttle/escape)
"aF" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
@@ -356,14 +356,14 @@
/turf/open/floor/grass,
/area/shuttle/escape)
"aJ" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/escape)
"aK" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
@@ -384,7 +384,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"aN" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/turf_decal/bot,
+15 -15
View File
@@ -222,7 +222,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aJ" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/plasteel/darkpurple/side{
dir = 9
},
@@ -235,7 +235,7 @@
/turf/open/floor/plasteel/darkgreen/side,
/area/shuttle/escape)
"aL" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/plasteel/darkpurple/side{
dir = 5
},
@@ -253,7 +253,7 @@
},
/area/shuttle/escape)
"aO" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
@@ -262,14 +262,14 @@
},
/area/shuttle/escape)
"aP" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
/turf/open/floor/plasteel/darkpurple/side,
/area/shuttle/escape)
"aQ" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
@@ -283,7 +283,7 @@
},
/area/shuttle/escape)
"aS" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/darkpurple/side{
@@ -291,7 +291,7 @@
},
/area/shuttle/escape)
"aT" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -300,7 +300,7 @@
},
/area/shuttle/escape)
"aU" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/darkpurple/side{
@@ -328,7 +328,7 @@
/turf/open/floor/plasteel/cmo,
/area/shuttle/escape)
"aY" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light,
@@ -370,7 +370,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/shuttle/escape)
"be" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/plasteel/cmo,
/area/shuttle/escape)
"bf" = (
@@ -424,7 +424,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bo" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/structure/window/reinforced{
dir = 1;
pixel_y = 2
@@ -432,7 +432,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bq" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plating,
@@ -466,13 +466,13 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bw" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bx" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -518,7 +518,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bG" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light,
+10 -10
View File
@@ -420,7 +420,7 @@
},
/area/shuttle/escape)
"bd" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig{
@@ -572,7 +572,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"bx" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig{
@@ -660,7 +660,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bK" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/plasteel/darkgreen/side{
dir = 8
},
@@ -679,7 +679,7 @@
},
/area/shuttle/escape)
"bN" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/plasteel/darkgreen/side,
@@ -815,7 +815,7 @@
},
/area/shuttle/escape)
"bX" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/window/reinforced{
@@ -824,7 +824,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"bY" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/structure/window/reinforced{
@@ -833,27 +833,27 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"bZ" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"ca" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/structure/window/reinforced{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"cb" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/plasteel/darkgreen/side{
dir = 1
},
/area/shuttle/escape)
"cc" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/darkgreen/side,
+14 -14
View File
@@ -18,7 +18,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"af" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
@@ -43,7 +43,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aj" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -76,7 +76,7 @@
pixel_x = 6;
pixel_y = -24
},
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -91,7 +91,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aq" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ar" = (
@@ -102,7 +102,7 @@
pixel_y = -6;
req_access_txt = "19"
},
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/machinery/button/door{
id = "bearsbearsbears";
name = "release bears";
@@ -131,7 +131,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aw" = (
@@ -204,7 +204,7 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"aJ" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
@@ -238,7 +238,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"aP" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -315,7 +315,7 @@
/turf/open/floor/engine,
/area/shuttle/escape)
"bc" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/window/reinforced{
@@ -327,7 +327,7 @@
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
@@ -341,7 +341,7 @@
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
@@ -350,13 +350,13 @@
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"bh" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
@@ -551,7 +551,7 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"bO" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/light/small{
+8 -8
View File
@@ -109,7 +109,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"at" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"au" = (
@@ -178,7 +178,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aE" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -188,7 +188,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aG" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aH" = (
@@ -222,7 +222,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"aL" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
@@ -231,7 +231,7 @@
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -266,7 +266,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aT" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/extinguisher_cabinet{
@@ -395,14 +395,14 @@
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"bo" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bp" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light{
+5 -5
View File
@@ -21,14 +21,14 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"ah" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"ai" = (
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"aj" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/yellow,
@@ -73,7 +73,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ar" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/yellow,
@@ -94,7 +94,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/yellow,
@@ -237,7 +237,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"bb" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+9 -9
View File
@@ -38,7 +38,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"ak" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -47,7 +47,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"am" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -92,7 +92,7 @@
pixel_x = -24;
pixel_y = -6
},
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -102,11 +102,11 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aw" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium,
@@ -182,13 +182,13 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aI" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aJ" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/window/reinforced{
@@ -352,7 +352,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"bm" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/light/small{
@@ -365,7 +365,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"bo" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/light/small{
+2 -2
View File
@@ -3,7 +3,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/pod_1)
"G" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/status_display{
@@ -32,7 +32,7 @@
/turf/open/floor/plating,
/area/shuttle/pod_1)
"U" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/item/radio/intercom{
+6 -6
View File
@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"h" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/item/storage/pod{
@@ -17,7 +17,7 @@
/turf/open/floor/plating,
/area/shuttle/pod_1)
"A" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/item/radio/intercom{
@@ -36,13 +36,13 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"H" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"J" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/status_display{
@@ -51,13 +51,13 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"L" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"M" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/machinery/status_display{
+3 -3
View File
@@ -24,7 +24,7 @@
/turf/closed/wall/mineral/titanium/interior,
/area/shuttle/transport)
"h" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -36,7 +36,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"j" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"k" = (
@@ -64,7 +64,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"q" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
+2 -2
View File
@@ -27,7 +27,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/transport)
"g" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/pod/dark,
/area/shuttle/transport)
"h" = (
@@ -87,7 +87,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/transport)
"p" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/pod/dark,
+3 -3
View File
@@ -68,7 +68,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"ar" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/wood,
/area/shuttle/transport)
"as" = (
@@ -137,7 +137,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"aJ" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"aK" = (
@@ -204,7 +204,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"aW" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
+3 -3
View File
@@ -15,7 +15,7 @@
/turf/closed/wall/mineral/titanium/interior,
/area/shuttle/transport)
"f" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/plasteel/freezer,
@@ -90,7 +90,7 @@
/area/shuttle/transport)
"n" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/plasteel/freezer,
/area/shuttle/transport)
"o" = (
@@ -131,7 +131,7 @@
/turf/open/floor/plasteel/freezer,
/area/shuttle/transport)
"w" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/freezer,
+6 -6
View File
@@ -176,7 +176,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/syndicate/hallway)
"aC" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4;
name = "tactical chair"
},
@@ -188,7 +188,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/hallway)
"aE" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8;
name = "tactical chair"
},
@@ -206,7 +206,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/syndicate/eva)
"aH" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4;
name = "tactical chair"
},
@@ -218,7 +218,7 @@
},
/area/shuttle/syndicate/hallway)
"aI" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8;
name = "tactical chair"
},
@@ -256,7 +256,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/eva)
"aO" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4;
name = "tactical chair"
},
@@ -318,7 +318,7 @@
},
/area/shuttle/syndicate/hallway)
"aX" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4;
name = "tactical chair"
},
+1 -1
View File
@@ -86,7 +86,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/labor)
"o" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/machinery/flasher{
+2 -2
View File
@@ -120,7 +120,7 @@
/turf/open/floor/plasteel,
/area/shuttle/labor)
"q" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
@@ -133,7 +133,7 @@
/turf/open/floor/plasteel,
/area/shuttle/labor)
"s" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/machinery/flasher{
+1 -1
View File
@@ -18,7 +18,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"f" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
+4 -4
View File
@@ -47,7 +47,7 @@
/turf/open/floor/plasteel,
/area/shuttle/mining)
"g" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/neutral,
@@ -116,7 +116,7 @@
/turf/open/floor/plasteel/white,
/area/shuttle/mining)
"n" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
@@ -126,7 +126,7 @@
/turf/open/floor/plasteel,
/area/shuttle/mining)
"o" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
@@ -139,7 +139,7 @@
/turf/open/floor/plasteel,
/area/shuttle/mining)
"p" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
+4 -4
View File
@@ -39,7 +39,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/pirate)
"ag" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/dark,
@@ -71,7 +71,7 @@
pixel_y = -24;
req_access = null
},
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
@@ -82,7 +82,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/pirate)
"an" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
@@ -413,7 +413,7 @@
pixel_y = -24;
req_access = null
},
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
+1 -1
View File
@@ -156,7 +156,7 @@
},
/area/shuttle/caravan/freighter1)
"gw" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
+6 -6
View File
@@ -88,7 +88,7 @@
/turf/open/floor/plating,
/area/shuttle/caravan/syndicate3)
"hF" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/machinery/light/small{
dir = 8
},
@@ -104,7 +104,7 @@
/turf/open/floor/pod/dark,
/area/shuttle/caravan/syndicate3)
"ka" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light/small{
@@ -169,7 +169,7 @@
/turf/open/floor/plating,
/area/shuttle/caravan/syndicate3)
"rV" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
@@ -185,7 +185,7 @@
},
/area/shuttle/caravan/syndicate3)
"sn" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
/area/shuttle/caravan/syndicate3)
@@ -247,7 +247,7 @@
/turf/open/floor/plasteel/darkred/side,
/area/shuttle/caravan/syndicate3)
"Cm" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/firealarm{
@@ -278,7 +278,7 @@
},
/area/shuttle/caravan/syndicate3)
"EO" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/machinery/airalarm/syndicate{
pixel_y = 24
},
+1 -1
View File
@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aA" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/turretid{
+90
View File
@@ -0,0 +1,90 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/machinery/door/airlock/public/glass{
name = "Elevator Access"
},
/obj/docking_port/mobile/elevator{
dir = 4;
height = 6;
id = "snowdin_excavation";
name = "excavation elevator";
timid = 1;
width = 6
},
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator1)
"b" = (
/obj/structure/window/reinforced/fulltile/ice,
/obj/structure/grille,
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator1)
"c" = (
/obj/machinery/door/airlock/public/glass{
name = "Elevator Access"
},
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator1)
"d" = (
/turf/closed/wall/ice,
/area/shuttle/snowdin/elevator1)
"e" = (
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator1)
"f" = (
/obj/machinery/computer/shuttle/snowdin/mining{
dir = 2;
name = "Excavation Elevator Console";
possible_destinations = "snowdin_excavation_top;snowdin_excavation_down";
shuttleId = "snowdin_excavation"
},
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator1)
(1,1,1) = {"
d
b
c
a
b
d
"}
(2,1,1) = {"
b
e
e
e
e
b
"}
(3,1,1) = {"
c
e
e
e
e
c
"}
(4,1,1) = {"
c
e
e
e
e
c
"}
(5,1,1) = {"
b
f
e
e
e
b
"}
(6,1,1) = {"
d
b
c
c
b
d
"}
+86
View File
@@ -0,0 +1,86 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/machinery/door/airlock/public/glass{
name = "Elevator Access"
},
/obj/docking_port/mobile/elevator{
dir = 4;
dwidth = 2;
height = 5;
id = "snowdin_mining";
name = "mining elevator";
timid = 1;
width = 5
},
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator2)
"b" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator2)
"c" = (
/obj/machinery/door/airlock/public/glass{
name = "Elevator Access"
},
/turf/open/floor/plating,
/area/shuttle/snowdin/elevator2)
"d" = (
/turf/closed/wall,
/area/shuttle/snowdin/elevator2)
"e" = (
/obj/machinery/computer/shuttle/snowdin/mining,
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator2)
"f" = (
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator2)
"g" = (
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator2)
"i" = (
/obj/machinery/light/small,
/turf/open/floor/engine,
/area/shuttle/snowdin/elevator2)
"j" = (
/turf/closed/wall/rust,
/area/shuttle/snowdin/elevator2)
(1,1,1) = {"
j
b
a
b
d
"}
(2,1,1) = {"
b
e
f
i
b
"}
(3,1,1) = {"
c
f
f
f
c
"}
(4,1,1) = {"
b
g
f
f
b
"}
(5,1,1) = {"
d
b
c
b
j
"}
+3 -3
View File
@@ -137,7 +137,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aJ" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
@@ -179,7 +179,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aS" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/decal/remains/human,
@@ -232,7 +232,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bd" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bf" = (
+4 -4
View File
@@ -753,7 +753,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bo" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
name = "dust"
@@ -827,7 +827,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/abandoned)
"bu" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/decal/cleanable/dirt{
@@ -871,7 +871,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"by" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/decal/cleanable/dirt{
@@ -1022,7 +1022,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bL" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/obj/effect/decal/cleanable/dirt{
+4 -4
View File
@@ -42,7 +42,7 @@
/turf/open/floor/plating/abductor,
/area/shuttle/abandoned)
"i" = (
/obj/structure/chair/comfy/shuttle,
/obj/structure/chair/shuttle,
/turf/open/floor/plating/abductor,
/area/shuttle/abandoned)
"j" = (
@@ -65,7 +65,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"l" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/plating/abductor,
@@ -75,7 +75,7 @@
/turf/open/floor/plating/abductor,
/area/shuttle/abandoned)
"n" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/plating/abductor,
@@ -110,7 +110,7 @@
/turf/open/floor/plating/abductor,
/area/shuttle/abandoned)
"q" = (
/obj/structure/chair/comfy/shuttle{
/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plating/abductor,
+1
View File
@@ -96,6 +96,7 @@
#define ORGAN_SLOT_RIGHT_ARM_AUG "r_arm_device"
#define ORGAN_SLOT_LEFT_ARM_AUG "l_arm_device"
#define ORGAN_SLOT_STOMACH "stomach"
#define ORGAN_SLOT_STOMACH_AID "stomach_aid"
#define ORGAN_SLOT_BREATHING_TUBE "breathing_tube"
#define ORGAN_SLOT_EARS "ears"
#define ORGAN_SLOT_EYES "eye_sight"
+23 -23
View File
@@ -1,22 +1,22 @@
#define ACCESS_SECURITY 1 // Security equipment
#define ACCESS_BRIG 2 // Brig timers and permabrig
#define ACCESS_ARMORY 3
#define ACCESS_FORENSICS_LOCKERS 4
#define ACCESS_SECURITY 1 // Security equipment, security records, gulag item storage, secbots
#define ACCESS_BRIG 2 // Brig cells+timers, permabrig, gulag+gulag shuttle, prisoner management console
#define ACCESS_ARMORY 3 // Armory, gulag teleporter, execution chamber
#define ACCESS_FORENSICS_LOCKERS 4 //Detective's office, forensics lockers, security+medical records
#define ACCESS_MEDICAL 5
#define ACCESS_MORGUE 6
#define ACCESS_TOX 7
#define ACCESS_TOX_STORAGE 8
#define ACCESS_GENETICS 9
#define ACCESS_ENGINE 10
#define ACCESS_ENGINE_EQUIP 11
#define ACCESS_TOX 7 //R&D department, R&D console, burn chamber on some maps
#define ACCESS_TOX_STORAGE 8 //Toxins storage, burn chamber on some maps
#define ACCESS_GENETICS 9
#define ACCESS_ENGINE 10 //Engineering area, power monitor, power flow control console
#define ACCESS_ENGINE_EQUIP 11 //APCs, EngiVend/YouTool, engineering equipment lockers
#define ACCESS_MAINT_TUNNELS 12
#define ACCESS_EXTERNAL_AIRLOCKS 13
#define ACCESS_EMERGENCY_STORAGE 14
#define ACCESS_EMERGENCY_STORAGE 14 //Not in use
#define ACCESS_CHANGE_IDS 15
#define ACCESS_AI_UPLOAD 16
#define ACCESS_TELEPORTER 17
#define ACCESS_EVA 18
#define ACCESS_HEADS 19
#define ACCESS_HEADS 19 //Bridge, EVA storage windoors, gateway shutters, AI integrity restorer, clone record deletion, comms console
#define ACCESS_CAPTAIN 20
#define ACCESS_ALL_PERSONAL_LOCKERS 21
#define ACCESS_CHAPEL_OFFICE 22
@@ -31,9 +31,9 @@
#define ACCESS_CARGO 31
#define ACCESS_CONSTRUCTION 32
#define ACCESS_CHEMISTRY 33
#define ACCESS_CARGO_BOT 34
#define ACCESS_CARGO_BOT 34 //Not in use
#define ACCESS_HYDROPONICS 35
#define ACCESS_MANUFACTURING 36
#define ACCESS_MANUFACTURING 36 //Only used on research.dmm away mission
#define ACCESS_LIBRARY 37
#define ACCESS_LAWYER 38
#define ACCESS_VIROLOGY 39
@@ -44,10 +44,10 @@
#define ACCESS_THEATRE 46
#define ACCESS_RESEARCH 47
#define ACCESS_MINING 48
#define ACCESS_MINING_OFFICE 49 //not in use
#define ACCESS_MINING_OFFICE 49 //Not in use
#define ACCESS_MAILSORTING 50
#define ACCESS_MINT 51
#define ACCESS_MINT_VAULT 52
#define ACCESS_MINT 51 //Not in use
#define ACCESS_MINT_VAULT 52 //Not in use
#define ACCESS_VAULT 53
#define ACCESS_MINING_STATION 54
#define ACCESS_XENOBIOLOGY 55
@@ -58,19 +58,19 @@
#define ACCESS_KEYCARD_AUTH 60 //Used for events which require at least two people to confirm them
#define ACCESS_TCOMSAT 61 // has access to the entire telecomms satellite / machinery
#define ACCESS_GATEWAY 62
#define ACCESS_SEC_DOORS 63 // Security front doors
#define ACCESS_MINERAL_STOREROOM 64
#define ACCESS_SEC_DOORS 63 // Outer brig doors, department security posts
#define ACCESS_MINERAL_STOREROOM 64 //For releasing minerals from the ORM
#define ACCESS_MINISAT 65
#define ACCESS_WEAPONS 66 //Weapon authorization for secbots
#define ACCESS_NETWORK 67
#define ACCESS_CLONING 68 //Cloning room
#define ACCESS_NETWORK 67 //NTnet diagnostics/monitoring software
#define ACCESS_CLONING 68 //Cloning room and clone pod ejection
//BEGIN CENTCOM ACCESS
/*Should leave plenty of room if we need to add more access levels.
Mostly for admin fun times.*/
#define ACCESS_CENT_GENERAL 101//General facilities.
#define ACCESS_CENT_GENERAL 101//General facilities. CentCom ferry.
#define ACCESS_CENT_THUNDER 102//Thunderdome.
#define ACCESS_CENT_SPECOPS 103//Special Ops.
#define ACCESS_CENT_SPECOPS 103//Special Ops. Captain's display case, Marauder and Seraph mechs.
#define ACCESS_CENT_MEDICAL 104//Medical/Research
#define ACCESS_CENT_LIVING 105//Living quarters.
#define ACCESS_CENT_STORAGE 106//Generic storage areas.
@@ -79,7 +79,7 @@
#define ACCESS_CENT_BAR 110 // The non-existent CentCom Bar
//The Syndicate
#define ACCESS_SYNDICATE 150//General Syndicate Access
#define ACCESS_SYNDICATE 150//General Syndicate Access. Includes Syndicate mechs and ruins.
#define ACCESS_SYNDICATE_LEADER 151//Nuke Op Leader Access
//Away Missions or Ruins
+33 -9
View File
@@ -1,6 +1,7 @@
#define SEND_SIGNAL(target, sigtype, arguments...) ( !target.datum_components ? NONE : target._SendSignal(sigtype, list(##arguments)) )
#define SEND_SIGNAL(target, sigtype, arguments...) ( !target.comp_lookup || !target.comp_lookup[sigtype] ? NONE : target._SendSignal(sigtype, list(##arguments)) )
#define SEND_GLOBAL_SIGNAL(sigtype, arguments...) ( SEND_SIGNAL(SSdcs, sigtype, ##arguments) )
#define SEND_GLOBAL_SIGNAL(sigtype, arguments...) ( !SSdcs.comp_lookup[sigtype] ? NONE : SSdcs._SendGlobalSignal(sigtype, list(##arguments)) )
//shorthand
#define GET_COMPONENT_FROM(varname, path, target) var##path/##varname = ##target.GetComponent(##path)
#define GET_COMPONENT(varname, path) GET_COMPONENT_FROM(varname, path, src)
@@ -19,7 +20,7 @@
// global signals
// These are signals which can be listened to by any component on any parent
// GLOBAL SIGNALS MUST START WITH "!"
// start global signals with "!", this used to be necessary but now it's just a formatting choice
#define COMSIG_GLOB_NEW_Z "!new_z" //from base of datum/controller/subsystem/mapping/proc/add_new_zlevel(): (list/args)
#define COMSIG_GLOB_VAR_EDIT "!var_edit" //called after a successful var edit somewhere in the world: (list/args)
@@ -43,6 +44,8 @@
//End positions
#define COMPONENT_EXNAME_CHANGED 1
#define COMSIG_ATOM_ENTERED "atom_entered" //from base of atom/Entered(): (atom/movable/entering, /atom)
#define COMSIG_ATOM_EXIT "atom_exit" //from base of atom/Exit(): (/atom/movable/exiting, /atom/newloc)
#define COMPONENT_ATOM_BLOCK_EXIT 1
#define COMSIG_ATOM_EXITED "atom_exited" //from base of atom/Exited(): (atom/movable/exiting, atom/newloc)
#define COMSIG_ATOM_EX_ACT "atom_ex_act" //from base of atom/ex_act(): (severity, target)
#define COMSIG_ATOM_EMP_ACT "atom_emp_act" //from base of atom/emp_act(): (severity)
@@ -89,6 +92,8 @@
// /atom/movable signals
#define COMSIG_MOVABLE_MOVED "movable_moved" //from base of atom/movable/Moved(): (/atom, dir)
#define COMSIG_MOVABLE_CROSSED "movable_crossed" //from base of atom/movable/Crossed(): (/atom/movable)
#define COMSIG_MOVABLE_UNCROSS "movable_uncross" //from base of atom/movable/Uncross(): (/atom/movable)
#define COMPONENT_MOVABLE_BLOCK_UNCROSS 1
#define COMSIG_MOVABLE_UNCROSSED "movable_uncrossed" //from base of atom/movable/Uncrossed(): (/atom/movable)
#define COMSIG_MOVABLE_COLLIDE "movable_collide" //from base of atom/movable/Collide(): (/atom)
#define COMSIG_MOVABLE_IMPACT "movable_impact" //from base of atom/movable/throw_impact(): (/atom/hit_atom, /datum/thrownthing/throwingdatum)
@@ -98,8 +103,6 @@
#define COMSIG_MOVABLE_THROW "movable_throw" //from base of atom/movable/throw_at(): (datum/thrownthing, spin)
#define COMSIG_MOVABLE_Z_CHANGED "movable_ztransit" //from base of atom/movable/onTransitZ(): (old_z, new_z)
<<<<<<< HEAD
=======
// /mob Signals
#define COMSIG_MOB_RECEIVE_MAGIC "mob_receive_magic" //from base of mob/anti_magic_check(): (magic, holy, protection_sources)
#define COMPONENT_BLOCK_MAGIC 1
@@ -109,7 +112,6 @@
#define COMSIG_LIVING_IGNITED "living_ignite" //from base of mob/living/IgniteMob() (/mob/living)
#define COMSIG_LIVING_EXTINGUISHED "living_extinguished" //from base of mob/living/ExtinguishMob() (/mob/living)
>>>>>>> 3167e2b... Rewrites the antimagic component to properly use signals (#38649)
// /mob/living/carbon signals
#define COMSIG_CARBON_SOUNDBANG "carbon_soundbang" //from base of mob/living/carbon/soundbang_act(): (list(intensity))
@@ -119,12 +121,13 @@
// /obj/item signals
#define COMSIG_ITEM_ATTACK "item_attack" //from base of obj/item/attack(): (/mob/living/target, /mob/living/user)
#define COMSIG_ITEM_ATTACK_SELF "item_attack_self" //from base of obj/item/attack_self(): (/mob)
#define COMPONENT_NO_INTERACT 1
#define COMSIG_ITEM_ATTACK_OBJ "item_attack_obj" //from base of obj/item/attack_obj(): (/obj, /mob)
#define COMPONENT_NO_ATTACK_OBJ 1
#define COMSIG_ITEM_PRE_ATTACK "item_pre_attack" //from base of obj/item/pre_attack(): (atom/target, mob/user, params)
#define COMPONENT_NO_ATTACK 1
#define COMSIG_ITEM_EQUIPPED "item_equip" //from base of obj/item/equipped(): (/mob/equipper, slot)
#define COMSIG_ITEM_DROPPED "item_drop"
#define COMSIG_ITEM_DROPPED "item_drop" //from base of obj/item/dropped(): (mob/user)
#define COMSIG_ITEM_PICKUP "item_pickup" //from base of obj/item/pickup(): (/mob/taker)
#define COMSIG_ITEM_ATTACK_ZONE "item_attack_zone" //from base of mob/living/carbon/attacked_by(): (mob/living/carbon/target, mob/living/user, hit_zone)
#define COMSIG_ITEM_IMBUE_SOUL "item_imbue_soul" //return a truthy value to prevent ensouling, checked in /obj/effect/proc_holder/spell/targeted/lichdom/cast(): (mob/user)
@@ -132,6 +135,27 @@
// /obj/item/clothing signals
#define COMSIG_SHOES_STEP_ACTION "shoes_step_action" //from base of obj/item/clothing/shoes/proc/step_action(): ()
// /obj/item/implant signals
#define COMSIG_IMPLANT_ACTIVATED "implant_activated" //from base of /obj/item/implant/proc/activate(): ()
#define COMSIG_IMPLANT_IMPLANTING "implant_implanting" //from base of /obj/item/implant/proc/implant(): (list/args)
#define COMPONENT_STOP_IMPLANTING 1
#define COMSIG_IMPLANT_OTHER "implant_other" //called on already installed implants when a new one is being added in /obj/item/implant/proc/implant(): (list/args, obj/item/implant/new_implant)
//#define COMPONENT_STOP_IMPLANTING 1 //The name makes sense for both
#define COMPONENT_DELETE_NEW_IMPLANT 2
#define COMPONENT_DELETE_OLD_IMPLANT 4
#define COMSIG_IMPLANT_EXISTING_UPLINK "implant_uplink_exists" //called on implants being implanted into someone with an uplink implant: (datum/component/uplink)
//This uses all return values of COMSIG_IMPLANT_OTHER
// /obj/item/pda signals
#define COMSIG_PDA_CHANGE_RINGTONE "pda_change_ringtone" //called on pda when the user changes the ringtone: (mob/living/user, new_ringtone)
#define COMPONENT_STOP_RINGTONE_CHANGE 1
// /obj/item/radio signals
#define COMSIG_RADIO_NEW_FREQUENCY "radio_new_frequency" //called from base of /obj/item/radio/proc/set_frequency(): (list/args)
// /obj/item/pen signals
#define COMSIG_PEN_ROTATED "pen_rotated" //called after rotation in /obj/item/pen/attack_self(): (rotation, mob/living/carbon/user)
// /mob/living/carbon/human signals
#define COMSIG_HUMAN_MELEE_UNARMED_ATTACK "human_melee_unarmed_attack" //from mob/living/carbon/human/UnarmedAttack(): (atom/target)
#define COMSIG_HUMAN_MELEE_UNARMED_ATTACKBY "human_melee_unarmed_attackby" //from mob/living/carbon/human/UnarmedAttack(): (mob/living/carbon/human/attacker)
@@ -151,7 +175,7 @@
#define COMSIG_CLEAR_MOOD_EVENT "clear_mood" //Called when you clear a mood event from anywhere in the code.
//NTnet
#define COMSIG_COMPONENT_NTNET_RECIEVE "ntnet_recieve" //called on an object by its NTNET connection component on recieve. (sending_id(number), sending_netname(text), data(datum/netdata))
#define COMSIG_COMPONENT_NTNET_RECEIVE "ntnet_receive" //called on an object by its NTNET connection component on receive. (sending_id(number), sending_netname(text), data(datum/netdata))
// /datum/component/storage signals
#define COMSIG_CONTAINS_STORAGE "is_storage" //() - returns bool.
@@ -179,4 +203,4 @@
//Ouch my toes!
#define CALTROP_BYPASS_SHOES 1
#define CALTROP_IGNORE_WALKERS 2
#define CALTROP_IGNORE_WALKERS 2
+1 -7
View File
@@ -13,16 +13,12 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
//FLAGS BITMASK
#define NODROP_1 (1<<1) // This flag makes it so that an item literally cannot be removed at all, or at least that's how it should be. Only deleted.
#define NOBLUDGEON_1 (1<<2) // when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
#define HEAR_1 (1<<3) // This flag is what recursive_hear_check() uses to determine wether to add an item to the hearer list or not.
#define CHECK_RICOCHET_1 (1<<4) // Projectiels will check ricochet on things impacted that have this.
#define CONDUCT_1 (1<<5) // conducts electricity (metal etc.)
#define ABSTRACT_1 (1<<6) // for all things that are technically items but used for various different stuff, made it 128 because it could conflict with other flags other way
#define NODECONSTRUCT_1 (1<<7) // For machines and structures that should not break into parts, eg, holodeck stuff
#define OVERLAY_QUEUED_1 (1<<8) // atom queued to SSoverlay
#define ON_BORDER_1 (1<<9) // item has priority to check when entering or leaving
#define DROPDEL_1 (1<<10) // When dropped, it calls qdel on itself
#define PREVENT_CLICK_UNDER_1 (1<<11) //Prevent clicking things below it on the same turf eg. doors/ fulltile windows
#define HOLOGRAM_1 (1<<12)
#define TESLA_IGNORE_1 (1<<13) // TESLA_IGNORE grants immunity from being targeted by tesla-style electricity
@@ -33,9 +29,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
#define NOJAUNT_1 (1<<0)
#define UNUSED_RESERVATION_TURF_1 (1<<1)
#define CAN_BE_DIRTY_1 (1<<2) // If a turf can be made dirty at roundstart. This is also used in areas.
#define NO_DEATHRATTLE_1 (1<<4) // Do not notify deadchat about any deaths that occur on this turf.
#define NO_RUINS_1 (1<<5) //Blocks ruins spawning on the turf
#define NO_LAVA_GEN_1 (1<<6) //Blocks lava rivers being generated on the turf
#define NO_RUINS_1 (1<<10) //Blocks ruins spawning on the turf
/*
These defines are used specifically with the atom/pass_flags bitmask
@@ -81,4 +76,3 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
#define EMP_PROTECT_SELF (1<<0)
#define EMP_PROTECT_CONTENTS (1<<1)
#define EMP_PROTECT_WIRES (1<<2)
+1
View File
@@ -14,6 +14,7 @@
#define INVESTIGATE_HALLUCINATIONS "hallucinations"
#define INVESTIGATE_RADIATION "radiation"
#define INVESTIGATE_EXONET "exonet"
#define INVESTIGATE_CIRCUIT "circuit"
//Individual logging defines
#define INDIVIDUAL_ATTACK_LOG "Attack log"
+3
View File
@@ -41,6 +41,9 @@ require only minor tweaks.
// number - bombcap is multiplied by this before being applied to bombs
#define ZTRAIT_BOMBCAP_MULTIPLIER "Bombcap Multiplier"
// number - default gravity if there's no gravity generators or area overrides present
#define ZTRAIT_GRAVITY "Gravity"
// numeric offsets - e.g. {"Down": -1} means that chasms will fall to z - 1 rather than oblivion
#define ZTRAIT_UP "Up"
#define ZTRAIT_DOWN "Down"
+7
View File
@@ -86,6 +86,7 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
//Because I *KNOW* somebody will think layer+1 means "above"
//IT DOESN'T OK, IT MEANS "UNDER"
#define UNDER_SUIT_LAYER (SUIT_LAYER+1)
#define UNDER_HEAD_LAYER (HEAD_LAYER+1)
//AND -1 MEANS "ABOVE", OK?, OK!?!
#define ABOVE_SHOES_LAYER (SHOES_LAYER-1)
@@ -430,6 +431,7 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
#define ION_FILE "ion_laws.json"
#define PIRATE_NAMES_FILE "pirates.json"
//Fullscreen overlay resolution in tiles.
#define FULLSCREEN_OVERLAY_RESOLUTION_X 15
#define FULLSCREEN_OVERLAY_RESOLUTION_Y 15
@@ -448,5 +450,10 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
// Used by PDA and cartridge code to reduce repetitiveness of spritesheets
#define PDAIMG(what) {"<span class="pda16x16 [#what]"></span>"}
//Filters
#define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-2, size=4, border=4, color="#04080FAA")
#define STANDARD_GRAVITY 1 //Anything above this is high gravity, anything below no grav
#define GRAVITY_DAMAGE_TRESHOLD 3 //Starting with this value gravity will start to damage mobs
+4
View File
@@ -21,6 +21,10 @@
#define NEEDS_PERMIT (1<<3) //Used by security bots to determine if this item is safe for public use.
#define SLOWS_WHILE_IN_HAND (1<<4)
#define NO_MAT_REDEMPTION (1<<5) // Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
#define DROPDEL (1<<6) // When dropped, it calls qdel on itself
#define NOBLUDGEON (1<<7) // when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
#define NODROP (1<<8) // This flag makes it so that an item literally cannot be removed at all, or at least that's how it should be. Only deleted.
#define ABSTRACT (1<<9) // for all things that are technically items but used for various different stuff
// Flags for the clothing_flags var on /obj/item/clothing
+2
View File
@@ -68,3 +68,5 @@
//Flags in the players table in the db
#define DB_FLAG_EXEMPT 1
#define DEFAULT_CYBORG_NAME "Default Cyborg Name"
-1
View File
@@ -2,7 +2,6 @@
#define LIQUID 2
#define GAS 3
// container_type defines
#define INJECTABLE (1<<0) // Makes it possible to add reagents through droppers and syringes.
#define DRAWABLE (1<<1) // Makes it possible to remove reagents through syringes.
+3
View File
@@ -0,0 +1,3 @@
#define SPECIFIC_HEAT_DEFAULT 200
#define SPECIFIC_HEAT_PLASMA 500
+7
View File
@@ -0,0 +1,7 @@
// rust_g.dm - DM API for rust_g extension library
#define RUST_G "rust_g"
#define rustg_dmi_strip_metadata(fname) call(RUST_G, "dmi_strip_metadata")(fname)
#define rustg_log_write(fname, text) call(RUST_G, "log_write")(fname, text)
/proc/rustg_log_close_all() return call(RUST_G, "log_close_all")()
+2
View File
@@ -80,6 +80,8 @@
#define STATUS_EFFECT_SYPHONMARK /datum/status_effect/syphon_mark //tracks kills for the KA death syphon module
#define STATUS_EFFECT_INLOVE /datum/status_effect/in_love //Displays you as being in love with someone else, and makes hearts appear around them.
/////////////
// SLIME //
/////////////
+11 -13
View File
@@ -124,21 +124,19 @@
#define COMPILE_OVERLAYS(A)\
if (TRUE) {\
var/list/oo = A.our_overlays;\
var/list/ad = A.add_overlays;\
var/list/rm = A.remove_overlays;\
var/list/po = A.priority_overlays;\
if(LAZYLEN(rm)){\
A.overlays -= rm;\
rm.Cut();\
}\
if(LAZYLEN(ad)){\
A.overlays |= ad;\
ad.Cut();\
}\
if(LAZYLEN(po)){\
if(LAZYLEN(oo)){\
A.overlays = oo + po;\
}\
else{\
A.overlays = po;\
}\
}\
else if(LAZYLEN(oo)){\
A.overlays = oo;\
}\
else{\
A.overlays.Cut();\
A.overlays |= po;\
}\
A.flags_1 &= ~OVERLAY_QUEUED_1;\
}
+1 -1
View File
@@ -34,7 +34,7 @@
#define WIRE_POWER1 "Main Power 1"
#define WIRE_POWER2 "Main Power 2"
#define WIRE_PROCEED "Proceed"
#define WIRE_RX "Recieve"
#define WIRE_RX "Receive"
#define WIRE_RESET_MODULE "Reset Module"
#define WIRE_SAFETY "Safety"
#define WIRE_SHOCK "High Voltage Ground"
+6 -8
View File
@@ -1,13 +1,10 @@
//location of the rust-g library
#define RUST_G "rust_g"
//wrapper macros for easier grepping
#define DIRECT_OUTPUT(A, B) A << B
#define SEND_IMAGE(target, image) DIRECT_OUTPUT(target, image)
#define SEND_SOUND(target, sound) DIRECT_OUTPUT(target, sound)
#define SEND_TEXT(target, text) DIRECT_OUTPUT(target, text)
#define WRITE_FILE(file, text) DIRECT_OUTPUT(file, text)
#define WRITE_LOG(log, text) call(RUST_G, "log_write")(log, text)
#define WRITE_LOG(log, text) rustg_log_write(log, text)
//print a warning message to world.log
#define WARNING(MSG) warning("[MSG] in [__FILE__] at line [__LINE__] src: [src] usr: [usr].")
@@ -131,6 +128,10 @@
/proc/log_query_debug(text)
WRITE_LOG(GLOB.query_debug_log, "SQL: [text]")
/proc/log_job_debug(text)
if (CONFIG_GET(flag/log_job_debug))
WRITE_LOG(GLOB.world_job_debug_log, "JOB: [text]")
/* Log to both DD and the logfile. */
/proc/log_world(text)
WRITE_LOG(GLOB.world_runtime_log, text)
@@ -152,7 +153,7 @@
/* Close open log handles. This should be called as late as possible, and no logging should hapen after. */
/proc/shutdown_logging()
call(RUST_G, "log_close_all")()
rustg_log_close_all()
/* Helper procs for building detailed log lines */
@@ -172,6 +173,3 @@
return "[A.loc] [COORD(T)] ([A.loc.type])"
else if(A.loc)
return "[A.loc] (0, 0, 0) ([A.loc.type])"
//this is only used here (for now)
#undef RUST_G
+1 -1
View File
@@ -433,7 +433,7 @@
if(!gametypeCheck.age_check(M.client))
continue
if(jobbanType)
if(jobban_isbanned(M, jobbanType) || jobban_isbanned(M, ROLE_SYNDICATE))
if(jobban_isbanned(M, jobbanType) || QDELETED(M) || jobban_isbanned(M, ROLE_SYNDICATE) || QDELETED(M))
continue
showCandidatePollWindow(M, poll_time, Question, result, ignore_category, time_passed, flashwindow)
+1
View File
@@ -529,6 +529,7 @@ Proc for attack log creation, because really why not
step(X, pick(NORTH, SOUTH, EAST, WEST))
/proc/deadchat_broadcast(message, mob/follow_target=null, turf/turf_target=null, speaker_key=null, message_type=DEADCHAT_REGULAR)
message = "<span class='linkify'>[message]</span>"
for(var/mob/M in GLOB.player_list)
var/datum/preferences/prefs
if(M.client && M.client.prefs)
+1 -1
View File
@@ -1,4 +1,4 @@
// Ensure the frequency is within bounds of what it should be sending/recieving at
// Ensure the frequency is within bounds of what it should be sending/receiving at
/proc/sanitize_frequency(frequency, free = FALSE)
. = round(frequency)
if(free)
+2
View File
@@ -524,6 +524,8 @@
return
var/datum/DBQuery/query_admin_rank_update = SSdbcore.NewQuery("UPDATE [format_table_name("player")] p INNER JOIN [format_table_name("admin")] a ON p.ckey = a.ckey SET p.lastadminrank = a.rank")
query_admin_rank_update.Execute()
qdel(query_admin_rank_update)
//json format backup file generation stored per server
var/json_file = file("data/admins_backup.json")
var/list/file_data = list("ranks" = list(), "admins" = list())
+2 -2
View File
@@ -64,7 +64,7 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)
//Takes a value of time in deciseconds.
//Returns a text value of that number in hours, minutes, or seconds.
/proc/DisplayTimeText(time_value, truncate = FALSE)
var/second = time_value*0.1
var/second = (time_value)*0.1
var/second_adjusted = null
var/second_rounded = FALSE
var/minute = null
@@ -144,7 +144,7 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)
else if(day && (!minute || !second))
hour = " and 1 hour"
else
hour = "[truncate ? "hour" : "1 hour"]"
hour = "[truncate ? "hour" : "1 hour"]"
else
hour = null
-15
View File
@@ -218,21 +218,6 @@
. = "NONE"
return .
/proc/ui_style2icon(ui_style)
switch(ui_style)
if("Retro")
return 'icons/mob/screen_retro.dmi'
if("Plasmafire")
return 'icons/mob/screen_plasmafire.dmi'
if("Slimecore")
return 'icons/mob/screen_slimecore.dmi'
if("Operative")
return 'icons/mob/screen_operative.dmi'
if("Clockwork")
return 'icons/mob/screen_clockwork.dmi'
else
return 'icons/mob/screen_midnight.dmi'
//colour formats
/proc/rgb2hsl(red, green, blue)
red /= 255;green /= 255;blue /= 255;
+8 -6
View File
@@ -186,7 +186,7 @@ Turf and target are separate in case you want to teleport some distance from a t
return 1
//Generalised helper proc for letting mobs rename themselves. Used to be clname() and ainame()
/mob/proc/rename_self(role, client/C)
/mob/proc/apply_pref_name(role, client/C)
if(!C)
C = client
var/oldname = real_name
@@ -194,8 +194,10 @@ Turf and target are separate in case you want to teleport some distance from a t
var/loop = 1
var/safety = 0
var/banned = jobban_isbanned(src, "appearance")
while(loop && safety < 5)
if(C && C.prefs.custom_names[role] && !safety && (!jobban_isbanned(src, "appearance")))
if(C && C.prefs.custom_names[role] && !safety && !banned)
newname = C.prefs.custom_names[role]
else
switch(role)
@@ -207,10 +209,8 @@ Turf and target are separate in case you want to teleport some distance from a t
newname = pick(GLOB.mime_names)
if("ai")
newname = pick(GLOB.ai_names)
if("deity")
newname = pick(GLOB.clown_names|GLOB.ai_names|GLOB.mime_names) //pick any old name
else
return
return FALSE
for(var/mob/living/M in GLOB.player_list)
if(M == src)
@@ -224,6 +224,8 @@ Turf and target are separate in case you want to teleport some distance from a t
if(newname)
fully_replace_character_name(oldname,newname)
return TRUE
return FALSE
//Picks a string of symbols to display as the law number for hacked or ion laws
@@ -899,7 +901,7 @@ GLOBAL_LIST_INIT(WALLITEMS_INVERSE, typecacheof(list(
/proc/check_target_facings(mob/living/initator, mob/living/target)
/*This can be used to add additional effects on interactions between mobs depending on how the mobs are facing each other, such as adding a crit damage to blows to the back of a guy's head.
Given how click code currently works (Nov '13), the initiating mob will be facing the target mob most of the time
That said, this proc should not be used if the change facing proc of the click code is overriden at the same time*/
That said, this proc should not be used if the change facing proc of the click code is overridden at the same time*/
if(!ismob(target) || target.lying)
//Make sure we are not doing this for things that can't have a logical direction to the players given that the target would be on their side
return FALSE
+11 -4
View File
@@ -45,6 +45,10 @@ GLOBAL_LIST_INIT(bitfields, list(
"NEEDS_PERMIT" = NEEDS_PERMIT,
"SLOWS_WHILE_IN_HAND" = SLOWS_WHILE_IN_HAND,
"NO_MAT_REDEMPTION" = NO_MAT_REDEMPTION,
"DROPDEL" = DROPDEL,
"NOBLUDGEON" = NOBLUDGEON,
"NODROP" = NODROP,
"ABSTRACT" = ABSTRACT,
),
"admin_flags" = list(
"BUILDMODE" = R_BUILDMODE,
@@ -113,12 +117,15 @@ GLOBAL_LIST_INIT(bitfields, list(
"NOJAUNT_1" = NOJAUNT_1,
"UNUSED_RESERVATION_TURF_1" = UNUSED_RESERVATION_TURF_1,
"CAN_BE_DIRTY_1" = CAN_BE_DIRTY_1,
"HEAR_1 / NO_DEATHRATTLE_1 (turfs)" = HEAR_1,
"CHECK_RICOCHET_1 / NO_RUINS_1 (turfs)" = CHECK_RICOCHET_1,
"CONDUCT_1 / NO_LAVA_GEN_1" = CONDUCT_1,
"ABSTRACT_1" = ABSTRACT_1,
"HEAR_1" = HEAR_1,
"CHECK_RICOCHET_1" = CHECK_RICOCHET_1,
"CONDUCT_1" = CONDUCT_1,
"NO_LAVA_GEN_1" = NO_LAVA_GEN_1,
"NODECONSTRUCT_1" = NODECONSTRUCT_1,
"OVERLAY_QUEUED_1" = OVERLAY_QUEUED_1,
"ON_BORDER_1" = ON_BORDER_1,
"NO_RUINS_1" = NO_RUINS_1,
"PREVENT_CLICK_UNDER_1" = PREVENT_CLICK_UNDER_1,
"HOLOGRAM_1" = HOLOGRAM_1,
"TESLA_IGNORE_1" = TESLA_IGNORE_1,
"INITIALIZED_1" = INITIALIZED_1,
+2 -2
View File
@@ -1,7 +1,7 @@
GLOBAL_VAR_INIT(master_mode, "traitor") //"extended"
GLOBAL_VAR_INIT(secret_force_mode, "secret") // if this is anything but "secret", the secret rotation will forceably choose this mode
GLOBAL_VAR(common_report) //Contains commmon part of roundend report
GLOBAL_VAR(survivor_report) //Contains shared surivor report for roundend report (part of personal report)
GLOBAL_VAR(common_report) //Contains common part of roundend report
GLOBAL_VAR(survivor_report) //Contains shared survivor report for roundend report (part of personal report)
GLOBAL_VAR_INIT(wavesecret, 0) // meteor mode, delays wave progression, terrible name
+2
View File
@@ -22,6 +22,8 @@ GLOBAL_VAR(world_manifest_log)
GLOBAL_PROTECT(world_manifest_log)
GLOBAL_VAR(query_debug_log)
GLOBAL_PROTECT(query_debug_log)
GLOBAL_VAR(world_job_debug_log)
GLOBAL_PROTECT(world_job_debug_log)
GLOBAL_LIST_EMPTY(bombers)
GLOBAL_PROTECT(bombers)
+1 -1
View File
@@ -10,7 +10,7 @@ GLOBAL_VAR_INIT(TAB, "&nbsp;&nbsp;&nbsp;&nbsp;")
GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
GLOBAL_VAR_INIT(CELLRATE, 0.002) // multiplier for watts per tick <> cell storage (eg: .002 means if there is a load of 1000 watts, 20 units will be taken from a cell per second)
GLOBAL_VAR_INIT(CELLRATE, 0.002) // conversion ratio between a watt-tick and kilojoule
GLOBAL_VAR_INIT(CHARGELEVEL, 0.001) // Cap for how fast cells charge, as a percentage-per-tick (.001 means cellcharge is capped to 1% per second)
GLOBAL_LIST_EMPTY(powernets)
+47 -35
View File
@@ -40,7 +40,7 @@
*/
/atom/Click(location,control,params)
if(flags_1 & INITIALIZED_1)
SendSignal(COMSIG_CLICK, location, control, params)
SEND_SIGNAL(src, COMSIG_CLICK, location, control, params)
usr.ClickOn(src, params)
/atom/DblClick(location,control,params)
@@ -57,7 +57,7 @@
After that, mostly just check your state, check whether you're holding an item,
check whether you're adjacent to the target, then pass off the click to whoever
is recieving it.
is receiving it.
The most common are:
* mob/UnarmedAttack(atom,adjacent) - used here only when adjacent, with no item in hand; in the case of humans, checks gloves
* atom/attackby(item,user) - used only when adjacent
@@ -129,7 +129,7 @@
//These are always reachable.
//User itself, current loc, and user inventory
if(DirectAccess(A))
if(A in DirectAccess())
if(W)
W.melee_attack_chain(src, A, params)
else
@@ -174,40 +174,52 @@
return TRUE
return FALSE
/atom/movable/proc/CanReach(atom/target,obj/item/tool,view_only = FALSE)
if(isturf(target) || isturf(target.loc) || DirectAccess(target)) //Directly accessible atoms
if(Adjacent(target) || (tool && CheckToolReach(src, target, tool.reach))) //Adjacent or reaching attacks
return TRUE
else
//Things inside storage insde another storage
//Eg Contents of a box in a backpack
var/atom/outer_storage = get_atom_on_turf(target)
if(outer_storage == target) //whatever that is we don't want infinite loop.
return FALSE
if(outer_storage && CanReach(outer_storage,tool) && outer_storage.CanReachStorage(target,src,view_only ? STORAGE_VIEW_DEPTH : INVENTORY_DEPTH))
return TRUE
/atom/movable/proc/CanReach(atom/ultimate_target, obj/item/tool, view_only = FALSE)
// A backwards depth-limited breadth-first-search to see if the target is
// logically "in" anything adjacent to us.
var/list/direct_access = DirectAccess()
var/depth = 1 + (view_only ? STORAGE_VIEW_DEPTH : INVENTORY_DEPTH)
var/list/closed = list()
var/list/checking = list(ultimate_target)
while (checking.len && depth > 0)
var/list/next = list()
--depth
for(var/atom/target in checking) // will filter out nulls
if(closed[target] || isarea(target)) // avoid infinity situations
continue
closed[target] = TRUE
if(isturf(target) || isturf(target.loc) || (target in direct_access)) //Directly accessible atoms
if(Adjacent(target) || (tool && CheckToolReach(src, target, tool.reach))) //Adjacent or reaching attacks
return TRUE
if (!target.loc)
continue
GET_COMPONENT_FROM(storage, /datum/component/storage, target.loc)
if (storage)
var/datum/component/storage/concrete/master = storage.master()
if (master)
next += master.parent
for(var/S in master.slaves)
var/datum/component/storage/slave = S
next += slave.parent
else
next += target.loc
else
next += target.loc
checking = next
return FALSE
//Can [target] in this container be reached by [user], can't be more than [depth] levels deep
/atom/proc/CanReachStorage(atom/target,user,depth)
return FALSE
/obj/item/storage/CanReachStorage(atom/target,user,depth)
while(target && depth > 0)
target = target.loc
depth--
if(target == src)
return TRUE
return FALSE
/atom/movable/proc/DirectAccess(atom/target)
return (target == src || target == loc)
/atom/movable/proc/DirectAccess()
return list(src, loc)
/mob/DirectAccess(atom/target)
return (..() || (target in contents))
return ..() + contents
/mob/living/DirectAccess(atom/target)
return (..() || (target in GetAllContents()))
return ..() + GetAllContents()
/atom/proc/AllowClick()
return FALSE
@@ -309,7 +321,7 @@
A.ShiftClick(src)
return
/atom/proc/ShiftClick(mob/user)
SendSignal(COMSIG_CLICK_SHIFT, user)
SEND_SIGNAL(src, COMSIG_CLICK_SHIFT, user)
if(user.client && user.client.eye == user || user.client.eye == user.loc)
user.examinate(src)
return
@@ -324,7 +336,7 @@
return
/atom/proc/CtrlClick(mob/user)
SendSignal(COMSIG_CLICK_CTRL, user)
SEND_SIGNAL(src, COMSIG_CLICK_CTRL, user)
var/mob/living/ML = user
if(istype(ML))
ML.pulled(src)
@@ -356,7 +368,7 @@
..()
/atom/proc/AltClick(mob/user)
SendSignal(COMSIG_CLICK_ALT, user)
SEND_SIGNAL(src, COMSIG_CLICK_ALT, user)
var/turf/T = get_turf(src)
if(T && user.TurfAdjacent(T))
if(user.listed_turf == T)
@@ -381,7 +393,7 @@
return
/atom/proc/CtrlShiftClick(mob/user)
SendSignal(COMSIG_CLICK_CTRL_SHIFT)
SEND_SIGNAL(src, COMSIG_CLICK_CTRL_SHIFT)
return
/*
+3 -3
View File
@@ -101,7 +101,7 @@
/mob/living/silicon/robot/AltClickOn(atom/A)
A.BorgAltClick(src)
/atom/proc/BorgCtrlShiftClick(mob/living/silicon/robot/user) //forward to human click if not overriden
/atom/proc/BorgCtrlShiftClick(mob/living/silicon/robot/user) //forward to human click if not overridden
CtrlShiftClick(user)
/obj/machinery/door/airlock/BorgCtrlShiftClick(mob/living/silicon/robot/user) // Sets/Unsets Emergency Access Override Forwards to AI code.
@@ -111,7 +111,7 @@
..()
/atom/proc/BorgShiftClick(mob/living/silicon/robot/user) //forward to human click if not overriden
/atom/proc/BorgShiftClick(mob/living/silicon/robot/user) //forward to human click if not overridden
ShiftClick(user)
/obj/machinery/door/airlock/BorgShiftClick(mob/living/silicon/robot/user) // Opens and closes doors! Forwards to AI code.
@@ -121,7 +121,7 @@
..()
/atom/proc/BorgCtrlClick(mob/living/silicon/robot/user) //forward to human click if not overriden
/atom/proc/BorgCtrlClick(mob/living/silicon/robot/user) //forward to human click if not overridden
CtrlClick(user)
/obj/machinery/door/airlock/BorgCtrlClick(mob/living/silicon/robot/user) // Bolts doors. Forwards to AI code.
+5 -5
View File
@@ -2,13 +2,13 @@
MouseDrop:
Called on the atom you're dragging. In a lot of circumstances we want to use the
recieving object instead, so that's the default action. This allows you to drag
receiving object instead, so that's the default action. This allows you to drag
almost anything into a trash can.
*/
/atom/MouseDrop(atom/over, src_location, over_location, src_control, over_control, params)
if(!usr || !over)
return
if(SendSignal(COMSIG_MOUSEDROP_ONTO, over, usr) & COMPONENT_NO_MOUSEDROP) //Whatever is recieving will verify themselves for adjacency.
if(SEND_SIGNAL(src, COMSIG_MOUSEDROP_ONTO, over, usr) & COMPONENT_NO_MOUSEDROP) //Whatever is receiving will verify themselves for adjacency.
return
if(over == src)
return usr.client.Click(src, src_location, src_control, params)
@@ -18,9 +18,9 @@
over.MouseDrop_T(src,usr)
return
// recieve a mousedrop
// receive a mousedrop
/atom/proc/MouseDrop_T(atom/dropping, mob/user)
SendSignal(COMSIG_MOUSEDROPPED_ONTO, dropping, user)
SEND_SIGNAL(src, COMSIG_MOUSEDROPPED_ONTO, dropping, user)
return
@@ -140,4 +140,4 @@
if (middragatom == src_object)
middragtime = 0
middragatom = null
..()
..()
+1 -1
View File
@@ -138,7 +138,7 @@
/datum/hud/proc/get_action_buttons_icons()
. = list()
.["bg_icon"] = ui_style_icon
.["bg_icon"] = ui_style
.["bg_state"] = "template"
//TODO : Make these fit theme
+2 -2
View File
@@ -186,9 +186,9 @@
/datum/hud/ai
ui_style_icon = 'icons/mob/screen_ai.dmi'
ui_style = 'icons/mob/screen_ai.dmi'
/datum/hud/ai/New(mob/owner, ui_style = 'icons/mob/screen_ai.dmi')
/datum/hud/ai/New(mob/owner)
..()
var/obj/screen/using
+14 -4
View File
@@ -237,6 +237,16 @@ magboots would let you walk around normally on the floor. Barring those, you can
or shoot a gun to move around via Newton's 3rd Law of Motion."
icon_state = "weightless"
/obj/screen/alert/highgravity
name = "High Gravity"
desc = "You're getting crushed by high gravity, picking up items and movement will be slowed."
icon_state = "paralysis"
/obj/screen/alert/veryhighgravity
name = "Crushing Gravity"
desc = "You're getting crushed by high gravity, picking up items and movement will be slowed. You'll also accumulate brute damage!"
icon_state = "paralysis"
/obj/screen/alert/fire
name = "On Fire"
desc = "You're on fire. Stop, drop and roll to put the fire out or move to a vacuum area."
@@ -304,6 +314,9 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
/obj/screen/alert/bloodsense/process()
var/atom/blood_target
if(!mob_viewer.mind)
return
var/datum/antagonist/cult/antag = mob_viewer.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
if(!antag)
return
@@ -588,7 +601,6 @@ so as to remain in compliance with the most up-to-date laws."
// Re-render all alerts - also called in /datum/hud/show_hud() because it's needed there
/datum/hud/proc/reorganize_alerts()
var/list/alerts = mymob.alerts
var/icon_pref
if(!hud_shown)
for(var/i = 1, i <= alerts.len, i++)
mymob.client.screen -= alerts[alerts[i]]
@@ -596,9 +608,7 @@ so as to remain in compliance with the most up-to-date laws."
for(var/i = 1, i <= alerts.len, i++)
var/obj/screen/alert/alert = alerts[alerts[i]]
if(alert.icon_state == "template")
if(!icon_pref)
icon_pref = ui_style2icon(mymob.client.prefs.UI_style)
alert.icon = icon_pref
alert.icon = ui_style
switch(i)
if(1)
. = ui_alert1
+3 -4
View File
@@ -24,11 +24,10 @@
desc = "Allows you to sense the general direction of your Queen."
screen_loc = ui_alien_queen_finder
/datum/hud/alien
ui_style_icon = 'icons/mob/screen_alien.dmi'
ui_style = 'icons/mob/screen_alien.dmi'
/datum/hud/alien/New(mob/living/carbon/alien/humanoid/owner, ui_style = 'icons/mob/screen_alien.dmi')
/datum/hud/alien/New(mob/living/carbon/alien/humanoid/owner)
..()
var/obj/screen/using
@@ -36,7 +35,7 @@
//equippable shit
//hands
build_hand_slots(ui_style)
build_hand_slots()
//begin buttons

Some files were not shown because too many files have changed in this diff Show More